falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

z_actor_dlftbls.c OK. Rework a bunch of segment address organization. (#29)

This commit is contained in:
Rozelette 2020-09-27 19:19:06 -05:00 committed by GitHub
parent a672633c3b
commit 07efebe2ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 8041 additions and 9023 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4611
include/dmadata.h
View File

File diff suppressed because it is too large Load Diff

8
include/functions.h
View File

@ -907,10 +907,10 @@ void func_800BE5CC(void); // func_800BE5CC
void func_800BE63C(void); // func_800BE63C
void func_800BE680(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE1 param_8); // func_800BE680
void func_800BF7CC(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7); // func_800BF7CC
void func_800BF9A0(s32 a0, s32 a1); // func_800BF9A0
s32 func_800BFA78(s32 param_1, s32 param_2); // func_800BFA78
void func_800BFAE8(void); // func_800BFAE8
void func_800BFB40(void); // func_800BFB40
void ActorOverlayTable_FaultPrint(void* arg0, void* arg1); // ActorOverlayTable_FaultPrint
void* ActorOverlayTable_FaultAddrConv(void* arg0, void* arg1); // ActorOverlayTable_FaultAddrConv
void ActorOverlayTable_Init(void); // ActorOverlayTable_Init
void ActorOverlayTable_Cleanup(void); // ActorOverlayTable_Cleanup
void BgCheck_PolygonLinkedListNodeInit(BgPolygonLinkedListNode* node, s16* polyIndex, u16 next); // func_800BFB80
void BgCheck_PolygonLinkedListResetHead(u16* head); // func_800BFB9C
void BgCheck_ScenePolygonListsNodeInsert(BgScenePolygonLists* list, u16* head, s16* polyIndex); // func_800BFBAC

1670
include/segment_symbols.h Normal file
View File

File diff suppressed because it is too large Load Diff

12
include/variables.h
View File

@ -2,7 +2,7 @@
#define _VARIABLES_H_
#include <z64.h>
#include <dmadata.h>
#include <segment_symbols.h>
#include <segment.h>
#include <section.h>
#include <pre_boot_variables.h>
@ -352,11 +352,11 @@ extern DmaEntry dmadata[1568]; // D_8009F8B0
extern UNK_TYPE1 D_80186028; // D_80186028
extern UNK_TYPE1 D_801AAAB0; // D_801AAAB0
extern UNK_TYPE1 D_801AD370; // D_801AD370
extern ActorInit enAObjInitData; // D_801ADE60
extern ActorInit En_A_Obj_InitVars; // En_A_Obj_InitVars
extern ColCylinderInit enAObjCylinderInit; // D_801ADE80
extern InitChainEntry enAObjInitVar; // D_801ADEAC
extern u32 enAObjDisplayLists[2]; // D_801ADEB0
extern ActorInit enItem00InitData; // D_801ADEC0
extern ActorInit En_Item00_InitVars; // En_Item00_InitVars
extern ColCylinderInit enItem00CylinderInit; // D_801ADEE0
extern InitChainEntry enItem00InitVars[1]; // D_801ADF0C
extern UNK_TYPE1 D_801ADF10; // D_801ADF10
@ -438,8 +438,8 @@ extern UNK_TYPE1 D_801AEFA8; // D_801AEFA8
extern UNK_TYPE1 D_801AEFB8; // D_801AEFB8
extern UNK_TYPE1 D_801AEFBC; // D_801AEFBC
extern UNK_TYPE1 D_801AEFC0; // D_801AEFC0
extern ActorOverlay actorOverlayTable[ACTOR_ID_MAX]; // D_801AEFD0
extern UNK_TYPE4 D_801B4610; // D_801B4610
extern ActorOverlay gActorOverlayTable[ACTOR_ID_MAX]; // D_801AEFD0
extern s32 gMaxActorId; // gMaxActorId
extern u32 D_801B4620[32]; // D_801B4620
extern u16 D_801B46A0[16]; // D_801B46A0
extern u8 D_801B46C0[16]; // D_801B46C0
@ -2253,7 +2253,7 @@ extern UNK_TYPE1 D_801D08D8; // D_801D08D8
extern UNK_TYPE1 D_801D08E4; // D_801D08E4
extern UNK_TYPE1 D_801D08E8; // D_801D08E8
extern UNK_TYPE1 D_801D0900; // D_801D0900
extern ActorInit D_801D0B50; // D_801D0B50
extern ActorInit Player_InitVars; // Player_InitVars
extern UNK_TYPE1 D_801D0B70; // D_801D0B70
extern UNK_TYPE1 D_801D0B8C; // D_801D0B8C
extern UNK_TYPE4 D_801D0BA8; // D_801D0BA8

1146
include/variables_overlay.h
View File

File diff suppressed because it is too large Load Diff

6
include/z64actor.h
View File

@ -70,6 +70,12 @@ typedef struct {
/* 0x1C */ ActorFunc draw;
} ActorInit; // size = 0x20
typedef enum {
ALLOCTYPE_NORMAL,
ALLOCTYPE_ABSOLUTE,
ALLOCTYPE_PERMANENT
} AllocType;
typedef struct {
/* 0x00 */ u32 vromStart;
/* 0x04 */ u32 vromEnd;

1382
linker_scripts/code_script.txt
View File

File diff suppressed because it is too large Load Diff

6140
linker_scripts/dmadata_script.txt
View File

File diff suppressed because it is too large Load Diff

2
src/boot_O2_g3/idle.c
View File

@ -55,7 +55,7 @@ void Idle_InitCodeAndMemory(void) {
oldSize = sDmaMgrDmaBuffSize;
sDmaMgrDmaBuffSize = 0;
DmaMgr_SendRequestImpl(&dmaReq, (u32)&code_text_start, (u32)&code_vrom_start, (u32)&code_vrom_end - (u32)&code_vrom_start, 0, &queue, 0);
DmaMgr_SendRequestImpl(&dmaReq, (u32)&code_text_start, (u32)_codeSegmentRomStart, (u32)_codeSegmentRomEnd - (u32)_codeSegmentRomStart, 0, &queue, 0);
Idle_InitScreen();
Idle_InitMemory();
osRecvMesg(&queue, 0, 1);

2
src/boot_O2_g3/z_std_dma.c
View File

@ -200,7 +200,7 @@ s32 DmaMgr_SendRequest0(void* vramStart, u32 vromStart, u32 size) {
void Dmamgr_Start() {
DmaEntry* v0;
u32 v1;
DmaMgr_DMARomToRam((u32)&dmadata_vrom_start, dmadata, (u32)&dmadata_vrom_end - (u32)&dmadata_vrom_start);
DmaMgr_DMARomToRam((u32)_dmadataSegmentRomStart, dmadata, (u32)_dmadataSegmentRomEnd - (u32)_dmadataSegmentRomStart);
for (v0 = dmadata, v1 = 0; v0->vromEnd != 0; v0++, v1++);

52
src/code/code_0x800BF9A0.c
View File

@ -1,52 +0,0 @@
#include <ultra64.h>
#include <global.h>
void func_800BF9A0(s32 a0, s32 a1) {
s32 i;
ActorOverlay* s0;
s32 v1;
func_8008439C(-2, 0);
func_800847CC(D_801DCBB0, D_801B4610);
func_800847CC(D_801DCBC4);
for (i = 0, s0 = &actorOverlayTable[0]; i < D_801B4610; i++, s0++) {
v1 = (u32)s0->vramEnd - (u32)s0->vramStart;
if (s0->loadedRamAddr == NULL) continue;
func_800847CC(D_801DCBE4, i, s0->loadedRamAddr, (u32)s0->loadedRamAddr + v1, s0->nbLoaded, &D_801DCBFC);
}
}
s32 func_800BFA78(s32 a0, s32 a1) {
s32 i;
ActorOverlay* v0 = &actorOverlayTable[0];
s32 t1;
s32 a2;
s32 a0_2 = a0;
for (i = 0; i < D_801B4610; i++, v0++) {
t1 = (u32)v0->vramStart - (u32)v0->loadedRamAddr;
a2 = (u32)v0->vramEnd - (u32)v0->vramStart;
if (v0->loadedRamAddr == NULL) continue;
if (a0_2 < (u32)v0->loadedRamAddr) continue;
if (a0_2 < ((u32)v0->loadedRamAddr + a2)) {
return a0_2 + t1;
}
}
return 0;
}
void func_800BFAE8(void) {
D_801B4610 = ACTOR_ID_MAX;
func_800819F0(&D_801ED930, (u32)func_800BF9A0, 0, 0);
func_80081BCC(&D_801ED940, (u32)func_800BFA78, 0);
}
void func_800BFB40(void) {
func_80081AD4(&D_801ED930);
func_80081CA4(&D_801ED940);
D_801B4610 = 0;
}

767
src/code/z_actor_dlftbls.c Normal file
View File

@ -0,0 +1,767 @@
#include <ultra64.h>
#include <global.h>
#include <global_overlay.h>
#define ACTOR_OVERLAY(name, allocType) \
{ \
(u32)_ovl_##name##SegmentRomStart, (u32)_ovl_##name##SegmentRomEnd, _ovl_##name##SegmentStart, \
_ovl_##name##SegmentEnd, NULL, &name##_InitVars, NULL, allocType, 0 \
}
#define ACTOR_OVERLAY_INTERNAL(name, allocType) \
{ 0, 0, NULL, NULL, NULL, &name##_InitVars, NULL, allocType, 0 }
#define ACTOR_OVERLAY_UNSET \
{ 0 }
ActorOverlay gActorOverlayTable[] = {
ACTOR_OVERLAY_INTERNAL(Player, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Test, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_GirlA, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Part, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Light, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Door, ALLOCTYPE_PERMANENT),
ACTOR_OVERLAY(En_Box, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Pametfrog, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Okuta, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Bom, ALLOCTYPE_PERMANENT),
ACTOR_OVERLAY(En_Wallmas, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Dodongo, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Firefly, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Horse, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_INTERNAL(En_Item00, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Arrow, ALLOCTYPE_PERMANENT),
ACTOR_OVERLAY(En_Elf, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Niw, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Tite, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Peehat, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Butte, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Insect, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Fish, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Holl, ALLOCTYPE_PERMANENT),
ACTOR_OVERLAY(En_Dinofos, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Hata, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Zl1, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Viewer, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Bubble, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Door_Shutter, ALLOCTYPE_PERMANENT),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Boom, ALLOCTYPE_PERMANENT),
ACTOR_OVERLAY(En_Torch2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Minifrog, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_St, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_INTERNAL(En_A_Obj, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Wturn, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_River_Sound, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Ossan, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Famos, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Bombf, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Am, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Dekubaba, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_M_Fire1, ALLOCTYPE_PERMANENT),
ACTOR_OVERLAY(En_M_Thunder, ALLOCTYPE_PERMANENT),
ACTOR_OVERLAY(Bg_Breakwall, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(Door_Warp1, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Syokudai, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Item_B_Heart, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Dekunuts, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Bbfall, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Arms_Hook, ALLOCTYPE_PERMANENT),
ACTOR_OVERLAY(En_Bb, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Keikoku_Spr, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Wood02, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Death, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Minideath, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Vm, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Demo_Effect, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Demo_Kankyo, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Floormas, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Rd, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_F40_Flift, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(Obj_Mure, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Sw, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Object_Kankyo, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Horse_Link_Child, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Door_Ana, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Encount1, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Demo_Tre_Lgt, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Encount2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Fire_Rock, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Ctower_Rot, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Mir_Ray, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Sb, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Bigslime, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Karebaba, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_In, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Ru, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Bom_Chu, ALLOCTYPE_PERMANENT),
ACTOR_OVERLAY(En_Horse_Game_Check, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Rr, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Fr, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Fishing, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Oshihiki, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Eff_Dust, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Umajump, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Arrow_Fire, ALLOCTYPE_ABSOLUTE),
ACTOR_OVERLAY(Arrow_Ice, ALLOCTYPE_ABSOLUTE),
ACTOR_OVERLAY(Arrow_Light, ALLOCTYPE_ABSOLUTE),
ACTOR_OVERLAY(Item_Etcetera, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Kibako, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Tsubo, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Ik, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(Demo_Shd, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Dns, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Elf_Msg, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Honotrap, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Tubo_Trap, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Ice_Poly, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Fz, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Kusa, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Bean, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Bombiwa, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Switch, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(Obj_Lift, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Hsblock, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Okarina_Tag, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Goroiwa, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Daiku, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Nwc, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Item_Inbox, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Ge1, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Blockstop, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Sda, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Clear_Tag, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Gm, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Ms, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Hs, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Ingate, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Kanban, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Attack_Niw, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Mk, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Owl, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Ishi, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Hana, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Lightswitch, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Mure2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Fu, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Stream, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Mm, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Weather_Tag, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Ani, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Js, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Okarina_Effect, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Mag, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Elf_Msg2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_F40_Swlift, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Kakasi, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Makeoshihiki, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Oceff_Spot, ALLOCTYPE_ABSOLUTE),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Torch, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(Shot_Sun, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(Obj_Roomtimer, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Ssh, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(Oceff_Wipe, ALLOCTYPE_ABSOLUTE),
ACTOR_OVERLAY(Oceff_Storm, ALLOCTYPE_ABSOLUTE),
ACTOR_OVERLAY(Obj_Demo, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Minislime, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Nutsball, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(Oceff_Wipe2, ALLOCTYPE_ABSOLUTE),
ACTOR_OVERLAY(Oceff_Wipe3, ALLOCTYPE_ABSOLUTE),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Dg, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Si, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Comb, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Kibako2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Hs2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Mure3, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Tg, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Wf, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Skb, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Gs, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Sound, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Crow, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Cow, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(Oceff_Wipe4, ALLOCTYPE_ABSOLUTE),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Zo, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Makekinsuta, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Ge3, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(Obj_Hamishi, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Zl4, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Mm2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(Door_Spiral, ALLOCTYPE_PERMANENT),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(Obj_Pzlblock, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Toge, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(Obj_Armos, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Boyo, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Grasshopper, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(Obj_Grass, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Grass_Carry, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Grass_Unit, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(Bg_Fire_Wall, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Bu, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Encount3, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Jso, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Chikuwa, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Knight, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Warp_tag, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Aob_01, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Boj_01, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Boj_02, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Boj_03, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Encount4, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Bom_Bowl_Man, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Syateki_Man, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(Bg_Icicle, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Syateki_Crow, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Boj_04, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Cne_01, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Bba_01, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Bji_01, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Spdweb, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Mt_tag, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Boss_01, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Boss_02, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Boss_03, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Boss_04, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Boss_05, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Boss_06, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Boss_07, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Dy_Yoseizo, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Boj_05, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Sob1, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Go, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Raf, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Funen, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Raillift, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Numa_Hana, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Flowerpot, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Spinyroll, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_Hina, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Syateki_Wf, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Skateblock, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Iceblock, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Bigpamet, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Syateki_Dekunuts, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Elf_Msg3, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Fg, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_Ravine, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_Sa, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Slime, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Pr, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Toudai, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Entotu, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Bell, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Syateki_Okuta, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(Obj_Shutter, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_Zl, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Elfgrp, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_Tsg, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Baguo, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Vspinyroll, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Smork, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Test2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Test3, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Test4, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Bat, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Sekihi, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Wiz, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Wiz_Brock, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Wiz_Fire, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Eff_Change, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_Statue, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Fireshield, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Ladder, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Mkk, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Demo_Getitem, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Dnb, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Dnh, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Dnk, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Dnq, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(Bg_Keikoku_Saku, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Hugebombiwa, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Firefly2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Rat, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Water_Effect, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Kusa2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Spout_Fire, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(Bg_Dblue_Movebg, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Dy_Extra, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Bal, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Ginko_Man, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Warp_Uzu, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Driftice, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Look_Nuts, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Mushi2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Fall, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Mm3, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Crace_Movebg, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Dno, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Pr2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Prz, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Jso2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Etcetera, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Egol, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Mine, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Purify, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Tru, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Trt, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Test5, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Test6, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Az, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Estone, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Hakugin_Post, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_Opstage, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_Stk, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_Char00, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_Char01, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_Char02, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_Char03, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_Char04, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_Char05, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_Char06, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_Char07, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_Char08, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_Char09, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Tokeidai, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Mnk, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Egblock, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Guard_Nuts, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Hakugin_Bombwall, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Tokei_Tobira, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Hakugin_Elvpole, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Ma4, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Twig, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Po_Fusen, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Door_Etc, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Bigokuta, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Icefloe, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Ocarinalift, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Time_Tag, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Open_Shutter, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Open_Spot, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Fu_Kaiten, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Aqua, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Elforg, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Elfbub, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Fu_Mato, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Fu_Kago, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Osn, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Ctower_Gear, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Trt2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Tokei_Step, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Lotus, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Kame, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Takaraya_Wall, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Fu_Mizu, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Sellnuts, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Dkjail_Ivy, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(Obj_Visiblock, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Takaraya, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Tsn, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Ds2n, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Fsn, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Shn, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Stop_heishi, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Bigicicle, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Lift_Nuts, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Tk, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(Bg_Market_Step, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Lupygamelift, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Test7, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Lightblock, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Mir_Ray2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Wdhand, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Gamelupy, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Danpei_Movebg, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Snowwd, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Pm, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Gakufu, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Elf_Msg4, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Elf_Msg5, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Col_Man, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Talk_Gibud, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Giant, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Snowball, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Boss_Hakugin, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Gb2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Onpuman, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Tobira01, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Tag_Obj, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Dhouse, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Hakaisi, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Hakugin_Switch, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Snowman, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(TG_Sw, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Po_Sisters, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Pp, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Hakurock, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Hanabi, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Dowsing, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Wind, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Racedog, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Kendo_Js, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Botihasira, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Fish2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Pst, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Poh, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Spidertent, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Zoraegg, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Kbt, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Gg, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Maruta, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Snowball2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Gg2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Ghaka, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Dnp, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Dai, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Goron_Oyu, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Kgy, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Invadepoh, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Gk, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_An, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY_UNSET,
ACTOR_OVERLAY(En_Bee, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Ot, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Dragon, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Dora, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Bigpo, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Kendo_Kanban, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Hariko, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Sth, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Sinkai_Kabe, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Haka_Curtain, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Kin2_Bombwall, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Kin2_Fence, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Kin2_Picture, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Kin2_Shelf, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Rail_Skb, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Jg, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Tru_Mt, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Um, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Neo_Reeba, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Mbar_Chair, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Ikana_Block, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Ikana_Mirror, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Ikana_Rotaryroom, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Dblue_Balance, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Dblue_Waterfall, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Kaizoku, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Ge2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Ma_Yts, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Ma_Yto, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Tokei_Turret, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Dblue_Elevator, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Warpstone, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Zog, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Rotlift, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Jg_Gakki, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Inibs_Movebg, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Zot, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Tree, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Y2lift, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Y2shutter, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Boat, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Taru, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Hunsui, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Jc_Mato, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Mir_Ray3, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Zob, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Elf_Msg6, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Nozoki, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Toto, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Railgibud, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Baba, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Suttari, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Zod, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Kujiya, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Geg, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Kinoko, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Yasi, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Tanron1, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Tanron2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Tanron3, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Chan, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Zos, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_S_Goro, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Nb, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Ja, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_F40_Block, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_F40_Switch, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Po_Composer, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Guruguru, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Oceff_Wipe5, ALLOCTYPE_ABSOLUTE),
ACTOR_OVERLAY(En_Stone_heishi, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Oceff_Wipe6, ALLOCTYPE_ABSOLUTE),
ACTOR_OVERLAY(En_Scopenuts, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Scopecrow, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Oceff_Wipe7, ALLOCTYPE_ABSOLUTE),
ACTOR_OVERLAY(Eff_Kamejima_Wave, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Hg, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Hgo, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Zov, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Ah, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Hgdoor, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Ikana_Bombwall, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Ikana_Ray, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Ikana_Shutter, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Haka_Bombwall, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Haka_Tomb, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Sc_Ruppe, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Iknv_Doukutu, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Iknv_Obj, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Pamera, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_HsStump, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Hidden_Nuts, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Zow, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Talk, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Al, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Tab, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Nimotsu, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Hit_Tag, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Ruppecrow, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Tanron4, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Tanron5, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Tanron6, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Daiku2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Muto, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Baisen, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Heishi, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Demo_heishi, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Dt, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Cha, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Dinner, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Eff_Lastday, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Ikana_Dharma, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Akindonuts, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Eff_Stk, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Ig, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Rg, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Osk, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Sth2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Yb, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Rz, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Scopecoin, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Bjt, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Bomjima, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Bomjimb, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Bombers, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Bombers2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Bombal, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Moon_Stone, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Mu_Pict, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Ikninside, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Eff_Zoraband, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Kepn_Koya, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Usiyane, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Nnh, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Kzsaku, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Milk_Bin, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Kitan, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Astr_Bombwall, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Iknin_Susceil, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Bsb, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Recepgirl, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Thiefbird, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Jgame_Tsn, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Jgame_Light, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Yado, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Demo_Syoten, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Demo_Moonend, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Lbfshot, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Bg_Last_Bwall, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_And, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Invadepoh_Demo, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Danpeilift, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Fall2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_Al, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_An, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_Ah, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_Nb, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Drs, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Ending_Hero, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_Bal, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Paper, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Hint_Skb, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_Tag, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Bh, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Ending_Hero2, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Ending_Hero3, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Ending_Hero4, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Ending_Hero5, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Ending_Hero6, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Dm_Gm, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Swprize, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Invisible_Ruppe, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(Obj_Ending, ALLOCTYPE_NORMAL),
ACTOR_OVERLAY(En_Rsn, ALLOCTYPE_NORMAL),
};
s32 gMaxActorId = 0;
FaultClient D_801ED930;
FaultAddrConvClient D_801ED940;
void ActorOverlayTable_FaultPrint(void* arg0, void* arg1) {
ActorOverlay* overlayEntry;
u32 overlaySize;
s32 i;
FaultDrawer_SetCharPad(-2, 0);
FaultDrawer_Printf("actor_dlftbls %u\n", gMaxActorId);
FaultDrawer_Printf("No. RamStart- RamEnd cn Name\n");
for (i = 0, overlayEntry = &gActorOverlayTable[0]; i < gMaxActorId; i++, overlayEntry++) {
overlaySize = (u32)overlayEntry->vramEnd - (u32)overlayEntry->vramStart;
if (overlayEntry->loadedRamAddr != NULL) {
FaultDrawer_Printf("%3d %08x-%08x %3d %s\n", i, overlayEntry->loadedRamAddr,
(u32)overlayEntry->loadedRamAddr + overlaySize, overlayEntry->nbLoaded, "");
}
}
}
void* ActorOverlayTable_FaultAddrConv(void* arg0, void* arg1) {
u8* ptr = arg0;
ActorOverlay* overlayEntry = &gActorOverlayTable[0];
s32 i;
u8* ramStart;
u8* ramEnd;
u32 size;
u32 offset;
for (i = 0; i < gMaxActorId; i++, overlayEntry++) {
size = (u8*)overlayEntry->vramEnd - (u8*)overlayEntry->vramStart;
ramStart = overlayEntry->loadedRamAddr;
ramEnd = ramStart + size;
offset = (u8*)overlayEntry->vramStart - ramStart;
if (ramStart != NULL) {
if (ptr >= ramStart && ptr < ramEnd) {
return ptr + offset;
}
}
}
return NULL;
}
void ActorOverlayTable_Init(void) {
gMaxActorId = ACTOR_ID_MAX;
Fault_AddClient(&D_801ED930, &ActorOverlayTable_FaultPrint, NULL, NULL);
Fault_AddAddrConvClient(&D_801ED940, &ActorOverlayTable_FaultAddrConv, NULL);
}
void ActorOverlayTable_Cleanup(void) {
Fault_RemoveClient(&D_801ED930);
Fault_RemoveAddrConvClient(&D_801ED940);
gMaxActorId = 0;
}

6
src/code/z_kanfont.c
View File

@ -6,13 +6,13 @@ void Kanfont_Nop800F4F40(GlobalContext* ctxt, UNK_TYPE param_2, UNK_TYPE param_3
void Kanfont_LoadAsciiChar(GlobalContext* ctxt, u8 character, s32 iParm3) {
// UB to convert pointer to u32
DmaMgr_SendRequest0((void*)((u32)&ctxt->msgCtx.font.unk0[(ctxt->msgCtx).unk11EF0] + iParm3),
(u32)&nes_font_static_vrom_start + character * 0x80 - 0x1000,
(u32)_nes_font_staticSegmentRomStart + character * 0x80 - 0x1000,
0x80);
}
void Kanfont_LoadMessageBoxEnd(Font* font, u16 type) {
// UB to convert pointer to u32
DmaMgr_SendRequest0(&font->unk7800[0][0], type * 0x80 + (u32)&message_static_vrom_start + 0x5000, 0x80);
DmaMgr_SendRequest0(&font->unk7800[0][0], type * 0x80 + (u32)_message_staticSegmentRomStart + 0x5000, 0x80);
}
void Kanfont_LoadOrderedFont(Font* font) {
@ -27,7 +27,7 @@ void Kanfont_LoadOrderedFont(Font* font) {
loadOffset = 0;
}
// UB to convert pointer to u32
DmaMgr_SendRequest0(writeLocation, (u32)&nes_font_static_vrom_start + loadOffset, 0x80);
DmaMgr_SendRequest0(writeLocation, (u32)_nes_font_staticSegmentRomStart + loadOffset, 0x80);
if (kanfontOrdering[codePointIndex] == 140) break;
codePointIndex++;
}

2
src/code/z_scene.c
View File

@ -172,7 +172,7 @@ void Scene_HeaderCommand00(GlobalContext* ctxt, SceneCmd* entry) {
ctxt->sceneContext.spawnedObjectCount = loadedCount;
unk20 = gSaveContext.perm.unk20;
temp16 = D_801C2730[unk20];
actorOverlayTable[0].initInfo->objectId = temp16;
gActorOverlayTable[0].initInfo->objectId = temp16;
Scene_LoadObject(&ctxt->sceneContext, temp16);
ctxt->sceneContext.objects[ctxt->sceneContext.objectCount].vramAddr = objectVramAddr;

8
tables/functions.txt
View File

@ -904,10 +904,10 @@
0x800BE63C:("func_800BE63C",),
0x800BE680:("func_800BE680",),
0x800BF7CC:("func_800BF7CC",),
0x800BF9A0:("func_800BF9A0",),
0x800BFA78:("func_800BFA78",),
0x800BFAE8:("func_800BFAE8",),
0x800BFB40:("func_800BFB40",),
0x800BF9A0:("ActorOverlayTable_FaultPrint",),
0x800BFA78:("ActorOverlayTable_FaultAddrConv",),
0x800BFAE8:("ActorOverlayTable_Init",),
0x800BFB40:("ActorOverlayTable_Cleanup",),
0x800BFB80:("BgCheck_PolygonLinkedListNodeInit",),
0x800BFB9C:("BgCheck_PolygonLinkedListResetHead",),
0x800BFBAC:("BgCheck_ScenePolygonListsNodeInsert",),

4
tables/objects.txt
View File

@ -268,7 +268,7 @@
0x800B32D0:"flg_set",
0x800B3880:"z_DLF",
0x800B3AD0:"z_actor",
0x800BF9A0:"",
0x800BF9A0:"z_actor_dlftbls",
0x800BFB80:"z_bgcheck",
0x800CAAD0:"",
0x800CAE10:"",
@ -402,7 +402,7 @@
0x801AE8F0:"code_data_flg_set_table",
0x801AEC70:"code_data_flg_set",
0x801AEC80:"code_data_z_actor",
0x801B4610:"code_data_0x800BF9A0",
0x801AEFD0:"code_data_z_actor_dlftbls",
0x801B4620:"code_data_z_bgcheck",
0x801B4710:"code_data_z_camera",
0x801B9F20:"code_data_z_collision_check",

1124
tables/variables.txt
View File

File diff suppressed because it is too large Load Diff

118
tables/vrom_variables.txt
View File

@ -2,67 +2,67 @@
{
# NOTE These symbols could be one of two symbols: the start of a file or the end of a file before it.
# The choice for disassembly is arbitrary but in code it should be the one that makes sense.
0x0001A500:("dmadata_vrom_start","u32","",0x4), # Start of dmadata
0x00020700:("dmadata_vrom_end","u32","",0x4), # Byte immediately after end of dmadata
0x00046AF0:("Audioseq_vrom_start","UNK_TYPE","",0x4),
0x00097F70:("Audioseq_vrom_end","UNK_TYPE","",0x4),
0x0065D000:("link_animetion_vrom_start","UNK_TYPE","",0x4),
0x0001A500:("_dmadataSegmentRomStart","u32","",0x4), # Start of dmadata
0x00020700:("_dmadataSegmentRomEnd","u32","",0x4), # Byte immediately after end of dmadata
0x00046AF0:("_AudioseqSegmentRomStart","UNK_TYPE","",0x4),
0x00097F70:("_AudioseqSegmentRomEnd","UNK_TYPE","",0x4),
0x0065D000:("_link_animetionSegmentRomStart","UNK_TYPE","",0x4),
0x00957000:("","UNK_TYPE","",0x4), # ovl_kaleido_scope uses this. It is the start of vrom for a null entry in dmadata???
0x009ECEC0:("","UNK_TYPE","",0x4), # ovl_kaleido_scope uses this. It is the end of vrom for a null entry in dmadata???
0x009ED000:("","UNK_TYPE","",0x4), # ovl_kaleido_scope uses this. It is the start of vrom for a null entry in dmadata???
0x009F4700:("","UNK_TYPE","",0x4), # ovl_kaleido_scope uses this. It is the end of vrom for a null entry in dmadata???
0x009F5000:("icon_item_field_static_vrom_start","UNK_TYPE","",0x4),
0x00A09AF0:("icon_item_field_static_vrom_end","UNK_TYPE","",0x4),
0x00A0A000:("icon_item_dungeon_static_vrom_start","UNK_TYPE","",0x4),
0x00A0EB80:("icon_item_dungeon_static_vrom_end","UNK_TYPE","",0x4),
0x00A0F000:("icon_item_gameover_static_vrom_start","UNK_TYPE","",0x4),
0x00A12300:("icon_item_gameover_static_vrom_end","UNK_TYPE","",0x4),
0x00A13000:("_013_0x00963540_vrom_start","UNK_TYPE","",0x4),
0x00A1BA00:("_013_0x00963540_vrom_end","UNK_TYPE","",0x4),
0x00A1C000:("_014_0x00967260_vrom_start","UNK_TYPE","",0x4),
0x00A1C2E0:("_014_0x00967260_vrom_end","UNK_TYPE","",0x4),
0x00A1D000:("map_i_static_vrom_start","UNK_TYPE","",0x4),
0x00A1E310:("map_grand_static_vrom_start","UNK_TYPE","",0x4),
0x00A27660:("item_name_static_vrom_start","UNK_TYPE","",0x4),
0x00A352F0:("map_name_static_vrom_start","UNK_TYPE","",0x4),
0x00A36C10:("_019_0x00980f60_vrom_start","UNK_TYPE","",0x4),
0x00A7BEE0:("_020_0x009c6230_vrom_start","UNK_TYPE","",0x4),
0x00A807A0:("_020_0x009c6230_vrom_end","UNK_TYPE","",0x4),
0x00A8C000:("_022_0x009caaf0_vrom_start","UNK_TYPE","",0x4),
0x00A92A10:("_023_0x009d1500_vrom_start","UNK_TYPE","",0x4),
0x00A990E0:("_023_0x009d1500_vrom_end","UNK_TYPE","",0x4),
0x00A9A000:("_024_0x009d3760_vrom_start","UNK_TYPE","",0x4),
0x00ABFC00:("_024_0x009d3760_vrom_end","UNK_TYPE","",0x4),
0x00AC0000:("do_action_static_vrom_start","UNK_TYPE","",0x4),
0x00AC4000:("message_static_vrom_start","UNK_TYPE","",0x4),
0x00ACA000:("message_texture_static_vrom_start","UNK_TYPE","",0x4),
0x00ACC000:("nes_font_static_vrom_start","UNK_TYPE","",0x4),
0x00AD1000:("en_message_data_static_vrom_start","UNK_TYPE","",0x4),
0x00B3B000:("staff_message_data_static_vrom_start","UNK_TYPE","",0x4),
0x00B3C000:("code_vrom_start","UNK_TYPE","",0x4),
0x00C7A4E0:("code_vrom_end","UNK_TYPE","",0x4),
0x01E85000:("nintendo_rogo_static_vrom_start","UNK_TYPE","",0x4),
0x01E87DC0:("nintendo_rogo_static_vrom_end","UNK_TYPE","",0x4),
0x01E88000:("title_static_vrom_start","UNK_TYPE","",0x4),
0x01EB9730:("title_static_vrom_end","UNK_TYPE","",0x4),
0x01EBA000:("_1124_0x0163f490_vrom_start","UNK_TYPE","",0x4),
0x01EBB280:("_1124_0x0163f490_vrom_end","UNK_TYPE","",0x4),
0x01EBC000:("_1125_0x0163fc10_vrom_start","UNK_TYPE","",0x4),
0x01EBC680:("_1125_0x0163fc10_vrom_end","UNK_TYPE","",0x4),
0x01EBD000:("_1126_0x0163ffc0_vrom_start","UNK_TYPE","",0x4),
0x01EC8B20:("_1126_0x0163ffc0_vrom_end","UNK_TYPE","",0x4),
0x01EC9000:("_1127_0x01643d50_vrom_start","UNK_TYPE","",0x4),
0x01EC9F30:("_1127_0x01643d50_vrom_end","UNK_TYPE","",0x4),
0x01ECA000:("_1128_0x01644c80_vrom_start","UNK_TYPE","",0x4),
0x01ED3B00:("_1128_0x01644c80_vrom_end","UNK_TYPE","",0x4),
0x01ED4000:("_1129_0x01646b60_vrom_start","UNK_TYPE","",0x4),
0x01EDDB00:("_1129_0x01646b60_vrom_end","UNK_TYPE","",0x4),
0x01EDE000:("_1130_0x01649020_vrom_start","UNK_TYPE","",0x4),
0x01EE7B00:("_1130_0x01649020_vrom_end","UNK_TYPE","",0x4),
0x01EE8000:("_1131_0x0164ad90_vrom_start","UNK_TYPE","",0x4),
0x01EF1B00:("_1131_0x0164ad90_vrom_end","UNK_TYPE","",0x4),
0x01EF2000:("vr_fine_static_vrom_start","UNK_TYPE","",0x4),
0x01EFE000:("vr_cloud_static_vrom_start","UNK_TYPE","",0x4),
0x01F0A000:("vr_pal_static_vrom_start","UNK_TYPE","",0x4),
0x01F0A200:("vr_pal_static_vrom_end","UNK_TYPE","",0x4),
0x009F5000:("_icon_item_field_staticSegmentRomStart","UNK_TYPE","",0x4),
0x00A09AF0:("_icon_item_field_staticSegmentRomEnd","UNK_TYPE","",0x4),
0x00A0A000:("_icon_item_dungeon_staticSegmentRomStart","UNK_TYPE","",0x4),
0x00A0EB80:("_icon_item_dungeon_staticSegmentRomEnd","UNK_TYPE","",0x4),
0x00A0F000:("_icon_item_gameover_staticSegmentRomStart","UNK_TYPE","",0x4),
0x00A12300:("_icon_item_gameover_staticSegmentRomEnd","UNK_TYPE","",0x4),
0x00A13000:("__013_0x00963540SegmentRomStart","UNK_TYPE","",0x4),
0x00A1BA00:("__013_0x00963540SegmentRomEnd","UNK_TYPE","",0x4),
0x00A1C000:("__014_0x00967260SegmentRomStart","UNK_TYPE","",0x4),
0x00A1C2E0:("__014_0x00967260SegmentRomEnd","UNK_TYPE","",0x4),
0x00A1D000:("_map_i_staticSegmentRomStart","UNK_TYPE","",0x4),
0x00A1E310:("_map_grand_staticSegmentRomStart","UNK_TYPE","",0x4),
0x00A27660:("_item_name_staticSegmentRomStart","UNK_TYPE","",0x4),
0x00A352F0:("_map_name_staticSegmentRomStart","UNK_TYPE","",0x4),
0x00A36C10:("__019_0x00980f60SegmentRomStart","UNK_TYPE","",0x4),
0x00A7BEE0:("__020_0x009c6230SegmentRomStart","UNK_TYPE","",0x4),
0x00A807A0:("__020_0x009c6230SegmentRomEnd","UNK_TYPE","",0x4),
0x00A8C000:("__022_0x009caaf0SegmentRomStart","UNK_TYPE","",0x4),
0x00A92A10:("__023_0x009d1500SegmentRomStart","UNK_TYPE","",0x4),
0x00A990E0:("__023_0x009d1500SegmentRomEnd","UNK_TYPE","",0x4),
0x00A9A000:("__024_0x009d3760SegmentRomStart","UNK_TYPE","",0x4),
0x00ABFC00:("__024_0x009d3760SegmentRomEnd","UNK_TYPE","",0x4),
0x00AC0000:("_do_action_staticSegmentRomStart","UNK_TYPE","",0x4),
0x00AC4000:("_message_staticSegmentRomStart","UNK_TYPE","",0x4),
0x00ACA000:("_message_texture_staticSegmentRomStart","UNK_TYPE","",0x4),
0x00ACC000:("_nes_font_staticSegmentRomStart","UNK_TYPE","",0x4),
0x00AD1000:("_en_message_data_staticSegmentRomStart","UNK_TYPE","",0x4),
0x00B3B000:("_staff_message_data_staticSegmentRomStart","UNK_TYPE","",0x4),
0x00B3C000:("_codeSegmentRomStart","UNK_TYPE","",0x4),
0x00C7A4E0:("_codeSegmentRomEnd","UNK_TYPE","",0x4),
0x01E85000:("_nintendo_rogo_staticSegmentRomStart","UNK_TYPE","",0x4),
0x01E87DC0:("_nintendo_rogo_staticSegmentRomEnd","UNK_TYPE","",0x4),
0x01E88000:("_title_staticSegmentRomStart","UNK_TYPE","",0x4),
0x01EB9730:("_title_staticSegmentRomEnd","UNK_TYPE","",0x4),
0x01EBA000:("__1124_0x0163f490SegmentRomStart","UNK_TYPE","",0x4),
0x01EBB280:("__1124_0x0163f490SegmentRomEnd","UNK_TYPE","",0x4),
0x01EBC000:("__1125_0x0163fc10SegmentRomStart","UNK_TYPE","",0x4),
0x01EBC680:("__1125_0x0163fc10SegmentRomEnd","UNK_TYPE","",0x4),
0x01EBD000:("__1126_0x0163ffc0SegmentRomStart","UNK_TYPE","",0x4),
0x01EC8B20:("__1126_0x0163ffc0SegmentRomEnd","UNK_TYPE","",0x4),
0x01EC9000:("__1127_0x01643d50SegmentRomStart","UNK_TYPE","",0x4),
0x01EC9F30:("__1127_0x01643d50SegmentRomEnd","UNK_TYPE","",0x4),
0x01ECA000:("__1128_0x01644c80SegmentRomStart","UNK_TYPE","",0x4),
0x01ED3B00:("__1128_0x01644c80SegmentRomEnd","UNK_TYPE","",0x4),
0x01ED4000:("__1129_0x01646b60SegmentRomStart","UNK_TYPE","",0x4),
0x01EDDB00:("__1129_0x01646b60SegmentRomEnd","UNK_TYPE","",0x4),
0x01EDE000:("__1130_0x01649020SegmentRomStart","UNK_TYPE","",0x4),
0x01EE7B00:("__1130_0x01649020SegmentRomEnd","UNK_TYPE","",0x4),
0x01EE8000:("__1131_0x0164ad90SegmentRomStart","UNK_TYPE","",0x4),
0x01EF1B00:("__1131_0x0164ad90SegmentRomEnd","UNK_TYPE","",0x4),
0x01EF2000:("_vr_fine_staticSegmentRomStart","UNK_TYPE","",0x4),
0x01EFE000:("_vr_cloud_staticSegmentRomStart","UNK_TYPE","",0x4),
0x01F0A000:("_vr_pal_staticSegmentRomStart","UNK_TYPE","",0x4),
0x01F0A200:("_vr_pal_staticSegmentRomEnd","UNK_TYPE","",0x4),
}

4
tools/dmadata.py
View File

@ -89,6 +89,6 @@ if __name__ == "__main__":
with open(args.linkscript, 'w') as file:
for name, vrom_start, vrom_end in linker_info:
formatted_name = '_' + name if name[0].isdigit() else name
file.write('{}_vrom_start = 0x{:08X};\n'.format(formatted_name, vrom_start))
file.write('{}_vrom_end = 0x{:08X};\n'.format(formatted_name, vrom_end))
file.write('_{}SegmentRomStart = 0x{:08X};\n'.format(formatted_name, vrom_start))
file.write('_{}SegmentRomEnd = 0x{:08X};\n'.format(formatted_name, vrom_end))
file.write('\n')