diff --git a/Makefile b/Makefile index 0cb078697a..57c4b5cd06 100644 --- a/Makefile +++ b/Makefile @@ -177,10 +177,10 @@ build/baserom/%: baserom/% build/asm/%.o: asm/%.asm $(AS) $(ASFLAGS) $^ -o $@ -build/src/actors/%.o: src/actors/%.c include/* $(S_FILES) +build/src/overlays/%.o: src/overlays/%.c include/* $(S_FILES) $(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $< - ./tools/overlay.py $@ build/src/actors/$*_overlay.s - $(AS) $(ASFLAGS) build/src/actors/$*_overlay.s -o build/src/actors/$*_overlay.o + ./tools/overlay.py $@ build/src/overlays/$*_overlay.s + $(AS) $(ASFLAGS) build/src/overlays/$*_overlay.s -o build/src/overlays/$*_overlay.o build/src/%.o: src/%.c include/* $(S_FILES) $(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $< diff --git a/include/functions_overlay.h b/include/functions_overlay.h index 87935d7da6..1887813b71 100644 --- a/include/functions_overlay.h +++ b/include/functions_overlay.h @@ -2922,7 +2922,7 @@ void func_809200F8(void); // func_809200F8 void ItemEtcetera_Update(void); // func_80920140 void func_80920164(void); // func_80920164 void func_809201BC(void); // func_809201BC -void FireArrow_SetUpdateFunc(ActorArrowFire* this, actor_func update); // func_80920340 +void FireArrow_SetUpdateFunc(ActorArrowFire* this, ActorFunc update); // func_80920340 void ArrowFire_Init(ActorArrowFire* this, GlobalContext* ctxt); // func_8092034C void ArrowFire_Destroy(ActorArrowFire* this, GlobalContext* ctxt); // func_809203F8 void FireArrow_Update1(ActorArrowFire* pzParm1); // func_80920440 @@ -8001,12 +8001,12 @@ void BgOpenSpot_Init(void); // func_80ACB1E0 void BgOpenSpot_Destroy(void); // func_80ACB220 void BgOpenSpot_Update(void); // func_80ACB230 void func_80ACB2B0(void); // func_80ACB2B0 -void BgFuKaiten_Init(ActorBgFuKaiten* this, GlobalContext* ctxt); // func_80ACB400 -void BgFuKaiten_Destroy(ActorBgFuKaiten* this, GlobalContext* ctxt); // func_80ACB480 -void BgFuKaiten_UpdateRotation(ActorBgFuKaiten* this); // func_80ACB4B4 -void BgFuKaiten_UpdateHeight(ActorBgFuKaiten* this); // func_80ACB50C -void BgFuKaiten_Update(ActorBgFuKaiten* this, GlobalContext* ctxt); // func_80ACB570 -void BgFuKaiten_Draw(ActorBgFuKaiten* this, GlobalContext* ctxt); // func_80ACB5A0 +void BgFuKaiten_Init(Actor* this, GlobalContext* ctxt); // func_80ACB400 +void BgFuKaiten_Destroy(Actor* this, GlobalContext* ctxt); // func_80ACB480 +void BgFuKaiten_UpdateRotation(Actor* this); // func_80ACB4B4 +void BgFuKaiten_UpdateHeight(Actor* this); // func_80ACB50C +void BgFuKaiten_Update(Actor* this, GlobalContext* ctxt); // func_80ACB570 +void BgFuKaiten_Draw(Actor* this, GlobalContext* ctxt); // func_80ACB5A0 void func_80ACB6A0(void); // func_80ACB6A0 void func_80ACB7F4(void); // func_80ACB7F4 void func_80ACB940(void); // func_80ACB940 @@ -11748,14 +11748,14 @@ void func_80BD5118(void); // func_80BD5118 void func_80BD5134(void); // func_80BD5134 void BgIkanaBombwall_Update(void); // func_80BD51DC void BgIkanaBombwall_Draw(void); // func_80BD5200 -void BgIkanaRay_Init(ActorBgIkanaRay* this, GlobalContext* ctxt); // func_80BD53C0 -void BgIkanaRay_Destroy(ActorBgIkanaRay* this, GlobalContext* ctxt); // func_80BD546C -void BgIkanaRay_SetDeactivated(ActorBgIkanaRay* this); // func_80BD5498 -void BgIkanaRay_UpdateCheckForActivation(ActorBgIkanaRay* this, GlobalContext* ctxt); // func_80BD54BC -void BgIkanaRay_SetActivated(ActorBgIkanaRay* this); // func_80BD5500 -void BgIkanaRay_UpdateActivated(ActorBgIkanaRay* this, GlobalContext* ctxt); // func_80BD5530 -void BgIkanaRay_Update(ActorBgIkanaRay* this, GlobalContext* ctxt); // func_80BD556C -void BgIkanaRay_Draw(ActorBgIkanaRay* this, GlobalContext* ctxt); // func_80BD5590 +void BgIkanaRay_Init(Actor* this, GlobalContext* ctxt); // func_80BD53C0 +void BgIkanaRay_Destroy(Actor* this, GlobalContext* ctxt); // func_80BD546C +void BgIkanaRay_SetDeactivated(Actor* this); // func_80BD5498 +void BgIkanaRay_UpdateCheckForActivation(Actor* this, GlobalContext* ctxt); // func_80BD54BC +void BgIkanaRay_SetActivated(Actor* this); // func_80BD5500 +void BgIkanaRay_UpdateActivated(Actor* this, GlobalContext* ctxt); // func_80BD5530 +void BgIkanaRay_Update(Actor* this, GlobalContext* ctxt); // func_80BD556C +void BgIkanaRay_Draw(Actor* this, GlobalContext* ctxt); // func_80BD5590 void func_80BD5690(void); // func_80BD5690 void BgIkanaShutter_Init(void); // func_80BD5728 void BgIkanaShutter_Destroy(void); // func_80BD57F4 diff --git a/include/variables_overlay.h b/include/variables_overlay.h index cae302915c..5802518816 100644 --- a/include/variables_overlay.h +++ b/include/variables_overlay.h @@ -9526,7 +9526,7 @@ extern UNK_TYPE1 D_80ACB3B0; // D_80ACB3B0 extern OverlayRelocationSection bgOpenSpotOverlayInfo; // D_80ACB3C0 extern u32 bgOpenSpotOverlayRelocations[7]; // D_80ACB3D4 extern u32 bgOpenSpotOverlayInfoOffset; // D_80ACB3FC -extern ActorInit bgFuKaitenInitData; // D_80ACB630 +extern ActorInit Bg_Fu_Kaiten_InitVars; // D_80ACB630 extern f32 D_80ACB650; // D_80ACB650 extern OverlayRelocationSection bgFuKaitenOverlayInfo; // D_80ACB660 extern u32 bgFuKaitenOverlayRelocations[8]; // D_80ACB674 @@ -12749,7 +12749,7 @@ extern UNK_TYPE4 D_80BD52FC; // D_80BD52FC extern OverlayRelocationSection bgIkanaBombwallOverlayInfo; // D_80BD5300 extern u32 bgIkanaBombwallOverlayRelocations[39]; // D_80BD5314 extern u32 bgIkanaBombwallOverlayInfoOffset; // D_80BD53BC -extern ActorInit bgIkanaRayInitData; // D_80BD55D0 +extern ActorInit Bg_Ikana_Ray_InitVars; // D_80BD55D0 extern ColCylinderInit bgIkanaRayCylinderInit; // D_80BD55F0 extern InitChainEntry bgIkanaRayCompInit[4]; // D_80BD561C extern OverlayRelocationSection bgIkanaRayOverlayInfo; // D_80BD5630 diff --git a/include/z64.h b/include/z64.h index cca7a08700..430e8d8724 100644 --- a/include/z64.h +++ b/include/z64.h @@ -992,8 +992,6 @@ typedef struct { /* 0x44 */ BgScenePolygonLists scenePolyLists; } StaticCollisionContext; // size = 0x50 -typedef struct ActorBgFuKaiten ActorBgFuKaiten; - typedef struct ActorBgMbarChair ActorBgMbarChair; typedef struct ActorEnBji01 ActorEnBji01; @@ -1671,20 +1669,13 @@ typedef struct { /* 0x244 */ Vec3f unk244; /* 0x250 */ f32 unk250; /* 0x254 */ f32 unk254; - /* 0x258 */ actor_func update; + /* 0x258 */ ActorFunc update; /* 0x25C */ s16 unk25C; /* 0x25E */ u16 unk25E; /* 0x260 */ u8 unk260; /* 0x261 */ UNK_TYPE1 pad261[0x3]; } ActorArrowFire; // size = 0x264 -typedef struct { - /* 0x000 */ Actor base; - /* 0x144 */ ColCylinder collision; - /* 0x190 */ AnimatedTexture* animatedTextures; - /* 0x194 */ actor_func update; -} ActorBgIkanaRay; // size = 0x198 - struct ActorBgMbarChair { /* 0x000 */ Actor base; /* 0x144 */ UNK_TYPE1 pad144[0x18]; @@ -1751,7 +1742,7 @@ typedef struct { /* 0x14A */ u16 unk14A; /* 0x14C */ u8 unk14C; /* 0x14D */ UNK_TYPE1 pad14D[0x3]; - /* 0x150 */ actor_func unk150; + /* 0x150 */ ActorFunc unk150; } ActorEnTest4; // size = 0x154 struct ActorObjBell { @@ -1765,22 +1756,12 @@ struct ActorObjBell { /* 0x214 */ s16 unk214; /* 0x216 */ UNK_TYPE1 pad216[0x12]; }; // size = 0x228 -struct ActorBgFuKaiten { - /* 0x000 */ DynaPolyActor bg; - /* 0x15C */ UNK_TYPE1 pad15C[0x4]; - /* 0x160 */ f32 elevation; - /* 0x164 */ f32 bouceHeight; - /* 0x168 */ s16 rotationSpeed; - /* 0x16A */ s16 bounceSpeed; - /* 0x16C */ s16 bounce; - /* 0x16E */ UNK_TYPE1 pad16E[0x2]; -}; // size = 0x170 struct ActorBgIknvObj { /* 0x000 */ DynaPolyActor bg; /* 0x15C */ ColCylinder collision; /* 0x1A8 */ u32 displayListAddr; - /* 0x1AC */ actor_func updateFunc; + /* 0x1AC */ ActorFunc updateFunc; }; // size = 0x1B0 typedef struct { diff --git a/include/z64actor.h b/include/z64actor.h index 7a330e0007..49e1a5949a 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -11,7 +11,7 @@ struct GlobalContext; struct LightMapper; struct BgPolygon; -typedef void(*actor_func)(struct Actor* this, struct GlobalContext* ctxt); +typedef void(*ActorFunc)(struct Actor* this, struct GlobalContext* ctxt); typedef struct { /* 0x00 */ Vec3f pos; @@ -61,14 +61,13 @@ typedef struct { typedef struct { /* 0x00 */ s16 id; /* 0x02 */ u8 type; - /* 0x03 */ u8 room; /* 0x04 */ u32 flags; /* 0x08 */ s16 objectId; /* 0x0C */ u32 instanceSize; - /* 0x10 */ actor_func init; - /* 0x14 */ actor_func destroy; - /* 0x18 */ actor_func update; - /* 0x1C */ actor_func draw; + /* 0x10 */ ActorFunc init; + /* 0x14 */ ActorFunc destroy; + /* 0x18 */ ActorFunc update; + /* 0x1C */ ActorFunc draw; } ActorInit; // size = 0x20 typedef struct { @@ -152,10 +151,10 @@ typedef struct Actor { /* 0x124 */ struct Actor* child; /* 0x128 */ struct Actor* prev; /* 0x12C */ struct Actor* next; - /* 0x130 */ actor_func init; - /* 0x134 */ actor_func destroy; - /* 0x138 */ actor_func update; - /* 0x13C */ actor_func draw; + /* 0x130 */ ActorFunc init; + /* 0x134 */ ActorFunc destroy; + /* 0x138 */ ActorFunc update; + /* 0x13C */ ActorFunc draw; /* 0x140 */ ActorOverlay* overlayEntry; } Actor; // size = 0x144 @@ -212,7 +211,7 @@ typedef struct { typedef struct { /* 0x000 */ Actor base; - /* 0x144 */ actor_func update; + /* 0x144 */ ActorFunc update; /* 0x148 */ s16 collectibleFlagId; /* 0x14A */ s16 unk14A; /* 0x14C */ s16 unk14C; @@ -226,11 +225,26 @@ typedef struct { typedef struct { /* 0x000 */ Actor base; - /* 0x144 */ actor_func update; + /* 0x144 */ ActorFunc update; /* 0x148 */ ColCylinder collision; /* 0x194 */ UNK_TYPE1 pad194[0x14]; } ActorEnAObj; // size = 0x1A8 +typedef enum { + /* 0x00 */ ACTORTYPE_SWITCH, + /* 0x01 */ ACTORTYPE_BG, + /* 0x02 */ ACTORTYPE_PLAYER, + /* 0x03 */ ACTORTYPE_EXPLOSIVES, + /* 0x04 */ ACTORTYPE_NPC, + /* 0x05 */ ACTORTYPE_ENEMY, + /* 0x06 */ ACTORTYPE_PROP, + /* 0x07 */ ACTORTYPE_ITEMACTION, + /* 0x08 */ ACTORTYPE_MISC, + /* 0x09 */ ACTORTYPE_BOSS, + /* 0x0A */ ACTORTYPE_DOOR, + /* 0x0B */ ACTORTYPE_CHEST +} ActorType; + typedef enum { /* 0x000 */ ACTOR_PLAYER, /* 0x001 */ ACTOR_EN_TEST, diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index 08aa91eb65..71d2f3496f 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -704,7 +704,7 @@ SECTIONS SegmentStart = .; ovl_En_Test : AT(RomLocation) { - build/asm/ovl_En_Test_0x80862B70.o(.text) + build/src/overlays/actors/ovl_En_Test/z_en_test.o(.text) build/asm/ovl_En_Test_data.o(.text) } SegmentEnd = .; @@ -714,7 +714,7 @@ SECTIONS SegmentStart = .; ovl_En_GirlA : AT(RomLocation) { - build/asm/ovl_En_GirlA_0x80863870.o(.text) + build/src/overlays/actors/ovl_En_GirlA/z_en_girla.o(.text) build/asm/ovl_En_GirlA_data.o(.text) } SegmentEnd = .; @@ -724,7 +724,7 @@ SECTIONS SegmentStart = .; ovl_En_Part : AT(RomLocation) { - build/asm/ovl_En_Part_0x80865370.o(.text) + build/src/overlays/actors/ovl_En_Part/z_en_part.o(.text) build/asm/ovl_En_Part_data.o(.text) } SegmentEnd = .; @@ -734,7 +734,7 @@ SECTIONS SegmentStart = .; ovl_En_Light : AT(RomLocation) { - build/asm/ovl_En_Light_0x80865990.o(.text) + build/src/overlays/actors/ovl_En_Light/z_en_light.o(.text) build/asm/ovl_En_Light_data.o(.text) } SegmentEnd = .; @@ -744,7 +744,7 @@ SECTIONS SegmentStart = .; ovl_En_Door : AT(RomLocation) { - build/asm/ovl_En_Door_0x80866800.o(.text) + build/src/overlays/actors/ovl_En_Door/z_en_door.o(.text) build/asm/ovl_En_Door_data.o(.text) ovl_En_Door_bss_start = .; } @@ -756,7 +756,7 @@ SECTIONS SegmentStart = .; ovl_En_Box : AT(RomLocation) { - build/asm/ovl_En_Box_0x80867BD0.o(.text) + build/src/overlays/actors/ovl_En_Box/z_en_box.o(.text) build/asm/ovl_En_Box_data.o(.text) } SegmentEnd = .; @@ -766,7 +766,7 @@ SECTIONS SegmentStart = .; ovl_En_Pametfrog : AT(RomLocation) { - build/asm/ovl_En_Pametfrog_0x80869D90.o(.text) + build/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.o(.text) build/asm/ovl_En_Pametfrog_data.o(.text) } SegmentEnd = .; @@ -776,7 +776,7 @@ SECTIONS SegmentStart = .; ovl_En_Okuta : AT(RomLocation) { - build/asm/ovl_En_Okuta_0x8086DE20.o(.text) + build/src/overlays/actors/ovl_En_Okuta/z_en_okuta.o(.text) build/asm/ovl_En_Okuta_data.o(.text) } SegmentEnd = .; @@ -786,7 +786,7 @@ SECTIONS SegmentStart = .; ovl_En_Bom : AT(RomLocation) { - build/asm/ovl_En_Bom_0x80870DB0.o(.text) + build/src/overlays/actors/ovl_En_Bom/z_en_bom.o(.text) build/asm/ovl_En_Bom_data.o(.text) ovl_En_Bom_bss_start = .; } @@ -798,7 +798,7 @@ SECTIONS SegmentStart = .; ovl_En_Wallmas : AT(RomLocation) { - build/asm/ovl_En_Wallmas_0x80874810.o(.text) + build/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.o(.text) build/asm/ovl_En_Wallmas_data.o(.text) } SegmentEnd = .; @@ -808,7 +808,7 @@ SECTIONS SegmentStart = .; ovl_En_Dodongo : AT(RomLocation) { - build/asm/ovl_En_Dodongo_0x80876670.o(.text) + build/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.o(.text) build/asm/ovl_En_Dodongo_data.o(.text) } SegmentEnd = .; @@ -818,7 +818,7 @@ SECTIONS SegmentStart = .; ovl_En_Firefly : AT(RomLocation) { - build/asm/ovl_En_Firefly_0x808796F0.o(.text) + build/src/overlays/actors/ovl_En_Firefly/z_en_firefly.o(.text) build/asm/ovl_En_Firefly_data.o(.text) } SegmentEnd = .; @@ -828,7 +828,7 @@ SECTIONS SegmentStart = .; ovl_En_Horse : AT(RomLocation) { - build/asm/ovl_En_Horse_0x8087B730.o(.text) + build/src/overlays/actors/ovl_En_Horse/z_en_horse.o(.text) build/asm/ovl_En_Horse_data.o(.text) } SegmentEnd = .; @@ -838,7 +838,7 @@ SECTIONS SegmentStart = .; ovl_En_Arrow : AT(RomLocation) { - build/asm/ovl_En_Arrow_0x8088A240.o(.text) + build/src/overlays/actors/ovl_En_Arrow/z_en_arrow.o(.text) build/asm/ovl_En_Arrow_data.o(.text) } SegmentEnd = .; @@ -848,7 +848,7 @@ SECTIONS SegmentStart = .; ovl_En_Elf : AT(RomLocation) { - build/asm/ovl_En_Elf_0x8088C510.o(.text) + build/src/overlays/actors/ovl_En_Elf/z_en_elf.o(.text) build/asm/ovl_En_Elf_data.o(.text) } SegmentEnd = .; @@ -858,7 +858,7 @@ SECTIONS SegmentStart = .; ovl_En_Niw : AT(RomLocation) { - build/asm/ovl_En_Niw_0x80891060.o(.text) + build/src/overlays/actors/ovl_En_Niw/z_en_niw.o(.text) build/asm/ovl_En_Niw_data.o(.text) } SegmentEnd = .; @@ -868,7 +868,7 @@ SECTIONS SegmentStart = .; ovl_En_Tite : AT(RomLocation) { - build/asm/ovl_En_Tite_0x808937F0.o(.text) + build/src/overlays/actors/ovl_En_Tite/z_en_tite.o(.text) build/asm/ovl_En_Tite_data.o(.text) } SegmentEnd = .; @@ -878,7 +878,7 @@ SECTIONS SegmentStart = .; ovl_En_Peehat : AT(RomLocation) { - build/asm/ovl_En_Peehat_0x80896F30.o(.text) + build/src/overlays/actors/ovl_En_Peehat/z_en_peehat.o(.text) build/asm/ovl_En_Peehat_data.o(.text) } SegmentEnd = .; @@ -888,7 +888,7 @@ SECTIONS SegmentStart = .; ovl_En_Holl : AT(RomLocation) { - build/asm/ovl_En_Holl_0x80899960.o(.text) + build/src/overlays/actors/ovl_En_Holl/z_en_holl.o(.text) build/asm/ovl_En_Holl_data.o(.text) } SegmentEnd = .; @@ -898,7 +898,7 @@ SECTIONS SegmentStart = .; ovl_En_Dinofos : AT(RomLocation) { - build/asm/ovl_En_Dinofos_0x8089A6E0.o(.text) + build/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.o(.text) build/asm/ovl_En_Dinofos_data.o(.text) } SegmentEnd = .; @@ -908,7 +908,7 @@ SECTIONS SegmentStart = .; ovl_En_Hata : AT(RomLocation) { - build/asm/ovl_En_Hata_0x8089E8E0.o(.text) + build/src/overlays/actors/ovl_En_Hata/z_en_hata.o(.text) build/asm/ovl_En_Hata_data.o(.text) } SegmentEnd = .; @@ -918,7 +918,7 @@ SECTIONS SegmentStart = .; ovl_En_Zl1 : AT(RomLocation) { - build/asm/ovl_En_Zl1_0x8089ED90.o(.text) + build/src/overlays/actors/ovl_En_Zl1/z_en_zl1.o(.text) build/asm/ovl_En_Zl1_data.o(.text) } SegmentEnd = .; @@ -928,7 +928,7 @@ SECTIONS SegmentStart = .; ovl_En_Viewer : AT(RomLocation) { - build/asm/ovl_En_Viewer_0x8089EE20.o(.text) + build/src/overlays/actors/ovl_En_Viewer/z_en_viewer.o(.text) build/asm/ovl_En_Viewer_data.o(.text) ovl_En_Viewer_bss_start = .; } @@ -940,7 +940,7 @@ SECTIONS SegmentStart = .; ovl_En_Bubble : AT(RomLocation) { - build/asm/ovl_En_Bubble_0x8089F4E0.o(.text) + build/src/overlays/actors/ovl_En_Bubble/z_en_bubble.o(.text) build/asm/ovl_En_Bubble_data.o(.text) } SegmentEnd = .; @@ -950,7 +950,7 @@ SECTIONS SegmentStart = .; ovl_Door_Shutter : AT(RomLocation) { - build/asm/ovl_Door_Shutter_0x808A08F0.o(.text) + build/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.o(.text) build/asm/ovl_Door_Shutter_data.o(.text) } SegmentEnd = .; @@ -960,7 +960,7 @@ SECTIONS SegmentStart = .; ovl_En_Boom : AT(RomLocation) { - build/asm/ovl_En_Boom_0x808A24D0.o(.text) + build/src/overlays/actors/ovl_En_Boom/z_en_boom.o(.text) build/asm/ovl_En_Boom_data.o(.text) } SegmentEnd = .; @@ -970,7 +970,7 @@ SECTIONS SegmentStart = .; ovl_En_Torch2 : AT(RomLocation) { - build/asm/ovl_En_Torch2_0x808A31B0.o(.text) + build/src/overlays/actors/ovl_En_Torch2/z_en_torch2.o(.text) build/asm/ovl_En_Torch2_data.o(.text) } SegmentEnd = .; @@ -980,7 +980,7 @@ SECTIONS SegmentStart = .; ovl_En_Minifrog : AT(RomLocation) { - build/asm/ovl_En_Minifrog_0x808A3670.o(.text) + build/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.o(.text) build/asm/ovl_En_Minifrog_data.o(.text) } SegmentEnd = .; @@ -990,7 +990,7 @@ SECTIONS SegmentStart = .; ovl_En_St : AT(RomLocation) { - build/asm/ovl_En_St_0x808A5050.o(.text) + build/src/overlays/actors/ovl_En_St/z_en_st.o(.text) build/asm/ovl_En_St_data.o(.text) } SegmentEnd = .; @@ -1000,7 +1000,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Wturn : AT(RomLocation) { - build/asm/ovl_Obj_Wturn_0x808A7930.o(.text) + build/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.o(.text) build/asm/ovl_Obj_Wturn_data.o(.text) } SegmentEnd = .; @@ -1010,7 +1010,7 @@ SECTIONS SegmentStart = .; ovl_En_River_Sound : AT(RomLocation) { - build/asm/ovl_En_River_Sound_0x808A7E30.o(.text) + build/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.o(.text) build/asm/ovl_En_River_Sound_data.o(.text) } SegmentEnd = .; @@ -1020,7 +1020,7 @@ SECTIONS SegmentStart = .; ovl_En_Ossan : AT(RomLocation) { - build/asm/ovl_En_Ossan_0x808A80A0.o(.text) + build/src/overlays/actors/ovl_En_Ossan/z_en_ossan.o(.text) build/asm/ovl_En_Ossan_data.o(.text) } SegmentEnd = .; @@ -1030,7 +1030,7 @@ SECTIONS SegmentStart = .; ovl_En_Famos : AT(RomLocation) { - build/asm/ovl_En_Famos_0x808AC920.o(.text) + build/src/overlays/actors/ovl_En_Famos/z_en_famos.o(.text) build/asm/ovl_En_Famos_data.o(.text) } SegmentEnd = .; @@ -1040,7 +1040,7 @@ SECTIONS SegmentStart = .; ovl_En_Bombf : AT(RomLocation) { - build/asm/ovl_En_Bombf_0x808AE8C0.o(.text) + build/src/overlays/actors/ovl_En_Bombf/z_en_bombf.o(.text) build/asm/ovl_En_Bombf_data.o(.text) } SegmentEnd = .; @@ -1050,7 +1050,7 @@ SECTIONS SegmentStart = .; ovl_En_Am : AT(RomLocation) { - build/asm/ovl_En_Am_0x808AFCD0.o(.text) + build/src/overlays/actors/ovl_En_Am/z_en_am.o(.text) build/asm/ovl_En_Am_data.o(.text) } SegmentEnd = .; @@ -1060,7 +1060,7 @@ SECTIONS SegmentStart = .; ovl_En_Dekubaba : AT(RomLocation) { - build/asm/ovl_En_Dekubaba_0x808B1330.o(.text) + build/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.o(.text) build/asm/ovl_En_Dekubaba_data.o(.text) } SegmentEnd = .; @@ -1070,7 +1070,7 @@ SECTIONS SegmentStart = .; ovl_En_M_Fire1 : AT(RomLocation) { - build/asm/ovl_En_M_Fire1_0x808B5230.o(.text) + build/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.o(.text) build/asm/ovl_En_M_Fire1_data.o(.text) } SegmentEnd = .; @@ -1080,7 +1080,7 @@ SECTIONS SegmentStart = .; ovl_En_M_Thunder : AT(RomLocation) { - build/asm/ovl_En_M_Thunder_0x808B53C0.o(.text) + build/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.o(.text) build/asm/ovl_En_M_Thunder_data.o(.text) } SegmentEnd = .; @@ -1090,7 +1090,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Breakwall : AT(RomLocation) { - build/asm/ovl_Bg_Breakwall_0x808B7360.o(.text) + build/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.o(.text) build/asm/ovl_Bg_Breakwall_data.o(.text) } SegmentEnd = .; @@ -1100,7 +1100,7 @@ SECTIONS SegmentStart = .; ovl_Door_Warp1 : AT(RomLocation) { - build/asm/ovl_Door_Warp1_0x808B8490.o(.text) + build/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.o(.text) build/asm/ovl_Door_Warp1_data.o(.text) ovl_Door_Warp1_bss_start = .; } @@ -1112,7 +1112,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Syokudai : AT(RomLocation) { - build/asm/ovl_Obj_Syokudai_0x808BC010.o(.text) + build/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.o(.text) build/asm/ovl_Obj_Syokudai_data.o(.text) ovl_Obj_Syokudai_bss_start = .; } @@ -1124,7 +1124,7 @@ SECTIONS SegmentStart = .; ovl_Item_B_Heart : AT(RomLocation) { - build/asm/ovl_Item_B_Heart_0x808BCDF0.o(.text) + build/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.o(.text) build/asm/ovl_Item_B_Heart_data.o(.text) } SegmentEnd = .; @@ -1134,7 +1134,7 @@ SECTIONS SegmentStart = .; ovl_En_Dekunuts : AT(RomLocation) { - build/asm/ovl_En_Dekunuts_0x808BD1E0.o(.text) + build/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.o(.text) build/asm/ovl_En_Dekunuts_data.o(.text) } SegmentEnd = .; @@ -1144,7 +1144,7 @@ SECTIONS SegmentStart = .; ovl_En_Bbfall : AT(RomLocation) { - build/asm/ovl_En_Bbfall_0x808BF220.o(.text) + build/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.o(.text) build/asm/ovl_En_Bbfall_data.o(.text) } SegmentEnd = .; @@ -1154,7 +1154,7 @@ SECTIONS SegmentStart = .; ovl_Arms_Hook : AT(RomLocation) { - build/asm/ovl_Arms_Hook_0x808C1030.o(.text) + build/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.o(.text) build/asm/ovl_Arms_Hook_data.o(.text) } SegmentEnd = .; @@ -1164,7 +1164,7 @@ SECTIONS SegmentStart = .; ovl_En_Bb : AT(RomLocation) { - build/asm/ovl_En_Bb_0x808C1D40.o(.text) + build/src/overlays/actors/ovl_En_Bb/z_en_bb.o(.text) build/asm/ovl_En_Bb_data.o(.text) } SegmentEnd = .; @@ -1174,7 +1174,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Keikoku_Spr : AT(RomLocation) { - build/asm/ovl_Bg_Keikoku_Spr_0x808C3A50.o(.text) + build/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.o(.text) build/asm/ovl_Bg_Keikoku_Spr_data.o(.text) } SegmentEnd = .; @@ -1184,7 +1184,7 @@ SECTIONS SegmentStart = .; ovl_En_Wood02 : AT(RomLocation) { - build/asm/ovl_En_Wood02_0x808C3C00.o(.text) + build/src/overlays/actors/ovl_En_Wood02/z_en_wood02.o(.text) build/asm/ovl_En_Wood02_data.o(.text) ovl_En_Wood02_bss_start = .; } @@ -1196,7 +1196,7 @@ SECTIONS SegmentStart = .; ovl_En_Death : AT(RomLocation) { - build/asm/ovl_En_Death_0x808C4F80.o(.text) + build/src/overlays/actors/ovl_En_Death/z_en_death.o(.text) build/asm/ovl_En_Death_data.o(.text) } SegmentEnd = .; @@ -1206,7 +1206,7 @@ SECTIONS SegmentStart = .; ovl_En_Minideath : AT(RomLocation) { - build/asm/ovl_En_Minideath_0x808CA0B0.o(.text) + build/src/overlays/actors/ovl_En_Minideath/z_en_minideath.o(.text) build/asm/ovl_En_Minideath_data.o(.text) ovl_En_Minideath_bss_start = .; } @@ -1218,7 +1218,7 @@ SECTIONS SegmentStart = .; ovl_En_Vm : AT(RomLocation) { - build/asm/ovl_En_Vm_0x808CC260.o(.text) + build/src/overlays/actors/ovl_En_Vm/z_en_vm.o(.text) build/asm/ovl_En_Vm_data.o(.text) } SegmentEnd = .; @@ -1228,7 +1228,7 @@ SECTIONS SegmentStart = .; ovl_Demo_Effect : AT(RomLocation) { - build/asm/ovl_Demo_Effect_0x808CD740.o(.text) + build/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.o(.text) build/asm/ovl_Demo_Effect_data.o(.text) } SegmentEnd = .; @@ -1238,7 +1238,7 @@ SECTIONS SegmentStart = .; ovl_Demo_Kankyo : AT(RomLocation) { - build/asm/ovl_Demo_Kankyo_0x808CE450.o(.text) + build/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.o(.text) build/asm/ovl_Demo_Kankyo_data.o(.text) } SegmentEnd = .; @@ -1248,7 +1248,7 @@ SECTIONS SegmentStart = .; ovl_En_Floormas : AT(RomLocation) { - build/asm/ovl_En_Floormas_0x808D0680.o(.text) + build/src/overlays/actors/ovl_En_Floormas/z_en_floormas.o(.text) build/asm/ovl_En_Floormas_data.o(.text) } SegmentEnd = .; @@ -1258,7 +1258,7 @@ SECTIONS SegmentStart = .; ovl_En_Rd : AT(RomLocation) { - build/asm/ovl_En_Rd_0x808D3E20.o(.text) + build/src/overlays/actors/ovl_En_Rd/z_en_rd.o(.text) build/asm/ovl_En_Rd_data.o(.text) } SegmentEnd = .; @@ -1268,7 +1268,7 @@ SECTIONS SegmentStart = .; ovl_Bg_F40_Flift : AT(RomLocation) { - build/asm/ovl_Bg_F40_Flift_0x808D7550.o(.text) + build/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.o(.text) build/asm/ovl_Bg_F40_Flift_data.o(.text) } SegmentEnd = .; @@ -1278,7 +1278,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Mure : AT(RomLocation) { - build/asm/ovl_Obj_Mure_0x808D78D0.o(.text) + build/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.o(.text) build/asm/ovl_Obj_Mure_data.o(.text) } SegmentEnd = .; @@ -1288,7 +1288,7 @@ SECTIONS SegmentStart = .; ovl_En_Sw : AT(RomLocation) { - build/asm/ovl_En_Sw_0x808D8940.o(.text) + build/src/overlays/actors/ovl_En_Sw/z_en_sw.o(.text) build/asm/ovl_En_Sw_data.o(.text) } SegmentEnd = .; @@ -1298,7 +1298,7 @@ SECTIONS SegmentStart = .; ovl_Object_Kankyo : AT(RomLocation) { - build/asm/ovl_Object_Kankyo_0x808DBE80.o(.text) + build/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.o(.text) build/asm/ovl_Object_Kankyo_data.o(.text) ovl_Object_Kankyo_bss_start = .; } @@ -1310,7 +1310,7 @@ SECTIONS SegmentStart = .; ovl_En_Horse_Link_Child : AT(RomLocation) { - build/asm/ovl_En_Horse_Link_Child_0x808DE5C0.o(.text) + build/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.o(.text) build/asm/ovl_En_Horse_Link_Child_data.o(.text) } SegmentEnd = .; @@ -1320,7 +1320,7 @@ SECTIONS SegmentStart = .; ovl_Door_Ana : AT(RomLocation) { - build/asm/ovl_Door_Ana_0x808E01A0.o(.text) + build/src/overlays/actors/ovl_Door_Ana/z_door_ana.o(.text) build/asm/ovl_Door_Ana_data.o(.text) } SegmentEnd = .; @@ -1330,7 +1330,7 @@ SECTIONS SegmentStart = .; ovl_En_Encount1 : AT(RomLocation) { - build/asm/ovl_En_Encount1_0x808E0830.o(.text) + build/src/overlays/actors/ovl_En_Encount1/z_en_encount1.o(.text) build/asm/ovl_En_Encount1_data.o(.text) } SegmentEnd = .; @@ -1340,7 +1340,7 @@ SECTIONS SegmentStart = .; ovl_Demo_Tre_Lgt : AT(RomLocation) { - build/asm/ovl_Demo_Tre_Lgt_0x808E0E40.o(.text) + build/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.o(.text) build/asm/ovl_Demo_Tre_Lgt_data.o(.text) } SegmentEnd = .; @@ -1350,7 +1350,7 @@ SECTIONS SegmentStart = .; ovl_En_Encount2 : AT(RomLocation) { - build/asm/ovl_En_Encount2_0x808E1560.o(.text) + build/src/overlays/actors/ovl_En_Encount2/z_en_encount2.o(.text) build/asm/ovl_En_Encount2_data.o(.text) } SegmentEnd = .; @@ -1360,7 +1360,7 @@ SECTIONS SegmentStart = .; ovl_En_Fire_Rock : AT(RomLocation) { - build/asm/ovl_En_Fire_Rock_0x808E1FE0.o(.text) + build/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.o(.text) build/asm/ovl_En_Fire_Rock_data.o(.text) } SegmentEnd = .; @@ -1370,7 +1370,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Ctower_Rot : AT(RomLocation) { - build/asm/ovl_Bg_Ctower_Rot_0x808E2070.o(.text) + build/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.o(.text) build/asm/ovl_Bg_Ctower_Rot_data.o(.text) } SegmentEnd = .; @@ -1380,7 +1380,7 @@ SECTIONS SegmentStart = .; ovl_Mir_Ray : AT(RomLocation) { - build/asm/ovl_Mir_Ray_0x808E2600.o(.text) + build/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.o(.text) build/asm/ovl_Mir_Ray_data.o(.text) } SegmentEnd = .; @@ -1390,7 +1390,7 @@ SECTIONS SegmentStart = .; ovl_En_Sb : AT(RomLocation) { - build/asm/ovl_En_Sb_0x808E3EF0.o(.text) + build/src/overlays/actors/ovl_En_Sb/z_en_sb.o(.text) build/asm/ovl_En_Sb_data.o(.text) } SegmentEnd = .; @@ -1400,7 +1400,7 @@ SECTIONS SegmentStart = .; ovl_En_Bigslime : AT(RomLocation) { - build/asm/ovl_En_Bigslime_0x808E4FC0.o(.text) + build/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.o(.text) build/asm/ovl_En_Bigslime_data.o(.text) } SegmentEnd = .; @@ -1410,7 +1410,7 @@ SECTIONS SegmentStart = .; ovl_En_Karebaba : AT(RomLocation) { - build/asm/ovl_En_Karebaba_0x808F1200.o(.text) + build/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.o(.text) build/asm/ovl_En_Karebaba_data.o(.text) } SegmentEnd = .; @@ -1420,7 +1420,7 @@ SECTIONS SegmentStart = .; ovl_En_In : AT(RomLocation) { - build/asm/ovl_En_In_0x808F30B0.o(.text) + build/src/overlays/actors/ovl_En_In/z_en_in.o(.text) build/asm/ovl_En_In_data.o(.text) } SegmentEnd = .; @@ -1430,7 +1430,7 @@ SECTIONS SegmentStart = .; ovl_En_Bom_Chu : AT(RomLocation) { - build/asm/ovl_En_Bom_Chu_0x808F74B0.o(.text) + build/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.o(.text) build/asm/ovl_En_Bom_Chu_data.o(.text) } SegmentEnd = .; @@ -1440,7 +1440,7 @@ SECTIONS SegmentStart = .; ovl_En_Horse_Game_Check : AT(RomLocation) { - build/asm/ovl_En_Horse_Game_Check_0x808F8AA0.o(.text) + build/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.o(.text) build/asm/ovl_En_Horse_Game_Check_data.o(.text) } SegmentEnd = .; @@ -1450,7 +1450,7 @@ SECTIONS SegmentStart = .; ovl_En_Rr : AT(RomLocation) { - build/asm/ovl_En_Rr_0x808F9E00.o(.text) + build/src/overlays/actors/ovl_En_Rr/z_en_rr.o(.text) build/asm/ovl_En_Rr_data.o(.text) } SegmentEnd = .; @@ -1460,7 +1460,7 @@ SECTIONS SegmentStart = .; ovl_En_Fr : AT(RomLocation) { - build/asm/ovl_En_Fr_0x808FC550.o(.text) + build/src/overlays/actors/ovl_En_Fr/z_en_fr.o(.text) build/asm/ovl_En_Fr_data.o(.text) } SegmentEnd = .; @@ -1482,7 +1482,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Oshihiki : AT(RomLocation) { - build/asm/ovl_Obj_Oshihiki_0x80917290.o(.text) + build/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.o(.text) build/asm/ovl_Obj_Oshihiki_data.o(.text) } SegmentEnd = .; @@ -1492,7 +1492,7 @@ SECTIONS SegmentStart = .; ovl_Eff_Dust : AT(RomLocation) { - build/asm/ovl_Eff_Dust_0x80918B40.o(.text) + build/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.o(.text) build/asm/ovl_Eff_Dust_data.o(.text) } SegmentEnd = .; @@ -1502,7 +1502,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Umajump : AT(RomLocation) { - build/asm/ovl_Bg_Umajump_0x80919F30.o(.text) + build/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.o(.text) build/asm/ovl_Bg_Umajump_data.o(.text) } SegmentEnd = .; @@ -1512,7 +1512,7 @@ SECTIONS SegmentStart = .; ovl_En_Insect : AT(RomLocation) { - build/asm/ovl_En_Insect_0x8091A8A0.o(.text) + build/src/overlays/actors/ovl_En_Insect/z_en_insect.o(.text) build/asm/ovl_En_Insect_data.o(.text) } SegmentEnd = .; @@ -1522,7 +1522,7 @@ SECTIONS SegmentStart = .; ovl_En_Butte : AT(RomLocation) { - build/asm/ovl_En_Butte_0x8091C0A0.o(.text) + build/src/overlays/actors/ovl_En_Butte/z_en_butte.o(.text) build/asm/ovl_En_Butte_data.o(.text) } SegmentEnd = .; @@ -1532,7 +1532,7 @@ SECTIONS SegmentStart = .; ovl_En_Fish : AT(RomLocation) { - build/asm/ovl_En_Fish_0x8091D630.o(.text) + build/src/overlays/actors/ovl_En_Fish/z_en_fish.o(.text) build/asm/ovl_En_Fish_data.o(.text) } SegmentEnd = .; @@ -1542,7 +1542,7 @@ SECTIONS SegmentStart = .; ovl_Item_Etcetera : AT(RomLocation) { - build/asm/ovl_Item_Etcetera_0x8091FEF0.o(.text) + build/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.o(.text) build/asm/ovl_Item_Etcetera_data.o(.text) } SegmentEnd = .; @@ -1552,7 +1552,7 @@ SECTIONS SegmentStart = .; ovl_Arrow_Fire : AT(RomLocation) { - build/asm/ovl_Arrow_Fire_0x80920340.o(.text) + build/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.o(.text) build/asm/ovl_Arrow_Fire_data.o(.text) ovl_Arrow_Fire_bss_start = .; } @@ -1564,7 +1564,7 @@ SECTIONS SegmentStart = .; ovl_Arrow_Ice : AT(RomLocation) { - build/asm/ovl_Arrow_Ice_0x80922430.o(.text) + build/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.o(.text) build/asm/ovl_Arrow_Ice_data.o(.text) ovl_Arrow_Ice_bss_start = .; } @@ -1576,7 +1576,7 @@ SECTIONS SegmentStart = .; ovl_Arrow_Light : AT(RomLocation) { - build/asm/ovl_Arrow_Light_0x80924300.o(.text) + build/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.o(.text) build/asm/ovl_Arrow_Light_data.o(.text) ovl_Arrow_Light_bss_start = .; } @@ -1588,7 +1588,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Kibako : AT(RomLocation) { - build/asm/ovl_Obj_Kibako_0x809261B0.o(.text) + build/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.o(.text) build/asm/ovl_Obj_Kibako_data.o(.text) } SegmentEnd = .; @@ -1598,7 +1598,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Tsubo : AT(RomLocation) { - build/asm/ovl_Obj_Tsubo_0x809275C0.o(.text) + build/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.o(.text) build/asm/ovl_Obj_Tsubo_data.o(.text) } SegmentEnd = .; @@ -1608,7 +1608,7 @@ SECTIONS SegmentStart = .; ovl_En_Ik : AT(RomLocation) { - build/asm/ovl_En_Ik_0x80929910.o(.text) + build/src/overlays/actors/ovl_En_Ik/z_en_ik.o(.text) build/asm/ovl_En_Ik_data.o(.text) } SegmentEnd = .; @@ -1618,7 +1618,7 @@ SECTIONS SegmentStart = .; ovl_Demo_Shd : AT(RomLocation) { - build/asm/ovl_Demo_Shd_0x8092C530.o(.text) + build/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.o(.text) build/asm/ovl_Demo_Shd_data.o(.text) } SegmentEnd = .; @@ -1628,7 +1628,7 @@ SECTIONS SegmentStart = .; ovl_En_Dns : AT(RomLocation) { - build/asm/ovl_En_Dns_0x8092C5C0.o(.text) + build/src/overlays/actors/ovl_En_Dns/z_en_dns.o(.text) build/asm/ovl_En_Dns_data.o(.text) } SegmentEnd = .; @@ -1638,7 +1638,7 @@ SECTIONS SegmentStart = .; ovl_Elf_Msg : AT(RomLocation) { - build/asm/ovl_Elf_Msg_0x8092DF90.o(.text) + build/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.o(.text) build/asm/ovl_Elf_Msg_data.o(.text) } SegmentEnd = .; @@ -1648,7 +1648,7 @@ SECTIONS SegmentStart = .; ovl_En_Honotrap : AT(RomLocation) { - build/asm/ovl_En_Honotrap_0x8092E510.o(.text) + build/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.o(.text) build/asm/ovl_En_Honotrap_data.o(.text) } SegmentEnd = .; @@ -1658,7 +1658,7 @@ SECTIONS SegmentStart = .; ovl_En_Tubo_Trap : AT(RomLocation) { - build/asm/ovl_En_Tubo_Trap_0x809307E0.o(.text) + build/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.o(.text) build/asm/ovl_En_Tubo_Trap_data.o(.text) } SegmentEnd = .; @@ -1668,7 +1668,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Ice_Poly : AT(RomLocation) { - build/asm/ovl_Obj_Ice_Poly_0x80931560.o(.text) + build/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.o(.text) build/asm/ovl_Obj_Ice_Poly_data.o(.text) } SegmentEnd = .; @@ -1678,7 +1678,7 @@ SECTIONS SegmentStart = .; ovl_En_Fz : AT(RomLocation) { - build/asm/ovl_En_Fz_0x80932490.o(.text) + build/src/overlays/actors/ovl_En_Fz/z_en_fz.o(.text) build/asm/ovl_En_Fz_data.o(.text) } SegmentEnd = .; @@ -1688,7 +1688,7 @@ SECTIONS SegmentStart = .; ovl_En_Kusa : AT(RomLocation) { - build/asm/ovl_En_Kusa_0x809349E0.o(.text) + build/src/overlays/actors/ovl_En_Kusa/z_en_kusa.o(.text) build/asm/ovl_En_Kusa_data.o(.text) ovl_En_Kusa_bss_start = .; } @@ -1700,7 +1700,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Bean : AT(RomLocation) { - build/asm/ovl_Obj_Bean_0x80936CF0.o(.text) + build/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.o(.text) build/asm/ovl_Obj_Bean_data.o(.text) } SegmentEnd = .; @@ -1710,7 +1710,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Bombiwa : AT(RomLocation) { - build/asm/ovl_Obj_Bombiwa_0x809393B0.o(.text) + build/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.o(.text) build/asm/ovl_Obj_Bombiwa_data.o(.text) } SegmentEnd = .; @@ -1720,7 +1720,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Switch : AT(RomLocation) { - build/asm/ovl_Obj_Switch_0x8093ABD0.o(.text) + build/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.o(.text) build/asm/ovl_Obj_Switch_data.o(.text) ovl_Obj_Switch_bss_start = .; } @@ -1732,7 +1732,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Lift : AT(RomLocation) { - build/asm/ovl_Obj_Lift_0x8093D3C0.o(.text) + build/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.o(.text) build/asm/ovl_Obj_Lift_data.o(.text) } SegmentEnd = .; @@ -1742,7 +1742,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Hsblock : AT(RomLocation) { - build/asm/ovl_Obj_Hsblock_0x8093DEA0.o(.text) + build/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.o(.text) build/asm/ovl_Obj_Hsblock_data.o(.text) } SegmentEnd = .; @@ -1752,7 +1752,7 @@ SECTIONS SegmentStart = .; ovl_En_Okarina_Tag : AT(RomLocation) { - build/asm/ovl_En_Okarina_Tag_0x8093E420.o(.text) + build/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.o(.text) build/asm/ovl_En_Okarina_Tag_data.o(.text) } SegmentEnd = .; @@ -1762,7 +1762,7 @@ SECTIONS SegmentStart = .; ovl_En_Goroiwa : AT(RomLocation) { - build/asm/ovl_En_Goroiwa_0x8093E8A0.o(.text) + build/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.o(.text) build/asm/ovl_En_Goroiwa_data.o(.text) } SegmentEnd = .; @@ -1772,7 +1772,7 @@ SECTIONS SegmentStart = .; ovl_En_Daiku : AT(RomLocation) { - build/asm/ovl_En_Daiku_0x809434B0.o(.text) + build/src/overlays/actors/ovl_En_Daiku/z_en_daiku.o(.text) build/asm/ovl_En_Daiku_data.o(.text) } SegmentEnd = .; @@ -1782,7 +1782,7 @@ SECTIONS SegmentStart = .; ovl_En_Nwc : AT(RomLocation) { - build/asm/ovl_En_Nwc_0x809441E0.o(.text) + build/src/overlays/actors/ovl_En_Nwc/z_en_nwc.o(.text) build/asm/ovl_En_Nwc_data.o(.text) } SegmentEnd = .; @@ -1792,7 +1792,7 @@ SECTIONS SegmentStart = .; ovl_Item_Inbox : AT(RomLocation) { - build/asm/ovl_Item_Inbox_0x809454F0.o(.text) + build/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.o(.text) build/asm/ovl_Item_Inbox_data.o(.text) } SegmentEnd = .; @@ -1802,7 +1802,7 @@ SECTIONS SegmentStart = .; ovl_En_Ge1 : AT(RomLocation) { - build/asm/ovl_En_Ge1_0x80945650.o(.text) + build/src/overlays/actors/ovl_En_Ge1/z_en_ge1.o(.text) build/asm/ovl_En_Ge1_data.o(.text) } SegmentEnd = .; @@ -1812,7 +1812,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Blockstop : AT(RomLocation) { - build/asm/ovl_Obj_Blockstop_0x809466A0.o(.text) + build/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.o(.text) build/asm/ovl_Obj_Blockstop_data.o(.text) } SegmentEnd = .; @@ -1822,7 +1822,7 @@ SECTIONS SegmentStart = .; ovl_En_Sda : AT(RomLocation) { - build/asm/ovl_En_Sda_0x809468D0.o(.text) + build/src/overlays/actors/ovl_En_Sda/z_en_sda.o(.text) build/asm/ovl_En_Sda_data.o(.text) ovl_En_Sda_bss_start = .; } @@ -1834,7 +1834,7 @@ SECTIONS SegmentStart = .; ovl_En_Clear_Tag : AT(RomLocation) { - build/asm/ovl_En_Clear_Tag_0x80947F60.o(.text) + build/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.o(.text) build/asm/ovl_En_Clear_Tag_data.o(.text) } SegmentEnd = .; @@ -1844,7 +1844,7 @@ SECTIONS SegmentStart = .; ovl_En_Gm : AT(RomLocation) { - build/asm/ovl_En_Gm_0x8094DEE0.o(.text) + build/src/overlays/actors/ovl_En_Gm/z_en_gm.o(.text) build/asm/ovl_En_Gm_data.o(.text) } SegmentEnd = .; @@ -1854,7 +1854,7 @@ SECTIONS SegmentStart = .; ovl_En_Ms : AT(RomLocation) { - build/asm/ovl_En_Ms_0x80952620.o(.text) + build/src/overlays/actors/ovl_En_Ms/z_en_ms.o(.text) build/asm/ovl_En_Ms_data.o(.text) } SegmentEnd = .; @@ -1864,7 +1864,7 @@ SECTIONS SegmentStart = .; ovl_En_Hs : AT(RomLocation) { - build/asm/ovl_En_Hs_0x80952C50.o(.text) + build/src/overlays/actors/ovl_En_Hs/z_en_hs.o(.text) build/asm/ovl_En_Hs_data.o(.text) } SegmentEnd = .; @@ -1874,7 +1874,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Ingate : AT(RomLocation) { - build/asm/ovl_Bg_Ingate_0x80953A90.o(.text) + build/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.o(.text) build/asm/ovl_Bg_Ingate_data.o(.text) } SegmentEnd = .; @@ -1884,7 +1884,7 @@ SECTIONS SegmentStart = .; ovl_En_Kanban : AT(RomLocation) { - build/asm/ovl_En_Kanban_0x80954960.o(.text) + build/src/overlays/actors/ovl_En_Kanban/z_en_kanban.o(.text) build/asm/ovl_En_Kanban_data.o(.text) } SegmentEnd = .; @@ -1894,7 +1894,7 @@ SECTIONS SegmentStart = .; ovl_En_Attack_Niw : AT(RomLocation) { - build/asm/ovl_En_Attack_Niw_0x809580C0.o(.text) + build/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.o(.text) build/asm/ovl_En_Attack_Niw_data.o(.text) } SegmentEnd = .; @@ -1904,7 +1904,7 @@ SECTIONS SegmentStart = .; ovl_En_Mk : AT(RomLocation) { - build/asm/ovl_En_Mk_0x809592E0.o(.text) + build/src/overlays/actors/ovl_En_Mk/z_en_mk.o(.text) build/asm/ovl_En_Mk_data.o(.text) } SegmentEnd = .; @@ -1914,7 +1914,7 @@ SECTIONS SegmentStart = .; ovl_En_Owl : AT(RomLocation) { - build/asm/ovl_En_Owl_0x8095A510.o(.text) + build/src/overlays/actors/ovl_En_Owl/z_en_owl.o(.text) build/asm/ovl_En_Owl_data.o(.text) } SegmentEnd = .; @@ -1924,7 +1924,7 @@ SECTIONS SegmentStart = .; ovl_En_Ishi : AT(RomLocation) { - build/asm/ovl_En_Ishi_0x8095D6E0.o(.text) + build/src/overlays/actors/ovl_En_Ishi/z_en_ishi.o(.text) build/asm/ovl_En_Ishi_data.o(.text) } SegmentEnd = .; @@ -1934,7 +1934,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Hana : AT(RomLocation) { - build/asm/ovl_Obj_Hana_0x8095FB10.o(.text) + build/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.o(.text) build/asm/ovl_Obj_Hana_data.o(.text) } SegmentEnd = .; @@ -1944,7 +1944,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Lightswitch : AT(RomLocation) { - build/asm/ovl_Obj_Lightswitch_0x8095FBF0.o(.text) + build/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.o(.text) build/asm/ovl_Obj_Lightswitch_data.o(.text) } SegmentEnd = .; @@ -1954,7 +1954,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Mure2 : AT(RomLocation) { - build/asm/ovl_Obj_Mure2_0x80960CF0.o(.text) + build/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.o(.text) build/asm/ovl_Obj_Mure2_data.o(.text) } SegmentEnd = .; @@ -1964,7 +1964,7 @@ SECTIONS SegmentStart = .; ovl_En_Fu : AT(RomLocation) { - build/asm/ovl_En_Fu_0x809616E0.o(.text) + build/src/overlays/actors/ovl_En_Fu/z_en_fu.o(.text) build/asm/ovl_En_Fu_data.o(.text) } SegmentEnd = .; @@ -1974,7 +1974,7 @@ SECTIONS SegmentStart = .; ovl_En_Stream : AT(RomLocation) { - build/asm/ovl_En_Stream_0x80965650.o(.text) + build/src/overlays/actors/ovl_En_Stream/z_en_stream.o(.text) build/asm/ovl_En_Stream_data.o(.text) } SegmentEnd = .; @@ -1984,7 +1984,7 @@ SECTIONS SegmentStart = .; ovl_En_Mm : AT(RomLocation) { - build/asm/ovl_En_Mm_0x80965BB0.o(.text) + build/src/overlays/actors/ovl_En_Mm/z_en_mm.o(.text) build/asm/ovl_En_Mm_data.o(.text) } SegmentEnd = .; @@ -1994,7 +1994,7 @@ SECTIONS SegmentStart = .; ovl_En_Weather_Tag : AT(RomLocation) { - build/asm/ovl_En_Weather_Tag_0x80966410.o(.text) + build/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.o(.text) build/asm/ovl_En_Weather_Tag_data.o(.text) } SegmentEnd = .; @@ -2004,7 +2004,7 @@ SECTIONS SegmentStart = .; ovl_En_Ani : AT(RomLocation) { - build/asm/ovl_En_Ani_0x809679D0.o(.text) + build/src/overlays/actors/ovl_En_Ani/z_en_ani.o(.text) build/asm/ovl_En_Ani_data.o(.text) } SegmentEnd = .; @@ -2014,7 +2014,7 @@ SECTIONS SegmentStart = .; ovl_En_Js : AT(RomLocation) { - build/asm/ovl_En_Js_0x809687B0.o(.text) + build/src/overlays/actors/ovl_En_Js/z_en_js.o(.text) build/asm/ovl_En_Js_data.o(.text) } SegmentEnd = .; @@ -2024,7 +2024,7 @@ SECTIONS SegmentStart = .; ovl_En_Okarina_Effect : AT(RomLocation) { - build/asm/ovl_En_Okarina_Effect_0x8096B0A0.o(.text) + build/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.o(.text) build/asm/ovl_En_Okarina_Effect_data.o(.text) } SegmentEnd = .; @@ -2034,7 +2034,7 @@ SECTIONS SegmentStart = .; ovl_En_Mag : AT(RomLocation) { - build/asm/ovl_En_Mag_0x8096B310.o(.text) + build/src/overlays/actors/ovl_En_Mag/z_en_mag.o(.text) build/asm/ovl_En_Mag_data.o(.text) } SegmentEnd = .; @@ -2044,7 +2044,7 @@ SECTIONS SegmentStart = .; ovl_Elf_Msg2 : AT(RomLocation) { - build/asm/ovl_Elf_Msg2_0x8096EC40.o(.text) + build/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.o(.text) build/asm/ovl_Elf_Msg2_data.o(.text) } SegmentEnd = .; @@ -2054,7 +2054,7 @@ SECTIONS SegmentStart = .; ovl_Bg_F40_Swlift : AT(RomLocation) { - build/asm/ovl_Bg_F40_Swlift_0x8096F160.o(.text) + build/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.o(.text) build/asm/ovl_Bg_F40_Swlift_data.o(.text) ovl_Bg_F40_Swlift_bss_start = .; } @@ -2066,7 +2066,7 @@ SECTIONS SegmentStart = .; ovl_En_Kakasi : AT(RomLocation) { - build/asm/ovl_En_Kakasi_0x8096F5E0.o(.text) + build/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.o(.text) build/asm/ovl_En_Kakasi_data.o(.text) } SegmentEnd = .; @@ -2076,7 +2076,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Makeoshihiki : AT(RomLocation) { - build/asm/ovl_Obj_Makeoshihiki_0x80972350.o(.text) + build/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.o(.text) build/asm/ovl_Obj_Makeoshihiki_data.o(.text) } SegmentEnd = .; @@ -2086,7 +2086,7 @@ SECTIONS SegmentStart = .; ovl_Oceff_Spot : AT(RomLocation) { - build/asm/ovl_Oceff_Spot_0x80972680.o(.text) + build/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.o(.text) build/asm/ovl_Oceff_Spot_data.o(.text) } SegmentEnd = .; @@ -2096,7 +2096,7 @@ SECTIONS SegmentStart = .; ovl_En_Torch : AT(RomLocation) { - build/asm/ovl_En_Torch_0x80973550.o(.text) + build/src/overlays/actors/ovl_En_Torch/z_en_torch.o(.text) build/asm/ovl_En_Torch_data.o(.text) } SegmentEnd = .; @@ -2106,7 +2106,7 @@ SECTIONS SegmentStart = .; ovl_Shot_Sun : AT(RomLocation) { - build/asm/ovl_Shot_Sun_0x80973640.o(.text) + build/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.o(.text) build/asm/ovl_Shot_Sun_data.o(.text) } SegmentEnd = .; @@ -2116,7 +2116,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Roomtimer : AT(RomLocation) { - build/asm/ovl_Obj_Roomtimer_0x80973C50.o(.text) + build/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.o(.text) build/asm/ovl_Obj_Roomtimer_data.o(.text) } SegmentEnd = .; @@ -2126,7 +2126,7 @@ SECTIONS SegmentStart = .; ovl_En_Ssh : AT(RomLocation) { - build/asm/ovl_En_Ssh_0x80973EF0.o(.text) + build/src/overlays/actors/ovl_En_Ssh/z_en_ssh.o(.text) build/asm/ovl_En_Ssh_data.o(.text) } SegmentEnd = .; @@ -2136,7 +2136,7 @@ SECTIONS SegmentStart = .; ovl_Oceff_Wipe : AT(RomLocation) { - build/asm/ovl_Oceff_Wipe_0x809764B0.o(.text) + build/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.o(.text) build/asm/ovl_Oceff_Wipe_data.o(.text) ovl_Oceff_Wipe_bss_start = .; } @@ -2438,7 +2438,7 @@ SECTIONS SegmentStart = .; ovl_Oceff_Storm : AT(RomLocation) { - build/asm/ovl_Oceff_Storm_0x80981760.o(.text) + build/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.o(.text) build/asm/ovl_Oceff_Storm_data.o(.text) } SegmentEnd = .; @@ -2448,7 +2448,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Demo : AT(RomLocation) { - build/asm/ovl_Obj_Demo_0x80983520.o(.text) + build/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.o(.text) build/asm/ovl_Obj_Demo_data.o(.text) } SegmentEnd = .; @@ -2458,7 +2458,7 @@ SECTIONS SegmentStart = .; ovl_En_Minislime : AT(RomLocation) { - build/asm/ovl_En_Minislime_0x809838F0.o(.text) + build/src/overlays/actors/ovl_En_Minislime/z_en_minislime.o(.text) build/asm/ovl_En_Minislime_data.o(.text) } SegmentEnd = .; @@ -2468,7 +2468,7 @@ SECTIONS SegmentStart = .; ovl_En_Nutsball : AT(RomLocation) { - build/asm/ovl_En_Nutsball_0x80985C40.o(.text) + build/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.o(.text) build/asm/ovl_En_Nutsball_data.o(.text) } SegmentEnd = .; @@ -2478,7 +2478,7 @@ SECTIONS SegmentStart = .; ovl_Oceff_Wipe2 : AT(RomLocation) { - build/asm/ovl_Oceff_Wipe2_0x80986270.o(.text) + build/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.o(.text) build/asm/ovl_Oceff_Wipe2_data.o(.text) ovl_Oceff_Wipe2_bss_start = .; } @@ -2490,7 +2490,7 @@ SECTIONS SegmentStart = .; ovl_Oceff_Wipe3 : AT(RomLocation) { - build/asm/ovl_Oceff_Wipe3_0x809879E0.o(.text) + build/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.o(.text) build/asm/ovl_Oceff_Wipe3_data.o(.text) ovl_Oceff_Wipe3_bss_start = .; } @@ -2502,7 +2502,7 @@ SECTIONS SegmentStart = .; ovl_En_Dg : AT(RomLocation) { - build/asm/ovl_En_Dg_0x80989140.o(.text) + build/src/overlays/actors/ovl_En_Dg/z_en_dg.o(.text) build/asm/ovl_En_Dg_data.o(.text) } SegmentEnd = .; @@ -2512,7 +2512,7 @@ SECTIONS SegmentStart = .; ovl_En_Si : AT(RomLocation) { - build/asm/ovl_En_Si_0x8098CA20.o(.text) + build/src/overlays/actors/ovl_En_Si/z_en_si.o(.text) build/asm/ovl_En_Si_data.o(.text) } SegmentEnd = .; @@ -2522,7 +2522,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Comb : AT(RomLocation) { - build/asm/ovl_Obj_Comb_0x8098CE40.o(.text) + build/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.o(.text) build/asm/ovl_Obj_Comb_data.o(.text) } SegmentEnd = .; @@ -2532,7 +2532,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Kibako2 : AT(RomLocation) { - build/asm/ovl_Obj_Kibako2_0x8098E5C0.o(.text) + build/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.o(.text) build/asm/ovl_Obj_Kibako2_data.o(.text) } SegmentEnd = .; @@ -2542,7 +2542,7 @@ SECTIONS SegmentStart = .; ovl_En_Hs2 : AT(RomLocation) { - build/asm/ovl_En_Hs2_0x8098EF60.o(.text) + build/src/overlays/actors/ovl_En_Hs2/z_en_hs2.o(.text) build/asm/ovl_En_Hs2_data.o(.text) } SegmentEnd = .; @@ -2552,7 +2552,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Mure3 : AT(RomLocation) { - build/asm/ovl_Obj_Mure3_0x8098F040.o(.text) + build/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.o(.text) build/asm/ovl_Obj_Mure3_data.o(.text) } SegmentEnd = .; @@ -2562,7 +2562,7 @@ SECTIONS SegmentStart = .; ovl_En_Tg : AT(RomLocation) { - build/asm/ovl_En_Tg_0x8098F800.o(.text) + build/src/overlays/actors/ovl_En_Tg/z_en_tg.o(.text) build/asm/ovl_En_Tg_data.o(.text) } SegmentEnd = .; @@ -2572,7 +2572,7 @@ SECTIONS SegmentStart = .; ovl_En_Wf : AT(RomLocation) { - build/asm/ovl_En_Wf_0x80990310.o(.text) + build/src/overlays/actors/ovl_En_Wf/z_en_wf.o(.text) build/asm/ovl_En_Wf_data.o(.text) } SegmentEnd = .; @@ -2582,7 +2582,7 @@ SECTIONS SegmentStart = .; ovl_En_Skb : AT(RomLocation) { - build/asm/ovl_En_Skb_0x809947B0.o(.text) + build/src/overlays/actors/ovl_En_Skb/z_en_skb.o(.text) build/asm/ovl_En_Skb_data.o(.text) } SegmentEnd = .; @@ -2592,7 +2592,7 @@ SECTIONS SegmentStart = .; ovl_En_Gs : AT(RomLocation) { - build/asm/ovl_En_Gs_0x80997A90.o(.text) + build/src/overlays/actors/ovl_En_Gs/z_en_gs.o(.text) build/asm/ovl_En_Gs_data.o(.text) } SegmentEnd = .; @@ -2602,7 +2602,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Sound : AT(RomLocation) { - build/asm/ovl_Obj_Sound_0x8099A920.o(.text) + build/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.o(.text) build/asm/ovl_Obj_Sound_data.o(.text) } SegmentEnd = .; @@ -2612,7 +2612,7 @@ SECTIONS SegmentStart = .; ovl_En_Crow : AT(RomLocation) { - build/asm/ovl_En_Crow_0x8099AB30.o(.text) + build/src/overlays/actors/ovl_En_Crow/z_en_crow.o(.text) build/asm/ovl_En_Crow_data.o(.text) } SegmentEnd = .; @@ -2622,7 +2622,7 @@ SECTIONS SegmentStart = .; ovl_En_Cow : AT(RomLocation) { - build/asm/ovl_En_Cow_0x8099C290.o(.text) + build/src/overlays/actors/ovl_En_Cow/z_en_cow.o(.text) build/asm/ovl_En_Cow_data.o(.text) } SegmentEnd = .; @@ -2632,7 +2632,7 @@ SECTIONS SegmentStart = .; ovl_Oceff_Wipe4 : AT(RomLocation) { - build/asm/ovl_Oceff_Wipe4_0x8099D780.o(.text) + build/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.o(.text) build/asm/ovl_Oceff_Wipe4_data.o(.text) ovl_Oceff_Wipe4_bss_start = .; } @@ -2644,7 +2644,7 @@ SECTIONS SegmentStart = .; ovl_En_Zo : AT(RomLocation) { - build/asm/ovl_En_Zo_0x8099E790.o(.text) + build/src/overlays/actors/ovl_En_Zo/z_en_zo.o(.text) build/asm/ovl_En_Zo_data.o(.text) } SegmentEnd = .; @@ -2664,7 +2664,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Makekinsuta : AT(RomLocation) { - build/asm/ovl_Obj_Makekinsuta_0x8099FA40.o(.text) + build/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.o(.text) build/asm/ovl_Obj_Makekinsuta_data.o(.text) } SegmentEnd = .; @@ -2674,7 +2674,7 @@ SECTIONS SegmentStart = .; ovl_En_Ge3 : AT(RomLocation) { - build/asm/ovl_En_Ge3_0x8099FEB0.o(.text) + build/src/overlays/actors/ovl_En_Ge3/z_en_ge3.o(.text) build/asm/ovl_En_Ge3_data.o(.text) } SegmentEnd = .; @@ -2684,7 +2684,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Hamishi : AT(RomLocation) { - build/asm/ovl_Obj_Hamishi_0x809A0F20.o(.text) + build/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.o(.text) build/asm/ovl_Obj_Hamishi_data.o(.text) } SegmentEnd = .; @@ -2694,7 +2694,7 @@ SECTIONS SegmentStart = .; ovl_En_Zl4 : AT(RomLocation) { - build/asm/ovl_En_Zl4_0x809A1BB0.o(.text) + build/src/overlays/actors/ovl_En_Zl4/z_en_zl4.o(.text) build/asm/ovl_En_Zl4_data.o(.text) } SegmentEnd = .; @@ -2704,7 +2704,7 @@ SECTIONS SegmentStart = .; ovl_En_Mm2 : AT(RomLocation) { - build/asm/ovl_En_Mm2_0x809A2030.o(.text) + build/src/overlays/actors/ovl_En_Mm2/z_en_mm2.o(.text) build/asm/ovl_En_Mm2_data.o(.text) } SegmentEnd = .; @@ -2714,7 +2714,7 @@ SECTIONS SegmentStart = .; ovl_Door_Spiral : AT(RomLocation) { - build/asm/ovl_Door_Spiral_0x809A2B60.o(.text) + build/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.o(.text) build/asm/ovl_Door_Spiral_data.o(.text) } SegmentEnd = .; @@ -2724,7 +2724,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Pzlblock : AT(RomLocation) { - build/asm/ovl_Obj_Pzlblock_0x809A33E0.o(.text) + build/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.o(.text) build/asm/ovl_Obj_Pzlblock_data.o(.text) } SegmentEnd = .; @@ -2734,7 +2734,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Toge : AT(RomLocation) { - build/asm/ovl_Obj_Toge_0x809A41C0.o(.text) + build/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.o(.text) build/asm/ovl_Obj_Toge_data.o(.text) } SegmentEnd = .; @@ -2744,7 +2744,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Armos : AT(RomLocation) { - build/asm/ovl_Obj_Armos_0x809A4E00.o(.text) + build/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.o(.text) build/asm/ovl_Obj_Armos_data.o(.text) } SegmentEnd = .; @@ -2754,7 +2754,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Boyo : AT(RomLocation) { - build/asm/ovl_Obj_Boyo_0x809A5D10.o(.text) + build/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.o(.text) build/asm/ovl_Obj_Boyo_data.o(.text) } SegmentEnd = .; @@ -2764,7 +2764,7 @@ SECTIONS SegmentStart = .; ovl_En_Grasshopper : AT(RomLocation) { - build/asm/ovl_En_Grasshopper_0x809A6280.o(.text) + build/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.o(.text) build/asm/ovl_En_Grasshopper_data.o(.text) } SegmentEnd = .; @@ -2774,7 +2774,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Grass : AT(RomLocation) { - build/asm/ovl_Obj_Grass_0x809A9110.o(.text) + build/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.o(.text) build/asm/ovl_Obj_Grass_data.o(.text) ovl_Obj_Grass_bss_start = .; } @@ -2786,7 +2786,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Grass_Carry : AT(RomLocation) { - build/asm/ovl_Obj_Grass_Carry_0x809AAE60.o(.text) + build/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.o(.text) build/asm/ovl_Obj_Grass_Carry_data.o(.text) } SegmentEnd = .; @@ -2796,7 +2796,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Grass_Unit : AT(RomLocation) { - build/asm/ovl_Obj_Grass_Unit_0x809ABDE0.o(.text) + build/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.o(.text) build/asm/ovl_Obj_Grass_Unit_data.o(.text) } SegmentEnd = .; @@ -2806,7 +2806,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Fire_Wall : AT(RomLocation) { - build/asm/ovl_Bg_Fire_Wall_0x809AC4B0.o(.text) + build/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.o(.text) build/asm/ovl_Bg_Fire_Wall_data.o(.text) } SegmentEnd = .; @@ -2816,7 +2816,7 @@ SECTIONS SegmentStart = .; ovl_En_Bu : AT(RomLocation) { - build/asm/ovl_En_Bu_0x809ACD90.o(.text) + build/src/overlays/actors/ovl_En_Bu/z_en_bu.o(.text) build/asm/ovl_En_Bu_data.o(.text) } SegmentEnd = .; @@ -2826,7 +2826,7 @@ SECTIONS SegmentStart = .; ovl_En_Encount3 : AT(RomLocation) { - build/asm/ovl_En_Encount3_0x809ACF40.o(.text) + build/src/overlays/actors/ovl_En_Encount3/z_en_encount3.o(.text) build/asm/ovl_En_Encount3_data.o(.text) } SegmentEnd = .; @@ -2836,7 +2836,7 @@ SECTIONS SegmentStart = .; ovl_En_Jso : AT(RomLocation) { - build/asm/ovl_En_Jso_0x809AD8E0.o(.text) + build/src/overlays/actors/ovl_En_Jso/z_en_jso.o(.text) build/asm/ovl_En_Jso_data.o(.text) } SegmentEnd = .; @@ -2846,7 +2846,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Chikuwa : AT(RomLocation) { - build/asm/ovl_Obj_Chikuwa_0x809B1550.o(.text) + build/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.o(.text) build/asm/ovl_Obj_Chikuwa_data.o(.text) } SegmentEnd = .; @@ -2856,7 +2856,7 @@ SECTIONS SegmentStart = .; ovl_En_Knight : AT(RomLocation) { - build/asm/ovl_En_Knight_0x809B20F0.o(.text) + build/src/overlays/actors/ovl_En_Knight/z_en_knight.o(.text) build/asm/ovl_En_Knight_data.o(.text) ovl_En_Knight_bss_start = .; } @@ -2868,7 +2868,7 @@ SECTIONS SegmentStart = .; ovl_En_Warp_tag : AT(RomLocation) { - build/asm/ovl_En_Warp_tag_0x809C0760.o(.text) + build/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.o(.text) build/asm/ovl_En_Warp_tag_data.o(.text) } SegmentEnd = .; @@ -2878,7 +2878,7 @@ SECTIONS SegmentStart = .; ovl_En_Aob_01 : AT(RomLocation) { - build/asm/ovl_En_Aob_01_0x809C10B0.o(.text) + build/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.o(.text) build/asm/ovl_En_Aob_01_data.o(.text) } SegmentEnd = .; @@ -2888,7 +2888,7 @@ SECTIONS SegmentStart = .; ovl_En_Boj_01 : AT(RomLocation) { - build/asm/ovl_En_Boj_01_0x809C3D80.o(.text) + build/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.o(.text) build/asm/ovl_En_Boj_01_data.o(.text) } SegmentEnd = .; @@ -2898,7 +2898,7 @@ SECTIONS SegmentStart = .; ovl_En_Boj_02 : AT(RomLocation) { - build/asm/ovl_En_Boj_02_0x809C3E10.o(.text) + build/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.o(.text) build/asm/ovl_En_Boj_02_data.o(.text) } SegmentEnd = .; @@ -2908,7 +2908,7 @@ SECTIONS SegmentStart = .; ovl_En_Boj_03 : AT(RomLocation) { - build/asm/ovl_En_Boj_03_0x809C3EA0.o(.text) + build/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.o(.text) build/asm/ovl_En_Boj_03_data.o(.text) } SegmentEnd = .; @@ -2918,7 +2918,7 @@ SECTIONS SegmentStart = .; ovl_En_Encount4 : AT(RomLocation) { - build/asm/ovl_En_Encount4_0x809C3F30.o(.text) + build/src/overlays/actors/ovl_En_Encount4/z_en_encount4.o(.text) build/asm/ovl_En_Encount4_data.o(.text) } SegmentEnd = .; @@ -2928,7 +2928,7 @@ SECTIONS SegmentStart = .; ovl_En_Bom_Bowl_Man : AT(RomLocation) { - build/asm/ovl_En_Bom_Bowl_Man_0x809C4790.o(.text) + build/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.o(.text) build/asm/ovl_En_Bom_Bowl_Man_data.o(.text) } SegmentEnd = .; @@ -2938,7 +2938,7 @@ SECTIONS SegmentStart = .; ovl_En_Syateki_Man : AT(RomLocation) { - build/asm/ovl_En_Syateki_Man_0x809C64C0.o(.text) + build/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.o(.text) build/asm/ovl_En_Syateki_Man_data.o(.text) } SegmentEnd = .; @@ -2948,7 +2948,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Icicle : AT(RomLocation) { - build/asm/ovl_Bg_Icicle_0x809C9A60.o(.text) + build/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.o(.text) build/asm/ovl_Bg_Icicle_data.o(.text) } SegmentEnd = .; @@ -2958,7 +2958,7 @@ SECTIONS SegmentStart = .; ovl_En_Syateki_Crow : AT(RomLocation) { - build/asm/ovl_En_Syateki_Crow_0x809CA3F0.o(.text) + build/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.o(.text) build/asm/ovl_En_Syateki_Crow_data.o(.text) } SegmentEnd = .; @@ -2968,7 +2968,7 @@ SECTIONS SegmentStart = .; ovl_En_Boj_04 : AT(RomLocation) { - build/asm/ovl_En_Boj_04_0x809CB200.o(.text) + build/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.o(.text) build/asm/ovl_En_Boj_04_data.o(.text) } SegmentEnd = .; @@ -2978,7 +2978,7 @@ SECTIONS SegmentStart = .; ovl_En_Cne_01 : AT(RomLocation) { - build/asm/ovl_En_Cne_01_0x809CB290.o(.text) + build/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.o(.text) build/asm/ovl_En_Cne_01_data.o(.text) } SegmentEnd = .; @@ -2988,7 +2988,7 @@ SECTIONS SegmentStart = .; ovl_En_Bba_01 : AT(RomLocation) { - build/asm/ovl_En_Bba_01_0x809CC060.o(.text) + build/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.o(.text) build/asm/ovl_En_Bba_01_data.o(.text) } SegmentEnd = .; @@ -2998,7 +2998,7 @@ SECTIONS SegmentStart = .; ovl_En_Bji_01 : AT(RomLocation) { - build/asm/ovl_En_Bji_01_0x809CCDE0.o(.text) + build/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.o(.text) build/asm/ovl_En_Bji_01_data.o(.text) } SegmentEnd = .; @@ -3008,7 +3008,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Spdweb : AT(RomLocation) { - build/asm/ovl_Bg_Spdweb_0x809CDEC0.o(.text) + build/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.o(.text) build/asm/ovl_Bg_Spdweb_data.o(.text) } SegmentEnd = .; @@ -3018,7 +3018,7 @@ SECTIONS SegmentStart = .; ovl_En_Mt_tag : AT(RomLocation) { - build/asm/ovl_En_Mt_tag_0x809CF350.o(.text) + build/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.o(.text) build/asm/ovl_En_Mt_tag_data.o(.text) } SegmentEnd = .; @@ -3028,7 +3028,7 @@ SECTIONS SegmentStart = .; ovl_Boss_01 : AT(RomLocation) { - build/asm/ovl_Boss_01_0x809D0530.o(.text) + build/src/overlays/actors/ovl_Boss_01/z_boss_01.o(.text) build/asm/ovl_Boss_01_data.o(.text) ovl_Boss_01_bss_start = .; } @@ -3040,7 +3040,7 @@ SECTIONS SegmentStart = .; ovl_Boss_02 : AT(RomLocation) { - build/asm/ovl_Boss_02_0x809DA1D0.o(.text) + build/src/overlays/actors/ovl_Boss_02/z_boss_02.o(.text) build/asm/ovl_Boss_02_data.o(.text) ovl_Boss_02_bss_start = .; } @@ -3052,7 +3052,7 @@ SECTIONS SegmentStart = .; ovl_Boss_03 : AT(RomLocation) { - build/asm/ovl_Boss_03_0x809E2760.o(.text) + build/src/overlays/actors/ovl_Boss_03/z_boss_03.o(.text) build/asm/ovl_Boss_03_data.o(.text) ovl_Boss_03_bss_start = .; } @@ -3064,7 +3064,7 @@ SECTIONS SegmentStart = .; ovl_Boss_04 : AT(RomLocation) { - build/asm/ovl_Boss_04_0x809EC040.o(.text) + build/src/overlays/actors/ovl_Boss_04/z_boss_04.o(.text) build/asm/ovl_Boss_04_data.o(.text) ovl_Boss_04_bss_start = .; } @@ -3076,7 +3076,7 @@ SECTIONS SegmentStart = .; ovl_Boss_05 : AT(RomLocation) { - build/asm/ovl_Boss_05_0x809EE4E0.o(.text) + build/src/overlays/actors/ovl_Boss_05/z_boss_05.o(.text) build/asm/ovl_Boss_05_data.o(.text) ovl_Boss_05_bss_start = .; } @@ -3088,7 +3088,7 @@ SECTIONS SegmentStart = .; ovl_Boss_06 : AT(RomLocation) { - build/asm/ovl_Boss_06_0x809F2120.o(.text) + build/src/overlays/actors/ovl_Boss_06/z_boss_06.o(.text) build/asm/ovl_Boss_06_data.o(.text) ovl_Boss_06_bss_start = .; } @@ -3100,7 +3100,7 @@ SECTIONS SegmentStart = .; ovl_Boss_07 : AT(RomLocation) { - build/asm/ovl_Boss_07_0x809F4980.o(.text) + build/src/overlays/actors/ovl_Boss_07/z_boss_07.o(.text) build/asm/ovl_Boss_07_data.o(.text) ovl_Boss_07_bss_start = .; } @@ -3112,7 +3112,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Dy_Yoseizo : AT(RomLocation) { - build/asm/ovl_Bg_Dy_Yoseizo_0x80A0A8A0.o(.text) + build/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.o(.text) build/asm/ovl_Bg_Dy_Yoseizo_data.o(.text) } SegmentEnd = .; @@ -3122,7 +3122,7 @@ SECTIONS SegmentStart = .; ovl_En_Boj_05 : AT(RomLocation) { - build/asm/ovl_En_Boj_05_0x80A0C780.o(.text) + build/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.o(.text) build/asm/ovl_En_Boj_05_data.o(.text) } SegmentEnd = .; @@ -3132,7 +3132,7 @@ SECTIONS SegmentStart = .; ovl_En_Sob1 : AT(RomLocation) { - build/asm/ovl_En_Sob1_0x80A0C810.o(.text) + build/src/overlays/actors/ovl_En_Sob1/z_en_sob1.o(.text) build/asm/ovl_En_Sob1_data.o(.text) } SegmentEnd = .; @@ -3142,7 +3142,7 @@ SECTIONS SegmentStart = .; ovl_En_Go : AT(RomLocation) { - build/asm/ovl_En_Go_0x80A10FD0.o(.text) + build/src/overlays/actors/ovl_En_Go/z_en_go.o(.text) build/asm/ovl_En_Go_data.o(.text) } SegmentEnd = .; @@ -3152,7 +3152,7 @@ SECTIONS SegmentStart = .; ovl_En_Raf : AT(RomLocation) { - build/asm/ovl_En_Raf_0x80A16D40.o(.text) + build/src/overlays/actors/ovl_En_Raf/z_en_raf.o(.text) build/asm/ovl_En_Raf_data.o(.text) } SegmentEnd = .; @@ -3162,7 +3162,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Funen : AT(RomLocation) { - build/asm/ovl_Obj_Funen_0x80A19740.o(.text) + build/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.o(.text) build/asm/ovl_Obj_Funen_data.o(.text) } SegmentEnd = .; @@ -3172,7 +3172,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Raillift : AT(RomLocation) { - build/asm/ovl_Obj_Raillift_0x80A19910.o(.text) + build/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.o(.text) build/asm/ovl_Obj_Raillift_data.o(.text) } SegmentEnd = .; @@ -3182,7 +3182,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Numa_Hana : AT(RomLocation) { - build/asm/ovl_Bg_Numa_Hana_0x80A1A500.o(.text) + build/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.o(.text) build/asm/ovl_Bg_Numa_Hana_data.o(.text) } SegmentEnd = .; @@ -3192,7 +3192,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Flowerpot : AT(RomLocation) { - build/asm/ovl_Obj_Flowerpot_0x80A1B3D0.o(.text) + build/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.o(.text) build/asm/ovl_Obj_Flowerpot_data.o(.text) ovl_Obj_Flowerpot_bss_start = .; } @@ -3204,7 +3204,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Spinyroll : AT(RomLocation) { - build/asm/ovl_Obj_Spinyroll_0x80A1DA50.o(.text) + build/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.o(.text) build/asm/ovl_Obj_Spinyroll_data.o(.text) } SegmentEnd = .; @@ -3214,7 +3214,7 @@ SECTIONS SegmentStart = .; ovl_Dm_Hina : AT(RomLocation) { - build/asm/ovl_Dm_Hina_0x80A1F410.o(.text) + build/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.o(.text) build/asm/ovl_Dm_Hina_data.o(.text) } SegmentEnd = .; @@ -3224,7 +3224,7 @@ SECTIONS SegmentStart = .; ovl_En_Syateki_Wf : AT(RomLocation) { - build/asm/ovl_En_Syateki_Wf_0x80A1FE50.o(.text) + build/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.o(.text) build/asm/ovl_En_Syateki_Wf_data.o(.text) } SegmentEnd = .; @@ -3234,7 +3234,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Skateblock : AT(RomLocation) { - build/asm/ovl_Obj_Skateblock_0x80A21150.o(.text) + build/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.o(.text) build/asm/ovl_Obj_Skateblock_data.o(.text) } SegmentEnd = .; @@ -3254,7 +3254,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Iceblock : AT(RomLocation) { - build/asm/ovl_Obj_Iceblock_0x80A23090.o(.text) + build/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.o(.text) build/asm/ovl_Obj_Iceblock_data.o(.text) } SegmentEnd = .; @@ -3264,7 +3264,7 @@ SECTIONS SegmentStart = .; ovl_En_Bigpamet : AT(RomLocation) { - build/asm/ovl_En_Bigpamet_0x80A27520.o(.text) + build/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.o(.text) build/asm/ovl_En_Bigpamet_data.o(.text) } SegmentEnd = .; @@ -3274,7 +3274,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Dblue_Movebg : AT(RomLocation) { - build/asm/ovl_Bg_Dblue_Movebg_0x80A29A80.o(.text) + build/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.o(.text) build/asm/ovl_Bg_Dblue_Movebg_data.o(.text) ovl_Bg_Dblue_Movebg_bss_start = .; } @@ -3286,7 +3286,7 @@ SECTIONS SegmentStart = .; ovl_En_Syateki_Dekunuts : AT(RomLocation) { - build/asm/ovl_En_Syateki_Dekunuts_0x80A2BC00.o(.text) + build/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.o(.text) build/asm/ovl_En_Syateki_Dekunuts_data.o(.text) } SegmentEnd = .; @@ -3296,7 +3296,7 @@ SECTIONS SegmentStart = .; ovl_Elf_Msg3 : AT(RomLocation) { - build/asm/ovl_Elf_Msg3_0x80A2CD10.o(.text) + build/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.o(.text) build/asm/ovl_Elf_Msg3_data.o(.text) } SegmentEnd = .; @@ -3306,7 +3306,7 @@ SECTIONS SegmentStart = .; ovl_En_Fg : AT(RomLocation) { - build/asm/ovl_En_Fg_0x80A2D280.o(.text) + build/src/overlays/actors/ovl_En_Fg/z_en_fg.o(.text) build/asm/ovl_En_Fg_data.o(.text) } SegmentEnd = .; @@ -3316,7 +3316,7 @@ SECTIONS SegmentStart = .; ovl_Dm_Ravine : AT(RomLocation) { - build/asm/ovl_Dm_Ravine_0x80A2E7A0.o(.text) + build/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.o(.text) build/asm/ovl_Dm_Ravine_data.o(.text) } SegmentEnd = .; @@ -3326,7 +3326,7 @@ SECTIONS SegmentStart = .; ovl_Dm_Sa : AT(RomLocation) { - build/asm/ovl_Dm_Sa_0x80A2E960.o(.text) + build/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.o(.text) build/asm/ovl_Dm_Sa_data.o(.text) } SegmentEnd = .; @@ -3336,7 +3336,7 @@ SECTIONS SegmentStart = .; ovl_En_Slime : AT(RomLocation) { - build/asm/ovl_En_Slime_0x80A2EDA0.o(.text) + build/src/overlays/actors/ovl_En_Slime/z_en_slime.o(.text) build/asm/ovl_En_Slime_data.o(.text) ovl_En_Slime_bss_start = .; } @@ -3348,7 +3348,7 @@ SECTIONS SegmentStart = .; ovl_En_Pr : AT(RomLocation) { - build/asm/ovl_En_Pr_0x80A32210.o(.text) + build/src/overlays/actors/ovl_En_Pr/z_en_pr.o(.text) build/asm/ovl_En_Pr_data.o(.text) } SegmentEnd = .; @@ -3358,7 +3358,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Toudai : AT(RomLocation) { - build/asm/ovl_Obj_Toudai_0x80A33B00.o(.text) + build/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.o(.text) build/asm/ovl_Obj_Toudai_data.o(.text) } SegmentEnd = .; @@ -3368,7 +3368,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Entotu : AT(RomLocation) { - build/asm/ovl_Obj_Entotu_0x80A34700.o(.text) + build/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.o(.text) build/asm/ovl_Obj_Entotu_data.o(.text) } SegmentEnd = .; @@ -3378,7 +3378,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Bell : AT(RomLocation) { - build/asm/ovl_Obj_Bell_0x80A35510.o(.text) + build/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.o(.text) build/asm/ovl_Obj_Bell_data.o(.text) } SegmentEnd = .; @@ -3388,7 +3388,7 @@ SECTIONS SegmentStart = .; ovl_En_Syateki_Okuta : AT(RomLocation) { - build/asm/ovl_En_Syateki_Okuta_0x80A35FF0.o(.text) + build/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.o(.text) build/asm/ovl_En_Syateki_Okuta_data.o(.text) } SegmentEnd = .; @@ -3398,7 +3398,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Shutter : AT(RomLocation) { - build/asm/ovl_Obj_Shutter_0x80A37ED0.o(.text) + build/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.o(.text) build/asm/ovl_Obj_Shutter_data.o(.text) } SegmentEnd = .; @@ -3408,7 +3408,7 @@ SECTIONS SegmentStart = .; ovl_Dm_Zl : AT(RomLocation) { - build/asm/ovl_Dm_Zl_0x80A38190.o(.text) + build/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.o(.text) build/asm/ovl_Dm_Zl_data.o(.text) } SegmentEnd = .; @@ -3418,7 +3418,7 @@ SECTIONS SegmentStart = .; ovl_En_Ru : AT(RomLocation) { - build/asm/ovl_En_Ru_0x80A389A0.o(.text) + build/src/overlays/actors/ovl_En_Ru/z_en_ru.o(.text) build/asm/ovl_En_Ru_data.o(.text) } SegmentEnd = .; @@ -3428,7 +3428,7 @@ SECTIONS SegmentStart = .; ovl_En_Elfgrp : AT(RomLocation) { - build/asm/ovl_En_Elfgrp_0x80A396B0.o(.text) + build/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.o(.text) build/asm/ovl_En_Elfgrp_data.o(.text) } SegmentEnd = .; @@ -3438,7 +3438,7 @@ SECTIONS SegmentStart = .; ovl_Dm_Tsg : AT(RomLocation) { - build/asm/ovl_Dm_Tsg_0x80A3AC60.o(.text) + build/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.o(.text) build/asm/ovl_Dm_Tsg_data.o(.text) } SegmentEnd = .; @@ -3448,7 +3448,7 @@ SECTIONS SegmentStart = .; ovl_En_Baguo : AT(RomLocation) { - build/asm/ovl_En_Baguo_0x80A3B080.o(.text) + build/src/overlays/actors/ovl_En_Baguo/z_en_baguo.o(.text) build/asm/ovl_En_Baguo_data.o(.text) } SegmentEnd = .; @@ -3458,7 +3458,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Vspinyroll : AT(RomLocation) { - build/asm/ovl_Obj_Vspinyroll_0x80A3C4E0.o(.text) + build/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.o(.text) build/asm/ovl_Obj_Vspinyroll_data.o(.text) } SegmentEnd = .; @@ -3468,7 +3468,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Smork : AT(RomLocation) { - build/asm/ovl_Obj_Smork_0x80A3D680.o(.text) + build/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.o(.text) build/asm/ovl_Obj_Smork_data.o(.text) } SegmentEnd = .; @@ -3478,7 +3478,7 @@ SECTIONS SegmentStart = .; ovl_En_Test2 : AT(RomLocation) { - build/asm/ovl_En_Test2_0x80A3E390.o(.text) + build/src/overlays/actors/ovl_En_Test2/z_en_test2.o(.text) build/asm/ovl_En_Test2_data.o(.text) } SegmentEnd = .; @@ -3488,7 +3488,7 @@ SECTIONS SegmentStart = .; ovl_En_Test3 : AT(RomLocation) { - build/asm/ovl_En_Test3_0x80A3E7E0.o(.text) + build/src/overlays/actors/ovl_En_Test3/z_en_test3.o(.text) build/asm/ovl_En_Test3_data.o(.text) ovl_En_Test3_bss_start = .; } @@ -3500,7 +3500,7 @@ SECTIONS SegmentStart = .; ovl_En_Test4 : AT(RomLocation) { - build/asm/ovl_En_Test4_0x80A41D70.o(.text) + build/src/overlays/actors/ovl_En_Test4/z_en_test4.o(.text) build/asm/ovl_En_Test4_data.o(.text) ovl_En_Test4_bss_start = .; } @@ -3512,7 +3512,7 @@ SECTIONS SegmentStart = .; ovl_En_Bat : AT(RomLocation) { - build/asm/ovl_En_Bat_0x80A434E0.o(.text) + build/src/overlays/actors/ovl_En_Bat/z_en_bat.o(.text) build/asm/ovl_En_Bat_data.o(.text) ovl_En_Bat_bss_start = .; } @@ -3524,7 +3524,7 @@ SECTIONS SegmentStart = .; ovl_En_Sekihi : AT(RomLocation) { - build/asm/ovl_En_Sekihi_0x80A44C80.o(.text) + build/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.o(.text) build/asm/ovl_En_Sekihi_data.o(.text) } SegmentEnd = .; @@ -3534,7 +3534,7 @@ SECTIONS SegmentStart = .; ovl_En_Wiz : AT(RomLocation) { - build/asm/ovl_En_Wiz_0x80A45360.o(.text) + build/src/overlays/actors/ovl_En_Wiz/z_en_wiz.o(.text) build/asm/ovl_En_Wiz_data.o(.text) } SegmentEnd = .; @@ -3544,7 +3544,7 @@ SECTIONS SegmentStart = .; ovl_En_Wiz_Brock : AT(RomLocation) { - build/asm/ovl_En_Wiz_Brock_0x80A48FE0.o(.text) + build/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.o(.text) build/asm/ovl_En_Wiz_Brock_data.o(.text) } SegmentEnd = .; @@ -3554,7 +3554,7 @@ SECTIONS SegmentStart = .; ovl_En_Wiz_Fire : AT(RomLocation) { - build/asm/ovl_En_Wiz_Fire_0x80A496A0.o(.text) + build/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.o(.text) build/asm/ovl_En_Wiz_Fire_data.o(.text) } SegmentEnd = .; @@ -3564,7 +3564,7 @@ SECTIONS SegmentStart = .; ovl_Eff_Change : AT(RomLocation) { - build/asm/ovl_Eff_Change_0x80A4C490.o(.text) + build/src/overlays/actors/ovl_Eff_Change/z_eff_change.o(.text) build/asm/ovl_Eff_Change_data.o(.text) } SegmentEnd = .; @@ -3574,7 +3574,7 @@ SECTIONS SegmentStart = .; ovl_Dm_Statue : AT(RomLocation) { - build/asm/ovl_Dm_Statue_0x80A4C9B0.o(.text) + build/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.o(.text) build/asm/ovl_Dm_Statue_data.o(.text) } SegmentEnd = .; @@ -3584,7 +3584,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Fireshield : AT(RomLocation) { - build/asm/ovl_Obj_Fireshield_0x80A4CA90.o(.text) + build/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.o(.text) build/asm/ovl_Obj_Fireshield_data.o(.text) } SegmentEnd = .; @@ -3594,7 +3594,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Ladder : AT(RomLocation) { - build/asm/ovl_Bg_Ladder_0x80A4D9F0.o(.text) + build/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.o(.text) build/asm/ovl_Bg_Ladder_data.o(.text) } SegmentEnd = .; @@ -3604,7 +3604,7 @@ SECTIONS SegmentStart = .; ovl_En_Mkk : AT(RomLocation) { - build/asm/ovl_En_Mkk_0x80A4DED0.o(.text) + build/src/overlays/actors/ovl_En_Mkk/z_en_mkk.o(.text) build/asm/ovl_En_Mkk_data.o(.text) } SegmentEnd = .; @@ -3614,7 +3614,7 @@ SECTIONS SegmentStart = .; ovl_Demo_Getitem : AT(RomLocation) { - build/asm/ovl_Demo_Getitem_0x80A4FA40.o(.text) + build/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.o(.text) build/asm/ovl_Demo_Getitem_data.o(.text) } SegmentEnd = .; @@ -3624,7 +3624,7 @@ SECTIONS SegmentStart = .; ovl_En_Dnb : AT(RomLocation) { - build/asm/ovl_En_Dnb_0x80A4FDD0.o(.text) + build/src/overlays/actors/ovl_En_Dnb/z_en_dnb.o(.text) build/asm/ovl_En_Dnb_data.o(.text) } SegmentEnd = .; @@ -3634,7 +3634,7 @@ SECTIONS SegmentStart = .; ovl_En_Dnh : AT(RomLocation) { - build/asm/ovl_En_Dnh_0x80A50D40.o(.text) + build/src/overlays/actors/ovl_En_Dnh/z_en_dnh.o(.text) build/asm/ovl_En_Dnh_data.o(.text) } SegmentEnd = .; @@ -3644,7 +3644,7 @@ SECTIONS SegmentStart = .; ovl_En_Dnk : AT(RomLocation) { - build/asm/ovl_En_Dnk_0x80A514F0.o(.text) + build/src/overlays/actors/ovl_En_Dnk/z_en_dnk.o(.text) build/asm/ovl_En_Dnk_data.o(.text) } SegmentEnd = .; @@ -3654,7 +3654,7 @@ SECTIONS SegmentStart = .; ovl_En_Dnq : AT(RomLocation) { - build/asm/ovl_En_Dnq_0x80A52530.o(.text) + build/src/overlays/actors/ovl_En_Dnq/z_en_dnq.o(.text) build/asm/ovl_En_Dnq_data.o(.text) } SegmentEnd = .; @@ -3664,7 +3664,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Keikoku_Saku : AT(RomLocation) { - build/asm/ovl_Bg_Keikoku_Saku_0x80A537D0.o(.text) + build/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.o(.text) build/asm/ovl_Bg_Keikoku_Saku_data.o(.text) } SegmentEnd = .; @@ -3674,7 +3674,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Hugebombiwa : AT(RomLocation) { - build/asm/ovl_Obj_Hugebombiwa_0x80A53BE0.o(.text) + build/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.o(.text) build/asm/ovl_Obj_Hugebombiwa_data.o(.text) } SegmentEnd = .; @@ -3684,7 +3684,7 @@ SECTIONS SegmentStart = .; ovl_En_Firefly2 : AT(RomLocation) { - build/asm/ovl_En_Firefly2_0x80A560C0.o(.text) + build/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.o(.text) build/asm/ovl_En_Firefly2_data.o(.text) } SegmentEnd = .; @@ -3694,7 +3694,7 @@ SECTIONS SegmentStart = .; ovl_En_Rat : AT(RomLocation) { - build/asm/ovl_En_Rat_0x80A56150.o(.text) + build/src/overlays/actors/ovl_En_Rat/z_en_rat.o(.text) build/asm/ovl_En_Rat_data.o(.text) } SegmentEnd = .; @@ -3704,7 +3704,7 @@ SECTIONS SegmentStart = .; ovl_En_Water_Effect : AT(RomLocation) { - build/asm/ovl_En_Water_Effect_0x80A587A0.o(.text) + build/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.o(.text) build/asm/ovl_En_Water_Effect_data.o(.text) } SegmentEnd = .; @@ -3714,7 +3714,7 @@ SECTIONS SegmentStart = .; ovl_En_Kusa2 : AT(RomLocation) { - build/asm/ovl_En_Kusa2_0x80A5B160.o(.text) + build/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.o(.text) build/asm/ovl_En_Kusa2_data.o(.text) ovl_En_Kusa2_bss_start = .; } @@ -3726,7 +3726,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Spout_Fire : AT(RomLocation) { - build/asm/ovl_Bg_Spout_Fire_0x80A60B20.o(.text) + build/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.o(.text) build/asm/ovl_Bg_Spout_Fire_data.o(.text) } SegmentEnd = .; @@ -3736,7 +3736,7 @@ SECTIONS SegmentStart = .; ovl_En_Dy_Extra : AT(RomLocation) { - build/asm/ovl_En_Dy_Extra_0x80A612B0.o(.text) + build/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.o(.text) build/asm/ovl_En_Dy_Extra_data.o(.text) } SegmentEnd = .; @@ -3746,7 +3746,7 @@ SECTIONS SegmentStart = .; ovl_En_Bal : AT(RomLocation) { - build/asm/ovl_En_Bal_0x80A61810.o(.text) + build/src/overlays/actors/ovl_En_Bal/z_en_bal.o(.text) build/asm/ovl_En_Bal_data.o(.text) } SegmentEnd = .; @@ -3756,7 +3756,7 @@ SECTIONS SegmentStart = .; ovl_En_Ginko_Man : AT(RomLocation) { - build/asm/ovl_En_Ginko_Man_0x80A644A0.o(.text) + build/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.o(.text) build/asm/ovl_En_Ginko_Man_data.o(.text) } SegmentEnd = .; @@ -3766,7 +3766,7 @@ SECTIONS SegmentStart = .; ovl_En_Warp_Uzu : AT(RomLocation) { - build/asm/ovl_En_Warp_Uzu_0x80A66180.o(.text) + build/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.o(.text) build/asm/ovl_En_Warp_Uzu_data.o(.text) } SegmentEnd = .; @@ -3776,7 +3776,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Driftice : AT(RomLocation) { - build/asm/ovl_Obj_Driftice_0x80A66570.o(.text) + build/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.o(.text) build/asm/ovl_Obj_Driftice_data.o(.text) } SegmentEnd = .; @@ -3786,7 +3786,7 @@ SECTIONS SegmentStart = .; ovl_En_Look_Nuts : AT(RomLocation) { - build/asm/ovl_En_Look_Nuts_0x80A678B0.o(.text) + build/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.o(.text) build/asm/ovl_En_Look_Nuts_data.o(.text) } SegmentEnd = .; @@ -3796,7 +3796,7 @@ SECTIONS SegmentStart = .; ovl_En_Mushi2 : AT(RomLocation) { - build/asm/ovl_En_Mushi2_0x80A687A0.o(.text) + build/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.o(.text) build/asm/ovl_En_Mushi2_data.o(.text) } SegmentEnd = .; @@ -3806,7 +3806,7 @@ SECTIONS SegmentStart = .; ovl_En_Fall : AT(RomLocation) { - build/asm/ovl_En_Fall_0x80A6BF90.o(.text) + build/src/overlays/actors/ovl_En_Fall/z_en_fall.o(.text) build/asm/ovl_En_Fall_data.o(.text) ovl_En_Fall_bss_start = .; } @@ -3818,7 +3818,7 @@ SECTIONS SegmentStart = .; ovl_En_Mm3 : AT(RomLocation) { - build/asm/ovl_En_Mm3_0x80A6F0A0.o(.text) + build/src/overlays/actors/ovl_En_Mm3/z_en_mm3.o(.text) build/asm/ovl_En_Mm3_data.o(.text) } SegmentEnd = .; @@ -3828,7 +3828,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Crace_Movebg : AT(RomLocation) { - build/asm/ovl_Bg_Crace_Movebg_0x80A706F0.o(.text) + build/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.o(.text) build/asm/ovl_Bg_Crace_Movebg_data.o(.text) ovl_Bg_Crace_Movebg_bss_start = .; } @@ -3840,7 +3840,7 @@ SECTIONS SegmentStart = .; ovl_En_Dno : AT(RomLocation) { - build/asm/ovl_En_Dno_0x80A711D0.o(.text) + build/src/overlays/actors/ovl_En_Dno/z_en_dno.o(.text) build/asm/ovl_En_Dno_data.o(.text) } SegmentEnd = .; @@ -3850,7 +3850,7 @@ SECTIONS SegmentStart = .; ovl_En_Pr2 : AT(RomLocation) { - build/asm/ovl_En_Pr2_0x80A73FA0.o(.text) + build/src/overlays/actors/ovl_En_Pr2/z_en_pr2.o(.text) build/asm/ovl_En_Pr2_data.o(.text) } SegmentEnd = .; @@ -3860,7 +3860,7 @@ SECTIONS SegmentStart = .; ovl_En_Prz : AT(RomLocation) { - build/asm/ovl_En_Prz_0x80A75DC0.o(.text) + build/src/overlays/actors/ovl_En_Prz/z_en_prz.o(.text) build/asm/ovl_En_Prz_data.o(.text) } SegmentEnd = .; @@ -3870,7 +3870,7 @@ SECTIONS SegmentStart = .; ovl_En_Jso2 : AT(RomLocation) { - build/asm/ovl_En_Jso2_0x80A773C0.o(.text) + build/src/overlays/actors/ovl_En_Jso2/z_en_jso2.o(.text) build/asm/ovl_En_Jso2_data.o(.text) } SegmentEnd = .; @@ -3880,7 +3880,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Etcetera : AT(RomLocation) { - build/asm/ovl_Obj_Etcetera_0x80A7BC70.o(.text) + build/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.o(.text) build/asm/ovl_Obj_Etcetera_data.o(.text) } SegmentEnd = .; @@ -3890,7 +3890,7 @@ SECTIONS SegmentStart = .; ovl_En_Egol : AT(RomLocation) { - build/asm/ovl_En_Egol_0x80A7C990.o(.text) + build/src/overlays/actors/ovl_En_Egol/z_en_egol.o(.text) build/asm/ovl_En_Egol_data.o(.text) } SegmentEnd = .; @@ -3900,7 +3900,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Mine : AT(RomLocation) { - build/asm/ovl_Obj_Mine_0x80A811D0.o(.text) + build/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.o(.text) build/asm/ovl_Obj_Mine_data.o(.text) ovl_Obj_Mine_bss_start = .; } @@ -3912,7 +3912,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Purify : AT(RomLocation) { - build/asm/ovl_Obj_Purify_0x80A84CD0.o(.text) + build/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.o(.text) build/asm/ovl_Obj_Purify_data.o(.text) } SegmentEnd = .; @@ -3922,7 +3922,7 @@ SECTIONS SegmentStart = .; ovl_En_Tru : AT(RomLocation) { - build/asm/ovl_En_Tru_0x80A85620.o(.text) + build/src/overlays/actors/ovl_En_Tru/z_en_tru.o(.text) build/asm/ovl_En_Tru_data.o(.text) } SegmentEnd = .; @@ -3932,7 +3932,7 @@ SECTIONS SegmentStart = .; ovl_En_Trt : AT(RomLocation) { - build/asm/ovl_En_Trt_0x80A8B770.o(.text) + build/src/overlays/actors/ovl_En_Trt/z_en_trt.o(.text) build/asm/ovl_En_Trt_data.o(.text) } SegmentEnd = .; @@ -3942,7 +3942,7 @@ SECTIONS SegmentStart = .; ovl_En_Test5 : AT(RomLocation) { - build/asm/ovl_En_Test5_0x80A903B0.o(.text) + build/src/overlays/actors/ovl_En_Test5/z_en_test5.o(.text) build/asm/ovl_En_Test5_data.o(.text) } SegmentEnd = .; @@ -3952,7 +3952,7 @@ SECTIONS SegmentStart = .; ovl_En_Test6 : AT(RomLocation) { - build/asm/ovl_En_Test6_0x80A90730.o(.text) + build/src/overlays/actors/ovl_En_Test6/z_en_test6.o(.text) build/asm/ovl_En_Test6_data.o(.text) ovl_En_Test6_bss_start = .; } @@ -3964,7 +3964,7 @@ SECTIONS SegmentStart = .; ovl_En_Az : AT(RomLocation) { - build/asm/ovl_En_Az_0x80A94A30.o(.text) + build/src/overlays/actors/ovl_En_Az/z_en_az.o(.text) build/asm/ovl_En_Az_data.o(.text) ovl_En_Az_bss_start = .; } @@ -3976,7 +3976,7 @@ SECTIONS SegmentStart = .; ovl_En_Estone : AT(RomLocation) { - build/asm/ovl_En_Estone_0x80A99EA0.o(.text) + build/src/overlays/actors/ovl_En_Estone/z_en_estone.o(.text) build/asm/ovl_En_Estone_data.o(.text) } SegmentEnd = .; @@ -3986,7 +3986,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Hakugin_Post : AT(RomLocation) { - build/asm/ovl_Bg_Hakugin_Post_0x80A9ACD0.o(.text) + build/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.o(.text) build/asm/ovl_Bg_Hakugin_Post_data.o(.text) ovl_Bg_Hakugin_Post_bss_start = .; } @@ -3998,7 +3998,7 @@ SECTIONS SegmentStart = .; ovl_Dm_Opstage : AT(RomLocation) { - build/asm/ovl_Dm_Opstage_0x80A9F950.o(.text) + build/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.o(.text) build/asm/ovl_Dm_Opstage_data.o(.text) } SegmentEnd = .; @@ -4008,7 +4008,7 @@ SECTIONS SegmentStart = .; ovl_Dm_Stk : AT(RomLocation) { - build/asm/ovl_Dm_Stk_0x80A9FDB0.o(.text) + build/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.o(.text) build/asm/ovl_Dm_Stk_data.o(.text) } SegmentEnd = .; @@ -4018,7 +4018,7 @@ SECTIONS SegmentStart = .; ovl_Dm_Char00 : AT(RomLocation) { - build/asm/ovl_Dm_Char00_0x80AA5580.o(.text) + build/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.o(.text) build/asm/ovl_Dm_Char00_data.o(.text) } SegmentEnd = .; @@ -4028,7 +4028,7 @@ SECTIONS SegmentStart = .; ovl_Dm_Char01 : AT(RomLocation) { - build/asm/ovl_Dm_Char01_0x80AA81E0.o(.text) + build/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.o(.text) build/asm/ovl_Dm_Char01_data.o(.text) ovl_Dm_Char01_bss_start = .; } @@ -4040,7 +4040,7 @@ SECTIONS SegmentStart = .; ovl_Dm_Char02 : AT(RomLocation) { - build/asm/ovl_Dm_Char02_0x80AAAE30.o(.text) + build/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.o(.text) build/asm/ovl_Dm_Char02_data.o(.text) } SegmentEnd = .; @@ -4050,7 +4050,7 @@ SECTIONS SegmentStart = .; ovl_Dm_Char03 : AT(RomLocation) { - build/asm/ovl_Dm_Char03_0x80AAB4A0.o(.text) + build/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.o(.text) build/asm/ovl_Dm_Char03_data.o(.text) } SegmentEnd = .; @@ -4060,7 +4060,7 @@ SECTIONS SegmentStart = .; ovl_Dm_Char04 : AT(RomLocation) { - build/asm/ovl_Dm_Char04_0x80AABC40.o(.text) + build/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.o(.text) build/asm/ovl_Dm_Char04_data.o(.text) } SegmentEnd = .; @@ -4070,7 +4070,7 @@ SECTIONS SegmentStart = .; ovl_Dm_Char05 : AT(RomLocation) { - build/asm/ovl_Dm_Char05_0x80AAC5A0.o(.text) + build/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.o(.text) build/asm/ovl_Dm_Char05_data.o(.text) } SegmentEnd = .; @@ -4080,7 +4080,7 @@ SECTIONS SegmentStart = .; ovl_Dm_Char06 : AT(RomLocation) { - build/asm/ovl_Dm_Char06_0x80AAE680.o(.text) + build/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.o(.text) build/asm/ovl_Dm_Char06_data.o(.text) } SegmentEnd = .; @@ -4090,7 +4090,7 @@ SECTIONS SegmentStart = .; ovl_Dm_Char07 : AT(RomLocation) { - build/asm/ovl_Dm_Char07_0x80AAE9C0.o(.text) + build/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.o(.text) build/asm/ovl_Dm_Char07_data.o(.text) } SegmentEnd = .; @@ -4100,7 +4100,7 @@ SECTIONS SegmentStart = .; ovl_Dm_Char08 : AT(RomLocation) { - build/asm/ovl_Dm_Char08_0x80AAF050.o(.text) + build/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.o(.text) build/asm/ovl_Dm_Char08_data.o(.text) } SegmentEnd = .; @@ -4110,7 +4110,7 @@ SECTIONS SegmentStart = .; ovl_Dm_Char09 : AT(RomLocation) { - build/asm/ovl_Dm_Char09_0x80AB1E10.o(.text) + build/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.o(.text) build/asm/ovl_Dm_Char09_data.o(.text) } SegmentEnd = .; @@ -4120,7 +4120,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Tokeidai : AT(RomLocation) { - build/asm/ovl_Obj_Tokeidai_0x80AB2790.o(.text) + build/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.o(.text) build/asm/ovl_Obj_Tokeidai_data.o(.text) } SegmentEnd = .; @@ -4130,7 +4130,7 @@ SECTIONS SegmentStart = .; ovl_En_Mnk : AT(RomLocation) { - build/asm/ovl_En_Mnk_0x80AB4D10.o(.text) + build/src/overlays/actors/ovl_En_Mnk/z_en_mnk.o(.text) build/asm/ovl_En_Mnk_data.o(.text) } SegmentEnd = .; @@ -4140,7 +4140,7 @@ SECTIONS SegmentStart = .; ovl_En_Egblock : AT(RomLocation) { - build/asm/ovl_En_Egblock_0x80ABA7A0.o(.text) + build/src/overlays/actors/ovl_En_Egblock/z_en_egblock.o(.text) build/asm/ovl_En_Egblock_data.o(.text) } SegmentEnd = .; @@ -4150,7 +4150,7 @@ SECTIONS SegmentStart = .; ovl_En_Guard_Nuts : AT(RomLocation) { - build/asm/ovl_En_Guard_Nuts_0x80ABB0E0.o(.text) + build/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.o(.text) build/asm/ovl_En_Guard_Nuts_data.o(.text) } SegmentEnd = .; @@ -4160,7 +4160,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Hakugin_Bombwall : AT(RomLocation) { - build/asm/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0.o(.text) + build/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.o(.text) build/asm/ovl_Bg_Hakugin_Bombwall_data.o(.text) } SegmentEnd = .; @@ -4170,7 +4170,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Tokei_Tobira : AT(RomLocation) { - build/asm/ovl_Obj_Tokei_Tobira_0x80ABD1D0.o(.text) + build/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.o(.text) build/asm/ovl_Obj_Tokei_Tobira_data.o(.text) } SegmentEnd = .; @@ -4180,7 +4180,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Hakugin_Elvpole : AT(RomLocation) { - build/asm/ovl_Bg_Hakugin_Elvpole_0x80ABD830.o(.text) + build/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.o(.text) build/asm/ovl_Bg_Hakugin_Elvpole_data.o(.text) } SegmentEnd = .; @@ -4190,7 +4190,7 @@ SECTIONS SegmentStart = .; ovl_En_Ma4 : AT(RomLocation) { - build/asm/ovl_En_Ma4_0x80ABDCA0.o(.text) + build/src/overlays/actors/ovl_En_Ma4/z_en_ma4.o(.text) build/asm/ovl_En_Ma4_data.o(.text) } SegmentEnd = .; @@ -4200,7 +4200,7 @@ SECTIONS SegmentStart = .; ovl_En_Twig : AT(RomLocation) { - build/asm/ovl_En_Twig_0x80AC0830.o(.text) + build/src/overlays/actors/ovl_En_Twig/z_en_twig.o(.text) build/asm/ovl_En_Twig_data.o(.text) ovl_En_Twig_bss_start = .; } @@ -4212,7 +4212,7 @@ SECTIONS SegmentStart = .; ovl_En_Po_Fusen : AT(RomLocation) { - build/asm/ovl_En_Po_Fusen_0x80AC1270.o(.text) + build/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.o(.text) build/asm/ovl_En_Po_Fusen_data.o(.text) } SegmentEnd = .; @@ -4222,7 +4222,7 @@ SECTIONS SegmentStart = .; ovl_En_Door_Etc : AT(RomLocation) { - build/asm/ovl_En_Door_Etc_0x80AC1ED0.o(.text) + build/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.o(.text) build/asm/ovl_En_Door_Etc_data.o(.text) } SegmentEnd = .; @@ -4232,7 +4232,7 @@ SECTIONS SegmentStart = .; ovl_En_Bigokuta : AT(RomLocation) { - build/asm/ovl_En_Bigokuta_0x80AC26F0.o(.text) + build/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.o(.text) build/asm/ovl_En_Bigokuta_data.o(.text) } SegmentEnd = .; @@ -4242,7 +4242,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Icefloe : AT(RomLocation) { - build/asm/ovl_Bg_Icefloe_0x80AC48F0.o(.text) + build/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.o(.text) build/asm/ovl_Bg_Icefloe_data.o(.text) ovl_Bg_Icefloe_bss_start = .; } @@ -4314,7 +4314,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Ocarinalift : AT(RomLocation) { - build/asm/ovl_Obj_Ocarinalift_0x80AC94C0.o(.text) + build/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.o(.text) build/asm/ovl_Obj_Ocarinalift_data.o(.text) } SegmentEnd = .; @@ -4324,7 +4324,7 @@ SECTIONS SegmentStart = .; ovl_En_Time_Tag : AT(RomLocation) { - build/asm/ovl_En_Time_Tag_0x80AC9EA0.o(.text) + build/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.o(.text) build/asm/ovl_En_Time_Tag_data.o(.text) } SegmentEnd = .; @@ -4334,7 +4334,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Open_Shutter : AT(RomLocation) { - build/asm/ovl_Bg_Open_Shutter_0x80ACAB10.o(.text) + build/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.o(.text) build/asm/ovl_Bg_Open_Shutter_data.o(.text) } SegmentEnd = .; @@ -4344,7 +4344,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Open_Spot : AT(RomLocation) { - build/asm/ovl_Bg_Open_Spot_0x80ACB1E0.o(.text) + build/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.o(.text) build/asm/ovl_Bg_Open_Spot_data.o(.text) } SegmentEnd = .; @@ -4354,10 +4354,10 @@ SECTIONS SegmentStart = .; ovl_Bg_Fu_Kaiten : AT(RomLocation) { - build/src/actors/Bg_Fu_Kaiten/z_bg_fu_kaiten.o(.text) - build/src/actors/Bg_Fu_Kaiten/z_bg_fu_kaiten.o(.data) - build/src/actors/Bg_Fu_Kaiten/z_bg_fu_kaiten.o(.rodata) - build/src/actors/Bg_Fu_Kaiten/z_bg_fu_kaiten_overlay.o(.ovl) + build/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.o(.text) + build/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.o(.data) + build/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.o(.rodata) + build/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -4366,7 +4366,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Aqua : AT(RomLocation) { - build/asm/ovl_Obj_Aqua_0x80ACB6A0.o(.text) + build/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.o(.text) build/asm/ovl_Obj_Aqua_data.o(.text) } SegmentEnd = .; @@ -4376,7 +4376,7 @@ SECTIONS SegmentStart = .; ovl_En_Elforg : AT(RomLocation) { - build/asm/ovl_En_Elforg_0x80ACC470.o(.text) + build/src/overlays/actors/ovl_En_Elforg/z_en_elforg.o(.text) build/asm/ovl_En_Elforg_data.o(.text) } SegmentEnd = .; @@ -4386,7 +4386,7 @@ SECTIONS SegmentStart = .; ovl_En_Elfbub : AT(RomLocation) { - build/asm/ovl_En_Elfbub_0x80ACDCD0.o(.text) + build/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.o(.text) build/asm/ovl_En_Elfbub_data.o(.text) } SegmentEnd = .; @@ -4396,7 +4396,7 @@ SECTIONS SegmentStart = .; ovl_En_Fu_Mato : AT(RomLocation) { - build/asm/ovl_En_Fu_Mato_0x80ACE330.o(.text) + build/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.o(.text) build/asm/ovl_En_Fu_Mato_data.o(.text) } SegmentEnd = .; @@ -4406,7 +4406,7 @@ SECTIONS SegmentStart = .; ovl_En_Fu_Kago : AT(RomLocation) { - build/asm/ovl_En_Fu_Kago_0x80ACF780.o(.text) + build/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.o(.text) build/asm/ovl_En_Fu_Kago_data.o(.text) } SegmentEnd = .; @@ -4416,7 +4416,7 @@ SECTIONS SegmentStart = .; ovl_En_Osn : AT(RomLocation) { - build/asm/ovl_En_Osn_0x80AD0830.o(.text) + build/src/overlays/actors/ovl_En_Osn/z_en_osn.o(.text) build/asm/ovl_En_Osn_data.o(.text) } SegmentEnd = .; @@ -4426,7 +4426,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Ctower_Gear : AT(RomLocation) { - build/asm/ovl_Bg_Ctower_Gear_0x80AD2B70.o(.text) + build/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.o(.text) build/asm/ovl_Bg_Ctower_Gear_data.o(.text) } SegmentEnd = .; @@ -4436,7 +4436,7 @@ SECTIONS SegmentStart = .; ovl_En_Trt2 : AT(RomLocation) { - build/asm/ovl_En_Trt2_0x80AD3380.o(.text) + build/src/overlays/actors/ovl_En_Trt2/z_en_trt2.o(.text) build/asm/ovl_En_Trt2_data.o(.text) } SegmentEnd = .; @@ -4446,7 +4446,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Tokei_Step : AT(RomLocation) { - build/asm/ovl_Obj_Tokei_Step_0x80AD5BB0.o(.text) + build/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.o(.text) build/asm/ovl_Obj_Tokei_Step_data.o(.text) } SegmentEnd = .; @@ -4456,7 +4456,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Lotus : AT(RomLocation) { - build/asm/ovl_Bg_Lotus_0x80AD6760.o(.text) + build/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.o(.text) build/asm/ovl_Bg_Lotus_data.o(.text) } SegmentEnd = .; @@ -4466,7 +4466,7 @@ SECTIONS SegmentStart = .; ovl_En_Kame : AT(RomLocation) { - build/asm/ovl_En_Kame_0x80AD6DD0.o(.text) + build/src/overlays/actors/ovl_En_Kame/z_en_kame.o(.text) build/asm/ovl_En_Kame_data.o(.text) } SegmentEnd = .; @@ -4476,7 +4476,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Takaraya_Wall : AT(RomLocation) { - build/asm/ovl_Obj_Takaraya_Wall_0x80AD9240.o(.text) + build/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.o(.text) build/asm/ovl_Obj_Takaraya_Wall_data.o(.text) ovl_Obj_Takaraya_Wall_bss_start = .; } @@ -4488,7 +4488,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Fu_Mizu : AT(RomLocation) { - build/asm/ovl_Bg_Fu_Mizu_0x80ADAAF0.o(.text) + build/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.o(.text) build/asm/ovl_Bg_Fu_Mizu_data.o(.text) } SegmentEnd = .; @@ -4498,7 +4498,7 @@ SECTIONS SegmentStart = .; ovl_En_Sellnuts : AT(RomLocation) { - build/asm/ovl_En_Sellnuts_0x80ADADD0.o(.text) + build/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.o(.text) build/asm/ovl_En_Sellnuts_data.o(.text) } SegmentEnd = .; @@ -4508,7 +4508,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Dkjail_Ivy : AT(RomLocation) { - build/asm/ovl_Bg_Dkjail_Ivy_0x80ADE230.o(.text) + build/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.o(.text) build/asm/ovl_Bg_Dkjail_Ivy_data.o(.text) } SegmentEnd = .; @@ -4518,7 +4518,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Visiblock : AT(RomLocation) { - build/asm/ovl_Obj_Visiblock_0x80ADEA70.o(.text) + build/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.o(.text) build/asm/ovl_Obj_Visiblock_data.o(.text) } SegmentEnd = .; @@ -4528,7 +4528,7 @@ SECTIONS SegmentStart = .; ovl_En_Takaraya : AT(RomLocation) { - build/asm/ovl_En_Takaraya_0x80ADEB90.o(.text) + build/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.o(.text) build/asm/ovl_En_Takaraya_data.o(.text) } SegmentEnd = .; @@ -4538,7 +4538,7 @@ SECTIONS SegmentStart = .; ovl_En_Tsn : AT(RomLocation) { - build/asm/ovl_En_Tsn_0x80ADFCA0.o(.text) + build/src/overlays/actors/ovl_En_Tsn/z_en_tsn.o(.text) build/asm/ovl_En_Tsn_data.o(.text) } SegmentEnd = .; @@ -4548,7 +4548,7 @@ SECTIONS SegmentStart = .; ovl_En_Ds2n : AT(RomLocation) { - build/asm/ovl_En_Ds2n_0x80AE1650.o(.text) + build/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.o(.text) build/asm/ovl_En_Ds2n_data.o(.text) } SegmentEnd = .; @@ -4558,7 +4558,7 @@ SECTIONS SegmentStart = .; ovl_En_Fsn : AT(RomLocation) { - build/asm/ovl_En_Fsn_0x80AE1B70.o(.text) + build/src/overlays/actors/ovl_En_Fsn/z_en_fsn.o(.text) build/asm/ovl_En_Fsn_data.o(.text) } SegmentEnd = .; @@ -4568,7 +4568,7 @@ SECTIONS SegmentStart = .; ovl_En_Shn : AT(RomLocation) { - build/asm/ovl_En_Shn_0x80AE6130.o(.text) + build/src/overlays/actors/ovl_En_Shn/z_en_shn.o(.text) build/asm/ovl_En_Shn_data.o(.text) } SegmentEnd = .; @@ -4578,7 +4578,7 @@ SECTIONS SegmentStart = .; ovl_En_Stop_heishi : AT(RomLocation) { - build/asm/ovl_En_Stop_heishi_0x80AE73A0.o(.text) + build/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.o(.text) build/asm/ovl_En_Stop_heishi_data.o(.text) } SegmentEnd = .; @@ -4588,7 +4588,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Bigicicle : AT(RomLocation) { - build/asm/ovl_Obj_Bigicicle_0x80AE8B70.o(.text) + build/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.o(.text) build/asm/ovl_Obj_Bigicicle_data.o(.text) } SegmentEnd = .; @@ -4598,7 +4598,7 @@ SECTIONS SegmentStart = .; ovl_En_Lift_Nuts : AT(RomLocation) { - build/asm/ovl_En_Lift_Nuts_0x80AE9A20.o(.text) + build/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.o(.text) build/asm/ovl_En_Lift_Nuts_data.o(.text) } SegmentEnd = .; @@ -4608,7 +4608,7 @@ SECTIONS SegmentStart = .; ovl_En_Tk : AT(RomLocation) { - build/asm/ovl_En_Tk_0x80AEC460.o(.text) + build/src/overlays/actors/ovl_En_Tk/z_en_tk.o(.text) build/asm/ovl_En_Tk_data.o(.text) ovl_En_Tk_bss_start = .; } @@ -4620,7 +4620,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Market_Step : AT(RomLocation) { - build/asm/ovl_Bg_Market_Step_0x80AF0060.o(.text) + build/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.o(.text) build/asm/ovl_Bg_Market_Step_data.o(.text) } SegmentEnd = .; @@ -4630,7 +4630,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Lupygamelift : AT(RomLocation) { - build/asm/ovl_Obj_Lupygamelift_0x80AF0170.o(.text) + build/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.o(.text) build/asm/ovl_Obj_Lupygamelift_data.o(.text) } SegmentEnd = .; @@ -4640,7 +4640,7 @@ SECTIONS SegmentStart = .; ovl_En_Test7 : AT(RomLocation) { - build/asm/ovl_En_Test7_0x80AF0820.o(.text) + build/src/overlays/actors/ovl_En_Test7/z_en_test7.o(.text) build/asm/ovl_En_Test7_data.o(.text) ovl_En_Test7_bss_start = .; } @@ -4652,7 +4652,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Lightblock : AT(RomLocation) { - build/asm/ovl_Obj_Lightblock_0x80AF3910.o(.text) + build/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.o(.text) build/asm/ovl_Obj_Lightblock_data.o(.text) } SegmentEnd = .; @@ -4662,7 +4662,7 @@ SECTIONS SegmentStart = .; ovl_Mir_Ray2 : AT(RomLocation) { - build/asm/ovl_Mir_Ray2_0x80AF3F70.o(.text) + build/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.o(.text) build/asm/ovl_Mir_Ray2_data.o(.text) } SegmentEnd = .; @@ -4672,7 +4672,7 @@ SECTIONS SegmentStart = .; ovl_En_Wdhand : AT(RomLocation) { - build/asm/ovl_En_Wdhand_0x80AF43F0.o(.text) + build/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.o(.text) build/asm/ovl_En_Wdhand_data.o(.text) } SegmentEnd = .; @@ -4682,7 +4682,7 @@ SECTIONS SegmentStart = .; ovl_En_Gamelupy : AT(RomLocation) { - build/asm/ovl_En_Gamelupy_0x80AF6760.o(.text) + build/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.o(.text) build/asm/ovl_En_Gamelupy_data.o(.text) } SegmentEnd = .; @@ -4692,7 +4692,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Danpei_Movebg : AT(RomLocation) { - build/asm/ovl_Bg_Danpei_Movebg_0x80AF6DE0.o(.text) + build/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.o(.text) build/asm/ovl_Bg_Danpei_Movebg_data.o(.text) } SegmentEnd = .; @@ -4702,7 +4702,7 @@ SECTIONS SegmentStart = .; ovl_En_Snowwd : AT(RomLocation) { - build/asm/ovl_En_Snowwd_0x80AF7640.o(.text) + build/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.o(.text) build/asm/ovl_En_Snowwd_data.o(.text) } SegmentEnd = .; @@ -4712,7 +4712,7 @@ SECTIONS SegmentStart = .; ovl_En_Pm : AT(RomLocation) { - build/asm/ovl_En_Pm_0x80AF7B40.o(.text) + build/src/overlays/actors/ovl_En_Pm/z_en_pm.o(.text) build/asm/ovl_En_Pm_data.o(.text) } SegmentEnd = .; @@ -4722,7 +4722,7 @@ SECTIONS SegmentStart = .; ovl_En_Gakufu : AT(RomLocation) { - build/asm/ovl_En_Gakufu_0x80AFC960.o(.text) + build/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.o(.text) build/asm/ovl_En_Gakufu_data.o(.text) } SegmentEnd = .; @@ -4732,7 +4732,7 @@ SECTIONS SegmentStart = .; ovl_Elf_Msg4 : AT(RomLocation) { - build/asm/ovl_Elf_Msg4_0x80AFD380.o(.text) + build/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.o(.text) build/asm/ovl_Elf_Msg4_data.o(.text) } SegmentEnd = .; @@ -4742,7 +4742,7 @@ SECTIONS SegmentStart = .; ovl_Elf_Msg5 : AT(RomLocation) { - build/asm/ovl_Elf_Msg5_0x80AFD990.o(.text) + build/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.o(.text) build/asm/ovl_Elf_Msg5_data.o(.text) } SegmentEnd = .; @@ -4752,7 +4752,7 @@ SECTIONS SegmentStart = .; ovl_En_Col_Man : AT(RomLocation) { - build/asm/ovl_En_Col_Man_0x80AFDC40.o(.text) + build/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.o(.text) build/asm/ovl_En_Col_Man_data.o(.text) } SegmentEnd = .; @@ -4762,7 +4762,7 @@ SECTIONS SegmentStart = .; ovl_En_Talk_Gibud : AT(RomLocation) { - build/asm/ovl_En_Talk_Gibud_0x80AFE8A0.o(.text) + build/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.o(.text) build/asm/ovl_En_Talk_Gibud_data.o(.text) } SegmentEnd = .; @@ -4772,7 +4772,7 @@ SECTIONS SegmentStart = .; ovl_En_Giant : AT(RomLocation) { - build/asm/ovl_En_Giant_0x80B01990.o(.text) + build/src/overlays/actors/ovl_En_Giant/z_en_giant.o(.text) build/asm/ovl_En_Giant_data.o(.text) } SegmentEnd = .; @@ -4782,7 +4782,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Snowball : AT(RomLocation) { - build/asm/ovl_Obj_Snowball_0x80B02CD0.o(.text) + build/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.o(.text) build/asm/ovl_Obj_Snowball_data.o(.text) } SegmentEnd = .; @@ -4792,7 +4792,7 @@ SECTIONS SegmentStart = .; ovl_Boss_Hakugin : AT(RomLocation) { - build/asm/ovl_Boss_Hakugin_0x80B05290.o(.text) + build/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.o(.text) build/asm/ovl_Boss_Hakugin_data.o(.text) } SegmentEnd = .; @@ -4802,7 +4802,7 @@ SECTIONS SegmentStart = .; ovl_En_Gb2 : AT(RomLocation) { - build/asm/ovl_En_Gb2_0x80B0F5E0.o(.text) + build/src/overlays/actors/ovl_En_Gb2/z_en_gb2.o(.text) build/asm/ovl_En_Gb2_data.o(.text) } SegmentEnd = .; @@ -4812,7 +4812,7 @@ SECTIONS SegmentStart = .; ovl_En_Onpuman : AT(RomLocation) { - build/asm/ovl_En_Onpuman_0x80B11E60.o(.text) + build/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.o(.text) build/asm/ovl_En_Onpuman_data.o(.text) } SegmentEnd = .; @@ -4822,7 +4822,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Tobira01 : AT(RomLocation) { - build/asm/ovl_Bg_Tobira01_0x80B12430.o(.text) + build/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.o(.text) build/asm/ovl_Bg_Tobira01_data.o(.text) } SegmentEnd = .; @@ -4832,7 +4832,7 @@ SECTIONS SegmentStart = .; ovl_En_Tag_Obj : AT(RomLocation) { - build/asm/ovl_En_Tag_Obj_0x80B12870.o(.text) + build/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.o(.text) build/asm/ovl_En_Tag_Obj_data.o(.text) } SegmentEnd = .; @@ -4842,7 +4842,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Dhouse : AT(RomLocation) { - build/asm/ovl_Obj_Dhouse_0x80B12980.o(.text) + build/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.o(.text) build/asm/ovl_Obj_Dhouse_data.o(.text) } SegmentEnd = .; @@ -4852,7 +4852,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Hakaisi : AT(RomLocation) { - build/asm/ovl_Obj_Hakaisi_0x80B14180.o(.text) + build/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.o(.text) build/asm/ovl_Obj_Hakaisi_data.o(.text) } SegmentEnd = .; @@ -4862,7 +4862,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Hakugin_Switch : AT(RomLocation) { - build/asm/ovl_Bg_Hakugin_Switch_0x80B15790.o(.text) + build/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.o(.text) build/asm/ovl_Bg_Hakugin_Switch_data.o(.text) ovl_Bg_Hakugin_Switch_bss_start = .; } @@ -4874,7 +4874,7 @@ SECTIONS SegmentStart = .; ovl_En_Snowman : AT(RomLocation) { - build/asm/ovl_En_Snowman_0x80B16B00.o(.text) + build/src/overlays/actors/ovl_En_Snowman/z_en_snowman.o(.text) build/asm/ovl_En_Snowman_data.o(.text) } SegmentEnd = .; @@ -4884,7 +4884,7 @@ SECTIONS SegmentStart = .; ovl_TG_Sw : AT(RomLocation) { - build/asm/ovl_TG_Sw_0x80B19F60.o(.text) + build/src/overlays/actors/ovl_TG_Sw/z_tg_sw.o(.text) build/asm/ovl_TG_Sw_data.o(.text) } SegmentEnd = .; @@ -4894,7 +4894,7 @@ SECTIONS SegmentStart = .; ovl_En_Po_Sisters : AT(RomLocation) { - build/asm/ovl_En_Po_Sisters_0x80B1A3B0.o(.text) + build/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.o(.text) build/asm/ovl_En_Po_Sisters_data.o(.text) } SegmentEnd = .; @@ -4904,7 +4904,7 @@ SECTIONS SegmentStart = .; ovl_En_Pp : AT(RomLocation) { - build/asm/ovl_En_Pp_0x80B1DEB0.o(.text) + build/src/overlays/actors/ovl_En_Pp/z_en_pp.o(.text) build/asm/ovl_En_Pp_data.o(.text) } SegmentEnd = .; @@ -4914,7 +4914,7 @@ SECTIONS SegmentStart = .; ovl_En_Hakurock : AT(RomLocation) { - build/asm/ovl_En_Hakurock_0x80B21B00.o(.text) + build/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.o(.text) build/asm/ovl_En_Hakurock_data.o(.text) } SegmentEnd = .; @@ -4924,7 +4924,7 @@ SECTIONS SegmentStart = .; ovl_En_Hanabi : AT(RomLocation) { - build/asm/ovl_En_Hanabi_0x80B22C00.o(.text) + build/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.o(.text) build/asm/ovl_En_Hanabi_data.o(.text) } SegmentEnd = .; @@ -4934,7 +4934,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Dowsing : AT(RomLocation) { - build/asm/ovl_Obj_Dowsing_0x80B23D50.o(.text) + build/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.o(.text) build/asm/ovl_Obj_Dowsing_data.o(.text) } SegmentEnd = .; @@ -4944,7 +4944,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Wind : AT(RomLocation) { - build/asm/ovl_Obj_Wind_0x80B23ED0.o(.text) + build/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.o(.text) build/asm/ovl_Obj_Wind_data.o(.text) } SegmentEnd = .; @@ -4954,7 +4954,7 @@ SECTIONS SegmentStart = .; ovl_En_Racedog : AT(RomLocation) { - build/asm/ovl_En_Racedog_0x80B24630.o(.text) + build/src/overlays/actors/ovl_En_Racedog/z_en_racedog.o(.text) build/asm/ovl_En_Racedog_data.o(.text) } SegmentEnd = .; @@ -4964,7 +4964,7 @@ SECTIONS SegmentStart = .; ovl_En_Kendo_Js : AT(RomLocation) { - build/asm/ovl_En_Kendo_Js_0x80B262A0.o(.text) + build/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.o(.text) build/asm/ovl_En_Kendo_Js_data.o(.text) } SegmentEnd = .; @@ -4974,7 +4974,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Botihasira : AT(RomLocation) { - build/asm/ovl_Bg_Botihasira_0x80B28080.o(.text) + build/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.o(.text) build/asm/ovl_Bg_Botihasira_data.o(.text) } SegmentEnd = .; @@ -4984,7 +4984,7 @@ SECTIONS SegmentStart = .; ovl_En_Fish2 : AT(RomLocation) { - build/asm/ovl_En_Fish2_0x80B28370.o(.text) + build/src/overlays/actors/ovl_En_Fish2/z_en_fish2.o(.text) build/asm/ovl_En_Fish2_data.o(.text) } SegmentEnd = .; @@ -4994,7 +4994,7 @@ SECTIONS SegmentStart = .; ovl_En_Pst : AT(RomLocation) { - build/asm/ovl_En_Pst_0x80B2B830.o(.text) + build/src/overlays/actors/ovl_En_Pst/z_en_pst.o(.text) build/asm/ovl_En_Pst_data.o(.text) } SegmentEnd = .; @@ -5004,7 +5004,7 @@ SECTIONS SegmentStart = .; ovl_En_Poh : AT(RomLocation) { - build/asm/ovl_En_Poh_0x80B2C6F0.o(.text) + build/src/overlays/actors/ovl_En_Poh/z_en_poh.o(.text) build/asm/ovl_En_Poh_data.o(.text) } SegmentEnd = .; @@ -5014,7 +5014,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Spidertent : AT(RomLocation) { - build/asm/ovl_Obj_Spidertent_0x80B2FB10.o(.text) + build/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.o(.text) build/asm/ovl_Obj_Spidertent_data.o(.text) } SegmentEnd = .; @@ -5024,7 +5024,7 @@ SECTIONS SegmentStart = .; ovl_En_Zoraegg : AT(RomLocation) { - build/asm/ovl_En_Zoraegg_0x80B31590.o(.text) + build/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.o(.text) build/asm/ovl_En_Zoraegg_data.o(.text) } SegmentEnd = .; @@ -5034,7 +5034,7 @@ SECTIONS SegmentStart = .; ovl_En_Kbt : AT(RomLocation) { - build/asm/ovl_En_Kbt_0x80B33D30.o(.text) + build/src/overlays/actors/ovl_En_Kbt/z_en_kbt.o(.text) build/asm/ovl_En_Kbt_data.o(.text) } SegmentEnd = .; @@ -5044,7 +5044,7 @@ SECTIONS SegmentStart = .; ovl_En_Gg : AT(RomLocation) { - build/asm/ovl_En_Gg_0x80B34F70.o(.text) + build/src/overlays/actors/ovl_En_Gg/z_en_gg.o(.text) build/asm/ovl_En_Gg_data.o(.text) } SegmentEnd = .; @@ -5054,7 +5054,7 @@ SECTIONS SegmentStart = .; ovl_En_Maruta : AT(RomLocation) { - build/asm/ovl_En_Maruta_0x80B37080.o(.text) + build/src/overlays/actors/ovl_En_Maruta/z_en_maruta.o(.text) build/asm/ovl_En_Maruta_data.o(.text) } SegmentEnd = .; @@ -5064,7 +5064,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Snowball2 : AT(RomLocation) { - build/asm/ovl_Obj_Snowball2_0x80B38E20.o(.text) + build/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.o(.text) build/asm/ovl_Obj_Snowball2_data.o(.text) } SegmentEnd = .; @@ -5074,7 +5074,7 @@ SECTIONS SegmentStart = .; ovl_En_Gg2 : AT(RomLocation) { - build/asm/ovl_En_Gg2_0x80B3AC50.o(.text) + build/src/overlays/actors/ovl_En_Gg2/z_en_gg2.o(.text) build/asm/ovl_En_Gg2_data.o(.text) } SegmentEnd = .; @@ -5084,7 +5084,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Ghaka : AT(RomLocation) { - build/asm/ovl_Obj_Ghaka_0x80B3C260.o(.text) + build/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.o(.text) build/asm/ovl_Obj_Ghaka_data.o(.text) } SegmentEnd = .; @@ -5094,7 +5094,7 @@ SECTIONS SegmentStart = .; ovl_En_Dnp : AT(RomLocation) { - build/asm/ovl_En_Dnp_0x80B3CA20.o(.text) + build/src/overlays/actors/ovl_En_Dnp/z_en_dnp.o(.text) build/asm/ovl_En_Dnp_data.o(.text) } SegmentEnd = .; @@ -5104,7 +5104,7 @@ SECTIONS SegmentStart = .; ovl_En_Dai : AT(RomLocation) { - build/asm/ovl_En_Dai_0x80B3DFF0.o(.text) + build/src/overlays/actors/ovl_En_Dai/z_en_dai.o(.text) build/asm/ovl_En_Dai_data.o(.text) } SegmentEnd = .; @@ -5114,7 +5114,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Goron_Oyu : AT(RomLocation) { - build/asm/ovl_Bg_Goron_Oyu_0x80B40080.o(.text) + build/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.o(.text) build/asm/ovl_Bg_Goron_Oyu_data.o(.text) } SegmentEnd = .; @@ -5124,7 +5124,7 @@ SECTIONS SegmentStart = .; ovl_En_Kgy : AT(RomLocation) { - build/asm/ovl_En_Kgy_0x80B40800.o(.text) + build/src/overlays/actors/ovl_En_Kgy/z_en_kgy.o(.text) build/asm/ovl_En_Kgy_data.o(.text) } SegmentEnd = .; @@ -5134,7 +5134,7 @@ SECTIONS SegmentStart = .; ovl_En_Invadepoh : AT(RomLocation) { - build/asm/ovl_En_Invadepoh_0x80B439B0.o(.text) + build/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.o(.text) build/asm/ovl_En_Invadepoh_data.o(.text) ovl_En_Invadepoh_bss_start = .; } @@ -5146,7 +5146,7 @@ SECTIONS SegmentStart = .; ovl_En_Gk : AT(RomLocation) { - build/asm/ovl_En_Gk_0x80B50410.o(.text) + build/src/overlays/actors/ovl_En_Gk/z_en_gk.o(.text) build/asm/ovl_En_Gk_data.o(.text) } SegmentEnd = .; @@ -5156,7 +5156,7 @@ SECTIONS SegmentStart = .; ovl_En_An : AT(RomLocation) { - build/asm/ovl_En_An_0x80B53840.o(.text) + build/src/overlays/actors/ovl_En_An/z_en_an.o(.text) build/asm/ovl_En_An_data.o(.text) } SegmentEnd = .; @@ -5166,7 +5166,7 @@ SECTIONS SegmentStart = .; ovl_En_Bee : AT(RomLocation) { - build/asm/ovl_En_Bee_0x80B5A720.o(.text) + build/src/overlays/actors/ovl_En_Bee/z_en_bee.o(.text) build/asm/ovl_En_Bee_data.o(.text) } SegmentEnd = .; @@ -5176,7 +5176,7 @@ SECTIONS SegmentStart = .; ovl_En_Ot : AT(RomLocation) { - build/asm/ovl_En_Ot_0x80B5B2E0.o(.text) + build/src/overlays/actors/ovl_En_Ot/z_en_ot.o(.text) build/asm/ovl_En_Ot_data.o(.text) ovl_En_Ot_bss_start = .; } @@ -5188,7 +5188,7 @@ SECTIONS SegmentStart = .; ovl_En_Dragon : AT(RomLocation) { - build/asm/ovl_En_Dragon_0x80B5E890.o(.text) + build/src/overlays/actors/ovl_En_Dragon/z_en_dragon.o(.text) build/asm/ovl_En_Dragon_data.o(.text) } SegmentEnd = .; @@ -5198,7 +5198,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Dora : AT(RomLocation) { - build/asm/ovl_Obj_Dora_0x80B60AD0.o(.text) + build/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.o(.text) build/asm/ovl_Obj_Dora_data.o(.text) } SegmentEnd = .; @@ -5208,7 +5208,7 @@ SECTIONS SegmentStart = .; ovl_En_Bigpo : AT(RomLocation) { - build/asm/ovl_En_Bigpo_0x80B615E0.o(.text) + build/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.o(.text) build/asm/ovl_En_Bigpo_data.o(.text) } SegmentEnd = .; @@ -5218,7 +5218,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Kendo_Kanban : AT(RomLocation) { - build/asm/ovl_Obj_Kendo_Kanban_0x80B654C0.o(.text) + build/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.o(.text) build/asm/ovl_Obj_Kendo_Kanban_data.o(.text) } SegmentEnd = .; @@ -5228,7 +5228,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Hariko : AT(RomLocation) { - build/asm/ovl_Obj_Hariko_0x80B66A20.o(.text) + build/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.o(.text) build/asm/ovl_Obj_Hariko_data.o(.text) } SegmentEnd = .; @@ -5238,7 +5238,7 @@ SECTIONS SegmentStart = .; ovl_En_Sth : AT(RomLocation) { - build/asm/ovl_En_Sth_0x80B66D30.o(.text) + build/src/overlays/actors/ovl_En_Sth/z_en_sth.o(.text) build/asm/ovl_En_Sth_data.o(.text) } SegmentEnd = .; @@ -5248,7 +5248,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Sinkai_Kabe : AT(RomLocation) { - build/asm/ovl_Bg_Sinkai_Kabe_0x80B6D660.o(.text) + build/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.o(.text) build/asm/ovl_Bg_Sinkai_Kabe_data.o(.text) } SegmentEnd = .; @@ -5258,7 +5258,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Haka_Curtain : AT(RomLocation) { - build/asm/ovl_Bg_Haka_Curtain_0x80B6DBE0.o(.text) + build/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.o(.text) build/asm/ovl_Bg_Haka_Curtain_data.o(.text) } SegmentEnd = .; @@ -5268,7 +5268,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Kin2_Bombwall : AT(RomLocation) { - build/asm/ovl_Bg_Kin2_Bombwall_0x80B6E020.o(.text) + build/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.o(.text) build/asm/ovl_Bg_Kin2_Bombwall_data.o(.text) } SegmentEnd = .; @@ -5278,7 +5278,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Kin2_Fence : AT(RomLocation) { - build/asm/ovl_Bg_Kin2_Fence_0x80B6E820.o(.text) + build/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.o(.text) build/asm/ovl_Bg_Kin2_Fence_data.o(.text) } SegmentEnd = .; @@ -5288,7 +5288,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Kin2_Picture : AT(RomLocation) { - build/asm/ovl_Bg_Kin2_Picture_0x80B6EFA0.o(.text) + build/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.o(.text) build/asm/ovl_Bg_Kin2_Picture_data.o(.text) } SegmentEnd = .; @@ -5298,7 +5298,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Kin2_Shelf : AT(RomLocation) { - build/asm/ovl_Bg_Kin2_Shelf_0x80B6FB30.o(.text) + build/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.o(.text) build/asm/ovl_Bg_Kin2_Shelf_data.o(.text) } SegmentEnd = .; @@ -5308,7 +5308,7 @@ SECTIONS SegmentStart = .; ovl_En_Rail_Skb : AT(RomLocation) { - build/asm/ovl_En_Rail_Skb_0x80B708C0.o(.text) + build/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.o(.text) build/asm/ovl_En_Rail_Skb_data.o(.text) } SegmentEnd = .; @@ -5318,7 +5318,7 @@ SECTIONS SegmentStart = .; ovl_En_Jg : AT(RomLocation) { - build/asm/ovl_En_Jg_0x80B73A90.o(.text) + build/src/overlays/actors/ovl_En_Jg/z_en_jg.o(.text) build/asm/ovl_En_Jg_data.o(.text) } SegmentEnd = .; @@ -5328,7 +5328,7 @@ SECTIONS SegmentStart = .; ovl_En_Tru_Mt : AT(RomLocation) { - build/asm/ovl_En_Tru_Mt_0x80B76030.o(.text) + build/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.o(.text) build/asm/ovl_En_Tru_Mt_data.o(.text) } SegmentEnd = .; @@ -5338,7 +5338,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Um : AT(RomLocation) { - build/asm/ovl_Obj_Um_0x80B77770.o(.text) + build/src/overlays/actors/ovl_Obj_Um/z_obj_um.o(.text) build/asm/ovl_Obj_Um_data.o(.text) } SegmentEnd = .; @@ -5348,7 +5348,7 @@ SECTIONS SegmentStart = .; ovl_En_Neo_Reeba : AT(RomLocation) { - build/asm/ovl_En_Neo_Reeba_0x80B7C890.o(.text) + build/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.o(.text) build/asm/ovl_En_Neo_Reeba_data.o(.text) } SegmentEnd = .; @@ -5358,7 +5358,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Mbar_Chair : AT(RomLocation) { - build/asm/ovl_Bg_Mbar_Chair_0x80B7E930.o(.text) + build/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.o(.text) build/asm/ovl_Bg_Mbar_Chair_data.o(.text) } SegmentEnd = .; @@ -5368,7 +5368,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Ikana_Block : AT(RomLocation) { - build/asm/ovl_Bg_Ikana_Block_0x80B7EA60.o(.text) + build/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.o(.text) build/asm/ovl_Bg_Ikana_Block_data.o(.text) } SegmentEnd = .; @@ -5378,7 +5378,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Ikana_Mirror : AT(RomLocation) { - build/asm/ovl_Bg_Ikana_Mirror_0x80B7F730.o(.text) + build/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.o(.text) build/asm/ovl_Bg_Ikana_Mirror_data.o(.text) } SegmentEnd = .; @@ -5388,7 +5388,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Ikana_Rotaryroom : AT(RomLocation) { - build/asm/ovl_Bg_Ikana_Rotaryroom_0x80B802E0.o(.text) + build/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.o(.text) build/asm/ovl_Bg_Ikana_Rotaryroom_data.o(.text) } SegmentEnd = .; @@ -5398,7 +5398,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Dblue_Balance : AT(RomLocation) { - build/asm/ovl_Bg_Dblue_Balance_0x80B823B0.o(.text) + build/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.o(.text) build/asm/ovl_Bg_Dblue_Balance_data.o(.text) ovl_Bg_Dblue_Balance_bss_start = .; } @@ -5410,7 +5410,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Dblue_Waterfall : AT(RomLocation) { - build/asm/ovl_Bg_Dblue_Waterfall_0x80B83C80.o(.text) + build/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.o(.text) build/asm/ovl_Bg_Dblue_Waterfall_data.o(.text) } SegmentEnd = .; @@ -5420,7 +5420,7 @@ SECTIONS SegmentStart = .; ovl_En_Kaizoku : AT(RomLocation) { - build/asm/ovl_En_Kaizoku_0x80B85590.o(.text) + build/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.o(.text) build/asm/ovl_En_Kaizoku_data.o(.text) } SegmentEnd = .; @@ -5430,7 +5430,7 @@ SECTIONS SegmentStart = .; ovl_En_Ge2 : AT(RomLocation) { - build/asm/ovl_En_Ge2_0x80B8B2D0.o(.text) + build/src/overlays/actors/ovl_En_Ge2/z_en_ge2.o(.text) build/asm/ovl_En_Ge2_data.o(.text) } SegmentEnd = .; @@ -5440,7 +5440,7 @@ SECTIONS SegmentStart = .; ovl_En_Ma_Yts : AT(RomLocation) { - build/asm/ovl_En_Ma_Yts_0x80B8D030.o(.text) + build/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.o(.text) build/asm/ovl_En_Ma_Yts_data.o(.text) } SegmentEnd = .; @@ -5450,7 +5450,7 @@ SECTIONS SegmentStart = .; ovl_En_Ma_Yto : AT(RomLocation) { - build/asm/ovl_En_Ma_Yto_0x80B8E520.o(.text) + build/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.o(.text) build/asm/ovl_En_Ma_Yto_data.o(.text) } SegmentEnd = .; @@ -5460,7 +5460,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Tokei_Turret : AT(RomLocation) { - build/asm/ovl_Obj_Tokei_Turret_0x80B91CC0.o(.text) + build/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.o(.text) build/asm/ovl_Obj_Tokei_Turret_data.o(.text) } SegmentEnd = .; @@ -5470,7 +5470,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Dblue_Elevator : AT(RomLocation) { - build/asm/ovl_Bg_Dblue_Elevator_0x80B91F20.o(.text) + build/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.o(.text) build/asm/ovl_Bg_Dblue_Elevator_data.o(.text) } SegmentEnd = .; @@ -5480,7 +5480,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Warpstone : AT(RomLocation) { - build/asm/ovl_Obj_Warpstone_0x80B92B10.o(.text) + build/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.o(.text) build/asm/ovl_Obj_Warpstone_data.o(.text) } SegmentEnd = .; @@ -5490,7 +5490,7 @@ SECTIONS SegmentStart = .; ovl_En_Zog : AT(RomLocation) { - build/asm/ovl_En_Zog_0x80B93310.o(.text) + build/src/overlays/actors/ovl_En_Zog/z_en_zog.o(.text) build/asm/ovl_En_Zog_data.o(.text) ovl_En_Zog_bss_start = .; } @@ -5502,7 +5502,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Rotlift : AT(RomLocation) { - build/asm/ovl_Obj_Rotlift_0x80B95E20.o(.text) + build/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.o(.text) build/asm/ovl_Obj_Rotlift_data.o(.text) } SegmentEnd = .; @@ -5512,7 +5512,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Jg_Gakki : AT(RomLocation) { - build/asm/ovl_Obj_Jg_Gakki_0x80B961E0.o(.text) + build/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.o(.text) build/asm/ovl_Obj_Jg_Gakki_data.o(.text) } SegmentEnd = .; @@ -5522,7 +5522,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Inibs_Movebg : AT(RomLocation) { - build/asm/ovl_Bg_Inibs_Movebg_0x80B96410.o(.text) + build/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.o(.text) build/asm/ovl_Bg_Inibs_Movebg_data.o(.text) } SegmentEnd = .; @@ -5532,7 +5532,7 @@ SECTIONS SegmentStart = .; ovl_En_Zot : AT(RomLocation) { - build/asm/ovl_En_Zot_0x80B965D0.o(.text) + build/src/overlays/actors/ovl_En_Zot/z_en_zot.o(.text) build/asm/ovl_En_Zot_data.o(.text) } SegmentEnd = .; @@ -5542,7 +5542,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Tree : AT(RomLocation) { - build/asm/ovl_Obj_Tree_0x80B9A0B0.o(.text) + build/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.o(.text) build/asm/ovl_Obj_Tree_data.o(.text) } SegmentEnd = .; @@ -5552,7 +5552,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Y2lift : AT(RomLocation) { - build/asm/ovl_Obj_Y2lift_0x80B9A650.o(.text) + build/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.o(.text) build/asm/ovl_Obj_Y2lift_data.o(.text) } SegmentEnd = .; @@ -5562,7 +5562,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Y2shutter : AT(RomLocation) { - build/asm/ovl_Obj_Y2shutter_0x80B9A980.o(.text) + build/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.o(.text) build/asm/ovl_Obj_Y2shutter_data.o(.text) } SegmentEnd = .; @@ -5572,7 +5572,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Boat : AT(RomLocation) { - build/asm/ovl_Obj_Boat_0x80B9AF50.o(.text) + build/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.o(.text) build/asm/ovl_Obj_Boat_data.o(.text) } SegmentEnd = .; @@ -5582,7 +5582,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Taru : AT(RomLocation) { - build/asm/ovl_Obj_Taru_0x80B9B6E0.o(.text) + build/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.o(.text) build/asm/ovl_Obj_Taru_data.o(.text) } SegmentEnd = .; @@ -5592,7 +5592,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Hunsui : AT(RomLocation) { - build/asm/ovl_Obj_Hunsui_0x80B9C450.o(.text) + build/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.o(.text) build/asm/ovl_Obj_Hunsui_data.o(.text) ovl_Obj_Hunsui_bss_start = .; } @@ -5604,7 +5604,7 @@ SECTIONS SegmentStart = .; ovl_En_Jc_Mato : AT(RomLocation) { - build/asm/ovl_En_Jc_Mato_0x80B9DEE0.o(.text) + build/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.o(.text) build/asm/ovl_En_Jc_Mato_data.o(.text) } SegmentEnd = .; @@ -5614,7 +5614,7 @@ SECTIONS SegmentStart = .; ovl_Mir_Ray3 : AT(RomLocation) { - build/asm/ovl_Mir_Ray3_0x80B9E2C0.o(.text) + build/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.o(.text) build/asm/ovl_Mir_Ray3_data.o(.text) } SegmentEnd = .; @@ -5624,7 +5624,7 @@ SECTIONS SegmentStart = .; ovl_En_Zob : AT(RomLocation) { - build/asm/ovl_En_Zob_0x80B9F570.o(.text) + build/src/overlays/actors/ovl_En_Zob/z_en_zob.o(.text) build/asm/ovl_En_Zob_data.o(.text) } SegmentEnd = .; @@ -5634,7 +5634,7 @@ SECTIONS SegmentStart = .; ovl_Elf_Msg6 : AT(RomLocation) { - build/asm/ovl_Elf_Msg6_0x80BA15A0.o(.text) + build/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.o(.text) build/asm/ovl_Elf_Msg6_data.o(.text) } SegmentEnd = .; @@ -5644,7 +5644,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Nozoki : AT(RomLocation) { - build/asm/ovl_Obj_Nozoki_0x80BA2420.o(.text) + build/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.o(.text) build/asm/ovl_Obj_Nozoki_data.o(.text) ovl_Obj_Nozoki_bss_start = .; } @@ -5656,7 +5656,7 @@ SECTIONS SegmentStart = .; ovl_En_Toto : AT(RomLocation) { - build/asm/ovl_En_Toto_0x80BA36C0.o(.text) + build/src/overlays/actors/ovl_En_Toto/z_en_toto.o(.text) build/asm/ovl_En_Toto_data.o(.text) } SegmentEnd = .; @@ -5666,7 +5666,7 @@ SECTIONS SegmentStart = .; ovl_En_Railgibud : AT(RomLocation) { - build/asm/ovl_En_Railgibud_0x80BA5400.o(.text) + build/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.o(.text) build/asm/ovl_En_Railgibud_data.o(.text) } SegmentEnd = .; @@ -5676,7 +5676,7 @@ SECTIONS SegmentStart = .; ovl_En_Baba : AT(RomLocation) { - build/asm/ovl_En_Baba_0x80BA8820.o(.text) + build/src/overlays/actors/ovl_En_Baba/z_en_baba.o(.text) build/asm/ovl_En_Baba_data.o(.text) } SegmentEnd = .; @@ -5686,7 +5686,7 @@ SECTIONS SegmentStart = .; ovl_En_Suttari : AT(RomLocation) { - build/asm/ovl_En_Suttari_0x80BAA6D0.o(.text) + build/src/overlays/actors/ovl_En_Suttari/z_en_suttari.o(.text) build/asm/ovl_En_Suttari_data.o(.text) } SegmentEnd = .; @@ -5696,7 +5696,7 @@ SECTIONS SegmentStart = .; ovl_En_Zod : AT(RomLocation) { - build/asm/ovl_En_Zod_0x80BAEF70.o(.text) + build/src/overlays/actors/ovl_En_Zod/z_en_zod.o(.text) build/asm/ovl_En_Zod_data.o(.text) } SegmentEnd = .; @@ -5706,7 +5706,7 @@ SECTIONS SegmentStart = .; ovl_En_Kujiya : AT(RomLocation) { - build/asm/ovl_En_Kujiya_0x80BB08E0.o(.text) + build/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.o(.text) build/asm/ovl_En_Kujiya_data.o(.text) } SegmentEnd = .; @@ -5716,7 +5716,7 @@ SECTIONS SegmentStart = .; ovl_En_Geg : AT(RomLocation) { - build/asm/ovl_En_Geg_0x80BB16D0.o(.text) + build/src/overlays/actors/ovl_En_Geg/z_en_geg.o(.text) build/asm/ovl_En_Geg_data.o(.text) } SegmentEnd = .; @@ -5726,7 +5726,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Kinoko : AT(RomLocation) { - build/asm/ovl_Obj_Kinoko_0x80BB4700.o(.text) + build/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.o(.text) build/asm/ovl_Obj_Kinoko_data.o(.text) } SegmentEnd = .; @@ -5736,7 +5736,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Yasi : AT(RomLocation) { - build/asm/ovl_Obj_Yasi_0x80BB4AF0.o(.text) + build/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.o(.text) build/asm/ovl_Obj_Yasi_data.o(.text) } SegmentEnd = .; @@ -5746,7 +5746,7 @@ SECTIONS SegmentStart = .; ovl_En_Tanron1 : AT(RomLocation) { - build/asm/ovl_En_Tanron1_0x80BB4E00.o(.text) + build/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.o(.text) build/asm/ovl_En_Tanron1_data.o(.text) } SegmentEnd = .; @@ -5756,7 +5756,7 @@ SECTIONS SegmentStart = .; ovl_En_Tanron2 : AT(RomLocation) { - build/asm/ovl_En_Tanron2_0x80BB67D0.o(.text) + build/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.o(.text) build/asm/ovl_En_Tanron2_data.o(.text) ovl_En_Tanron2_bss_start = .; } @@ -5768,7 +5768,7 @@ SECTIONS SegmentStart = .; ovl_En_Tanron3 : AT(RomLocation) { - build/asm/ovl_En_Tanron3_0x80BB85A0.o(.text) + build/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.o(.text) build/asm/ovl_En_Tanron3_data.o(.text) } SegmentEnd = .; @@ -5778,7 +5778,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Chan : AT(RomLocation) { - build/asm/ovl_Obj_Chan_0x80BB98E0.o(.text) + build/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.o(.text) build/asm/ovl_Obj_Chan_data.o(.text) ovl_Obj_Chan_bss_start = .; } @@ -5790,7 +5790,7 @@ SECTIONS SegmentStart = .; ovl_En_Zos : AT(RomLocation) { - build/asm/ovl_En_Zos_0x80BBACA0.o(.text) + build/src/overlays/actors/ovl_En_Zos/z_en_zos.o(.text) build/asm/ovl_En_Zos_data.o(.text) } SegmentEnd = .; @@ -5800,7 +5800,7 @@ SECTIONS SegmentStart = .; ovl_En_S_Goro : AT(RomLocation) { - build/asm/ovl_En_S_Goro_0x80BBCA80.o(.text) + build/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.o(.text) build/asm/ovl_En_S_Goro_data.o(.text) } SegmentEnd = .; @@ -5810,7 +5810,7 @@ SECTIONS SegmentStart = .; ovl_En_Nb : AT(RomLocation) { - build/asm/ovl_En_Nb_0x80BBFDB0.o(.text) + build/src/overlays/actors/ovl_En_Nb/z_en_nb.o(.text) build/asm/ovl_En_Nb_data.o(.text) } SegmentEnd = .; @@ -5820,7 +5820,7 @@ SECTIONS SegmentStart = .; ovl_En_Ja : AT(RomLocation) { - build/asm/ovl_En_Ja_0x80BC1900.o(.text) + build/src/overlays/actors/ovl_En_Ja/z_en_ja.o(.text) build/asm/ovl_En_Ja_data.o(.text) } SegmentEnd = .; @@ -5830,7 +5830,7 @@ SECTIONS SegmentStart = .; ovl_Bg_F40_Block : AT(RomLocation) { - build/asm/ovl_Bg_F40_Block_0x80BC3980.o(.text) + build/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.o(.text) build/asm/ovl_Bg_F40_Block_data.o(.text) } SegmentEnd = .; @@ -5840,7 +5840,7 @@ SECTIONS SegmentStart = .; ovl_Bg_F40_Switch : AT(RomLocation) { - build/asm/ovl_Bg_F40_Switch_0x80BC47B0.o(.text) + build/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.o(.text) build/asm/ovl_Bg_F40_Switch_data.o(.text) ovl_Bg_F40_Switch_bss_start = .; } @@ -5852,7 +5852,7 @@ SECTIONS SegmentStart = .; ovl_En_Po_Composer : AT(RomLocation) { - build/asm/ovl_En_Po_Composer_0x80BC4F30.o(.text) + build/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.o(.text) build/asm/ovl_En_Po_Composer_data.o(.text) } SegmentEnd = .; @@ -5862,7 +5862,7 @@ SECTIONS SegmentStart = .; ovl_En_Guruguru : AT(RomLocation) { - build/asm/ovl_En_Guruguru_0x80BC6BF0.o(.text) + build/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.o(.text) build/asm/ovl_En_Guruguru_data.o(.text) } SegmentEnd = .; @@ -5872,7 +5872,7 @@ SECTIONS SegmentStart = .; ovl_Oceff_Wipe5 : AT(RomLocation) { - build/asm/ovl_Oceff_Wipe5_0x80BC7AD0.o(.text) + build/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.o(.text) build/asm/ovl_Oceff_Wipe5_data.o(.text) ovl_Oceff_Wipe5_bss_start = .; } @@ -5884,7 +5884,7 @@ SECTIONS SegmentStart = .; ovl_En_Stone_heishi : AT(RomLocation) { - build/asm/ovl_En_Stone_heishi_0x80BC9270.o(.text) + build/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.o(.text) build/asm/ovl_En_Stone_heishi_data.o(.text) } SegmentEnd = .; @@ -5894,7 +5894,7 @@ SECTIONS SegmentStart = .; ovl_Oceff_Wipe6 : AT(RomLocation) { - build/asm/ovl_Oceff_Wipe6_0x80BCA5A0.o(.text) + build/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.o(.text) build/asm/ovl_Oceff_Wipe6_data.o(.text) } SegmentEnd = .; @@ -5904,7 +5904,7 @@ SECTIONS SegmentStart = .; ovl_En_Scopenuts : AT(RomLocation) { - build/asm/ovl_En_Scopenuts_0x80BCABF0.o(.text) + build/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.o(.text) build/asm/ovl_En_Scopenuts_data.o(.text) } SegmentEnd = .; @@ -5914,7 +5914,7 @@ SECTIONS SegmentStart = .; ovl_En_Scopecrow : AT(RomLocation) { - build/asm/ovl_En_Scopecrow_0x80BCD000.o(.text) + build/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.o(.text) build/asm/ovl_En_Scopecrow_data.o(.text) } SegmentEnd = .; @@ -5924,7 +5924,7 @@ SECTIONS SegmentStart = .; ovl_Oceff_Wipe7 : AT(RomLocation) { - build/asm/ovl_Oceff_Wipe7_0x80BCDCB0.o(.text) + build/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.o(.text) build/asm/ovl_Oceff_Wipe7_data.o(.text) ovl_Oceff_Wipe7_bss_start = .; } @@ -5936,7 +5936,7 @@ SECTIONS SegmentStart = .; ovl_Eff_Kamejima_Wave : AT(RomLocation) { - build/asm/ovl_Eff_Kamejima_Wave_0x80BCEB20.o(.text) + build/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.o(.text) build/asm/ovl_Eff_Kamejima_Wave_data.o(.text) ovl_Eff_Kamejima_Wave_bss_start = .; } @@ -5948,7 +5948,7 @@ SECTIONS SegmentStart = .; ovl_En_Hg : AT(RomLocation) { - build/asm/ovl_En_Hg_0x80BCF1D0.o(.text) + build/src/overlays/actors/ovl_En_Hg/z_en_hg.o(.text) build/asm/ovl_En_Hg_data.o(.text) } SegmentEnd = .; @@ -5958,7 +5958,7 @@ SECTIONS SegmentStart = .; ovl_En_Hgo : AT(RomLocation) { - build/asm/ovl_En_Hgo_0x80BD02B0.o(.text) + build/src/overlays/actors/ovl_En_Hgo/z_en_hgo.o(.text) build/asm/ovl_En_Hgo_data.o(.text) } SegmentEnd = .; @@ -5968,7 +5968,7 @@ SECTIONS SegmentStart = .; ovl_En_Zov : AT(RomLocation) { - build/asm/ovl_En_Zov_0x80BD11E0.o(.text) + build/src/overlays/actors/ovl_En_Zov/z_en_zov.o(.text) build/asm/ovl_En_Zov_data.o(.text) } SegmentEnd = .; @@ -5978,7 +5978,7 @@ SECTIONS SegmentStart = .; ovl_En_Ah : AT(RomLocation) { - build/asm/ovl_En_Ah_0x80BD2A30.o(.text) + build/src/overlays/actors/ovl_En_Ah/z_en_ah.o(.text) build/asm/ovl_En_Ah_data.o(.text) } SegmentEnd = .; @@ -5988,7 +5988,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Hgdoor : AT(RomLocation) { - build/asm/ovl_Obj_Hgdoor_0x80BD4090.o(.text) + build/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.o(.text) build/asm/ovl_Obj_Hgdoor_data.o(.text) } SegmentEnd = .; @@ -5998,7 +5998,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Ikana_Bombwall : AT(RomLocation) { - build/asm/ovl_Bg_Ikana_Bombwall_0x80BD4720.o(.text) + build/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.o(.text) build/asm/ovl_Bg_Ikana_Bombwall_data.o(.text) } SegmentEnd = .; @@ -6008,10 +6008,10 @@ SECTIONS SegmentStart = .; ovl_Bg_Ikana_Ray : AT(RomLocation) { - build/src/actors/Bg_Ikana_Ray/z_bg_ikana_ray.o(.text) - build/src/actors/Bg_Ikana_Ray/z_bg_ikana_ray.o(.data) - build/src/actors/Bg_Ikana_Ray/z_bg_ikana_ray.o(.rodata) - build/src/actors/Bg_Ikana_Ray/z_bg_ikana_ray_overlay.o(.ovl) + build/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.o(.text) + build/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.o(.data) + build/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.o(.rodata) + build/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -6020,7 +6020,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Ikana_Shutter : AT(RomLocation) { - build/asm/ovl_Bg_Ikana_Shutter_0x80BD5690.o(.text) + build/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.o(.text) build/asm/ovl_Bg_Ikana_Shutter_data.o(.text) } SegmentEnd = .; @@ -6030,7 +6030,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Haka_Bombwall : AT(RomLocation) { - build/asm/ovl_Bg_Haka_Bombwall_0x80BD5E00.o(.text) + build/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.o(.text) build/asm/ovl_Bg_Haka_Bombwall_data.o(.text) } SegmentEnd = .; @@ -6040,7 +6040,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Haka_Tomb : AT(RomLocation) { - build/asm/ovl_Bg_Haka_Tomb_0x80BD6580.o(.text) + build/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.o(.text) build/asm/ovl_Bg_Haka_Tomb_data.o(.text) } SegmentEnd = .; @@ -6050,7 +6050,7 @@ SECTIONS SegmentStart = .; ovl_En_Sc_Ruppe : AT(RomLocation) { - build/asm/ovl_En_Sc_Ruppe_0x80BD6910.o(.text) + build/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.o(.text) build/asm/ovl_En_Sc_Ruppe_data.o(.text) } SegmentEnd = .; @@ -6060,7 +6060,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Iknv_Doukutu : AT(RomLocation) { - build/asm/ovl_Bg_Iknv_Doukutu_0x80BD6F10.o(.text) + build/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.o(.text) build/asm/ovl_Bg_Iknv_Doukutu_data.o(.text) } SegmentEnd = .; @@ -6070,7 +6070,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Iknv_Obj : AT(RomLocation) { - build/asm/ovl_Bg_Iknv_Obj_0x80BD7AB0.o(.text) + build/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.o(.text) build/asm/ovl_Bg_Iknv_Obj_data.o(.text) } SegmentEnd = .; @@ -6080,7 +6080,7 @@ SECTIONS SegmentStart = .; ovl_En_Pamera : AT(RomLocation) { - build/asm/ovl_En_Pamera_0x80BD82B0.o(.text) + build/src/overlays/actors/ovl_En_Pamera/z_en_pamera.o(.text) build/asm/ovl_En_Pamera_data.o(.text) } SegmentEnd = .; @@ -6090,7 +6090,7 @@ SECTIONS SegmentStart = .; ovl_Obj_HsStump : AT(RomLocation) { - build/asm/ovl_Obj_HsStump_0x80BDAA30.o(.text) + build/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.o(.text) build/asm/ovl_Obj_HsStump_data.o(.text) } SegmentEnd = .; @@ -6100,7 +6100,7 @@ SECTIONS SegmentStart = .; ovl_En_Hidden_Nuts : AT(RomLocation) { - build/asm/ovl_En_Hidden_Nuts_0x80BDB040.o(.text) + build/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.o(.text) build/asm/ovl_En_Hidden_Nuts_data.o(.text) } SegmentEnd = .; @@ -6110,7 +6110,7 @@ SECTIONS SegmentStart = .; ovl_En_Zow : AT(RomLocation) { - build/asm/ovl_En_Zow_0x80BDC270.o(.text) + build/src/overlays/actors/ovl_En_Zow/z_en_zow.o(.text) build/asm/ovl_En_Zow_data.o(.text) } SegmentEnd = .; @@ -6120,7 +6120,7 @@ SECTIONS SegmentStart = .; ovl_En_Talk : AT(RomLocation) { - build/asm/ovl_En_Talk_0x80BDDFE0.o(.text) + build/src/overlays/actors/ovl_En_Talk/z_en_talk.o(.text) build/asm/ovl_En_Talk_data.o(.text) } SegmentEnd = .; @@ -6130,7 +6130,7 @@ SECTIONS SegmentStart = .; ovl_En_Al : AT(RomLocation) { - build/asm/ovl_En_Al_0x80BDE1A0.o(.text) + build/src/overlays/actors/ovl_En_Al/z_en_al.o(.text) build/asm/ovl_En_Al_data.o(.text) } SegmentEnd = .; @@ -6140,7 +6140,7 @@ SECTIONS SegmentStart = .; ovl_En_Tab : AT(RomLocation) { - build/asm/ovl_En_Tab_0x80BE04E0.o(.text) + build/src/overlays/actors/ovl_En_Tab/z_en_tab.o(.text) build/asm/ovl_En_Tab_data.o(.text) } SegmentEnd = .; @@ -6150,7 +6150,7 @@ SECTIONS SegmentStart = .; ovl_En_Nimotsu : AT(RomLocation) { - build/asm/ovl_En_Nimotsu_0x80BE1C80.o(.text) + build/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.o(.text) build/asm/ovl_En_Nimotsu_data.o(.text) } SegmentEnd = .; @@ -6160,7 +6160,7 @@ SECTIONS SegmentStart = .; ovl_En_Hit_Tag : AT(RomLocation) { - build/asm/ovl_En_Hit_Tag_0x80BE2030.o(.text) + build/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.o(.text) build/asm/ovl_En_Hit_Tag_data.o(.text) } SegmentEnd = .; @@ -6170,7 +6170,7 @@ SECTIONS SegmentStart = .; ovl_En_Ruppecrow : AT(RomLocation) { - build/asm/ovl_En_Ruppecrow_0x80BE2260.o(.text) + build/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.o(.text) build/asm/ovl_En_Ruppecrow_data.o(.text) } SegmentEnd = .; @@ -6180,7 +6180,7 @@ SECTIONS SegmentStart = .; ovl_En_Tanron4 : AT(RomLocation) { - build/asm/ovl_En_Tanron4_0x80BE3B80.o(.text) + build/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.o(.text) build/asm/ovl_En_Tanron4_data.o(.text) } SegmentEnd = .; @@ -6190,7 +6190,7 @@ SECTIONS SegmentStart = .; ovl_En_Tanron5 : AT(RomLocation) { - build/asm/ovl_En_Tanron5_0x80BE4930.o(.text) + build/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.o(.text) build/asm/ovl_En_Tanron5_data.o(.text) } SegmentEnd = .; @@ -6200,7 +6200,7 @@ SECTIONS SegmentStart = .; ovl_En_Tanron6 : AT(RomLocation) { - build/asm/ovl_En_Tanron6_0x80BE6040.o(.text) + build/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.o(.text) build/asm/ovl_En_Tanron6_data.o(.text) } SegmentEnd = .; @@ -6210,7 +6210,7 @@ SECTIONS SegmentStart = .; ovl_En_Daiku2 : AT(RomLocation) { - build/asm/ovl_En_Daiku2_0x80BE61D0.o(.text) + build/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.o(.text) build/asm/ovl_En_Daiku2_data.o(.text) } SegmentEnd = .; @@ -6220,7 +6220,7 @@ SECTIONS SegmentStart = .; ovl_En_Muto : AT(RomLocation) { - build/asm/ovl_En_Muto_0x80BE7B00.o(.text) + build/src/overlays/actors/ovl_En_Muto/z_en_muto.o(.text) build/asm/ovl_En_Muto_data.o(.text) } SegmentEnd = .; @@ -6230,7 +6230,7 @@ SECTIONS SegmentStart = .; ovl_En_Baisen : AT(RomLocation) { - build/asm/ovl_En_Baisen_0x80BE84F0.o(.text) + build/src/overlays/actors/ovl_En_Baisen/z_en_baisen.o(.text) build/asm/ovl_En_Baisen_data.o(.text) } SegmentEnd = .; @@ -6240,7 +6240,7 @@ SECTIONS SegmentStart = .; ovl_En_Heishi : AT(RomLocation) { - build/asm/ovl_En_Heishi_0x80BE8F20.o(.text) + build/src/overlays/actors/ovl_En_Heishi/z_en_heishi.o(.text) build/asm/ovl_En_Heishi_data.o(.text) } SegmentEnd = .; @@ -6250,7 +6250,7 @@ SECTIONS SegmentStart = .; ovl_En_Demo_heishi : AT(RomLocation) { - build/asm/ovl_En_Demo_heishi_0x80BE9510.o(.text) + build/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.o(.text) build/asm/ovl_En_Demo_heishi_data.o(.text) } SegmentEnd = .; @@ -6260,7 +6260,7 @@ SECTIONS SegmentStart = .; ovl_En_Dt : AT(RomLocation) { - build/asm/ovl_En_Dt_0x80BE9B20.o(.text) + build/src/overlays/actors/ovl_En_Dt/z_en_dt.o(.text) build/asm/ovl_En_Dt_data.o(.text) } SegmentEnd = .; @@ -6270,7 +6270,7 @@ SECTIONS SegmentStart = .; ovl_En_Cha : AT(RomLocation) { - build/asm/ovl_En_Cha_0x80BEB520.o(.text) + build/src/overlays/actors/ovl_En_Cha/z_en_cha.o(.text) build/asm/ovl_En_Cha_data.o(.text) } SegmentEnd = .; @@ -6280,7 +6280,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Dinner : AT(RomLocation) { - build/asm/ovl_Obj_Dinner_0x80BEB940.o(.text) + build/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.o(.text) build/asm/ovl_Obj_Dinner_data.o(.text) } SegmentEnd = .; @@ -6290,7 +6290,7 @@ SECTIONS SegmentStart = .; ovl_Eff_Lastday : AT(RomLocation) { - build/asm/ovl_Eff_Lastday_0x80BEBAC0.o(.text) + build/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.o(.text) build/asm/ovl_Eff_Lastday_data.o(.text) } SegmentEnd = .; @@ -6300,7 +6300,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Ikana_Dharma : AT(RomLocation) { - build/asm/ovl_Bg_Ikana_Dharma_0x80BEC240.o(.text) + build/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.o(.text) build/asm/ovl_Bg_Ikana_Dharma_data.o(.text) ovl_Bg_Ikana_Dharma_bss_start = .; } @@ -6312,7 +6312,7 @@ SECTIONS SegmentStart = .; ovl_En_Akindonuts : AT(RomLocation) { - build/asm/ovl_En_Akindonuts_0x80BECBE0.o(.text) + build/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.o(.text) build/asm/ovl_En_Akindonuts_data.o(.text) } SegmentEnd = .; @@ -6322,7 +6322,7 @@ SECTIONS SegmentStart = .; ovl_Eff_Stk : AT(RomLocation) { - build/asm/ovl_Eff_Stk_0x80BF0D90.o(.text) + build/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.o(.text) build/asm/ovl_Eff_Stk_data.o(.text) } SegmentEnd = .; @@ -6332,7 +6332,7 @@ SECTIONS SegmentStart = .; ovl_En_Ig : AT(RomLocation) { - build/asm/ovl_En_Ig_0x80BF1150.o(.text) + build/src/overlays/actors/ovl_En_Ig/z_en_ig.o(.text) build/asm/ovl_En_Ig_data.o(.text) } SegmentEnd = .; @@ -6342,7 +6342,7 @@ SECTIONS SegmentStart = .; ovl_En_Rg : AT(RomLocation) { - build/asm/ovl_En_Rg_0x80BF3920.o(.text) + build/src/overlays/actors/ovl_En_Rg/z_en_rg.o(.text) build/asm/ovl_En_Rg_data.o(.text) ovl_En_Rg_bss_start = .; } @@ -6354,7 +6354,7 @@ SECTIONS SegmentStart = .; ovl_En_Osk : AT(RomLocation) { - build/asm/ovl_En_Osk_0x80BF5C20.o(.text) + build/src/overlays/actors/ovl_En_Osk/z_en_osk.o(.text) build/asm/ovl_En_Osk_data.o(.text) } SegmentEnd = .; @@ -6364,7 +6364,7 @@ SECTIONS SegmentStart = .; ovl_En_Sth2 : AT(RomLocation) { - build/asm/ovl_En_Sth2_0x80BF74E0.o(.text) + build/src/overlays/actors/ovl_En_Sth2/z_en_sth2.o(.text) build/asm/ovl_En_Sth2_data.o(.text) } SegmentEnd = .; @@ -6374,7 +6374,7 @@ SECTIONS SegmentStart = .; ovl_En_Yb : AT(RomLocation) { - build/asm/ovl_En_Yb_0x80BFA100.o(.text) + build/src/overlays/actors/ovl_En_Yb/z_en_yb.o(.text) build/asm/ovl_En_Yb_data.o(.text) } SegmentEnd = .; @@ -6384,7 +6384,7 @@ SECTIONS SegmentStart = .; ovl_En_Rz : AT(RomLocation) { - build/asm/ovl_En_Rz_0x80BFB480.o(.text) + build/src/overlays/actors/ovl_En_Rz/z_en_rz.o(.text) build/asm/ovl_En_Rz_data.o(.text) } SegmentEnd = .; @@ -6394,7 +6394,7 @@ SECTIONS SegmentStart = .; ovl_En_Scopecoin : AT(RomLocation) { - build/asm/ovl_En_Scopecoin_0x80BFCFA0.o(.text) + build/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.o(.text) build/asm/ovl_En_Scopecoin_data.o(.text) } SegmentEnd = .; @@ -6404,7 +6404,7 @@ SECTIONS SegmentStart = .; ovl_En_Bjt : AT(RomLocation) { - build/asm/ovl_En_Bjt_0x80BFD2E0.o(.text) + build/src/overlays/actors/ovl_En_Bjt/z_en_bjt.o(.text) build/asm/ovl_En_Bjt_data.o(.text) } SegmentEnd = .; @@ -6414,7 +6414,7 @@ SECTIONS SegmentStart = .; ovl_En_Bomjima : AT(RomLocation) { - build/asm/ovl_En_Bomjima_0x80BFE170.o(.text) + build/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.o(.text) build/asm/ovl_En_Bomjima_data.o(.text) } SegmentEnd = .; @@ -6424,7 +6424,7 @@ SECTIONS SegmentStart = .; ovl_En_Bomjimb : AT(RomLocation) { - build/asm/ovl_En_Bomjimb_0x80C00EA0.o(.text) + build/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.o(.text) build/asm/ovl_En_Bomjimb_data.o(.text) } SegmentEnd = .; @@ -6434,7 +6434,7 @@ SECTIONS SegmentStart = .; ovl_En_Bombers : AT(RomLocation) { - build/asm/ovl_En_Bombers_0x80C03530.o(.text) + build/src/overlays/actors/ovl_En_Bombers/z_en_bombers.o(.text) build/asm/ovl_En_Bombers_data.o(.text) } SegmentEnd = .; @@ -6444,7 +6444,7 @@ SECTIONS SegmentStart = .; ovl_En_Bombers2 : AT(RomLocation) { - build/asm/ovl_En_Bombers2_0x80C04930.o(.text) + build/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.o(.text) build/asm/ovl_En_Bombers2_data.o(.text) } SegmentEnd = .; @@ -6454,7 +6454,7 @@ SECTIONS SegmentStart = .; ovl_En_Bombal : AT(RomLocation) { - build/asm/ovl_En_Bombal_0x80C05A70.o(.text) + build/src/overlays/actors/ovl_En_Bombal/z_en_bombal.o(.text) build/asm/ovl_En_Bombal_data.o(.text) } SegmentEnd = .; @@ -6464,7 +6464,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Moon_Stone : AT(RomLocation) { - build/asm/ovl_Obj_Moon_Stone_0x80C06510.o(.text) + build/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.o(.text) build/asm/ovl_Obj_Moon_Stone_data.o(.text) } SegmentEnd = .; @@ -6474,7 +6474,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Mu_Pict : AT(RomLocation) { - build/asm/ovl_Obj_Mu_Pict_0x80C06AA0.o(.text) + build/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.o(.text) build/asm/ovl_Obj_Mu_Pict_data.o(.text) } SegmentEnd = .; @@ -6484,7 +6484,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Ikninside : AT(RomLocation) { - build/asm/ovl_Bg_Ikninside_0x80C07110.o(.text) + build/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.o(.text) build/asm/ovl_Bg_Ikninside_data.o(.text) } SegmentEnd = .; @@ -6494,7 +6494,7 @@ SECTIONS SegmentStart = .; ovl_Eff_Zoraband : AT(RomLocation) { - build/asm/ovl_Eff_Zoraband_0x80C07740.o(.text) + build/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.o(.text) build/asm/ovl_Eff_Zoraband_data.o(.text) } SegmentEnd = .; @@ -6504,7 +6504,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Kepn_Koya : AT(RomLocation) { - build/asm/ovl_Obj_Kepn_Koya_0x80C07B20.o(.text) + build/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.o(.text) build/asm/ovl_Obj_Kepn_Koya_data.o(.text) } SegmentEnd = .; @@ -6514,7 +6514,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Usiyane : AT(RomLocation) { - build/asm/ovl_Obj_Usiyane_0x80C07C80.o(.text) + build/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.o(.text) build/asm/ovl_Obj_Usiyane_data.o(.text) } SegmentEnd = .; @@ -6524,7 +6524,7 @@ SECTIONS SegmentStart = .; ovl_En_Nnh : AT(RomLocation) { - build/asm/ovl_En_Nnh_0x80C08760.o(.text) + build/src/overlays/actors/ovl_En_Nnh/z_en_nnh.o(.text) build/asm/ovl_En_Nnh_data.o(.text) } SegmentEnd = .; @@ -6534,7 +6534,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Kzsaku : AT(RomLocation) { - build/asm/ovl_Obj_Kzsaku_0x80C08A80.o(.text) + build/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.o(.text) build/asm/ovl_Obj_Kzsaku_data.o(.text) } SegmentEnd = .; @@ -6544,7 +6544,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Milk_Bin : AT(RomLocation) { - build/asm/ovl_Obj_Milk_Bin_0x80C08E40.o(.text) + build/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.o(.text) build/asm/ovl_Obj_Milk_Bin_data.o(.text) } SegmentEnd = .; @@ -6554,7 +6554,7 @@ SECTIONS SegmentStart = .; ovl_En_Kitan : AT(RomLocation) { - build/asm/ovl_En_Kitan_0x80C090D0.o(.text) + build/src/overlays/actors/ovl_En_Kitan/z_en_kitan.o(.text) build/asm/ovl_En_Kitan_data.o(.text) } SegmentEnd = .; @@ -6564,7 +6564,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Astr_Bombwall : AT(RomLocation) { - build/asm/ovl_Bg_Astr_Bombwall_0x80C09ED0.o(.text) + build/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.o(.text) build/asm/ovl_Bg_Astr_Bombwall_data.o(.text) } SegmentEnd = .; @@ -6574,7 +6574,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Iknin_Susceil : AT(RomLocation) { - build/asm/ovl_Bg_Iknin_Susceil_0x80C0A740.o(.text) + build/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.o(.text) build/asm/ovl_Bg_Iknin_Susceil_data.o(.text) } SegmentEnd = .; @@ -6584,7 +6584,7 @@ SECTIONS SegmentStart = .; ovl_En_Bsb : AT(RomLocation) { - build/asm/ovl_En_Bsb_0x80C0B290.o(.text) + build/src/overlays/actors/ovl_En_Bsb/z_en_bsb.o(.text) build/asm/ovl_En_Bsb_data.o(.text) } SegmentEnd = .; @@ -6594,7 +6594,7 @@ SECTIONS SegmentStart = .; ovl_En_Recepgirl : AT(RomLocation) { - build/asm/ovl_En_Recepgirl_0x80C0FFD0.o(.text) + build/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.o(.text) build/asm/ovl_En_Recepgirl_data.o(.text) } SegmentEnd = .; @@ -6604,7 +6604,7 @@ SECTIONS SegmentStart = .; ovl_En_Thiefbird : AT(RomLocation) { - build/asm/ovl_En_Thiefbird_0x80C10770.o(.text) + build/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.o(.text) build/asm/ovl_En_Thiefbird_data.o(.text) ovl_En_Thiefbird_bss_start = .; } @@ -6616,7 +6616,7 @@ SECTIONS SegmentStart = .; ovl_En_Jgame_Tsn : AT(RomLocation) { - build/asm/ovl_En_Jgame_Tsn_0x80C13930.o(.text) + build/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.o(.text) build/asm/ovl_En_Jgame_Tsn_data.o(.text) } SegmentEnd = .; @@ -6626,7 +6626,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Jgame_Light : AT(RomLocation) { - build/asm/ovl_Obj_Jgame_Light_0x80C152F0.o(.text) + build/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.o(.text) build/asm/ovl_Obj_Jgame_Light_data.o(.text) } SegmentEnd = .; @@ -6636,7 +6636,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Yado : AT(RomLocation) { - build/asm/ovl_Obj_Yado_0x80C161E0.o(.text) + build/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.o(.text) build/asm/ovl_Obj_Yado_data.o(.text) ovl_Obj_Yado_bss_start = .; } @@ -6648,7 +6648,7 @@ SECTIONS SegmentStart = .; ovl_Demo_Syoten : AT(RomLocation) { - build/asm/ovl_Demo_Syoten_0x80C16480.o(.text) + build/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.o(.text) build/asm/ovl_Demo_Syoten_data.o(.text) } SegmentEnd = .; @@ -6658,7 +6658,7 @@ SECTIONS SegmentStart = .; ovl_Demo_Moonend : AT(RomLocation) { - build/asm/ovl_Demo_Moonend_0x80C17A10.o(.text) + build/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.o(.text) build/asm/ovl_Demo_Moonend_data.o(.text) } SegmentEnd = .; @@ -6668,7 +6668,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Lbfshot : AT(RomLocation) { - build/asm/ovl_Bg_Lbfshot_0x80C18120.o(.text) + build/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.o(.text) build/asm/ovl_Bg_Lbfshot_data.o(.text) } SegmentEnd = .; @@ -6678,7 +6678,7 @@ SECTIONS SegmentStart = .; ovl_Bg_Last_Bwall : AT(RomLocation) { - build/asm/ovl_Bg_Last_Bwall_0x80C18240.o(.text) + build/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.o(.text) build/asm/ovl_Bg_Last_Bwall_data.o(.text) } SegmentEnd = .; @@ -6688,7 +6688,7 @@ SECTIONS SegmentStart = .; ovl_En_And : AT(RomLocation) { - build/asm/ovl_En_And_0x80C18B90.o(.text) + build/src/overlays/actors/ovl_En_And/z_en_and.o(.text) build/asm/ovl_En_And_data.o(.text) } SegmentEnd = .; @@ -6698,7 +6698,7 @@ SECTIONS SegmentStart = .; ovl_En_Invadepoh_Demo : AT(RomLocation) { - build/asm/ovl_En_Invadepoh_Demo_0x80C192A0.o(.text) + build/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.o(.text) build/asm/ovl_En_Invadepoh_Demo_data.o(.text) ovl_En_Invadepoh_Demo_bss_start = .; } @@ -6710,7 +6710,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Danpeilift : AT(RomLocation) { - build/asm/ovl_Obj_Danpeilift_0x80C1ADC0.o(.text) + build/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.o(.text) build/asm/ovl_Obj_Danpeilift_data.o(.text) } SegmentEnd = .; @@ -6720,7 +6720,7 @@ SECTIONS SegmentStart = .; ovl_En_Fall2 : AT(RomLocation) { - build/asm/ovl_En_Fall2_0x80C1B640.o(.text) + build/src/overlays/actors/ovl_En_Fall2/z_en_fall2.o(.text) build/asm/ovl_En_Fall2_data.o(.text) } SegmentEnd = .; @@ -6730,7 +6730,7 @@ SECTIONS SegmentStart = .; ovl_Dm_Al : AT(RomLocation) { - build/asm/ovl_Dm_Al_0x80C1BD90.o(.text) + build/src/overlays/actors/ovl_Dm_Al/z_dm_al.o(.text) build/asm/ovl_Dm_Al_data.o(.text) } SegmentEnd = .; @@ -6740,7 +6740,7 @@ SECTIONS SegmentStart = .; ovl_Dm_An : AT(RomLocation) { - build/asm/ovl_Dm_An_0x80C1C410.o(.text) + build/src/overlays/actors/ovl_Dm_An/z_dm_an.o(.text) build/asm/ovl_Dm_An_data.o(.text) } SegmentEnd = .; @@ -6750,7 +6750,7 @@ SECTIONS SegmentStart = .; ovl_Dm_Ah : AT(RomLocation) { - build/asm/ovl_Dm_Ah_0x80C1D410.o(.text) + build/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.o(.text) build/asm/ovl_Dm_Ah_data.o(.text) } SegmentEnd = .; @@ -6760,7 +6760,7 @@ SECTIONS SegmentStart = .; ovl_Dm_Nb : AT(RomLocation) { - build/asm/ovl_Dm_Nb_0x80C1DED0.o(.text) + build/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.o(.text) build/asm/ovl_Dm_Nb_data.o(.text) } SegmentEnd = .; @@ -6770,7 +6770,7 @@ SECTIONS SegmentStart = .; ovl_En_Drs : AT(RomLocation) { - build/asm/ovl_En_Drs_0x80C1E290.o(.text) + build/src/overlays/actors/ovl_En_Drs/z_en_drs.o(.text) build/asm/ovl_En_Drs_data.o(.text) } SegmentEnd = .; @@ -6780,7 +6780,7 @@ SECTIONS SegmentStart = .; ovl_En_Ending_Hero : AT(RomLocation) { - build/asm/ovl_En_Ending_Hero_0x80C1E690.o(.text) + build/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.o(.text) build/asm/ovl_En_Ending_Hero_data.o(.text) } SegmentEnd = .; @@ -6790,7 +6790,7 @@ SECTIONS SegmentStart = .; ovl_Dm_Bal : AT(RomLocation) { - build/asm/ovl_Dm_Bal_0x80C1E9E0.o(.text) + build/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.o(.text) build/asm/ovl_Dm_Bal_data.o(.text) } SegmentEnd = .; @@ -6800,7 +6800,7 @@ SECTIONS SegmentStart = .; ovl_En_Paper : AT(RomLocation) { - build/asm/ovl_En_Paper_0x80C1F3D0.o(.text) + build/src/overlays/actors/ovl_En_Paper/z_en_paper.o(.text) build/asm/ovl_En_Paper_data.o(.text) } SegmentEnd = .; @@ -6810,7 +6810,7 @@ SECTIONS SegmentStart = .; ovl_En_Hint_Skb : AT(RomLocation) { - build/asm/ovl_En_Hint_Skb_0x80C1FCF0.o(.text) + build/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.o(.text) build/asm/ovl_En_Hint_Skb_data.o(.text) } SegmentEnd = .; @@ -6820,7 +6820,7 @@ SECTIONS SegmentStart = .; ovl_Dm_Tag : AT(RomLocation) { - build/asm/ovl_Dm_Tag_0x80C22350.o(.text) + build/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.o(.text) build/asm/ovl_Dm_Tag_data.o(.text) } SegmentEnd = .; @@ -6830,7 +6830,7 @@ SECTIONS SegmentStart = .; ovl_En_Bh : AT(RomLocation) { - build/asm/ovl_En_Bh_0x80C22D40.o(.text) + build/src/overlays/actors/ovl_En_Bh/z_en_bh.o(.text) build/asm/ovl_En_Bh_data.o(.text) } SegmentEnd = .; @@ -6840,7 +6840,7 @@ SECTIONS SegmentStart = .; ovl_En_Ending_Hero2 : AT(RomLocation) { - build/asm/ovl_En_Ending_Hero2_0x80C23230.o(.text) + build/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.o(.text) build/asm/ovl_En_Ending_Hero2_data.o(.text) } SegmentEnd = .; @@ -6850,7 +6850,7 @@ SECTIONS SegmentStart = .; ovl_En_Ending_Hero3 : AT(RomLocation) { - build/asm/ovl_En_Ending_Hero3_0x80C23460.o(.text) + build/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.o(.text) build/asm/ovl_En_Ending_Hero3_data.o(.text) } SegmentEnd = .; @@ -6860,7 +6860,7 @@ SECTIONS SegmentStart = .; ovl_En_Ending_Hero4 : AT(RomLocation) { - build/asm/ovl_En_Ending_Hero4_0x80C23690.o(.text) + build/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.o(.text) build/asm/ovl_En_Ending_Hero4_data.o(.text) } SegmentEnd = .; @@ -6870,7 +6870,7 @@ SECTIONS SegmentStart = .; ovl_En_Ending_Hero5 : AT(RomLocation) { - build/asm/ovl_En_Ending_Hero5_0x80C238C0.o(.text) + build/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.o(.text) build/asm/ovl_En_Ending_Hero5_data.o(.text) } SegmentEnd = .; @@ -6880,7 +6880,7 @@ SECTIONS SegmentStart = .; ovl_En_Ending_Hero6 : AT(RomLocation) { - build/asm/ovl_En_Ending_Hero6_0x80C23C90.o(.text) + build/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.o(.text) build/asm/ovl_En_Ending_Hero6_data.o(.text) } SegmentEnd = .; @@ -6890,7 +6890,7 @@ SECTIONS SegmentStart = .; ovl_Dm_Gm : AT(RomLocation) { - build/asm/ovl_Dm_Gm_0x80C24360.o(.text) + build/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.o(.text) build/asm/ovl_Dm_Gm_data.o(.text) } SegmentEnd = .; @@ -6900,7 +6900,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Swprize : AT(RomLocation) { - build/asm/ovl_Obj_Swprize_0x80C25360.o(.text) + build/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.o(.text) build/asm/ovl_Obj_Swprize_data.o(.text) } SegmentEnd = .; @@ -6910,7 +6910,7 @@ SECTIONS SegmentStart = .; ovl_En_Invisible_Ruppe : AT(RomLocation) { - build/asm/ovl_En_Invisible_Ruppe_0x80C258A0.o(.text) + build/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.o(.text) build/asm/ovl_En_Invisible_Ruppe_data.o(.text) } SegmentEnd = .; @@ -6920,7 +6920,7 @@ SECTIONS SegmentStart = .; ovl_Obj_Ending : AT(RomLocation) { - build/asm/ovl_Obj_Ending_0x80C25BC0.o(.text) + build/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.o(.text) build/asm/ovl_Obj_Ending_data.o(.text) } SegmentEnd = .; @@ -6930,7 +6930,7 @@ SECTIONS SegmentStart = .; ovl_En_Rsn : AT(RomLocation) { - build/asm/ovl_En_Rsn_0x80C25D40.o(.text) + build/src/overlays/actors/ovl_En_Rsn/z_en_rsn.o(.text) build/asm/ovl_En_Rsn_data.o(.text) } SegmentEnd = .; diff --git a/src/actors/Bg_Fu_Kaiten/z_bg_fu_kaiten.c b/src/actors/Bg_Fu_Kaiten/z_bg_fu_kaiten.c deleted file mode 100644 index 4d3641a074..0000000000 --- a/src/actors/Bg_Fu_Kaiten/z_bg_fu_kaiten.c +++ /dev/null @@ -1,67 +0,0 @@ -#include -#include - -ActorInit bgFuKaitenInitData = { - ACTOR_BG_FU_KAITEN, - 1, - 0, - 0x30, - 0x01A0, - sizeof(ActorBgFuKaiten), - (actor_func)&BgFuKaiten_Init, - (actor_func)&BgFuKaiten_Destroy, - (actor_func)&BgFuKaiten_Update, - (actor_func)&BgFuKaiten_Draw -}; - -void BgFuKaiten_Init(ActorBgFuKaiten* this, GlobalContext* ctxt) { - UNK_TYPE pad0; - UNK_TYPE pad1; - BgMeshHeader* header = 0; - - Actor_SetScale(&this->bg.actor, 1.0); - BcCheck3_BgActorInit(&this->bg, 3); - BgCheck_RelocateMeshHeader(&object_fu_kaiten_002D30, &header); - this->bg.dynaPolyId = BgCheck_AddActorMesh(ctxt, &ctxt->colCtx.dyna, &this->bg, header); - - this->bouceHeight = 0.0; - this->rotationSpeed = 0; - this->bounceSpeed = 0; - this->bounce = 0; -} - -void BgFuKaiten_Destroy(ActorBgFuKaiten* this, GlobalContext* ctxt) { - BgCheck_RemoveActorMesh(ctxt, &ctxt->colCtx.dyna, this->bg.dynaPolyId); -} - -void BgFuKaiten_UpdateRotation(ActorBgFuKaiten* this) { - f32 f0; - this->bg.actor.shape.rot.y += this->rotationSpeed; - if (this->rotationSpeed > 0) - { - f0 = this->rotationSpeed * .002f; - func_8019FAD8(&this->bg.actor.unkEC, 8310, f0); - } -} - -void BgFuKaiten_UpdateHeight(ActorBgFuKaiten* this) { - this->bounce += this->bounceSpeed; - this->bg.actor.currPosRot.pos.y = this->bg.actor.initPosRot.pos.y + this->elevation + this->bouceHeight; - - this->bg.actor.currPosRot.pos.y -= this->bouceHeight * Math_Coss(this->bounce); -} - -void BgFuKaiten_Update(ActorBgFuKaiten* this, GlobalContext* ctxt) { - BgFuKaiten_UpdateRotation(this); - BgFuKaiten_UpdateHeight(this); -} - -void BgFuKaiten_Draw(ActorBgFuKaiten* this, GlobalContext* ctxt) { - GraphicsContext* gfxCtx = ctxt->state.gfxCtx; - UNK_TYPE pad; - - func_8012C28C(gfxCtx); - - gSPMatrix(gfxCtx->polyOpa.p++, SysMatrix_AppendStateToPolyOpaDisp(ctxt->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gfxCtx->polyOpa.p++, object_fu_kaiten_0005D0); -} diff --git a/src/actors/Bg_Ikana_Ray/z_bg_ikana_ray.c b/src/actors/Bg_Ikana_Ray/z_bg_ikana_ray.c deleted file mode 100644 index 8f92aed83f..0000000000 --- a/src/actors/Bg_Ikana_Ray/z_bg_ikana_ray.c +++ /dev/null @@ -1,85 +0,0 @@ -#include -#include - -ActorInit bgIkanaRayInitData = { - ACTOR_BG_IKANA_RAY, - 6, - 0, - 0, - 0x0203, - sizeof(ActorBgIkanaRay), - (actor_func)BgIkanaRay_Init, - (actor_func)BgIkanaRay_Destroy, - (actor_func)BgIkanaRay_Update, - (actor_func)BgIkanaRay_Draw -}; - -// TODO better formatting -ColCylinderInit bgIkanaRayCylinderInit = { - { 10, 33, 0, 0, 0, 1 }, - { 0, { 0x00200000, 0, 0 }, { 0, 0, 0 }, 25, 0, 1 }, - { 90, 420, 65116} -}; - -// TODO macro -InitChainEntry bgIkanaRayCompInit[] = { - {1, 6, 0x0FC, 4000}, - {1, 6, 0x100, 1000}, - {1, 6, 0x104, 1000}, - {0, 9, 0x058, 100} -}; - -void BgIkanaRay_Init(ActorBgIkanaRay* this, GlobalContext* ctxt) { - ColCylinder* collision = &this->collision; - u32 pad; - - Actor_ProcessInitChain((Actor*)this, bgIkanaRayCompInit); - - Collision_InitCylinderDefault(ctxt, collision); - Collision_InitCylinderWithData(ctxt, collision, (Actor*)this, &bgIkanaRayCylinderInit); - Collision_CylinderMoveToActor((Actor*)this, &this->collision); - - this->animatedTextures = (AnimatedTexture*)Lib_PtrSegToVirt(object_ikana_obj_001228); - - if (Actor_GetSwitchFlag(ctxt, this->base.params & 0x7F) != 0) { - BgIkanaRay_SetActivated(this); - } else { - BgIkanaRay_SetDeactivated(this); - } -} - -void BgIkanaRay_Destroy(ActorBgIkanaRay* this, GlobalContext* ctxt) { - ColCylinder* collision = &this->collision; - Collision_FiniCylinder(ctxt, collision); -} - -void BgIkanaRay_SetDeactivated(ActorBgIkanaRay* this) { - this->base.draw = NULL; - this->base.flags |= 0x10; - this->update = (actor_func)BgIkanaRay_UpdateCheckForActivation; -} - -void BgIkanaRay_UpdateCheckForActivation(ActorBgIkanaRay* this, GlobalContext* ctxt) { - if (Actor_GetSwitchFlag(ctxt, this->base.params & 0x7F) != 0) { - BgIkanaRay_SetActivated(this); - } -} - -void BgIkanaRay_SetActivated(ActorBgIkanaRay* this) { - this->base.draw = (actor_func)BgIkanaRay_Draw; - this->base.flags &= 0xFFFFFFEF; - this->update = (actor_func)BgIkanaRay_UpdateActivated; -} - -void BgIkanaRay_UpdateActivated(ActorBgIkanaRay* this, GlobalContext* ctxt) { - Collision_AddAT(ctxt, &ctxt->colCheckCtx, &this->collision.base); -} - -void BgIkanaRay_Update(ActorBgIkanaRay* this, GlobalContext* ctxt) { - this->update((Actor*)this, ctxt); -} - -void BgIkanaRay_Draw(ActorBgIkanaRay* this, GlobalContext* ctxt) { - SceneProc_DrawAllSceneAnimatedTextures(ctxt, this->animatedTextures); - func_800BE03C(ctxt, object_ikana_obj_001100); -} diff --git a/src/code/code_0x800A5AC0.c b/src/code/code_0x800A5AC0.c index 420ce32d2d..31b42d4d56 100644 --- a/src/code/code_0x800A5AC0.c +++ b/src/code/code_0x800A5AC0.c @@ -12,7 +12,7 @@ void EnAObj_Init(ActorEnAObj* this, GlobalContext* ctxt) { Collision_InitCylinder(ctxt, &s0->collision, (Actor*)s0, &enAObjCylinderInit); Collision_CylinderMoveToActor((Actor*)s0, &s0->collision); s0->base.unkA0.mass = 255; - s0->update = (actor_func)EnAObj_Update1; + s0->update = (ActorFunc)EnAObj_Update1; } void EnAObj_Destroy(ActorEnAObj* this, GlobalContext* ctxt) { @@ -24,7 +24,7 @@ void EnAObj_Update1(ActorEnAObj* this, GlobalContext* ctxt) { s16 v0; s32 v1; if (func_800B84D0((Actor*)this, ctxt) != 0) { - this->update = (actor_func)EnAObj_Update2; + this->update = (ActorFunc)EnAObj_Update2; } else { v0 = this->base.rotTowardsLinkY - this->base.shape.rot.y; v1 = (v0 < 0)? -v0 : v0; @@ -36,7 +36,7 @@ void EnAObj_Update1(ActorEnAObj* this, GlobalContext* ctxt) { void EnAObj_Update2(ActorEnAObj* this, GlobalContext* ctxt) { if (func_800B867C((Actor*)this, ctxt) != 0) { - this->update = (actor_func)EnAObj_Update1; + this->update = (ActorFunc)EnAObj_Update1; } } diff --git a/src/overlays/actors/ovl_Arms_Hook/overlay.cfg b/src/overlays/actors/ovl_Arms_Hook/overlay.cfg new file mode 100644 index 0000000000..4a8f598228 --- /dev/null +++ b/src/overlays/actors/ovl_Arms_Hook/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Arms_Hook +z_arms_hook.c diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c new file mode 100644 index 0000000000..e9eb8f95d4 --- /dev/null +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -0,0 +1,48 @@ +#include "z_arms_hook.h" + +#define FLAGS 0x00000030 + +#define THIS ((ArmsHook*)thisx) + +void ArmsHook_Init(Actor* thisx, GlobalContext* globalCtx); +void ArmsHook_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ArmsHook_Update(Actor* thisx, GlobalContext* globalCtx); +void ArmsHook_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Arms_Hook_InitVars = { + ACTOR_ARMS_HOOK, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ArmsHook), + (ActorFunc)ArmsHook_Init, + (ActorFunc)ArmsHook_Destroy, + (ActorFunc)ArmsHook_Update, + (ActorFunc)ArmsHook_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Arms_Hook_0x808C1030/func_808C1030.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arms_Hook_0x808C1030/ArmsHook_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arms_Hook_0x808C1030/ArmsHook_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arms_Hook_0x808C1030/func_808C10F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arms_Hook_0x808C1030/func_808C1154.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arms_Hook_0x808C1030/func_808C1168.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arms_Hook_0x808C1030/func_808C1198.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arms_Hook_0x808C1030/func_808C11C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arms_Hook_0x808C1030/func_808C125C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arms_Hook_0x808C1030/func_808C12A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arms_Hook_0x808C1030/ArmsHook_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arms_Hook_0x808C1030/ArmsHook_Draw.asm") diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h new file mode 100644 index 0000000000..f2b4a55865 --- /dev/null +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h @@ -0,0 +1,15 @@ +#ifndef Z_ARMS_HOOK_H +#define Z_ARMS_HOOK_H + +#include + +struct ArmsHook; + +typedef struct ArmsHook { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xCC]; +} ArmsHook; // size = 0x210 + +extern const ActorInit Arms_Hook_InitVars; + +#endif // Z_ARMS_HOOK_H diff --git a/src/overlays/actors/ovl_Arrow_Fire/overlay.cfg b/src/overlays/actors/ovl_Arrow_Fire/overlay.cfg new file mode 100644 index 0000000000..a2d1a6ad65 --- /dev/null +++ b/src/overlays/actors/ovl_Arrow_Fire/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Arrow_Fire +z_arrow_fire.c diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c new file mode 100644 index 0000000000..13a47d81da --- /dev/null +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -0,0 +1,44 @@ +#include "z_arrow_fire.h" + +#define FLAGS 0x02000010 + +#define THIS ((ArrowFire*)thisx) + +void ArrowFire_Init(Actor* thisx, GlobalContext* globalCtx); +void ArrowFire_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ArrowFire_Update(Actor* thisx, GlobalContext* globalCtx); +void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Arrow_Fire_InitVars = { + ACTOR_ARROW_FIRE, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ArrowFire), + (ActorFunc)ArrowFire_Init, + (ActorFunc)ArrowFire_Destroy, + (ActorFunc)ArrowFire_Update, + (ActorFunc)ArrowFire_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Fire_0x80920340/FireArrow_SetUpdateFunc.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Fire_0x80920340/ArrowFire_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Fire_0x80920340/ArrowFire_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Fire_0x80920340/FireArrow_Update1.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Fire_0x80920340/FireArrow_Lerp.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Fire_0x80920340/FireArrow_Update3.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Fire_0x80920340/FireArrow_Update2.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Fire_0x80920340/ArrowFire_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Fire_0x80920340/func_80920948.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Fire_0x80920340/ArrowFire_Draw.asm") diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h new file mode 100644 index 0000000000..5eced61f29 --- /dev/null +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h @@ -0,0 +1,15 @@ +#ifndef Z_ARROW_FIRE_H +#define Z_ARROW_FIRE_H + +#include + +struct ArrowFire; + +typedef struct ArrowFire { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x120]; +} ArrowFire; // size = 0x264 + +extern const ActorInit Arrow_Fire_InitVars; + +#endif // Z_ARROW_FIRE_H diff --git a/src/overlays/actors/ovl_Arrow_Ice/overlay.cfg b/src/overlays/actors/ovl_Arrow_Ice/overlay.cfg new file mode 100644 index 0000000000..b95f23d3c6 --- /dev/null +++ b/src/overlays/actors/ovl_Arrow_Ice/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Arrow_Ice +z_arrow_ice.c diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c new file mode 100644 index 0000000000..83cd0f8e12 --- /dev/null +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -0,0 +1,42 @@ +#include "z_arrow_ice.h" + +#define FLAGS 0x02000010 + +#define THIS ((ArrowIce*)thisx) + +void ArrowIce_Init(Actor* thisx, GlobalContext* globalCtx); +void ArrowIce_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ArrowIce_Update(Actor* thisx, GlobalContext* globalCtx); +void ArrowIce_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Arrow_Ice_InitVars = { + ACTOR_ARROW_ICE, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ArrowIce), + (ActorFunc)ArrowIce_Init, + (ActorFunc)ArrowIce_Destroy, + (ActorFunc)ArrowIce_Update, + (ActorFunc)ArrowIce_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Ice_0x80922430/func_80922430.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Ice_0x80922430/ArrowIce_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Ice_0x80922430/ArrowIce_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Ice_0x80922430/func_809224DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Ice_0x80922430/func_809225D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Ice_0x80922430/func_80922628.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Ice_0x80922430/func_809227F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Ice_0x80922430/ArrowIce_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Ice_0x80922430/ArrowIce_Draw.asm") diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h new file mode 100644 index 0000000000..ca0a7ce68d --- /dev/null +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h @@ -0,0 +1,15 @@ +#ifndef Z_ARROW_ICE_H +#define Z_ARROW_ICE_H + +#include + +struct ArrowIce; + +typedef struct ArrowIce { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x20]; +} ArrowIce; // size = 0x164 + +extern const ActorInit Arrow_Ice_InitVars; + +#endif // Z_ARROW_ICE_H diff --git a/src/overlays/actors/ovl_Arrow_Light/overlay.cfg b/src/overlays/actors/ovl_Arrow_Light/overlay.cfg new file mode 100644 index 0000000000..d5bda9b4cf --- /dev/null +++ b/src/overlays/actors/ovl_Arrow_Light/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Arrow_Light +z_arrow_light.c diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c new file mode 100644 index 0000000000..bcc4426971 --- /dev/null +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -0,0 +1,42 @@ +#include "z_arrow_light.h" + +#define FLAGS 0x02000010 + +#define THIS ((ArrowLight*)thisx) + +void ArrowLight_Init(Actor* thisx, GlobalContext* globalCtx); +void ArrowLight_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ArrowLight_Update(Actor* thisx, GlobalContext* globalCtx); +void ArrowLight_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Arrow_Light_InitVars = { + ACTOR_ARROW_LIGHT, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ArrowLight), + (ActorFunc)ArrowLight_Init, + (ActorFunc)ArrowLight_Destroy, + (ActorFunc)ArrowLight_Update, + (ActorFunc)ArrowLight_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Light_0x80924300/func_80924300.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Light_0x80924300/ArrowLight_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Light_0x80924300/ArrowLight_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Light_0x80924300/func_809243AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Light_0x80924300/func_809244A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Light_0x80924300/func_809244F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Light_0x80924300/func_809246C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Light_0x80924300/ArrowLight_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Arrow_Light_0x80924300/ArrowLight_Draw.asm") diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h new file mode 100644 index 0000000000..e16d814c71 --- /dev/null +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h @@ -0,0 +1,15 @@ +#ifndef Z_ARROW_LIGHT_H +#define Z_ARROW_LIGHT_H + +#include + +struct ArrowLight; + +typedef struct ArrowLight { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x20]; +} ArrowLight; // size = 0x164 + +extern const ActorInit Arrow_Light_InitVars; + +#endif // Z_ARROW_LIGHT_H diff --git a/src/overlays/actors/ovl_Bg_Astr_Bombwall/overlay.cfg b/src/overlays/actors/ovl_Bg_Astr_Bombwall/overlay.cfg new file mode 100644 index 0000000000..735382eadc --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Astr_Bombwall/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Astr_Bombwall +z_bg_astr_bombwall.c diff --git a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c new file mode 100644 index 0000000000..424fff93bc --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c @@ -0,0 +1,48 @@ +#include "z_bg_astr_bombwall.h" + +#define FLAGS 0x00000000 + +#define THIS ((BgAstrBombwall*)thisx) + +void BgAstrBombwall_Init(Actor* thisx, GlobalContext* globalCtx); +void BgAstrBombwall_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgAstrBombwall_Update(Actor* thisx, GlobalContext* globalCtx); +void BgAstrBombwall_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Astr_Bombwall_InitVars = { + ACTOR_BG_ASTR_BOMBWALL, + ACTORTYPE_BG, + FLAGS, + OBJECT_ASTR_OBJ, + sizeof(BgAstrBombwall), + (ActorFunc)BgAstrBombwall_Init, + (ActorFunc)BgAstrBombwall_Destroy, + (ActorFunc)BgAstrBombwall_Update, + (ActorFunc)BgAstrBombwall_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C09ED0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Astr_Bombwall_0x80C09ED0/BgAstrBombwall_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Astr_Bombwall_0x80C09ED0/BgAstrBombwall_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C0A120.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C0A378.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C0A38C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C0A400.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C0A418.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C0A458.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Astr_Bombwall_0x80C09ED0/func_80C0A4BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Astr_Bombwall_0x80C09ED0/BgAstrBombwall_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Astr_Bombwall_0x80C09ED0/BgAstrBombwall_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.h b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.h new file mode 100644 index 0000000000..a17cfdc93f --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_ASTR_BOMBWALL_H +#define Z_BG_ASTR_BOMBWALL_H + +#include + +struct BgAstrBombwall; + +typedef struct BgAstrBombwall { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xF8]; +} BgAstrBombwall; // size = 0x23C + +extern const ActorInit Bg_Astr_Bombwall_InitVars; + +#endif // Z_BG_ASTR_BOMBWALL_H diff --git a/src/overlays/actors/ovl_Bg_Botihasira/overlay.cfg b/src/overlays/actors/ovl_Bg_Botihasira/overlay.cfg new file mode 100644 index 0000000000..48da75cb3e --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Botihasira/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Botihasira +z_bg_botihasira.c diff --git a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c new file mode 100644 index 0000000000..51717f7f54 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c @@ -0,0 +1,34 @@ +#include "z_bg_botihasira.h" + +#define FLAGS 0x00000000 + +#define THIS ((BgBotihasira*)thisx) + +void BgBotihasira_Init(Actor* thisx, GlobalContext* globalCtx); +void BgBotihasira_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgBotihasira_Update(Actor* thisx, GlobalContext* globalCtx); +void BgBotihasira_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Botihasira_InitVars = { + ACTOR_BG_BOTIHASIRA, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_BOTIHASIRA, + sizeof(BgBotihasira), + (ActorFunc)BgBotihasira_Init, + (ActorFunc)BgBotihasira_Destroy, + (ActorFunc)BgBotihasira_Update, + (ActorFunc)BgBotihasira_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Botihasira_0x80B28080/BgBotihasira_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Botihasira_0x80B28080/BgBotihasira_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Botihasira_0x80B28080/func_80B2815C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Botihasira_0x80B28080/BgBotihasira_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Botihasira_0x80B28080/BgBotihasira_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.h b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.h new file mode 100644 index 0000000000..bf3b2f60a5 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_BOTIHASIRA_H +#define Z_BG_BOTIHASIRA_H + +#include + +struct BgBotihasira; + +typedef struct BgBotihasira { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x68]; +} BgBotihasira; // size = 0x1AC + +extern const ActorInit Bg_Botihasira_InitVars; + +#endif // Z_BG_BOTIHASIRA_H diff --git a/src/overlays/actors/ovl_Bg_Breakwall/overlay.cfg b/src/overlays/actors/ovl_Bg_Breakwall/overlay.cfg new file mode 100644 index 0000000000..77c1ecf0d2 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Breakwall/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Breakwall +z_bg_breakwall.c diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c new file mode 100644 index 0000000000..aacd54f652 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c @@ -0,0 +1,72 @@ +#include "z_bg_breakwall.h" + +#define FLAGS 0x00000030 + +#define THIS ((BgBreakwall*)thisx) + +void BgBreakwall_Init(Actor* thisx, GlobalContext* globalCtx); +void BgBreakwall_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Breakwall_InitVars = { + ACTOR_BG_BREAKWALL, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(BgBreakwall), + (ActorFunc)BgBreakwall_Init, + (ActorFunc)NULL, + (ActorFunc)BgBreakwall_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B7360.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B736C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B7380.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B73C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B73FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B7410.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B7460.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B74A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B74D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B751C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/BgBreakwall_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B767C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B76CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B77D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B77E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B782C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B78A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B78DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B7914.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B7A10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/BgBreakwall_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B7A90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B7B54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B7D34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Breakwall_0x808B7360/func_808B7FE4.asm") diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h new file mode 100644 index 0000000000..81c8536a6a --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_BREAKWALL_H +#define Z_BG_BREAKWALL_H + +#include + +struct BgBreakwall; + +typedef struct BgBreakwall { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x20]; +} BgBreakwall; // size = 0x164 + +extern const ActorInit Bg_Breakwall_InitVars; + +#endif // Z_BG_BREAKWALL_H diff --git a/src/overlays/actors/ovl_Bg_Crace_Movebg/overlay.cfg b/src/overlays/actors/ovl_Bg_Crace_Movebg/overlay.cfg new file mode 100644 index 0000000000..ab8eb44057 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Crace_Movebg/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Crace_Movebg +z_bg_crace_movebg.c diff --git a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c new file mode 100644 index 0000000000..f807cce16e --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c @@ -0,0 +1,64 @@ +#include "z_bg_crace_movebg.h" + +#define FLAGS 0x00000010 + +#define THIS ((BgCraceMovebg*)thisx) + +void BgCraceMovebg_Init(Actor* thisx, GlobalContext* globalCtx); +void BgCraceMovebg_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgCraceMovebg_Update(Actor* thisx, GlobalContext* globalCtx); +void BgCraceMovebg_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Crace_Movebg_InitVars = { + ACTOR_BG_CRACE_MOVEBG, + ACTORTYPE_BG, + FLAGS, + OBJECT_CRACE_OBJECT, + sizeof(BgCraceMovebg), + (ActorFunc)BgCraceMovebg_Init, + (ActorFunc)BgCraceMovebg_Destroy, + (ActorFunc)BgCraceMovebg_Update, + (ActorFunc)BgCraceMovebg_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/BgCraceMovebg_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A7090C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70970.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A7099C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A709E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70A08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70A84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70A9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/BgCraceMovebg_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/BgCraceMovebg_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70C04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70D74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70DA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70E2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70E70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70F14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70F2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A70FF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/func_80A71040.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Crace_Movebg_0x80A706F0/BgCraceMovebg_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.h b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.h new file mode 100644 index 0000000000..c05a762dae --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_CRACE_MOVEBG_H +#define Z_BG_CRACE_MOVEBG_H + +#include + +struct BgCraceMovebg; + +typedef struct BgCraceMovebg { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x50]; +} BgCraceMovebg; // size = 0x194 + +extern const ActorInit Bg_Crace_Movebg_InitVars; + +#endif // Z_BG_CRACE_MOVEBG_H diff --git a/src/overlays/actors/ovl_Bg_Ctower_Gear/overlay.cfg b/src/overlays/actors/ovl_Bg_Ctower_Gear/overlay.cfg new file mode 100644 index 0000000000..244f98e32c --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ctower_Gear/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Ctower_Gear +z_bg_ctower_gear.c diff --git a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c new file mode 100644 index 0000000000..2a918279ef --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c @@ -0,0 +1,38 @@ +#include "z_bg_ctower_gear.h" + +#define FLAGS 0x00000010 + +#define THIS ((BgCtowerGear*)thisx) + +void BgCtowerGear_Init(Actor* thisx, GlobalContext* globalCtx); +void BgCtowerGear_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgCtowerGear_Update(Actor* thisx, GlobalContext* globalCtx); +void BgCtowerGear_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Ctower_Gear_InitVars = { + ACTOR_BG_CTOWER_GEAR, + ACTORTYPE_PROP, + FLAGS, + OBJECT_CTOWER_ROT, + sizeof(BgCtowerGear), + (ActorFunc)BgCtowerGear_Init, + (ActorFunc)BgCtowerGear_Destroy, + (ActorFunc)BgCtowerGear_Update, + (ActorFunc)BgCtowerGear_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Gear_0x80AD2B70/func_80AD2B70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Gear_0x80AD2B70/BgCtowerGear_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Gear_0x80AD2B70/BgCtowerGear_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Gear_0x80AD2B70/BgCtowerGear_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Gear_0x80AD2B70/func_80AD3054.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Gear_0x80AD2B70/BgCtowerGear_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Gear_0x80AD2B70/func_80AD3164.asm") diff --git a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.h b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.h new file mode 100644 index 0000000000..c565f2a687 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_CTOWER_GEAR_H +#define Z_BG_CTOWER_GEAR_H + +#include + +struct BgCtowerGear; + +typedef struct BgCtowerGear { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x18]; +} BgCtowerGear; // size = 0x15C + +extern const ActorInit Bg_Ctower_Gear_InitVars; + +#endif // Z_BG_CTOWER_GEAR_H diff --git a/src/overlays/actors/ovl_Bg_Ctower_Rot/overlay.cfg b/src/overlays/actors/ovl_Bg_Ctower_Rot/overlay.cfg new file mode 100644 index 0000000000..c41e36b27c --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ctower_Rot/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Ctower_Rot +z_bg_ctower_rot.c diff --git a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c new file mode 100644 index 0000000000..057bd8580c --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c @@ -0,0 +1,42 @@ +#include "z_bg_ctower_rot.h" + +#define FLAGS 0x00000030 + +#define THIS ((BgCtowerRot*)thisx) + +void BgCtowerRot_Init(Actor* thisx, GlobalContext* globalCtx); +void BgCtowerRot_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgCtowerRot_Update(Actor* thisx, GlobalContext* globalCtx); +void BgCtowerRot_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Ctower_Rot_InitVars = { + ACTOR_BG_CTOWER_ROT, + ACTORTYPE_BG, + FLAGS, + OBJECT_CTOWER_ROT, + sizeof(BgCtowerRot), + (ActorFunc)BgCtowerRot_Init, + (ActorFunc)BgCtowerRot_Destroy, + (ActorFunc)BgCtowerRot_Update, + (ActorFunc)BgCtowerRot_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Rot_0x808E2070/BgCtowerRot_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Rot_0x808E2070/BgCtowerRot_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Rot_0x808E2070/func_808E21FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Rot_0x808E2070/func_808E22DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Rot_0x808E2070/func_808E22EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Rot_0x808E2070/func_808E23D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Rot_0x808E2070/func_808E2444.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Rot_0x808E2070/BgCtowerRot_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ctower_Rot_0x808E2070/BgCtowerRot_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.h b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.h new file mode 100644 index 0000000000..cb2ac760c0 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_CTOWER_ROT_H +#define Z_BG_CTOWER_ROT_H + +#include + +struct BgCtowerRot; + +typedef struct BgCtowerRot { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x24]; +} BgCtowerRot; // size = 0x168 + +extern const ActorInit Bg_Ctower_Rot_InitVars; + +#endif // Z_BG_CTOWER_ROT_H diff --git a/src/overlays/actors/ovl_Bg_Danpei_Movebg/overlay.cfg b/src/overlays/actors/ovl_Bg_Danpei_Movebg/overlay.cfg new file mode 100644 index 0000000000..beb2b30109 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Danpei_Movebg/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Danpei_Movebg +z_bg_danpei_movebg.c diff --git a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c new file mode 100644 index 0000000000..6d1f419b84 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c @@ -0,0 +1,47 @@ +#include "z_bg_danpei_movebg.h" + +#define FLAGS 0x00000010 + +#define THIS ((BgDanpeiMovebg*)thisx) + +void BgDanpeiMovebg_Init(Actor* thisx, GlobalContext* globalCtx); +void BgDanpeiMovebg_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgDanpeiMovebg_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Danpei_Movebg_InitVars = { + ACTOR_BG_DANPEI_MOVEBG, + ACTORTYPE_BG, + FLAGS, + GAMEPLAY_KEEP, + sizeof(BgDanpeiMovebg), + (ActorFunc)BgDanpeiMovebg_Init, + (ActorFunc)BgDanpeiMovebg_Destroy, + (ActorFunc)BgDanpeiMovebg_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF6DE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Danpei_Movebg_0x80AF6DE0/BgDanpeiMovebg_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF6EA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Danpei_Movebg_0x80AF6DE0/BgDanpeiMovebg_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Danpei_Movebg_0x80AF6DE0/BgDanpeiMovebg_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF705C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF70FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF71FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF72F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF7354.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF746C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Danpei_Movebg_0x80AF6DE0/func_80AF74CC.asm") diff --git a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.h b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.h new file mode 100644 index 0000000000..b8de0d17e3 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_DANPEI_MOVEBG_H +#define Z_BG_DANPEI_MOVEBG_H + +#include + +struct BgDanpeiMovebg; + +typedef struct BgDanpeiMovebg { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x94]; +} BgDanpeiMovebg; // size = 0x1D8 + +extern const ActorInit Bg_Danpei_Movebg_InitVars; + +#endif // Z_BG_DANPEI_MOVEBG_H diff --git a/src/overlays/actors/ovl_Bg_Dblue_Balance/overlay.cfg b/src/overlays/actors/ovl_Bg_Dblue_Balance/overlay.cfg new file mode 100644 index 0000000000..f0f5a4f1ab --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Dblue_Balance/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Dblue_Balance +z_bg_dblue_balance.c diff --git a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c new file mode 100644 index 0000000000..c50ea9b34d --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c @@ -0,0 +1,64 @@ +#include "z_bg_dblue_balance.h" + +#define FLAGS 0x00000000 + +#define THIS ((BgDblueBalance*)thisx) + +void BgDblueBalance_Init(Actor* thisx, GlobalContext* globalCtx); +void BgDblueBalance_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgDblueBalance_Update(Actor* thisx, GlobalContext* globalCtx); +void BgDblueBalance_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Dblue_Balance_InitVars = { + ACTOR_BG_DBLUE_BALANCE, + ACTORTYPE_BG, + FLAGS, + OBJECT_DBLUE_OBJECT, + sizeof(BgDblueBalance), + (ActorFunc)BgDblueBalance_Init, + (ActorFunc)BgDblueBalance_Destroy, + (ActorFunc)BgDblueBalance_Update, + (ActorFunc)BgDblueBalance_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B823B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B82454.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B8259C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B8264C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B828E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B8296C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B82B00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/BgDblueBalance_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/BgDblueBalance_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B82DC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B82DE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/BgDblueBalance_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B8330C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B83344.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B8335C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B833A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B833C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B83518.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/BgDblueBalance_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Balance_0x80B823B0/func_80B83758.asm") diff --git a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.h b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.h new file mode 100644 index 0000000000..8d31ae167c --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_DBLUE_BALANCE_H +#define Z_BG_DBLUE_BALANCE_H + +#include + +struct BgDblueBalance; + +typedef struct BgDblueBalance { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xE8]; +} BgDblueBalance; // size = 0x22C + +extern const ActorInit Bg_Dblue_Balance_InitVars; + +#endif // Z_BG_DBLUE_BALANCE_H diff --git a/src/overlays/actors/ovl_Bg_Dblue_Elevator/overlay.cfg b/src/overlays/actors/ovl_Bg_Dblue_Elevator/overlay.cfg new file mode 100644 index 0000000000..8193509f4d --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Dblue_Elevator/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Dblue_Elevator +z_bg_dblue_elevator.c diff --git a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c new file mode 100644 index 0000000000..2475f0515e --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c @@ -0,0 +1,52 @@ +#include "z_bg_dblue_elevator.h" + +#define FLAGS 0x00000010 + +#define THIS ((BgDblueElevator*)thisx) + +void BgDblueElevator_Init(Actor* thisx, GlobalContext* globalCtx); +void BgDblueElevator_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgDblueElevator_Update(Actor* thisx, GlobalContext* globalCtx); +void BgDblueElevator_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Dblue_Elevator_InitVars = { + ACTOR_BG_DBLUE_ELEVATOR, + ACTORTYPE_BG, + FLAGS, + OBJECT_DBLUE_OBJECT, + sizeof(BgDblueElevator), + (ActorFunc)BgDblueElevator_Init, + (ActorFunc)BgDblueElevator_Destroy, + (ActorFunc)BgDblueElevator_Update, + (ActorFunc)BgDblueElevator_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B91F20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B91F74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B922C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B922FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/BgDblueElevator_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/BgDblueElevator_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B924DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B924F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B9257C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B925B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B92644.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/func_80B92660.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/BgDblueElevator_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Elevator_0x80B91F20/BgDblueElevator_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.h b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.h new file mode 100644 index 0000000000..04e59e7d31 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_DBLUE_ELEVATOR_H +#define Z_BG_DBLUE_ELEVATOR_H + +#include + +struct BgDblueElevator; + +typedef struct BgDblueElevator { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2C]; +} BgDblueElevator; // size = 0x170 + +extern const ActorInit Bg_Dblue_Elevator_InitVars; + +#endif // Z_BG_DBLUE_ELEVATOR_H diff --git a/src/overlays/actors/ovl_Bg_Dblue_Movebg/overlay.cfg b/src/overlays/actors/ovl_Bg_Dblue_Movebg/overlay.cfg new file mode 100644 index 0000000000..7188cf2ea1 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Dblue_Movebg/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Dblue_Movebg +z_bg_dblue_movebg.c diff --git a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c new file mode 100644 index 0000000000..a05d1f41c2 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c @@ -0,0 +1,62 @@ +#include "z_bg_dblue_movebg.h" + +#define FLAGS 0x00000030 + +#define THIS ((BgDblueMovebg*)thisx) + +void BgDblueMovebg_Init(Actor* thisx, GlobalContext* globalCtx); +void BgDblueMovebg_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgDblueMovebg_Update(Actor* thisx, GlobalContext* globalCtx); +void BgDblueMovebg_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Dblue_Movebg_InitVars = { + ACTOR_BG_DBLUE_MOVEBG, + ACTORTYPE_BG, + FLAGS, + OBJECT_DBLUE_OBJECT, + sizeof(BgDblueMovebg), + (ActorFunc)BgDblueMovebg_Init, + (ActorFunc)BgDblueMovebg_Destroy, + (ActorFunc)BgDblueMovebg_Update, + (ActorFunc)BgDblueMovebg_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A29A80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/BgDblueMovebg_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/BgDblueMovebg_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2A128.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2A1E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2A32C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2A444.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2A670.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2A688.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2A714.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2A7F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2AAB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2ABD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2AED0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2B1A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/BgDblueMovebg_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2B274.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/func_80A2B308.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Movebg_0x80A29A80/BgDblueMovebg_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.h b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.h new file mode 100644 index 0000000000..57d001d31c --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_DBLUE_MOVEBG_H +#define Z_BG_DBLUE_MOVEBG_H + +#include + +struct BgDblueMovebg; + +typedef struct BgDblueMovebg { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x22C]; +} BgDblueMovebg; // size = 0x370 + +extern const ActorInit Bg_Dblue_Movebg_InitVars; + +#endif // Z_BG_DBLUE_MOVEBG_H diff --git a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/overlay.cfg b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/overlay.cfg new file mode 100644 index 0000000000..08aaa6100f --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Dblue_Waterfall +z_bg_dblue_waterfall.c diff --git a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c new file mode 100644 index 0000000000..3da001aee8 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c @@ -0,0 +1,68 @@ +#include "z_bg_dblue_waterfall.h" + +#define FLAGS 0x00000010 + +#define THIS ((BgDblueWaterfall*)thisx) + +void BgDblueWaterfall_Init(Actor* thisx, GlobalContext* globalCtx); +void BgDblueWaterfall_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgDblueWaterfall_Update(Actor* thisx, GlobalContext* globalCtx); +void BgDblueWaterfall_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Dblue_Waterfall_InitVars = { + ACTOR_BG_DBLUE_WATERFALL, + ACTORTYPE_PROP, + FLAGS, + OBJECT_DBLUE_OBJECT, + sizeof(BgDblueWaterfall), + (ActorFunc)BgDblueWaterfall_Init, + (ActorFunc)BgDblueWaterfall_Destroy, + (ActorFunc)BgDblueWaterfall_Update, + (ActorFunc)BgDblueWaterfall_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B83C80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B83D04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B83D58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B83D94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B83E1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B83EA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B841A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84348.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84568.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84610.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/BgDblueWaterfall_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/BgDblueWaterfall_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B8484C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84928.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84AD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84AEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84B9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84BCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84EF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/func_80B84F20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/BgDblueWaterfall_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dblue_Waterfall_0x80B83C80/BgDblueWaterfall_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.h b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.h new file mode 100644 index 0000000000..4ffb4e8430 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_DBLUE_WATERFALL_H +#define Z_BG_DBLUE_WATERFALL_H + +#include + +struct BgDblueWaterfall; + +typedef struct BgDblueWaterfall { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x68]; +} BgDblueWaterfall; // size = 0x1AC + +extern const ActorInit Bg_Dblue_Waterfall_InitVars; + +#endif // Z_BG_DBLUE_WATERFALL_H diff --git a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/overlay.cfg b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/overlay.cfg new file mode 100644 index 0000000000..4a1aa8be1c --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Dkjail_Ivy +z_bg_dkjail_ivy.c diff --git a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c new file mode 100644 index 0000000000..1492618976 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c @@ -0,0 +1,46 @@ +#include "z_bg_dkjail_ivy.h" + +#define FLAGS 0x00000000 + +#define THIS ((BgDkjailIvy*)thisx) + +void BgDkjailIvy_Init(Actor* thisx, GlobalContext* globalCtx); +void BgDkjailIvy_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgDkjailIvy_Update(Actor* thisx, GlobalContext* globalCtx); +void BgDkjailIvy_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Dkjail_Ivy_InitVars = { + ACTOR_BG_DKJAIL_IVY, + ACTORTYPE_BG, + FLAGS, + OBJECT_DKJAIL_OBJ, + sizeof(BgDkjailIvy), + (ActorFunc)BgDkjailIvy_Init, + (ActorFunc)BgDkjailIvy_Destroy, + (ActorFunc)BgDkjailIvy_Update, + (ActorFunc)BgDkjailIvy_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dkjail_Ivy_0x80ADE230/func_80ADE230.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dkjail_Ivy_0x80ADE230/BgDkjailIvy_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dkjail_Ivy_0x80ADE230/BgDkjailIvy_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dkjail_Ivy_0x80ADE230/func_80ADE6AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dkjail_Ivy_0x80ADE230/func_80ADE6C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dkjail_Ivy_0x80ADE230/func_80ADE734.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dkjail_Ivy_0x80ADE230/func_80ADE748.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dkjail_Ivy_0x80ADE230/func_80ADE7E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dkjail_Ivy_0x80ADE230/func_80ADE7F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dkjail_Ivy_0x80ADE230/BgDkjailIvy_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dkjail_Ivy_0x80ADE230/BgDkjailIvy_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.h b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.h new file mode 100644 index 0000000000..63c7324073 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_DKJAIL_IVY_H +#define Z_BG_DKJAIL_IVY_H + +#include + +struct BgDkjailIvy; + +typedef struct BgDkjailIvy { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x6C]; +} BgDkjailIvy; // size = 0x1B0 + +extern const ActorInit Bg_Dkjail_Ivy_InitVars; + +#endif // Z_BG_DKJAIL_IVY_H diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/overlay.cfg b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/overlay.cfg new file mode 100644 index 0000000000..59c99de934 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Dy_Yoseizo +z_bg_dy_yoseizo.c diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c new file mode 100644 index 0000000000..b4c74b5bdc --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c @@ -0,0 +1,71 @@ +#include "z_bg_dy_yoseizo.h" + +#define FLAGS 0x02000030 + +#define THIS ((BgDyYoseizo*)thisx) + +void BgDyYoseizo_Init(Actor* thisx, GlobalContext* globalCtx); +void BgDyYoseizo_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgDyYoseizo_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Dy_Yoseizo_InitVars = { + ACTOR_BG_DY_YOSEIZO, + ACTORTYPE_PROP, + FLAGS, + OBJECT_DY_OBJ, + sizeof(BgDyYoseizo), + (ActorFunc)BgDyYoseizo_Init, + (ActorFunc)BgDyYoseizo_Destroy, + (ActorFunc)BgDyYoseizo_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/BgDyYoseizo_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/BgDyYoseizo_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0A96C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0A9E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0AA40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0AD50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0AE1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0AFDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B078.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B184.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B290.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B35C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B500.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B5F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B75C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B834.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0B8CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0BB08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/BgDyYoseizo_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0BCD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0BD40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0BE60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0BF70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Dy_Yoseizo_0x80A0A8A0/func_80A0C270.asm") diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h new file mode 100644 index 0000000000..12179e2aa7 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_DY_YOSEIZO_H +#define Z_BG_DY_YOSEIZO_H + +#include + +struct BgDyYoseizo; + +typedef struct BgDyYoseizo { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0x33C0]; +} BgDyYoseizo; // size = 0x3504 + +extern const ActorInit Bg_Dy_Yoseizo_InitVars; + +#endif // Z_BG_DY_YOSEIZO_H diff --git a/src/overlays/actors/ovl_Bg_F40_Block/overlay.cfg b/src/overlays/actors/ovl_Bg_F40_Block/overlay.cfg new file mode 100644 index 0000000000..b5030fcaa7 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_F40_Block/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_F40_Block +z_bg_f40_block.c diff --git a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c new file mode 100644 index 0000000000..10601c494e --- /dev/null +++ b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c @@ -0,0 +1,62 @@ +#include "z_bg_f40_block.h" + +#define FLAGS 0x00000010 + +#define THIS ((BgF40Block*)thisx) + +void BgF40Block_Init(Actor* thisx, GlobalContext* globalCtx); +void BgF40Block_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgF40Block_Update(Actor* thisx, GlobalContext* globalCtx); +void BgF40Block_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_F40_Block_InitVars = { + ACTOR_BG_F40_BLOCK, + ACTORTYPE_BG, + FLAGS, + OBJECT_F40_OBJ, + sizeof(BgF40Block), + (ActorFunc)BgF40Block_Init, + (ActorFunc)BgF40Block_Destroy, + (ActorFunc)BgF40Block_Update, + (ActorFunc)BgF40Block_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC3980.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC3A2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC3B00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC3CA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC3D08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC4038.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/BgF40Block_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/BgF40Block_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC41AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC4228.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC4344.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC4380.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC43CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC4448.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC44F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC4530.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/func_80BC457C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/BgF40Block_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Block_0x80BC3980/BgF40Block_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.h b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.h new file mode 100644 index 0000000000..33c6a27c2d --- /dev/null +++ b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_F40_BLOCK_H +#define Z_BG_F40_BLOCK_H + +#include + +struct BgF40Block; + +typedef struct BgF40Block { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2C]; +} BgF40Block; // size = 0x170 + +extern const ActorInit Bg_F40_Block_InitVars; + +#endif // Z_BG_F40_BLOCK_H diff --git a/src/overlays/actors/ovl_Bg_F40_Flift/overlay.cfg b/src/overlays/actors/ovl_Bg_F40_Flift/overlay.cfg new file mode 100644 index 0000000000..f771926dbf --- /dev/null +++ b/src/overlays/actors/ovl_Bg_F40_Flift/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_F40_Flift +z_bg_f40_flift.c diff --git a/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c b/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c new file mode 100644 index 0000000000..34c9a8964e --- /dev/null +++ b/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c @@ -0,0 +1,36 @@ +#include "z_bg_f40_flift.h" + +#define FLAGS 0x00000010 + +#define THIS ((BgF40Flift*)thisx) + +void BgF40Flift_Init(Actor* thisx, GlobalContext* globalCtx); +void BgF40Flift_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgF40Flift_Update(Actor* thisx, GlobalContext* globalCtx); +void BgF40Flift_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_F40_Flift_InitVars = { + ACTOR_BG_F40_FLIFT, + ACTORTYPE_BG, + FLAGS, + OBJECT_F40_OBJ, + sizeof(BgF40Flift), + (ActorFunc)BgF40Flift_Init, + (ActorFunc)BgF40Flift_Destroy, + (ActorFunc)BgF40Flift_Update, + (ActorFunc)BgF40Flift_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Flift_0x808D7550/BgF40Flift_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Flift_0x808D7550/BgF40Flift_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Flift_0x808D7550/func_808D75F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Flift_0x808D7550/func_808D7714.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Flift_0x808D7550/BgF40Flift_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Flift_0x808D7550/BgF40Flift_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.h b/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.h new file mode 100644 index 0000000000..40047e5a84 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_F40_FLIFT_H +#define Z_BG_F40_FLIFT_H + +#include + +struct BgF40Flift; + +typedef struct BgF40Flift { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x20]; +} BgF40Flift; // size = 0x164 + +extern const ActorInit Bg_F40_Flift_InitVars; + +#endif // Z_BG_F40_FLIFT_H diff --git a/src/overlays/actors/ovl_Bg_F40_Switch/overlay.cfg b/src/overlays/actors/ovl_Bg_F40_Switch/overlay.cfg new file mode 100644 index 0000000000..b5e0454594 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_F40_Switch/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_F40_Switch +z_bg_f40_switch.c diff --git a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c new file mode 100644 index 0000000000..2666bb01f9 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c @@ -0,0 +1,44 @@ +#include "z_bg_f40_switch.h" + +#define FLAGS 0x00000010 + +#define THIS ((BgF40Switch*)thisx) + +void BgF40Switch_Init(Actor* thisx, GlobalContext* globalCtx); +void BgF40Switch_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgF40Switch_Update(Actor* thisx, GlobalContext* globalCtx); +void BgF40Switch_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_F40_Switch_InitVars = { + ACTOR_BG_F40_SWITCH, + ACTORTYPE_SWITCH, + FLAGS, + OBJECT_F40_SWITCH, + sizeof(BgF40Switch), + (ActorFunc)BgF40Switch_Init, + (ActorFunc)BgF40Switch_Destroy, + (ActorFunc)BgF40Switch_Update, + (ActorFunc)BgF40Switch_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Switch_0x80BC47B0/func_80BC47B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Switch_0x80BC47B0/BgF40Switch_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Switch_0x80BC47B0/BgF40Switch_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Switch_0x80BC47B0/func_80BC4B20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Switch_0x80BC47B0/func_80BC4B94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Switch_0x80BC47B0/func_80BC4BB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Switch_0x80BC47B0/func_80BC4C68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Switch_0x80BC47B0/func_80BC4D30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Switch_0x80BC47B0/BgF40Switch_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Switch_0x80BC47B0/BgF40Switch_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.h b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.h new file mode 100644 index 0000000000..5a88b5bc52 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_F40_SWITCH_H +#define Z_BG_F40_SWITCH_H + +#include + +struct BgF40Switch; + +typedef struct BgF40Switch { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x24]; +} BgF40Switch; // size = 0x168 + +extern const ActorInit Bg_F40_Switch_InitVars; + +#endif // Z_BG_F40_SWITCH_H diff --git a/src/overlays/actors/ovl_Bg_F40_Swlift/overlay.cfg b/src/overlays/actors/ovl_Bg_F40_Swlift/overlay.cfg new file mode 100644 index 0000000000..83d9bffed0 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_F40_Swlift/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_F40_Swlift +z_bg_f40_swlift.c diff --git a/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c new file mode 100644 index 0000000000..3af971ecb7 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c @@ -0,0 +1,32 @@ +#include "z_bg_f40_swlift.h" + +#define FLAGS 0x00000010 + +#define THIS ((BgF40Swlift*)thisx) + +void BgF40Swlift_Init(Actor* thisx, GlobalContext* globalCtx); +void BgF40Swlift_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgF40Swlift_Update(Actor* thisx, GlobalContext* globalCtx); +void BgF40Swlift_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_F40_Swlift_InitVars = { + ACTOR_BG_F40_SWLIFT, + ACTORTYPE_BG, + FLAGS, + OBJECT_F40_OBJ, + sizeof(BgF40Swlift), + (ActorFunc)BgF40Swlift_Init, + (ActorFunc)BgF40Swlift_Destroy, + (ActorFunc)BgF40Swlift_Update, + (ActorFunc)BgF40Swlift_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Swlift_0x8096F160/BgF40Swlift_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Swlift_0x8096F160/BgF40Swlift_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Swlift_0x8096F160/BgF40Swlift_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_F40_Swlift_0x8096F160/BgF40Swlift_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.h b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.h new file mode 100644 index 0000000000..b7d34d637f --- /dev/null +++ b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_F40_SWLIFT_H +#define Z_BG_F40_SWLIFT_H + +#include + +struct BgF40Swlift; + +typedef struct BgF40Swlift { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1C]; +} BgF40Swlift; // size = 0x160 + +extern const ActorInit Bg_F40_Swlift_InitVars; + +#endif // Z_BG_F40_SWLIFT_H diff --git a/src/overlays/actors/ovl_Bg_Fire_Wall/overlay.cfg b/src/overlays/actors/ovl_Bg_Fire_Wall/overlay.cfg new file mode 100644 index 0000000000..8405309d0d --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Fire_Wall/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Fire_Wall +z_bg_fire_wall.c diff --git a/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c b/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c new file mode 100644 index 0000000000..668ec0bea3 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c @@ -0,0 +1,45 @@ +#include "z_bg_fire_wall.h" + +#define FLAGS 0x00000000 + +#define THIS ((BgFireWall*)thisx) + +void BgFireWall_Init(Actor* thisx, GlobalContext* globalCtx); +void BgFireWall_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgFireWall_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Fire_Wall_InitVars = { + ACTOR_BG_FIRE_WALL, + ACTORTYPE_BG, + FLAGS, + OBJECT_FWALL, + sizeof(BgFireWall), + (ActorFunc)BgFireWall_Init, + (ActorFunc)BgFireWall_Destroy, + (ActorFunc)BgFireWall_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fire_Wall_0x809AC4B0/BgFireWall_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fire_Wall_0x809AC4B0/BgFireWall_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fire_Wall_0x809AC4B0/func_809AC5C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fire_Wall_0x809AC4B0/func_809AC638.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fire_Wall_0x809AC4B0/func_809AC68C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fire_Wall_0x809AC4B0/func_809AC6C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fire_Wall_0x809AC4B0/func_809AC760.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fire_Wall_0x809AC4B0/func_809AC7F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fire_Wall_0x809AC4B0/func_809AC970.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fire_Wall_0x809AC4B0/BgFireWall_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fire_Wall_0x809AC4B0/func_809ACB28.asm") diff --git a/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.h b/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.h new file mode 100644 index 0000000000..c7b6e55c60 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_FIRE_WALL_H +#define Z_BG_FIRE_WALL_H + +#include + +struct BgFireWall; + +typedef struct BgFireWall { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x6C]; +} BgFireWall; // size = 0x1B0 + +extern const ActorInit Bg_Fire_Wall_InitVars; + +#endif // Z_BG_FIRE_WALL_H diff --git a/src/overlays/actors/ovl_Bg_Fu_Kaiten/overlay.cfg b/src/overlays/actors/ovl_Bg_Fu_Kaiten/overlay.cfg new file mode 100644 index 0000000000..30736ca5db --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Fu_Kaiten/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Fu_Kaiten +z_bg_fu_kaiten.c diff --git a/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c b/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c new file mode 100644 index 0000000000..6468c85727 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c @@ -0,0 +1,74 @@ +#include "z_bg_fu_kaiten.h" + +#define FLAGS 0x00000030 + +#define THIS ((BgFuKaiten*)thisx) + +void BgFuKaiten_Init(Actor* thisx, GlobalContext* globalCtx); +void BgFuKaiten_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgFuKaiten_Update(Actor* thisx, GlobalContext* globalCtx); +void BgFuKaiten_Draw(Actor* thisx, GlobalContext* globalCtx); + +const ActorInit Bg_Fu_Kaiten_InitVars = { + ACTOR_BG_FU_KAITEN, + ACTORTYPE_BG, + FLAGS, + OBJECT_FU_KAITEN, + sizeof(BgFuKaiten), + (ActorFunc)BgFuKaiten_Init, + (ActorFunc)BgFuKaiten_Destroy, + (ActorFunc)BgFuKaiten_Update, + (ActorFunc)BgFuKaiten_Draw +}; + +void BgFuKaiten_Init(Actor* thisx, GlobalContext* globalCtx) { + UNK_TYPE pad0; + UNK_TYPE pad1; + BgMeshHeader* header = 0; + + Actor_SetScale(thisx, 1.0); + BcCheck3_BgActorInit(&THIS->bg, 3); + BgCheck_RelocateMeshHeader(&object_fu_kaiten_002D30, &header); + THIS->bg.dynaPolyId = BgCheck_AddActorMesh(globalCtx, &globalCtx->colCtx.dyna, &THIS->bg, header); + + THIS->bouceHeight = 0.0; + THIS->rotationSpeed = 0; + THIS->bounceSpeed = 0; + THIS->bounce = 0; +} + +void BgFuKaiten_Destroy(Actor* thisx, GlobalContext* globalCtx) { + BgCheck_RemoveActorMesh(globalCtx, &globalCtx->colCtx.dyna, THIS->bg.dynaPolyId); +} + +void BgFuKaiten_UpdateRotation(BgFuKaiten* this) { + f32 f0; + this->bg.actor.shape.rot.y += this->rotationSpeed; + if (this->rotationSpeed > 0) + { + f0 = this->rotationSpeed * .002f; + func_8019FAD8(&this->bg.actor.unkEC, 8310, f0); + } +} + +void BgFuKaiten_UpdateHeight(BgFuKaiten* this) { + this->bounce += this->bounceSpeed; + this->bg.actor.currPosRot.pos.y = this->bg.actor.initPosRot.pos.y + this->elevation + this->bouceHeight; + + this->bg.actor.currPosRot.pos.y -= this->bouceHeight * Math_Coss(this->bounce); +} + +void BgFuKaiten_Update(Actor* thisx, GlobalContext* globalCtx) { + BgFuKaiten_UpdateRotation(THIS); + BgFuKaiten_UpdateHeight(THIS); +} + +void BgFuKaiten_Draw(Actor* thisx, GlobalContext* globalCtx) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + UNK_TYPE pad; + + func_8012C28C(gfxCtx); + + gSPMatrix(gfxCtx->polyOpa.p++, SysMatrix_AppendStateToPolyOpaDisp(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gfxCtx->polyOpa.p++, object_fu_kaiten_0005D0); +} diff --git a/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.h b/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.h new file mode 100644 index 0000000000..5dafe366d4 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.h @@ -0,0 +1,21 @@ +#ifndef Z_BG_FU_KAITEN_H +#define Z_BG_FU_KAITEN_H + +#include + +struct BgFuKaiten; + +typedef struct BgFuKaiten { + /* 0x000 */ DynaPolyActor bg; + /* 0x15C */ UNK_TYPE1 pad15C[0x4]; + /* 0x160 */ f32 elevation; + /* 0x164 */ f32 bouceHeight; + /* 0x168 */ s16 rotationSpeed; + /* 0x16A */ s16 bounceSpeed; + /* 0x16C */ s16 bounce; + /* 0x16E */ UNK_TYPE1 pad16E[0x2]; +} BgFuKaiten; // size = 0x170 + +extern const ActorInit Bg_Fu_Kaiten_InitVars; + +#endif // Z_BG_FU_KAITEN_H diff --git a/src/overlays/actors/ovl_Bg_Fu_Mizu/overlay.cfg b/src/overlays/actors/ovl_Bg_Fu_Mizu/overlay.cfg new file mode 100644 index 0000000000..295d23d049 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Fu_Mizu/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Fu_Mizu +z_bg_fu_mizu.c diff --git a/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c b/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c new file mode 100644 index 0000000000..9d2bf207d3 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c @@ -0,0 +1,34 @@ +#include "z_bg_fu_mizu.h" + +#define FLAGS 0x00000030 + +#define THIS ((BgFuMizu*)thisx) + +void BgFuMizu_Init(Actor* thisx, GlobalContext* globalCtx); +void BgFuMizu_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgFuMizu_Update(Actor* thisx, GlobalContext* globalCtx); +void BgFuMizu_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Fu_Mizu_InitVars = { + ACTOR_BG_FU_MIZU, + ACTORTYPE_BG, + FLAGS, + OBJECT_FU_KAITEN, + sizeof(BgFuMizu), + (ActorFunc)BgFuMizu_Init, + (ActorFunc)BgFuMizu_Destroy, + (ActorFunc)BgFuMizu_Update, + (ActorFunc)BgFuMizu_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fu_Mizu_0x80ADAAF0/BgFuMizu_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fu_Mizu_0x80ADAAF0/BgFuMizu_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fu_Mizu_0x80ADAAF0/func_80ADABA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fu_Mizu_0x80ADAAF0/BgFuMizu_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Fu_Mizu_0x80ADAAF0/BgFuMizu_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.h b/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.h new file mode 100644 index 0000000000..68f04c6ab5 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_FU_MIZU_H +#define Z_BG_FU_MIZU_H + +#include + +struct BgFuMizu; + +typedef struct BgFuMizu { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x20]; +} BgFuMizu; // size = 0x164 + +extern const ActorInit Bg_Fu_Mizu_InitVars; + +#endif // Z_BG_FU_MIZU_H diff --git a/src/overlays/actors/ovl_Bg_Goron_Oyu/overlay.cfg b/src/overlays/actors/ovl_Bg_Goron_Oyu/overlay.cfg new file mode 100644 index 0000000000..cd6286ed11 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Goron_Oyu/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Goron_Oyu +z_bg_goron_oyu.c diff --git a/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c b/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c new file mode 100644 index 0000000000..be9094958c --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c @@ -0,0 +1,48 @@ +#include "z_bg_goron_oyu.h" + +#define FLAGS 0x00000030 + +#define THIS ((BgGoronOyu*)thisx) + +void BgGoronOyu_Init(Actor* thisx, GlobalContext* globalCtx); +void BgGoronOyu_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgGoronOyu_Update(Actor* thisx, GlobalContext* globalCtx); +void BgGoronOyu_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Goron_Oyu_InitVars = { + ACTOR_BG_GORON_OYU, + ACTORTYPE_BG, + FLAGS, + OBJECT_OYU, + sizeof(BgGoronOyu), + (ActorFunc)BgGoronOyu_Init, + (ActorFunc)BgGoronOyu_Destroy, + (ActorFunc)BgGoronOyu_Update, + (ActorFunc)BgGoronOyu_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Goron_Oyu_0x80B40080/func_80B40080.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Goron_Oyu_0x80B40080/func_80B4009C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Goron_Oyu_0x80B40080/func_80B400C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Goron_Oyu_0x80B40080/func_80B40100.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Goron_Oyu_0x80B40080/func_80B40160.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Goron_Oyu_0x80B40080/func_80B401F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Goron_Oyu_0x80B40080/func_80B40308.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Goron_Oyu_0x80B40080/func_80B40394.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Goron_Oyu_0x80B40080/BgGoronOyu_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Goron_Oyu_0x80B40080/BgGoronOyu_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Goron_Oyu_0x80B40080/BgGoronOyu_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Goron_Oyu_0x80B40080/BgGoronOyu_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.h b/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.h new file mode 100644 index 0000000000..9e95eb6220 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_GORON_OYU_H +#define Z_BG_GORON_OYU_H + +#include + +struct BgGoronOyu; + +typedef struct BgGoronOyu { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x3C]; +} BgGoronOyu; // size = 0x180 + +extern const ActorInit Bg_Goron_Oyu_InitVars; + +#endif // Z_BG_GORON_OYU_H diff --git a/src/overlays/actors/ovl_Bg_Haka_Bombwall/overlay.cfg b/src/overlays/actors/ovl_Bg_Haka_Bombwall/overlay.cfg new file mode 100644 index 0000000000..dd9b391ee5 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Haka_Bombwall/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Haka_Bombwall +z_bg_haka_bombwall.c diff --git a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c new file mode 100644 index 0000000000..ac26934f40 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c @@ -0,0 +1,48 @@ +#include "z_bg_haka_bombwall.h" + +#define FLAGS 0x00000000 + +#define THIS ((BgHakaBombwall*)thisx) + +void BgHakaBombwall_Init(Actor* thisx, GlobalContext* globalCtx); +void BgHakaBombwall_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgHakaBombwall_Update(Actor* thisx, GlobalContext* globalCtx); +void BgHakaBombwall_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Haka_Bombwall_InitVars = { + ACTOR_BG_HAKA_BOMBWALL, + ACTORTYPE_BG, + FLAGS, + OBJECT_HAKA_OBJ, + sizeof(BgHakaBombwall), + (ActorFunc)BgHakaBombwall_Init, + (ActorFunc)BgHakaBombwall_Destroy, + (ActorFunc)BgHakaBombwall_Update, + (ActorFunc)BgHakaBombwall_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Bombwall_0x80BD5E00/func_80BD5E00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Bombwall_0x80BD5E00/func_80BD5E6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Bombwall_0x80BD5E00/BgHakaBombwall_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Bombwall_0x80BD5E00/BgHakaBombwall_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Bombwall_0x80BD5E00/func_80BD6260.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Bombwall_0x80BD5E00/func_80BD6274.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Bombwall_0x80BD5E00/func_80BD62D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Bombwall_0x80BD5E00/func_80BD6314.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Bombwall_0x80BD5E00/func_80BD63B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Bombwall_0x80BD5E00/func_80BD63D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Bombwall_0x80BD5E00/BgHakaBombwall_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Bombwall_0x80BD5E00/BgHakaBombwall_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.h b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.h new file mode 100644 index 0000000000..190f5c8d70 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_HAKA_BOMBWALL_H +#define Z_BG_HAKA_BOMBWALL_H + +#include + +struct BgHakaBombwall; + +typedef struct BgHakaBombwall { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x6C]; +} BgHakaBombwall; // size = 0x1B0 + +extern const ActorInit Bg_Haka_Bombwall_InitVars; + +#endif // Z_BG_HAKA_BOMBWALL_H diff --git a/src/overlays/actors/ovl_Bg_Haka_Curtain/overlay.cfg b/src/overlays/actors/ovl_Bg_Haka_Curtain/overlay.cfg new file mode 100644 index 0000000000..eba48c8727 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Haka_Curtain/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Haka_Curtain +z_bg_haka_curtain.c diff --git a/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c b/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c new file mode 100644 index 0000000000..b6148b7245 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c @@ -0,0 +1,52 @@ +#include "z_bg_haka_curtain.h" + +#define FLAGS 0x00000010 + +#define THIS ((BgHakaCurtain*)thisx) + +void BgHakaCurtain_Init(Actor* thisx, GlobalContext* globalCtx); +void BgHakaCurtain_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgHakaCurtain_Update(Actor* thisx, GlobalContext* globalCtx); +void BgHakaCurtain_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Haka_Curtain_InitVars = { + ACTOR_BG_HAKA_CURTAIN, + ACTORTYPE_BG, + FLAGS, + OBJECT_HAKA_OBJ, + sizeof(BgHakaCurtain), + (ActorFunc)BgHakaCurtain_Init, + (ActorFunc)BgHakaCurtain_Destroy, + (ActorFunc)BgHakaCurtain_Update, + (ActorFunc)BgHakaCurtain_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Curtain_0x80B6DBE0/BgHakaCurtain_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Curtain_0x80B6DBE0/BgHakaCurtain_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Curtain_0x80B6DBE0/func_80B6DC98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Curtain_0x80B6DBE0/func_80B6DCAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Curtain_0x80B6DBE0/func_80B6DCEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Curtain_0x80B6DBE0/func_80B6DD00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Curtain_0x80B6DBE0/func_80B6DD5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Curtain_0x80B6DBE0/func_80B6DD70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Curtain_0x80B6DBE0/func_80B6DD80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Curtain_0x80B6DBE0/func_80B6DD9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Curtain_0x80B6DBE0/func_80B6DE80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Curtain_0x80B6DBE0/func_80B6DEA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Curtain_0x80B6DBE0/BgHakaCurtain_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Curtain_0x80B6DBE0/BgHakaCurtain_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.h b/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.h new file mode 100644 index 0000000000..6e41aa1f58 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_HAKA_CURTAIN_H +#define Z_BG_HAKA_CURTAIN_H + +#include + +struct BgHakaCurtain; + +typedef struct BgHakaCurtain { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1C]; +} BgHakaCurtain; // size = 0x160 + +extern const ActorInit Bg_Haka_Curtain_InitVars; + +#endif // Z_BG_HAKA_CURTAIN_H diff --git a/src/overlays/actors/ovl_Bg_Haka_Tomb/overlay.cfg b/src/overlays/actors/ovl_Bg_Haka_Tomb/overlay.cfg new file mode 100644 index 0000000000..3e83b3fb68 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Haka_Tomb/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Haka_Tomb +z_bg_haka_tomb.c diff --git a/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c b/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c new file mode 100644 index 0000000000..4466f229ab --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c @@ -0,0 +1,46 @@ +#include "z_bg_haka_tomb.h" + +#define FLAGS 0x00000000 + +#define THIS ((BgHakaTomb*)thisx) + +void BgHakaTomb_Init(Actor* thisx, GlobalContext* globalCtx); +void BgHakaTomb_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgHakaTomb_Update(Actor* thisx, GlobalContext* globalCtx); +void BgHakaTomb_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Haka_Tomb_InitVars = { + ACTOR_BG_HAKA_TOMB, + ACTORTYPE_BG, + FLAGS, + OBJECT_HAKA_OBJ, + sizeof(BgHakaTomb), + (ActorFunc)BgHakaTomb_Init, + (ActorFunc)BgHakaTomb_Destroy, + (ActorFunc)BgHakaTomb_Update, + (ActorFunc)BgHakaTomb_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Tomb_0x80BD6580/BgHakaTomb_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Tomb_0x80BD6580/BgHakaTomb_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Tomb_0x80BD6580/func_80BD6624.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Tomb_0x80BD6580/func_80BD6638.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Tomb_0x80BD6580/func_80BD66AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Tomb_0x80BD6580/func_80BD6754.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Tomb_0x80BD6580/func_80BD6768.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Tomb_0x80BD6580/func_80BD67A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Tomb_0x80BD6580/func_80BD67BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Tomb_0x80BD6580/BgHakaTomb_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Haka_Tomb_0x80BD6580/BgHakaTomb_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.h b/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.h new file mode 100644 index 0000000000..47999c9be5 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_HAKA_TOMB_H +#define Z_BG_HAKA_TOMB_H + +#include + +struct BgHakaTomb; + +typedef struct BgHakaTomb { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x20]; +} BgHakaTomb; // size = 0x164 + +extern const ActorInit Bg_Haka_Tomb_InitVars; + +#endif // Z_BG_HAKA_TOMB_H diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/overlay.cfg b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/overlay.cfg new file mode 100644 index 0000000000..9b4288e951 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Hakugin_Bombwall +z_bg_hakugin_bombwall.c diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c new file mode 100644 index 0000000000..d763c495d5 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c @@ -0,0 +1,50 @@ +#include "z_bg_hakugin_bombwall.h" + +#define FLAGS 0x00000000 + +#define THIS ((BgHakuginBombwall*)thisx) + +void BgHakuginBombwall_Init(Actor* thisx, GlobalContext* globalCtx); +void BgHakuginBombwall_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgHakuginBombwall_Update(Actor* thisx, GlobalContext* globalCtx); +void BgHakuginBombwall_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Hakugin_Bombwall_InitVars = { + ACTOR_BG_HAKUGIN_BOMBWALL, + ACTORTYPE_BG, + FLAGS, + OBJECT_HAKUGIN_OBJ, + sizeof(BgHakuginBombwall), + (ActorFunc)BgHakuginBombwall_Init, + (ActorFunc)BgHakuginBombwall_Destroy, + (ActorFunc)BgHakuginBombwall_Update, + (ActorFunc)BgHakuginBombwall_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABBFC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABC2E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABC58C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABC7FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/BgHakuginBombwall_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/BgHakuginBombwall_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABCB5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABCC00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABCCE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABCD98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/func_80ABCE60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/BgHakuginBombwall_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0/BgHakuginBombwall_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.h b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.h new file mode 100644 index 0000000000..548d108b1a --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_HAKUGIN_BOMBWALL_H +#define Z_BG_HAKUGIN_BOMBWALL_H + +#include + +struct BgHakuginBombwall; + +typedef struct BgHakuginBombwall { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x6C]; +} BgHakuginBombwall; // size = 0x1B0 + +extern const ActorInit Bg_Hakugin_Bombwall_InitVars; + +#endif // Z_BG_HAKUGIN_BOMBWALL_H diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/overlay.cfg b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/overlay.cfg new file mode 100644 index 0000000000..cc7d95cdce --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Hakugin_Elvpole +z_bg_hakugin_elvpole.c diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c new file mode 100644 index 0000000000..d6bfbaec5b --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c @@ -0,0 +1,34 @@ +#include "z_bg_hakugin_elvpole.h" + +#define FLAGS 0x00000010 + +#define THIS ((BgHakuginElvpole*)thisx) + +void BgHakuginElvpole_Init(Actor* thisx, GlobalContext* globalCtx); +void BgHakuginElvpole_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgHakuginElvpole_Update(Actor* thisx, GlobalContext* globalCtx); +void BgHakuginElvpole_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Hakugin_Elvpole_InitVars = { + ACTOR_BG_HAKUGIN_ELVPOLE, + ACTORTYPE_BG, + FLAGS, + OBJECT_HAKUGIN_OBJ, + sizeof(BgHakuginElvpole), + (ActorFunc)BgHakuginElvpole_Init, + (ActorFunc)BgHakuginElvpole_Destroy, + (ActorFunc)BgHakuginElvpole_Update, + (ActorFunc)BgHakuginElvpole_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Elvpole_0x80ABD830/BgHakuginElvpole_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Elvpole_0x80ABD830/BgHakuginElvpole_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Elvpole_0x80ABD830/func_80ABD92C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Elvpole_0x80ABD830/BgHakuginElvpole_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Elvpole_0x80ABD830/BgHakuginElvpole_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.h b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.h new file mode 100644 index 0000000000..b4d8a83804 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_HAKUGIN_ELVPOLE_H +#define Z_BG_HAKUGIN_ELVPOLE_H + +#include + +struct BgHakuginElvpole; + +typedef struct BgHakuginElvpole { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x24]; +} BgHakuginElvpole; // size = 0x168 + +extern const ActorInit Bg_Hakugin_Elvpole_InitVars; + +#endif // Z_BG_HAKUGIN_ELVPOLE_H diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Post/overlay.cfg b/src/overlays/actors/ovl_Bg_Hakugin_Post/overlay.cfg new file mode 100644 index 0000000000..fc47ccb4fc --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Hakugin_Post/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Hakugin_Post +z_bg_hakugin_post.c diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c new file mode 100644 index 0000000000..9f50731455 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c @@ -0,0 +1,105 @@ +#include "z_bg_hakugin_post.h" + +#define FLAGS 0x00000030 + +#define THIS ((BgHakuginPost*)thisx) + +void BgHakuginPost_Init(Actor* thisx, GlobalContext* globalCtx); +void BgHakuginPost_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgHakuginPost_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Hakugin_Post_InitVars = { + ACTOR_BG_HAKUGIN_POST, + ACTORTYPE_BG, + FLAGS, + OBJECT_HAKUGIN_OBJ, + sizeof(BgHakuginPost), + (ActorFunc)BgHakuginPost_Init, + (ActorFunc)BgHakuginPost_Destroy, + (ActorFunc)BgHakuginPost_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9ACD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9ACF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9AD18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9AE3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9AEB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9AFB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9B160.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9B244.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9B2B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9B32C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9B384.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9B3BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9B46C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9B554.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9BC0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9BD24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9C058.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9C18C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9C228.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9C634.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9C854.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/BgHakuginPost_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/BgHakuginPost_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9CA94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9CAA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9CC84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9CCA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9CD00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9CD14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9CE00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9CE1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D0A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D0B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D1E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D260.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D2C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D360.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D3E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D434.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/BgHakuginPost_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Post_0x80A9ACD0/func_80A9D61C.asm") diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.h b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.h new file mode 100644 index 0000000000..9c42a12c55 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_HAKUGIN_POST_H +#define Z_BG_HAKUGIN_POST_H + +#include + +struct BgHakuginPost; + +typedef struct BgHakuginPost { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x44]; +} BgHakuginPost; // size = 0x188 + +extern const ActorInit Bg_Hakugin_Post_InitVars; + +#endif // Z_BG_HAKUGIN_POST_H diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Switch/overlay.cfg b/src/overlays/actors/ovl_Bg_Hakugin_Switch/overlay.cfg new file mode 100644 index 0000000000..3887196c77 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Hakugin_Switch/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Hakugin_Switch +z_bg_hakugin_switch.c diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c new file mode 100644 index 0000000000..1cc71b50ee --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c @@ -0,0 +1,76 @@ +#include "z_bg_hakugin_switch.h" + +#define FLAGS 0x00000010 + +#define THIS ((BgHakuginSwitch*)thisx) + +void BgHakuginSwitch_Init(Actor* thisx, GlobalContext* globalCtx); +void BgHakuginSwitch_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgHakuginSwitch_Update(Actor* thisx, GlobalContext* globalCtx); +void BgHakuginSwitch_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Hakugin_Switch_InitVars = { + ACTOR_BG_HAKUGIN_SWITCH, + ACTORTYPE_SWITCH, + FLAGS, + OBJECT_GORONSWITCH, + sizeof(BgHakuginSwitch), + (ActorFunc)BgHakuginSwitch_Init, + (ActorFunc)BgHakuginSwitch_Destroy, + (ActorFunc)BgHakuginSwitch_Update, + (ActorFunc)BgHakuginSwitch_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15790.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B157C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/BgHakuginSwitch_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/BgHakuginSwitch_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15A4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15A68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15B1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15B74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15E0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15E78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15F3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B15F88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B1606C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B160DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B16180.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B161A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B16244.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B162AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B163C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B16400.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B16494.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B16520.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B165A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/func_80B165E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/BgHakuginSwitch_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Hakugin_Switch_0x80B15790/BgHakuginSwitch_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.h b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.h new file mode 100644 index 0000000000..c85a1baee0 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_HAKUGIN_SWITCH_H +#define Z_BG_HAKUGIN_SWITCH_H + +#include + +struct BgHakuginSwitch; + +typedef struct BgHakuginSwitch { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x88]; +} BgHakuginSwitch; // size = 0x1CC + +extern const ActorInit Bg_Hakugin_Switch_InitVars; + +#endif // Z_BG_HAKUGIN_SWITCH_H diff --git a/src/overlays/actors/ovl_Bg_Icefloe/overlay.cfg b/src/overlays/actors/ovl_Bg_Icefloe/overlay.cfg new file mode 100644 index 0000000000..f8da71e62d --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Icefloe/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Icefloe +z_bg_icefloe.c diff --git a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c new file mode 100644 index 0000000000..62e696510d --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c @@ -0,0 +1,44 @@ +#include "z_bg_icefloe.h" + +#define FLAGS 0x00000010 + +#define THIS ((BgIcefloe*)thisx) + +void BgIcefloe_Init(Actor* thisx, GlobalContext* globalCtx); +void BgIcefloe_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgIcefloe_Update(Actor* thisx, GlobalContext* globalCtx); +void BgIcefloe_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Icefloe_InitVars = { + ACTOR_BG_ICEFLOE, + ACTORTYPE_BG, + FLAGS, + OBJECT_ICEFLOE, + sizeof(BgIcefloe), + (ActorFunc)BgIcefloe_Init, + (ActorFunc)BgIcefloe_Destroy, + (ActorFunc)BgIcefloe_Update, + (ActorFunc)BgIcefloe_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icefloe_0x80AC48F0/BgIcefloe_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icefloe_0x80AC48F0/BgIcefloe_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icefloe_0x80AC48F0/func_80AC4A80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icefloe_0x80AC48F0/func_80AC4AE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icefloe_0x80AC48F0/func_80AC4C18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icefloe_0x80AC48F0/func_80AC4C34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icefloe_0x80AC48F0/func_80AC4CF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icefloe_0x80AC48F0/func_80AC4D2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icefloe_0x80AC48F0/BgIcefloe_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icefloe_0x80AC48F0/BgIcefloe_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.h b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.h new file mode 100644 index 0000000000..b6b05bd8fe --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_ICEFLOE_H +#define Z_BG_ICEFLOE_H + +#include + +struct BgIcefloe; + +typedef struct BgIcefloe { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x20]; +} BgIcefloe; // size = 0x164 + +extern const ActorInit Bg_Icefloe_InitVars; + +#endif // Z_BG_ICEFLOE_H diff --git a/src/overlays/actors/ovl_Bg_Icicle/overlay.cfg b/src/overlays/actors/ovl_Bg_Icicle/overlay.cfg new file mode 100644 index 0000000000..88c4deec09 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Icicle/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Icicle +z_bg_icicle.c diff --git a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c new file mode 100644 index 0000000000..da2b54fd18 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c @@ -0,0 +1,46 @@ +#include "z_bg_icicle.h" + +#define FLAGS 0x00000000 + +#define THIS ((BgIcicle*)thisx) + +void BgIcicle_Init(Actor* thisx, GlobalContext* globalCtx); +void BgIcicle_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgIcicle_Update(Actor* thisx, GlobalContext* globalCtx); +void BgIcicle_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Icicle_InitVars = { + ACTOR_BG_ICICLE, + ACTORTYPE_PROP, + FLAGS, + OBJECT_ICICLE, + sizeof(BgIcicle), + (ActorFunc)BgIcicle_Init, + (ActorFunc)BgIcicle_Destroy, + (ActorFunc)BgIcicle_Update, + (ActorFunc)BgIcicle_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icicle_0x809C9A60/BgIcicle_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icicle_0x809C9A60/BgIcicle_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icicle_0x809C9A60/func_809C9B9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icicle_0x809C9A60/func_809C9D7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icicle_0x809C9A60/func_809C9D8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icicle_0x809C9A60/func_809C9DC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icicle_0x809C9A60/func_809C9F28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icicle_0x809C9A60/func_809CA06C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icicle_0x809C9A60/func_809CA0BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icicle_0x809C9A60/BgIcicle_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Icicle_0x809C9A60/BgIcicle_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.h b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.h new file mode 100644 index 0000000000..fea19d1573 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_ICICLE_H +#define Z_BG_ICICLE_H + +#include + +struct BgIcicle; + +typedef struct BgIcicle { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x6C]; +} BgIcicle; // size = 0x1B0 + +extern const ActorInit Bg_Icicle_InitVars; + +#endif // Z_BG_ICICLE_H diff --git a/src/overlays/actors/ovl_Bg_Ikana_Block/overlay.cfg b/src/overlays/actors/ovl_Bg_Ikana_Block/overlay.cfg new file mode 100644 index 0000000000..af448437b7 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ikana_Block/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Ikana_Block +z_bg_ikana_block.c diff --git a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c new file mode 100644 index 0000000000..f92802f4e5 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c @@ -0,0 +1,67 @@ +#include "z_bg_ikana_block.h" + +#define FLAGS 0x00000010 + +#define THIS ((BgIkanaBlock*)thisx) + +void BgIkanaBlock_Init(Actor* thisx, GlobalContext* globalCtx); +void BgIkanaBlock_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgIkanaBlock_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Ikana_Block_InitVars = { + ACTOR_BG_IKANA_BLOCK, + ACTORTYPE_BG, + FLAGS, + GAMEPLAY_DANGEON_KEEP, + sizeof(BgIkanaBlock), + (ActorFunc)BgIkanaBlock_Init, + (ActorFunc)BgIkanaBlock_Destroy, + (ActorFunc)BgIkanaBlock_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7EA60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7EB30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7EB64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7EB7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7EB94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7ECFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7ED54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7EDC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7EE70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7EEB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/BgIkanaBlock_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/BgIkanaBlock_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F00C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F034.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F0A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F0D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F1A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F290.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F360.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F398.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/BgIkanaBlock_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Block_0x80B7EA60/func_80B7F564.asm") diff --git a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.h b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.h new file mode 100644 index 0000000000..dc1ff78f95 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_IKANA_BLOCK_H +#define Z_BG_IKANA_BLOCK_H + +#include + +struct BgIkanaBlock; + +typedef struct BgIkanaBlock { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x3C]; +} BgIkanaBlock; // size = 0x180 + +extern const ActorInit Bg_Ikana_Block_InitVars; + +#endif // Z_BG_IKANA_BLOCK_H diff --git a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/overlay.cfg b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/overlay.cfg new file mode 100644 index 0000000000..4888c9532f --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Ikana_Bombwall +z_bg_ikana_bombwall.c diff --git a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c new file mode 100644 index 0000000000..5220e84796 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c @@ -0,0 +1,56 @@ +#include "z_bg_ikana_bombwall.h" + +#define FLAGS 0x10000000 + +#define THIS ((BgIkanaBombwall*)thisx) + +void BgIkanaBombwall_Init(Actor* thisx, GlobalContext* globalCtx); +void BgIkanaBombwall_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgIkanaBombwall_Update(Actor* thisx, GlobalContext* globalCtx); +void BgIkanaBombwall_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Ikana_Bombwall_InitVars = { + ACTOR_BG_IKANA_BOMBWALL, + ACTORTYPE_BG, + FLAGS, + OBJECT_IKANA_OBJ, + sizeof(BgIkanaBombwall), + (ActorFunc)BgIkanaBombwall_Init, + (ActorFunc)BgIkanaBombwall_Destroy, + (ActorFunc)BgIkanaBombwall_Update, + (ActorFunc)BgIkanaBombwall_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4720.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4A14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/BgIkanaBombwall_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/BgIkanaBombwall_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4E44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4EAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4F18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4F2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4F88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4F9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD4FF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD503C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD5118.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/func_80BD5134.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/BgIkanaBombwall_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Bombwall_0x80BD4720/BgIkanaBombwall_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.h b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.h new file mode 100644 index 0000000000..3f757d2a42 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_IKANA_BOMBWALL_H +#define Z_BG_IKANA_BOMBWALL_H + +#include + +struct BgIkanaBombwall; + +typedef struct BgIkanaBombwall { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x6C]; +} BgIkanaBombwall; // size = 0x1B0 + +extern const ActorInit Bg_Ikana_Bombwall_InitVars; + +#endif // Z_BG_IKANA_BOMBWALL_H diff --git a/src/overlays/actors/ovl_Bg_Ikana_Dharma/overlay.cfg b/src/overlays/actors/ovl_Bg_Ikana_Dharma/overlay.cfg new file mode 100644 index 0000000000..13c58ba86f --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ikana_Dharma/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Ikana_Dharma +z_bg_ikana_dharma.c diff --git a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c new file mode 100644 index 0000000000..28e82e8508 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c @@ -0,0 +1,46 @@ +#include "z_bg_ikana_dharma.h" + +#define FLAGS 0x00000010 + +#define THIS ((BgIkanaDharma*)thisx) + +void BgIkanaDharma_Init(Actor* thisx, GlobalContext* globalCtx); +void BgIkanaDharma_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgIkanaDharma_Update(Actor* thisx, GlobalContext* globalCtx); +void BgIkanaDharma_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Ikana_Dharma_InitVars = { + ACTOR_BG_IKANA_DHARMA, + ACTORTYPE_BG, + FLAGS, + OBJECT_IKANA_OBJ, + sizeof(BgIkanaDharma), + (ActorFunc)BgIkanaDharma_Init, + (ActorFunc)BgIkanaDharma_Destroy, + (ActorFunc)BgIkanaDharma_Update, + (ActorFunc)BgIkanaDharma_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Dharma_0x80BEC240/func_80BEC240.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Dharma_0x80BEC240/BgIkanaDharma_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Dharma_0x80BEC240/BgIkanaDharma_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Dharma_0x80BEC240/func_80BEC5C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Dharma_0x80BEC240/func_80BEC5E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Dharma_0x80BEC240/func_80BEC758.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Dharma_0x80BEC240/func_80BEC790.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Dharma_0x80BEC240/func_80BEC7EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Dharma_0x80BEC240/func_80BEC808.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Dharma_0x80BEC240/BgIkanaDharma_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Dharma_0x80BEC240/BgIkanaDharma_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.h b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.h new file mode 100644 index 0000000000..0cab98a701 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_IKANA_DHARMA_H +#define Z_BG_IKANA_DHARMA_H + +#include + +struct BgIkanaDharma; + +typedef struct BgIkanaDharma { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x6C]; +} BgIkanaDharma; // size = 0x1B0 + +extern const ActorInit Bg_Ikana_Dharma_InitVars; + +#endif // Z_BG_IKANA_DHARMA_H diff --git a/src/overlays/actors/ovl_Bg_Ikana_Mirror/overlay.cfg b/src/overlays/actors/ovl_Bg_Ikana_Mirror/overlay.cfg new file mode 100644 index 0000000000..d735febc00 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ikana_Mirror/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Ikana_Mirror +z_bg_ikana_mirror.c diff --git a/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c b/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c new file mode 100644 index 0000000000..426f9f8072 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c @@ -0,0 +1,42 @@ +#include "z_bg_ikana_mirror.h" + +#define FLAGS 0x00000010 + +#define THIS ((BgIkanaMirror*)thisx) + +void BgIkanaMirror_Init(Actor* thisx, GlobalContext* globalCtx); +void BgIkanaMirror_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgIkanaMirror_Update(Actor* thisx, GlobalContext* globalCtx); +void BgIkanaMirror_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Ikana_Mirror_InitVars = { + ACTOR_BG_IKANA_MIRROR, + ACTORTYPE_PROP, + FLAGS, + OBJECT_IKANA_OBJ, + sizeof(BgIkanaMirror), + (ActorFunc)BgIkanaMirror_Init, + (ActorFunc)BgIkanaMirror_Destroy, + (ActorFunc)BgIkanaMirror_Update, + (ActorFunc)BgIkanaMirror_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Mirror_0x80B7F730/func_80B7F730.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Mirror_0x80B7F730/BgIkanaMirror_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Mirror_0x80B7F730/BgIkanaMirror_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Mirror_0x80B7F730/func_80B7FA84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Mirror_0x80B7F730/func_80B7FA9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Mirror_0x80B7F730/func_80B7FB84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Mirror_0x80B7F730/func_80B7FBA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Mirror_0x80B7F730/BgIkanaMirror_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Mirror_0x80B7F730/BgIkanaMirror_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.h b/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.h new file mode 100644 index 0000000000..c995765ae3 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_IKANA_MIRROR_H +#define Z_BG_IKANA_MIRROR_H + +#include + +struct BgIkanaMirror; + +typedef struct BgIkanaMirror { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x488]; +} BgIkanaMirror; // size = 0x5CC + +extern const ActorInit Bg_Ikana_Mirror_InitVars; + +#endif // Z_BG_IKANA_MIRROR_H diff --git a/src/overlays/actors/ovl_Bg_Ikana_Ray/overlay.cfg b/src/overlays/actors/ovl_Bg_Ikana_Ray/overlay.cfg new file mode 100644 index 0000000000..b091b0a519 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ikana_Ray/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Ikana_Ray +z_bg_ikana_ray.c diff --git a/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c b/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c new file mode 100644 index 0000000000..62b55d446b --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c @@ -0,0 +1,97 @@ +#include "z_bg_ikana_ray.h" + +#define FLAGS 0x00000000 + +#define THIS ((BgIkanaRay*)thisx) + +void BgIkanaRay_Init(Actor* thisx, GlobalContext* globalCtx); +void BgIkanaRay_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgIkanaRay_Update(Actor* thisx, GlobalContext* globalCtx); +void BgIkanaRay_Draw(Actor* thisx, GlobalContext* globalCtx); + +void BgIkanaRay_SetDeactivated(BgIkanaRay* this); +void BgIkanaRay_UpdateCheckForActivation(BgIkanaRay* this, GlobalContext* globalCtx); +void BgIkanaRay_SetActivated(BgIkanaRay* this); +void BgIkanaRay_UpdateActivated(BgIkanaRay* this, GlobalContext* globalCtx); + +const ActorInit Bg_Ikana_Ray_InitVars = { + ACTOR_BG_IKANA_RAY, + ACTORTYPE_PROP, + FLAGS, + OBJECT_IKANA_OBJ, + sizeof(BgIkanaRay), + (ActorFunc)BgIkanaRay_Init, + (ActorFunc)BgIkanaRay_Destroy, + (ActorFunc)BgIkanaRay_Update, + (ActorFunc)BgIkanaRay_Draw +}; + +// TODO better formatting +ColCylinderInit bgIkanaRayCylinderInit = { + { 10, 33, 0, 0, 0, 1 }, + { 0, { 0x00200000, 0, 0 }, { 0, 0, 0 }, 25, 0, 1 }, + { 90, 420, 65116} +}; + +// TODO macro +InitChainEntry bgIkanaRayCompInit[] = { + {1, 6, 0x0FC, 4000}, + {1, 6, 0x100, 1000}, + {1, 6, 0x104, 1000}, + {0, 9, 0x058, 100} +}; + +void BgIkanaRay_Init(Actor* thisx, GlobalContext* globalCtx) { + ColCylinder* collision = &THIS->collision; + u32 pad; + + Actor_ProcessInitChain(thisx, bgIkanaRayCompInit); + + Collision_InitCylinderDefault(globalCtx, collision); + Collision_InitCylinderWithData(globalCtx, collision, thisx, &bgIkanaRayCylinderInit); + Collision_CylinderMoveToActor(thisx, &THIS->collision); + + THIS->animatedTextures = (AnimatedTexture*)Lib_PtrSegToVirt(object_ikana_obj_001228); + + if (Actor_GetSwitchFlag(globalCtx, THIS->base.params & 0x7F) != 0) { + BgIkanaRay_SetActivated(THIS); + } else { + BgIkanaRay_SetDeactivated(THIS); + } +} + +void BgIkanaRay_Destroy(Actor* thisx, GlobalContext* globalCtx) { + ColCylinder* collision = &THIS->collision; + Collision_FiniCylinder(globalCtx, collision); +} + +void BgIkanaRay_SetDeactivated(BgIkanaRay* this) { + this->base.draw = NULL; + this->base.flags |= 0x10; + this->update = BgIkanaRay_UpdateCheckForActivation; +} + +void BgIkanaRay_UpdateCheckForActivation(BgIkanaRay* this, GlobalContext* globalCtx) { + if (Actor_GetSwitchFlag(globalCtx, this->base.params & 0x7F) != 0) { + BgIkanaRay_SetActivated(this); + } +} + +void BgIkanaRay_SetActivated(BgIkanaRay* this) { + this->base.draw = (ActorFunc)BgIkanaRay_Draw; + this->base.flags &= 0xFFFFFFEF; + this->update = BgIkanaRay_UpdateActivated; +} + +void BgIkanaRay_UpdateActivated(BgIkanaRay* this, GlobalContext* globalCtx) { + Collision_AddAT(globalCtx, &globalCtx->colCheckCtx, &this->collision.base); +} + +void BgIkanaRay_Update(Actor* thisx, GlobalContext* globalCtx) { + THIS->update(THIS, globalCtx); +} + +void BgIkanaRay_Draw(Actor* thisx, GlobalContext* globalCtx) { + SceneProc_DrawAllSceneAnimatedTextures(globalCtx, THIS->animatedTextures); + func_800BE03C(globalCtx, object_ikana_obj_001100); +} diff --git a/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.h b/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.h new file mode 100644 index 0000000000..cfb1687f4a --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.h @@ -0,0 +1,17 @@ +#ifndef Z_BG_IKANA_RAY_H +#define Z_BG_IKANA_RAY_H + +#include + +struct BgIkanaRay; + +typedef struct BgIkanaRay { + /* 0x000 */ Actor base; + /* 0x144 */ ColCylinder collision; + /* 0x190 */ AnimatedTexture* animatedTextures; + /* 0x194 */ void (*update)(struct BgIkanaRay*, GlobalContext*); +} BgIkanaRay; // size = 0x198 + +extern const ActorInit Bg_Ikana_Ray_InitVars; + +#endif // Z_BG_IKANA_RAY_H diff --git a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/overlay.cfg b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/overlay.cfg new file mode 100644 index 0000000000..c51c2a5980 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Ikana_Rotaryroom +z_bg_ikana_rotaryroom.c diff --git a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c new file mode 100644 index 0000000000..0d7841cf5c --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c @@ -0,0 +1,82 @@ +#include "z_bg_ikana_rotaryroom.h" + +#define FLAGS 0x00000030 + +#define THIS ((BgIkanaRotaryroom*)thisx) + +void BgIkanaRotaryroom_Init(Actor* thisx, GlobalContext* globalCtx); +void BgIkanaRotaryroom_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgIkanaRotaryroom_Update(Actor* thisx, GlobalContext* globalCtx); +void BgIkanaRotaryroom_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Ikana_Rotaryroom_InitVars = { + ACTOR_BG_IKANA_ROTARYROOM, + ACTORTYPE_BG, + FLAGS, + OBJECT_IKANA_OBJ, + sizeof(BgIkanaRotaryroom), + (ActorFunc)BgIkanaRotaryroom_Init, + (ActorFunc)BgIkanaRotaryroom_Destroy, + (ActorFunc)BgIkanaRotaryroom_Update, + (ActorFunc)BgIkanaRotaryroom_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B802E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B80358.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B80440.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B80550.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B80778.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B80894.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B80C88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B80F08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81010.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81234.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B814B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81570.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B816A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/BgIkanaRotaryroom_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/BgIkanaRotaryroom_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B818B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B818C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81978.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B8198C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B819DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B819F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81A64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81A80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81B84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81BA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81DAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/func_80B81DC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/BgIkanaRotaryroom_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Rotaryroom_0x80B802E0/BgIkanaRotaryroom_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.h b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.h new file mode 100644 index 0000000000..393fd4b55e --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_IKANA_ROTARYROOM_H +#define Z_BG_IKANA_ROTARYROOM_H + +#include + +struct BgIkanaRotaryroom; + +typedef struct BgIkanaRotaryroom { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x444]; +} BgIkanaRotaryroom; // size = 0x588 + +extern const ActorInit Bg_Ikana_Rotaryroom_InitVars; + +#endif // Z_BG_IKANA_ROTARYROOM_H diff --git a/src/overlays/actors/ovl_Bg_Ikana_Shutter/overlay.cfg b/src/overlays/actors/ovl_Bg_Ikana_Shutter/overlay.cfg new file mode 100644 index 0000000000..e86cc272b1 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ikana_Shutter/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Ikana_Shutter +z_bg_ikana_shutter.c diff --git a/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c new file mode 100644 index 0000000000..770c37d542 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c @@ -0,0 +1,70 @@ +#include "z_bg_ikana_shutter.h" + +#define FLAGS 0x00000010 + +#define THIS ((BgIkanaShutter*)thisx) + +void BgIkanaShutter_Init(Actor* thisx, GlobalContext* globalCtx); +void BgIkanaShutter_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgIkanaShutter_Update(Actor* thisx, GlobalContext* globalCtx); +void BgIkanaShutter_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Ikana_Shutter_InitVars = { + ACTOR_BG_IKANA_SHUTTER, + ACTORTYPE_SWITCH, + FLAGS, + OBJECT_IKANA_OBJ, + sizeof(BgIkanaShutter), + (ActorFunc)BgIkanaShutter_Init, + (ActorFunc)BgIkanaShutter_Destroy, + (ActorFunc)BgIkanaShutter_Update, + (ActorFunc)BgIkanaShutter_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5690.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/BgIkanaShutter_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/BgIkanaShutter_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5828.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5844.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5878.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5894.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD58F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5910.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD599C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD59C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD59F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5A18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5AE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5B04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5B44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5B60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5BC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5BD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5C64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/func_80BD5C8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/BgIkanaShutter_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikana_Shutter_0x80BD5690/BgIkanaShutter_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.h b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.h new file mode 100644 index 0000000000..d689dc823e --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_IKANA_SHUTTER_H +#define Z_BG_IKANA_SHUTTER_H + +#include + +struct BgIkanaShutter; + +typedef struct BgIkanaShutter { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1C]; +} BgIkanaShutter; // size = 0x160 + +extern const ActorInit Bg_Ikana_Shutter_InitVars; + +#endif // Z_BG_IKANA_SHUTTER_H diff --git a/src/overlays/actors/ovl_Bg_Iknin_Susceil/overlay.cfg b/src/overlays/actors/ovl_Bg_Iknin_Susceil/overlay.cfg new file mode 100644 index 0000000000..e7df7599d6 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Iknin_Susceil/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Iknin_Susceil +z_bg_iknin_susceil.c diff --git a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c new file mode 100644 index 0000000000..af775c0cff --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c @@ -0,0 +1,66 @@ +#include "z_bg_iknin_susceil.h" + +#define FLAGS 0x00000030 + +#define THIS ((BgIkninSusceil*)thisx) + +void BgIkninSusceil_Init(Actor* thisx, GlobalContext* globalCtx); +void BgIkninSusceil_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgIkninSusceil_Update(Actor* thisx, GlobalContext* globalCtx); +void BgIkninSusceil_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Iknin_Susceil_InitVars = { + ACTOR_BG_IKNIN_SUSCEIL, + ACTORTYPE_BG, + FLAGS, + OBJECT_IKNINSIDE_OBJ, + sizeof(BgIkninSusceil), + (ActorFunc)BgIkninSusceil_Init, + (ActorFunc)BgIkninSusceil_Destroy, + (ActorFunc)BgIkninSusceil_Update, + (ActorFunc)BgIkninSusceil_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0A740.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0A804.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0A838.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0A86C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0A95C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/BgIkninSusceil_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/BgIkninSusceil_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AB14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AB44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AB88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0ABA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AC74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AC90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0ACD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0ACE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AD44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AD64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AE3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/func_80C0AE5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/BgIkninSusceil_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknin_Susceil_0x80C0A740/BgIkninSusceil_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.h b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.h new file mode 100644 index 0000000000..191a95f814 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_IKNIN_SUSCEIL_H +#define Z_BG_IKNIN_SUSCEIL_H + +#include + +struct BgIkninSusceil; + +typedef struct BgIkninSusceil { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x28]; +} BgIkninSusceil; // size = 0x16C + +extern const ActorInit Bg_Iknin_Susceil_InitVars; + +#endif // Z_BG_IKNIN_SUSCEIL_H diff --git a/src/overlays/actors/ovl_Bg_Ikninside/overlay.cfg b/src/overlays/actors/ovl_Bg_Ikninside/overlay.cfg new file mode 100644 index 0000000000..43d45dac70 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ikninside/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Ikninside +z_bg_ikninside.c diff --git a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c new file mode 100644 index 0000000000..56464e0a97 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c @@ -0,0 +1,38 @@ +#include "z_bg_ikninside.h" + +#define FLAGS 0x00000010 + +#define THIS ((BgIkninside*)thisx) + +void BgIkninside_Init(Actor* thisx, GlobalContext* globalCtx); +void BgIkninside_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgIkninside_Update(Actor* thisx, GlobalContext* globalCtx); +void BgIkninside_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Ikninside_InitVars = { + ACTOR_BG_IKNINSIDE, + ACTORTYPE_BG, + FLAGS, + OBJECT_IKNINSIDE_OBJ, + sizeof(BgIkninside), + (ActorFunc)BgIkninside_Init, + (ActorFunc)BgIkninside_Destroy, + (ActorFunc)BgIkninside_Update, + (ActorFunc)BgIkninside_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikninside_0x80C07110/BgIkninside_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikninside_0x80C07110/BgIkninside_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikninside_0x80C07110/func_80C07220.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikninside_0x80C07110/func_80C07230.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikninside_0x80C07110/func_80C072D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikninside_0x80C07110/BgIkninside_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ikninside_0x80C07110/BgIkninside_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.h b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.h new file mode 100644 index 0000000000..6626af7623 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_IKNINSIDE_H +#define Z_BG_IKNINSIDE_H + +#include + +struct BgIkninside; + +typedef struct BgIkninside { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x6C]; +} BgIkninside; // size = 0x1B0 + +extern const ActorInit Bg_Ikninside_InitVars; + +#endif // Z_BG_IKNINSIDE_H diff --git a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/overlay.cfg b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/overlay.cfg new file mode 100644 index 0000000000..0eca2bc55d --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Iknv_Doukutu +z_bg_iknv_doukutu.c diff --git a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c new file mode 100644 index 0000000000..e2440969e0 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c @@ -0,0 +1,52 @@ +#include "z_bg_iknv_doukutu.h" + +#define FLAGS 0x00000030 + +#define THIS ((BgIknvDoukutu*)thisx) + +void BgIknvDoukutu_Init(Actor* thisx, GlobalContext* globalCtx); +void BgIknvDoukutu_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgIknvDoukutu_Update(Actor* thisx, GlobalContext* globalCtx); +void BgIknvDoukutu_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Iknv_Doukutu_InitVars = { + ACTOR_BG_IKNV_DOUKUTU, + ACTORTYPE_BG, + FLAGS, + OBJECT_IKNV_OBJ, + sizeof(BgIknvDoukutu), + (ActorFunc)BgIknvDoukutu_Init, + (ActorFunc)BgIknvDoukutu_Destroy, + (ActorFunc)BgIknvDoukutu_Update, + (ActorFunc)BgIknvDoukutu_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/BgIknvDoukutu_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/BgIknvDoukutu_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD716C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD71BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD7250.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD72BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD7360.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD73D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/BgIknvDoukutu_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/BgIknvDoukutu_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD7538.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD7768.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD7820.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Doukutu_0x80BD6F10/func_80BD78C4.asm") diff --git a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.h b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.h new file mode 100644 index 0000000000..4262cf7995 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_IKNV_DOUKUTU_H +#define Z_BG_IKNV_DOUKUTU_H + +#include + +struct BgIknvDoukutu; + +typedef struct BgIknvDoukutu { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x24]; +} BgIknvDoukutu; // size = 0x168 + +extern const ActorInit Bg_Iknv_Doukutu_InitVars; + +#endif // Z_BG_IKNV_DOUKUTU_H diff --git a/src/overlays/actors/ovl_Bg_Iknv_Obj/overlay.cfg b/src/overlays/actors/ovl_Bg_Iknv_Obj/overlay.cfg new file mode 100644 index 0000000000..971c9f9479 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Iknv_Obj/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Iknv_Obj +z_bg_iknv_obj.c diff --git a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c new file mode 100644 index 0000000000..9ee6f7581c --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c @@ -0,0 +1,52 @@ +#include "z_bg_iknv_obj.h" + +#define FLAGS 0x00000010 + +#define THIS ((BgIknvObj*)thisx) + +void BgIknvObj_Init(Actor* thisx, GlobalContext* globalCtx); +void BgIknvObj_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgIknvObj_Update(Actor* thisx, GlobalContext* globalCtx); +void BgIknvObj_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Iknv_Obj_InitVars = { + ACTOR_BG_IKNV_OBJ, + ACTORTYPE_BG, + FLAGS, + OBJECT_IKNV_OBJ, + sizeof(BgIknvObj), + (ActorFunc)BgIknvObj_Init, + (ActorFunc)BgIknvObj_Destroy, + (ActorFunc)BgIknvObj_Update, + (ActorFunc)BgIknvObj_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/BgIknvObj_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/BgIknvObj_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/func_80BD7CEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/BgIknvObj_UpdateType0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/func_80BD7E0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/func_80BD7ED8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/func_80BD7F4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/func_80BD7FDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/func_80BD8040.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/BgIknvObj_UpdateType2.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/BgIknvObj_UpdateType1.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/BgIknvObj_UpdateDefault.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/BgIknvObj_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Iknv_Obj_0x80BD7AB0/BgIknvObj_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.h b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.h new file mode 100644 index 0000000000..e71a24f8a0 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_IKNV_OBJ_H +#define Z_BG_IKNV_OBJ_H + +#include + +struct BgIknvObj; + +typedef struct BgIknvObj { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x6C]; +} BgIknvObj; // size = 0x1B0 + +extern const ActorInit Bg_Iknv_Obj_InitVars; + +#endif // Z_BG_IKNV_OBJ_H diff --git a/src/overlays/actors/ovl_Bg_Ingate/overlay.cfg b/src/overlays/actors/ovl_Bg_Ingate/overlay.cfg new file mode 100644 index 0000000000..68501515e6 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ingate/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Ingate +z_bg_ingate.c diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c new file mode 100644 index 0000000000..8f58837c04 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -0,0 +1,58 @@ +#include "z_bg_ingate.h" + +#define FLAGS 0x00000030 + +#define THIS ((BgIngate*)thisx) + +void BgIngate_Init(Actor* thisx, GlobalContext* globalCtx); +void BgIngate_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgIngate_Update(Actor* thisx, GlobalContext* globalCtx); +void BgIngate_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Ingate_InitVars = { + ACTOR_BG_INGATE, + ACTORTYPE_BG, + FLAGS, + OBJECT_SICHITAI_OBJ, + sizeof(BgIngate), + (ActorFunc)BgIngate_Init, + (ActorFunc)BgIngate_Destroy, + (ActorFunc)BgIngate_Update, + (ActorFunc)BgIngate_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_80953A90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_80953B40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_80953BEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_80953DA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_80953E38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_80953EA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_80953F14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_80953F8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_80953F9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_809541B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_809542A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_80954340.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/func_809543D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/BgIngate_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/BgIngate_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/BgIngate_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ingate_0x80953A90/BgIngate_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h new file mode 100644 index 0000000000..2ae76762e4 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_INGATE_H +#define Z_BG_INGATE_H + +#include + +struct BgIngate; + +typedef struct BgIngate { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4C]; +} BgIngate; // size = 0x190 + +extern const ActorInit Bg_Ingate_InitVars; + +#endif // Z_BG_INGATE_H diff --git a/src/overlays/actors/ovl_Bg_Inibs_Movebg/overlay.cfg b/src/overlays/actors/ovl_Bg_Inibs_Movebg/overlay.cfg new file mode 100644 index 0000000000..8777870430 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Inibs_Movebg/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Inibs_Movebg +z_bg_inibs_movebg.c diff --git a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c new file mode 100644 index 0000000000..2a51b1b523 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c @@ -0,0 +1,29 @@ +#include "z_bg_inibs_movebg.h" + +#define FLAGS 0x00000030 + +#define THIS ((BgInibsMovebg*)thisx) + +void BgInibsMovebg_Init(Actor* thisx, GlobalContext* globalCtx); +void BgInibsMovebg_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgInibsMovebg_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Inibs_Movebg_InitVars = { + ACTOR_BG_INIBS_MOVEBG, + ACTORTYPE_BG, + FLAGS, + OBJECT_INIBS_OBJECT, + sizeof(BgInibsMovebg), + (ActorFunc)BgInibsMovebg_Init, + (ActorFunc)BgInibsMovebg_Destroy, + (ActorFunc)func_800BDFB0, + (ActorFunc)BgInibsMovebg_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Inibs_Movebg_0x80B96410/BgInibsMovebg_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Inibs_Movebg_0x80B96410/BgInibsMovebg_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Inibs_Movebg_0x80B96410/BgInibsMovebg_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.h b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.h new file mode 100644 index 0000000000..bbca985680 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_INIBS_MOVEBG_H +#define Z_BG_INIBS_MOVEBG_H + +#include + +struct BgInibsMovebg; + +typedef struct BgInibsMovebg { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x24]; +} BgInibsMovebg; // size = 0x168 + +extern const ActorInit Bg_Inibs_Movebg_InitVars; + +#endif // Z_BG_INIBS_MOVEBG_H diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Saku/overlay.cfg b/src/overlays/actors/ovl_Bg_Keikoku_Saku/overlay.cfg new file mode 100644 index 0000000000..78f2c76688 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Keikoku_Saku/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Keikoku_Saku +z_bg_keikoku_saku.c diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c new file mode 100644 index 0000000000..27777fcc23 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c @@ -0,0 +1,38 @@ +#include "z_bg_keikoku_saku.h" + +#define FLAGS 0x00000000 + +#define THIS ((BgKeikokuSaku*)thisx) + +void BgKeikokuSaku_Init(Actor* thisx, GlobalContext* globalCtx); +void BgKeikokuSaku_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgKeikokuSaku_Update(Actor* thisx, GlobalContext* globalCtx); +void BgKeikokuSaku_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Keikoku_Saku_InitVars = { + ACTOR_BG_KEIKOKU_SAKU, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_KEIKOKU_OBJ, + sizeof(BgKeikokuSaku), + (ActorFunc)BgKeikokuSaku_Init, + (ActorFunc)BgKeikokuSaku_Destroy, + (ActorFunc)BgKeikokuSaku_Update, + (ActorFunc)BgKeikokuSaku_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Keikoku_Saku_0x80A537D0/BgKeikokuSaku_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Keikoku_Saku_0x80A537D0/BgKeikokuSaku_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Keikoku_Saku_0x80A537D0/func_80A5389C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Keikoku_Saku_0x80A537D0/func_80A538E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Keikoku_Saku_0x80A537D0/func_80A53994.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Keikoku_Saku_0x80A537D0/BgKeikokuSaku_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Keikoku_Saku_0x80A537D0/BgKeikokuSaku_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.h b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.h new file mode 100644 index 0000000000..230effd744 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_KEIKOKU_SAKU_H +#define Z_BG_KEIKOKU_SAKU_H + +#include + +struct BgKeikokuSaku; + +typedef struct BgKeikokuSaku { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x20]; +} BgKeikokuSaku; // size = 0x164 + +extern const ActorInit Bg_Keikoku_Saku_InitVars; + +#endif // Z_BG_KEIKOKU_SAKU_H diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Spr/overlay.cfg b/src/overlays/actors/ovl_Bg_Keikoku_Spr/overlay.cfg new file mode 100644 index 0000000000..74d068ea4e --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Keikoku_Spr/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Keikoku_Spr +z_bg_keikoku_spr.c diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c b/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c new file mode 100644 index 0000000000..da01b56865 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c @@ -0,0 +1,32 @@ +#include "z_bg_keikoku_spr.h" + +#define FLAGS 0x00000000 + +#define THIS ((BgKeikokuSpr*)thisx) + +void BgKeikokuSpr_Init(Actor* thisx, GlobalContext* globalCtx); +void BgKeikokuSpr_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgKeikokuSpr_Update(Actor* thisx, GlobalContext* globalCtx); +void BgKeikokuSpr_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Keikoku_Spr_InitVars = { + ACTOR_BG_KEIKOKU_SPR, + ACTORTYPE_PROP, + FLAGS, + OBJECT_KEIKOKU_OBJ, + sizeof(BgKeikokuSpr), + (ActorFunc)BgKeikokuSpr_Init, + (ActorFunc)BgKeikokuSpr_Destroy, + (ActorFunc)BgKeikokuSpr_Update, + (ActorFunc)BgKeikokuSpr_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Keikoku_Spr_0x808C3A50/BgKeikokuSpr_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Keikoku_Spr_0x808C3A50/BgKeikokuSpr_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Keikoku_Spr_0x808C3A50/BgKeikokuSpr_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Keikoku_Spr_0x808C3A50/BgKeikokuSpr_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.h b/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.h new file mode 100644 index 0000000000..b31f3ea55a --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.h @@ -0,0 +1,14 @@ +#ifndef Z_BG_KEIKOKU_SPR_H +#define Z_BG_KEIKOKU_SPR_H + +#include + +struct BgKeikokuSpr; + +typedef struct BgKeikokuSpr { + /* 0x000 */ Actor actor; +} BgKeikokuSpr; // size = 0x144 + +extern const ActorInit Bg_Keikoku_Spr_InitVars; + +#endif // Z_BG_KEIKOKU_SPR_H diff --git a/src/overlays/actors/ovl_Bg_Kin2_Bombwall/overlay.cfg b/src/overlays/actors/ovl_Bg_Kin2_Bombwall/overlay.cfg new file mode 100644 index 0000000000..b61d1617fd --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Kin2_Bombwall/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Kin2_Bombwall +z_bg_kin2_bombwall.c diff --git a/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c b/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c new file mode 100644 index 0000000000..a005dca600 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c @@ -0,0 +1,48 @@ +#include "z_bg_kin2_bombwall.h" + +#define FLAGS 0x10000010 + +#define THIS ((BgKin2Bombwall*)thisx) + +void BgKin2Bombwall_Init(Actor* thisx, GlobalContext* globalCtx); +void BgKin2Bombwall_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgKin2Bombwall_Update(Actor* thisx, GlobalContext* globalCtx); +void BgKin2Bombwall_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Kin2_Bombwall_InitVars = { + ACTOR_BG_KIN2_BOMBWALL, + ACTORTYPE_BG, + FLAGS, + OBJECT_KIN2_OBJ, + sizeof(BgKin2Bombwall), + (ActorFunc)BgKin2Bombwall_Init, + (ActorFunc)BgKin2Bombwall_Destroy, + (ActorFunc)BgKin2Bombwall_Update, + (ActorFunc)BgKin2Bombwall_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Bombwall_0x80B6E020/func_80B6E020.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Bombwall_0x80B6E020/func_80B6E090.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Bombwall_0x80B6E020/BgKin2Bombwall_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Bombwall_0x80B6E020/BgKin2Bombwall_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Bombwall_0x80B6E020/func_80B6E4B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Bombwall_0x80B6E020/func_80B6E4CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Bombwall_0x80B6E020/func_80B6E544.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Bombwall_0x80B6E020/func_80B6E558.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Bombwall_0x80B6E020/func_80B6E5F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Bombwall_0x80B6E020/func_80B6E614.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Bombwall_0x80B6E020/BgKin2Bombwall_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Bombwall_0x80B6E020/BgKin2Bombwall_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.h b/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.h new file mode 100644 index 0000000000..75a77c4c55 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_KIN2_BOMBWALL_H +#define Z_BG_KIN2_BOMBWALL_H + +#include + +struct BgKin2Bombwall; + +typedef struct BgKin2Bombwall { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x6C]; +} BgKin2Bombwall; // size = 0x1B0 + +extern const ActorInit Bg_Kin2_Bombwall_InitVars; + +#endif // Z_BG_KIN2_BOMBWALL_H diff --git a/src/overlays/actors/ovl_Bg_Kin2_Fence/overlay.cfg b/src/overlays/actors/ovl_Bg_Kin2_Fence/overlay.cfg new file mode 100644 index 0000000000..d3984fea95 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Kin2_Fence/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Kin2_Fence +z_bg_kin2_fence.c diff --git a/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c b/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c new file mode 100644 index 0000000000..ca51d35632 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c @@ -0,0 +1,56 @@ +#include "z_bg_kin2_fence.h" + +#define FLAGS 0x00000010 + +#define THIS ((BgKin2Fence*)thisx) + +void BgKin2Fence_Init(Actor* thisx, GlobalContext* globalCtx); +void BgKin2Fence_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgKin2Fence_Update(Actor* thisx, GlobalContext* globalCtx); +void BgKin2Fence_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Kin2_Fence_InitVars = { + ACTOR_BG_KIN2_FENCE, + ACTORTYPE_BG, + FLAGS, + OBJECT_KIN2_OBJ, + sizeof(BgKin2Fence), + (ActorFunc)BgKin2Fence_Init, + (ActorFunc)BgKin2Fence_Destroy, + (ActorFunc)BgKin2Fence_Update, + (ActorFunc)BgKin2Fence_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6E820.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6E890.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/BgKin2Fence_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/BgKin2Fence_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6EADC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6EAF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6EBF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6EC08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6EC70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6EC8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6ECC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6ECD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6ED30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/func_80B6ED58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/BgKin2Fence_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Fence_0x80B6E820/BgKin2Fence_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.h b/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.h new file mode 100644 index 0000000000..e8656e68d8 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_KIN2_FENCE_H +#define Z_BG_KIN2_FENCE_H + +#include + +struct BgKin2Fence; + +typedef struct BgKin2Fence { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x140]; +} BgKin2Fence; // size = 0x284 + +extern const ActorInit Bg_Kin2_Fence_InitVars; + +#endif // Z_BG_KIN2_FENCE_H diff --git a/src/overlays/actors/ovl_Bg_Kin2_Picture/overlay.cfg b/src/overlays/actors/ovl_Bg_Kin2_Picture/overlay.cfg new file mode 100644 index 0000000000..ddd62c8234 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Kin2_Picture/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Kin2_Picture +z_bg_kin2_picture.c diff --git a/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c new file mode 100644 index 0000000000..9ab76107b8 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c @@ -0,0 +1,58 @@ +#include "z_bg_kin2_picture.h" + +#define FLAGS 0x00000000 + +#define THIS ((BgKin2Picture*)thisx) + +void BgKin2Picture_Init(Actor* thisx, GlobalContext* globalCtx); +void BgKin2Picture_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgKin2Picture_Update(Actor* thisx, GlobalContext* globalCtx); +void BgKin2Picture_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Kin2_Picture_InitVars = { + ACTOR_BG_KIN2_PICTURE, + ACTORTYPE_PROP, + FLAGS, + OBJECT_KIN2_OBJ, + sizeof(BgKin2Picture), + (ActorFunc)BgKin2Picture_Init, + (ActorFunc)BgKin2Picture_Destroy, + (ActorFunc)BgKin2Picture_Update, + (ActorFunc)BgKin2Picture_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6EFA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6EFEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F098.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/BgKin2Picture_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/BgKin2Picture_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F4C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F4D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F5A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F5B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F61C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F640.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F708.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F72C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F8F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/func_80B6F90C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/BgKin2Picture_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Picture_0x80B6EFA0/BgKin2Picture_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.h b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.h new file mode 100644 index 0000000000..b4f2d99d71 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_KIN2_PICTURE_H +#define Z_BG_KIN2_PICTURE_H + +#include + +struct BgKin2Picture; + +typedef struct BgKin2Picture { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x100]; +} BgKin2Picture; // size = 0x244 + +extern const ActorInit Bg_Kin2_Picture_InitVars; + +#endif // Z_BG_KIN2_PICTURE_H diff --git a/src/overlays/actors/ovl_Bg_Kin2_Shelf/overlay.cfg b/src/overlays/actors/ovl_Bg_Kin2_Shelf/overlay.cfg new file mode 100644 index 0000000000..84a84fd495 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Kin2_Shelf/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Kin2_Shelf +z_bg_kin2_shelf.c diff --git a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c new file mode 100644 index 0000000000..5e23f880ce --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c @@ -0,0 +1,56 @@ +#include "z_bg_kin2_shelf.h" + +#define FLAGS 0x00000000 + +#define THIS ((BgKin2Shelf*)thisx) + +void BgKin2Shelf_Init(Actor* thisx, GlobalContext* globalCtx); +void BgKin2Shelf_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgKin2Shelf_Update(Actor* thisx, GlobalContext* globalCtx); +void BgKin2Shelf_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Kin2_Shelf_InitVars = { + ACTOR_BG_KIN2_SHELF, + ACTORTYPE_BG, + FLAGS, + OBJECT_KIN2_OBJ, + sizeof(BgKin2Shelf), + (ActorFunc)BgKin2Shelf_Init, + (ActorFunc)BgKin2Shelf_Destroy, + (ActorFunc)BgKin2Shelf_Update, + (ActorFunc)BgKin2Shelf_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B6FB30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B6FCA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B6FE08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B6FE48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B6FEBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B6FF28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/BgKin2Shelf_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/BgKin2Shelf_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B700A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B700C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B70214.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B70230.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B70498.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/func_80B704B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/BgKin2Shelf_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Kin2_Shelf_0x80B6FB30/BgKin2Shelf_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.h b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.h new file mode 100644 index 0000000000..b01ff6fcc0 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_KIN2_SHELF_H +#define Z_BG_KIN2_SHELF_H + +#include + +struct BgKin2Shelf; + +typedef struct BgKin2Shelf { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x24]; +} BgKin2Shelf; // size = 0x168 + +extern const ActorInit Bg_Kin2_Shelf_InitVars; + +#endif // Z_BG_KIN2_SHELF_H diff --git a/src/overlays/actors/ovl_Bg_Ladder/overlay.cfg b/src/overlays/actors/ovl_Bg_Ladder/overlay.cfg new file mode 100644 index 0000000000..6f88bdf1b5 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ladder/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Ladder +z_bg_ladder.c diff --git a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c new file mode 100644 index 0000000000..fefd64b69c --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c @@ -0,0 +1,40 @@ +#include "z_bg_ladder.h" + +#define FLAGS 0x00000010 + +#define THIS ((BgLadder*)thisx) + +void BgLadder_Init(Actor* thisx, GlobalContext* globalCtx); +void BgLadder_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgLadder_Update(Actor* thisx, GlobalContext* globalCtx); +void BgLadder_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Ladder_InitVars = { + ACTOR_BG_LADDER, + ACTORTYPE_PROP, + FLAGS, + OBJECT_LADDER, + sizeof(BgLadder), + (ActorFunc)BgLadder_Init, + (ActorFunc)BgLadder_Destroy, + (ActorFunc)BgLadder_Update, + (ActorFunc)BgLadder_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ladder_0x80A4D9F0/BgLadder_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ladder_0x80A4D9F0/BgLadder_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ladder_0x80A4D9F0/func_80A4DB88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ladder_0x80A4D9F0/func_80A4DBD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ladder_0x80A4D9F0/func_80A4DC48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ladder_0x80A4D9F0/func_80A4DCCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ladder_0x80A4D9F0/BgLadder_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Ladder_0x80A4D9F0/BgLadder_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.h b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.h new file mode 100644 index 0000000000..b86c15c902 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_LADDER_H +#define Z_BG_LADDER_H + +#include + +struct BgLadder; + +typedef struct BgLadder { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x20]; +} BgLadder; // size = 0x164 + +extern const ActorInit Bg_Ladder_InitVars; + +#endif // Z_BG_LADDER_H diff --git a/src/overlays/actors/ovl_Bg_Last_Bwall/overlay.cfg b/src/overlays/actors/ovl_Bg_Last_Bwall/overlay.cfg new file mode 100644 index 0000000000..ec560aa15f --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Last_Bwall/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Last_Bwall +z_bg_last_bwall.c diff --git a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c new file mode 100644 index 0000000000..1dbcd03452 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c @@ -0,0 +1,48 @@ +#include "z_bg_last_bwall.h" + +#define FLAGS 0x00000000 + +#define THIS ((BgLastBwall*)thisx) + +void BgLastBwall_Init(Actor* thisx, GlobalContext* globalCtx); +void BgLastBwall_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgLastBwall_Update(Actor* thisx, GlobalContext* globalCtx); +void BgLastBwall_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Last_Bwall_InitVars = { + ACTOR_BG_LAST_BWALL, + ACTORTYPE_BG, + FLAGS, + OBJECT_LAST_OBJ, + sizeof(BgLastBwall), + (ActorFunc)BgLastBwall_Init, + (ActorFunc)BgLastBwall_Destroy, + (ActorFunc)BgLastBwall_Update, + (ActorFunc)BgLastBwall_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Last_Bwall_0x80C18240/func_80C18240.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Last_Bwall_0x80C18240/BgLastBwall_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Last_Bwall_0x80C18240/BgLastBwall_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Last_Bwall_0x80C18240/func_80C184EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Last_Bwall_0x80C18240/func_80C187E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Last_Bwall_0x80C18240/func_80C187F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Last_Bwall_0x80C18240/func_80C1886C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Last_Bwall_0x80C18240/func_80C18884.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Last_Bwall_0x80C18240/func_80C188C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Last_Bwall_0x80C18240/func_80C18928.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Last_Bwall_0x80C18240/BgLastBwall_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Last_Bwall_0x80C18240/BgLastBwall_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.h b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.h new file mode 100644 index 0000000000..6cdd8caffb --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_LAST_BWALL_H +#define Z_BG_LAST_BWALL_H + +#include + +struct BgLastBwall; + +typedef struct BgLastBwall { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xF8]; +} BgLastBwall; // size = 0x23C + +extern const ActorInit Bg_Last_Bwall_InitVars; + +#endif // Z_BG_LAST_BWALL_H diff --git a/src/overlays/actors/ovl_Bg_Lbfshot/overlay.cfg b/src/overlays/actors/ovl_Bg_Lbfshot/overlay.cfg new file mode 100644 index 0000000000..520be10f09 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Lbfshot/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Lbfshot +z_bg_lbfshot.c diff --git a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c new file mode 100644 index 0000000000..dceaf6b1d3 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c @@ -0,0 +1,29 @@ +#include "z_bg_lbfshot.h" + +#define FLAGS 0x00000000 + +#define THIS ((BgLbfshot*)thisx) + +void BgLbfshot_Init(Actor* thisx, GlobalContext* globalCtx); +void BgLbfshot_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgLbfshot_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Lbfshot_InitVars = { + ACTOR_BG_LBFSHOT, + ACTORTYPE_BG, + FLAGS, + OBJECT_LBFSHOT, + sizeof(BgLbfshot), + (ActorFunc)BgLbfshot_Init, + (ActorFunc)BgLbfshot_Destroy, + (ActorFunc)func_800BDFB0, + (ActorFunc)BgLbfshot_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Lbfshot_0x80C18120/BgLbfshot_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Lbfshot_0x80C18120/BgLbfshot_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Lbfshot_0x80C18120/BgLbfshot_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.h b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.h new file mode 100644 index 0000000000..b67c59cf88 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_LBFSHOT_H +#define Z_BG_LBFSHOT_H + +#include + +struct BgLbfshot; + +typedef struct BgLbfshot { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1C]; +} BgLbfshot; // size = 0x160 + +extern const ActorInit Bg_Lbfshot_InitVars; + +#endif // Z_BG_LBFSHOT_H diff --git a/src/overlays/actors/ovl_Bg_Lotus/overlay.cfg b/src/overlays/actors/ovl_Bg_Lotus/overlay.cfg new file mode 100644 index 0000000000..95702c51ba --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Lotus/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Lotus +z_bg_lotus.c diff --git a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c new file mode 100644 index 0000000000..aceb1ab458 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c @@ -0,0 +1,40 @@ +#include "z_bg_lotus.h" + +#define FLAGS 0x00000000 + +#define THIS ((BgLotus*)thisx) + +void BgLotus_Init(Actor* thisx, GlobalContext* globalCtx); +void BgLotus_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgLotus_Update(Actor* thisx, GlobalContext* globalCtx); +void BgLotus_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Lotus_InitVars = { + ACTOR_BG_LOTUS, + ACTORTYPE_BG, + FLAGS, + OBJECT_LOTUS, + sizeof(BgLotus), + (ActorFunc)BgLotus_Init, + (ActorFunc)BgLotus_Destroy, + (ActorFunc)BgLotus_Update, + (ActorFunc)BgLotus_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Lotus_0x80AD6760/BgLotus_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Lotus_0x80AD6760/BgLotus_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Lotus_0x80AD6760/func_80AD6830.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Lotus_0x80AD6760/func_80AD68DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Lotus_0x80AD6760/func_80AD6A88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Lotus_0x80AD6760/func_80AD6B68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Lotus_0x80AD6760/BgLotus_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Lotus_0x80AD6760/BgLotus_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.h b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.h new file mode 100644 index 0000000000..03a14ed797 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_LOTUS_H +#define Z_BG_LOTUS_H + +#include + +struct BgLotus; + +typedef struct BgLotus { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x28]; +} BgLotus; // size = 0x16C + +extern const ActorInit Bg_Lotus_InitVars; + +#endif // Z_BG_LOTUS_H diff --git a/src/overlays/actors/ovl_Bg_Market_Step/overlay.cfg b/src/overlays/actors/ovl_Bg_Market_Step/overlay.cfg new file mode 100644 index 0000000000..07ff7cee87 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Market_Step/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Market_Step +z_bg_market_step.c diff --git a/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c new file mode 100644 index 0000000000..26a640422d --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c @@ -0,0 +1,26 @@ +#include "z_bg_market_step.h" + +#define FLAGS 0x10000020 + +#define THIS ((BgMarketStep*)thisx) + +void BgMarketStep_Init(Actor* thisx, GlobalContext* globalCtx); +void BgMarketStep_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Market_Step_InitVars = { + ACTOR_BG_MARKET_STEP, + ACTORTYPE_BG, + FLAGS, + OBJECT_MARKET_OBJ, + sizeof(BgMarketStep), + (ActorFunc)BgMarketStep_Init, + (ActorFunc)func_800BDFB0, + (ActorFunc)func_800BDFB0, + (ActorFunc)BgMarketStep_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Market_Step_0x80AF0060/BgMarketStep_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Market_Step_0x80AF0060/BgMarketStep_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.h b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.h new file mode 100644 index 0000000000..c05eda127e --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.h @@ -0,0 +1,14 @@ +#ifndef Z_BG_MARKET_STEP_H +#define Z_BG_MARKET_STEP_H + +#include + +struct BgMarketStep; + +typedef struct BgMarketStep { + /* 0x000 */ Actor actor; +} BgMarketStep; // size = 0x144 + +extern const ActorInit Bg_Market_Step_InitVars; + +#endif // Z_BG_MARKET_STEP_H diff --git a/src/overlays/actors/ovl_Bg_Mbar_Chair/overlay.cfg b/src/overlays/actors/ovl_Bg_Mbar_Chair/overlay.cfg new file mode 100644 index 0000000000..8cfa06dece --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Mbar_Chair/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Mbar_Chair +z_bg_mbar_chair.c diff --git a/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c b/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c new file mode 100644 index 0000000000..3e2e4e8734 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c @@ -0,0 +1,32 @@ +#include "z_bg_mbar_chair.h" + +#define FLAGS 0x00000000 + +#define THIS ((BgMbarChair*)thisx) + +void BgMbarChair_Init(Actor* thisx, GlobalContext* globalCtx); +void BgMbarChair_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgMbarChair_Update(Actor* thisx, GlobalContext* globalCtx); +void BgMbarChair_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Mbar_Chair_InitVars = { + ACTOR_BG_MBAR_CHAIR, + ACTORTYPE_BG, + FLAGS, + OBJECT_MBAR_OBJ, + sizeof(BgMbarChair), + (ActorFunc)BgMbarChair_Init, + (ActorFunc)BgMbarChair_Destroy, + (ActorFunc)BgMbarChair_Update, + (ActorFunc)BgMbarChair_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Mbar_Chair_0x80B7E930/BgMbarChair_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Mbar_Chair_0x80B7E930/BgMbarChair_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Mbar_Chair_0x80B7E930/BgMbarChair_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Mbar_Chair_0x80B7E930/BgMbarChair_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.h b/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.h new file mode 100644 index 0000000000..1f2dabe25e --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_MBAR_CHAIR_H +#define Z_BG_MBAR_CHAIR_H + +#include + +struct BgMbarChair; + +typedef struct BgMbarChair { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x18]; +} BgMbarChair; // size = 0x15C + +extern const ActorInit Bg_Mbar_Chair_InitVars; + +#endif // Z_BG_MBAR_CHAIR_H diff --git a/src/overlays/actors/ovl_Bg_Numa_Hana/overlay.cfg b/src/overlays/actors/ovl_Bg_Numa_Hana/overlay.cfg new file mode 100644 index 0000000000..63ed804b17 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Numa_Hana/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Numa_Hana +z_bg_numa_hana.c diff --git a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c new file mode 100644 index 0000000000..43d1b52ad8 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c @@ -0,0 +1,62 @@ +#include "z_bg_numa_hana.h" + +#define FLAGS 0x00000410 + +#define THIS ((BgNumaHana*)thisx) + +void BgNumaHana_Init(Actor* thisx, GlobalContext* globalCtx); +void BgNumaHana_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgNumaHana_Update(Actor* thisx, GlobalContext* globalCtx); +void BgNumaHana_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Numa_Hana_InitVars = { + ACTOR_BG_NUMA_HANA, + ACTORTYPE_BG, + FLAGS, + OBJECT_NUMA_OBJ, + sizeof(BgNumaHana), + (ActorFunc)BgNumaHana_Init, + (ActorFunc)BgNumaHana_Destroy, + (ActorFunc)BgNumaHana_Update, + (ActorFunc)BgNumaHana_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1A500.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1A56C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1A750.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/BgNumaHana_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/BgNumaHana_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1AA14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1AA28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1AA38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1AA4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1AAE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1AB00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1ABD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1ABF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1ACCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1ACE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1AE08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/func_80A1AE1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/BgNumaHana_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Numa_Hana_0x80A1A500/BgNumaHana_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.h b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.h new file mode 100644 index 0000000000..ef2a5bcda9 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_NUMA_HANA_H +#define Z_BG_NUMA_HANA_H + +#include + +struct BgNumaHana; + +typedef struct BgNumaHana { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1FC]; +} BgNumaHana; // size = 0x340 + +extern const ActorInit Bg_Numa_Hana_InitVars; + +#endif // Z_BG_NUMA_HANA_H diff --git a/src/overlays/actors/ovl_Bg_Open_Shutter/overlay.cfg b/src/overlays/actors/ovl_Bg_Open_Shutter/overlay.cfg new file mode 100644 index 0000000000..8bf55bec25 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Open_Shutter/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Open_Shutter +z_bg_open_shutter.c diff --git a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c new file mode 100644 index 0000000000..6b4cb5b382 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c @@ -0,0 +1,42 @@ +#include "z_bg_open_shutter.h" + +#define FLAGS 0x00000010 + +#define THIS ((BgOpenShutter*)thisx) + +void BgOpenShutter_Init(Actor* thisx, GlobalContext* globalCtx); +void BgOpenShutter_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgOpenShutter_Update(Actor* thisx, GlobalContext* globalCtx); +void BgOpenShutter_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Open_Shutter_InitVars = { + ACTOR_BG_OPEN_SHUTTER, + ACTORTYPE_DOOR, + FLAGS, + OBJECT_OPEN_OBJ, + sizeof(BgOpenShutter), + (ActorFunc)BgOpenShutter_Init, + (ActorFunc)BgOpenShutter_Destroy, + (ActorFunc)BgOpenShutter_Update, + (ActorFunc)BgOpenShutter_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Shutter_0x80ACAB10/func_80ACAB10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Shutter_0x80ACAB10/func_80ACABA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Shutter_0x80ACAB10/BgOpenShutter_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Shutter_0x80ACAB10/BgOpenShutter_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Shutter_0x80ACAB10/func_80ACAD88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Shutter_0x80ACAB10/func_80ACAE5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Shutter_0x80ACAB10/func_80ACAEF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Shutter_0x80ACAB10/BgOpenShutter_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Shutter_0x80ACAB10/BgOpenShutter_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.h b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.h new file mode 100644 index 0000000000..a63e25d4b5 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_OPEN_SHUTTER_H +#define Z_BG_OPEN_SHUTTER_H + +#include + +struct BgOpenShutter; + +typedef struct BgOpenShutter { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x24]; +} BgOpenShutter; // size = 0x168 + +extern const ActorInit Bg_Open_Shutter_InitVars; + +#endif // Z_BG_OPEN_SHUTTER_H diff --git a/src/overlays/actors/ovl_Bg_Open_Spot/overlay.cfg b/src/overlays/actors/ovl_Bg_Open_Spot/overlay.cfg new file mode 100644 index 0000000000..757c3fbfdc --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Open_Spot/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Open_Spot +z_bg_open_spot.c diff --git a/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c b/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c new file mode 100644 index 0000000000..2f7179b61d --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c @@ -0,0 +1,31 @@ +#include "z_bg_open_spot.h" + +#define FLAGS 0x00000010 + +#define THIS ((BgOpenSpot*)thisx) + +void BgOpenSpot_Init(Actor* thisx, GlobalContext* globalCtx); +void BgOpenSpot_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgOpenSpot_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Open_Spot_InitVars = { + ACTOR_BG_OPEN_SPOT, + ACTORTYPE_PROP, + FLAGS, + OBJECT_OPEN_OBJ, + sizeof(BgOpenSpot), + (ActorFunc)BgOpenSpot_Init, + (ActorFunc)BgOpenSpot_Destroy, + (ActorFunc)BgOpenSpot_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Spot_0x80ACB1E0/BgOpenSpot_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Spot_0x80ACB1E0/BgOpenSpot_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Spot_0x80ACB1E0/BgOpenSpot_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Open_Spot_0x80ACB1E0/func_80ACB2B0.asm") diff --git a/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.h b/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.h new file mode 100644 index 0000000000..e3f982aefb --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_OPEN_SPOT_H +#define Z_BG_OPEN_SPOT_H + +#include + +struct BgOpenSpot; + +typedef struct BgOpenSpot { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4]; +} BgOpenSpot; // size = 0x148 + +extern const ActorInit Bg_Open_Spot_InitVars; + +#endif // Z_BG_OPEN_SPOT_H diff --git a/src/overlays/actors/ovl_Bg_Sinkai_Kabe/overlay.cfg b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/overlay.cfg new file mode 100644 index 0000000000..b2a92fdbff --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Sinkai_Kabe +z_bg_sinkai_kabe.c diff --git a/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c new file mode 100644 index 0000000000..02b250655c --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c @@ -0,0 +1,31 @@ +#include "z_bg_sinkai_kabe.h" + +#define FLAGS 0x00000010 + +#define THIS ((BgSinkaiKabe*)thisx) + +void BgSinkaiKabe_Init(Actor* thisx, GlobalContext* globalCtx); +void BgSinkaiKabe_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgSinkaiKabe_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Sinkai_Kabe_InitVars = { + ACTOR_BG_SINKAI_KABE, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_SINKAI_KABE, + sizeof(BgSinkaiKabe), + (ActorFunc)BgSinkaiKabe_Init, + (ActorFunc)BgSinkaiKabe_Destroy, + (ActorFunc)BgSinkaiKabe_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Sinkai_Kabe_0x80B6D660/BgSinkaiKabe_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Sinkai_Kabe_0x80B6D660/BgSinkaiKabe_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Sinkai_Kabe_0x80B6D660/func_80B6DA20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Sinkai_Kabe_0x80B6D660/BgSinkaiKabe_Update.asm") diff --git a/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.h b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.h new file mode 100644 index 0000000000..cf53517d5f --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_SINKAI_KABE_H +#define Z_BG_SINKAI_KABE_H + +#include + +struct BgSinkaiKabe; + +typedef struct BgSinkaiKabe { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2C]; +} BgSinkaiKabe; // size = 0x170 + +extern const ActorInit Bg_Sinkai_Kabe_InitVars; + +#endif // Z_BG_SINKAI_KABE_H diff --git a/src/overlays/actors/ovl_Bg_Spdweb/overlay.cfg b/src/overlays/actors/ovl_Bg_Spdweb/overlay.cfg new file mode 100644 index 0000000000..9411f40928 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Spdweb/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Spdweb +z_bg_spdweb.c diff --git a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c new file mode 100644 index 0000000000..b1571043c0 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c @@ -0,0 +1,50 @@ +#include "z_bg_spdweb.h" + +#define FLAGS 0x00000000 + +#define THIS ((BgSpdweb*)thisx) + +void BgSpdweb_Init(Actor* thisx, GlobalContext* globalCtx); +void BgSpdweb_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgSpdweb_Update(Actor* thisx, GlobalContext* globalCtx); +void BgSpdweb_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Spdweb_InitVars = { + ACTOR_BG_SPDWEB, + ACTORTYPE_BG, + FLAGS, + OBJECT_SPDWEB, + sizeof(BgSpdweb), + (ActorFunc)BgSpdweb_Init, + (ActorFunc)BgSpdweb_Destroy, + (ActorFunc)BgSpdweb_Update, + (ActorFunc)BgSpdweb_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/BgSpdweb_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/BgSpdweb_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/func_809CE068.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/func_809CE15C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/func_809CE1D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/func_809CE234.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/func_809CE4C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/func_809CE830.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/func_809CEBC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/func_809CEE74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/func_809CEEAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/BgSpdweb_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spdweb_0x809CDEC0/BgSpdweb_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.h b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.h new file mode 100644 index 0000000000..82b368a00c --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_SPDWEB_H +#define Z_BG_SPDWEB_H + +#include + +struct BgSpdweb; + +typedef struct BgSpdweb { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1B8]; +} BgSpdweb; // size = 0x2FC + +extern const ActorInit Bg_Spdweb_InitVars; + +#endif // Z_BG_SPDWEB_H diff --git a/src/overlays/actors/ovl_Bg_Spout_Fire/overlay.cfg b/src/overlays/actors/ovl_Bg_Spout_Fire/overlay.cfg new file mode 100644 index 0000000000..bad8eedab0 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Spout_Fire/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Spout_Fire +z_bg_spout_fire.c diff --git a/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c b/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c new file mode 100644 index 0000000000..73020d104d --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c @@ -0,0 +1,43 @@ +#include "z_bg_spout_fire.h" + +#define FLAGS 0x00000000 + +#define THIS ((BgSpoutFire*)thisx) + +void BgSpoutFire_Init(Actor* thisx, GlobalContext* globalCtx); +void BgSpoutFire_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgSpoutFire_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Spout_Fire_InitVars = { + ACTOR_BG_SPOUT_FIRE, + ACTORTYPE_BG, + FLAGS, + OBJECT_FWALL, + sizeof(BgSpoutFire), + (ActorFunc)BgSpoutFire_Init, + (ActorFunc)BgSpoutFire_Destroy, + (ActorFunc)BgSpoutFire_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spout_Fire_0x80A60B20/BgSpoutFire_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spout_Fire_0x80A60B20/BgSpoutFire_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spout_Fire_0x80A60B20/func_80A60C24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spout_Fire_0x80A60B20/func_80A60C94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spout_Fire_0x80A60B20/func_80A60CDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spout_Fire_0x80A60B20/func_80A60D10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spout_Fire_0x80A60B20/func_80A60DA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spout_Fire_0x80A60B20/func_80A60E08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spout_Fire_0x80A60B20/BgSpoutFire_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Spout_Fire_0x80A60B20/func_80A61040.asm") diff --git a/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.h b/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.h new file mode 100644 index 0000000000..aa2c029e21 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_SPOUT_FIRE_H +#define Z_BG_SPOUT_FIRE_H + +#include + +struct BgSpoutFire; + +typedef struct BgSpoutFire { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x54]; +} BgSpoutFire; // size = 0x198 + +extern const ActorInit Bg_Spout_Fire_InitVars; + +#endif // Z_BG_SPOUT_FIRE_H diff --git a/src/overlays/actors/ovl_Bg_Tobira01/overlay.cfg b/src/overlays/actors/ovl_Bg_Tobira01/overlay.cfg new file mode 100644 index 0000000000..7b142082d3 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Tobira01/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Tobira01 +z_bg_tobira01.c diff --git a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c new file mode 100644 index 0000000000..29dbb701a3 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c @@ -0,0 +1,34 @@ +#include "z_bg_tobira01.h" + +#define FLAGS 0x00000030 + +#define THIS ((BgTobira01*)thisx) + +void BgTobira01_Init(Actor* thisx, GlobalContext* globalCtx); +void BgTobira01_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgTobira01_Update(Actor* thisx, GlobalContext* globalCtx); +void BgTobira01_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Tobira01_InitVars = { + ACTOR_BG_TOBIRA01, + ACTORTYPE_PROP, + FLAGS, + OBJECT_SPOT11_OBJ, + sizeof(BgTobira01), + (ActorFunc)BgTobira01_Init, + (ActorFunc)BgTobira01_Destroy, + (ActorFunc)BgTobira01_Update, + (ActorFunc)BgTobira01_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Tobira01_0x80B12430/func_80B12430.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Tobira01_0x80B12430/BgTobira01_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Tobira01_0x80B12430/BgTobira01_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Tobira01_0x80B12430/BgTobira01_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Tobira01_0x80B12430/BgTobira01_Draw.asm") diff --git a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.h b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.h new file mode 100644 index 0000000000..4b5400edf1 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_TOBIRA01_H +#define Z_BG_TOBIRA01_H + +#include + +struct BgTobira01; + +typedef struct BgTobira01 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2C]; +} BgTobira01; // size = 0x170 + +extern const ActorInit Bg_Tobira01_InitVars; + +#endif // Z_BG_TOBIRA01_H diff --git a/src/overlays/actors/ovl_Bg_Umajump/overlay.cfg b/src/overlays/actors/ovl_Bg_Umajump/overlay.cfg new file mode 100644 index 0000000000..3678ab523c --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Umajump/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Bg_Umajump +z_bg_umajump.c diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c new file mode 100644 index 0000000000..b3a0d13838 --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c @@ -0,0 +1,41 @@ +#include "z_bg_umajump.h" + +#define FLAGS 0x00000000 + +#define THIS ((BgUmajump*)thisx) + +void BgUmajump_Init(Actor* thisx, GlobalContext* globalCtx); +void BgUmajump_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BgUmajump_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Bg_Umajump_InitVars = { + ACTOR_BG_UMAJUMP, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(BgUmajump), + (ActorFunc)BgUmajump_Init, + (ActorFunc)BgUmajump_Destroy, + (ActorFunc)BgUmajump_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Umajump_0x80919F30/func_80919F30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Umajump_0x80919F30/func_80919FC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Umajump_0x80919F30/func_8091A044.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Umajump_0x80919F30/func_8091A0B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Umajump_0x80919F30/BgUmajump_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Umajump_0x80919F30/BgUmajump_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Umajump_0x80919F30/BgUmajump_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Umajump_0x80919F30/func_8091A5A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Bg_Umajump_0x80919F30/func_8091A7B0.asm") diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h new file mode 100644 index 0000000000..be91a6150f --- /dev/null +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h @@ -0,0 +1,15 @@ +#ifndef Z_BG_UMAJUMP_H +#define Z_BG_UMAJUMP_H + +#include + +struct BgUmajump; + +typedef struct BgUmajump { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x28]; +} BgUmajump; // size = 0x16C + +extern const ActorInit Bg_Umajump_InitVars; + +#endif // Z_BG_UMAJUMP_H diff --git a/src/overlays/actors/ovl_Boss_01/overlay.cfg b/src/overlays/actors/ovl_Boss_01/overlay.cfg new file mode 100644 index 0000000000..d11a70ed1b --- /dev/null +++ b/src/overlays/actors/ovl_Boss_01/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Boss_01 +z_boss_01.c diff --git a/src/overlays/actors/ovl_Boss_01/z_boss_01.c b/src/overlays/actors/ovl_Boss_01/z_boss_01.c new file mode 100644 index 0000000000..37742a8761 --- /dev/null +++ b/src/overlays/actors/ovl_Boss_01/z_boss_01.c @@ -0,0 +1,174 @@ +#include "z_boss_01.h" + +#define FLAGS 0x00000035 + +#define THIS ((Boss01*)thisx) + +void Boss01_Init(Actor* thisx, GlobalContext* globalCtx); +void Boss01_Destroy(Actor* thisx, GlobalContext* globalCtx); +void Boss01_Update(Actor* thisx, GlobalContext* globalCtx); +void Boss01_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Boss_01_InitVars = { + ACTOR_BOSS_01, + ACTORTYPE_BOSS, + FLAGS, + OBJECT_BOSS01, + sizeof(Boss01), + (ActorFunc)Boss01_Init, + (ActorFunc)Boss01_Destroy, + (ActorFunc)Boss01_Update, + (ActorFunc)Boss01_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D0530.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D0550.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D0678.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D082C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D089C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D092C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D0AA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/Boss01_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/Boss01_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D119C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D1258.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D12B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D1AB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D1B2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D1E5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D1E74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D1EA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D20D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D2588.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D25E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D2664.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D26B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D2780.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D27D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D2858.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D2914.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D2A44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D2AA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D2BCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D2CDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D2DE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D2E4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D3074.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D30D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D32B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D3374.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D3400.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D345C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D34D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D3530.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D35A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D365C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D370C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D3A7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D3ADC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D3C10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D3CD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D441C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D4464.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D44C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D4668.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/Boss01_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D519C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D5584.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D55CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/Boss01_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D5B0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D5BC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D5FB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D606C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D62D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D6314.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D6424.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D6488.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D64E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D6540.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D6588.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D65E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D670C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D694C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D6B08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D6BB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D6C98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D6E7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_01_0x809D0530/func_809D73D4.asm") diff --git a/src/overlays/actors/ovl_Boss_01/z_boss_01.h b/src/overlays/actors/ovl_Boss_01/z_boss_01.h new file mode 100644 index 0000000000..c8b49de4fe --- /dev/null +++ b/src/overlays/actors/ovl_Boss_01/z_boss_01.h @@ -0,0 +1,15 @@ +#ifndef Z_BOSS_01_H +#define Z_BOSS_01_H + +#include + +struct Boss01; + +typedef struct Boss01 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x998]; +} Boss01; // size = 0xADC + +extern const ActorInit Boss_01_InitVars; + +#endif // Z_BOSS_01_H diff --git a/src/overlays/actors/ovl_Boss_02/overlay.cfg b/src/overlays/actors/ovl_Boss_02/overlay.cfg new file mode 100644 index 0000000000..6bf46fe21e --- /dev/null +++ b/src/overlays/actors/ovl_Boss_02/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Boss_02 +z_boss_02.c diff --git a/src/overlays/actors/ovl_Boss_02/z_boss_02.c b/src/overlays/actors/ovl_Boss_02/z_boss_02.c new file mode 100644 index 0000000000..0bfc7fdac0 --- /dev/null +++ b/src/overlays/actors/ovl_Boss_02/z_boss_02.c @@ -0,0 +1,70 @@ +#include "z_boss_02.h" + +#define FLAGS 0x00000035 + +#define THIS ((Boss02*)thisx) + +void Boss02_Init(Actor* thisx, GlobalContext* globalCtx); +void Boss02_Destroy(Actor* thisx, GlobalContext* globalCtx); +void Boss02_Update(Actor* thisx, GlobalContext* globalCtx); +void Boss02_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Boss_02_InitVars = { + ACTOR_BOSS_02, + ACTORTYPE_BOSS, + FLAGS, + OBJECT_BOSS02, + sizeof(Boss02), + (ActorFunc)Boss02_Init, + (ActorFunc)Boss02_Destroy, + (ActorFunc)Boss02_Update, + (ActorFunc)Boss02_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DA1D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DA22C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DA24C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DA264.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DA344.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DA460.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DA50C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/Boss02_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/Boss02_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DAA74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DAA98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DAAA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DAB78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DBFB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DC218.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/Boss02_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DC78C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/Boss02_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DD0A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DD0CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DD2F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DD934.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_02_0x809DA1D0/func_809DEAC4.asm") diff --git a/src/overlays/actors/ovl_Boss_02/z_boss_02.h b/src/overlays/actors/ovl_Boss_02/z_boss_02.h new file mode 100644 index 0000000000..58b0e0284f --- /dev/null +++ b/src/overlays/actors/ovl_Boss_02/z_boss_02.h @@ -0,0 +1,15 @@ +#ifndef Z_BOSS_02_H +#define Z_BOSS_02_H + +#include + +struct Boss02; + +typedef struct Boss02 { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0x1C3C]; +} Boss02; // size = 0x1D80 + +extern const ActorInit Boss_02_InitVars; + +#endif // Z_BOSS_02_H diff --git a/src/overlays/actors/ovl_Boss_03/overlay.cfg b/src/overlays/actors/ovl_Boss_03/overlay.cfg new file mode 100644 index 0000000000..285cc55879 --- /dev/null +++ b/src/overlays/actors/ovl_Boss_03/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Boss_03 +z_boss_03.c diff --git a/src/overlays/actors/ovl_Boss_03/z_boss_03.c b/src/overlays/actors/ovl_Boss_03/z_boss_03.c new file mode 100644 index 0000000000..2fc751b110 --- /dev/null +++ b/src/overlays/actors/ovl_Boss_03/z_boss_03.c @@ -0,0 +1,116 @@ +#include "z_boss_03.h" + +#define FLAGS 0x00000035 + +#define THIS ((Boss03*)thisx) + +void Boss03_Init(Actor* thisx, GlobalContext* globalCtx); +void Boss03_Destroy(Actor* thisx, GlobalContext* globalCtx); +void Boss03_Update(Actor* thisx, GlobalContext* globalCtx); +void Boss03_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Boss_03_InitVars = { + ACTOR_BOSS_03, + ACTORTYPE_BOSS, + FLAGS, + OBJECT_BOSS03, + sizeof(Boss03), + (ActorFunc)Boss03_Init, + (ActorFunc)Boss03_Destroy, + (ActorFunc)Boss03_Update, + (ActorFunc)Boss03_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E2760.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E2788.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E2880.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E299C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E2AB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E2B8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E2C1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E2C3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E2D64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E2DA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/Boss03_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/Boss03_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E344C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E34B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E38EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E3968.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E3D34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E3D98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E4180.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E421C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E4674.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E475C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E4910.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E497C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E4C34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E4C90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E4E2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E4E80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E5ADC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E5B64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E65F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E6640.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E69A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E6A38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E6B70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E6BC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E6CB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/Boss03_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E7920.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E79C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E7AA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/Boss03_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E7D00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E81E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E8810.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_03_0x809E2760/func_809E8BEC.asm") diff --git a/src/overlays/actors/ovl_Boss_03/z_boss_03.h b/src/overlays/actors/ovl_Boss_03/z_boss_03.h new file mode 100644 index 0000000000..99ffd20da4 --- /dev/null +++ b/src/overlays/actors/ovl_Boss_03/z_boss_03.h @@ -0,0 +1,15 @@ +#ifndef Z_BOSS_03_H +#define Z_BOSS_03_H + +#include + +struct Boss03; + +typedef struct Boss03 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x438]; +} Boss03; // size = 0x57C + +extern const ActorInit Boss_03_InitVars; + +#endif // Z_BOSS_03_H diff --git a/src/overlays/actors/ovl_Boss_04/overlay.cfg b/src/overlays/actors/ovl_Boss_04/overlay.cfg new file mode 100644 index 0000000000..16d818a430 --- /dev/null +++ b/src/overlays/actors/ovl_Boss_04/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Boss_04 +z_boss_04.c diff --git a/src/overlays/actors/ovl_Boss_04/z_boss_04.c b/src/overlays/actors/ovl_Boss_04/z_boss_04.c new file mode 100644 index 0000000000..92ba7379fe --- /dev/null +++ b/src/overlays/actors/ovl_Boss_04/z_boss_04.c @@ -0,0 +1,58 @@ +#include "z_boss_04.h" + +#define FLAGS 0x00000035 + +#define THIS ((Boss04*)thisx) + +void Boss04_Init(Actor* thisx, GlobalContext* globalCtx); +void Boss04_Destroy(Actor* thisx, GlobalContext* globalCtx); +void Boss04_Update(Actor* thisx, GlobalContext* globalCtx); +void Boss04_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Boss_04_InitVars = { + ACTOR_BOSS_04, + ACTORTYPE_BOSS, + FLAGS, + OBJECT_BOSS04, + sizeof(Boss04), + (ActorFunc)Boss04_Init, + (ActorFunc)Boss04_Destroy, + (ActorFunc)Boss04_Update, + (ActorFunc)Boss04_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809EC040.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/Boss04_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/Boss04_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809EC544.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809EC568.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809ECD00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809ECD18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809ECEF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809ECF58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809ED224.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809ED2A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809ED45C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809ED50C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/Boss04_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809EDCCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/func_809EDECC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_04_0x809EC040/Boss04_Draw.asm") diff --git a/src/overlays/actors/ovl_Boss_04/z_boss_04.h b/src/overlays/actors/ovl_Boss_04/z_boss_04.h new file mode 100644 index 0000000000..8afdb9cc81 --- /dev/null +++ b/src/overlays/actors/ovl_Boss_04/z_boss_04.h @@ -0,0 +1,15 @@ +#ifndef Z_BOSS_04_H +#define Z_BOSS_04_H + +#include + +struct Boss04; + +typedef struct Boss04 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x608]; +} Boss04; // size = 0x74C + +extern const ActorInit Boss_04_InitVars; + +#endif // Z_BOSS_04_H diff --git a/src/overlays/actors/ovl_Boss_05/overlay.cfg b/src/overlays/actors/ovl_Boss_05/overlay.cfg new file mode 100644 index 0000000000..db19abb801 --- /dev/null +++ b/src/overlays/actors/ovl_Boss_05/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Boss_05 +z_boss_05.c diff --git a/src/overlays/actors/ovl_Boss_05/z_boss_05.c b/src/overlays/actors/ovl_Boss_05/z_boss_05.c new file mode 100644 index 0000000000..dc450de637 --- /dev/null +++ b/src/overlays/actors/ovl_Boss_05/z_boss_05.c @@ -0,0 +1,108 @@ +#include "z_boss_05.h" + +#define FLAGS 0x00000005 + +#define THIS ((Boss05*)thisx) + +void Boss05_Init(Actor* thisx, GlobalContext* globalCtx); +void Boss05_Destroy(Actor* thisx, GlobalContext* globalCtx); +void Boss05_Update(Actor* thisx, GlobalContext* globalCtx); +void Boss05_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Boss_05_InitVars = { + ACTOR_BOSS_05, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_BOSS05, + sizeof(Boss05), + (ActorFunc)Boss05_Init, + (ActorFunc)Boss05_Destroy, + (ActorFunc)Boss05_Update, + (ActorFunc)Boss05_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809EE4E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809EE668.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/Boss05_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/Boss05_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809EECBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809EEDD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809EEDE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809EF9BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809EFAB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809EFE50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0014.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0058.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F00CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F010C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F01CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0244.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F02D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0374.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0474.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F04C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0538.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0590.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0650.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F06B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0708.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0780.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0A0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0A64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0ABC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F0B0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/Boss05_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F1050.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F1170.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F1284.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F12A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F135C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F1404.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F1430.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F1464.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F14AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/func_809F1550.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_05_0x809EE4E0/Boss05_Draw.asm") diff --git a/src/overlays/actors/ovl_Boss_05/z_boss_05.h b/src/overlays/actors/ovl_Boss_05/z_boss_05.h new file mode 100644 index 0000000000..91e23655db --- /dev/null +++ b/src/overlays/actors/ovl_Boss_05/z_boss_05.h @@ -0,0 +1,15 @@ +#ifndef Z_BOSS_05_H +#define Z_BOSS_05_H + +#include + +struct Boss05; + +typedef struct Boss05 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x3C4]; +} Boss05; // size = 0x508 + +extern const ActorInit Boss_05_InitVars; + +#endif // Z_BOSS_05_H diff --git a/src/overlays/actors/ovl_Boss_06/overlay.cfg b/src/overlays/actors/ovl_Boss_06/overlay.cfg new file mode 100644 index 0000000000..3f5b0e7d58 --- /dev/null +++ b/src/overlays/actors/ovl_Boss_06/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Boss_06 +z_boss_06.c diff --git a/src/overlays/actors/ovl_Boss_06/z_boss_06.c b/src/overlays/actors/ovl_Boss_06/z_boss_06.c new file mode 100644 index 0000000000..8292bcb01f --- /dev/null +++ b/src/overlays/actors/ovl_Boss_06/z_boss_06.c @@ -0,0 +1,54 @@ +#include "z_boss_06.h" + +#define FLAGS 0x00000035 + +#define THIS ((Boss06*)thisx) + +void Boss06_Init(Actor* thisx, GlobalContext* globalCtx); +void Boss06_Destroy(Actor* thisx, GlobalContext* globalCtx); +void Boss06_Update(Actor* thisx, GlobalContext* globalCtx); +void Boss06_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Boss_06_InitVars = { + ACTOR_BOSS_06, + ACTORTYPE_BOSS, + FLAGS, + OBJECT_KNIGHT, + sizeof(Boss06), + (ActorFunc)Boss06_Init, + (ActorFunc)Boss06_Destroy, + (ActorFunc)Boss06_Update, + (ActorFunc)Boss06_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/func_809F2120.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/func_809F2140.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/Boss06_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/Boss06_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/func_809F23CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/func_809F24A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/func_809F24C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/func_809F2B64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/func_809F2C44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/func_809F2E14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/func_809F2E34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/func_809F2ED0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/func_809F2EE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/Boss06_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_06_0x809F2120/Boss06_Draw.asm") diff --git a/src/overlays/actors/ovl_Boss_06/z_boss_06.h b/src/overlays/actors/ovl_Boss_06/z_boss_06.h new file mode 100644 index 0000000000..0e31376a3f --- /dev/null +++ b/src/overlays/actors/ovl_Boss_06/z_boss_06.h @@ -0,0 +1,15 @@ +#ifndef Z_BOSS_06_H +#define Z_BOSS_06_H + +#include + +struct Boss06; + +typedef struct Boss06 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x8EC]; +} Boss06; // size = 0xA30 + +extern const ActorInit Boss_06_InitVars; + +#endif // Z_BOSS_06_H diff --git a/src/overlays/actors/ovl_Boss_07/overlay.cfg b/src/overlays/actors/ovl_Boss_07/overlay.cfg new file mode 100644 index 0000000000..79c564cccb --- /dev/null +++ b/src/overlays/actors/ovl_Boss_07/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Boss_07 +z_boss_07.c diff --git a/src/overlays/actors/ovl_Boss_07/z_boss_07.c b/src/overlays/actors/ovl_Boss_07/z_boss_07.c new file mode 100644 index 0000000000..579130a759 --- /dev/null +++ b/src/overlays/actors/ovl_Boss_07/z_boss_07.c @@ -0,0 +1,296 @@ +#include "z_boss_07.h" + +#define FLAGS 0x00000035 + +#define THIS ((Boss07*)thisx) + +void Boss07_Init(Actor* thisx, GlobalContext* globalCtx); +void Boss07_Destroy(Actor* thisx, GlobalContext* globalCtx); +void Boss07_Update(Actor* thisx, GlobalContext* globalCtx); +void Boss07_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Boss_07_InitVars = { + ACTOR_BOSS_07, + ACTORTYPE_BOSS, + FLAGS, + OBJECT_BOSS07, + sizeof(Boss07), + (ActorFunc)Boss07_Init, + (ActorFunc)Boss07_Destroy, + (ActorFunc)Boss07_Update, + (ActorFunc)Boss07_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F4980.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F49A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F49C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F4AE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F4BB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F4C40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F4CBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F4D10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F4D54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F4FAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F4FF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F51E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F52CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F536C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F5494.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/Boss07_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/Boss07_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F5E14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F5E88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F64F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F65F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F7400.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F748C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F7688.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F76D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F77A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F783C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F7968.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F7AB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F7BC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F7D2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F805C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F8658.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F86B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F87C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F8908.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F8AB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F8B1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F8D04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F8DEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F8E68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F8EC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F91D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F9280.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F93DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F94AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F99C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F9CEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809F9E94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/Boss07_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FAA44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FB114.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FB504.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FB55C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FB728.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FB7D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FBB9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FBF94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/Boss07_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FC4C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FC8B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FC960.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FCBC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FCC70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FCCCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FD5F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FD710.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FD818.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FD89C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FD984.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FDAB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FDB2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FDBA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FDEDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FDF54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FE068.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FE0E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FE2D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FE348.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FE4B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FE524.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FE6B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FE734.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FEE70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FF0E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FF12C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FF5CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FF678.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FF6B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FF810.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FF900.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FFA04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FFA80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FFE64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_809FFEAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A0021C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A00274.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A00484.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A00554.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A006D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A006F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A00720.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A016E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A01750.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A025AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A0264C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A02B30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A02C54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A03238.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A036C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A03868.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A03F18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A03F5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A0434C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A045A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A04768.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A04878.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A04890.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A04DE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A04E5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A055E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A05608.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A05694.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A057A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A05AF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A05B50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A05C88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A05DDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A06500.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A06990.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A06C64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A06E24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A06F48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A07604.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A07638.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_07_0x809F4980/func_80A07740.asm") diff --git a/src/overlays/actors/ovl_Boss_07/z_boss_07.h b/src/overlays/actors/ovl_Boss_07/z_boss_07.h new file mode 100644 index 0000000000..d43bb422ff --- /dev/null +++ b/src/overlays/actors/ovl_Boss_07/z_boss_07.h @@ -0,0 +1,15 @@ +#ifndef Z_BOSS_07_H +#define Z_BOSS_07_H + +#include + +struct Boss07; + +typedef struct Boss07 { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0xAADC]; +} Boss07; // size = 0xAC20 + +extern const ActorInit Boss_07_InitVars; + +#endif // Z_BOSS_07_H diff --git a/src/overlays/actors/ovl_Boss_Hakugin/overlay.cfg b/src/overlays/actors/ovl_Boss_Hakugin/overlay.cfg new file mode 100644 index 0000000000..059dde3810 --- /dev/null +++ b/src/overlays/actors/ovl_Boss_Hakugin/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Boss_Hakugin +z_boss_hakugin.c diff --git a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c new file mode 100644 index 0000000000..6905480f2c --- /dev/null +++ b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c @@ -0,0 +1,182 @@ +#include "z_boss_hakugin.h" + +#define FLAGS 0x00000035 + +#define THIS ((BossHakugin*)thisx) + +void BossHakugin_Init(Actor* thisx, GlobalContext* globalCtx); +void BossHakugin_Destroy(Actor* thisx, GlobalContext* globalCtx); +void BossHakugin_Update(Actor* thisx, GlobalContext* globalCtx); +void BossHakugin_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Boss_Hakugin_InitVars = { + ACTOR_BOSS_HAKUGIN, + ACTORTYPE_BOSS, + FLAGS, + OBJECT_BOSS_HAKUGIN, + sizeof(BossHakugin), + (ActorFunc)BossHakugin_Init, + (ActorFunc)BossHakugin_Destroy, + (ActorFunc)BossHakugin_Update, + (ActorFunc)BossHakugin_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/BossHakugin_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/BossHakugin_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0573C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B057A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B058C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B05A64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B05B04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B05CBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B05D4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B05EE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0607C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B06558.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B06600.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0696C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B06B20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B06C08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B06D38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B06F48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0728C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B07450.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B07700.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0791C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B07B88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B07BFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B07DA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B07EEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B08018.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B08124.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0813C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0825C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B082AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B08550.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0863C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B08848.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B08960.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B08C1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B08CB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B09178.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B091D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B093C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B094E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B09840.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B098BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B09A94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B09C78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B09DFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B09E20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B09E84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B09EDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B09F7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0A2A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0A5EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0A638.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0A87C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0A8C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0AC30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0ADFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0B238.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0B34C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0B3F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0B548.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0B660.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/BossHakugin_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0C000.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0C1BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0C398.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0C570.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0C7B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0CAF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0CCD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0CF24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/BossHakugin_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0D2B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0D69C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0D750.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0D9CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0DFA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0E548.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Boss_Hakugin_0x80B05290/func_80B0E5A4.asm") diff --git a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h new file mode 100644 index 0000000000..d621466b0d --- /dev/null +++ b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h @@ -0,0 +1,15 @@ +#ifndef Z_BOSS_HAKUGIN_H +#define Z_BOSS_HAKUGIN_H + +#include + +struct BossHakugin; + +typedef struct BossHakugin { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0x36CC]; +} BossHakugin; // size = 0x3810 + +extern const ActorInit Boss_Hakugin_InitVars; + +#endif // Z_BOSS_HAKUGIN_H diff --git a/src/overlays/actors/ovl_Demo_Effect/overlay.cfg b/src/overlays/actors/ovl_Demo_Effect/overlay.cfg new file mode 100644 index 0000000000..8f2105acfc --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Effect/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Demo_Effect +z_demo_effect.c diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c new file mode 100644 index 0000000000..ce0389509d --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -0,0 +1,49 @@ +#include "z_demo_effect.h" + +#define FLAGS 0x00000030 + +#define THIS ((DemoEffect*)thisx) + +void DemoEffect_Init(Actor* thisx, GlobalContext* globalCtx); +void DemoEffect_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DemoEffect_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Demo_Effect_InitVars = { + ACTOR_DEMO_EFFECT, + ACTORTYPE_BG, + FLAGS, + GAMEPLAY_KEEP, + sizeof(DemoEffect), + (ActorFunc)DemoEffect_Init, + (ActorFunc)DemoEffect_Destroy, + (ActorFunc)DemoEffect_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/DemoEffect_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/DemoEffect_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/func_808CD940.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/func_808CD998.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/func_808CDAD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/func_808CDBDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/func_808CDCEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/func_808CDD70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/func_808CDDE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/DemoEffect_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/func_808CDE78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/func_808CDFF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Effect_0x808CD740/func_808CE078.asm") diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h new file mode 100644 index 0000000000..73287de3da --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h @@ -0,0 +1,15 @@ +#ifndef Z_DEMO_EFFECT_H +#define Z_DEMO_EFFECT_H + +#include + +struct DemoEffect; + +typedef struct DemoEffect { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x38]; +} DemoEffect; // size = 0x17C + +extern const ActorInit Demo_Effect_InitVars; + +#endif // Z_DEMO_EFFECT_H diff --git a/src/overlays/actors/ovl_Demo_Getitem/overlay.cfg b/src/overlays/actors/ovl_Demo_Getitem/overlay.cfg new file mode 100644 index 0000000000..df09fe2ea2 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Getitem/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Demo_Getitem +z_demo_getitem.c diff --git a/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c new file mode 100644 index 0000000000..80e28497a1 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c @@ -0,0 +1,35 @@ +#include "z_demo_getitem.h" + +#define FLAGS 0x00000030 + +#define THIS ((DemoGetitem*)thisx) + +void DemoGetitem_Init(Actor* thisx, GlobalContext* globalCtx); +void DemoGetitem_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DemoGetitem_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Demo_Getitem_InitVars = { + ACTOR_DEMO_GETITEM, + ACTORTYPE_BG, + FLAGS, + GAMEPLAY_KEEP, + sizeof(DemoGetitem), + (ActorFunc)DemoGetitem_Init, + (ActorFunc)DemoGetitem_Destroy, + (ActorFunc)DemoGetitem_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Getitem_0x80A4FA40/DemoGetitem_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Getitem_0x80A4FA40/DemoGetitem_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Getitem_0x80A4FA40/func_80A4FB10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Getitem_0x80A4FA40/func_80A4FB68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Getitem_0x80A4FA40/DemoGetitem_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Getitem_0x80A4FA40/func_80A4FCF0.asm") diff --git a/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.h b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.h new file mode 100644 index 0000000000..56b5c9fd73 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.h @@ -0,0 +1,15 @@ +#ifndef Z_DEMO_GETITEM_H +#define Z_DEMO_GETITEM_H + +#include + +struct DemoGetitem; + +typedef struct DemoGetitem { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xC]; +} DemoGetitem; // size = 0x150 + +extern const ActorInit Demo_Getitem_InitVars; + +#endif // Z_DEMO_GETITEM_H diff --git a/src/overlays/actors/ovl_Demo_Kankyo/overlay.cfg b/src/overlays/actors/ovl_Demo_Kankyo/overlay.cfg new file mode 100644 index 0000000000..b9c10f3119 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Kankyo/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Demo_Kankyo +z_demo_kankyo.c diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c new file mode 100644 index 0000000000..ddd62aca58 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -0,0 +1,44 @@ +#include "z_demo_kankyo.h" + +#define FLAGS 0x00000030 + +#define THIS ((DemoKankyo*)thisx) + +void DemoKankyo_Init(Actor* thisx, GlobalContext* globalCtx); +void DemoKankyo_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DemoKankyo_Update(Actor* thisx, GlobalContext* globalCtx); +void DemoKankyo_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Demo_Kankyo_InitVars = { + ACTOR_DEMO_KANKYO, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(DemoKankyo), + (ActorFunc)DemoKankyo_Init, + (ActorFunc)DemoKankyo_Destroy, + (ActorFunc)DemoKankyo_Update, + (ActorFunc)DemoKankyo_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Kankyo_0x808CE450/func_808CE450.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Kankyo_0x808CE450/func_808CE45C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Kankyo_0x808CE450/func_808CF06C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Kankyo_0x808CE450/func_808CF0CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Kankyo_0x808CE450/DemoKankyo_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Kankyo_0x808CE450/DemoKankyo_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Kankyo_0x808CE450/DemoKankyo_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Kankyo_0x808CE450/func_808CF970.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Kankyo_0x808CE450/func_808CFE04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Kankyo_0x808CE450/DemoKankyo_Draw.asm") diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h new file mode 100644 index 0000000000..417c49d797 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h @@ -0,0 +1,15 @@ +#ifndef Z_DEMO_KANKYO_H +#define Z_DEMO_KANKYO_H + +#include + +struct DemoKankyo; + +typedef struct DemoKankyo { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0x150C]; +} DemoKankyo; // size = 0x1650 + +extern const ActorInit Demo_Kankyo_InitVars; + +#endif // Z_DEMO_KANKYO_H diff --git a/src/overlays/actors/ovl_Demo_Moonend/overlay.cfg b/src/overlays/actors/ovl_Demo_Moonend/overlay.cfg new file mode 100644 index 0000000000..3d2793e42b --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Moonend/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Demo_Moonend +z_demo_moonend.c diff --git a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c new file mode 100644 index 0000000000..25cd035c87 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c @@ -0,0 +1,44 @@ +#include "z_demo_moonend.h" + +#define FLAGS 0x00000030 + +#define THIS ((DemoMoonend*)thisx) + +void DemoMoonend_Init(Actor* thisx, GlobalContext* globalCtx); +void DemoMoonend_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DemoMoonend_Update(Actor* thisx, GlobalContext* globalCtx); +void DemoMoonend_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Demo_Moonend_InitVars = { + ACTOR_DEMO_MOONEND, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_MOONEND, + sizeof(DemoMoonend), + (ActorFunc)DemoMoonend_Init, + (ActorFunc)DemoMoonend_Destroy, + (ActorFunc)DemoMoonend_Update, + (ActorFunc)DemoMoonend_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Moonend_0x80C17A10/DemoMoonend_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Moonend_0x80C17A10/DemoMoonend_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Moonend_0x80C17A10/func_80C17B50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Moonend_0x80C17A10/func_80C17B60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Moonend_0x80C17A10/func_80C17C48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Moonend_0x80C17A10/DemoMoonend_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Moonend_0x80C17A10/func_80C17E70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Moonend_0x80C17A10/func_80C17EE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Moonend_0x80C17A10/DemoMoonend_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Moonend_0x80C17A10/func_80C17FCC.asm") diff --git a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.h b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.h new file mode 100644 index 0000000000..5e63599341 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.h @@ -0,0 +1,15 @@ +#ifndef Z_DEMO_MOONEND_H +#define Z_DEMO_MOONEND_H + +#include + +struct DemoMoonend; + +typedef struct DemoMoonend { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1A0]; +} DemoMoonend; // size = 0x2E4 + +extern const ActorInit Demo_Moonend_InitVars; + +#endif // Z_DEMO_MOONEND_H diff --git a/src/overlays/actors/ovl_Demo_Shd/overlay.cfg b/src/overlays/actors/ovl_Demo_Shd/overlay.cfg new file mode 100644 index 0000000000..0cf96d92aa --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Shd/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Demo_Shd +z_demo_shd.c diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c new file mode 100644 index 0000000000..336e43e19c --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c @@ -0,0 +1,32 @@ +#include "z_demo_shd.h" + +#define FLAGS 0x00000030 + +#define THIS ((DemoShd*)thisx) + +void DemoShd_Init(Actor* thisx, GlobalContext* globalCtx); +void DemoShd_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DemoShd_Update(Actor* thisx, GlobalContext* globalCtx); +void DemoShd_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Demo_Shd_InitVars = { + ACTOR_DEMO_SHD, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_FWALL, + sizeof(DemoShd), + (ActorFunc)DemoShd_Init, + (ActorFunc)DemoShd_Destroy, + (ActorFunc)DemoShd_Update, + (ActorFunc)DemoShd_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Shd_0x8092C530/DemoShd_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Shd_0x8092C530/DemoShd_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Shd_0x8092C530/DemoShd_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Shd_0x8092C530/DemoShd_Draw.asm") diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h new file mode 100644 index 0000000000..86fadb332b --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h @@ -0,0 +1,15 @@ +#ifndef Z_DEMO_SHD_H +#define Z_DEMO_SHD_H + +#include + +struct DemoShd; + +typedef struct DemoShd { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0x118C]; +} DemoShd; // size = 0x12D0 + +extern const ActorInit Demo_Shd_InitVars; + +#endif // Z_DEMO_SHD_H diff --git a/src/overlays/actors/ovl_Demo_Syoten/overlay.cfg b/src/overlays/actors/ovl_Demo_Syoten/overlay.cfg new file mode 100644 index 0000000000..8fde4e6f62 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Syoten/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Demo_Syoten +z_demo_syoten.c diff --git a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c new file mode 100644 index 0000000000..121504d30e --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c @@ -0,0 +1,60 @@ +#include "z_demo_syoten.h" + +#define FLAGS 0x00000030 + +#define THIS ((DemoSyoten*)thisx) + +void DemoSyoten_Init(Actor* thisx, GlobalContext* globalCtx); +void DemoSyoten_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DemoSyoten_Update(Actor* thisx, GlobalContext* globalCtx); +void DemoSyoten_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Demo_Syoten_InitVars = { + ACTOR_DEMO_SYOTEN, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_SYOTEN, + sizeof(DemoSyoten), + (ActorFunc)DemoSyoten_Init, + (ActorFunc)DemoSyoten_Destroy, + (ActorFunc)DemoSyoten_Update, + (ActorFunc)DemoSyoten_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/DemoSyoten_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/DemoSyoten_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C16760.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C16818.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C168D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C16974.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C16A64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C16A74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C16BD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C16DD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C16EAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C17008.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/DemoSyoten_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C170F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C173B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C17468.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/DemoSyoten_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Syoten_0x80C16480/func_80C17690.asm") diff --git a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.h b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.h new file mode 100644 index 0000000000..bbb4d58e10 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.h @@ -0,0 +1,15 @@ +#ifndef Z_DEMO_SYOTEN_H +#define Z_DEMO_SYOTEN_H + +#include + +struct DemoSyoten; + +typedef struct DemoSyoten { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2B4]; +} DemoSyoten; // size = 0x3F8 + +extern const ActorInit Demo_Syoten_InitVars; + +#endif // Z_DEMO_SYOTEN_H diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/overlay.cfg b/src/overlays/actors/ovl_Demo_Tre_Lgt/overlay.cfg new file mode 100644 index 0000000000..a063264ea8 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Demo_Tre_Lgt +z_demo_tre_lgt.c diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c new file mode 100644 index 0000000000..bf7b6c2d45 --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c @@ -0,0 +1,42 @@ +#include "z_demo_tre_lgt.h" + +#define FLAGS 0x00000010 + +#define THIS ((DemoTreLgt*)thisx) + +void DemoTreLgt_Init(Actor* thisx, GlobalContext* globalCtx); +void DemoTreLgt_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DemoTreLgt_Update(Actor* thisx, GlobalContext* globalCtx); +void DemoTreLgt_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Demo_Tre_Lgt_InitVars = { + ACTOR_DEMO_TRE_LGT, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_BOX, + sizeof(DemoTreLgt), + (ActorFunc)DemoTreLgt_Init, + (ActorFunc)DemoTreLgt_Destroy, + (ActorFunc)DemoTreLgt_Update, + (ActorFunc)DemoTreLgt_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Tre_Lgt_0x808E0E40/DemoTreLgt_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Tre_Lgt_0x808E0E40/DemoTreLgt_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Tre_Lgt_0x808E0E40/func_808E0EE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Tre_Lgt_0x808E0E40/func_808E0EF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Tre_Lgt_0x808E0E40/func_808E0F4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Tre_Lgt_0x808E0E40/func_808E0FE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Tre_Lgt_0x808E0E40/DemoTreLgt_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Tre_Lgt_0x808E0E40/func_808E12A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Demo_Tre_Lgt_0x808E0E40/DemoTreLgt_Draw.asm") diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h new file mode 100644 index 0000000000..e2ed5d65be --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h @@ -0,0 +1,15 @@ +#ifndef Z_DEMO_TRE_LGT_H +#define Z_DEMO_TRE_LGT_H + +#include + +struct DemoTreLgt; + +typedef struct DemoTreLgt { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x34]; +} DemoTreLgt; // size = 0x178 + +extern const ActorInit Demo_Tre_Lgt_InitVars; + +#endif // Z_DEMO_TRE_LGT_H diff --git a/src/overlays/actors/ovl_Dm_Ah/overlay.cfg b/src/overlays/actors/ovl_Dm_Ah/overlay.cfg new file mode 100644 index 0000000000..22f1cf7a3d --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Ah/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_Ah +z_dm_ah.c diff --git a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c new file mode 100644 index 0000000000..7d2fb1eeb3 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c @@ -0,0 +1,50 @@ +#include "z_dm_ah.h" + +#define FLAGS 0x00000009 + +#define THIS ((DmAh*)thisx) + +void DmAh_Init(Actor* thisx, GlobalContext* globalCtx); +void DmAh_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmAh_Update(Actor* thisx, GlobalContext* globalCtx); +void DmAh_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_Ah_InitVars = { + ACTOR_DM_AH, + ACTORTYPE_NPC, + FLAGS, + OBJECT_AH, + sizeof(DmAh), + (ActorFunc)DmAh_Init, + (ActorFunc)DmAh_Destroy, + (ActorFunc)DmAh_Update, + (ActorFunc)DmAh_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/func_80C1D410.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/func_80C1D458.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/func_80C1D4D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/func_80C1D6E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/func_80C1D78C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/func_80C1D7FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/func_80C1D92C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/DmAh_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/DmAh_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/DmAh_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/func_80C1DAD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/func_80C1DB24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ah_0x80C1D410/DmAh_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.h b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.h new file mode 100644 index 0000000000..e0c5fa0cb1 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_AH_H +#define Z_DM_AH_H + +#include + +struct DmAh; + +typedef struct DmAh { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x15C]; +} DmAh; // size = 0x2A0 + +extern const ActorInit Dm_Ah_InitVars; + +#endif // Z_DM_AH_H diff --git a/src/overlays/actors/ovl_Dm_Al/overlay.cfg b/src/overlays/actors/ovl_Dm_Al/overlay.cfg new file mode 100644 index 0000000000..92999ffdd3 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Al/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_Al +z_dm_al.c diff --git a/src/overlays/actors/ovl_Dm_Al/z_dm_al.c b/src/overlays/actors/ovl_Dm_Al/z_dm_al.c new file mode 100644 index 0000000000..9e0ade937e --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Al/z_dm_al.c @@ -0,0 +1,42 @@ +#include "z_dm_al.h" + +#define FLAGS 0x00000009 + +#define THIS ((DmAl*)thisx) + +void DmAl_Init(Actor* thisx, GlobalContext* globalCtx); +void DmAl_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmAl_Update(Actor* thisx, GlobalContext* globalCtx); +void DmAl_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_Al_InitVars = { + ACTOR_EN_AL, + ACTORTYPE_NPC, + FLAGS, + OBJECT_AL, + sizeof(DmAl), + (ActorFunc)DmAl_Init, + (ActorFunc)DmAl_Destroy, + (ActorFunc)DmAl_Update, + (ActorFunc)DmAl_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Al_0x80C1BD90/func_80C1BD90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Al_0x80C1BD90/func_80C1BDD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Al_0x80C1BD90/DmAl_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Al_0x80C1BD90/DmAl_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Al_0x80C1BD90/DmAl_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Al_0x80C1BD90/func_80C1C028.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Al_0x80C1BD90/func_80C1C064.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Al_0x80C1BD90/func_80C1C11C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Al_0x80C1BD90/DmAl_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Al/z_dm_al.h b/src/overlays/actors/ovl_Dm_Al/z_dm_al.h new file mode 100644 index 0000000000..6ad8152d5c --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Al/z_dm_al.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_AL_H +#define Z_DM_AL_H + +#include + +struct DmAl; + +typedef struct DmAl { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x31C]; +} DmAl; // size = 0x460 + +extern const ActorInit Dm_Al_InitVars; + +#endif // Z_DM_AL_H diff --git a/src/overlays/actors/ovl_Dm_An/overlay.cfg b/src/overlays/actors/ovl_Dm_An/overlay.cfg new file mode 100644 index 0000000000..03f82edfa5 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_An/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_An +z_dm_an.c diff --git a/src/overlays/actors/ovl_Dm_An/z_dm_an.c b/src/overlays/actors/ovl_Dm_An/z_dm_an.c new file mode 100644 index 0000000000..64f497dd4c --- /dev/null +++ b/src/overlays/actors/ovl_Dm_An/z_dm_an.c @@ -0,0 +1,53 @@ +#include "z_dm_an.h" + +#define FLAGS 0x00000009 + +#define THIS ((DmAn*)thisx) + +void DmAn_Init(Actor* thisx, GlobalContext* globalCtx); +void DmAn_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmAn_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_An_InitVars = { + ACTOR_DM_AN, + ACTORTYPE_NPC, + FLAGS, + OBJECT_AN1, + sizeof(DmAn), + (ActorFunc)DmAn_Init, + (ActorFunc)DmAn_Destroy, + (ActorFunc)DmAn_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/func_80C1C410.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/func_80C1C4D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/func_80C1C5B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/func_80C1C62C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/func_80C1C83C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/func_80C1C8E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/func_80C1C958.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/func_80C1CAB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/func_80C1CC80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/DmAn_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/DmAn_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/DmAn_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/func_80C1CD80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/func_80C1CEFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_An_0x80C1C410/func_80C1D0B0.asm") diff --git a/src/overlays/actors/ovl_Dm_An/z_dm_an.h b/src/overlays/actors/ovl_Dm_An/z_dm_an.h new file mode 100644 index 0000000000..21ce93f4dc --- /dev/null +++ b/src/overlays/actors/ovl_Dm_An/z_dm_an.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_AN_H +#define Z_DM_AN_H + +#include + +struct DmAn; + +typedef struct DmAn { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x194]; +} DmAn; // size = 0x2D8 + +extern const ActorInit Dm_An_InitVars; + +#endif // Z_DM_AN_H diff --git a/src/overlays/actors/ovl_Dm_Bal/overlay.cfg b/src/overlays/actors/ovl_Dm_Bal/overlay.cfg new file mode 100644 index 0000000000..fa51bac6a6 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Bal/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_Bal +z_dm_bal.c diff --git a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c new file mode 100644 index 0000000000..0bed8bd21c --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c @@ -0,0 +1,48 @@ +#include "z_dm_bal.h" + +#define FLAGS 0x02000019 + +#define THIS ((DmBal*)thisx) + +void DmBal_Init(Actor* thisx, GlobalContext* globalCtx); +void DmBal_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmBal_Update(Actor* thisx, GlobalContext* globalCtx); +void DmBal_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_Bal_InitVars = { + ACTOR_DM_BAL, + ACTORTYPE_NPC, + FLAGS, + OBJECT_BAL, + sizeof(DmBal), + (ActorFunc)DmBal_Init, + (ActorFunc)DmBal_Destroy, + (ActorFunc)DmBal_Update, + (ActorFunc)DmBal_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Bal_0x80C1E9E0/DmBal_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Bal_0x80C1E9E0/DmBal_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Bal_0x80C1E9E0/func_80C1EAC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Bal_0x80C1E9E0/func_80C1EAD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Bal_0x80C1E9E0/func_80C1EAE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Bal_0x80C1E9E0/func_80C1EC60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Bal_0x80C1E9E0/func_80C1ED0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Bal_0x80C1E9E0/func_80C1ED64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Bal_0x80C1E9E0/DmBal_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Bal_0x80C1E9E0/func_80C1EF80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Bal_0x80C1E9E0/func_80C1F060.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Bal_0x80C1E9E0/DmBal_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.h b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.h new file mode 100644 index 0000000000..e7dcc346bd --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_BAL_H +#define Z_DM_BAL_H + +#include + +struct DmBal; + +typedef struct DmBal { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1F8]; +} DmBal; // size = 0x33C + +extern const ActorInit Dm_Bal_InitVars; + +#endif // Z_DM_BAL_H diff --git a/src/overlays/actors/ovl_Dm_Char00/overlay.cfg b/src/overlays/actors/ovl_Dm_Char00/overlay.cfg new file mode 100644 index 0000000000..0d49d3bbc7 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char00/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_Char00 +z_dm_char00.c diff --git a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c new file mode 100644 index 0000000000..7a3e6aac82 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c @@ -0,0 +1,76 @@ +#include "z_dm_char00.h" + +#define FLAGS 0x00000030 + +#define THIS ((DmChar00*)thisx) + +void DmChar00_Init(Actor* thisx, GlobalContext* globalCtx); +void DmChar00_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmChar00_Update(Actor* thisx, GlobalContext* globalCtx); +void DmChar00_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_Char00_InitVars = { + ACTOR_DM_CHAR00, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_DELF, + sizeof(DmChar00), + (ActorFunc)DmChar00_Init, + (ActorFunc)DmChar00_Destroy, + (ActorFunc)DmChar00_Update, + (ActorFunc)DmChar00_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5580.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA561C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5720.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA575C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5890.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA58CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5950.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5960.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA59E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5A6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5AF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5BF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5CD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5D10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5D6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5DC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5E2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA5EBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/DmChar00_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/DmChar00_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA62FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA67F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA695C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/DmChar00_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/func_80AA6A6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char00_0x80AA5580/DmChar00_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.h b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.h new file mode 100644 index 0000000000..73ed6387e9 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_CHAR00_H +#define Z_DM_CHAR00_H + +#include + +struct DmChar00; + +typedef struct DmChar00 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x120]; +} DmChar00; // size = 0x264 + +extern const ActorInit Dm_Char00_InitVars; + +#endif // Z_DM_CHAR00_H diff --git a/src/overlays/actors/ovl_Dm_Char01/overlay.cfg b/src/overlays/actors/ovl_Dm_Char01/overlay.cfg new file mode 100644 index 0000000000..babdfc2f2a --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char01/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_Char01 +z_dm_char01.c diff --git a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c new file mode 100644 index 0000000000..3e9f436937 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c @@ -0,0 +1,54 @@ +#include "z_dm_char01.h" + +#define FLAGS 0x02000030 + +#define THIS ((DmChar01*)thisx) + +void DmChar01_Init(Actor* thisx, GlobalContext* globalCtx); +void DmChar01_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmChar01_Update(Actor* thisx, GlobalContext* globalCtx); +void DmChar01_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_Char01_InitVars = { + ACTOR_DM_CHAR01, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_MTORIDE, + sizeof(DmChar01), + (ActorFunc)DmChar01_Init, + (ActorFunc)DmChar01_Destroy, + (ActorFunc)DmChar01_Update, + (ActorFunc)DmChar01_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/DmChar01_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/DmChar01_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/func_80AA8698.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/func_80AA884C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/func_80AA88A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/func_80AA892C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/func_80AA8C28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/func_80AA8F0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/func_80AA8F1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/func_80AA8F2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/func_80AA9020.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/func_80AA90AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/func_80AA90F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/DmChar01_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char01_0x80AA81E0/DmChar01_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.h b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.h new file mode 100644 index 0000000000..37b36c853b --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_CHAR01_H +#define Z_DM_CHAR01_H + +#include + +struct DmChar01; + +typedef struct DmChar01 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x20C]; +} DmChar01; // size = 0x350 + +extern const ActorInit Dm_Char01_InitVars; + +#endif // Z_DM_CHAR01_H diff --git a/src/overlays/actors/ovl_Dm_Char02/overlay.cfg b/src/overlays/actors/ovl_Dm_Char02/overlay.cfg new file mode 100644 index 0000000000..b5c165061a --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char02/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_Char02 +z_dm_char02.c diff --git a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c new file mode 100644 index 0000000000..61a1fc6a3a --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c @@ -0,0 +1,46 @@ +#include "z_dm_char02.h" + +#define FLAGS 0x00000030 + +#define THIS ((DmChar02*)thisx) + +void DmChar02_Init(Actor* thisx, GlobalContext* globalCtx); +void DmChar02_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmChar02_Update(Actor* thisx, GlobalContext* globalCtx); +void DmChar02_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_Char02_InitVars = { + ACTOR_DM_CHAR02, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_STK2, + sizeof(DmChar02), + (ActorFunc)DmChar02_Init, + (ActorFunc)DmChar02_Destroy, + (ActorFunc)DmChar02_Update, + (ActorFunc)DmChar02_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char02_0x80AAAE30/func_80AAAE30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char02_0x80AAAE30/func_80AAAECC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char02_0x80AAAE30/func_80AAAF2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char02_0x80AAAE30/DmChar02_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char02_0x80AAAE30/DmChar02_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char02_0x80AAAE30/func_80AAB04C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char02_0x80AAAE30/DmChar02_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char02_0x80AAAE30/func_80AAB23C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char02_0x80AAAE30/func_80AAB258.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char02_0x80AAAE30/func_80AAB270.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char02_0x80AAAE30/DmChar02_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.h b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.h new file mode 100644 index 0000000000..705ff5f6b1 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_CHAR02_H +#define Z_DM_CHAR02_H + +#include + +struct DmChar02; + +typedef struct DmChar02 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1B0]; +} DmChar02; // size = 0x2F4 + +extern const ActorInit Dm_Char02_InitVars; + +#endif // Z_DM_CHAR02_H diff --git a/src/overlays/actors/ovl_Dm_Char03/overlay.cfg b/src/overlays/actors/ovl_Dm_Char03/overlay.cfg new file mode 100644 index 0000000000..dd50d58fa1 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char03/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_Char03 +z_dm_char03.c diff --git a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c new file mode 100644 index 0000000000..9e5daf5779 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c @@ -0,0 +1,52 @@ +#include "z_dm_char03.h" + +#define FLAGS 0x00000030 + +#define THIS ((DmChar03*)thisx) + +void DmChar03_Init(Actor* thisx, GlobalContext* globalCtx); +void DmChar03_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmChar03_Update(Actor* thisx, GlobalContext* globalCtx); +void DmChar03_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_Char03_InitVars = { + ACTOR_DM_CHAR03, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_OSN, + sizeof(DmChar03), + (ActorFunc)DmChar03_Init, + (ActorFunc)DmChar03_Destroy, + (ActorFunc)DmChar03_Update, + (ActorFunc)DmChar03_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/func_80AAB4A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/DmChar03_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/DmChar03_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/func_80AAB5F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/func_80AAB644.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/func_80AAB700.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/func_80AAB710.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/func_80AAB838.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/DmChar03_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/func_80AAB974.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/func_80AAB990.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/func_80AAB9A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/DmChar03_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char03_0x80AAB4A0/func_80AABA84.asm") diff --git a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.h b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.h new file mode 100644 index 0000000000..60cc694db4 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_CHAR03_H +#define Z_DM_CHAR03_H + +#include + +struct DmChar03; + +typedef struct DmChar03 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x58]; +} DmChar03; // size = 0x19C + +extern const ActorInit Dm_Char03_InitVars; + +#endif // Z_DM_CHAR03_H diff --git a/src/overlays/actors/ovl_Dm_Char04/overlay.cfg b/src/overlays/actors/ovl_Dm_Char04/overlay.cfg new file mode 100644 index 0000000000..a8f5bd501e --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char04/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_Char04 +z_dm_char04.c diff --git a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c new file mode 100644 index 0000000000..6cef27de3d --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c @@ -0,0 +1,38 @@ +#include "z_dm_char04.h" + +#define FLAGS 0x00000030 + +#define THIS ((DmChar04*)thisx) + +void DmChar04_Init(Actor* thisx, GlobalContext* globalCtx); +void DmChar04_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmChar04_Update(Actor* thisx, GlobalContext* globalCtx); +void DmChar04_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_Char04_InitVars = { + ACTOR_DM_CHAR04, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(DmChar04), + (ActorFunc)DmChar04_Init, + (ActorFunc)DmChar04_Destroy, + (ActorFunc)DmChar04_Update, + (ActorFunc)DmChar04_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char04_0x80AABC40/func_80AABC40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char04_0x80AABC40/DmChar04_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char04_0x80AABC40/DmChar04_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char04_0x80AABC40/func_80AABE34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char04_0x80AABC40/DmChar04_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char04_0x80AABC40/func_80AABF74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char04_0x80AABC40/DmChar04_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.h b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.h new file mode 100644 index 0000000000..d21793ce55 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_CHAR04_H +#define Z_DM_CHAR04_H + +#include + +struct DmChar04; + +typedef struct DmChar04 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x120]; +} DmChar04; // size = 0x264 + +extern const ActorInit Dm_Char04_InitVars; + +#endif // Z_DM_CHAR04_H diff --git a/src/overlays/actors/ovl_Dm_Char05/overlay.cfg b/src/overlays/actors/ovl_Dm_Char05/overlay.cfg new file mode 100644 index 0000000000..cb8b10bcc2 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char05/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_Char05 +z_dm_char05.c diff --git a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c new file mode 100644 index 0000000000..5576c0be02 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c @@ -0,0 +1,100 @@ +#include "z_dm_char05.h" + +#define FLAGS 0x00000030 + +#define THIS ((DmChar05*)thisx) + +void DmChar05_Init(Actor* thisx, GlobalContext* globalCtx); +void DmChar05_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmChar05_Update(Actor* thisx, GlobalContext* globalCtx); +void DmChar05_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_Char05_InitVars = { + ACTOR_DM_CHAR05, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_DMASK, + sizeof(DmChar05), + (ActorFunc)DmChar05_Init, + (ActorFunc)DmChar05_Destroy, + (ActorFunc)DmChar05_Update, + (ActorFunc)DmChar05_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAC5A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAC63C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAC6E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAC770.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAC7FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAC888.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/DmChar05_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/DmChar05_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAC990.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAC9DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AACA98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AACAE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AACBE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AACC48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AACC6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AACCD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AACD0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AACD1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AACD68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AACE10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AACE5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AACF04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAD3F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAD450.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAD4A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/DmChar05_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAD964.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAD980.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAD998.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AADA90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AADB4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AADC00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/DmChar05_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AADD9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AADE78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AADF54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAE030.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char05_0x80AAC5A0/func_80AAE114.asm") diff --git a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.h b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.h new file mode 100644 index 0000000000..7edbfc73c5 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_CHAR05_H +#define Z_DM_CHAR05_H + +#include + +struct DmChar05; + +typedef struct DmChar05 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x74]; +} DmChar05; // size = 0x1B8 + +extern const ActorInit Dm_Char05_InitVars; + +#endif // Z_DM_CHAR05_H diff --git a/src/overlays/actors/ovl_Dm_Char06/overlay.cfg b/src/overlays/actors/ovl_Dm_Char06/overlay.cfg new file mode 100644 index 0000000000..8c0666c9b1 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char06/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_Char06 +z_dm_char06.c diff --git a/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c new file mode 100644 index 0000000000..afab20132b --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c @@ -0,0 +1,36 @@ +#include "z_dm_char06.h" + +#define FLAGS 0x00000030 + +#define THIS ((DmChar06*)thisx) + +void DmChar06_Init(Actor* thisx, GlobalContext* globalCtx); +void DmChar06_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmChar06_Update(Actor* thisx, GlobalContext* globalCtx); +void DmChar06_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_Char06_InitVars = { + ACTOR_DM_CHAR06, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_YUKIYAMA, + sizeof(DmChar06), + (ActorFunc)DmChar06_Init, + (ActorFunc)DmChar06_Destroy, + (ActorFunc)DmChar06_Update, + (ActorFunc)DmChar06_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char06_0x80AAE680/func_80AAE680.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char06_0x80AAE680/DmChar06_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char06_0x80AAE680/DmChar06_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char06_0x80AAE680/func_80AAE6F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char06_0x80AAE680/DmChar06_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char06_0x80AAE680/DmChar06_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.h b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.h new file mode 100644 index 0000000000..b72a5bae29 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_CHAR06_H +#define Z_DM_CHAR06_H + +#include + +struct DmChar06; + +typedef struct DmChar06 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x160]; +} DmChar06; // size = 0x2A4 + +extern const ActorInit Dm_Char06_InitVars; + +#endif // Z_DM_CHAR06_H diff --git a/src/overlays/actors/ovl_Dm_Char07/overlay.cfg b/src/overlays/actors/ovl_Dm_Char07/overlay.cfg new file mode 100644 index 0000000000..5b5ad5acd5 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char07/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_Char07 +z_dm_char07.c diff --git a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c new file mode 100644 index 0000000000..00c52fbc46 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c @@ -0,0 +1,36 @@ +#include "z_dm_char07.h" + +#define FLAGS 0x00000030 + +#define THIS ((DmChar07*)thisx) + +void DmChar07_Init(Actor* thisx, GlobalContext* globalCtx); +void DmChar07_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmChar07_Update(Actor* thisx, GlobalContext* globalCtx); +void DmChar07_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_Char07_InitVars = { + ACTOR_DM_CHAR07, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_MILKBAR, + sizeof(DmChar07), + (ActorFunc)DmChar07_Init, + (ActorFunc)DmChar07_Destroy, + (ActorFunc)DmChar07_Update, + (ActorFunc)DmChar07_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char07_0x80AAE9C0/func_80AAE9C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char07_0x80AAE9C0/DmChar07_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char07_0x80AAE9C0/DmChar07_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char07_0x80AAE9C0/func_80AAEABC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char07_0x80AAE9C0/DmChar07_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char07_0x80AAE9C0/DmChar07_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.h b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.h new file mode 100644 index 0000000000..a10ba75ef5 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_CHAR07_H +#define Z_DM_CHAR07_H + +#include + +struct DmChar07; + +typedef struct DmChar07 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x178]; +} DmChar07; // size = 0x2BC + +extern const ActorInit Dm_Char07_InitVars; + +#endif // Z_DM_CHAR07_H diff --git a/src/overlays/actors/ovl_Dm_Char08/overlay.cfg b/src/overlays/actors/ovl_Dm_Char08/overlay.cfg new file mode 100644 index 0000000000..5f69d0c826 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char08/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_Char08 +z_dm_char08.c diff --git a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c new file mode 100644 index 0000000000..2869f37f75 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c @@ -0,0 +1,78 @@ +#include "z_dm_char08.h" + +#define FLAGS 0x02000000 + +#define THIS ((DmChar08*)thisx) + +void DmChar08_Init(Actor* thisx, GlobalContext* globalCtx); +void DmChar08_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmChar08_Update(Actor* thisx, GlobalContext* globalCtx); +void DmChar08_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_Char08_InitVars = { + ACTOR_DM_CHAR08, + ACTORTYPE_BG, + FLAGS, + OBJECT_KAMEJIMA, + sizeof(DmChar08), + (ActorFunc)DmChar08_Init, + (ActorFunc)DmChar08_Destroy, + (ActorFunc)DmChar08_Update, + (ActorFunc)DmChar08_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAF050.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAF15C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/DmChar08_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/DmChar08_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAF610.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAF79C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAF884.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAF8F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAFA18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAFAC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAFAE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAFB04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAFB94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAFBA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAFCCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAFE78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AAFE88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AB01E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AB023C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AB032C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AB096C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AB0A10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/DmChar08_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AB0E3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AB0E7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/func_80AB0F90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char08_0x80AAF050/DmChar08_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.h b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.h new file mode 100644 index 0000000000..45e727ec62 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_CHAR08_H +#define Z_DM_CHAR08_H + +#include + +struct DmChar08; + +typedef struct DmChar08 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xC8]; +} DmChar08; // size = 0x20C + +extern const ActorInit Dm_Char08_InitVars; + +#endif // Z_DM_CHAR08_H diff --git a/src/overlays/actors/ovl_Dm_Char09/overlay.cfg b/src/overlays/actors/ovl_Dm_Char09/overlay.cfg new file mode 100644 index 0000000000..99eda9b12c --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char09/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_Char09 +z_dm_char09.c diff --git a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c new file mode 100644 index 0000000000..6ab09f31dd --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c @@ -0,0 +1,46 @@ +#include "z_dm_char09.h" + +#define FLAGS 0x00000030 + +#define THIS ((DmChar09*)thisx) + +void DmChar09_Init(Actor* thisx, GlobalContext* globalCtx); +void DmChar09_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmChar09_Update(Actor* thisx, GlobalContext* globalCtx); +void DmChar09_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_Char09_InitVars = { + ACTOR_DM_CHAR09, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_BEE, + sizeof(DmChar09), + (ActorFunc)DmChar09_Init, + (ActorFunc)DmChar09_Destroy, + (ActorFunc)DmChar09_Update, + (ActorFunc)DmChar09_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char09_0x80AB1E10/func_80AB1E10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char09_0x80AB1E10/DmChar09_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char09_0x80AB1E10/DmChar09_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char09_0x80AB1E10/func_80AB1FA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char09_0x80AB1E10/func_80AB1FDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char09_0x80AB1E10/func_80AB2258.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char09_0x80AB1E10/func_80AB2268.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char09_0x80AB1E10/func_80AB24BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char09_0x80AB1E10/DmChar09_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char09_0x80AB1E10/func_80AB25D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Char09_0x80AB1E10/DmChar09_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.h b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.h new file mode 100644 index 0000000000..6332e73977 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_CHAR09_H +#define Z_DM_CHAR09_H + +#include + +struct DmChar09; + +typedef struct DmChar09 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xEC]; +} DmChar09; // size = 0x230 + +extern const ActorInit Dm_Char09_InitVars; + +#endif // Z_DM_CHAR09_H diff --git a/src/overlays/actors/ovl_Dm_Gm/overlay.cfg b/src/overlays/actors/ovl_Dm_Gm/overlay.cfg new file mode 100644 index 0000000000..e12011867c --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Gm/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_Gm +z_dm_gm.c diff --git a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c new file mode 100644 index 0000000000..21287bb4bf --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c @@ -0,0 +1,53 @@ +#include "z_dm_gm.h" + +#define FLAGS 0x00000009 + +#define THIS ((DmGm*)thisx) + +void DmGm_Init(Actor* thisx, GlobalContext* globalCtx); +void DmGm_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmGm_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_Gm_InitVars = { + ACTOR_DM_GM, + ACTORTYPE_NPC, + FLAGS, + OBJECT_AN1, + sizeof(DmGm), + (ActorFunc)DmGm_Init, + (ActorFunc)DmGm_Destroy, + (ActorFunc)DmGm_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/func_80C24360.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/func_80C24428.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/func_80C24504.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/func_80C2457C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/func_80C2478C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/func_80C24838.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/func_80C248A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/func_80C24A00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/func_80C24BD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/DmGm_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/DmGm_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/DmGm_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/func_80C24CD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/func_80C24E4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Gm_0x80C24360/func_80C25000.asm") diff --git a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.h b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.h new file mode 100644 index 0000000000..6ef88ca618 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_GM_H +#define Z_DM_GM_H + +#include + +struct DmGm; + +typedef struct DmGm { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x194]; +} DmGm; // size = 0x2D8 + +extern const ActorInit Dm_Gm_InitVars; + +#endif // Z_DM_GM_H diff --git a/src/overlays/actors/ovl_Dm_Hina/overlay.cfg b/src/overlays/actors/ovl_Dm_Hina/overlay.cfg new file mode 100644 index 0000000000..824085b3ee --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Hina/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_Hina +z_dm_hina.c diff --git a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c new file mode 100644 index 0000000000..14aafcd206 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c @@ -0,0 +1,44 @@ +#include "z_dm_hina.h" + +#define FLAGS 0x00000030 + +#define THIS ((DmHina*)thisx) + +void DmHina_Init(Actor* thisx, GlobalContext* globalCtx); +void DmHina_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmHina_Update(Actor* thisx, GlobalContext* globalCtx); +void DmHina_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_Hina_InitVars = { + ACTOR_DM_HINA, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_BSMASK, + sizeof(DmHina), + (ActorFunc)DmHina_Init, + (ActorFunc)DmHina_Destroy, + (ActorFunc)DmHina_Update, + (ActorFunc)DmHina_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Hina_0x80A1F410/DmHina_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Hina_0x80A1F410/DmHina_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Hina_0x80A1F410/func_80A1F470.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Hina_0x80A1F410/func_80A1F56C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Hina_0x80A1F410/func_80A1F5AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Hina_0x80A1F410/func_80A1F63C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Hina_0x80A1F410/func_80A1F75C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Hina_0x80A1F410/DmHina_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Hina_0x80A1F410/func_80A1F9AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Hina_0x80A1F410/DmHina_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.h b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.h new file mode 100644 index 0000000000..6e73b57356 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_HINA_H +#define Z_DM_HINA_H + +#include + +struct DmHina; + +typedef struct DmHina { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x40]; +} DmHina; // size = 0x184 + +extern const ActorInit Dm_Hina_InitVars; + +#endif // Z_DM_HINA_H diff --git a/src/overlays/actors/ovl_Dm_Nb/overlay.cfg b/src/overlays/actors/ovl_Dm_Nb/overlay.cfg new file mode 100644 index 0000000000..7af01c8ccf --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Nb/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_Nb +z_dm_nb.c diff --git a/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c new file mode 100644 index 0000000000..86f29b8c6d --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c @@ -0,0 +1,38 @@ +#include "z_dm_nb.h" + +#define FLAGS 0x00000009 + +#define THIS ((DmNb*)thisx) + +void DmNb_Init(Actor* thisx, GlobalContext* globalCtx); +void DmNb_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmNb_Update(Actor* thisx, GlobalContext* globalCtx); +void DmNb_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_Nb_InitVars = { + ACTOR_DM_NB, + ACTORTYPE_NPC, + FLAGS, + OBJECT_NB, + sizeof(DmNb), + (ActorFunc)DmNb_Init, + (ActorFunc)DmNb_Destroy, + (ActorFunc)DmNb_Update, + (ActorFunc)DmNb_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Nb_0x80C1DED0/func_80C1DED0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Nb_0x80C1DED0/func_80C1DF18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Nb_0x80C1DED0/DmNb_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Nb_0x80C1DED0/DmNb_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Nb_0x80C1DED0/DmNb_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Nb_0x80C1DED0/func_80C1E168.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Nb_0x80C1DED0/DmNb_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.h b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.h new file mode 100644 index 0000000000..d6716621ee --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_NB_H +#define Z_DM_NB_H + +#include + +struct DmNb; + +typedef struct DmNb { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xB8]; +} DmNb; // size = 0x1FC + +extern const ActorInit Dm_Nb_InitVars; + +#endif // Z_DM_NB_H diff --git a/src/overlays/actors/ovl_Dm_Opstage/overlay.cfg b/src/overlays/actors/ovl_Dm_Opstage/overlay.cfg new file mode 100644 index 0000000000..17e40ea810 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Opstage/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_Opstage +z_dm_opstage.c diff --git a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c new file mode 100644 index 0000000000..bae4de7acd --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c @@ -0,0 +1,36 @@ +#include "z_dm_opstage.h" + +#define FLAGS 0x00000030 + +#define THIS ((DmOpstage*)thisx) + +void DmOpstage_Init(Actor* thisx, GlobalContext* globalCtx); +void DmOpstage_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmOpstage_Update(Actor* thisx, GlobalContext* globalCtx); +void DmOpstage_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_Opstage_InitVars = { + ACTOR_DM_OPSTAGE, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_KEIKOKU_DEMO, + sizeof(DmOpstage), + (ActorFunc)DmOpstage_Init, + (ActorFunc)DmOpstage_Destroy, + (ActorFunc)DmOpstage_Update, + (ActorFunc)DmOpstage_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Opstage_0x80A9F950/func_80A9F950.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Opstage_0x80A9F950/DmOpstage_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Opstage_0x80A9F950/DmOpstage_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Opstage_0x80A9F950/func_80A9FA58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Opstage_0x80A9F950/DmOpstage_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Opstage_0x80A9F950/DmOpstage_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.h b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.h new file mode 100644 index 0000000000..27aed840f5 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_OPSTAGE_H +#define Z_DM_OPSTAGE_H + +#include + +struct DmOpstage; + +typedef struct DmOpstage { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x6C]; +} DmOpstage; // size = 0x1B0 + +extern const ActorInit Dm_Opstage_InitVars; + +#endif // Z_DM_OPSTAGE_H diff --git a/src/overlays/actors/ovl_Dm_Ravine/overlay.cfg b/src/overlays/actors/ovl_Dm_Ravine/overlay.cfg new file mode 100644 index 0000000000..a3287c4077 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Ravine/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_Ravine +z_dm_ravine.c diff --git a/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c new file mode 100644 index 0000000000..3a9f7df277 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c @@ -0,0 +1,34 @@ +#include "z_dm_ravine.h" + +#define FLAGS 0x00000030 + +#define THIS ((DmRavine*)thisx) + +void DmRavine_Init(Actor* thisx, GlobalContext* globalCtx); +void DmRavine_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmRavine_Update(Actor* thisx, GlobalContext* globalCtx); +void DmRavine_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_Ravine_InitVars = { + ACTOR_DM_RAVINE, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_KEIKOKU_DEMO, + sizeof(DmRavine), + (ActorFunc)DmRavine_Init, + (ActorFunc)DmRavine_Destroy, + (ActorFunc)DmRavine_Update, + (ActorFunc)DmRavine_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ravine_0x80A2E7A0/DmRavine_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ravine_0x80A2E7A0/DmRavine_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ravine_0x80A2E7A0/func_80A2E838.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ravine_0x80A2E7A0/DmRavine_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Ravine_0x80A2E7A0/DmRavine_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.h b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.h new file mode 100644 index 0000000000..66b86ac17c --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_RAVINE_H +#define Z_DM_RAVINE_H + +#include + +struct DmRavine; + +typedef struct DmRavine { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x8]; +} DmRavine; // size = 0x14C + +extern const ActorInit Dm_Ravine_InitVars; + +#endif // Z_DM_RAVINE_H diff --git a/src/overlays/actors/ovl_Dm_Sa/overlay.cfg b/src/overlays/actors/ovl_Dm_Sa/overlay.cfg new file mode 100644 index 0000000000..3916c7965b --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Sa/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_Sa +z_dm_sa.c diff --git a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c new file mode 100644 index 0000000000..07d1691110 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c @@ -0,0 +1,46 @@ +#include "z_dm_sa.h" + +#define FLAGS 0x00000030 + +#define THIS ((DmSa*)thisx) + +void DmSa_Init(Actor* thisx, GlobalContext* globalCtx); +void DmSa_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmSa_Update(Actor* thisx, GlobalContext* globalCtx); +void DmSa_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_Sa_InitVars = { + ACTOR_DM_SA, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_STK, + sizeof(DmSa), + (ActorFunc)DmSa_Init, + (ActorFunc)DmSa_Destroy, + (ActorFunc)DmSa_Update, + (ActorFunc)DmSa_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Sa_0x80A2E960/func_80A2E960.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Sa_0x80A2E960/DmSa_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Sa_0x80A2E960/DmSa_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Sa_0x80A2E960/func_80A2EABC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Sa_0x80A2E960/DmSa_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Sa_0x80A2E960/func_80A2EB10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Sa_0x80A2E960/func_80A2EB2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Sa_0x80A2E960/func_80A2EB44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Sa_0x80A2E960/func_80A2EB58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Sa_0x80A2E960/func_80A2EBB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Sa_0x80A2E960/DmSa_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.h b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.h new file mode 100644 index 0000000000..c8f020c9a2 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_SA_H +#define Z_DM_SA_H + +#include + +struct DmSa; + +typedef struct DmSa { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1B0]; +} DmSa; // size = 0x2F4 + +extern const ActorInit Dm_Sa_InitVars; + +#endif // Z_DM_SA_H diff --git a/src/overlays/actors/ovl_Dm_Statue/overlay.cfg b/src/overlays/actors/ovl_Dm_Statue/overlay.cfg new file mode 100644 index 0000000000..d01c4284e0 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Statue/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_Statue +z_dm_statue.c diff --git a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c new file mode 100644 index 0000000000..cc00341968 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c @@ -0,0 +1,32 @@ +#include "z_dm_statue.h" + +#define FLAGS 0x04000030 + +#define THIS ((DmStatue*)thisx) + +void DmStatue_Init(Actor* thisx, GlobalContext* globalCtx); +void DmStatue_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmStatue_Update(Actor* thisx, GlobalContext* globalCtx); +void DmStatue_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_Statue_InitVars = { + ACTOR_DM_STATUE, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_SMTOWER, + sizeof(DmStatue), + (ActorFunc)DmStatue_Init, + (ActorFunc)DmStatue_Destroy, + (ActorFunc)DmStatue_Update, + (ActorFunc)DmStatue_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Statue_0x80A4C9B0/DmStatue_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Statue_0x80A4C9B0/DmStatue_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Statue_0x80A4C9B0/DmStatue_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Statue_0x80A4C9B0/DmStatue_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.h b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.h new file mode 100644 index 0000000000..82df0b8566 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_STATUE_H +#define Z_DM_STATUE_H + +#include + +struct DmStatue; + +typedef struct DmStatue { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x50]; +} DmStatue; // size = 0x194 + +extern const ActorInit Dm_Statue_InitVars; + +#endif // Z_DM_STATUE_H diff --git a/src/overlays/actors/ovl_Dm_Stk/overlay.cfg b/src/overlays/actors/ovl_Dm_Stk/overlay.cfg new file mode 100644 index 0000000000..6282311226 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Stk/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_Stk +z_dm_stk.c diff --git a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c new file mode 100644 index 0000000000..57ac055aef --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c @@ -0,0 +1,110 @@ +#include "z_dm_stk.h" + +#define FLAGS 0x02000030 + +#define THIS ((DmStk*)thisx) + +void DmStk_Init(Actor* thisx, GlobalContext* globalCtx); +void DmStk_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmStk_Update(Actor* thisx, GlobalContext* globalCtx); +void DmStk_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_Stk_InitVars = { + ACTOR_DM_STK, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_STK, + sizeof(DmStk), + (ActorFunc)DmStk_Init, + (ActorFunc)DmStk_Destroy, + (ActorFunc)DmStk_Update, + (ActorFunc)DmStk_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80A9FDB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80A9FE3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80A9FED8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA00CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA0100.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA0158.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA01C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA0264.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA0420.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA05F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA0634.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA066C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA071C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA076C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA09DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA0B08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA0DA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA0E1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA0E90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/DmStk_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/DmStk_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA16F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA1704.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA1714.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA17F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA18D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA192C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA1998.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA19EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA1A50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA1AC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA1AF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA1B9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA1C64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA1D1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA26CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA2720.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA27EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/DmStk_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA2B14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA2BC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/func_80AA33A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Stk_0x80A9FDB0/DmStk_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h new file mode 100644 index 0000000000..ead3785134 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_STK_H +#define Z_DM_STK_H + +#include + +struct DmStk; + +typedef struct DmStk { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1F8]; +} DmStk; // size = 0x33C + +extern const ActorInit Dm_Stk_InitVars; + +#endif // Z_DM_STK_H diff --git a/src/overlays/actors/ovl_Dm_Tag/overlay.cfg b/src/overlays/actors/ovl_Dm_Tag/overlay.cfg new file mode 100644 index 0000000000..e1895969ed --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Tag/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_Tag +z_dm_tag.c diff --git a/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c new file mode 100644 index 0000000000..2fcfbd072e --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c @@ -0,0 +1,49 @@ +#include "z_dm_tag.h" + +#define FLAGS 0x00000010 + +#define THIS ((DmTag*)thisx) + +void DmTag_Init(Actor* thisx, GlobalContext* globalCtx); +void DmTag_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmTag_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_Tag_InitVars = { + ACTOR_DM_TAG, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(DmTag), + (ActorFunc)DmTag_Init, + (ActorFunc)DmTag_Destroy, + (ActorFunc)DmTag_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/func_80C22350.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/func_80C22400.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/func_80C2247C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/func_80C224D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/func_80C227E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/func_80C22880.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/func_80C2291C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/func_80C229AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/func_80C229EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/func_80C229FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/DmTag_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/DmTag_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tag_0x80C22350/DmTag_Update.asm") diff --git a/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.h b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.h new file mode 100644 index 0000000000..9e6a3e3373 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_TAG_H +#define Z_DM_TAG_H + +#include + +struct DmTag; + +typedef struct DmTag { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x68]; +} DmTag; // size = 0x1AC + +extern const ActorInit Dm_Tag_InitVars; + +#endif // Z_DM_TAG_H diff --git a/src/overlays/actors/ovl_Dm_Tsg/overlay.cfg b/src/overlays/actors/ovl_Dm_Tsg/overlay.cfg new file mode 100644 index 0000000000..cf5632fbbf --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Tsg/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_Tsg +z_dm_tsg.c diff --git a/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c new file mode 100644 index 0000000000..faa3cacc7f --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c @@ -0,0 +1,32 @@ +#include "z_dm_tsg.h" + +#define FLAGS 0x00000030 + +#define THIS ((DmTsg*)thisx) + +void DmTsg_Init(Actor* thisx, GlobalContext* globalCtx); +void DmTsg_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmTsg_Update(Actor* thisx, GlobalContext* globalCtx); +void DmTsg_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_Tsg_InitVars = { + ACTOR_DM_TSG, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_OPEN_OBJ, + sizeof(DmTsg), + (ActorFunc)DmTsg_Init, + (ActorFunc)DmTsg_Destroy, + (ActorFunc)DmTsg_Update, + (ActorFunc)DmTsg_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tsg_0x80A3AC60/DmTsg_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tsg_0x80A3AC60/DmTsg_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tsg_0x80A3AC60/DmTsg_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Tsg_0x80A3AC60/DmTsg_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.h b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.h new file mode 100644 index 0000000000..9b383ecaef --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_TSG_H +#define Z_DM_TSG_H + +#include + +struct DmTsg; + +typedef struct DmTsg { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x7DC]; +} DmTsg; // size = 0x920 + +extern const ActorInit Dm_Tsg_InitVars; + +#endif // Z_DM_TSG_H diff --git a/src/overlays/actors/ovl_Dm_Zl/overlay.cfg b/src/overlays/actors/ovl_Dm_Zl/overlay.cfg new file mode 100644 index 0000000000..5411031276 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Zl/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Dm_Zl +z_dm_zl.c diff --git a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c new file mode 100644 index 0000000000..63a58ef0da --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c @@ -0,0 +1,44 @@ +#include "z_dm_zl.h" + +#define FLAGS 0x00000010 + +#define THIS ((DmZl*)thisx) + +void DmZl_Init(Actor* thisx, GlobalContext* globalCtx); +void DmZl_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DmZl_Update(Actor* thisx, GlobalContext* globalCtx); +void DmZl_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Dm_Zl_InitVars = { + ACTOR_DM_ZL, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_ZL4, + sizeof(DmZl), + (ActorFunc)DmZl_Init, + (ActorFunc)DmZl_Destroy, + (ActorFunc)DmZl_Update, + (ActorFunc)DmZl_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Zl_0x80A38190/func_80A38190.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Zl_0x80A38190/DmZl_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Zl_0x80A38190/DmZl_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Zl_0x80A38190/func_80A382FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Zl_0x80A38190/func_80A3830C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Zl_0x80A38190/func_80A38468.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Zl_0x80A38190/DmZl_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Zl_0x80A38190/func_80A3862C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Zl_0x80A38190/func_80A38648.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Dm_Zl_0x80A38190/DmZl_Draw.asm") diff --git a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.h b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.h new file mode 100644 index 0000000000..d617d39038 --- /dev/null +++ b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.h @@ -0,0 +1,15 @@ +#ifndef Z_DM_ZL_H +#define Z_DM_ZL_H + +#include + +struct DmZl; + +typedef struct DmZl { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x190]; +} DmZl; // size = 0x2D4 + +extern const ActorInit Dm_Zl_InitVars; + +#endif // Z_DM_ZL_H diff --git a/src/overlays/actors/ovl_Door_Ana/overlay.cfg b/src/overlays/actors/ovl_Door_Ana/overlay.cfg new file mode 100644 index 0000000000..cb3d1a5fd9 --- /dev/null +++ b/src/overlays/actors/ovl_Door_Ana/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Door_Ana +z_door_ana.c diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c new file mode 100644 index 0000000000..997154f833 --- /dev/null +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -0,0 +1,40 @@ +#include "z_door_ana.h" + +#define FLAGS 0x02000000 + +#define THIS ((DoorAna*)thisx) + +void DoorAna_Init(Actor* thisx, GlobalContext* globalCtx); +void DoorAna_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DoorAna_Update(Actor* thisx, GlobalContext* globalCtx); +void DoorAna_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Door_Ana_InitVars = { + ACTOR_DOOR_ANA, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_FIELD_KEEP, + sizeof(DoorAna), + (ActorFunc)DoorAna_Init, + (ActorFunc)DoorAna_Destroy, + (ActorFunc)DoorAna_Update, + (ActorFunc)DoorAna_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Ana_0x808E01A0/func_808E01A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Ana_0x808E01A0/DoorAna_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Ana_0x808E01A0/DoorAna_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Ana_0x808E01A0/func_808E02A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Ana_0x808E01A0/func_808E03B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Ana_0x808E01A0/func_808E05C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Ana_0x808E01A0/DoorAna_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Ana_0x808E01A0/DoorAna_Draw.asm") diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.h b/src/overlays/actors/ovl_Door_Ana/z_door_ana.h new file mode 100644 index 0000000000..b307ce7fe0 --- /dev/null +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.h @@ -0,0 +1,15 @@ +#ifndef Z_DOOR_ANA_H +#define Z_DOOR_ANA_H + +#include + +struct DoorAna; + +typedef struct DoorAna { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x50]; +} DoorAna; // size = 0x194 + +extern const ActorInit Door_Ana_InitVars; + +#endif // Z_DOOR_ANA_H diff --git a/src/overlays/actors/ovl_Door_Shutter/overlay.cfg b/src/overlays/actors/ovl_Door_Shutter/overlay.cfg new file mode 100644 index 0000000000..f3b63c1cc9 --- /dev/null +++ b/src/overlays/actors/ovl_Door_Shutter/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Door_Shutter +z_door_shutter.c diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c new file mode 100644 index 0000000000..2fc43a42cd --- /dev/null +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -0,0 +1,73 @@ +#include "z_door_shutter.h" + +#define FLAGS 0x00000010 + +#define THIS ((DoorShutter*)thisx) + +void DoorShutter_Init(Actor* thisx, GlobalContext* globalCtx); +void DoorShutter_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DoorShutter_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Door_Shutter_InitVars = { + ACTOR_DOOR_SHUTTER, + ACTORTYPE_DOOR, + FLAGS, + GAMEPLAY_KEEP, + sizeof(DoorShutter), + (ActorFunc)DoorShutter_Init, + (ActorFunc)DoorShutter_Destroy, + (ActorFunc)DoorShutter_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A08F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A0900.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A0974.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/DoorShutter_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/DoorShutter_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A0D0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A0D90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A0E28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A0F88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1080.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1090.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1288.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1340.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1478.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1548.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1618.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1684.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1784.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1884.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1A70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1B48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1C50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/DoorShutter_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1D68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Shutter_0x808A08F0/func_808A1E14.asm") diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h new file mode 100644 index 0000000000..2f3757c7fe --- /dev/null +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h @@ -0,0 +1,15 @@ +#ifndef Z_DOOR_SHUTTER_H +#define Z_DOOR_SHUTTER_H + +#include + +struct DoorShutter; + +typedef struct DoorShutter { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2C]; +} DoorShutter; // size = 0x170 + +extern const ActorInit Door_Shutter_InitVars; + +#endif // Z_DOOR_SHUTTER_H diff --git a/src/overlays/actors/ovl_Door_Spiral/overlay.cfg b/src/overlays/actors/ovl_Door_Spiral/overlay.cfg new file mode 100644 index 0000000000..f33e851b57 --- /dev/null +++ b/src/overlays/actors/ovl_Door_Spiral/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Door_Spiral +z_door_spiral.c diff --git a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c new file mode 100644 index 0000000000..07e106167b --- /dev/null +++ b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c @@ -0,0 +1,48 @@ +#include "z_door_spiral.h" + +#define FLAGS 0x00000010 + +#define THIS ((DoorSpiral*)thisx) + +void DoorSpiral_Init(Actor* thisx, GlobalContext* globalCtx); +void DoorSpiral_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DoorSpiral_Update(Actor* thisx, GlobalContext* globalCtx); +void DoorSpiral_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Door_Spiral_InitVars = { + ACTOR_DOOR_SPIRAL, + ACTORTYPE_DOOR, + FLAGS, + GAMEPLAY_KEEP, + sizeof(DoorSpiral), + (ActorFunc)DoorSpiral_Init, + (ActorFunc)DoorSpiral_Destroy, + (ActorFunc)DoorSpiral_Update, + (ActorFunc)DoorSpiral_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Spiral_0x809A2B60/func_809A2B60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Spiral_0x809A2B60/func_809A2B70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Spiral_0x809A2B60/func_809A2BF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Spiral_0x809A2B60/DoorSpiral_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Spiral_0x809A2B60/DoorSpiral_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Spiral_0x809A2B60/func_809A2DB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Spiral_0x809A2B60/func_809A2E08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Spiral_0x809A2B60/func_809A2EA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Spiral_0x809A2B60/func_809A2FF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Spiral_0x809A2B60/func_809A3098.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Spiral_0x809A2B60/DoorSpiral_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Spiral_0x809A2B60/DoorSpiral_Draw.asm") diff --git a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.h b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.h new file mode 100644 index 0000000000..a84d28f98d --- /dev/null +++ b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.h @@ -0,0 +1,15 @@ +#ifndef Z_DOOR_SPIRAL_H +#define Z_DOOR_SPIRAL_H + +#include + +struct DoorSpiral; + +typedef struct DoorSpiral { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xC]; +} DoorSpiral; // size = 0x150 + +extern const ActorInit Door_Spiral_InitVars; + +#endif // Z_DOOR_SPIRAL_H diff --git a/src/overlays/actors/ovl_Door_Warp1/overlay.cfg b/src/overlays/actors/ovl_Door_Warp1/overlay.cfg new file mode 100644 index 0000000000..7646036548 --- /dev/null +++ b/src/overlays/actors/ovl_Door_Warp1/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Door_Warp1 +z_door_warp1.c diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c new file mode 100644 index 0000000000..9505cdb859 --- /dev/null +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -0,0 +1,106 @@ +#include "z_door_warp1.h" + +#define FLAGS 0x00000000 + +#define THIS ((DoorWarp1*)thisx) + +void DoorWarp1_Init(Actor* thisx, GlobalContext* globalCtx); +void DoorWarp1_Destroy(Actor* thisx, GlobalContext* globalCtx); +void DoorWarp1_Update(Actor* thisx, GlobalContext* globalCtx); +void DoorWarp1_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Door_Warp1_InitVars = { + ACTOR_DOOR_WARP1, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_WARP1, + sizeof(DoorWarp1), + (ActorFunc)DoorWarp1_Init, + (ActorFunc)DoorWarp1_Destroy, + (ActorFunc)DoorWarp1_Update, + (ActorFunc)DoorWarp1_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B8490.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B849C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B8568.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B866C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/DoorWarp1_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/DoorWarp1_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B8924.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B8A7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B8C48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B8E78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B900C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B9094.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B90CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B921C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B93A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B94A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B9524.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B958C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B96A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B96B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B977C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B9840.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B98A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B9B30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B9BE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B9CE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B9E94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B9ED8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B9F10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808B9FD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808BA10C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808BA550.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808BAAF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808BABF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/DoorWarp1_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808BACCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808BAE9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808BB4C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808BB4F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/DoorWarp1_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Door_Warp1_0x808B8490/func_808BB8D4.asm") diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h new file mode 100644 index 0000000000..7cc84da79b --- /dev/null +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h @@ -0,0 +1,15 @@ +#ifndef Z_DOOR_WARP1_H +#define Z_DOOR_WARP1_H + +#include + +struct DoorWarp1; + +typedef struct DoorWarp1 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xC8]; +} DoorWarp1; // size = 0x20C + +extern const ActorInit Door_Warp1_InitVars; + +#endif // Z_DOOR_WARP1_H diff --git a/src/overlays/actors/ovl_Eff_Change/overlay.cfg b/src/overlays/actors/ovl_Eff_Change/overlay.cfg new file mode 100644 index 0000000000..6ab11cfbd9 --- /dev/null +++ b/src/overlays/actors/ovl_Eff_Change/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Eff_Change +z_eff_change.c diff --git a/src/overlays/actors/ovl_Eff_Change/z_eff_change.c b/src/overlays/actors/ovl_Eff_Change/z_eff_change.c new file mode 100644 index 0000000000..f594876dfe --- /dev/null +++ b/src/overlays/actors/ovl_Eff_Change/z_eff_change.c @@ -0,0 +1,35 @@ +#include "z_eff_change.h" + +#define FLAGS 0x00000010 + +#define THIS ((EffChange*)thisx) + +void EffChange_Init(Actor* thisx, GlobalContext* globalCtx); +void EffChange_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EffChange_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Eff_Change_InitVars = { + ACTOR_EFF_CHANGE, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EffChange), + (ActorFunc)EffChange_Init, + (ActorFunc)EffChange_Destroy, + (ActorFunc)EffChange_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Change_0x80A4C490/EffChange_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Change_0x80A4C490/EffChange_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Change_0x80A4C490/func_80A4C578.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Change_0x80A4C490/func_80A4C5CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Change_0x80A4C490/EffChange_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Change_0x80A4C490/func_80A4C7B0.asm") diff --git a/src/overlays/actors/ovl_Eff_Change/z_eff_change.h b/src/overlays/actors/ovl_Eff_Change/z_eff_change.h new file mode 100644 index 0000000000..867e3b785c --- /dev/null +++ b/src/overlays/actors/ovl_Eff_Change/z_eff_change.h @@ -0,0 +1,15 @@ +#ifndef Z_EFF_CHANGE_H +#define Z_EFF_CHANGE_H + +#include + +struct EffChange; + +typedef struct EffChange { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x88]; +} EffChange; // size = 0x1CC + +extern const ActorInit Eff_Change_InitVars; + +#endif // Z_EFF_CHANGE_H diff --git a/src/overlays/actors/ovl_Eff_Dust/overlay.cfg b/src/overlays/actors/ovl_Eff_Dust/overlay.cfg new file mode 100644 index 0000000000..2833a83d08 --- /dev/null +++ b/src/overlays/actors/ovl_Eff_Dust/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Eff_Dust +z_eff_dust.c diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c new file mode 100644 index 0000000000..0a6fb1a91f --- /dev/null +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -0,0 +1,44 @@ +#include "z_eff_dust.h" + +#define FLAGS 0x00000030 + +#define THIS ((EffDust*)thisx) + +void EffDust_Init(Actor* thisx, GlobalContext* globalCtx); +void EffDust_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EffDust_Update(Actor* thisx, GlobalContext* globalCtx); +void EffDust_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Eff_Dust_InitVars = { + ACTOR_EFF_DUST, + ACTORTYPE_NPC, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EffDust), + (ActorFunc)EffDust_Init, + (ActorFunc)EffDust_Destroy, + (ActorFunc)EffDust_Update, + (ActorFunc)EffDust_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Dust_0x80918B40/func_80918B40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Dust_0x80918B40/EffDust_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Dust_0x80918B40/EffDust_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Dust_0x80918B40/func_80918D64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Dust_0x80918B40/func_80918FE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Dust_0x80918B40/func_80919230.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Dust_0x80918B40/EffDust_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Dust_0x80918B40/func_80919768.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Dust_0x80918B40/func_809199FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Dust_0x80918B40/EffDust_Draw.asm") diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h new file mode 100644 index 0000000000..1db346907f --- /dev/null +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h @@ -0,0 +1,15 @@ +#ifndef Z_EFF_DUST_H +#define Z_EFF_DUST_H + +#include + +struct EffDust; + +typedef struct EffDust { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x41C]; +} EffDust; // size = 0x560 + +extern const ActorInit Eff_Dust_InitVars; + +#endif // Z_EFF_DUST_H diff --git a/src/overlays/actors/ovl_Eff_Kamejima_Wave/overlay.cfg b/src/overlays/actors/ovl_Eff_Kamejima_Wave/overlay.cfg new file mode 100644 index 0000000000..7decfb871b --- /dev/null +++ b/src/overlays/actors/ovl_Eff_Kamejima_Wave/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Eff_Kamejima_Wave +z_eff_kamejima_wave.c diff --git a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c new file mode 100644 index 0000000000..8661432faf --- /dev/null +++ b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c @@ -0,0 +1,41 @@ +#include "z_eff_kamejima_wave.h" + +#define FLAGS 0x00000010 + +#define THIS ((EffKamejimaWave*)thisx) + +void EffKamejimaWave_Init(Actor* thisx, GlobalContext* globalCtx); +void EffKamejimaWave_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EffKamejimaWave_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Eff_Kamejima_Wave_InitVars = { + ACTOR_EFF_KAMEJIMA_WAVE, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_KAMEJIMA, + sizeof(EffKamejimaWave), + (ActorFunc)EffKamejimaWave_Init, + (ActorFunc)EffKamejimaWave_Destroy, + (ActorFunc)EffKamejimaWave_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Kamejima_Wave_0x80BCEB20/EffKamejimaWave_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Kamejima_Wave_0x80BCEB20/EffKamejimaWave_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Kamejima_Wave_0x80BCEB20/func_80BCEBC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Kamejima_Wave_0x80BCEB20/func_80BCEC6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Kamejima_Wave_0x80BCEB20/func_80BCED34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Kamejima_Wave_0x80BCEB20/func_80BCEDE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Kamejima_Wave_0x80BCEB20/EffKamejimaWave_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Kamejima_Wave_0x80BCEB20/func_80BCEEBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Kamejima_Wave_0x80BCEB20/func_80BCEF0C.asm") diff --git a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.h b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.h new file mode 100644 index 0000000000..0a4c476f14 --- /dev/null +++ b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.h @@ -0,0 +1,15 @@ +#ifndef Z_EFF_KAMEJIMA_WAVE_H +#define Z_EFF_KAMEJIMA_WAVE_H + +#include + +struct EffKamejimaWave; + +typedef struct EffKamejimaWave { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xC]; +} EffKamejimaWave; // size = 0x150 + +extern const ActorInit Eff_Kamejima_Wave_InitVars; + +#endif // Z_EFF_KAMEJIMA_WAVE_H diff --git a/src/overlays/actors/ovl_Eff_Lastday/overlay.cfg b/src/overlays/actors/ovl_Eff_Lastday/overlay.cfg new file mode 100644 index 0000000000..8e1cc8e1d8 --- /dev/null +++ b/src/overlays/actors/ovl_Eff_Lastday/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Eff_Lastday +z_eff_lastday.c diff --git a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c new file mode 100644 index 0000000000..0aea5fb1d7 --- /dev/null +++ b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c @@ -0,0 +1,42 @@ +#include "z_eff_lastday.h" + +#define FLAGS 0x00000030 + +#define THIS ((EffLastday*)thisx) + +void EffLastday_Init(Actor* thisx, GlobalContext* globalCtx); +void EffLastday_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EffLastday_Update(Actor* thisx, GlobalContext* globalCtx); +void EffLastday_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Eff_Lastday_InitVars = { + ACTOR_EFF_LASTDAY, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_LASTDAY, + sizeof(EffLastday), + (ActorFunc)EffLastday_Init, + (ActorFunc)EffLastday_Destroy, + (ActorFunc)EffLastday_Update, + (ActorFunc)EffLastday_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Lastday_0x80BEBAC0/EffLastday_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Lastday_0x80BEBAC0/EffLastday_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Lastday_0x80BEBAC0/func_80BEBD0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Lastday_0x80BEBAC0/func_80BEBDF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Lastday_0x80BEBAC0/func_80BEBEB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Lastday_0x80BEBAC0/func_80BEBF78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Lastday_0x80BEBAC0/EffLastday_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Lastday_0x80BEBAC0/func_80BEC0A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Lastday_0x80BEBAC0/EffLastday_Draw.asm") diff --git a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.h b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.h new file mode 100644 index 0000000000..eea5aed8aa --- /dev/null +++ b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.h @@ -0,0 +1,15 @@ +#ifndef Z_EFF_LASTDAY_H +#define Z_EFF_LASTDAY_H + +#include + +struct EffLastday; + +typedef struct EffLastday { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x14]; +} EffLastday; // size = 0x158 + +extern const ActorInit Eff_Lastday_InitVars; + +#endif // Z_EFF_LASTDAY_H diff --git a/src/overlays/actors/ovl_Eff_Stk/overlay.cfg b/src/overlays/actors/ovl_Eff_Stk/overlay.cfg new file mode 100644 index 0000000000..725fd80b3e --- /dev/null +++ b/src/overlays/actors/ovl_Eff_Stk/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Eff_Stk +z_eff_stk.c diff --git a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c new file mode 100644 index 0000000000..455534c2af --- /dev/null +++ b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c @@ -0,0 +1,34 @@ +#include "z_eff_stk.h" + +#define FLAGS 0x00000030 + +#define THIS ((EffStk*)thisx) + +void EffStk_Init(Actor* thisx, GlobalContext* globalCtx); +void EffStk_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EffStk_Update(Actor* thisx, GlobalContext* globalCtx); +void EffStk_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Eff_Stk_InitVars = { + ACTOR_EFF_STK, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_STK2, + sizeof(EffStk), + (ActorFunc)EffStk_Init, + (ActorFunc)EffStk_Destroy, + (ActorFunc)EffStk_Update, + (ActorFunc)EffStk_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Stk_0x80BF0D90/EffStk_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Stk_0x80BF0D90/EffStk_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Stk_0x80BF0D90/func_80BF0DE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Stk_0x80BF0D90/EffStk_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Stk_0x80BF0D90/EffStk_Draw.asm") diff --git a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.h b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.h new file mode 100644 index 0000000000..c3479ff179 --- /dev/null +++ b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.h @@ -0,0 +1,15 @@ +#ifndef Z_EFF_STK_H +#define Z_EFF_STK_H + +#include + +struct EffStk; + +typedef struct EffStk { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xC]; +} EffStk; // size = 0x150 + +extern const ActorInit Eff_Stk_InitVars; + +#endif // Z_EFF_STK_H diff --git a/src/overlays/actors/ovl_Eff_Zoraband/overlay.cfg b/src/overlays/actors/ovl_Eff_Zoraband/overlay.cfg new file mode 100644 index 0000000000..57858dabd2 --- /dev/null +++ b/src/overlays/actors/ovl_Eff_Zoraband/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Eff_Zoraband +z_eff_zoraband.c diff --git a/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c new file mode 100644 index 0000000000..2dff83c03a --- /dev/null +++ b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c @@ -0,0 +1,34 @@ +#include "z_eff_zoraband.h" + +#define FLAGS 0x00000030 + +#define THIS ((EffZoraband*)thisx) + +void EffZoraband_Init(Actor* thisx, GlobalContext* globalCtx); +void EffZoraband_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EffZoraband_Update(Actor* thisx, GlobalContext* globalCtx); +void EffZoraband_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Eff_Zoraband_InitVars = { + ACTOR_EFF_ZORABAND, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_ZORABAND, + sizeof(EffZoraband), + (ActorFunc)EffZoraband_Init, + (ActorFunc)EffZoraband_Destroy, + (ActorFunc)EffZoraband_Update, + (ActorFunc)EffZoraband_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Zoraband_0x80C07740/EffZoraband_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Zoraband_0x80C07740/EffZoraband_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Zoraband_0x80C07740/func_80C07790.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Zoraband_0x80C07740/EffZoraband_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Eff_Zoraband_0x80C07740/EffZoraband_Draw.asm") diff --git a/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.h b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.h new file mode 100644 index 0000000000..aa3aad98a0 --- /dev/null +++ b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.h @@ -0,0 +1,15 @@ +#ifndef Z_EFF_ZORABAND_H +#define Z_EFF_ZORABAND_H + +#include + +struct EffZoraband; + +typedef struct EffZoraband { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x8]; +} EffZoraband; // size = 0x14C + +extern const ActorInit Eff_Zoraband_InitVars; + +#endif // Z_EFF_ZORABAND_H diff --git a/src/overlays/actors/ovl_Elf_Msg/overlay.cfg b/src/overlays/actors/ovl_Elf_Msg/overlay.cfg new file mode 100644 index 0000000000..91ab171571 --- /dev/null +++ b/src/overlays/actors/ovl_Elf_Msg/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Elf_Msg +z_elf_msg.c diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c new file mode 100644 index 0000000000..294aaf3f1b --- /dev/null +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -0,0 +1,39 @@ +#include "z_elf_msg.h" + +#define FLAGS 0x00000010 + +#define THIS ((ElfMsg*)thisx) + +void ElfMsg_Init(Actor* thisx, GlobalContext* globalCtx); +void ElfMsg_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ElfMsg_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Elf_Msg_InitVars = { + ACTOR_ELF_MSG, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ElfMsg), + (ActorFunc)ElfMsg_Init, + (ActorFunc)ElfMsg_Destroy, + (ActorFunc)ElfMsg_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg_0x8092DF90/func_8092DF90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg_0x8092DF90/func_8092DF9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg_0x8092DF90/ElfMsg_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg_0x8092DF90/ElfMsg_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg_0x8092DF90/func_8092E1D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg_0x8092DF90/func_8092E1FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg_0x8092DF90/func_8092E284.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg_0x8092DF90/ElfMsg_Update.asm") diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h new file mode 100644 index 0000000000..9e90b2eb04 --- /dev/null +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h @@ -0,0 +1,15 @@ +#ifndef Z_ELF_MSG_H +#define Z_ELF_MSG_H + +#include + +struct ElfMsg; + +typedef struct ElfMsg { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4]; +} ElfMsg; // size = 0x148 + +extern const ActorInit Elf_Msg_InitVars; + +#endif // Z_ELF_MSG_H diff --git a/src/overlays/actors/ovl_Elf_Msg2/overlay.cfg b/src/overlays/actors/ovl_Elf_Msg2/overlay.cfg new file mode 100644 index 0000000000..15a73db5de --- /dev/null +++ b/src/overlays/actors/ovl_Elf_Msg2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Elf_Msg2 +z_elf_msg2.c diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c new file mode 100644 index 0000000000..7bc304ed8c --- /dev/null +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -0,0 +1,41 @@ +#include "z_elf_msg2.h" + +#define FLAGS 0x00000010 + +#define THIS ((ElfMsg2*)thisx) + +void ElfMsg2_Init(Actor* thisx, GlobalContext* globalCtx); +void ElfMsg2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ElfMsg2_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Elf_Msg2_InitVars = { + ACTOR_ELF_MSG2, + ACTORTYPE_BG, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ElfMsg2), + (ActorFunc)ElfMsg2_Init, + (ActorFunc)ElfMsg2_Destroy, + (ActorFunc)ElfMsg2_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg2_0x8096EC40/func_8096EC40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg2_0x8096EC40/func_8096EC4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg2_0x8096EC40/ElfMsg2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg2_0x8096EC40/ElfMsg2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg2_0x8096EC40/func_8096EE50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg2_0x8096EC40/func_8096EE64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg2_0x8096EC40/func_8096EF98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg2_0x8096EC40/func_8096EFD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg2_0x8096EC40/ElfMsg2_Update.asm") diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h new file mode 100644 index 0000000000..5a91815ee7 --- /dev/null +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h @@ -0,0 +1,15 @@ +#ifndef Z_ELF_MSG2_H +#define Z_ELF_MSG2_H + +#include + +struct ElfMsg2; + +typedef struct ElfMsg2 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4]; +} ElfMsg2; // size = 0x148 + +extern const ActorInit Elf_Msg2_InitVars; + +#endif // Z_ELF_MSG2_H diff --git a/src/overlays/actors/ovl_Elf_Msg3/overlay.cfg b/src/overlays/actors/ovl_Elf_Msg3/overlay.cfg new file mode 100644 index 0000000000..e39f7e2901 --- /dev/null +++ b/src/overlays/actors/ovl_Elf_Msg3/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Elf_Msg3 +z_elf_msg3.c diff --git a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c new file mode 100644 index 0000000000..7d73219621 --- /dev/null +++ b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c @@ -0,0 +1,37 @@ +#include "z_elf_msg3.h" + +#define FLAGS 0x00000010 + +#define THIS ((ElfMsg3*)thisx) + +void ElfMsg3_Init(Actor* thisx, GlobalContext* globalCtx); +void ElfMsg3_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ElfMsg3_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Elf_Msg3_InitVars = { + ACTOR_ELF_MSG3, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ElfMsg3), + (ActorFunc)ElfMsg3_Init, + (ActorFunc)ElfMsg3_Destroy, + (ActorFunc)ElfMsg3_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg3_0x80A2CD10/func_80A2CD10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg3_0x80A2CD10/func_80A2CD1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg3_0x80A2CD10/ElfMsg3_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg3_0x80A2CD10/ElfMsg3_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg3_0x80A2CD10/func_80A2CF50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg3_0x80A2CD10/func_80A2CF7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg3_0x80A2CD10/ElfMsg3_Update.asm") diff --git a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.h b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.h new file mode 100644 index 0000000000..1b1fd59846 --- /dev/null +++ b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.h @@ -0,0 +1,15 @@ +#ifndef Z_ELF_MSG3_H +#define Z_ELF_MSG3_H + +#include + +struct ElfMsg3; + +typedef struct ElfMsg3 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4]; +} ElfMsg3; // size = 0x148 + +extern const ActorInit Elf_Msg3_InitVars; + +#endif // Z_ELF_MSG3_H diff --git a/src/overlays/actors/ovl_Elf_Msg4/overlay.cfg b/src/overlays/actors/ovl_Elf_Msg4/overlay.cfg new file mode 100644 index 0000000000..2bfe9ff86c --- /dev/null +++ b/src/overlays/actors/ovl_Elf_Msg4/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Elf_Msg4 +z_elf_msg4.c diff --git a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c new file mode 100644 index 0000000000..8fb2bc743c --- /dev/null +++ b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c @@ -0,0 +1,39 @@ +#include "z_elf_msg4.h" + +#define FLAGS 0x00000010 + +#define THIS ((ElfMsg4*)thisx) + +void ElfMsg4_Init(Actor* thisx, GlobalContext* globalCtx); +void ElfMsg4_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ElfMsg4_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Elf_Msg4_InitVars = { + ACTOR_ELF_MSG4, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ElfMsg4), + (ActorFunc)ElfMsg4_Init, + (ActorFunc)ElfMsg4_Destroy, + (ActorFunc)ElfMsg4_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg4_0x80AFD380/func_80AFD380.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg4_0x80AFD380/ElfMsg4_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg4_0x80AFD380/ElfMsg4_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg4_0x80AFD380/func_80AFD5B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg4_0x80AFD380/func_80AFD5E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg4_0x80AFD380/func_80AFD668.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg4_0x80AFD380/func_80AFD770.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg4_0x80AFD380/ElfMsg4_Update.asm") diff --git a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.h b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.h new file mode 100644 index 0000000000..4de6f91d4a --- /dev/null +++ b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.h @@ -0,0 +1,15 @@ +#ifndef Z_ELF_MSG4_H +#define Z_ELF_MSG4_H + +#include + +struct ElfMsg4; + +typedef struct ElfMsg4 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x8]; +} ElfMsg4; // size = 0x14C + +extern const ActorInit Elf_Msg4_InitVars; + +#endif // Z_ELF_MSG4_H diff --git a/src/overlays/actors/ovl_Elf_Msg5/overlay.cfg b/src/overlays/actors/ovl_Elf_Msg5/overlay.cfg new file mode 100644 index 0000000000..d528de3424 --- /dev/null +++ b/src/overlays/actors/ovl_Elf_Msg5/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Elf_Msg5 +z_elf_msg5.c diff --git a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c new file mode 100644 index 0000000000..8924890b71 --- /dev/null +++ b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c @@ -0,0 +1,33 @@ +#include "z_elf_msg5.h" + +#define FLAGS 0x00000010 + +#define THIS ((ElfMsg5*)thisx) + +void ElfMsg5_Init(Actor* thisx, GlobalContext* globalCtx); +void ElfMsg5_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ElfMsg5_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Elf_Msg5_InitVars = { + ACTOR_ELF_MSG5, + ACTORTYPE_BG, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ElfMsg5), + (ActorFunc)ElfMsg5_Init, + (ActorFunc)ElfMsg5_Destroy, + (ActorFunc)ElfMsg5_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg5_0x80AFD990/func_80AFD990.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg5_0x80AFD990/ElfMsg5_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg5_0x80AFD990/ElfMsg5_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg5_0x80AFD990/func_80AFDB38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg5_0x80AFD990/ElfMsg5_Update.asm") diff --git a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.h b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.h new file mode 100644 index 0000000000..14ef9a2981 --- /dev/null +++ b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.h @@ -0,0 +1,15 @@ +#ifndef Z_ELF_MSG5_H +#define Z_ELF_MSG5_H + +#include + +struct ElfMsg5; + +typedef struct ElfMsg5 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4]; +} ElfMsg5; // size = 0x148 + +extern const ActorInit Elf_Msg5_InitVars; + +#endif // Z_ELF_MSG5_H diff --git a/src/overlays/actors/ovl_Elf_Msg6/overlay.cfg b/src/overlays/actors/ovl_Elf_Msg6/overlay.cfg new file mode 100644 index 0000000000..9ded97384e --- /dev/null +++ b/src/overlays/actors/ovl_Elf_Msg6/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Elf_Msg6 +z_elf_msg6.c diff --git a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c new file mode 100644 index 0000000000..ecaa6e135f --- /dev/null +++ b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c @@ -0,0 +1,53 @@ +#include "z_elf_msg6.h" + +#define FLAGS 0x00000010 + +#define THIS ((ElfMsg6*)thisx) + +void ElfMsg6_Init(Actor* thisx, GlobalContext* globalCtx); +void ElfMsg6_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ElfMsg6_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Elf_Msg6_InitVars = { + ACTOR_ELF_MSG6, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ElfMsg6), + (ActorFunc)ElfMsg6_Init, + (ActorFunc)ElfMsg6_Destroy, + (ActorFunc)ElfMsg6_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/func_80BA15A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/func_80BA165C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/func_80BA16F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/ElfMsg6_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/ElfMsg6_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/func_80BA1C00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/func_80BA1C88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/func_80BA1CF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/func_80BA1E30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/func_80BA1F80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/func_80BA2038.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/func_80BA2048.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/func_80BA215C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/func_80BA21C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Elf_Msg6_0x80BA15A0/ElfMsg6_Update.asm") diff --git a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.h b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.h new file mode 100644 index 0000000000..d52e139da2 --- /dev/null +++ b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.h @@ -0,0 +1,15 @@ +#ifndef Z_ELF_MSG6_H +#define Z_ELF_MSG6_H + +#include + +struct ElfMsg6; + +typedef struct ElfMsg6 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4]; +} ElfMsg6; // size = 0x148 + +extern const ActorInit Elf_Msg6_InitVars; + +#endif // Z_ELF_MSG6_H diff --git a/src/overlays/actors/ovl_En_Ah/overlay.cfg b/src/overlays/actors/ovl_En_Ah/overlay.cfg new file mode 100644 index 0000000000..694256c538 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ah/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ah +z_en_ah.c diff --git a/src/overlays/actors/ovl_En_Ah/z_en_ah.c b/src/overlays/actors/ovl_En_Ah/z_en_ah.c new file mode 100644 index 0000000000..ae5f65ea70 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ah/z_en_ah.c @@ -0,0 +1,80 @@ +#include "z_en_ah.h" + +#define FLAGS 0x00000039 + +#define THIS ((EnAh*)thisx) + +void EnAh_Init(Actor* thisx, GlobalContext* globalCtx); +void EnAh_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnAh_Update(Actor* thisx, GlobalContext* globalCtx); +void EnAh_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ah_InitVars = { + ACTOR_EN_AH, + ACTORTYPE_NPC, + FLAGS, + OBJECT_AH, + sizeof(EnAh), + (ActorFunc)EnAh_Init, + (ActorFunc)EnAh_Destroy, + (ActorFunc)EnAh_Update, + (ActorFunc)EnAh_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD2A30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD2AE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD2B0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD2BA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD2BE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD2C6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD2DA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD2DC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD2FD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD30C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD3118.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD3198.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD3294.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD3320.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD3374.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD33FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD3484.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD3548.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD35BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD3658.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD36B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD3768.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/EnAh_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/EnAh_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/EnAh_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD3AA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/func_80BD3AF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ah_0x80BD2A30/EnAh_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ah/z_en_ah.h b/src/overlays/actors/ovl_En_Ah/z_en_ah.h new file mode 100644 index 0000000000..a3f51dc3b6 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ah/z_en_ah.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_AH_H +#define Z_EN_AH_H + +#include + +struct EnAh; + +typedef struct EnAh { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1C0]; +} EnAh; // size = 0x304 + +extern const ActorInit En_Ah_InitVars; + +#endif // Z_EN_AH_H diff --git a/src/overlays/actors/ovl_En_Akindonuts/overlay.cfg b/src/overlays/actors/ovl_En_Akindonuts/overlay.cfg new file mode 100644 index 0000000000..a3e371656a --- /dev/null +++ b/src/overlays/actors/ovl_En_Akindonuts/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Akindonuts +z_en_akindonuts.c diff --git a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c new file mode 100644 index 0000000000..ffce076a4c --- /dev/null +++ b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c @@ -0,0 +1,114 @@ +#include "z_en_akindonuts.h" + +#define FLAGS 0x00000039 + +#define THIS ((EnAkindonuts*)thisx) + +void EnAkindonuts_Init(Actor* thisx, GlobalContext* globalCtx); +void EnAkindonuts_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnAkindonuts_Update(Actor* thisx, GlobalContext* globalCtx); +void EnAkindonuts_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Akindonuts_InitVars = { + ACTOR_EN_AKINDONUTS, + ACTORTYPE_NPC, + FLAGS, + OBJECT_DNT, + sizeof(EnAkindonuts), + (ActorFunc)EnAkindonuts_Init, + (ActorFunc)EnAkindonuts_Destroy, + (ActorFunc)EnAkindonuts_Update, + (ActorFunc)EnAkindonuts_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BECBE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BECC7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BECD10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BECEAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BECF6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BECFBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BED034.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BED090.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BED140.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BED208.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BED27C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BED2FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BED35C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BED3BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BED680.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BED8A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEDB88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEDDAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEE070.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEE274.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEE530.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEE73C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEE938.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEEB20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEEDC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEEE10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEEFA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEF18C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEF20C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEF360.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEF450.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEF4B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEF518.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEF770.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEF83C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEF9F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEFAF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEFD74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/EnAkindonuts_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/EnAkindonuts_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/EnAkindonuts_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BEFFB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BF0178.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/func_80BF0190.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Akindonuts_0x80BECBE0/EnAkindonuts_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.h b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.h new file mode 100644 index 0000000000..f8c4726b4d --- /dev/null +++ b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_AKINDONUTS_H +#define Z_EN_AKINDONUTS_H + +#include + +struct EnAkindonuts; + +typedef struct EnAkindonuts { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x228]; +} EnAkindonuts; // size = 0x36C + +extern const ActorInit En_Akindonuts_InitVars; + +#endif // Z_EN_AKINDONUTS_H diff --git a/src/overlays/actors/ovl_En_Al/overlay.cfg b/src/overlays/actors/ovl_En_Al/overlay.cfg new file mode 100644 index 0000000000..ccd80736ff --- /dev/null +++ b/src/overlays/actors/ovl_En_Al/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Al +z_en_al.c diff --git a/src/overlays/actors/ovl_En_Al/z_en_al.c b/src/overlays/actors/ovl_En_Al/z_en_al.c new file mode 100644 index 0000000000..e3b8cfd58a --- /dev/null +++ b/src/overlays/actors/ovl_En_Al/z_en_al.c @@ -0,0 +1,92 @@ +#include "z_en_al.h" + +#define FLAGS 0x00000039 + +#define THIS ((EnAl*)thisx) + +void EnAl_Init(Actor* thisx, GlobalContext* globalCtx); +void EnAl_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnAl_Update(Actor* thisx, GlobalContext* globalCtx); +void EnAl_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Al_InitVars = { + ACTOR_EN_AL, + ACTORTYPE_NPC, + FLAGS, + OBJECT_AL, + sizeof(EnAl), + (ActorFunc)EnAl_Init, + (ActorFunc)EnAl_Destroy, + (ActorFunc)EnAl_Update, + (ActorFunc)EnAl_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDE1A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDE250.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDE27C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDE318.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDE384.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDE408.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDE484.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDE4E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDE678.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDE7FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDE92C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDEA14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDEABC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDEC2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDED20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDEE5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDEF3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDEFE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDF064.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDF244.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDF308.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDF390.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDF414.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDF568.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDF578.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDF5E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDF6C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/EnAl_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/EnAl_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/EnAl_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDF914.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDF950.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/func_80BDFA34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Al_0x80BDE1A0/EnAl_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Al/z_en_al.h b/src/overlays/actors/ovl_En_Al/z_en_al.h new file mode 100644 index 0000000000..980a4d0b34 --- /dev/null +++ b/src/overlays/actors/ovl_En_Al/z_en_al.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_AL_H +#define Z_EN_AL_H + +#include + +struct EnAl; + +typedef struct EnAl { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x3BC]; +} EnAl; // size = 0x500 + +extern const ActorInit En_Al_InitVars; + +#endif // Z_EN_AL_H diff --git a/src/overlays/actors/ovl_En_Am/overlay.cfg b/src/overlays/actors/ovl_En_Am/overlay.cfg new file mode 100644 index 0000000000..8f03945db6 --- /dev/null +++ b/src/overlays/actors/ovl_En_Am/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Am +z_en_am.c diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c new file mode 100644 index 0000000000..04b4a81a13 --- /dev/null +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -0,0 +1,80 @@ +#include "z_en_am.h" + +#define FLAGS 0x00000405 + +#define THIS ((EnAm*)thisx) + +void EnAm_Init(Actor* thisx, GlobalContext* globalCtx); +void EnAm_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnAm_Update(Actor* thisx, GlobalContext* globalCtx); +void EnAm_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Am_InitVars = { + ACTOR_EN_AM, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_AM, + sizeof(EnAm), + (ActorFunc)EnAm_Init, + (ActorFunc)EnAm_Destroy, + (ActorFunc)EnAm_Update, + (ActorFunc)EnAm_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/EnAm_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/EnAm_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808AFE38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808AFF9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0040.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B00D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0124.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0208.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0358.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B03C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0460.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B04A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B04E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0508.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B057C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B05C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0640.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B066C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B06D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B07A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0820.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0894.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0AD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0B4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0B9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/EnAm_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/func_808B0EA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Am_0x808AFCD0/EnAm_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.h b/src/overlays/actors/ovl_En_Am/z_en_am.h new file mode 100644 index 0000000000..fc6d188e08 --- /dev/null +++ b/src/overlays/actors/ovl_En_Am/z_en_am.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_AM_H +#define Z_EN_AM_H + +#include + +struct EnAm; + +typedef struct EnAm { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x23C]; +} EnAm; // size = 0x380 + +extern const ActorInit En_Am_InitVars; + +#endif // Z_EN_AM_H diff --git a/src/overlays/actors/ovl_En_An/overlay.cfg b/src/overlays/actors/ovl_En_An/overlay.cfg new file mode 100644 index 0000000000..14a6d7d5f2 --- /dev/null +++ b/src/overlays/actors/ovl_En_An/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_An +z_en_an.c diff --git a/src/overlays/actors/ovl_En_An/z_en_an.c b/src/overlays/actors/ovl_En_An/z_en_an.c new file mode 100644 index 0000000000..36a6248a30 --- /dev/null +++ b/src/overlays/actors/ovl_En_An/z_en_an.c @@ -0,0 +1,145 @@ +#include "z_en_an.h" + +#define FLAGS 0x00000039 + +#define THIS ((EnAn*)thisx) + +void EnAn_Init(Actor* thisx, GlobalContext* globalCtx); +void EnAn_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnAn_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_An_InitVars = { + ACTOR_EN_AN, + ACTORTYPE_NPC, + FLAGS, + OBJECT_AN1, + sizeof(EnAn), + (ActorFunc)EnAn_Init, + (ActorFunc)EnAn_Destroy, + (ActorFunc)EnAn_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B53840.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B539CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B53A7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B53B3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B53BA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B53CE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B53ED4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B53F84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B54124.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B54678.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B546F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B54750.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B547C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B5492C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B54A94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B54BC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B54C5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B54D18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B54DF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B55180.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B552E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B553AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B554E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B555C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B556F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B557AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B55860.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B55914.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B55D20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B55D98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B55ECC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B55F8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B5600C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B56094.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B5611C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B561A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B56418.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B56744.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B56880.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B56B00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B56BC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B56CAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B56D28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B56E44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B56EB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B5702C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B572D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B573F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B575BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B57674.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B57718.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B577F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B578F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B57A44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B57B48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/EnAn_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/EnAn_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/EnAn_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B57EE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B57FC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_An_0x80B53840/func_80B580C0.asm") diff --git a/src/overlays/actors/ovl_En_An/z_en_an.h b/src/overlays/actors/ovl_En_An/z_en_an.h new file mode 100644 index 0000000000..e550135b74 --- /dev/null +++ b/src/overlays/actors/ovl_En_An/z_en_an.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_AN_H +#define Z_EN_AN_H + +#include + +struct EnAn; + +typedef struct EnAn { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x284]; +} EnAn; // size = 0x3C8 + +extern const ActorInit En_An_InitVars; + +#endif // Z_EN_AN_H diff --git a/src/overlays/actors/ovl_En_And/overlay.cfg b/src/overlays/actors/ovl_En_And/overlay.cfg new file mode 100644 index 0000000000..f62d705f09 --- /dev/null +++ b/src/overlays/actors/ovl_En_And/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_And +z_en_and.c diff --git a/src/overlays/actors/ovl_En_And/z_en_and.c b/src/overlays/actors/ovl_En_And/z_en_and.c new file mode 100644 index 0000000000..99d61bcfa5 --- /dev/null +++ b/src/overlays/actors/ovl_En_And/z_en_and.c @@ -0,0 +1,40 @@ +#include "z_en_and.h" + +#define FLAGS 0x00000039 + +#define THIS ((EnAnd*)thisx) + +void EnAnd_Init(Actor* thisx, GlobalContext* globalCtx); +void EnAnd_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnAnd_Update(Actor* thisx, GlobalContext* globalCtx); +void EnAnd_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_And_InitVars = { + ACTOR_EN_AND, + ACTORTYPE_NPC, + FLAGS, + OBJECT_AND, + sizeof(EnAnd), + (ActorFunc)EnAnd_Init, + (ActorFunc)EnAnd_Destroy, + (ActorFunc)EnAnd_Update, + (ActorFunc)EnAnd_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_And_0x80C18B90/func_80C18B90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_And_0x80C18B90/func_80C18BD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_And_0x80C18B90/func_80C18C50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_And_0x80C18B90/EnAnd_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_And_0x80C18B90/EnAnd_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_And_0x80C18B90/EnAnd_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_And_0x80C18B90/func_80C18ED0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_And_0x80C18B90/EnAnd_Draw.asm") diff --git a/src/overlays/actors/ovl_En_And/z_en_and.h b/src/overlays/actors/ovl_En_And/z_en_and.h new file mode 100644 index 0000000000..1769d94c43 --- /dev/null +++ b/src/overlays/actors/ovl_En_And/z_en_and.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_AND_H +#define Z_EN_AND_H + +#include + +struct EnAnd; + +typedef struct EnAnd { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1D0]; +} EnAnd; // size = 0x314 + +extern const ActorInit En_And_InitVars; + +#endif // Z_EN_AND_H diff --git a/src/overlays/actors/ovl_En_Ani/overlay.cfg b/src/overlays/actors/ovl_En_Ani/overlay.cfg new file mode 100644 index 0000000000..f0622d0c02 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ani/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ani +z_en_ani.c diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c new file mode 100644 index 0000000000..7f37a4db1e --- /dev/null +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -0,0 +1,60 @@ +#include "z_en_ani.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnAni*)thisx) + +void EnAni_Init(Actor* thisx, GlobalContext* globalCtx); +void EnAni_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnAni_Update(Actor* thisx, GlobalContext* globalCtx); +void EnAni_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ani_InitVars = { + ACTOR_EN_ANI, + ACTORTYPE_NPC, + FLAGS, + OBJECT_ANI, + sizeof(EnAni), + (ActorFunc)EnAni_Init, + (ActorFunc)EnAni_Destroy, + (ActorFunc)EnAni_Update, + (ActorFunc)EnAni_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_809679D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_80967A48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_80967AB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/EnAni_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/EnAni_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_80967D20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_80967DA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_80967DCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_80967E34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_80967E90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_80967F20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_80967FA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_809680B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_80968164.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/EnAni_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_80968504.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/func_8096854C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ani_0x809679D0/EnAni_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.h b/src/overlays/actors/ovl_En_Ani/z_en_ani.h new file mode 100644 index 0000000000..4965921cdc --- /dev/null +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ANI_H +#define Z_EN_ANI_H + +#include + +struct EnAni; + +typedef struct EnAni { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1BC]; +} EnAni; // size = 0x300 + +extern const ActorInit En_Ani_InitVars; + +#endif // Z_EN_ANI_H diff --git a/src/overlays/actors/ovl_En_Aob_01/overlay.cfg b/src/overlays/actors/ovl_En_Aob_01/overlay.cfg new file mode 100644 index 0000000000..592d6a8346 --- /dev/null +++ b/src/overlays/actors/ovl_En_Aob_01/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Aob_01 +z_en_aob_01.c diff --git a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c new file mode 100644 index 0000000000..b7f5776a57 --- /dev/null +++ b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c @@ -0,0 +1,100 @@ +#include "z_en_aob_01.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnAob01*)thisx) + +void EnAob01_Init(Actor* thisx, GlobalContext* globalCtx); +void EnAob01_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnAob01_Update(Actor* thisx, GlobalContext* globalCtx); +void EnAob01_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Aob_01_InitVars = { + ACTOR_EN_AOB_01, + ACTORTYPE_NPC, + FLAGS, + OBJECT_AOB, + sizeof(EnAob01), + (ActorFunc)EnAob01_Init, + (ActorFunc)EnAob01_Destroy, + (ActorFunc)EnAob01_Update, + (ActorFunc)EnAob01_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C10B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C1124.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C1158.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C11EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C1304.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C1424.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C14D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C15BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C165C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C16DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C1C9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C1D64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C1EC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2060.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C21E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2504.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2594.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C25E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2680.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C26E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2730.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2788.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2824.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C28B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2A64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2BE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2C9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2D0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2EC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2F34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C2FA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/EnAob01_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/EnAob01_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/EnAob01_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C33D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C35B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/func_809C35F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Aob_01_0x809C10B0/EnAob01_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.h b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.h new file mode 100644 index 0000000000..f151475c30 --- /dev/null +++ b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_AOB_01_H +#define Z_EN_AOB_01_H + +#include + +struct EnAob01; + +typedef struct EnAob01 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x300]; +} EnAob01; // size = 0x444 + +extern const ActorInit En_Aob_01_InitVars; + +#endif // Z_EN_AOB_01_H diff --git a/src/overlays/actors/ovl_En_Arrow/overlay.cfg b/src/overlays/actors/ovl_En_Arrow/overlay.cfg new file mode 100644 index 0000000000..5ae277d228 --- /dev/null +++ b/src/overlays/actors/ovl_En_Arrow/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Arrow +z_en_arrow.c diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c new file mode 100644 index 0000000000..a32ec4a853 --- /dev/null +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -0,0 +1,50 @@ +#include "z_en_arrow.h" + +#define FLAGS 0x00000030 + +#define THIS ((EnArrow*)thisx) + +void EnArrow_Init(Actor* thisx, GlobalContext* globalCtx); +void EnArrow_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnArrow_Update(Actor* thisx, GlobalContext* globalCtx); +void EnArrow_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Arrow_InitVars = { + ACTOR_EN_ARROW, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnArrow), + (ActorFunc)EnArrow_Init, + (ActorFunc)EnArrow_Destroy, + (ActorFunc)EnArrow_Update, + (ActorFunc)EnArrow_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/EnArrow_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/EnArrow_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/func_8088A514.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/func_8088A594.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/func_8088A7D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/func_8088A894.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/func_8088AA98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/func_8088ACE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/func_8088B630.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/func_8088B6B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/EnArrow_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/func_8088B88C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Arrow_0x8088A240/EnArrow_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h new file mode 100644 index 0000000000..042e359291 --- /dev/null +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ARROW_H +#define Z_EN_ARROW_H + +#include + +struct EnArrow; + +typedef struct EnArrow { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x134]; +} EnArrow; // size = 0x278 + +extern const ActorInit En_Arrow_InitVars; + +#endif // Z_EN_ARROW_H diff --git a/src/overlays/actors/ovl_En_Attack_Niw/overlay.cfg b/src/overlays/actors/ovl_En_Attack_Niw/overlay.cfg new file mode 100644 index 0000000000..2b4aa71bea --- /dev/null +++ b/src/overlays/actors/ovl_En_Attack_Niw/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Attack_Niw +z_en_attack_niw.c diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c new file mode 100644 index 0000000000..82bbf5e2d0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c @@ -0,0 +1,44 @@ +#include "z_en_attack_niw.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnAttackNiw*)thisx) + +void EnAttackNiw_Init(Actor* thisx, GlobalContext* globalCtx); +void EnAttackNiw_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnAttackNiw_Update(Actor* thisx, GlobalContext* globalCtx); +void EnAttackNiw_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Attack_Niw_InitVars = { + ACTOR_EN_ATTACK_NIW, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_NIW, + sizeof(EnAttackNiw), + (ActorFunc)EnAttackNiw_Init, + (ActorFunc)EnAttackNiw_Destroy, + (ActorFunc)EnAttackNiw_Update, + (ActorFunc)EnAttackNiw_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Attack_Niw_0x809580C0/EnAttackNiw_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Attack_Niw_0x809580C0/EnAttackNiw_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Attack_Niw_0x809580C0/func_80958228.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Attack_Niw_0x809580C0/func_809585B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Attack_Niw_0x809580C0/func_80958634.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Attack_Niw_0x809580C0/func_80958974.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Attack_Niw_0x809580C0/func_80958BE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Attack_Niw_0x809580C0/EnAttackNiw_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Attack_Niw_0x809580C0/func_80958F6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Attack_Niw_0x809580C0/EnAttackNiw_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h new file mode 100644 index 0000000000..ac88ff3b66 --- /dev/null +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ATTACK_NIW_H +#define Z_EN_ATTACK_NIW_H + +#include + +struct EnAttackNiw; + +typedef struct EnAttackNiw { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x19C]; +} EnAttackNiw; // size = 0x2E0 + +extern const ActorInit En_Attack_Niw_InitVars; + +#endif // Z_EN_ATTACK_NIW_H diff --git a/src/overlays/actors/ovl_En_Az/overlay.cfg b/src/overlays/actors/ovl_En_Az/overlay.cfg new file mode 100644 index 0000000000..e929d9380f --- /dev/null +++ b/src/overlays/actors/ovl_En_Az/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Az +z_en_az.c diff --git a/src/overlays/actors/ovl_En_Az/z_en_az.c b/src/overlays/actors/ovl_En_Az/z_en_az.c new file mode 100644 index 0000000000..f3544ab933 --- /dev/null +++ b/src/overlays/actors/ovl_En_Az/z_en_az.c @@ -0,0 +1,116 @@ +#include "z_en_az.h" + +#define FLAGS 0x80000010 + +#define THIS ((EnAz*)thisx) + +void EnAz_Init(Actor* thisx, GlobalContext* globalCtx); +void EnAz_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnAz_Update(Actor* thisx, GlobalContext* globalCtx); +void EnAz_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Az_InitVars = { + ACTOR_EN_AZ, + ACTORTYPE_NPC, + FLAGS, + OBJECT_AZ, + sizeof(EnAz), + (ActorFunc)EnAz_Init, + (ActorFunc)EnAz_Destroy, + (ActorFunc)EnAz_Update, + (ActorFunc)EnAz_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A94A30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A94A64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A94A90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A94AB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A94B20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A94B98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/EnAz_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/EnAz_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A954AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A95534.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A9565C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A95730.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A958B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A95B34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A95C5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A95CEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A95DA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A95E88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A95F94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A95FE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A9617C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97114.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97274.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A973B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97410.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A979DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A979F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97A28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97A40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97A9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97AB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97C0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97C24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97C4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97D5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97E48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97EAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A97F9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A982E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A98414.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/EnAz_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/EnAz_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A98DA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A98E48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A98EFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Az_0x80A94A30/func_80A98F94.asm") diff --git a/src/overlays/actors/ovl_En_Az/z_en_az.h b/src/overlays/actors/ovl_En_Az/z_en_az.h new file mode 100644 index 0000000000..ffe0b5f87f --- /dev/null +++ b/src/overlays/actors/ovl_En_Az/z_en_az.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_AZ_H +#define Z_EN_AZ_H + +#include + +struct EnAz; + +typedef struct EnAz { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x294]; +} EnAz; // size = 0x3D8 + +extern const ActorInit En_Az_InitVars; + +#endif // Z_EN_AZ_H diff --git a/src/overlays/actors/ovl_En_Baba/overlay.cfg b/src/overlays/actors/ovl_En_Baba/overlay.cfg new file mode 100644 index 0000000000..8d3dddae0f --- /dev/null +++ b/src/overlays/actors/ovl_En_Baba/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Baba +z_en_baba.c diff --git a/src/overlays/actors/ovl_En_Baba/z_en_baba.c b/src/overlays/actors/ovl_En_Baba/z_en_baba.c new file mode 100644 index 0000000000..c0d21db523 --- /dev/null +++ b/src/overlays/actors/ovl_En_Baba/z_en_baba.c @@ -0,0 +1,80 @@ +#include "z_en_baba.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnBaba*)thisx) + +void EnBaba_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBaba_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBaba_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBaba_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Baba_InitVars = { + ACTOR_EN_BABA, + ACTORTYPE_NPC, + FLAGS, + OBJECT_BBA, + sizeof(EnBaba), + (ActorFunc)EnBaba_Init, + (ActorFunc)EnBaba_Destroy, + (ActorFunc)EnBaba_Update, + (ActorFunc)EnBaba_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA8820.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA886C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA8C4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA8C90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA8D2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA8DF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA8F88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9110.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9160.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA93AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9480.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9758.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9848.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA98EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9AB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9B24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9B80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9CD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9E00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9E10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9E48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/EnBaba_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/EnBaba_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/EnBaba_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BA9FB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BAA198.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/func_80BAA20C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baba_0x80BA8820/EnBaba_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Baba/z_en_baba.h b/src/overlays/actors/ovl_En_Baba/z_en_baba.h new file mode 100644 index 0000000000..9e0dedef4d --- /dev/null +++ b/src/overlays/actors/ovl_En_Baba/z_en_baba.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BABA_H +#define Z_EN_BABA_H + +#include + +struct EnBaba; + +typedef struct EnBaba { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2FC]; +} EnBaba; // size = 0x440 + +extern const ActorInit En_Baba_InitVars; + +#endif // Z_EN_BABA_H diff --git a/src/overlays/actors/ovl_En_Baguo/overlay.cfg b/src/overlays/actors/ovl_En_Baguo/overlay.cfg new file mode 100644 index 0000000000..19e80c5e0f --- /dev/null +++ b/src/overlays/actors/ovl_En_Baguo/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Baguo +z_en_baguo.c diff --git a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c new file mode 100644 index 0000000000..8df6cbd374 --- /dev/null +++ b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c @@ -0,0 +1,55 @@ +#include "z_en_baguo.h" + +#define FLAGS 0x00000005 + +#define THIS ((EnBaguo*)thisx) + +void EnBaguo_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBaguo_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBaguo_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Baguo_InitVars = { + ACTOR_EN_BAGUO, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_GMO, + sizeof(EnBaguo), + (ActorFunc)EnBaguo_Init, + (ActorFunc)EnBaguo_Destroy, + (ActorFunc)EnBaguo_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/EnBaguo_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/EnBaguo_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3B220.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3B2CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3B3E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3B5E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3B794.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3B7B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3B8F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3B958.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/EnBaguo_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3BE24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3BE60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3BF0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3C008.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baguo_0x80A3B080/func_80A3C17C.asm") diff --git a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.h b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.h new file mode 100644 index 0000000000..b83a6655f2 --- /dev/null +++ b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BAGUO_H +#define Z_EN_BAGUO_H + +#include + +struct EnBaguo; + +typedef struct EnBaguo { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x788]; +} EnBaguo; // size = 0x8CC + +extern const ActorInit En_Baguo_InitVars; + +#endif // Z_EN_BAGUO_H diff --git a/src/overlays/actors/ovl_En_Baisen/overlay.cfg b/src/overlays/actors/ovl_En_Baisen/overlay.cfg new file mode 100644 index 0000000000..e1ba96f41a --- /dev/null +++ b/src/overlays/actors/ovl_En_Baisen/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Baisen +z_en_baisen.c diff --git a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c new file mode 100644 index 0000000000..facbfa0d8f --- /dev/null +++ b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c @@ -0,0 +1,50 @@ +#include "z_en_baisen.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnBaisen*)thisx) + +void EnBaisen_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBaisen_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBaisen_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBaisen_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Baisen_InitVars = { + ACTOR_EN_BAISEN, + ACTORTYPE_NPC, + FLAGS, + OBJECT_BAI, + sizeof(EnBaisen), + (ActorFunc)EnBaisen_Init, + (ActorFunc)EnBaisen_Destroy, + (ActorFunc)EnBaisen_Update, + (ActorFunc)EnBaisen_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/EnBaisen_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/EnBaisen_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/func_80BE8690.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/func_80BE871C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/func_80BE87B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/func_80BE87FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/func_80BE887C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/func_80BE895C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/func_80BE89D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/func_80BE8AAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/EnBaisen_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/func_80BE8D3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Baisen_0x80BE84F0/EnBaisen_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.h b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.h new file mode 100644 index 0000000000..ab6ed1e588 --- /dev/null +++ b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BAISEN_H +#define Z_EN_BAISEN_H + +#include + +struct EnBaisen; + +typedef struct EnBaisen { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1B8]; +} EnBaisen; // size = 0x2FC + +extern const ActorInit En_Baisen_InitVars; + +#endif // Z_EN_BAISEN_H diff --git a/src/overlays/actors/ovl_En_Bal/overlay.cfg b/src/overlays/actors/ovl_En_Bal/overlay.cfg new file mode 100644 index 0000000000..53fdf3ee56 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bal/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bal +z_en_bal.c diff --git a/src/overlays/actors/ovl_En_Bal/z_en_bal.c b/src/overlays/actors/ovl_En_Bal/z_en_bal.c new file mode 100644 index 0000000000..5318346162 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bal/z_en_bal.c @@ -0,0 +1,102 @@ +#include "z_en_bal.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnBal*)thisx) + +void EnBal_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBal_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBal_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBal_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bal_InitVars = { + ACTOR_EN_BAL, + ACTORTYPE_NPC, + FLAGS, + OBJECT_BAL, + sizeof(EnBal), + (ActorFunc)EnBal_Init, + (ActorFunc)EnBal_Destroy, + (ActorFunc)EnBal_Update, + (ActorFunc)EnBal_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/EnBal_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/EnBal_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A61A18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A61A44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A61A6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A61ADC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A61B5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A61C9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A61CE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A61DF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A61E5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A62128.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A621C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A62260.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A622A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A623CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A624DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A62818.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A62830.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A629C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A62AC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A62B30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A62B78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A62CF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A62DCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A62ED0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A62FAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A63158.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A634B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A634C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A635DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A635F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A636AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A637FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A63884.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/EnBal_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A63A10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/func_80A63B94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bal_0x80A61810/EnBal_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bal/z_en_bal.h b/src/overlays/actors/ovl_En_Bal/z_en_bal.h new file mode 100644 index 0000000000..6622fd9ed0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bal/z_en_bal.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BAL_H +#define Z_EN_BAL_H + +#include + +struct EnBal; + +typedef struct EnBal { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x270]; +} EnBal; // size = 0x3B4 + +extern const ActorInit En_Bal_InitVars; + +#endif // Z_EN_BAL_H diff --git a/src/overlays/actors/ovl_En_Bat/overlay.cfg b/src/overlays/actors/ovl_En_Bat/overlay.cfg new file mode 100644 index 0000000000..1d11f79a3b --- /dev/null +++ b/src/overlays/actors/ovl_En_Bat/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bat +z_en_bat.c diff --git a/src/overlays/actors/ovl_En_Bat/z_en_bat.c b/src/overlays/actors/ovl_En_Bat/z_en_bat.c new file mode 100644 index 0000000000..22edb4e151 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bat/z_en_bat.c @@ -0,0 +1,58 @@ +#include "z_en_bat.h" + +#define FLAGS 0x00005005 + +#define THIS ((EnBat*)thisx) + +void EnBat_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBat_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBat_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBat_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bat_InitVars = { + ACTOR_EN_BAT, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_BAT, + sizeof(EnBat), + (ActorFunc)EnBat_Init, + (ActorFunc)EnBat_Destroy, + (ActorFunc)EnBat_Update, + (ActorFunc)EnBat_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/EnBat_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/EnBat_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A437CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A43810.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A43870.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A438D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A438F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A4392C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A43CA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A43CE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A43F60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A44114.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A44294.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A4431C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/func_80A443D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/EnBat_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bat_0x80A434E0/EnBat_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bat/z_en_bat.h b/src/overlays/actors/ovl_En_Bat/z_en_bat.h new file mode 100644 index 0000000000..280589e436 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bat/z_en_bat.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BAT_H +#define Z_EN_BAT_H + +#include + +struct EnBat; + +typedef struct EnBat { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x98]; +} EnBat; // size = 0x1DC + +extern const ActorInit En_Bat_InitVars; + +#endif // Z_EN_BAT_H diff --git a/src/overlays/actors/ovl_En_Bb/overlay.cfg b/src/overlays/actors/ovl_En_Bb/overlay.cfg new file mode 100644 index 0000000000..048245caf6 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bb/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bb +z_en_bb.c diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c new file mode 100644 index 0000000000..1a84b458b9 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -0,0 +1,78 @@ +#include "z_en_bb.h" + +#define FLAGS 0x00000205 + +#define THIS ((EnBb*)thisx) + +void EnBb_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBb_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBb_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBb_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bb_InitVars = { + ACTOR_EN_BB, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_BB, + sizeof(EnBb), + (ActorFunc)EnBb_Init, + (ActorFunc)EnBb_Destroy, + (ActorFunc)EnBb_Update, + (ActorFunc)EnBb_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/EnBb_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/EnBb_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C1E94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C1F00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C1F74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C1FF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C20D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C2238.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C2344.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C23EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C254C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C25E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C272C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C28CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C2A00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C2B1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C2B94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C2BD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C2C38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C2CB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C2CF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C2D78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C2E34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/EnBb_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C32EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/func_808C3324.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bb_0x808C1D40/EnBb_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.h b/src/overlays/actors/ovl_En_Bb/z_en_bb.h new file mode 100644 index 0000000000..099e87b302 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BB_H +#define Z_EN_BB_H + +#include + +struct EnBb; + +typedef struct EnBb { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x208]; +} EnBb; // size = 0x34C + +extern const ActorInit En_Bb_InitVars; + +#endif // Z_EN_BB_H diff --git a/src/overlays/actors/ovl_En_Bba_01/overlay.cfg b/src/overlays/actors/ovl_En_Bba_01/overlay.cfg new file mode 100644 index 0000000000..e26bcdd36f --- /dev/null +++ b/src/overlays/actors/ovl_En_Bba_01/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bba_01 +z_en_bba_01.c diff --git a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c new file mode 100644 index 0000000000..03bb6c272a --- /dev/null +++ b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c @@ -0,0 +1,52 @@ +#include "z_en_bba_01.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnBba01*)thisx) + +void EnBba01_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBba01_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBba01_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBba01_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bba_01_InitVars = { + ACTOR_EN_BBA_01, + ACTORTYPE_NPC, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnBba01), + (ActorFunc)EnBba01_Init, + (ActorFunc)EnBba01_Destroy, + (ActorFunc)EnBba01_Update, + (ActorFunc)EnBba01_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/func_809CC060.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/func_809CC1D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/func_809CC270.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/func_809CC2F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/func_809CC370.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/func_809CC3A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/func_809CC3CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/EnBba01_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/EnBba01_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/EnBba01_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/func_809CC6F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/func_809CC984.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/func_809CCA5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bba_01_0x809CC060/EnBba01_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.h b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.h new file mode 100644 index 0000000000..d97733f7b6 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BBA_01_H +#define Z_EN_BBA_01_H + +#include + +struct EnBba01; + +typedef struct EnBba01 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4D8]; +} EnBba01; // size = 0x61C + +extern const ActorInit En_Bba_01_InitVars; + +#endif // Z_EN_BBA_01_H diff --git a/src/overlays/actors/ovl_En_Bbfall/overlay.cfg b/src/overlays/actors/ovl_En_Bbfall/overlay.cfg new file mode 100644 index 0000000000..711e74e296 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bbfall/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bbfall +z_en_bbfall.c diff --git a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c new file mode 100644 index 0000000000..001c4bd671 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c @@ -0,0 +1,84 @@ +#include "z_en_bbfall.h" + +#define FLAGS 0x00000215 + +#define THIS ((EnBbfall*)thisx) + +void EnBbfall_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBbfall_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBbfall_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBbfall_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bbfall_InitVars = { + ACTOR_EN_BBFALL, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_BB, + sizeof(EnBbfall), + (ActorFunc)EnBbfall_Init, + (ActorFunc)EnBbfall_Destroy, + (ActorFunc)EnBbfall_Update, + (ActorFunc)EnBbfall_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/EnBbfall_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/EnBbfall_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF344.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF3B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF438.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF4B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF514.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF578.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF5AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF5E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF734.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF7A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF830.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF894.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BF8DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BFA18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BFA3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BFAB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BFB4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BFCCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BFE58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808BFF8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808C00A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808C013C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808C0178.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808C01E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/EnBbfall_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808C07D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/func_808C080C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bbfall_0x808BF220/EnBbfall_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.h b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.h new file mode 100644 index 0000000000..34ed161db5 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BBFALL_H +#define Z_EN_BBFALL_H + +#include + +struct EnBbfall; + +typedef struct EnBbfall { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x320]; +} EnBbfall; // size = 0x464 + +extern const ActorInit En_Bbfall_InitVars; + +#endif // Z_EN_BBFALL_H diff --git a/src/overlays/actors/ovl_En_Bee/overlay.cfg b/src/overlays/actors/ovl_En_Bee/overlay.cfg new file mode 100644 index 0000000000..ef6192fc4a --- /dev/null +++ b/src/overlays/actors/ovl_En_Bee/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bee +z_en_bee.c diff --git a/src/overlays/actors/ovl_En_Bee/z_en_bee.c b/src/overlays/actors/ovl_En_Bee/z_en_bee.c new file mode 100644 index 0000000000..86dd31dc7e --- /dev/null +++ b/src/overlays/actors/ovl_En_Bee/z_en_bee.c @@ -0,0 +1,42 @@ +#include "z_en_bee.h" + +#define FLAGS 0x00000005 + +#define THIS ((EnBee*)thisx) + +void EnBee_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBee_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBee_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBee_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bee_InitVars = { + ACTOR_EN_BEE, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_BEE, + sizeof(EnBee), + (ActorFunc)EnBee_Init, + (ActorFunc)EnBee_Destroy, + (ActorFunc)EnBee_Update, + (ActorFunc)EnBee_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bee_0x80B5A720/EnBee_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bee_0x80B5A720/EnBee_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bee_0x80B5A720/func_80B5A854.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bee_0x80B5A720/func_80B5A9E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bee_0x80B5A720/func_80B5ABC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bee_0x80B5A720/func_80B5AC3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bee_0x80B5A720/func_80B5AF80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bee_0x80B5A720/EnBee_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bee_0x80B5A720/EnBee_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bee/z_en_bee.h b/src/overlays/actors/ovl_En_Bee/z_en_bee.h new file mode 100644 index 0000000000..65cc4088ac --- /dev/null +++ b/src/overlays/actors/ovl_En_Bee/z_en_bee.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BEE_H +#define Z_EN_BEE_H + +#include + +struct EnBee; + +typedef struct EnBee { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x144]; +} EnBee; // size = 0x288 + +extern const ActorInit En_Bee_InitVars; + +#endif // Z_EN_BEE_H diff --git a/src/overlays/actors/ovl_En_Bh/overlay.cfg b/src/overlays/actors/ovl_En_Bh/overlay.cfg new file mode 100644 index 0000000000..2fea0e1e5b --- /dev/null +++ b/src/overlays/actors/ovl_En_Bh/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bh +z_en_bh.c diff --git a/src/overlays/actors/ovl_En_Bh/z_en_bh.c b/src/overlays/actors/ovl_En_Bh/z_en_bh.c new file mode 100644 index 0000000000..b8fb16dfd0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bh/z_en_bh.c @@ -0,0 +1,34 @@ +#include "z_en_bh.h" + +#define FLAGS 0x00000000 + +#define THIS ((EnBh*)thisx) + +void EnBh_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBh_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBh_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBh_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bh_InitVars = { + ACTOR_EN_BH, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_BH, + sizeof(EnBh), + (ActorFunc)EnBh_Init, + (ActorFunc)EnBh_Destroy, + (ActorFunc)EnBh_Update, + (ActorFunc)EnBh_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bh_0x80C22D40/EnBh_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bh_0x80C22D40/EnBh_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bh_0x80C22D40/func_80C22DEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bh_0x80C22D40/EnBh_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bh_0x80C22D40/EnBh_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bh/z_en_bh.h b/src/overlays/actors/ovl_En_Bh/z_en_bh.h new file mode 100644 index 0000000000..5855a093f5 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bh/z_en_bh.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BH_H +#define Z_EN_BH_H + +#include + +struct EnBh; + +typedef struct EnBh { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xA8]; +} EnBh; // size = 0x1EC + +extern const ActorInit En_Bh_InitVars; + +#endif // Z_EN_BH_H diff --git a/src/overlays/actors/ovl_En_Bigokuta/overlay.cfg b/src/overlays/actors/ovl_En_Bigokuta/overlay.cfg new file mode 100644 index 0000000000..40f0939870 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bigokuta/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bigokuta +z_en_bigokuta.c diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c new file mode 100644 index 0000000000..2b3977d7b5 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -0,0 +1,84 @@ +#include "z_en_bigokuta.h" + +#define FLAGS 0x00000005 + +#define THIS ((EnBigokuta*)thisx) + +void EnBigokuta_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBigokuta_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBigokuta_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBigokuta_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bigokuta_InitVars = { + ACTOR_EN_BIGOKUTA, + ACTORTYPE_BOSS, + FLAGS, + OBJECT_BIGOKUTA, + sizeof(EnBigokuta), + (ActorFunc)EnBigokuta_Init, + (ActorFunc)EnBigokuta_Destroy, + (ActorFunc)EnBigokuta_Update, + (ActorFunc)EnBigokuta_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/EnBigokuta_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/EnBigokuta_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC28B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC299C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC2A1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC2A7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC2B4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC2B98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC2C30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC2C84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC2CE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC2DAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC2EBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC2F20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC2F64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC3054.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC30EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC31EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC33A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC33C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC3460.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC34A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC35E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC3650.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC3930.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC39A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/EnBigokuta_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC3D48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/func_80AC4204.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigokuta_0x80AC26F0/EnBigokuta_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h new file mode 100644 index 0000000000..6c032c65a7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BIGOKUTA_H +#define Z_EN_BIGOKUTA_H + +#include + +struct EnBigokuta; + +typedef struct EnBigokuta { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2B4]; +} EnBigokuta; // size = 0x3F8 + +extern const ActorInit En_Bigokuta_InitVars; + +#endif // Z_EN_BIGOKUTA_H diff --git a/src/overlays/actors/ovl_En_Bigpamet/overlay.cfg b/src/overlays/actors/ovl_En_Bigpamet/overlay.cfg new file mode 100644 index 0000000000..df083a1703 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bigpamet/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bigpamet +z_en_bigpamet.c diff --git a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c new file mode 100644 index 0000000000..6ed165ac8f --- /dev/null +++ b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c @@ -0,0 +1,120 @@ +#include "z_en_bigpamet.h" + +#define FLAGS 0x00000435 + +#define THIS ((EnBigpamet*)thisx) + +void EnBigpamet_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBigpamet_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBigpamet_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBigpamet_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bigpamet_InitVars = { + ACTOR_EN_BIGPAMET, + ACTORTYPE_BOSS, + FLAGS, + OBJECT_TL, + sizeof(EnBigpamet), + (ActorFunc)EnBigpamet_Init, + (ActorFunc)EnBigpamet_Destroy, + (ActorFunc)EnBigpamet_Update, + (ActorFunc)EnBigpamet_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/EnBigpamet_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/EnBigpamet_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A2768C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A276F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A2778C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A27970.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A27B58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A27DD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A27FE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A2811C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A281B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A281DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28274.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A282C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28378.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A283A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A283F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A2844C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A284E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A2855C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28618.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A2866C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A286C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28708.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28760.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A287E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28970.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A289C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28A28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28A98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28B98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28D0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28D80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28DC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28E40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28E98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28ED4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A28EE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A29028.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A29094.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/EnBigpamet_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A292A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A293E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A29494.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/EnBigpamet_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A29580.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A29628.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpamet_0x80A27520/func_80A2966C.asm") diff --git a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.h b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.h new file mode 100644 index 0000000000..e8f561f78d --- /dev/null +++ b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BIGPAMET_H +#define Z_EN_BIGPAMET_H + +#include + +struct EnBigpamet; + +typedef struct EnBigpamet { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x488]; +} EnBigpamet; // size = 0x5CC + +extern const ActorInit En_Bigpamet_InitVars; + +#endif // Z_EN_BIGPAMET_H diff --git a/src/overlays/actors/ovl_En_Bigpo/overlay.cfg b/src/overlays/actors/ovl_En_Bigpo/overlay.cfg new file mode 100644 index 0000000000..1519b5573d --- /dev/null +++ b/src/overlays/actors/ovl_En_Bigpo/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bigpo +z_en_bigpo.c diff --git a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c new file mode 100644 index 0000000000..55c66b7de3 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c @@ -0,0 +1,161 @@ +#include "z_en_bigpo.h" + +#define FLAGS 0x00001215 + +#define THIS ((EnBigpo*)thisx) + +void EnBigpo_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBigpo_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBigpo_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bigpo_InitVars = { + ACTOR_EN_BIGPO, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_BIGPO, + sizeof(EnBigpo), + (ActorFunc)EnBigpo_Init, + (ActorFunc)EnBigpo_Destroy, + (ActorFunc)EnBigpo_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/EnBigpo_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/EnBigpo_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B61914.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B619B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B619FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B61AC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B61AF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B61B38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B61B70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B61C04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B61CFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B61D74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B61DA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B61E9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B61F04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62034.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62084.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62154.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B621CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B622E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B623BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B624F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B6259C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B6275C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B627B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62814.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62830.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62900.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62920.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B629E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62A68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62AD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62B10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62E38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62F10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B62FCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B631F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63264.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B632BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B6330C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B633E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63410.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63450.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63474.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B636D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B636E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63758.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B6382C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B6383C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63854.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63888.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B638AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B638D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63964.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63980.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63A18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63AC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63C28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63D0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B63D88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/EnBigpo_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B64190.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B641E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B64240.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B64470.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B6467C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B64880.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B64B08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigpo_0x80B615E0/func_80B64DFC.asm") diff --git a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.h b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.h new file mode 100644 index 0000000000..65152dfc20 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BIGPO_H +#define Z_EN_BIGPO_H + +#include + +struct EnBigpo; + +typedef struct EnBigpo { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x254]; +} EnBigpo; // size = 0x398 + +extern const ActorInit En_Bigpo_InitVars; + +#endif // Z_EN_BIGPO_H diff --git a/src/overlays/actors/ovl_En_Bigslime/overlay.cfg b/src/overlays/actors/ovl_En_Bigslime/overlay.cfg new file mode 100644 index 0000000000..c7441440e7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bigslime/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bigslime +z_en_bigslime.c diff --git a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c new file mode 100644 index 0000000000..991fbe2399 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c @@ -0,0 +1,230 @@ +#include "z_en_bigslime.h" + +#define FLAGS 0x00000235 + +#define THIS ((EnBigslime*)thisx) + +void EnBigslime_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBigslime_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBigslime_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBigslime_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bigslime_InitVars = { + ACTOR_EN_BIGSLIME, + ACTORTYPE_BOSS, + FLAGS, + OBJECT_BIGSLIME, + sizeof(EnBigslime), + (ActorFunc)EnBigslime_Init, + (ActorFunc)EnBigslime_Destroy, + (ActorFunc)EnBigslime_Update, + (ActorFunc)EnBigslime_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/EnBigslime_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/EnBigslime_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E5388.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E5430.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E5484.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E574C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E5988.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E5A00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E5BB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E5ED4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E601C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E616C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E62B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E64D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6538.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6570.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E670C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6828.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E68AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E69AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E69F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6A70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6B08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6B68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6C18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6C44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6C70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6CC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6D58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6E80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6F08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6F50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E6FE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E7048.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E7154.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E71FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E732C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E7354.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E75D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E7770.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E7AF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E7B80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E7D68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E8064.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E836C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E844C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E84DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E88B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E89CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E8C38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E8CCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E90A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E91EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E9778.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E97D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E994C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E9AE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E9DA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E9DD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E9F38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808E9FC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EA14C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EA1C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EA264.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EA2D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EA538.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EA5E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EA748.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EA7A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EA80C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EA860.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EA8FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EA9B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EAA40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EAA8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EAAF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EAB74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EABCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EACEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EAEBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EB0A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EB178.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EB24C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EB328.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EB574.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EB690.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EB708.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EB7F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EB804.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EB83C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EB8B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EB9E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EBBE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EBED0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EC158.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EC354.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/EnBigslime_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EC708.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808EC990.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808ECD14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808ED07C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/EnBigslime_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bigslime_0x808E4FC0/func_808ED3F4.asm") diff --git a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.h b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.h new file mode 100644 index 0000000000..14b64bce7b --- /dev/null +++ b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BIGSLIME_H +#define Z_EN_BIGSLIME_H + +#include + +struct EnBigslime; + +typedef struct EnBigslime { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0x34F0]; +} EnBigslime; // size = 0x3634 + +extern const ActorInit En_Bigslime_InitVars; + +#endif // Z_EN_BIGSLIME_H diff --git a/src/overlays/actors/ovl_En_Bji_01/overlay.cfg b/src/overlays/actors/ovl_En_Bji_01/overlay.cfg new file mode 100644 index 0000000000..6455065bdc --- /dev/null +++ b/src/overlays/actors/ovl_En_Bji_01/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bji_01 +z_en_bji_01.c diff --git a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c new file mode 100644 index 0000000000..c505e088f7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c @@ -0,0 +1,56 @@ +#include "z_en_bji_01.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnBji01*)thisx) + +void EnBji01_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBji01_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBji01_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBji01_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bji_01_InitVars = { + ACTOR_EN_BJI_01, + ACTORTYPE_NPC, + FLAGS, + OBJECT_BJI, + sizeof(EnBji01), + (ActorFunc)EnBji01_Init, + (ActorFunc)EnBji01_Destroy, + (ActorFunc)EnBji01_Update, + (ActorFunc)EnBji01_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/func_809CCDE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/func_809CCE98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/func_809CCEE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/func_809CD028.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/func_809CD328.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/func_809CD634.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/func_809CD6B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/func_809CD6C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/func_809CD70C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/func_809CD77C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/EnBji01_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/EnBji01_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/EnBji01_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/func_809CDA4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/func_809CDB04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bji_01_0x809CCDE0/EnBji01_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h new file mode 100644 index 0000000000..f24070537f --- /dev/null +++ b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BJI_01_H +#define Z_EN_BJI_01_H + +#include + +struct EnBji01; + +typedef struct EnBji01 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x170]; +} EnBji01; // size = 0x2B4 + +extern const ActorInit En_Bji_01_InitVars; + +#endif // Z_EN_BJI_01_H diff --git a/src/overlays/actors/ovl_En_Bjt/overlay.cfg b/src/overlays/actors/ovl_En_Bjt/overlay.cfg new file mode 100644 index 0000000000..ab6f05a540 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bjt/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bjt +z_en_bjt.c diff --git a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c new file mode 100644 index 0000000000..08bde7511a --- /dev/null +++ b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c @@ -0,0 +1,54 @@ +#include "z_en_bjt.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnBjt*)thisx) + +void EnBjt_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBjt_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBjt_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBjt_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bjt_InitVars = { + ACTOR_EN_BJT, + ACTORTYPE_NPC, + FLAGS, + OBJECT_BJT, + sizeof(EnBjt), + (ActorFunc)EnBjt_Init, + (ActorFunc)EnBjt_Destroy, + (ActorFunc)EnBjt_Update, + (ActorFunc)EnBjt_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/func_80BFD2E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/func_80BFD30C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/func_80BFD3A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/func_80BFD434.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/func_80BFD4FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/func_80BFD5E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/func_80BFD6BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/func_80BFD8F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/func_80BFD984.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/func_80BFDA48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/func_80BFDAE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/EnBjt_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/EnBjt_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/EnBjt_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bjt_0x80BFD2E0/EnBjt_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.h b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.h new file mode 100644 index 0000000000..344403868b --- /dev/null +++ b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BJT_H +#define Z_EN_BJT_H + +#include + +struct EnBjt; + +typedef struct EnBjt { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x118]; +} EnBjt; // size = 0x25C + +extern const ActorInit En_Bjt_InitVars; + +#endif // Z_EN_BJT_H diff --git a/src/overlays/actors/ovl_En_Boj_01/overlay.cfg b/src/overlays/actors/ovl_En_Boj_01/overlay.cfg new file mode 100644 index 0000000000..01b4cce6ed --- /dev/null +++ b/src/overlays/actors/ovl_En_Boj_01/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Boj_01 +z_en_boj_01.c diff --git a/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c b/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c new file mode 100644 index 0000000000..b2e134503c --- /dev/null +++ b/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c @@ -0,0 +1,32 @@ +#include "z_en_boj_01.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnBoj01*)thisx) + +void EnBoj01_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBoj01_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBoj01_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBoj01_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Boj_01_InitVars = { + ACTOR_EN_BOJ_01, + ACTORTYPE_NPC, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnBoj01), + (ActorFunc)EnBoj01_Init, + (ActorFunc)EnBoj01_Destroy, + (ActorFunc)EnBoj01_Update, + (ActorFunc)EnBoj01_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_01_0x809C3D80/EnBoj01_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_01_0x809C3D80/EnBoj01_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_01_0x809C3D80/EnBoj01_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_01_0x809C3D80/EnBoj01_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.h b/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.h new file mode 100644 index 0000000000..88d0f66e4d --- /dev/null +++ b/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BOJ_01_H +#define Z_EN_BOJ_01_H + +#include + +struct EnBoj01; + +typedef struct EnBoj01 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1D0]; +} EnBoj01; // size = 0x314 + +extern const ActorInit En_Boj_01_InitVars; + +#endif // Z_EN_BOJ_01_H diff --git a/src/overlays/actors/ovl_En_Boj_02/overlay.cfg b/src/overlays/actors/ovl_En_Boj_02/overlay.cfg new file mode 100644 index 0000000000..7deb95ef2a --- /dev/null +++ b/src/overlays/actors/ovl_En_Boj_02/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Boj_02 +z_en_boj_02.c diff --git a/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c b/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c new file mode 100644 index 0000000000..d9fbc648f2 --- /dev/null +++ b/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c @@ -0,0 +1,32 @@ +#include "z_en_boj_02.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnBoj02*)thisx) + +void EnBoj02_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBoj02_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBoj02_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBoj02_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Boj_02_InitVars = { + ACTOR_EN_BOJ_02, + ACTORTYPE_NPC, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnBoj02), + (ActorFunc)EnBoj02_Init, + (ActorFunc)EnBoj02_Destroy, + (ActorFunc)EnBoj02_Update, + (ActorFunc)EnBoj02_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_02_0x809C3E10/EnBoj02_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_02_0x809C3E10/EnBoj02_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_02_0x809C3E10/EnBoj02_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_02_0x809C3E10/EnBoj02_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.h b/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.h new file mode 100644 index 0000000000..1f0c2d4f73 --- /dev/null +++ b/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BOJ_02_H +#define Z_EN_BOJ_02_H + +#include + +struct EnBoj02; + +typedef struct EnBoj02 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4D8]; +} EnBoj02; // size = 0x61C + +extern const ActorInit En_Boj_02_InitVars; + +#endif // Z_EN_BOJ_02_H diff --git a/src/overlays/actors/ovl_En_Boj_03/overlay.cfg b/src/overlays/actors/ovl_En_Boj_03/overlay.cfg new file mode 100644 index 0000000000..90f393836d --- /dev/null +++ b/src/overlays/actors/ovl_En_Boj_03/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Boj_03 +z_en_boj_03.c diff --git a/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c b/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c new file mode 100644 index 0000000000..f88b1c9b29 --- /dev/null +++ b/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c @@ -0,0 +1,32 @@ +#include "z_en_boj_03.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnBoj03*)thisx) + +void EnBoj03_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBoj03_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBoj03_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBoj03_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Boj_03_InitVars = { + ACTOR_EN_BOJ_03, + ACTORTYPE_NPC, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnBoj03), + (ActorFunc)EnBoj03_Init, + (ActorFunc)EnBoj03_Destroy, + (ActorFunc)EnBoj03_Update, + (ActorFunc)EnBoj03_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_03_0x809C3EA0/EnBoj03_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_03_0x809C3EA0/EnBoj03_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_03_0x809C3EA0/EnBoj03_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_03_0x809C3EA0/EnBoj03_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.h b/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.h new file mode 100644 index 0000000000..545b27fa56 --- /dev/null +++ b/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BOJ_03_H +#define Z_EN_BOJ_03_H + +#include + +struct EnBoj03; + +typedef struct EnBoj03 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4D8]; +} EnBoj03; // size = 0x61C + +extern const ActorInit En_Boj_03_InitVars; + +#endif // Z_EN_BOJ_03_H diff --git a/src/overlays/actors/ovl_En_Boj_04/overlay.cfg b/src/overlays/actors/ovl_En_Boj_04/overlay.cfg new file mode 100644 index 0000000000..fd93a10799 --- /dev/null +++ b/src/overlays/actors/ovl_En_Boj_04/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Boj_04 +z_en_boj_04.c diff --git a/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c b/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c new file mode 100644 index 0000000000..1f0daef1a0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c @@ -0,0 +1,32 @@ +#include "z_en_boj_04.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnBoj04*)thisx) + +void EnBoj04_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBoj04_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBoj04_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBoj04_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Boj_04_InitVars = { + ACTOR_EN_BOJ_04, + ACTORTYPE_NPC, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnBoj04), + (ActorFunc)EnBoj04_Init, + (ActorFunc)EnBoj04_Destroy, + (ActorFunc)EnBoj04_Update, + (ActorFunc)EnBoj04_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_04_0x809CB200/EnBoj04_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_04_0x809CB200/EnBoj04_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_04_0x809CB200/EnBoj04_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_04_0x809CB200/EnBoj04_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.h b/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.h new file mode 100644 index 0000000000..53c80b566a --- /dev/null +++ b/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BOJ_04_H +#define Z_EN_BOJ_04_H + +#include + +struct EnBoj04; + +typedef struct EnBoj04 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4D8]; +} EnBoj04; // size = 0x61C + +extern const ActorInit En_Boj_04_InitVars; + +#endif // Z_EN_BOJ_04_H diff --git a/src/overlays/actors/ovl_En_Boj_05/overlay.cfg b/src/overlays/actors/ovl_En_Boj_05/overlay.cfg new file mode 100644 index 0000000000..038e0e91ca --- /dev/null +++ b/src/overlays/actors/ovl_En_Boj_05/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Boj_05 +z_en_boj_05.c diff --git a/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c b/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c new file mode 100644 index 0000000000..6aa7154554 --- /dev/null +++ b/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c @@ -0,0 +1,32 @@ +#include "z_en_boj_05.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnBoj05*)thisx) + +void EnBoj05_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBoj05_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBoj05_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBoj05_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Boj_05_InitVars = { + ACTOR_EN_BOJ_05, + ACTORTYPE_NPC, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnBoj05), + (ActorFunc)EnBoj05_Init, + (ActorFunc)EnBoj05_Destroy, + (ActorFunc)EnBoj05_Update, + (ActorFunc)EnBoj05_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_05_0x80A0C780/EnBoj05_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_05_0x80A0C780/EnBoj05_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_05_0x80A0C780/EnBoj05_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boj_05_0x80A0C780/EnBoj05_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.h b/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.h new file mode 100644 index 0000000000..0e01946285 --- /dev/null +++ b/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BOJ_05_H +#define Z_EN_BOJ_05_H + +#include + +struct EnBoj05; + +typedef struct EnBoj05 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4D8]; +} EnBoj05; // size = 0x61C + +extern const ActorInit En_Boj_05_InitVars; + +#endif // Z_EN_BOJ_05_H diff --git a/src/overlays/actors/ovl_En_Bom/overlay.cfg b/src/overlays/actors/ovl_En_Bom/overlay.cfg new file mode 100644 index 0000000000..c752520396 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bom/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bom +z_en_bom.c diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c new file mode 100644 index 0000000000..5883712dcf --- /dev/null +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -0,0 +1,44 @@ +#include "z_en_bom.h" + +#define FLAGS 0x00000030 + +#define THIS ((EnBom*)thisx) + +void EnBom_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBom_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBom_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBom_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bom_InitVars = { + ACTOR_EN_BOM, + ACTORTYPE_EXPLOSIVES, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnBom), + (ActorFunc)EnBom_Init, + (ActorFunc)EnBom_Destroy, + (ActorFunc)EnBom_Update, + (ActorFunc)EnBom_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_0x80870DB0/EnBom_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_0x80870DB0/EnBom_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_0x80870DB0/func_80871058.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_0x80870DB0/func_808714D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_0x80870DB0/func_808715B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_0x80870DB0/EnBom_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_0x80870DB0/EnBom_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_0x80870DB0/func_80872648.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_0x80870DB0/func_808726DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_0x80870DB0/func_80872BC0.asm") diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.h b/src/overlays/actors/ovl_En_Bom/z_en_bom.h new file mode 100644 index 0000000000..71d5c55de3 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BOM_H +#define Z_EN_BOM_H + +#include + +struct EnBom; + +typedef struct EnBom { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xC0]; +} EnBom; // size = 0x204 + +extern const ActorInit En_Bom_InitVars; + +#endif // Z_EN_BOM_H diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/overlay.cfg b/src/overlays/actors/ovl_En_Bom_Bowl_Man/overlay.cfg new file mode 100644 index 0000000000..2d762ca9b0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bom_Bowl_Man +z_en_bom_bowl_man.c diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c new file mode 100644 index 0000000000..5af0f81b54 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -0,0 +1,74 @@ +#include "z_en_bom_bowl_man.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnBomBowlMan*)thisx) + +void EnBomBowlMan_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBomBowlMan_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBomBowlMan_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBomBowlMan_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bom_Bowl_Man_InitVars = { + ACTOR_EN_BOM_BOWL_MAN, + ACTORTYPE_NPC, + FLAGS, + OBJECT_CS, + sizeof(EnBomBowlMan), + (ActorFunc)EnBomBowlMan_Init, + (ActorFunc)EnBomBowlMan_Destroy, + (ActorFunc)EnBomBowlMan_Update, + (ActorFunc)EnBomBowlMan_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/EnBomBowlMan_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/EnBomBowlMan_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C493C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C49CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C4B50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C4B6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C4BC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C4DA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C51B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C52B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5310.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C53A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5408.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5524.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5598.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5738.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C59A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C59F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5AA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5B1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5BA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5BF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/EnBomBowlMan_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/func_809C5F44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Bowl_Man_0x809C4790/EnBomBowlMan_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h new file mode 100644 index 0000000000..b7615f8192 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BOM_BOWL_MAN_H +#define Z_EN_BOM_BOWL_MAN_H + +#include + +struct EnBomBowlMan; + +typedef struct EnBomBowlMan { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1B8]; +} EnBomBowlMan; // size = 0x2FC + +extern const ActorInit En_Bom_Bowl_Man_InitVars; + +#endif // Z_EN_BOM_BOWL_MAN_H diff --git a/src/overlays/actors/ovl_En_Bom_Chu/overlay.cfg b/src/overlays/actors/ovl_En_Bom_Chu/overlay.cfg new file mode 100644 index 0000000000..d1b0f7dc2d --- /dev/null +++ b/src/overlays/actors/ovl_En_Bom_Chu/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bom_Chu +z_en_bom_chu.c diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c new file mode 100644 index 0000000000..4aedf8e198 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c @@ -0,0 +1,54 @@ +#include "z_en_bom_chu.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnBomChu*)thisx) + +void EnBomChu_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBomChu_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBomChu_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBomChu_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bom_Chu_InitVars = { + ACTOR_EN_BOM_CHU, + ACTORTYPE_EXPLOSIVES, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnBomChu), + (ActorFunc)EnBomChu_Init, + (ActorFunc)EnBomChu_Destroy, + (ActorFunc)EnBomChu_Update, + (ActorFunc)EnBomChu_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/EnBomChu_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/EnBomChu_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/func_808F75D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/func_808F77E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/func_808F7868.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/func_808F7944.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/func_808F79D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/func_808F7A84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/func_808F7E74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/func_808F7FA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/func_808F7FD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/func_808F8080.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/func_808F818C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/EnBomChu_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bom_Chu_0x808F74B0/EnBomChu_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h new file mode 100644 index 0000000000..3bbea982f4 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BOM_CHU_H +#define Z_EN_BOM_CHU_H + +#include + +struct EnBomChu; + +typedef struct EnBomChu { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x9C]; +} EnBomChu; // size = 0x1E0 + +extern const ActorInit En_Bom_Chu_InitVars; + +#endif // Z_EN_BOM_CHU_H diff --git a/src/overlays/actors/ovl_En_Bombal/overlay.cfg b/src/overlays/actors/ovl_En_Bombal/overlay.cfg new file mode 100644 index 0000000000..a715cfbf52 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bombal/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bombal +z_en_bombal.c diff --git a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c new file mode 100644 index 0000000000..b2188dbf70 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c @@ -0,0 +1,46 @@ +#include "z_en_bombal.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnBombal*)thisx) + +void EnBombal_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBombal_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBombal_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBombal_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bombal_InitVars = { + ACTOR_EN_BOMBAL, + ACTORTYPE_PROP, + FLAGS, + OBJECT_FUSEN, + sizeof(EnBombal), + (ActorFunc)EnBombal_Init, + (ActorFunc)EnBombal_Destroy, + (ActorFunc)EnBombal_Update, + (ActorFunc)EnBombal_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombal_0x80C05A70/EnBombal_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombal_0x80C05A70/EnBombal_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombal_0x80C05A70/func_80C05B24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombal_0x80C05A70/func_80C05B3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombal_0x80C05A70/func_80C05C44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombal_0x80C05A70/func_80C05DE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombal_0x80C05A70/EnBombal_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombal_0x80C05A70/EnBombal_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombal_0x80C05A70/func_80C05F90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombal_0x80C05A70/func_80C060B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombal_0x80C05A70/func_80C06208.asm") diff --git a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.h b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.h new file mode 100644 index 0000000000..4359b03c16 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BOMBAL_H +#define Z_EN_BOMBAL_H + +#include + +struct EnBombal; + +typedef struct EnBombal { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0x2900]; +} EnBombal; // size = 0x2A44 + +extern const ActorInit En_Bombal_InitVars; + +#endif // Z_EN_BOMBAL_H diff --git a/src/overlays/actors/ovl_En_Bombers/overlay.cfg b/src/overlays/actors/ovl_En_Bombers/overlay.cfg new file mode 100644 index 0000000000..95cb0c1f86 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bombers/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bombers +z_en_bombers.c diff --git a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c new file mode 100644 index 0000000000..6fb03062a4 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c @@ -0,0 +1,54 @@ +#include "z_en_bombers.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnBombers*)thisx) + +void EnBombers_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBombers_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBombers_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBombers_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bombers_InitVars = { + ACTOR_EN_BOMBERS, + ACTORTYPE_NPC, + FLAGS, + OBJECT_CS, + sizeof(EnBombers), + (ActorFunc)EnBombers_Init, + (ActorFunc)EnBombers_Destroy, + (ActorFunc)EnBombers_Update, + (ActorFunc)EnBombers_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/EnBombers_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/EnBombers_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/func_80C03824.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/func_80C038B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/func_80C039A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/func_80C03ACC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/func_80C03AF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/func_80C03F64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/func_80C03FAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/func_80C042F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/func_80C04354.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/func_80C043C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/EnBombers_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/func_80C045B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers_0x80C03530/EnBombers_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.h b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.h new file mode 100644 index 0000000000..99e2989dea --- /dev/null +++ b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BOMBERS_H +#define Z_EN_BOMBERS_H + +#include + +struct EnBombers; + +typedef struct EnBombers { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1D0]; +} EnBombers; // size = 0x314 + +extern const ActorInit En_Bombers_InitVars; + +#endif // Z_EN_BOMBERS_H diff --git a/src/overlays/actors/ovl_En_Bombers2/overlay.cfg b/src/overlays/actors/ovl_En_Bombers2/overlay.cfg new file mode 100644 index 0000000000..6cbb956fe2 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bombers2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bombers2 +z_en_bombers2.c diff --git a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c new file mode 100644 index 0000000000..9f4d6aee09 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c @@ -0,0 +1,48 @@ +#include "z_en_bombers2.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnBombers2*)thisx) + +void EnBombers2_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBombers2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBombers2_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBombers2_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bombers2_InitVars = { + ACTOR_EN_BOMBERS2, + ACTORTYPE_NPC, + FLAGS, + OBJECT_CS, + sizeof(EnBombers2), + (ActorFunc)EnBombers2_Init, + (ActorFunc)EnBombers2_Destroy, + (ActorFunc)EnBombers2_Update, + (ActorFunc)EnBombers2_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers2_0x80C04930/EnBombers2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers2_0x80C04930/EnBombers2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers2_0x80C04930/func_80C04AAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers2_0x80C04930/func_80C04B40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers2_0x80C04930/func_80C04BA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers2_0x80C04930/func_80C04D00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers2_0x80C04930/func_80C04D8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers2_0x80C04930/func_80C050B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers2_0x80C04930/func_80C0520C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers2_0x80C04930/EnBombers2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers2_0x80C04930/func_80C056D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombers2_0x80C04930/EnBombers2_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h new file mode 100644 index 0000000000..97145e11cc --- /dev/null +++ b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BOMBERS2_H +#define Z_EN_BOMBERS2_H + +#include + +struct EnBombers2; + +typedef struct EnBombers2 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1D8]; +} EnBombers2; // size = 0x31C + +extern const ActorInit En_Bombers2_InitVars; + +#endif // Z_EN_BOMBERS2_H diff --git a/src/overlays/actors/ovl_En_Bombf/overlay.cfg b/src/overlays/actors/ovl_En_Bombf/overlay.cfg new file mode 100644 index 0000000000..831b98c2ff --- /dev/null +++ b/src/overlays/actors/ovl_En_Bombf/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bombf +z_en_bombf.c diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c new file mode 100644 index 0000000000..b7d61cea62 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -0,0 +1,46 @@ +#include "z_en_bombf.h" + +#define FLAGS 0x00000011 + +#define THIS ((EnBombf*)thisx) + +void EnBombf_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBombf_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBombf_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBombf_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bombf_InitVars = { + ACTOR_EN_BOMBF, + ACTORTYPE_PROP, + FLAGS, + OBJECT_BOMBF, + sizeof(EnBombf), + (ActorFunc)EnBombf_Init, + (ActorFunc)EnBombf_Destroy, + (ActorFunc)EnBombf_Update, + (ActorFunc)EnBombf_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombf_0x808AE8C0/func_808AE8C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombf_0x808AE8C0/EnBombf_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombf_0x808AE8C0/EnBombf_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombf_0x808AE8C0/func_808AEAB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombf_0x808AE8C0/func_808AEAE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombf_0x808AE8C0/func_808AEE3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombf_0x808AE8C0/func_808AEF68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombf_0x808AE8C0/func_808AEFD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombf_0x808AE8C0/EnBombf_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombf_0x808AE8C0/func_808AF86C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bombf_0x808AE8C0/EnBombf_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h new file mode 100644 index 0000000000..6eabd5845e --- /dev/null +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BOMBF_H +#define Z_EN_BOMBF_H + +#include + +struct EnBombf; + +typedef struct EnBombf { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xC4]; +} EnBombf; // size = 0x208 + +extern const ActorInit En_Bombf_InitVars; + +#endif // Z_EN_BOMBF_H diff --git a/src/overlays/actors/ovl_En_Bomjima/overlay.cfg b/src/overlays/actors/ovl_En_Bomjima/overlay.cfg new file mode 100644 index 0000000000..61e77897f1 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bomjima/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bomjima +z_en_bomjima.c diff --git a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c new file mode 100644 index 0000000000..30437009c0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c @@ -0,0 +1,92 @@ +#include "z_en_bomjima.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnBomjima*)thisx) + +void EnBomjima_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBomjima_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBomjima_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBomjima_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bomjima_InitVars = { + ACTOR_EN_BOMJIMA, + ACTORTYPE_NPC, + FLAGS, + OBJECT_CS, + sizeof(EnBomjima), + (ActorFunc)EnBomjima_Init, + (ActorFunc)EnBomjima_Destroy, + (ActorFunc)EnBomjima_Update, + (ActorFunc)EnBomjima_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/EnBomjima_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/EnBomjima_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFE32C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFE494.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFE524.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFE65C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFE67C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFEA94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFEB1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFEB64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFEFF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFF03C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFF120.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFF174.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFF3F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFF430.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFF4F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFF52C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFF6CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFF754.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFF9B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFFB40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFFBC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFFCFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFFD48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFFE48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80BFFF54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80C0011C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80C00168.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80C00234.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80C00284.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/EnBomjima_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/func_80C007F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjima_0x80BFE170/EnBomjima_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.h b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.h new file mode 100644 index 0000000000..6d2f67d403 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BOMJIMA_H +#define Z_EN_BOMJIMA_H + +#include + +struct EnBomjima; + +typedef struct EnBomjima { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x200]; +} EnBomjima; // size = 0x344 + +extern const ActorInit En_Bomjima_InitVars; + +#endif // Z_EN_BOMJIMA_H diff --git a/src/overlays/actors/ovl_En_Bomjimb/overlay.cfg b/src/overlays/actors/ovl_En_Bomjimb/overlay.cfg new file mode 100644 index 0000000000..3b2ee6496a --- /dev/null +++ b/src/overlays/actors/ovl_En_Bomjimb/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bomjimb +z_en_bomjimb.c diff --git a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c new file mode 100644 index 0000000000..32204ccd24 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c @@ -0,0 +1,88 @@ +#include "z_en_bomjimb.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnBomjimb*)thisx) + +void EnBomjimb_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBomjimb_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBomjimb_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBomjimb_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bomjimb_InitVars = { + ACTOR_EN_BOMJIMB, + ACTORTYPE_NPC, + FLAGS, + OBJECT_CS, + sizeof(EnBomjimb), + (ActorFunc)EnBomjimb_Init, + (ActorFunc)EnBomjimb_Destroy, + (ActorFunc)EnBomjimb_Update, + (ActorFunc)EnBomjimb_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/EnBomjimb_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/EnBomjimb_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C0113C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C011CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C012E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C012FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C013B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C013F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C01494.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C014E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C01984.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C01A24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C01B40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C01B74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C01C18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C01CD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C01FD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C0201C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C02108.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C0217C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C0250C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C02570.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C0267C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C02704.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C02740.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C02A14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C02BCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C02CA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C02DAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/EnBomjimb_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/func_80C02FA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bomjimb_0x80C00EA0/EnBomjimb_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.h b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.h new file mode 100644 index 0000000000..32c70c7e91 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BOMJIMB_H +#define Z_EN_BOMJIMB_H + +#include + +struct EnBomjimb; + +typedef struct EnBomjimb { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1F0]; +} EnBomjimb; // size = 0x334 + +extern const ActorInit En_Bomjimb_InitVars; + +#endif // Z_EN_BOMJIMB_H diff --git a/src/overlays/actors/ovl_En_Boom/overlay.cfg b/src/overlays/actors/ovl_En_Boom/overlay.cfg new file mode 100644 index 0000000000..d0ff420fdc --- /dev/null +++ b/src/overlays/actors/ovl_En_Boom/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Boom +z_en_boom.c diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c new file mode 100644 index 0000000000..4f47b0daf6 --- /dev/null +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -0,0 +1,38 @@ +#include "z_en_boom.h" + +#define FLAGS 0x00000030 + +#define THIS ((EnBoom*)thisx) + +void EnBoom_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBoom_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBoom_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBoom_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Boom_InitVars = { + ACTOR_EN_BOOM, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnBoom), + (ActorFunc)EnBoom_Init, + (ActorFunc)EnBoom_Destroy, + (ActorFunc)EnBoom_Update, + (ActorFunc)EnBoom_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boom_0x808A24D0/func_808A24D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boom_0x808A24D0/func_808A24DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boom_0x808A24D0/EnBoom_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boom_0x808A24D0/EnBoom_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boom_0x808A24D0/func_808A2918.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boom_0x808A24D0/EnBoom_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Boom_0x808A24D0/EnBoom_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.h b/src/overlays/actors/ovl_En_Boom/z_en_boom.h new file mode 100644 index 0000000000..5918b1c9d4 --- /dev/null +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BOOM_H +#define Z_EN_BOOM_H + +#include + +struct EnBoom; + +typedef struct EnBoom { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xB0]; +} EnBoom; // size = 0x1F4 + +extern const ActorInit En_Boom_InitVars; + +#endif // Z_EN_BOOM_H diff --git a/src/overlays/actors/ovl_En_Box/overlay.cfg b/src/overlays/actors/ovl_En_Box/overlay.cfg new file mode 100644 index 0000000000..bdbd8b7544 --- /dev/null +++ b/src/overlays/actors/ovl_En_Box/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Box +z_en_box.c diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c new file mode 100644 index 0000000000..8e47b65bb9 --- /dev/null +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -0,0 +1,76 @@ +#include "z_en_box.h" + +#define FLAGS 0x00000000 + +#define THIS ((EnBox*)thisx) + +void EnBox_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBox_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBox_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBox_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Box_InitVars = { + ACTOR_EN_BOX, + ACTORTYPE_CHEST, + FLAGS, + OBJECT_BOX, + sizeof(EnBox), + (ActorFunc)EnBox_Init, + (ActorFunc)EnBox_Destroy, + (ActorFunc)EnBox_Update, + (ActorFunc)EnBox_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80867BD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80867BDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80867C14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80867C8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80867FBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80867FE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_8086800C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/EnBox_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/EnBox_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80868630.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80868734.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_808687E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80868944.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_808689E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80868A6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80868AFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80868B74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80868CC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80869020.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_808692E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/EnBox_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80869600.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80869850.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_80869874.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/func_808698B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Box_0x80867BD0/EnBox_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.h b/src/overlays/actors/ovl_En_Box/z_en_box.h new file mode 100644 index 0000000000..f99f5cf349 --- /dev/null +++ b/src/overlays/actors/ovl_En_Box/z_en_box.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BOX_H +#define Z_EN_BOX_H + +#include + +struct EnBox; + +typedef struct EnBox { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xE0]; +} EnBox; // size = 0x224 + +extern const ActorInit En_Box_InitVars; + +#endif // Z_EN_BOX_H diff --git a/src/overlays/actors/ovl_En_Bsb/overlay.cfg b/src/overlays/actors/ovl_En_Bsb/overlay.cfg new file mode 100644 index 0000000000..8542407fec --- /dev/null +++ b/src/overlays/actors/ovl_En_Bsb/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bsb +z_en_bsb.c diff --git a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c new file mode 100644 index 0000000000..de7d5f7120 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c @@ -0,0 +1,136 @@ +#include "z_en_bsb.h" + +#define FLAGS 0x02000035 + +#define THIS ((EnBsb*)thisx) + +void EnBsb_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBsb_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBsb_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBsb_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bsb_InitVars = { + ACTOR_EN_BSB, + ACTORTYPE_PROP, + FLAGS, + OBJECT_BSB, + sizeof(EnBsb), + (ActorFunc)EnBsb_Init, + (ActorFunc)EnBsb_Destroy, + (ActorFunc)EnBsb_Update, + (ActorFunc)EnBsb_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0B290.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0B31C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/EnBsb_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/EnBsb_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0B888.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0B970.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0BA58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0BC30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0BE1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0BF2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0BFE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0C0F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0C238.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0C32C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0C364.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0C430.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0C484.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0C610.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0C6A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0C86C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0C8EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0CA28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0CB3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0CCCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0CD04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0CD90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0CDE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0CF4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0CFDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0D00C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0D10C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0D214.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0D27C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0D334.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0D384.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0D3C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0D51C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0D964.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0D9B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0DA58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0DB18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0E178.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0E1C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0E3B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0E480.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0E4FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0E618.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0E9CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/EnBsb_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0EEA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0F078.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0F170.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/EnBsb_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0F544.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0F640.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bsb_0x80C0B290/func_80C0F758.asm") diff --git a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.h b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.h new file mode 100644 index 0000000000..2c28184943 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BSB_H +#define Z_EN_BSB_H + +#include + +struct EnBsb; + +typedef struct EnBsb { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0x1014]; +} EnBsb; // size = 0x1158 + +extern const ActorInit En_Bsb_InitVars; + +#endif // Z_EN_BSB_H diff --git a/src/overlays/actors/ovl_En_Bu/overlay.cfg b/src/overlays/actors/ovl_En_Bu/overlay.cfg new file mode 100644 index 0000000000..970a005fb8 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bu/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bu +z_en_bu.c diff --git a/src/overlays/actors/ovl_En_Bu/z_en_bu.c b/src/overlays/actors/ovl_En_Bu/z_en_bu.c new file mode 100644 index 0000000000..bfd7022a98 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bu/z_en_bu.c @@ -0,0 +1,34 @@ +#include "z_en_bu.h" + +#define FLAGS 0x00000001 + +#define THIS ((EnBu*)thisx) + +void EnBu_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBu_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBu_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBu_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bu_InitVars = { + ACTOR_EN_BU, + ACTORTYPE_ENEMY, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnBu), + (ActorFunc)EnBu_Init, + (ActorFunc)EnBu_Destroy, + (ActorFunc)EnBu_Update, + (ActorFunc)EnBu_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bu_0x809ACD90/EnBu_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bu_0x809ACD90/EnBu_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bu_0x809ACD90/func_809ACDB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bu_0x809ACD90/EnBu_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bu_0x809ACD90/EnBu_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bu/z_en_bu.h b/src/overlays/actors/ovl_En_Bu/z_en_bu.h new file mode 100644 index 0000000000..9d5eeb3591 --- /dev/null +++ b/src/overlays/actors/ovl_En_Bu/z_en_bu.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BU_H +#define Z_EN_BU_H + +#include + +struct EnBu; + +typedef struct EnBu { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4C]; +} EnBu; // size = 0x190 + +extern const ActorInit En_Bu_InitVars; + +#endif // Z_EN_BU_H diff --git a/src/overlays/actors/ovl_En_Bubble/overlay.cfg b/src/overlays/actors/ovl_En_Bubble/overlay.cfg new file mode 100644 index 0000000000..9c86d2e3fc --- /dev/null +++ b/src/overlays/actors/ovl_En_Bubble/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Bubble +z_en_bubble.c diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c new file mode 100644 index 0000000000..3aff688eed --- /dev/null +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -0,0 +1,66 @@ +#include "z_en_bubble.h" + +#define FLAGS 0x00000001 + +#define THIS ((EnBubble*)thisx) + +void EnBubble_Init(Actor* thisx, GlobalContext* globalCtx); +void EnBubble_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnBubble_Update(Actor* thisx, GlobalContext* globalCtx); +void EnBubble_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Bubble_InitVars = { + ACTOR_EN_BUBBLE, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_BUBBLE, + sizeof(EnBubble), + (ActorFunc)EnBubble_Init, + (ActorFunc)EnBubble_Destroy, + (ActorFunc)EnBubble_Update, + (ActorFunc)EnBubble_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_8089F4E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_8089F59C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_8089F5D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_8089F5F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_8089F660.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_8089F8BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_8089F908.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_8089F95C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_8089F9E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_8089FA54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_8089FF30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_8089FFCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_808A005C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/EnBubble_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/EnBubble_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_808A029C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_808A0350.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_808A03A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/func_808A03E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/EnBubble_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Bubble_0x8089F4E0/EnBubble_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h new file mode 100644 index 0000000000..4863f4971d --- /dev/null +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BUBBLE_H +#define Z_EN_BUBBLE_H + +#include + +struct EnBubble; + +typedef struct EnBubble { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x114]; +} EnBubble; // size = 0x258 + +extern const ActorInit En_Bubble_InitVars; + +#endif // Z_EN_BUBBLE_H diff --git a/src/overlays/actors/ovl_En_Butte/overlay.cfg b/src/overlays/actors/ovl_En_Butte/overlay.cfg new file mode 100644 index 0000000000..04a22c1083 --- /dev/null +++ b/src/overlays/actors/ovl_En_Butte/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Butte +z_en_butte.c diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/src/overlays/actors/ovl_En_Butte/z_en_butte.c new file mode 100644 index 0000000000..9a1f425dbd --- /dev/null +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -0,0 +1,62 @@ +#include "z_en_butte.h" + +#define FLAGS 0x00000000 + +#define THIS ((EnButte*)thisx) + +void EnButte_Init(Actor* thisx, GlobalContext* globalCtx); +void EnButte_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnButte_Update(Actor* thisx, GlobalContext* globalCtx); +void EnButte_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Butte_InitVars = { + ACTOR_EN_BUTTE, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_FIELD_KEEP, + sizeof(EnButte), + (ActorFunc)EnButte_Init, + (ActorFunc)EnButte_Destroy, + (ActorFunc)EnButte_Update, + (ActorFunc)EnButte_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091C0A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091C124.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091C140.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091C178.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/EnButte_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/EnButte_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091C524.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091C5EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091C6B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091C748.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091C794.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091CB68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091CBB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091CF64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091CFB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091D070.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/func_8091D090.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/EnButte_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Butte_0x8091C0A0/EnButte_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.h b/src/overlays/actors/ovl_En_Butte/z_en_butte.h new file mode 100644 index 0000000000..26ea78b79a --- /dev/null +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_BUTTE_H +#define Z_EN_BUTTE_H + +#include + +struct EnButte; + +typedef struct EnButte { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x11C]; +} EnButte; // size = 0x260 + +extern const ActorInit En_Butte_InitVars; + +#endif // Z_EN_BUTTE_H diff --git a/src/overlays/actors/ovl_En_Cha/overlay.cfg b/src/overlays/actors/ovl_En_Cha/overlay.cfg new file mode 100644 index 0000000000..a409e7d556 --- /dev/null +++ b/src/overlays/actors/ovl_En_Cha/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Cha +z_en_cha.c diff --git a/src/overlays/actors/ovl_En_Cha/z_en_cha.c b/src/overlays/actors/ovl_En_Cha/z_en_cha.c new file mode 100644 index 0000000000..1f0aeb5582 --- /dev/null +++ b/src/overlays/actors/ovl_En_Cha/z_en_cha.c @@ -0,0 +1,36 @@ +#include "z_en_cha.h" + +#define FLAGS 0x00000000 + +#define THIS ((EnCha*)thisx) + +void EnCha_Init(Actor* thisx, GlobalContext* globalCtx); +void EnCha_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnCha_Update(Actor* thisx, GlobalContext* globalCtx); +void EnCha_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Cha_InitVars = { + ACTOR_EN_CHA, + ACTORTYPE_PROP, + FLAGS, + OBJECT_CHA, + sizeof(EnCha), + (ActorFunc)EnCha_Init, + (ActorFunc)EnCha_Destroy, + (ActorFunc)EnCha_Update, + (ActorFunc)EnCha_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cha_0x80BEB520/EnCha_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cha_0x80BEB520/EnCha_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cha_0x80BEB520/func_80BEB5DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cha_0x80BEB520/func_80BEB654.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cha_0x80BEB520/EnCha_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cha_0x80BEB520/EnCha_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Cha/z_en_cha.h b/src/overlays/actors/ovl_En_Cha/z_en_cha.h new file mode 100644 index 0000000000..fa3766ad08 --- /dev/null +++ b/src/overlays/actors/ovl_En_Cha/z_en_cha.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_CHA_H +#define Z_EN_CHA_H + +#include + +struct EnCha; + +typedef struct EnCha { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x50]; +} EnCha; // size = 0x194 + +extern const ActorInit En_Cha_InitVars; + +#endif // Z_EN_CHA_H diff --git a/src/overlays/actors/ovl_En_Clear_Tag/overlay.cfg b/src/overlays/actors/ovl_En_Clear_Tag/overlay.cfg new file mode 100644 index 0000000000..edfefada00 --- /dev/null +++ b/src/overlays/actors/ovl_En_Clear_Tag/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Clear_Tag +z_en_clear_tag.c diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c new file mode 100644 index 0000000000..134ca4324e --- /dev/null +++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c @@ -0,0 +1,54 @@ +#include "z_en_clear_tag.h" + +#define FLAGS 0x00000035 + +#define THIS ((EnClearTag*)thisx) + +void EnClearTag_Init(Actor* thisx, GlobalContext* globalCtx); +void EnClearTag_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnClearTag_Update(Actor* thisx, GlobalContext* globalCtx); +void EnClearTag_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Clear_Tag_InitVars = { + ACTOR_EN_CLEAR_TAG, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnClearTag), + (ActorFunc)EnClearTag_Init, + (ActorFunc)EnClearTag_Destroy, + (ActorFunc)EnClearTag_Update, + (ActorFunc)EnClearTag_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/func_80947F60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/func_809480C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/func_80948264.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/func_809484EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/func_809485A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/func_80948788.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/func_8094899C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/func_80948A54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/EnClearTag_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/EnClearTag_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/func_80949288.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/EnClearTag_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/EnClearTag_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/func_809495F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Clear_Tag_0x80947F60/func_80949BD4.asm") diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h new file mode 100644 index 0000000000..e8fad52079 --- /dev/null +++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_CLEAR_TAG_H +#define Z_EN_CLEAR_TAG_H + +#include + +struct EnClearTag; + +typedef struct EnClearTag { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0x2D40]; +} EnClearTag; // size = 0x2E84 + +extern const ActorInit En_Clear_Tag_InitVars; + +#endif // Z_EN_CLEAR_TAG_H diff --git a/src/overlays/actors/ovl_En_Cne_01/overlay.cfg b/src/overlays/actors/ovl_En_Cne_01/overlay.cfg new file mode 100644 index 0000000000..7678c1374b --- /dev/null +++ b/src/overlays/actors/ovl_En_Cne_01/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Cne_01 +z_en_cne_01.c diff --git a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c new file mode 100644 index 0000000000..2c37916c54 --- /dev/null +++ b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c @@ -0,0 +1,52 @@ +#include "z_en_cne_01.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnCne01*)thisx) + +void EnCne01_Init(Actor* thisx, GlobalContext* globalCtx); +void EnCne01_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnCne01_Update(Actor* thisx, GlobalContext* globalCtx); +void EnCne01_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Cne_01_InitVars = { + ACTOR_EN_CNE_01, + ACTORTYPE_NPC, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnCne01), + (ActorFunc)EnCne01_Init, + (ActorFunc)EnCne01_Destroy, + (ActorFunc)EnCne01_Update, + (ActorFunc)EnCne01_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/func_809CB290.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/func_809CB404.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/func_809CB4A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/func_809CB520.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/func_809CB5A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/func_809CB5D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/func_809CB5FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/EnCne01_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/EnCne01_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/EnCne01_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/func_809CB920.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/func_809CBBC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/func_809CBCA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cne_01_0x809CB290/EnCne01_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.h b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.h new file mode 100644 index 0000000000..ccb80705bb --- /dev/null +++ b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_CNE_01_H +#define Z_EN_CNE_01_H + +#include + +struct EnCne01; + +typedef struct EnCne01 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4D8]; +} EnCne01; // size = 0x61C + +extern const ActorInit En_Cne_01_InitVars; + +#endif // Z_EN_CNE_01_H diff --git a/src/overlays/actors/ovl_En_Col_Man/overlay.cfg b/src/overlays/actors/ovl_En_Col_Man/overlay.cfg new file mode 100644 index 0000000000..4f2df34a66 --- /dev/null +++ b/src/overlays/actors/ovl_En_Col_Man/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Col_Man +z_en_col_man.c diff --git a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c new file mode 100644 index 0000000000..5dd61373dd --- /dev/null +++ b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c @@ -0,0 +1,51 @@ +#include "z_en_col_man.h" + +#define FLAGS 0x00100000 + +#define THIS ((EnColMan*)thisx) + +void EnColMan_Init(Actor* thisx, GlobalContext* globalCtx); +void EnColMan_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnColMan_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Col_Man_InitVars = { + ACTOR_EN_COL_MAN, + ACTORTYPE_MISC, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnColMan), + (ActorFunc)EnColMan_Init, + (ActorFunc)EnColMan_Destroy, + (ActorFunc)EnColMan_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/EnColMan_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/EnColMan_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/func_80AFDD60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/func_80AFDE00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/func_80AFDF00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/func_80AFDF60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/func_80AFDFB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/func_80AFE234.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/func_80AFE25C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/EnColMan_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/func_80AFE414.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/func_80AFE4AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/func_80AFE584.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Col_Man_0x80AFDC40/func_80AFE650.asm") diff --git a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.h b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.h new file mode 100644 index 0000000000..12b9819a49 --- /dev/null +++ b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_COL_MAN_H +#define Z_EN_COL_MAN_H + +#include + +struct EnColMan; + +typedef struct EnColMan { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x5C]; +} EnColMan; // size = 0x1A0 + +extern const ActorInit En_Col_Man_InitVars; + +#endif // Z_EN_COL_MAN_H diff --git a/src/overlays/actors/ovl_En_Cow/overlay.cfg b/src/overlays/actors/ovl_En_Cow/overlay.cfg new file mode 100644 index 0000000000..d7215aa84e --- /dev/null +++ b/src/overlays/actors/ovl_En_Cow/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Cow +z_en_cow.c diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c new file mode 100644 index 0000000000..9992384f43 --- /dev/null +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -0,0 +1,64 @@ +#include "z_en_cow.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnCow*)thisx) + +void EnCow_Init(Actor* thisx, GlobalContext* globalCtx); +void EnCow_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnCow_Update(Actor* thisx, GlobalContext* globalCtx); +void EnCow_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Cow_InitVars = { + ACTOR_EN_COW, + ACTORTYPE_NPC, + FLAGS, + OBJECT_COW, + sizeof(EnCow), + (ActorFunc)EnCow_Init, + (ActorFunc)EnCow_Destroy, + (ActorFunc)EnCow_Update, + (ActorFunc)EnCow_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099C290.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099C328.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099C41C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/EnCow_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/EnCow_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099C880.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099CAA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099CB20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099CB68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099CBCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099CC68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099CCF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099CDA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099CFAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/EnCow_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099D3C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099D4AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099D4FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/EnCow_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Cow_0x8099C290/func_8099D59C.asm") diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.h b/src/overlays/actors/ovl_En_Cow/z_en_cow.h new file mode 100644 index 0000000000..d31bf5b2e0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_COW_H +#define Z_EN_COW_H + +#include + +struct EnCow; + +typedef struct EnCow { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x134]; +} EnCow; // size = 0x278 + +extern const ActorInit En_Cow_InitVars; + +#endif // Z_EN_COW_H diff --git a/src/overlays/actors/ovl_En_Crow/overlay.cfg b/src/overlays/actors/ovl_En_Crow/overlay.cfg new file mode 100644 index 0000000000..deb12c01d7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Crow/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Crow +z_en_crow.c diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c new file mode 100644 index 0000000000..90c2ea8143 --- /dev/null +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -0,0 +1,64 @@ +#include "z_en_crow.h" + +#define FLAGS 0x00005005 + +#define THIS ((EnCrow*)thisx) + +void EnCrow_Init(Actor* thisx, GlobalContext* globalCtx); +void EnCrow_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnCrow_Update(Actor* thisx, GlobalContext* globalCtx); +void EnCrow_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Crow_InitVars = { + ACTOR_EN_CROW, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_CROW, + sizeof(EnCrow), + (ActorFunc)EnCrow_Init, + (ActorFunc)EnCrow_Destroy, + (ActorFunc)EnCrow_Update, + (ActorFunc)EnCrow_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/EnCrow_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/EnCrow_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099AC58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099AC8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099B098.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099B0CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099B318.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099B384.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099B584.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099B6AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099B6C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099B778.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099B838.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099B8EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099B9E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099BAB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/EnCrow_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099BE48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/func_8099BF20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Crow_0x8099AB30/EnCrow_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.h b/src/overlays/actors/ovl_En_Crow/z_en_crow.h new file mode 100644 index 0000000000..021b2d915c --- /dev/null +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_CROW_H +#define Z_EN_CROW_H + +#include + +struct EnCrow; + +typedef struct EnCrow { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x158]; +} EnCrow; // size = 0x29C + +extern const ActorInit En_Crow_InitVars; + +#endif // Z_EN_CROW_H diff --git a/src/overlays/actors/ovl_En_Dai/overlay.cfg b/src/overlays/actors/ovl_En_Dai/overlay.cfg new file mode 100644 index 0000000000..6a1c6a9296 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dai/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Dai +z_en_dai.c diff --git a/src/overlays/actors/ovl_En_Dai/z_en_dai.c b/src/overlays/actors/ovl_En_Dai/z_en_dai.c new file mode 100644 index 0000000000..fc85f02fa6 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dai/z_en_dai.c @@ -0,0 +1,78 @@ +#include "z_en_dai.h" + +#define FLAGS 0x02000039 + +#define THIS ((EnDai*)thisx) + +void EnDai_Init(Actor* thisx, GlobalContext* globalCtx); +void EnDai_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnDai_Update(Actor* thisx, GlobalContext* globalCtx); +void EnDai_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Dai_InitVars = { + ACTOR_EN_DAI, + ACTORTYPE_NPC, + FLAGS, + OBJECT_DAI, + sizeof(EnDai), + (ActorFunc)EnDai_Init, + (ActorFunc)EnDai_Destroy, + (ActorFunc)EnDai_Update, + (ActorFunc)EnDai_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3DFF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3E168.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3E460.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3E5B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3E5DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3E69C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3E7C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3E834.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3E8BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3E96C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3EC10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3EC84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3ED88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3EE8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3EEDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3EF90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3F00C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3F044.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/EnDai_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/EnDai_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/EnDai_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3F598.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3F614.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3F6EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3F78C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/func_80B3F920.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dai_0x80B3DFF0/EnDai_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Dai/z_en_dai.h b/src/overlays/actors/ovl_En_Dai/z_en_dai.h new file mode 100644 index 0000000000..623a9cf1cb --- /dev/null +++ b/src/overlays/actors/ovl_En_Dai/z_en_dai.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_DAI_H +#define Z_EN_DAI_H + +#include + +struct EnDai; + +typedef struct EnDai { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x930]; +} EnDai; // size = 0xA74 + +extern const ActorInit En_Dai_InitVars; + +#endif // Z_EN_DAI_H diff --git a/src/overlays/actors/ovl_En_Daiku/overlay.cfg b/src/overlays/actors/ovl_En_Daiku/overlay.cfg new file mode 100644 index 0000000000..cde668b4bf --- /dev/null +++ b/src/overlays/actors/ovl_En_Daiku/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Daiku +z_en_daiku.c diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c new file mode 100644 index 0000000000..abe8d8e494 --- /dev/null +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -0,0 +1,48 @@ +#include "z_en_daiku.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnDaiku*)thisx) + +void EnDaiku_Init(Actor* thisx, GlobalContext* globalCtx); +void EnDaiku_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnDaiku_Update(Actor* thisx, GlobalContext* globalCtx); +void EnDaiku_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Daiku_InitVars = { + ACTOR_EN_DAIKU, + ACTORTYPE_NPC, + FLAGS, + OBJECT_DAIKU, + sizeof(EnDaiku), + (ActorFunc)EnDaiku_Init, + (ActorFunc)EnDaiku_Destroy, + (ActorFunc)EnDaiku_Update, + (ActorFunc)EnDaiku_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku_0x809434B0/EnDaiku_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku_0x809434B0/EnDaiku_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku_0x809434B0/func_8094373C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku_0x809434B0/func_809437C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku_0x809434B0/func_80943820.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku_0x809434B0/func_809438F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku_0x809434B0/func_80943BC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku_0x809434B0/func_80943BDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku_0x809434B0/EnDaiku_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku_0x809434B0/func_80943E18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku_0x809434B0/func_80943E60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku_0x809434B0/EnDaiku_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h new file mode 100644 index 0000000000..605bae4e57 --- /dev/null +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_DAIKU_H +#define Z_EN_DAIKU_H + +#include + +struct EnDaiku; + +typedef struct EnDaiku { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1A4]; +} EnDaiku; // size = 0x2E8 + +extern const ActorInit En_Daiku_InitVars; + +#endif // Z_EN_DAIKU_H diff --git a/src/overlays/actors/ovl_En_Daiku2/overlay.cfg b/src/overlays/actors/ovl_En_Daiku2/overlay.cfg new file mode 100644 index 0000000000..c5eafa2b80 --- /dev/null +++ b/src/overlays/actors/ovl_En_Daiku2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Daiku2 +z_en_daiku2.c diff --git a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c new file mode 100644 index 0000000000..e59accf1cc --- /dev/null +++ b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c @@ -0,0 +1,66 @@ +#include "z_en_daiku2.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnDaiku2*)thisx) + +void EnDaiku2_Init(Actor* thisx, GlobalContext* globalCtx); +void EnDaiku2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnDaiku2_Update(Actor* thisx, GlobalContext* globalCtx); +void EnDaiku2_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Daiku2_InitVars = { + ACTOR_EN_DAIKU2, + ACTORTYPE_NPC, + FLAGS, + OBJECT_DAIKU, + sizeof(EnDaiku2), + (ActorFunc)EnDaiku2_Init, + (ActorFunc)EnDaiku2_Destroy, + (ActorFunc)EnDaiku2_Update, + (ActorFunc)EnDaiku2_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE61D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/EnDaiku2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/EnDaiku2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE6408.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE64C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE65B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE66E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE6B40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE6BC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE6CFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE6D40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE6EB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE6EF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE71A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE71D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/EnDaiku2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE738C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/EnDaiku2_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE7504.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE7600.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Daiku2_0x80BE61D0/func_80BE7718.asm") diff --git a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.h b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.h new file mode 100644 index 0000000000..154b65b945 --- /dev/null +++ b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_DAIKU2_H +#define Z_EN_DAIKU2_H + +#include + +struct EnDaiku2; + +typedef struct EnDaiku2 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xC84]; +} EnDaiku2; // size = 0xDC8 + +extern const ActorInit En_Daiku2_InitVars; + +#endif // Z_EN_DAIKU2_H diff --git a/src/overlays/actors/ovl_En_Death/overlay.cfg b/src/overlays/actors/ovl_En_Death/overlay.cfg new file mode 100644 index 0000000000..17c27c8508 --- /dev/null +++ b/src/overlays/actors/ovl_En_Death/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Death +z_en_death.c diff --git a/src/overlays/actors/ovl_En_Death/z_en_death.c b/src/overlays/actors/ovl_En_Death/z_en_death.c new file mode 100644 index 0000000000..31d510adb6 --- /dev/null +++ b/src/overlays/actors/ovl_En_Death/z_en_death.c @@ -0,0 +1,140 @@ +#include "z_en_death.h" + +#define FLAGS 0x00001035 + +#define THIS ((EnDeath*)thisx) + +void EnDeath_Init(Actor* thisx, GlobalContext* globalCtx); +void EnDeath_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnDeath_Update(Actor* thisx, GlobalContext* globalCtx); +void EnDeath_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Death_InitVars = { + ACTOR_EN_DEATH, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_DEATH, + sizeof(EnDeath), + (ActorFunc)EnDeath_Init, + (ActorFunc)EnDeath_Destroy, + (ActorFunc)EnDeath_Update, + (ActorFunc)EnDeath_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/EnDeath_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/EnDeath_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C5310.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C5394.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C5428.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C54F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C566C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C571C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C589C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C597C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C5AB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C5C0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C5CB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C5D6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C5E90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C5F58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C6070.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C645C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C64DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C6620.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C66A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C67C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C682C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C68B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C692C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C6A08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C6AB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C6C5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C6CDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C6D40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C6F6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C70D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C72AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C74A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C74F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7800.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7888.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7A30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7AAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7AEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7B88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7C04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7C88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7CFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7D34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7DB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7DCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7E24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C7EDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/EnDeath_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C84A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C8690.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C882C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C8D18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C9160.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C9220.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/func_808C9340.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Death_0x808C4F80/EnDeath_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Death/z_en_death.h b/src/overlays/actors/ovl_En_Death/z_en_death.h new file mode 100644 index 0000000000..60ffad95e6 --- /dev/null +++ b/src/overlays/actors/ovl_En_Death/z_en_death.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_DEATH_H +#define Z_EN_DEATH_H + +#include + +struct EnDeath; + +typedef struct EnDeath { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x7F4]; +} EnDeath; // size = 0x938 + +extern const ActorInit En_Death_InitVars; + +#endif // Z_EN_DEATH_H diff --git a/src/overlays/actors/ovl_En_Dekubaba/overlay.cfg b/src/overlays/actors/ovl_En_Dekubaba/overlay.cfg new file mode 100644 index 0000000000..cb209dea47 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dekubaba/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Dekubaba +z_en_dekubaba.c diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c new file mode 100644 index 0000000000..c0656e8b2b --- /dev/null +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -0,0 +1,114 @@ +#include "z_en_dekubaba.h" + +#define FLAGS 0x00000405 + +#define THIS ((EnDekubaba*)thisx) + +void EnDekubaba_Init(Actor* thisx, GlobalContext* globalCtx); +void EnDekubaba_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnDekubaba_Update(Actor* thisx, GlobalContext* globalCtx); +void EnDekubaba_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Dekubaba_InitVars = { + ACTOR_EN_DEKUBABA, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_DEKUBABA, + sizeof(EnDekubaba), + (ActorFunc)EnDekubaba_Init, + (ActorFunc)EnDekubaba_Destroy, + (ActorFunc)EnDekubaba_Update, + (ActorFunc)EnDekubaba_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/EnDekubaba_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/EnDekubaba_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B1530.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B15B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B16BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B1798.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B1814.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B18A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B1B14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B1BC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B1CF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B2158.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B2240.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B2608.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B2660.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B2890.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B28B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B2980.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B29C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B2C40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B2CB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3044.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3078.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3170.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3280.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3390.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3404.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3768.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B37E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B39AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3B48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3BE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3C50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3D74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3DA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3E40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3EE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B3F50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/EnDekubaba_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B4548.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B465C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B48FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B49C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/func_808B4ABC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekubaba_0x808B1330/EnDekubaba_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h new file mode 100644 index 0000000000..fe5cdb90bb --- /dev/null +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_DEKUBABA_H +#define Z_EN_DEKUBABA_H + +#include + +struct EnDekubaba; + +typedef struct EnDekubaba { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2D8]; +} EnDekubaba; // size = 0x41C + +extern const ActorInit En_Dekubaba_InitVars; + +#endif // Z_EN_DEKUBABA_H diff --git a/src/overlays/actors/ovl_En_Dekunuts/overlay.cfg b/src/overlays/actors/ovl_En_Dekunuts/overlay.cfg new file mode 100644 index 0000000000..dbbc3d2ed8 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dekunuts/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Dekunuts +z_en_dekunuts.c diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c new file mode 100644 index 0000000000..b824dfb0cd --- /dev/null +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -0,0 +1,92 @@ +#include "z_en_dekunuts.h" + +#define FLAGS 0x00000005 + +#define THIS ((EnDekunuts*)thisx) + +void EnDekunuts_Init(Actor* thisx, GlobalContext* globalCtx); +void EnDekunuts_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnDekunuts_Update(Actor* thisx, GlobalContext* globalCtx); +void EnDekunuts_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Dekunuts_InitVars = { + ACTOR_EN_DEKUNUTS, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_DEKUNUTS, + sizeof(EnDekunuts), + (ActorFunc)EnDekunuts_Init, + (ActorFunc)EnDekunuts_Destroy, + (ActorFunc)EnDekunuts_Update, + (ActorFunc)EnDekunuts_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/EnDekunuts_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/EnDekunuts_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BD348.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BD3B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BD428.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BD49C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BD78C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BD7D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BD870.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BD8D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BDA08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BDA4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BDC9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BDCF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BDD54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BDE7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BDEF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BDF60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BDFB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BE1CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BE22C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BE294.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BE358.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BE3A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BE3FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BE484.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BE4D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BE680.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BE6C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BE73C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/EnDekunuts_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BEBD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/func_808BED30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dekunuts_0x808BD1E0/EnDekunuts_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h new file mode 100644 index 0000000000..d246df5f5e --- /dev/null +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_DEKUNUTS_H +#define Z_EN_DEKUNUTS_H + +#include + +struct EnDekunuts; + +typedef struct EnDekunuts { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x184]; +} EnDekunuts; // size = 0x2C8 + +extern const ActorInit En_Dekunuts_InitVars; + +#endif // Z_EN_DEKUNUTS_H diff --git a/src/overlays/actors/ovl_En_Demo_heishi/overlay.cfg b/src/overlays/actors/ovl_En_Demo_heishi/overlay.cfg new file mode 100644 index 0000000000..bff118f72a --- /dev/null +++ b/src/overlays/actors/ovl_En_Demo_heishi/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Demo_heishi +z_en_demo_heishi.c diff --git a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c new file mode 100644 index 0000000000..facf0e4f4c --- /dev/null +++ b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c @@ -0,0 +1,46 @@ +#include "z_en_demo_heishi.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnDemoheishi*)thisx) + +void EnDemoheishi_Init(Actor* thisx, GlobalContext* globalCtx); +void EnDemoheishi_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnDemoheishi_Update(Actor* thisx, GlobalContext* globalCtx); +void EnDemoheishi_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Demo_heishi_InitVars = { + ACTOR_EN_DEMO_HEISHI, + ACTORTYPE_NPC, + FLAGS, + OBJECT_SDN, + sizeof(EnDemoheishi), + (ActorFunc)EnDemoheishi_Init, + (ActorFunc)EnDemoheishi_Destroy, + (ActorFunc)EnDemoheishi_Update, + (ActorFunc)EnDemoheishi_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Demo_heishi_0x80BE9510/EnDemoheishi_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Demo_heishi_0x80BE9510/EnDemoheishi_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Demo_heishi_0x80BE9510/func_80BE95EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Demo_heishi_0x80BE9510/func_80BE9678.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Demo_heishi_0x80BE9510/func_80BE970C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Demo_heishi_0x80BE9510/func_80BE975C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Demo_heishi_0x80BE9510/func_80BE97F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Demo_heishi_0x80BE9510/func_80BE980C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Demo_heishi_0x80BE9510/EnDemoheishi_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Demo_heishi_0x80BE9510/func_80BE9974.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Demo_heishi_0x80BE9510/EnDemoheishi_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.h b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.h new file mode 100644 index 0000000000..f41fc980d0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_DEMO_HEISHI_H +#define Z_EN_DEMO_HEISHI_H + +#include + +struct EnDemoheishi; + +typedef struct EnDemoheishi { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x17C]; +} EnDemoheishi; // size = 0x2C0 + +extern const ActorInit En_Demo_heishi_InitVars; + +#endif // Z_EN_DEMO_HEISHI_H diff --git a/src/overlays/actors/ovl_En_Dg/overlay.cfg b/src/overlays/actors/ovl_En_Dg/overlay.cfg new file mode 100644 index 0000000000..b9e9281163 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dg/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Dg +z_en_dg.c diff --git a/src/overlays/actors/ovl_En_Dg/z_en_dg.c b/src/overlays/actors/ovl_En_Dg/z_en_dg.c new file mode 100644 index 0000000000..2d17682a04 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dg/z_en_dg.c @@ -0,0 +1,122 @@ +#include "z_en_dg.h" + +#define FLAGS 0x00800019 + +#define THIS ((EnDg*)thisx) + +void EnDg_Init(Actor* thisx, GlobalContext* globalCtx); +void EnDg_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnDg_Update(Actor* thisx, GlobalContext* globalCtx); +void EnDg_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Dg_InitVars = { + ACTOR_EN_DG, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_DOG, + sizeof(EnDg), + (ActorFunc)EnDg_Init, + (ActorFunc)EnDg_Destroy, + (ActorFunc)EnDg_Update, + (ActorFunc)EnDg_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989140.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989204.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098933C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989418.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_809895B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989674.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989864.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989974.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_809899C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989A08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989A48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989A9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989ADC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989BF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989D38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989E18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_80989FC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098A064.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098A1B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098A234.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098A468.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098A55C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098A618.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098A70C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098A89C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098A938.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098AAAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098AB48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098AC34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098AE58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098AF44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098AF98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098B004.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098B198.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098B28C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098B390.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098B464.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098B560.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098B88C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098BA64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098BB10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098BBEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098BC54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/EnDg_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/EnDg_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/EnDg_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098BFB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/func_8098BFD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dg_0x80989140/EnDg_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Dg/z_en_dg.h b/src/overlays/actors/ovl_En_Dg/z_en_dg.h new file mode 100644 index 0000000000..42b0d4b8af --- /dev/null +++ b/src/overlays/actors/ovl_En_Dg/z_en_dg.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_DG_H +#define Z_EN_DG_H + +#include + +struct EnDg; + +typedef struct EnDg { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x15C]; +} EnDg; // size = 0x2A0 + +extern const ActorInit En_Dg_InitVars; + +#endif // Z_EN_DG_H diff --git a/src/overlays/actors/ovl_En_Dinofos/overlay.cfg b/src/overlays/actors/ovl_En_Dinofos/overlay.cfg new file mode 100644 index 0000000000..61af267959 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dinofos/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Dinofos +z_en_dinofos.c diff --git a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c new file mode 100644 index 0000000000..58091f6691 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c @@ -0,0 +1,144 @@ +#include "z_en_dinofos.h" + +#define FLAGS 0x00000435 + +#define THIS ((EnDinofos*)thisx) + +void EnDinofos_Init(Actor* thisx, GlobalContext* globalCtx); +void EnDinofos_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnDinofos_Update(Actor* thisx, GlobalContext* globalCtx); +void EnDinofos_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Dinofos_InitVars = { + ACTOR_EN_DINOFOS, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_DINOFOS, + sizeof(EnDinofos), + (ActorFunc)EnDinofos_Init, + (ActorFunc)EnDinofos_Destroy, + (ActorFunc)EnDinofos_Update, + (ActorFunc)EnDinofos_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/EnDinofos_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/EnDinofos_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089A900.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089A968.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089A9B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089ABF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089AC70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089ACEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089AD70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089AE00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089B100.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089B288.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089B320.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089B3D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089B4A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089B580.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089B6E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089B72C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089B7B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089B834.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089B8B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089B98C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089BAC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089BB60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089BBB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089BD28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C024.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C0DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C164.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C1F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C244.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C2A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C398.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C44C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C4F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C56C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C690.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C724.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C784.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C7B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C87C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089C938.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089CA14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089CA74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089CB10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089CBEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089CF00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089CF70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089CFAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089D018.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089D11C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089D1E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089D2E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089D318.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089D42C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089D60C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/EnDinofos_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089DC4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/func_8089DC84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dinofos_0x8089A6E0/EnDinofos_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.h b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.h new file mode 100644 index 0000000000..337bba9b75 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_DINOFOS_H +#define Z_EN_DINOFOS_H + +#include + +struct EnDinofos; + +typedef struct EnDinofos { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x500]; +} EnDinofos; // size = 0x644 + +extern const ActorInit En_Dinofos_InitVars; + +#endif // Z_EN_DINOFOS_H diff --git a/src/overlays/actors/ovl_En_Dnb/overlay.cfg b/src/overlays/actors/ovl_En_Dnb/overlay.cfg new file mode 100644 index 0000000000..074d3340a5 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dnb/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Dnb +z_en_dnb.c diff --git a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c new file mode 100644 index 0000000000..156a56ec13 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c @@ -0,0 +1,50 @@ +#include "z_en_dnb.h" + +#define FLAGS 0x000000B0 + +#define THIS ((EnDnb*)thisx) + +void EnDnb_Init(Actor* thisx, GlobalContext* globalCtx); +void EnDnb_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnDnb_Update(Actor* thisx, GlobalContext* globalCtx); +void EnDnb_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Dnb_InitVars = { + ACTOR_EN_DNB, + ACTORTYPE_BG, + FLAGS, + OBJECT_HANAREYAMA_OBJ, + sizeof(EnDnb), + (ActorFunc)EnDnb_Init, + (ActorFunc)EnDnb_Destroy, + (ActorFunc)EnDnb_Update, + (ActorFunc)EnDnb_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/func_80A4FDD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/func_80A4FEBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/func_80A4FFE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/func_80A500F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/EnDnb_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/EnDnb_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/EnDnb_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/func_80A50510.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/func_80A5063C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/EnDnb_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/func_80A507C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/func_80A5086C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnb_0x80A4FDD0/func_80A50950.asm") diff --git a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.h b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.h new file mode 100644 index 0000000000..0bc3c7b611 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_DNB_H +#define Z_EN_DNB_H + +#include + +struct EnDnb; + +typedef struct EnDnb { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0x33F4]; +} EnDnb; // size = 0x3538 + +extern const ActorInit En_Dnb_InitVars; + +#endif // Z_EN_DNB_H diff --git a/src/overlays/actors/ovl_En_Dnh/overlay.cfg b/src/overlays/actors/ovl_En_Dnh/overlay.cfg new file mode 100644 index 0000000000..85a45176f6 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dnh/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Dnh +z_en_dnh.c diff --git a/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c new file mode 100644 index 0000000000..17722a40f8 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c @@ -0,0 +1,46 @@ +#include "z_en_dnh.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnDnh*)thisx) + +void EnDnh_Init(Actor* thisx, GlobalContext* globalCtx); +void EnDnh_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnDnh_Update(Actor* thisx, GlobalContext* globalCtx); +void EnDnh_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Dnh_InitVars = { + ACTOR_EN_DNH, + ACTORTYPE_NPC, + FLAGS, + OBJECT_TRO, + sizeof(EnDnh), + (ActorFunc)EnDnh_Init, + (ActorFunc)EnDnh_Destroy, + (ActorFunc)EnDnh_Update, + (ActorFunc)EnDnh_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnh_0x80A50D40/func_80A50D40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnh_0x80A50D40/func_80A50DF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnh_0x80A50D40/func_80A50E40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnh_0x80A50D40/func_80A50EC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnh_0x80A50D40/func_80A50F38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnh_0x80A50D40/func_80A50F9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnh_0x80A50D40/EnDnh_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnh_0x80A50D40/EnDnh_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnh_0x80A50D40/EnDnh_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnh_0x80A50D40/func_80A51168.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnh_0x80A50D40/EnDnh_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Dnh/z_en_dnh.h b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.h new file mode 100644 index 0000000000..1157d5afd7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_DNH_H +#define Z_EN_DNH_H + +#include + +struct EnDnh; + +typedef struct EnDnh { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x78]; +} EnDnh; // size = 0x1BC + +extern const ActorInit En_Dnh_InitVars; + +#endif // Z_EN_DNH_H diff --git a/src/overlays/actors/ovl_En_Dnk/overlay.cfg b/src/overlays/actors/ovl_En_Dnk/overlay.cfg new file mode 100644 index 0000000000..93ce82d2ce --- /dev/null +++ b/src/overlays/actors/ovl_En_Dnk/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Dnk +z_en_dnk.c diff --git a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c new file mode 100644 index 0000000000..e668e0a22d --- /dev/null +++ b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c @@ -0,0 +1,57 @@ +#include "z_en_dnk.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnDnk*)thisx) + +void EnDnk_Init(Actor* thisx, GlobalContext* globalCtx); +void EnDnk_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnDnk_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Dnk_InitVars = { + ACTOR_EN_DNK, + ACTORTYPE_NPC, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnDnk), + (ActorFunc)EnDnk_Init, + (ActorFunc)EnDnk_Destroy, + (ActorFunc)EnDnk_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A514F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A515C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A51648.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A51890.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A518DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/EnDnk_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/EnDnk_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/EnDnk_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A51A78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A51AA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A51CB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A51D78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A51DA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A51FC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A52018.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A52074.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnk_0x80A514F0/func_80A52134.asm") diff --git a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.h b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.h new file mode 100644 index 0000000000..aa9208d5e5 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_DNK_H +#define Z_EN_DNK_H + +#include + +struct EnDnk; + +typedef struct EnDnk { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x160]; +} EnDnk; // size = 0x2A4 + +extern const ActorInit En_Dnk_InitVars; + +#endif // Z_EN_DNK_H diff --git a/src/overlays/actors/ovl_En_Dno/overlay.cfg b/src/overlays/actors/ovl_En_Dno/overlay.cfg new file mode 100644 index 0000000000..9aa2bd93c1 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dno/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Dno +z_en_dno.c diff --git a/src/overlays/actors/ovl_En_Dno/z_en_dno.c b/src/overlays/actors/ovl_En_Dno/z_en_dno.c new file mode 100644 index 0000000000..8244943027 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dno/z_en_dno.c @@ -0,0 +1,96 @@ +#include "z_en_dno.h" + +#define FLAGS 0x00000039 + +#define THIS ((EnDno*)thisx) + +void EnDno_Init(Actor* thisx, GlobalContext* globalCtx); +void EnDno_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnDno_Update(Actor* thisx, GlobalContext* globalCtx); +void EnDno_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Dno_InitVars = { + ACTOR_EN_DNO, + ACTORTYPE_NPC, + FLAGS, + OBJECT_DNO, + sizeof(EnDno), + (ActorFunc)EnDno_Init, + (ActorFunc)EnDno_Destroy, + (ActorFunc)EnDno_Update, + (ActorFunc)EnDno_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A711D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A71424.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A714B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A7153C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A715DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A71788.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/EnDno_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/EnDno_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A71B04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A71B58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A71B68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A71C3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A71E54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A71F18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A72438.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A724B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A7256C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A72598.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A725E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A725F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A72AE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A72B3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A72B84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A72BA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A72C04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A72CF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A72D8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A72FAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A730A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A73244.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A732C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A73408.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/EnDno_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/EnDno_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A7361C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dno_0x80A711D0/func_80A73654.asm") diff --git a/src/overlays/actors/ovl_En_Dno/z_en_dno.h b/src/overlays/actors/ovl_En_Dno/z_en_dno.h new file mode 100644 index 0000000000..1eac1215ba --- /dev/null +++ b/src/overlays/actors/ovl_En_Dno/z_en_dno.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_DNO_H +#define Z_EN_DNO_H + +#include + +struct EnDno; + +typedef struct EnDno { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x328]; +} EnDno; // size = 0x46C + +extern const ActorInit En_Dno_InitVars; + +#endif // Z_EN_DNO_H diff --git a/src/overlays/actors/ovl_En_Dnp/overlay.cfg b/src/overlays/actors/ovl_En_Dnp/overlay.cfg new file mode 100644 index 0000000000..ea78e5340c --- /dev/null +++ b/src/overlays/actors/ovl_En_Dnp/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Dnp +z_en_dnp.c diff --git a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c new file mode 100644 index 0000000000..5fd75a704b --- /dev/null +++ b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c @@ -0,0 +1,66 @@ +#include "z_en_dnp.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnDnp*)thisx) + +void EnDnp_Init(Actor* thisx, GlobalContext* globalCtx); +void EnDnp_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnDnp_Update(Actor* thisx, GlobalContext* globalCtx); +void EnDnp_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Dnp_InitVars = { + ACTOR_EN_DNP, + ACTORTYPE_NPC, + FLAGS, + OBJECT_DNP, + sizeof(EnDnp), + (ActorFunc)EnDnp_Init, + (ActorFunc)EnDnp_Destroy, + (ActorFunc)EnDnp_Update, + (ActorFunc)EnDnp_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3CA20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3CC38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3CC80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3CD1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3CDA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3CEC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3CF60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3D044.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3D11C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3D2D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3D338.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3D3F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3D47C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3D558.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/EnDnp_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/EnDnp_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/EnDnp_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3D974.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3DA88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/func_80B3DAA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnp_0x80B3CA20/EnDnp_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.h b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.h new file mode 100644 index 0000000000..728d092050 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_DNP_H +#define Z_EN_DNP_H + +#include + +struct EnDnp; + +typedef struct EnDnp { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x200]; +} EnDnp; // size = 0x344 + +extern const ActorInit En_Dnp_InitVars; + +#endif // Z_EN_DNP_H diff --git a/src/overlays/actors/ovl_En_Dnq/overlay.cfg b/src/overlays/actors/ovl_En_Dnq/overlay.cfg new file mode 100644 index 0000000000..169a416214 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dnq/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Dnq +z_en_dnq.c diff --git a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c new file mode 100644 index 0000000000..6a89e25f06 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c @@ -0,0 +1,60 @@ +#include "z_en_dnq.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnDnq*)thisx) + +void EnDnq_Init(Actor* thisx, GlobalContext* globalCtx); +void EnDnq_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnDnq_Update(Actor* thisx, GlobalContext* globalCtx); +void EnDnq_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Dnq_InitVars = { + ACTOR_EN_DNQ, + ACTORTYPE_NPC, + FLAGS, + OBJECT_DNQ, + sizeof(EnDnq), + (ActorFunc)EnDnq_Init, + (ActorFunc)EnDnq_Destroy, + (ActorFunc)EnDnq_Update, + (ActorFunc)EnDnq_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A52530.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A5257C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A52604.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A52648.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A526F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A52944.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A52A78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A52B68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A52C6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A52CF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A52D44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A52DC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A52FB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/func_80A53038.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/EnDnq_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/EnDnq_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/EnDnq_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dnq_0x80A52530/EnDnq_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.h b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.h new file mode 100644 index 0000000000..fe0c03aee7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_DNQ_H +#define Z_EN_DNQ_H + +#include + +struct EnDnq; + +typedef struct EnDnq { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x264]; +} EnDnq; // size = 0x3A8 + +extern const ActorInit En_Dnq_InitVars; + +#endif // Z_EN_DNQ_H diff --git a/src/overlays/actors/ovl_En_Dns/overlay.cfg b/src/overlays/actors/ovl_En_Dns/overlay.cfg new file mode 100644 index 0000000000..3fc03b2179 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dns/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Dns +z_en_dns.c diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c new file mode 100644 index 0000000000..3c6a186225 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -0,0 +1,78 @@ +#include "z_en_dns.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnDns*)thisx) + +void EnDns_Init(Actor* thisx, GlobalContext* globalCtx); +void EnDns_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnDns_Update(Actor* thisx, GlobalContext* globalCtx); +void EnDns_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Dns_InitVars = { + ACTOR_EN_DNS, + ACTORTYPE_NPC, + FLAGS, + OBJECT_DNS, + sizeof(EnDns), + (ActorFunc)EnDns_Init, + (ActorFunc)EnDns_Destroy, + (ActorFunc)EnDns_Update, + (ActorFunc)EnDns_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092C5C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092C63C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092C6FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092C740.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092C86C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092C934.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092C9BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092CA74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092CAD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092CB98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092CC68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092CCEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092CE38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092D068.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092D108.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092D1B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092D320.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092D330.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092D4D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092D5E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/EnDns_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/EnDns_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/EnDns_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092D954.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092DA68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/func_8092DA94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dns_0x8092C5C0/EnDns_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.h b/src/overlays/actors/ovl_En_Dns/z_en_dns.h new file mode 100644 index 0000000000..bbf05ba362 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_DNS_H +#define Z_EN_DNS_H + +#include + +struct EnDns; + +typedef struct EnDns { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1BC]; +} EnDns; // size = 0x300 + +extern const ActorInit En_Dns_InitVars; + +#endif // Z_EN_DNS_H diff --git a/src/overlays/actors/ovl_En_Dodongo/overlay.cfg b/src/overlays/actors/ovl_En_Dodongo/overlay.cfg new file mode 100644 index 0000000000..05d2f0a6e7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dodongo/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Dodongo +z_en_dodongo.c diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c new file mode 100644 index 0000000000..a89619eb12 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -0,0 +1,90 @@ +#include "z_en_dodongo.h" + +#define FLAGS 0x00000405 + +#define THIS ((EnDodongo*)thisx) + +void EnDodongo_Init(Actor* thisx, GlobalContext* globalCtx); +void EnDodongo_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnDodongo_Update(Actor* thisx, GlobalContext* globalCtx); +void EnDodongo_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Dodongo_InitVars = { + ACTOR_EN_DODONGO, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_DODONGO, + sizeof(EnDodongo), + (ActorFunc)EnDodongo_Init, + (ActorFunc)EnDodongo_Destroy, + (ActorFunc)EnDodongo_Update, + (ActorFunc)EnDodongo_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/EnDodongo_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/EnDodongo_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80876930.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80876B08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80876BD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80876CAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80876D28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80876DC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_8087721C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80877278.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_808773C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80877424.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80877494.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80877500.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_808777A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_8087784C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80877D50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80877D90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80877DE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80877E60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80878354.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80878424.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80878594.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_808785B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_8087864C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_808786C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80878724.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_808787B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80878910.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/EnDodongo_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80878E44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/func_80878EB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dodongo_0x80876670/EnDodongo_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h new file mode 100644 index 0000000000..5dec05feb9 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_DODONGO_H +#define Z_EN_DODONGO_H + +#include + +struct EnDodongo; + +typedef struct EnDodongo { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x6D0]; +} EnDodongo; // size = 0x814 + +extern const ActorInit En_Dodongo_InitVars; + +#endif // Z_EN_DODONGO_H diff --git a/src/overlays/actors/ovl_En_Door/overlay.cfg b/src/overlays/actors/ovl_En_Door/overlay.cfg new file mode 100644 index 0000000000..9c737bc9dd --- /dev/null +++ b/src/overlays/actors/ovl_En_Door/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Door +z_en_door.c diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c new file mode 100644 index 0000000000..a745dc98ea --- /dev/null +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -0,0 +1,46 @@ +#include "z_en_door.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnDoor*)thisx) + +void EnDoor_Init(Actor* thisx, GlobalContext* globalCtx); +void EnDoor_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnDoor_Update(Actor* thisx, GlobalContext* globalCtx); +void EnDoor_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Door_InitVars = { + ACTOR_EN_DOOR, + ACTORTYPE_DOOR, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnDoor), + (ActorFunc)EnDoor_Init, + (ActorFunc)EnDoor_Destroy, + (ActorFunc)EnDoor_Update, + (ActorFunc)EnDoor_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Door_0x80866800/EnDoor_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Door_0x80866800/EnDoor_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Door_0x80866800/func_80866A5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Door_0x80866800/func_80866B20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Door_0x80866800/func_80866F94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Door_0x80866800/func_8086704C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Door_0x80866800/func_80867080.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Door_0x80866800/func_808670F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Door_0x80866800/func_80867144.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Door_0x80866800/EnDoor_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Door_0x80866800/func_80867350.asm") diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.h b/src/overlays/actors/ovl_En_Door/z_en_door.h new file mode 100644 index 0000000000..9ece0d90c0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Door/z_en_door.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_DOOR_H +#define Z_EN_DOOR_H + +#include + +struct EnDoor; + +typedef struct EnDoor { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x88]; +} EnDoor; // size = 0x1CC + +extern const ActorInit En_Door_InitVars; + +#endif // Z_EN_DOOR_H diff --git a/src/overlays/actors/ovl_En_Door_Etc/overlay.cfg b/src/overlays/actors/ovl_En_Door_Etc/overlay.cfg new file mode 100644 index 0000000000..fa6a13d8a2 --- /dev/null +++ b/src/overlays/actors/ovl_En_Door_Etc/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Door_Etc +z_en_door_etc.c diff --git a/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c new file mode 100644 index 0000000000..aea7d6c782 --- /dev/null +++ b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c @@ -0,0 +1,43 @@ +#include "z_en_door_etc.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnDoorEtc*)thisx) + +void EnDoorEtc_Init(Actor* thisx, GlobalContext* globalCtx); +void EnDoorEtc_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnDoorEtc_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Door_Etc_InitVars = { + ACTOR_EN_DOOR_ETC, + ACTORTYPE_DOOR, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnDoorEtc), + (ActorFunc)EnDoorEtc_Init, + (ActorFunc)EnDoorEtc_Destroy, + (ActorFunc)EnDoorEtc_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Door_Etc_0x80AC1ED0/EnDoorEtc_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Door_Etc_0x80AC1ED0/EnDoorEtc_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Door_Etc_0x80AC1ED0/func_80AC2044.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Door_Etc_0x80AC1ED0/func_80AC20A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Door_Etc_0x80AC1ED0/func_80AC2118.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Door_Etc_0x80AC1ED0/func_80AC2154.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Door_Etc_0x80AC1ED0/func_80AC21A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Door_Etc_0x80AC1ED0/func_80AC2354.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Door_Etc_0x80AC1ED0/EnDoorEtc_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Door_Etc_0x80AC1ED0/func_80AC24A8.asm") diff --git a/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.h b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.h new file mode 100644 index 0000000000..55e2c15995 --- /dev/null +++ b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_DOOR_ETC_H +#define Z_EN_DOOR_ETC_H + +#include + +struct EnDoorEtc; + +typedef struct EnDoorEtc { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xB8]; +} EnDoorEtc; // size = 0x1FC + +extern const ActorInit En_Door_Etc_InitVars; + +#endif // Z_EN_DOOR_ETC_H diff --git a/src/overlays/actors/ovl_En_Dragon/overlay.cfg b/src/overlays/actors/ovl_En_Dragon/overlay.cfg new file mode 100644 index 0000000000..2720fb7f17 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dragon/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Dragon +z_en_dragon.c diff --git a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c new file mode 100644 index 0000000000..199f55526c --- /dev/null +++ b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c @@ -0,0 +1,66 @@ +#include "z_en_dragon.h" + +#define FLAGS 0x00000035 + +#define THIS ((EnDragon*)thisx) + +void EnDragon_Init(Actor* thisx, GlobalContext* globalCtx); +void EnDragon_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnDragon_Update(Actor* thisx, GlobalContext* globalCtx); +void EnDragon_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Dragon_InitVars = { + ACTOR_EN_DRAGON, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_UTUBO, + sizeof(EnDragon), + (ActorFunc)EnDragon_Init, + (ActorFunc)EnDragon_Destroy, + (ActorFunc)EnDragon_Update, + (ActorFunc)EnDragon_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/EnDragon_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/EnDragon_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5EAA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5EB40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5ED90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5EDF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5EE3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5EF88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5EFD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5F3A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5F418.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5F508.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5F888.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5F8D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5FCC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B5FD68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B60138.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/EnDragon_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B6043C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/func_80B60494.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dragon_0x80B5E890/EnDragon_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.h b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.h new file mode 100644 index 0000000000..3cf87d8db2 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_DRAGON_H +#define Z_EN_DRAGON_H + +#include + +struct EnDragon; + +typedef struct EnDragon { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x3B8]; +} EnDragon; // size = 0x4FC + +extern const ActorInit En_Dragon_InitVars; + +#endif // Z_EN_DRAGON_H diff --git a/src/overlays/actors/ovl_En_Drs/overlay.cfg b/src/overlays/actors/ovl_En_Drs/overlay.cfg new file mode 100644 index 0000000000..7a0ab3db7b --- /dev/null +++ b/src/overlays/actors/ovl_En_Drs/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Drs +z_en_drs.c diff --git a/src/overlays/actors/ovl_En_Drs/z_en_drs.c b/src/overlays/actors/ovl_En_Drs/z_en_drs.c new file mode 100644 index 0000000000..78e6f272db --- /dev/null +++ b/src/overlays/actors/ovl_En_Drs/z_en_drs.c @@ -0,0 +1,39 @@ +#include "z_en_drs.h" + +#define FLAGS 0x00000000 + +#define THIS ((EnDrs*)thisx) + +void EnDrs_Init(Actor* thisx, GlobalContext* globalCtx); +void EnDrs_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnDrs_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Drs_InitVars = { + ACTOR_EN_DRS, + ACTORTYPE_PROP, + FLAGS, + OBJECT_DRS, + sizeof(EnDrs), + (ActorFunc)EnDrs_Init, + (ActorFunc)EnDrs_Destroy, + (ActorFunc)EnDrs_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Drs_0x80C1E290/func_80C1E290.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Drs_0x80C1E290/func_80C1E2D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Drs_0x80C1E290/func_80C1E3DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Drs_0x80C1E290/EnDrs_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Drs_0x80C1E290/EnDrs_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Drs_0x80C1E290/EnDrs_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Drs_0x80C1E290/func_80C1E4B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Drs_0x80C1E290/func_80C1E568.asm") diff --git a/src/overlays/actors/ovl_En_Drs/z_en_drs.h b/src/overlays/actors/ovl_En_Drs/z_en_drs.h new file mode 100644 index 0000000000..e644408c66 --- /dev/null +++ b/src/overlays/actors/ovl_En_Drs/z_en_drs.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_DRS_H +#define Z_EN_DRS_H + +#include + +struct EnDrs; + +typedef struct EnDrs { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xC8]; +} EnDrs; // size = 0x20C + +extern const ActorInit En_Drs_InitVars; + +#endif // Z_EN_DRS_H diff --git a/src/overlays/actors/ovl_En_Ds2n/overlay.cfg b/src/overlays/actors/ovl_En_Ds2n/overlay.cfg new file mode 100644 index 0000000000..d0764f1c1a --- /dev/null +++ b/src/overlays/actors/ovl_En_Ds2n/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ds2n +z_en_ds2n.c diff --git a/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c new file mode 100644 index 0000000000..05b78dfc6f --- /dev/null +++ b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c @@ -0,0 +1,42 @@ +#include "z_en_ds2n.h" + +#define FLAGS 0x02000019 + +#define THIS ((EnDs2n*)thisx) + +void EnDs2n_Init(Actor* thisx, GlobalContext* globalCtx); +void EnDs2n_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnDs2n_Update(Actor* thisx, GlobalContext* globalCtx); +void EnDs2n_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ds2n_InitVars = { + ACTOR_EN_DS2N, + ACTORTYPE_NPC, + FLAGS, + OBJECT_DS2N, + sizeof(EnDs2n), + (ActorFunc)EnDs2n_Init, + (ActorFunc)EnDs2n_Destroy, + (ActorFunc)EnDs2n_Update, + (ActorFunc)EnDs2n_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ds2n_0x80AE1650/func_80AE1650.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ds2n_0x80AE1650/func_80AE16A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ds2n_0x80AE1650/func_80AE16D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ds2n_0x80AE1650/EnDs2n_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ds2n_0x80AE1650/EnDs2n_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ds2n_0x80AE1650/EnDs2n_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ds2n_0x80AE1650/func_80AE1874.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ds2n_0x80AE1650/func_80AE18B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ds2n_0x80AE1650/EnDs2n_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.h b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.h new file mode 100644 index 0000000000..e4579560f3 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_DS2N_H +#define Z_EN_DS2N_H + +#include + +struct EnDs2n; + +typedef struct EnDs2n { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xF0]; +} EnDs2n; // size = 0x234 + +extern const ActorInit En_Ds2n_InitVars; + +#endif // Z_EN_DS2N_H diff --git a/src/overlays/actors/ovl_En_Dt/overlay.cfg b/src/overlays/actors/ovl_En_Dt/overlay.cfg new file mode 100644 index 0000000000..6eb5532378 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dt/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Dt +z_en_dt.c diff --git a/src/overlays/actors/ovl_En_Dt/z_en_dt.c b/src/overlays/actors/ovl_En_Dt/z_en_dt.c new file mode 100644 index 0000000000..d8c4c2d098 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dt/z_en_dt.c @@ -0,0 +1,68 @@ +#include "z_en_dt.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnDt*)thisx) + +void EnDt_Init(Actor* thisx, GlobalContext* globalCtx); +void EnDt_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnDt_Update(Actor* thisx, GlobalContext* globalCtx); +void EnDt_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Dt_InitVars = { + ACTOR_EN_DT, + ACTORTYPE_NPC, + FLAGS, + OBJECT_DT, + sizeof(EnDt), + (ActorFunc)EnDt_Init, + (ActorFunc)EnDt_Destroy, + (ActorFunc)EnDt_Update, + (ActorFunc)EnDt_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/EnDt_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/EnDt_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BE9C74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BE9CE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BE9D9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BE9DF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BE9E94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BE9EF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BEA088.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BEA254.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BEA394.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BEA8F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BEAAF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BEAB44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BEABF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BEAC84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BEAD2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BEADB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BEADD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/EnDt_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/func_80BEB06C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dt_0x80BE9B20/EnDt_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Dt/z_en_dt.h b/src/overlays/actors/ovl_En_Dt/z_en_dt.h new file mode 100644 index 0000000000..f43c9f8949 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dt/z_en_dt.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_DT_H +#define Z_EN_DT_H + +#include + +struct EnDt; + +typedef struct EnDt { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x19C]; +} EnDt; // size = 0x2E0 + +extern const ActorInit En_Dt_InitVars; + +#endif // Z_EN_DT_H diff --git a/src/overlays/actors/ovl_En_Dy_Extra/overlay.cfg b/src/overlays/actors/ovl_En_Dy_Extra/overlay.cfg new file mode 100644 index 0000000000..04c14d5ce2 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dy_Extra/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Dy_Extra +z_en_dy_extra.c diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c new file mode 100644 index 0000000000..65b6e4ee61 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c @@ -0,0 +1,36 @@ +#include "z_en_dy_extra.h" + +#define FLAGS 0x00000030 + +#define THIS ((EnDyExtra*)thisx) + +void EnDyExtra_Init(Actor* thisx, GlobalContext* globalCtx); +void EnDyExtra_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnDyExtra_Update(Actor* thisx, GlobalContext* globalCtx); +void EnDyExtra_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Dy_Extra_InitVars = { + ACTOR_EN_DY_EXTRA, + ACTORTYPE_PROP, + FLAGS, + OBJECT_DY_OBJ, + sizeof(EnDyExtra), + (ActorFunc)EnDyExtra_Init, + (ActorFunc)EnDyExtra_Destroy, + (ActorFunc)EnDyExtra_Update, + (ActorFunc)EnDyExtra_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dy_Extra_0x80A612B0/EnDyExtra_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dy_Extra_0x80A612B0/EnDyExtra_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dy_Extra_0x80A612B0/func_80A61334.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dy_Extra_0x80A612B0/func_80A613C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dy_Extra_0x80A612B0/EnDyExtra_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Dy_Extra_0x80A612B0/EnDyExtra_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h new file mode 100644 index 0000000000..beac4b5a78 --- /dev/null +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_DY_EXTRA_H +#define Z_EN_DY_EXTRA_H + +#include + +struct EnDyExtra; + +typedef struct EnDyExtra { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x28]; +} EnDyExtra; // size = 0x16C + +extern const ActorInit En_Dy_Extra_InitVars; + +#endif // Z_EN_DY_EXTRA_H diff --git a/src/overlays/actors/ovl_En_Egblock/overlay.cfg b/src/overlays/actors/ovl_En_Egblock/overlay.cfg new file mode 100644 index 0000000000..c80635d344 --- /dev/null +++ b/src/overlays/actors/ovl_En_Egblock/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Egblock +z_en_egblock.c diff --git a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c new file mode 100644 index 0000000000..c2e8813da9 --- /dev/null +++ b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c @@ -0,0 +1,44 @@ +#include "z_en_egblock.h" + +#define FLAGS 0x08000000 + +#define THIS ((EnEgblock*)thisx) + +void EnEgblock_Init(Actor* thisx, GlobalContext* globalCtx); +void EnEgblock_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnEgblock_Update(Actor* thisx, GlobalContext* globalCtx); +void EnEgblock_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Egblock_InitVars = { + ACTOR_EN_EGBLOCK, + ACTORTYPE_PROP, + FLAGS, + OBJECT_EG, + sizeof(EnEgblock), + (ActorFunc)EnEgblock_Init, + (ActorFunc)EnEgblock_Destroy, + (ActorFunc)EnEgblock_Update, + (ActorFunc)EnEgblock_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egblock_0x80ABA7A0/EnEgblock_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egblock_0x80ABA7A0/EnEgblock_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egblock_0x80ABA7A0/func_80ABA8A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egblock_0x80ABA7A0/func_80ABA988.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egblock_0x80ABA7A0/func_80ABA9B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egblock_0x80ABA7A0/EnEgblock_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egblock_0x80ABA7A0/EnEgblock_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egblock_0x80ABA7A0/func_80ABAAF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egblock_0x80ABA7A0/func_80ABACB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egblock_0x80ABA7A0/func_80ABAE64.asm") diff --git a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.h b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.h new file mode 100644 index 0000000000..24b8986920 --- /dev/null +++ b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_EGBLOCK_H +#define Z_EN_EGBLOCK_H + +#include + +struct EnEgblock; + +typedef struct EnEgblock { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xC70]; +} EnEgblock; // size = 0xDB4 + +extern const ActorInit En_Egblock_InitVars; + +#endif // Z_EN_EGBLOCK_H diff --git a/src/overlays/actors/ovl_En_Egol/overlay.cfg b/src/overlays/actors/ovl_En_Egol/overlay.cfg new file mode 100644 index 0000000000..1073044cd8 --- /dev/null +++ b/src/overlays/actors/ovl_En_Egol/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Egol +z_en_egol.c diff --git a/src/overlays/actors/ovl_En_Egol/z_en_egol.c b/src/overlays/actors/ovl_En_Egol/z_en_egol.c new file mode 100644 index 0000000000..83f3a055f7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Egol/z_en_egol.c @@ -0,0 +1,108 @@ +#include "z_en_egol.h" + +#define FLAGS 0x80000035 + +#define THIS ((EnEgol*)thisx) + +void EnEgol_Init(Actor* thisx, GlobalContext* globalCtx); +void EnEgol_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnEgol_Update(Actor* thisx, GlobalContext* globalCtx); +void EnEgol_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Egol_InitVars = { + ACTOR_EN_EGOL, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_EG, + sizeof(EnEgol), + (ActorFunc)EnEgol_Init, + (ActorFunc)EnEgol_Destroy, + (ActorFunc)EnEgol_Update, + (ActorFunc)EnEgol_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7C990.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7CA18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7CBC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7CD08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/EnEgol_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/EnEgol_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7D140.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7D168.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7D1E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7D240.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7D27C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7D2C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7D710.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7D780.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7DAAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7DAF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7E2E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7E344.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7E478.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7E4B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7E7EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7E820.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7E924.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7E970.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7E9D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7EA28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7EA88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7EAD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7EB14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7EB54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7EB90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7EBDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7EC84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7ED14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7EFB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/EnEgol_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7F8E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A7FAFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/EnEgol_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A80508.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A80750.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Egol_0x80A7C990/func_80A80904.asm") diff --git a/src/overlays/actors/ovl_En_Egol/z_en_egol.h b/src/overlays/actors/ovl_En_Egol/z_en_egol.h new file mode 100644 index 0000000000..527f146cc8 --- /dev/null +++ b/src/overlays/actors/ovl_En_Egol/z_en_egol.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_EGOL_H +#define Z_EN_EGOL_H + +#include + +struct EnEgol; + +typedef struct EnEgol { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0x1D2C]; +} EnEgol; // size = 0x1E70 + +extern const ActorInit En_Egol_InitVars; + +#endif // Z_EN_EGOL_H diff --git a/src/overlays/actors/ovl_En_Elf/overlay.cfg b/src/overlays/actors/ovl_En_Elf/overlay.cfg new file mode 100644 index 0000000000..cc1ddac286 --- /dev/null +++ b/src/overlays/actors/ovl_En_Elf/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Elf +z_en_elf.c diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/src/overlays/actors/ovl_En_Elf/z_en_elf.c new file mode 100644 index 0000000000..f904962f9f --- /dev/null +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -0,0 +1,116 @@ +#include "z_en_elf.h" + +#define FLAGS 0x02000030 + +#define THIS ((EnElf*)thisx) + +void EnElf_Init(Actor* thisx, GlobalContext* globalCtx); +void EnElf_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnElf_Update(Actor* thisx, GlobalContext* globalCtx); +void EnElf_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Elf_InitVars = { + ACTOR_EN_ELF, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnElf), + (ActorFunc)EnElf_Init, + (ActorFunc)EnElf_Destroy, + (ActorFunc)EnElf_Update, + (ActorFunc)EnElf_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088C510.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088C51C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088C804.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088C858.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088C920.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088C9CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088CBAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088CC48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088CD3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/EnElf_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/EnElf_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088D3EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088D470.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088D504.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088D5A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088D660.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088D7F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088D864.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088D8D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088D9BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088DB4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088DCA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088DD34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088E018.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088E0E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088E0F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088E304.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088E484.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088E5A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088E60C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088E850.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088EF18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088EFA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088F214.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088F5F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088F9E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088FA38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088FC34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088FD04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088FDCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8088FE64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_8089010C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/EnElf_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_80890494.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/EnElf_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elf_0x8088C510/func_808908D0.asm") diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.h b/src/overlays/actors/ovl_En_Elf/z_en_elf.h new file mode 100644 index 0000000000..ea6dbb23c2 --- /dev/null +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ELF_H +#define Z_EN_ELF_H + +#include + +struct EnElf; + +typedef struct EnElf { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x130]; +} EnElf; // size = 0x274 + +extern const ActorInit En_Elf_InitVars; + +#endif // Z_EN_ELF_H diff --git a/src/overlays/actors/ovl_En_Elfbub/overlay.cfg b/src/overlays/actors/ovl_En_Elfbub/overlay.cfg new file mode 100644 index 0000000000..91957fdd0f --- /dev/null +++ b/src/overlays/actors/ovl_En_Elfbub/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Elfbub +z_en_elfbub.c diff --git a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c new file mode 100644 index 0000000000..a240931fc6 --- /dev/null +++ b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c @@ -0,0 +1,36 @@ +#include "z_en_elfbub.h" + +#define FLAGS 0x00000001 + +#define THIS ((EnElfbub*)thisx) + +void EnElfbub_Init(Actor* thisx, GlobalContext* globalCtx); +void EnElfbub_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnElfbub_Update(Actor* thisx, GlobalContext* globalCtx); +void EnElfbub_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Elfbub_InitVars = { + ACTOR_EN_ELFBUB, + ACTORTYPE_MISC, + FLAGS, + OBJECT_BUBBLE, + sizeof(EnElfbub), + (ActorFunc)EnElfbub_Init, + (ActorFunc)EnElfbub_Destroy, + (ActorFunc)EnElfbub_Update, + (ActorFunc)EnElfbub_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfbub_0x80ACDCD0/EnElfbub_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfbub_0x80ACDCD0/EnElfbub_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfbub_0x80ACDCD0/func_80ACDE60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfbub_0x80ACDCD0/func_80ACE030.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfbub_0x80ACDCD0/EnElfbub_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfbub_0x80ACDCD0/EnElfbub_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.h b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.h new file mode 100644 index 0000000000..e85397810e --- /dev/null +++ b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ELFBUB_H +#define Z_EN_ELFBUB_H + +#include + +struct EnElfbub; + +typedef struct EnElfbub { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x60]; +} EnElfbub; // size = 0x1A4 + +extern const ActorInit En_Elfbub_InitVars; + +#endif // Z_EN_ELFBUB_H diff --git a/src/overlays/actors/ovl_En_Elfgrp/overlay.cfg b/src/overlays/actors/ovl_En_Elfgrp/overlay.cfg new file mode 100644 index 0000000000..a371edb2f8 --- /dev/null +++ b/src/overlays/actors/ovl_En_Elfgrp/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Elfgrp +z_en_elfgrp.c diff --git a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c new file mode 100644 index 0000000000..0a8813c99b --- /dev/null +++ b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c @@ -0,0 +1,73 @@ +#include "z_en_elfgrp.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnElfgrp*)thisx) + +void EnElfgrp_Init(Actor* thisx, GlobalContext* globalCtx); +void EnElfgrp_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnElfgrp_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Elfgrp_InitVars = { + ACTOR_EN_ELFGRP, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnElfgrp), + (ActorFunc)EnElfgrp_Init, + (ActorFunc)EnElfgrp_Destroy, + (ActorFunc)EnElfgrp_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A396B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/EnElfgrp_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/EnElfgrp_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A39BD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A39C1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A39CD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A39DC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A39F50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A39FBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A044.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A0AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A0F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A210.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A274.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A398.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A484.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A4AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A520.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A600.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A610.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A6F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A77C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A7FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/func_80A3A8F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elfgrp_0x80A396B0/EnElfgrp_Update.asm") diff --git a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.h b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.h new file mode 100644 index 0000000000..396e4c3e88 --- /dev/null +++ b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ELFGRP_H +#define Z_EN_ELFGRP_H + +#include + +struct EnElfgrp; + +typedef struct EnElfgrp { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xC]; +} EnElfgrp; // size = 0x150 + +extern const ActorInit En_Elfgrp_InitVars; + +#endif // Z_EN_ELFGRP_H diff --git a/src/overlays/actors/ovl_En_Elforg/overlay.cfg b/src/overlays/actors/ovl_En_Elforg/overlay.cfg new file mode 100644 index 0000000000..124b13ce0b --- /dev/null +++ b/src/overlays/actors/ovl_En_Elforg/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Elforg +z_en_elforg.c diff --git a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c new file mode 100644 index 0000000000..404f7a7f76 --- /dev/null +++ b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c @@ -0,0 +1,74 @@ +#include "z_en_elforg.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnElforg*)thisx) + +void EnElforg_Init(Actor* thisx, GlobalContext* globalCtx); +void EnElforg_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnElforg_Update(Actor* thisx, GlobalContext* globalCtx); +void EnElforg_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Elforg_InitVars = { + ACTOR_EN_ELFORG, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnElforg), + (ActorFunc)EnElforg_Init, + (ActorFunc)EnElforg_Destroy, + (ActorFunc)EnElforg_Update, + (ActorFunc)EnElforg_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACC470.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/EnElforg_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/EnElforg_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACC7E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACC8D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACC934.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACC994.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACCAC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACCBB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACCBD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACCC98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACCE4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACCEB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACD088.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACD164.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACD1B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACD1F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACD2E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACD59C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACD610.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACD6A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACD6EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/EnElforg_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/func_80ACD878.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Elforg_0x80ACC470/EnElforg_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.h b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.h new file mode 100644 index 0000000000..07fa10765a --- /dev/null +++ b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ELFORG_H +#define Z_EN_ELFORG_H + +#include + +struct EnElforg; + +typedef struct EnElforg { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xEC]; +} EnElforg; // size = 0x230 + +extern const ActorInit En_Elforg_InitVars; + +#endif // Z_EN_ELFORG_H diff --git a/src/overlays/actors/ovl_En_Encount1/overlay.cfg b/src/overlays/actors/ovl_En_Encount1/overlay.cfg new file mode 100644 index 0000000000..132566c389 --- /dev/null +++ b/src/overlays/actors/ovl_En_Encount1/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Encount1 +z_en_encount1.c diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c new file mode 100644 index 0000000000..1399c646bb --- /dev/null +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -0,0 +1,28 @@ +#include "z_en_encount1.h" + +#define FLAGS 0x08100010 + +#define THIS ((EnEncount1*)thisx) + +void EnEncount1_Init(Actor* thisx, GlobalContext* globalCtx); +void EnEncount1_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Encount1_InitVars = { + ACTOR_EN_ENCOUNT1, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnEncount1), + (ActorFunc)EnEncount1_Init, + (ActorFunc)NULL, + (ActorFunc)EnEncount1_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount1_0x808E0830/EnEncount1_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount1_0x808E0830/func_808E0954.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount1_0x808E0830/EnEncount1_Update.asm") diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h new file mode 100644 index 0000000000..51d6d2310a --- /dev/null +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ENCOUNT1_H +#define Z_EN_ENCOUNT1_H + +#include + +struct EnEncount1; + +typedef struct EnEncount1 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x20]; +} EnEncount1; // size = 0x164 + +extern const ActorInit En_Encount1_InitVars; + +#endif // Z_EN_ENCOUNT1_H diff --git a/src/overlays/actors/ovl_En_Encount2/overlay.cfg b/src/overlays/actors/ovl_En_Encount2/overlay.cfg new file mode 100644 index 0000000000..31c83ff6fd --- /dev/null +++ b/src/overlays/actors/ovl_En_Encount2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Encount2 +z_en_encount2.c diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c new file mode 100644 index 0000000000..861c7fc750 --- /dev/null +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -0,0 +1,46 @@ +#include "z_en_encount2.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnEncount2*)thisx) + +void EnEncount2_Init(Actor* thisx, GlobalContext* globalCtx); +void EnEncount2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnEncount2_Update(Actor* thisx, GlobalContext* globalCtx); +void EnEncount2_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Encount2_InitVars = { + ACTOR_EN_ENCOUNT2, + ACTORTYPE_PROP, + FLAGS, + OBJECT_FUSEN, + sizeof(EnEncount2), + (ActorFunc)EnEncount2_Init, + (ActorFunc)EnEncount2_Destroy, + (ActorFunc)EnEncount2_Update, + (ActorFunc)EnEncount2_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount2_0x808E1560/EnEncount2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount2_0x808E1560/EnEncount2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount2_0x808E1560/func_808E16FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount2_0x808E1560/func_808E1714.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount2_0x808E1560/func_808E17C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount2_0x808E1560/func_808E18A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount2_0x808E1560/EnEncount2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount2_0x808E1560/EnEncount2_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount2_0x808E1560/func_808E1A24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount2_0x808E1560/func_808E1B4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount2_0x808E1560/func_808E1C9C.asm") diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h new file mode 100644 index 0000000000..89da358c0e --- /dev/null +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ENCOUNT2_H +#define Z_EN_ENCOUNT2_H + +#include + +struct EnEncount2; + +typedef struct EnEncount2 { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0x292C]; +} EnEncount2; // size = 0x2A70 + +extern const ActorInit En_Encount2_InitVars; + +#endif // Z_EN_ENCOUNT2_H diff --git a/src/overlays/actors/ovl_En_Encount3/overlay.cfg b/src/overlays/actors/ovl_En_Encount3/overlay.cfg new file mode 100644 index 0000000000..5527756557 --- /dev/null +++ b/src/overlays/actors/ovl_En_Encount3/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Encount3 +z_en_encount3.c diff --git a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c new file mode 100644 index 0000000000..8802c85428 --- /dev/null +++ b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c @@ -0,0 +1,40 @@ +#include "z_en_encount3.h" + +#define FLAGS 0x08000030 + +#define THIS ((EnEncount3*)thisx) + +void EnEncount3_Init(Actor* thisx, GlobalContext* globalCtx); +void EnEncount3_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnEncount3_Update(Actor* thisx, GlobalContext* globalCtx); +void EnEncount3_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Encount3_InitVars = { + ACTOR_EN_ENCOUNT3, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_BIG_FWALL, + sizeof(EnEncount3), + (ActorFunc)EnEncount3_Init, + (ActorFunc)EnEncount3_Destroy, + (ActorFunc)EnEncount3_Update, + (ActorFunc)EnEncount3_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount3_0x809ACF40/EnEncount3_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount3_0x809ACF40/EnEncount3_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount3_0x809ACF40/func_809AD058.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount3_0x809ACF40/func_809AD084.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount3_0x809ACF40/func_809AD194.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount3_0x809ACF40/func_809AD1EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount3_0x809ACF40/EnEncount3_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount3_0x809ACF40/EnEncount3_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.h b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.h new file mode 100644 index 0000000000..236375f1c3 --- /dev/null +++ b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ENCOUNT3_H +#define Z_EN_ENCOUNT3_H + +#include + +struct EnEncount3; + +typedef struct EnEncount3 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x88]; +} EnEncount3; // size = 0x1CC + +extern const ActorInit En_Encount3_InitVars; + +#endif // Z_EN_ENCOUNT3_H diff --git a/src/overlays/actors/ovl_En_Encount4/overlay.cfg b/src/overlays/actors/ovl_En_Encount4/overlay.cfg new file mode 100644 index 0000000000..124d2e4b4d --- /dev/null +++ b/src/overlays/actors/ovl_En_Encount4/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Encount4 +z_en_encount4.c diff --git a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c new file mode 100644 index 0000000000..279bb6fb7f --- /dev/null +++ b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c @@ -0,0 +1,39 @@ +#include "z_en_encount4.h" + +#define FLAGS 0x08000010 + +#define THIS ((EnEncount4*)thisx) + +void EnEncount4_Init(Actor* thisx, GlobalContext* globalCtx); +void EnEncount4_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnEncount4_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Encount4_InitVars = { + ACTOR_EN_ENCOUNT4, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnEncount4), + (ActorFunc)EnEncount4_Init, + (ActorFunc)EnEncount4_Destroy, + (ActorFunc)EnEncount4_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount4_0x809C3F30/EnEncount4_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount4_0x809C3F30/EnEncount4_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount4_0x809C3F30/func_809C3FD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount4_0x809C3F30/func_809C4078.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount4_0x809C3F30/func_809C42A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount4_0x809C3F30/func_809C4598.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount4_0x809C3F30/func_809C464C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Encount4_0x809C3F30/EnEncount4_Update.asm") diff --git a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.h b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.h new file mode 100644 index 0000000000..da8890c995 --- /dev/null +++ b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ENCOUNT4_H +#define Z_EN_ENCOUNT4_H + +#include + +struct EnEncount4; + +typedef struct EnEncount4 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x14]; +} EnEncount4; // size = 0x158 + +extern const ActorInit En_Encount4_InitVars; + +#endif // Z_EN_ENCOUNT4_H diff --git a/src/overlays/actors/ovl_En_Ending_Hero/overlay.cfg b/src/overlays/actors/ovl_En_Ending_Hero/overlay.cfg new file mode 100644 index 0000000000..a512a6a47b --- /dev/null +++ b/src/overlays/actors/ovl_En_Ending_Hero/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ending_Hero +z_en_ending_hero.c diff --git a/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c b/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c new file mode 100644 index 0000000000..ad62015bab --- /dev/null +++ b/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c @@ -0,0 +1,36 @@ +#include "z_en_ending_hero.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnEndingHero*)thisx) + +void EnEndingHero_Init(Actor* thisx, GlobalContext* globalCtx); +void EnEndingHero_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnEndingHero_Update(Actor* thisx, GlobalContext* globalCtx); +void EnEndingHero_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ending_Hero_InitVars = { + ACTOR_EN_ENDING_HERO, + ACTORTYPE_NPC, + FLAGS, + OBJECT_DT, + sizeof(EnEndingHero), + (ActorFunc)EnEndingHero_Init, + (ActorFunc)EnEndingHero_Destroy, + (ActorFunc)EnEndingHero_Update, + (ActorFunc)EnEndingHero_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero_0x80C1E690/EnEndingHero_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero_0x80C1E690/EnEndingHero_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero_0x80C1E690/func_80C1E748.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero_0x80C1E690/func_80C1E764.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero_0x80C1E690/EnEndingHero_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero_0x80C1E690/EnEndingHero_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.h b/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.h new file mode 100644 index 0000000000..9bf4c113a1 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ENDING_HERO_H +#define Z_EN_ENDING_HERO_H + +#include + +struct EnEndingHero; + +typedef struct EnEndingHero { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x104]; +} EnEndingHero; // size = 0x248 + +extern const ActorInit En_Ending_Hero_InitVars; + +#endif // Z_EN_ENDING_HERO_H diff --git a/src/overlays/actors/ovl_En_Ending_Hero2/overlay.cfg b/src/overlays/actors/ovl_En_Ending_Hero2/overlay.cfg new file mode 100644 index 0000000000..eeddcc9c78 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ending_Hero2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ending_Hero2 +z_en_ending_hero2.c diff --git a/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c b/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c new file mode 100644 index 0000000000..0f6054610a --- /dev/null +++ b/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c @@ -0,0 +1,36 @@ +#include "z_en_ending_hero2.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnEndingHero2*)thisx) + +void EnEndingHero2_Init(Actor* thisx, GlobalContext* globalCtx); +void EnEndingHero2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnEndingHero2_Update(Actor* thisx, GlobalContext* globalCtx); +void EnEndingHero2_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ending_Hero2_InitVars = { + ACTOR_EN_ENDING_HERO2, + ACTORTYPE_NPC, + FLAGS, + OBJECT_BAI, + sizeof(EnEndingHero2), + (ActorFunc)EnEndingHero2_Init, + (ActorFunc)EnEndingHero2_Destroy, + (ActorFunc)EnEndingHero2_Update, + (ActorFunc)EnEndingHero2_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero2_0x80C23230/EnEndingHero2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero2_0x80C23230/EnEndingHero2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero2_0x80C23230/func_80C232E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero2_0x80C23230/func_80C23304.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero2_0x80C23230/EnEndingHero2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero2_0x80C23230/EnEndingHero2_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.h b/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.h new file mode 100644 index 0000000000..e76c32e544 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ENDING_HERO2_H +#define Z_EN_ENDING_HERO2_H + +#include + +struct EnEndingHero2; + +typedef struct EnEndingHero2 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x13C]; +} EnEndingHero2; // size = 0x280 + +extern const ActorInit En_Ending_Hero2_InitVars; + +#endif // Z_EN_ENDING_HERO2_H diff --git a/src/overlays/actors/ovl_En_Ending_Hero3/overlay.cfg b/src/overlays/actors/ovl_En_Ending_Hero3/overlay.cfg new file mode 100644 index 0000000000..13ddc6d82f --- /dev/null +++ b/src/overlays/actors/ovl_En_Ending_Hero3/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ending_Hero3 +z_en_ending_hero3.c diff --git a/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c b/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c new file mode 100644 index 0000000000..179149f149 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c @@ -0,0 +1,36 @@ +#include "z_en_ending_hero3.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnEndingHero3*)thisx) + +void EnEndingHero3_Init(Actor* thisx, GlobalContext* globalCtx); +void EnEndingHero3_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnEndingHero3_Update(Actor* thisx, GlobalContext* globalCtx); +void EnEndingHero3_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ending_Hero3_InitVars = { + ACTOR_EN_ENDING_HERO3, + ACTORTYPE_NPC, + FLAGS, + OBJECT_TORYO, + sizeof(EnEndingHero3), + (ActorFunc)EnEndingHero3_Init, + (ActorFunc)EnEndingHero3_Destroy, + (ActorFunc)EnEndingHero3_Update, + (ActorFunc)EnEndingHero3_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero3_0x80C23460/EnEndingHero3_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero3_0x80C23460/EnEndingHero3_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero3_0x80C23460/func_80C23518.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero3_0x80C23460/func_80C23534.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero3_0x80C23460/EnEndingHero3_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero3_0x80C23460/EnEndingHero3_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.h b/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.h new file mode 100644 index 0000000000..84c8a59d37 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ENDING_HERO3_H +#define Z_EN_ENDING_HERO3_H + +#include + +struct EnEndingHero3; + +typedef struct EnEndingHero3 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x118]; +} EnEndingHero3; // size = 0x25C + +extern const ActorInit En_Ending_Hero3_InitVars; + +#endif // Z_EN_ENDING_HERO3_H diff --git a/src/overlays/actors/ovl_En_Ending_Hero4/overlay.cfg b/src/overlays/actors/ovl_En_Ending_Hero4/overlay.cfg new file mode 100644 index 0000000000..314fdd5629 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ending_Hero4/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ending_Hero4 +z_en_ending_hero4.c diff --git a/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c b/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c new file mode 100644 index 0000000000..12ce28ed26 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c @@ -0,0 +1,36 @@ +#include "z_en_ending_hero4.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnEndingHero4*)thisx) + +void EnEndingHero4_Init(Actor* thisx, GlobalContext* globalCtx); +void EnEndingHero4_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnEndingHero4_Update(Actor* thisx, GlobalContext* globalCtx); +void EnEndingHero4_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ending_Hero4_InitVars = { + ACTOR_EN_ENDING_HERO4, + ACTORTYPE_NPC, + FLAGS, + OBJECT_SDN, + sizeof(EnEndingHero4), + (ActorFunc)EnEndingHero4_Init, + (ActorFunc)EnEndingHero4_Destroy, + (ActorFunc)EnEndingHero4_Update, + (ActorFunc)EnEndingHero4_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero4_0x80C23690/EnEndingHero4_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero4_0x80C23690/EnEndingHero4_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero4_0x80C23690/func_80C23748.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero4_0x80C23690/func_80C23764.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero4_0x80C23690/EnEndingHero4_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero4_0x80C23690/EnEndingHero4_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.h b/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.h new file mode 100644 index 0000000000..accf7134e7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ENDING_HERO4_H +#define Z_EN_ENDING_HERO4_H + +#include + +struct EnEndingHero4; + +typedef struct EnEndingHero4 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x118]; +} EnEndingHero4; // size = 0x25C + +extern const ActorInit En_Ending_Hero4_InitVars; + +#endif // Z_EN_ENDING_HERO4_H diff --git a/src/overlays/actors/ovl_En_Ending_Hero5/overlay.cfg b/src/overlays/actors/ovl_En_Ending_Hero5/overlay.cfg new file mode 100644 index 0000000000..1b49c5572c --- /dev/null +++ b/src/overlays/actors/ovl_En_Ending_Hero5/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ending_Hero5 +z_en_ending_hero5.c diff --git a/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.c b/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.c new file mode 100644 index 0000000000..65c71594c3 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.c @@ -0,0 +1,38 @@ +#include "z_en_ending_hero5.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnEndingHero5*)thisx) + +void EnEndingHero5_Init(Actor* thisx, GlobalContext* globalCtx); +void EnEndingHero5_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnEndingHero5_Update(Actor* thisx, GlobalContext* globalCtx); +void EnEndingHero5_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ending_Hero5_InitVars = { + ACTOR_EN_ENDING_HERO5, + ACTORTYPE_NPC, + FLAGS, + OBJECT_DAIKU, + sizeof(EnEndingHero5), + (ActorFunc)EnEndingHero5_Init, + (ActorFunc)EnEndingHero5_Destroy, + (ActorFunc)EnEndingHero5_Update, + (ActorFunc)EnEndingHero5_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero5_0x80C238C0/EnEndingHero5_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero5_0x80C238C0/EnEndingHero5_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero5_0x80C238C0/func_80C23980.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero5_0x80C238C0/func_80C2399C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero5_0x80C238C0/EnEndingHero5_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero5_0x80C238C0/func_80C23A30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero5_0x80C238C0/EnEndingHero5_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.h b/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.h new file mode 100644 index 0000000000..110db38f4e --- /dev/null +++ b/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ENDING_HERO5_H +#define Z_EN_ENDING_HERO5_H + +#include + +struct EnEndingHero5; + +typedef struct EnEndingHero5 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x11C]; +} EnEndingHero5; // size = 0x260 + +extern const ActorInit En_Ending_Hero5_InitVars; + +#endif // Z_EN_ENDING_HERO5_H diff --git a/src/overlays/actors/ovl_En_Ending_Hero6/overlay.cfg b/src/overlays/actors/ovl_En_Ending_Hero6/overlay.cfg new file mode 100644 index 0000000000..d6911ffa0b --- /dev/null +++ b/src/overlays/actors/ovl_En_Ending_Hero6/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ending_Hero6 +z_en_ending_hero6.c diff --git a/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c new file mode 100644 index 0000000000..7090fdd735 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c @@ -0,0 +1,40 @@ +#include "z_en_ending_hero6.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnEndingHero6*)thisx) + +void EnEndingHero6_Init(Actor* thisx, GlobalContext* globalCtx); +void EnEndingHero6_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnEndingHero6_Update(Actor* thisx, GlobalContext* globalCtx); +void EnEndingHero6_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ending_Hero6_InitVars = { + ACTOR_EN_ENDING_HERO6, + ACTORTYPE_NPC, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnEndingHero6), + (ActorFunc)EnEndingHero6_Init, + (ActorFunc)EnEndingHero6_Destroy, + (ActorFunc)EnEndingHero6_Update, + (ActorFunc)EnEndingHero6_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero6_0x80C23C90/EnEndingHero6_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero6_0x80C23C90/EnEndingHero6_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero6_0x80C23C90/func_80C23D60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero6_0x80C23C90/func_80C23DDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero6_0x80C23C90/func_80C23E18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero6_0x80C23C90/EnEndingHero6_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero6_0x80C23C90/func_80C23F14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ending_Hero6_0x80C23C90/EnEndingHero6_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.h b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.h new file mode 100644 index 0000000000..ad08569424 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ENDING_HERO6_H +#define Z_EN_ENDING_HERO6_H + +#include + +struct EnEndingHero6; + +typedef struct EnEndingHero6 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x150]; +} EnEndingHero6; // size = 0x294 + +extern const ActorInit En_Ending_Hero6_InitVars; + +#endif // Z_EN_ENDING_HERO6_H diff --git a/src/overlays/actors/ovl_En_Estone/overlay.cfg b/src/overlays/actors/ovl_En_Estone/overlay.cfg new file mode 100644 index 0000000000..b847b42fa8 --- /dev/null +++ b/src/overlays/actors/ovl_En_Estone/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Estone +z_en_estone.c diff --git a/src/overlays/actors/ovl_En_Estone/z_en_estone.c b/src/overlays/actors/ovl_En_Estone/z_en_estone.c new file mode 100644 index 0000000000..9cc391dae9 --- /dev/null +++ b/src/overlays/actors/ovl_En_Estone/z_en_estone.c @@ -0,0 +1,42 @@ +#include "z_en_estone.h" + +#define FLAGS 0x00000030 + +#define THIS ((EnEstone*)thisx) + +void EnEstone_Init(Actor* thisx, GlobalContext* globalCtx); +void EnEstone_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnEstone_Update(Actor* thisx, GlobalContext* globalCtx); +void EnEstone_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Estone_InitVars = { + ACTOR_EN_ESTONE, + ACTORTYPE_PROP, + FLAGS, + OBJECT_EG, + sizeof(EnEstone), + (ActorFunc)EnEstone_Init, + (ActorFunc)EnEstone_Destroy, + (ActorFunc)EnEstone_Update, + (ActorFunc)EnEstone_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Estone_0x80A99EA0/EnEstone_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Estone_0x80A99EA0/EnEstone_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Estone_0x80A99EA0/func_80A9A1DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Estone_0x80A99EA0/func_80A9A4B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Estone_0x80A99EA0/EnEstone_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Estone_0x80A99EA0/EnEstone_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Estone_0x80A99EA0/func_80A9A774.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Estone_0x80A99EA0/func_80A9A870.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Estone_0x80A99EA0/func_80A9A9C0.asm") diff --git a/src/overlays/actors/ovl_En_Estone/z_en_estone.h b/src/overlays/actors/ovl_En_Estone/z_en_estone.h new file mode 100644 index 0000000000..2afbb99a42 --- /dev/null +++ b/src/overlays/actors/ovl_En_Estone/z_en_estone.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ESTONE_H +#define Z_EN_ESTONE_H + +#include + +struct EnEstone; + +typedef struct EnEstone { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0x2C30]; +} EnEstone; // size = 0x2D74 + +extern const ActorInit En_Estone_InitVars; + +#endif // Z_EN_ESTONE_H diff --git a/src/overlays/actors/ovl_En_Fall/overlay.cfg b/src/overlays/actors/ovl_En_Fall/overlay.cfg new file mode 100644 index 0000000000..48cfdea221 --- /dev/null +++ b/src/overlays/actors/ovl_En_Fall/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Fall +z_en_fall.c diff --git a/src/overlays/actors/ovl_En_Fall/z_en_fall.c b/src/overlays/actors/ovl_En_Fall/z_en_fall.c new file mode 100644 index 0000000000..3fbbcfadbd --- /dev/null +++ b/src/overlays/actors/ovl_En_Fall/z_en_fall.c @@ -0,0 +1,85 @@ +#include "z_en_fall.h" + +#define FLAGS 0x00000030 + +#define THIS ((EnFall*)thisx) + +void EnFall_Init(Actor* thisx, GlobalContext* globalCtx); +void EnFall_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnFall_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Fall_InitVars = { + ACTOR_EN_FALL, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnFall), + (ActorFunc)EnFall_Init, + (ActorFunc)EnFall_Destroy, + (ActorFunc)EnFall_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6BF90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6C1DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/EnFall_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/EnFall_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6C3AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6C3FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6C7C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6C9A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6CA9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6CB74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6CD38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6CD74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6CECC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6CF60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6CF70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/EnFall_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6D100.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6D220.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6D444.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6D504.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6D698.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6D75C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6D88C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6D98C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6DA7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6DC20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6DC40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6DD3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6E07C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6E214.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall_0x80A6BF90/func_80A6E37C.asm") diff --git a/src/overlays/actors/ovl_En_Fall/z_en_fall.h b/src/overlays/actors/ovl_En_Fall/z_en_fall.h new file mode 100644 index 0000000000..c0983f1b2f --- /dev/null +++ b/src/overlays/actors/ovl_En_Fall/z_en_fall.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_FALL_H +#define Z_EN_FALL_H + +#include + +struct EnFall; + +typedef struct EnFall { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x20]; +} EnFall; // size = 0x164 + +extern const ActorInit En_Fall_InitVars; + +#endif // Z_EN_FALL_H diff --git a/src/overlays/actors/ovl_En_Fall2/overlay.cfg b/src/overlays/actors/ovl_En_Fall2/overlay.cfg new file mode 100644 index 0000000000..4219364f55 --- /dev/null +++ b/src/overlays/actors/ovl_En_Fall2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Fall2 +z_en_fall2.c diff --git a/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c b/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c new file mode 100644 index 0000000000..f77e274d6d --- /dev/null +++ b/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c @@ -0,0 +1,42 @@ +#include "z_en_fall2.h" + +#define FLAGS 0x00000030 + +#define THIS ((EnFall2*)thisx) + +void EnFall2_Init(Actor* thisx, GlobalContext* globalCtx); +void EnFall2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnFall2_Update(Actor* thisx, GlobalContext* globalCtx); +void EnFall2_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Fall2_InitVars = { + ACTOR_EN_FALL2, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_FALL2, + sizeof(EnFall2), + (ActorFunc)EnFall2_Init, + (ActorFunc)EnFall2_Destroy, + (ActorFunc)EnFall2_Update, + (ActorFunc)EnFall2_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall2_0x80C1B640/EnFall2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall2_0x80C1B640/EnFall2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall2_0x80C1B640/func_80C1B724.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall2_0x80C1B640/func_80C1B8A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall2_0x80C1B640/func_80C1B8B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall2_0x80C1B640/func_80C1B8F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall2_0x80C1B640/func_80C1B9D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall2_0x80C1B640/EnFall2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fall2_0x80C1B640/EnFall2_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Fall2/z_en_fall2.h b/src/overlays/actors/ovl_En_Fall2/z_en_fall2.h new file mode 100644 index 0000000000..a94ce6567b --- /dev/null +++ b/src/overlays/actors/ovl_En_Fall2/z_en_fall2.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_FALL2_H +#define Z_EN_FALL2_H + +#include + +struct EnFall2; + +typedef struct EnFall2 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1A8]; +} EnFall2; // size = 0x2EC + +extern const ActorInit En_Fall2_InitVars; + +#endif // Z_EN_FALL2_H diff --git a/src/overlays/actors/ovl_En_Famos/overlay.cfg b/src/overlays/actors/ovl_En_Famos/overlay.cfg new file mode 100644 index 0000000000..375bd1638a --- /dev/null +++ b/src/overlays/actors/ovl_En_Famos/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Famos +z_en_famos.c diff --git a/src/overlays/actors/ovl_En_Famos/z_en_famos.c b/src/overlays/actors/ovl_En_Famos/z_en_famos.c new file mode 100644 index 0000000000..d312904ceb --- /dev/null +++ b/src/overlays/actors/ovl_En_Famos/z_en_famos.c @@ -0,0 +1,106 @@ +#include "z_en_famos.h" + +#define FLAGS 0x00000005 + +#define THIS ((EnFamos*)thisx) + +void EnFamos_Init(Actor* thisx, GlobalContext* globalCtx); +void EnFamos_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnFamos_Update(Actor* thisx, GlobalContext* globalCtx); +void EnFamos_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Famos_InitVars = { + ACTOR_EN_FAMOS, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_FAMOS, + sizeof(EnFamos), + (ActorFunc)EnFamos_Init, + (ActorFunc)EnFamos_Destroy, + (ActorFunc)EnFamos_Update, + (ActorFunc)EnFamos_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/EnFamos_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/EnFamos_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ACB58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ACD2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ACF1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ACF98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD05C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD170.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD18C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD1F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD294.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD31C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD378.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD3E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD42C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD54C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD5B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD66C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD68C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD7EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD840.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD888.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AD8B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ADA74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ADAE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ADB4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ADB70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ADC40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ADC64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ADD20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ADDA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ADE00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ADE74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ADFA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808ADFF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AE030.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/EnFamos_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AE304.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AE3A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/func_808AE3FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Famos_0x808AC920/EnFamos_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Famos/z_en_famos.h b/src/overlays/actors/ovl_En_Famos/z_en_famos.h new file mode 100644 index 0000000000..c48eea569b --- /dev/null +++ b/src/overlays/actors/ovl_En_Famos/z_en_famos.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_FAMOS_H +#define Z_EN_FAMOS_H + +#include + +struct EnFamos; + +typedef struct EnFamos { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4D0]; +} EnFamos; // size = 0x614 + +extern const ActorInit En_Famos_InitVars; + +#endif // Z_EN_FAMOS_H diff --git a/src/overlays/actors/ovl_En_Fg/overlay.cfg b/src/overlays/actors/ovl_En_Fg/overlay.cfg new file mode 100644 index 0000000000..7121862622 --- /dev/null +++ b/src/overlays/actors/ovl_En_Fg/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Fg +z_en_fg.c diff --git a/src/overlays/actors/ovl_En_Fg/z_en_fg.c b/src/overlays/actors/ovl_En_Fg/z_en_fg.c new file mode 100644 index 0000000000..c44818e418 --- /dev/null +++ b/src/overlays/actors/ovl_En_Fg/z_en_fg.c @@ -0,0 +1,60 @@ +#include "z_en_fg.h" + +#define FLAGS 0x00004209 + +#define THIS ((EnFg*)thisx) + +void EnFg_Init(Actor* thisx, GlobalContext* globalCtx); +void EnFg_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnFg_Update(Actor* thisx, GlobalContext* globalCtx); +void EnFg_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Fg_InitVars = { + ACTOR_EN_FG, + ACTORTYPE_NPC, + FLAGS, + OBJECT_FR, + sizeof(EnFg), + (ActorFunc)EnFg_Init, + (ActorFunc)EnFg_Destroy, + (ActorFunc)EnFg_Update, + (ActorFunc)EnFg_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2D280.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2D348.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2D3D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2D400.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2D42C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2D4B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2D778.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2D9CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2D9DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/EnFg_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/EnFg_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/EnFg_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2DCE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2DD34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/EnFg_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2DFC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2E0A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fg_0x80A2D280/func_80A2E268.asm") diff --git a/src/overlays/actors/ovl_En_Fg/z_en_fg.h b/src/overlays/actors/ovl_En_Fg/z_en_fg.h new file mode 100644 index 0000000000..b1ffaca057 --- /dev/null +++ b/src/overlays/actors/ovl_En_Fg/z_en_fg.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_FG_H +#define Z_EN_FG_H + +#include + +struct EnFg; + +typedef struct EnFg { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x410]; +} EnFg; // size = 0x554 + +extern const ActorInit En_Fg_InitVars; + +#endif // Z_EN_FG_H diff --git a/src/overlays/actors/ovl_En_Fire_Rock/overlay.cfg b/src/overlays/actors/ovl_En_Fire_Rock/overlay.cfg new file mode 100644 index 0000000000..e1d38e60a1 --- /dev/null +++ b/src/overlays/actors/ovl_En_Fire_Rock/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Fire_Rock +z_en_fire_rock.c diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c new file mode 100644 index 0000000000..4efffe49ce --- /dev/null +++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c @@ -0,0 +1,32 @@ +#include "z_en_fire_rock.h" + +#define FLAGS 0x00000030 + +#define THIS ((EnFireRock*)thisx) + +void EnFireRock_Init(Actor* thisx, GlobalContext* globalCtx); +void EnFireRock_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnFireRock_Update(Actor* thisx, GlobalContext* globalCtx); +void EnFireRock_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Fire_Rock_InitVars = { + ACTOR_EN_FIRE_ROCK, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_EFC_STAR_FIELD, + sizeof(EnFireRock), + (ActorFunc)EnFireRock_Init, + (ActorFunc)EnFireRock_Destroy, + (ActorFunc)EnFireRock_Update, + (ActorFunc)EnFireRock_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fire_Rock_0x808E1FE0/EnFireRock_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fire_Rock_0x808E1FE0/EnFireRock_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fire_Rock_0x808E1FE0/EnFireRock_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fire_Rock_0x808E1FE0/EnFireRock_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h new file mode 100644 index 0000000000..637e7bd177 --- /dev/null +++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_FIRE_ROCK_H +#define Z_EN_FIRE_ROCK_H + +#include + +struct EnFireRock; + +typedef struct EnFireRock { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x94]; +} EnFireRock; // size = 0x1D8 + +extern const ActorInit En_Fire_Rock_InitVars; + +#endif // Z_EN_FIRE_ROCK_H diff --git a/src/overlays/actors/ovl_En_Firefly/overlay.cfg b/src/overlays/actors/ovl_En_Firefly/overlay.cfg new file mode 100644 index 0000000000..8b88be0b8c --- /dev/null +++ b/src/overlays/actors/ovl_En_Firefly/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Firefly +z_en_firefly.c diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c new file mode 100644 index 0000000000..d355843fef --- /dev/null +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -0,0 +1,84 @@ +#include "z_en_firefly.h" + +#define FLAGS 0x00005005 + +#define THIS ((EnFirefly*)thisx) + +void EnFirefly_Init(Actor* thisx, GlobalContext* globalCtx); +void EnFirefly_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnFirefly_Update(Actor* thisx, GlobalContext* globalCtx); +void EnFirefly_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Firefly_InitVars = { + ACTOR_EN_FIREFLY, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_FIREFLY, + sizeof(EnFirefly), + (ActorFunc)EnFirefly_Init, + (ActorFunc)EnFirefly_Destroy, + (ActorFunc)EnFirefly_Update, + (ActorFunc)EnFirefly_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/EnFirefly_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/EnFirefly_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_808798C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_80879930.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_80879950.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087997C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_80879A98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_80879C14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_80879CC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_80879F28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A110.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A1C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A1EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A268.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A2D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A50C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A548.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A5DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A60C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A774.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A818.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A8FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A920.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087A9E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087AA1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087AAF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/EnFirefly_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087AF48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/func_8087AF98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly_0x808796F0/EnFirefly_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h new file mode 100644 index 0000000000..9d2db70c04 --- /dev/null +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_FIREFLY_H +#define Z_EN_FIREFLY_H + +#include + +struct EnFirefly; + +typedef struct EnFirefly { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x230]; +} EnFirefly; // size = 0x374 + +extern const ActorInit En_Firefly_InitVars; + +#endif // Z_EN_FIREFLY_H diff --git a/src/overlays/actors/ovl_En_Firefly2/overlay.cfg b/src/overlays/actors/ovl_En_Firefly2/overlay.cfg new file mode 100644 index 0000000000..0872be9ea6 --- /dev/null +++ b/src/overlays/actors/ovl_En_Firefly2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Firefly2 +z_en_firefly2.c diff --git a/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c b/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c new file mode 100644 index 0000000000..8383dde52e --- /dev/null +++ b/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c @@ -0,0 +1,32 @@ +#include "z_en_firefly2.h" + +#define FLAGS 0x00005015 + +#define THIS ((EnFirefly2*)thisx) + +void EnFirefly2_Init(Actor* thisx, GlobalContext* globalCtx); +void EnFirefly2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnFirefly2_Update(Actor* thisx, GlobalContext* globalCtx); +void EnFirefly2_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Firefly2_InitVars = { + ACTOR_EN_FIREFLY2, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_FIREFLY, + sizeof(EnFirefly2), + (ActorFunc)EnFirefly2_Init, + (ActorFunc)EnFirefly2_Destroy, + (ActorFunc)EnFirefly2_Update, + (ActorFunc)EnFirefly2_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly2_0x80A560C0/EnFirefly2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly2_0x80A560C0/EnFirefly2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly2_0x80A560C0/EnFirefly2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Firefly2_0x80A560C0/EnFirefly2_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.h b/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.h new file mode 100644 index 0000000000..515f834716 --- /dev/null +++ b/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_FIREFLY2_H +#define Z_EN_FIREFLY2_H + +#include + +struct EnFirefly2; + +typedef struct EnFirefly2 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x228]; +} EnFirefly2; // size = 0x36C + +extern const ActorInit En_Firefly2_InitVars; + +#endif // Z_EN_FIREFLY2_H diff --git a/src/overlays/actors/ovl_En_Fish/overlay.cfg b/src/overlays/actors/ovl_En_Fish/overlay.cfg new file mode 100644 index 0000000000..a78daf631d --- /dev/null +++ b/src/overlays/actors/ovl_En_Fish/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Fish +z_en_fish.c diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c new file mode 100644 index 0000000000..ce1604ee92 --- /dev/null +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -0,0 +1,96 @@ +#include "z_en_fish.h" + +#define FLAGS 0x00000000 + +#define THIS ((EnFish*)thisx) + +void EnFish_Init(Actor* thisx, GlobalContext* globalCtx); +void EnFish_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnFish_Update(Actor* thisx, GlobalContext* globalCtx); +void EnFish_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Fish_InitVars = { + ACTOR_EN_FISH, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnFish), + (ActorFunc)EnFish_Init, + (ActorFunc)EnFish_Destroy, + (ActorFunc)EnFish_Update, + (ActorFunc)EnFish_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091D630.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091D660.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091D6C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091D728.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091D7C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091D840.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091D904.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091D944.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091DA14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/EnFish_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/EnFish_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091DD48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091DDF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091DEE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091DF68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091E070.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091E128.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091E2E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091E34C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091E5EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091E658.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091E810.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091E880.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091E9A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091EAF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091ECF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091ED70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091EF30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091EFE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091F344.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091F3BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091F5A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091F830.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/EnFish_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/func_8091F994.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish_0x8091D630/EnFish_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.h b/src/overlays/actors/ovl_En_Fish/z_en_fish.h new file mode 100644 index 0000000000..99302f6292 --- /dev/null +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_FISH_H +#define Z_EN_FISH_H + +#include + +struct EnFish; + +typedef struct EnFish { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x138]; +} EnFish; // size = 0x27C + +extern const ActorInit En_Fish_InitVars; + +#endif // Z_EN_FISH_H diff --git a/src/overlays/actors/ovl_En_Fish2/overlay.cfg b/src/overlays/actors/ovl_En_Fish2/overlay.cfg new file mode 100644 index 0000000000..cba83b7356 --- /dev/null +++ b/src/overlays/actors/ovl_En_Fish2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Fish2 +z_en_fish2.c diff --git a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c new file mode 100644 index 0000000000..14bdb46942 --- /dev/null +++ b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c @@ -0,0 +1,92 @@ +#include "z_en_fish2.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnFish2*)thisx) + +void EnFish2_Init(Actor* thisx, GlobalContext* globalCtx); +void EnFish2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnFish2_Update(Actor* thisx, GlobalContext* globalCtx); +void EnFish2_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Fish2_InitVars = { + ACTOR_EN_FISH2, + ACTORTYPE_PROP, + FLAGS, + OBJECT_FB, + sizeof(EnFish2), + (ActorFunc)EnFish2_Init, + (ActorFunc)EnFish2_Destroy, + (ActorFunc)EnFish2_Update, + (ActorFunc)EnFish2_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B28370.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B28478.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/EnFish2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/EnFish2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B287F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B288E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2899C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B289DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B28B5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B28C14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B29128.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2913C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B29194.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B29250.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2938C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B293C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2951C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B295A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B29778.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B297FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B29E5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B29EE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2A01C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2A094.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2A23C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2A448.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2A498.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/EnFish2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2ABF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2AC20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/EnFish2_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2ADB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2AF80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fish2_0x80B28370/func_80B2B180.asm") diff --git a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.h b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.h new file mode 100644 index 0000000000..23083dff26 --- /dev/null +++ b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_FISH2_H +#define Z_EN_FISH2_H + +#include + +struct EnFish2; + +typedef struct EnFish2 { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0x1ED4]; +} EnFish2; // size = 0x2018 + +extern const ActorInit En_Fish2_InitVars; + +#endif // Z_EN_FISH2_H diff --git a/src/overlays/actors/ovl_En_Floormas/overlay.cfg b/src/overlays/actors/ovl_En_Floormas/overlay.cfg new file mode 100644 index 0000000000..16ece1e424 --- /dev/null +++ b/src/overlays/actors/ovl_En_Floormas/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Floormas +z_en_floormas.c diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c new file mode 100644 index 0000000000..66c0689d21 --- /dev/null +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -0,0 +1,140 @@ +#include "z_en_floormas.h" + +#define FLAGS 0x00000405 + +#define THIS ((EnFloormas*)thisx) + +void EnFloormas_Init(Actor* thisx, GlobalContext* globalCtx); +void EnFloormas_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnFloormas_Update(Actor* thisx, GlobalContext* globalCtx); +void EnFloormas_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Floormas_InitVars = { + ACTOR_EN_FLOORMAS, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_WALLMASTER, + sizeof(EnFloormas), + (ActorFunc)EnFloormas_Init, + (ActorFunc)EnFloormas_Destroy, + (ActorFunc)EnFloormas_Update, + (ActorFunc)EnFloormas_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/EnFloormas_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/EnFloormas_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D08D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0908.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0930.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D09CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0A48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0B08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0B50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0C14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0C58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0CE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0D70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0ECC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0F14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0F50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D0F80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D108C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D11BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D1380.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D1458.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D14DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D161C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D1650.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D1740.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D17EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D19D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D1B44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D1BCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D1C1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D1D0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D1D6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D1ED4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D1F7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D1FD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2040.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D217C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D22C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2484.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D24F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2700.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2764.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2A20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2AA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2AB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2AF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2B18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2C08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2CDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2D30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2D6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2DC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D2E34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/EnFloormas_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D3488.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D34C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/EnFloormas_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Floormas_0x808D0680/func_808D3754.asm") diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h new file mode 100644 index 0000000000..411ee10881 --- /dev/null +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_FLOORMAS_H +#define Z_EN_FLOORMAS_H + +#include + +struct EnFloormas; + +typedef struct EnFloormas { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x25C]; +} EnFloormas; // size = 0x3A0 + +extern const ActorInit En_Floormas_InitVars; + +#endif // Z_EN_FLOORMAS_H diff --git a/src/overlays/actors/ovl_En_Fr/overlay.cfg b/src/overlays/actors/ovl_En_Fr/overlay.cfg new file mode 100644 index 0000000000..b21ec21455 --- /dev/null +++ b/src/overlays/actors/ovl_En_Fr/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Fr +z_en_fr.c diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c new file mode 100644 index 0000000000..3a75484c1b --- /dev/null +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -0,0 +1,29 @@ +#include "z_en_fr.h" + +#define FLAGS 0x40000000 + +#define THIS ((EnFr*)thisx) + +void EnFr_Init(Actor* thisx, GlobalContext* globalCtx); +void EnFr_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnFr_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Fr_InitVars = { + ACTOR_EN_FR, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnFr), + (ActorFunc)EnFr_Init, + (ActorFunc)EnFr_Destroy, + (ActorFunc)EnFr_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fr_0x808FC550/EnFr_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fr_0x808FC550/EnFr_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fr_0x808FC550/EnFr_Update.asm") diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.h b/src/overlays/actors/ovl_En_Fr/z_en_fr.h new file mode 100644 index 0000000000..8ef7fc87eb --- /dev/null +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.h @@ -0,0 +1,14 @@ +#ifndef Z_EN_FR_H +#define Z_EN_FR_H + +#include + +struct EnFr; + +typedef struct EnFr { + /* 0x000 */ Actor actor; +} EnFr; // size = 0x144 + +extern const ActorInit En_Fr_InitVars; + +#endif // Z_EN_FR_H diff --git a/src/overlays/actors/ovl_En_Fsn/overlay.cfg b/src/overlays/actors/ovl_En_Fsn/overlay.cfg new file mode 100644 index 0000000000..c173063cfb --- /dev/null +++ b/src/overlays/actors/ovl_En_Fsn/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Fsn +z_en_fsn.c diff --git a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c new file mode 100644 index 0000000000..8541003ea0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c @@ -0,0 +1,150 @@ +#include "z_en_fsn.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnFsn*)thisx) + +void EnFsn_Init(Actor* thisx, GlobalContext* globalCtx); +void EnFsn_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnFsn_Update(Actor* thisx, GlobalContext* globalCtx); +void EnFsn_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Fsn_InitVars = { + ACTOR_EN_FSN, + ACTORTYPE_NPC, + FLAGS, + OBJECT_FSN, + sizeof(EnFsn), + (ActorFunc)EnFsn_Init, + (ActorFunc)EnFsn_Destroy, + (ActorFunc)EnFsn_Update, + (ActorFunc)EnFsn_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE1B70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE1BF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE1C54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE1E58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE1EF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE1F5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2028.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2074.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE21C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2234.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2298.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2340.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2438.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2524.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE25D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2670.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE26D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2760.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE28B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2974.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2A98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2B44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2BE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2C6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2CFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2DC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE2F78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE30F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE32D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE3474.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE352C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE3644.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE3880.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE38E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE3A68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE3BC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE3CF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE3D50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE3E4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE3F40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE4028.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE4120.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE41FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE4424.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE44DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE45C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE4638.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE4828.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE4A1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE4B20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE4B70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE4BF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE4CD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE4D28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/EnFsn_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/EnFsn_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/EnFsn_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE502C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE52A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE5440.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE57E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/func_80AE5910.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fsn_0x80AE1B70/EnFsn_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.h b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.h new file mode 100644 index 0000000000..a6936afb68 --- /dev/null +++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_FSN_H +#define Z_EN_FSN_H + +#include + +struct EnFsn; + +typedef struct EnFsn { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x30C]; +} EnFsn; // size = 0x450 + +extern const ActorInit En_Fsn_InitVars; + +#endif // Z_EN_FSN_H diff --git a/src/overlays/actors/ovl_En_Fu/overlay.cfg b/src/overlays/actors/ovl_En_Fu/overlay.cfg new file mode 100644 index 0000000000..0cc55f8eb7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Fu/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Fu +z_en_fu.c diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c new file mode 100644 index 0000000000..6e5adf3a59 --- /dev/null +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -0,0 +1,134 @@ +#include "z_en_fu.h" + +#define FLAGS 0x0A000019 + +#define THIS ((EnFu*)thisx) + +void EnFu_Init(Actor* thisx, GlobalContext* globalCtx); +void EnFu_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnFu_Update(Actor* thisx, GlobalContext* globalCtx); +void EnFu_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Fu_InitVars = { + ACTOR_EN_FU, + ACTORTYPE_NPC, + FLAGS, + OBJECT_MU, + sizeof(EnFu), + (ActorFunc)EnFu_Init, + (ActorFunc)EnFu_Destroy, + (ActorFunc)EnFu_Update, + (ActorFunc)EnFu_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809616E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809619D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/EnFu_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/EnFu_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80961D10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80961D7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80961E88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80961EC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80961F00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80961F38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_8096209C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809622FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80962340.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80962588.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80962660.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809628BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809628D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809629F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80962A10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80962BA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80962BCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80962D48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80962D60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80962EBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80962F10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80962F4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80963258.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_8096326C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809632D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80963350.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80963540.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80963560.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80963610.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80963630.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80963810.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809638F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809639D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80963DE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80963EAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80963F44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80963F88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80963FF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80964034.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809640D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_8096413C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80964190.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_8096426C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809642E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/EnFu_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809643FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_8096450C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/EnFu_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80964694.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_809647EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_0x809616E0/func_80964950.asm") diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.h b/src/overlays/actors/ovl_En_Fu/z_en_fu.h new file mode 100644 index 0000000000..1138ce55e4 --- /dev/null +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_FU_H +#define Z_EN_FU_H + +#include + +struct EnFu; + +typedef struct EnFu { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x410]; +} EnFu; // size = 0x554 + +extern const ActorInit En_Fu_InitVars; + +#endif // Z_EN_FU_H diff --git a/src/overlays/actors/ovl_En_Fu_Kago/overlay.cfg b/src/overlays/actors/ovl_En_Fu_Kago/overlay.cfg new file mode 100644 index 0000000000..9a946e3098 --- /dev/null +++ b/src/overlays/actors/ovl_En_Fu_Kago/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Fu_Kago +z_en_fu_kago.c diff --git a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c new file mode 100644 index 0000000000..0a68ab757d --- /dev/null +++ b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c @@ -0,0 +1,54 @@ +#include "z_en_fu_kago.h" + +#define FLAGS 0x00000030 + +#define THIS ((EnFuKago*)thisx) + +void EnFuKago_Init(Actor* thisx, GlobalContext* globalCtx); +void EnFuKago_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnFuKago_Update(Actor* thisx, GlobalContext* globalCtx); +void EnFuKago_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Fu_Kago_InitVars = { + ACTOR_EN_FU_KAGO, + ACTORTYPE_BG, + FLAGS, + OBJECT_FU_MATO, + sizeof(EnFuKago), + (ActorFunc)EnFuKago_Init, + (ActorFunc)EnFuKago_Destroy, + (ActorFunc)EnFuKago_Update, + (ActorFunc)EnFuKago_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/EnFuKago_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/EnFuKago_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/func_80ACF8B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/func_80ACF994.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/func_80ACF9A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/func_80ACF9DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/func_80ACF9FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/func_80ACFA78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/func_80ACFDAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/func_80AD0028.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/func_80AD0274.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/func_80AD0288.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/EnFuKago_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/func_80AD0340.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Kago_0x80ACF780/EnFuKago_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.h b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.h new file mode 100644 index 0000000000..9eaaf5a0b5 --- /dev/null +++ b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_FU_KAGO_H +#define Z_EN_FU_KAGO_H + +#include + +struct EnFuKago; + +typedef struct EnFuKago { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1FC]; +} EnFuKago; // size = 0x340 + +extern const ActorInit En_Fu_Kago_InitVars; + +#endif // Z_EN_FU_KAGO_H diff --git a/src/overlays/actors/ovl_En_Fu_Mato/overlay.cfg b/src/overlays/actors/ovl_En_Fu_Mato/overlay.cfg new file mode 100644 index 0000000000..78253baff7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Fu_Mato/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Fu_Mato +z_en_fu_mato.c diff --git a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c new file mode 100644 index 0000000000..9e3e5d305e --- /dev/null +++ b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c @@ -0,0 +1,60 @@ +#include "z_en_fu_mato.h" + +#define FLAGS 0x00000030 + +#define THIS ((EnFuMato*)thisx) + +void EnFuMato_Init(Actor* thisx, GlobalContext* globalCtx); +void EnFuMato_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnFuMato_Update(Actor* thisx, GlobalContext* globalCtx); +void EnFuMato_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Fu_Mato_InitVars = { + ACTOR_EN_FU_MATO, + ACTORTYPE_BG, + FLAGS, + OBJECT_FU_MATO, + sizeof(EnFuMato), + (ActorFunc)EnFuMato_Init, + (ActorFunc)EnFuMato_Destroy, + (ActorFunc)EnFuMato_Update, + (ActorFunc)EnFuMato_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/EnFuMato_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/EnFuMato_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACE4B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACE4C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACE508.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACE51C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACE680.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACE718.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACE850.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACEB2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACECFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACEFC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACEFD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACF04C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/EnFuMato_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACF1F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/func_80ACF3F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fu_Mato_0x80ACE330/EnFuMato_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.h b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.h new file mode 100644 index 0000000000..0f136a00bb --- /dev/null +++ b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_FU_MATO_H +#define Z_EN_FU_MATO_H + +#include + +struct EnFuMato; + +typedef struct EnFuMato { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1C8]; +} EnFuMato; // size = 0x30C + +extern const ActorInit En_Fu_Mato_InitVars; + +#endif // Z_EN_FU_MATO_H diff --git a/src/overlays/actors/ovl_En_Fz/overlay.cfg b/src/overlays/actors/ovl_En_Fz/overlay.cfg new file mode 100644 index 0000000000..0eba400a54 --- /dev/null +++ b/src/overlays/actors/ovl_En_Fz/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Fz +z_en_fz.c diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c new file mode 100644 index 0000000000..a5fa38da07 --- /dev/null +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -0,0 +1,102 @@ +#include "z_en_fz.h" + +#define FLAGS 0x00000015 + +#define THIS ((EnFz*)thisx) + +void EnFz_Init(Actor* thisx, GlobalContext* globalCtx); +void EnFz_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnFz_Update(Actor* thisx, GlobalContext* globalCtx); +void EnFz_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Fz_InitVars = { + ACTOR_EN_FZ, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_FZ, + sizeof(EnFz), + (ActorFunc)EnFz_Init, + (ActorFunc)EnFz_Destroy, + (ActorFunc)EnFz_Update, + (ActorFunc)EnFz_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/EnFz_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/EnFz_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80932784.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_809328A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_809328F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80932AE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80932AF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80932BD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80932C98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933014.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_809330D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933104.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933184.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_809331F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933248.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933274.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933324.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933368.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_809333A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_809333D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933414.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933444.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933480.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_809334B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_809336C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933760.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933790.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_809337D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_8093389C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_809338E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933AF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933B38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80933B48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/EnFz_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/EnFz_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80934018.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_809340BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80934178.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Fz_0x80932490/func_80934464.asm") diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.h b/src/overlays/actors/ovl_En_Fz/z_en_fz.h new file mode 100644 index 0000000000..fd6bc160c6 --- /dev/null +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_FZ_H +#define Z_EN_FZ_H + +#include + +struct EnFz; + +typedef struct EnFz { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xA98]; +} EnFz; // size = 0xBDC + +extern const ActorInit En_Fz_InitVars; + +#endif // Z_EN_FZ_H diff --git a/src/overlays/actors/ovl_En_Gakufu/overlay.cfg b/src/overlays/actors/ovl_En_Gakufu/overlay.cfg new file mode 100644 index 0000000000..9f421707a8 --- /dev/null +++ b/src/overlays/actors/ovl_En_Gakufu/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Gakufu +z_en_gakufu.c diff --git a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c new file mode 100644 index 0000000000..e25f84d8ec --- /dev/null +++ b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c @@ -0,0 +1,48 @@ +#include "z_en_gakufu.h" + +#define FLAGS 0x02000010 + +#define THIS ((EnGakufu*)thisx) + +void EnGakufu_Init(Actor* thisx, GlobalContext* globalCtx); +void EnGakufu_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnGakufu_Update(Actor* thisx, GlobalContext* globalCtx); +void EnGakufu_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Gakufu_InitVars = { + ACTOR_EN_GAKUFU, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnGakufu), + (ActorFunc)EnGakufu_Init, + (ActorFunc)EnGakufu_Destroy, + (ActorFunc)EnGakufu_Update, + (ActorFunc)EnGakufu_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gakufu_0x80AFC960/func_80AFC960.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gakufu_0x80AFC960/EnGakufu_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gakufu_0x80AFC960/EnGakufu_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gakufu_0x80AFC960/func_80AFCB94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gakufu_0x80AFC960/func_80AFCBD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gakufu_0x80AFC960/func_80AFCC14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gakufu_0x80AFC960/func_80AFCC24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gakufu_0x80AFC960/func_80AFCC58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gakufu_0x80AFC960/func_80AFCD44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gakufu_0x80AFC960/func_80AFCDC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gakufu_0x80AFC960/EnGakufu_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gakufu_0x80AFC960/EnGakufu_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.h b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.h new file mode 100644 index 0000000000..04be194018 --- /dev/null +++ b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_GAKUFU_H +#define Z_EN_GAKUFU_H + +#include + +struct EnGakufu; + +typedef struct EnGakufu { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x10]; +} EnGakufu; // size = 0x154 + +extern const ActorInit En_Gakufu_InitVars; + +#endif // Z_EN_GAKUFU_H diff --git a/src/overlays/actors/ovl_En_Gamelupy/overlay.cfg b/src/overlays/actors/ovl_En_Gamelupy/overlay.cfg new file mode 100644 index 0000000000..a9b07ebaea --- /dev/null +++ b/src/overlays/actors/ovl_En_Gamelupy/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Gamelupy +z_en_gamelupy.c diff --git a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c new file mode 100644 index 0000000000..e726bdae51 --- /dev/null +++ b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c @@ -0,0 +1,48 @@ +#include "z_en_gamelupy.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnGamelupy*)thisx) + +void EnGamelupy_Init(Actor* thisx, GlobalContext* globalCtx); +void EnGamelupy_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnGamelupy_Update(Actor* thisx, GlobalContext* globalCtx); +void EnGamelupy_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Gamelupy_InitVars = { + ACTOR_EN_GAMELUPY, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnGamelupy), + (ActorFunc)EnGamelupy_Init, + (ActorFunc)EnGamelupy_Destroy, + (ActorFunc)EnGamelupy_Update, + (ActorFunc)EnGamelupy_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gamelupy_0x80AF6760/EnGamelupy_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gamelupy_0x80AF6760/EnGamelupy_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gamelupy_0x80AF6760/func_80AF6854.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gamelupy_0x80AF6760/func_80AF6944.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gamelupy_0x80AF6760/func_80AF6958.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gamelupy_0x80AF6760/func_80AF6994.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gamelupy_0x80AF6760/func_80AF69A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gamelupy_0x80AF6760/func_80AF6A38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gamelupy_0x80AF6760/func_80AF6A78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gamelupy_0x80AF6760/func_80AF6B40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gamelupy_0x80AF6760/EnGamelupy_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gamelupy_0x80AF6760/EnGamelupy_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.h b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.h new file mode 100644 index 0000000000..7672a2d9b0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_GAMELUPY_H +#define Z_EN_GAMELUPY_H + +#include + +struct EnGamelupy; + +typedef struct EnGamelupy { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x60]; +} EnGamelupy; // size = 0x1A4 + +extern const ActorInit En_Gamelupy_InitVars; + +#endif // Z_EN_GAMELUPY_H diff --git a/src/overlays/actors/ovl_En_Gb2/overlay.cfg b/src/overlays/actors/ovl_En_Gb2/overlay.cfg new file mode 100644 index 0000000000..d604decdc3 --- /dev/null +++ b/src/overlays/actors/ovl_En_Gb2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Gb2 +z_en_gb2.c diff --git a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c new file mode 100644 index 0000000000..c7692c677d --- /dev/null +++ b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c @@ -0,0 +1,100 @@ +#include "z_en_gb2.h" + +#define FLAGS 0x00000039 + +#define THIS ((EnGb2*)thisx) + +void EnGb2_Init(Actor* thisx, GlobalContext* globalCtx); +void EnGb2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnGb2_Update(Actor* thisx, GlobalContext* globalCtx); +void EnGb2_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Gb2_InitVars = { + ACTOR_EN_GB2, + ACTORTYPE_NPC, + FLAGS, + OBJECT_PS, + sizeof(EnGb2), + (ActorFunc)EnGb2_Init, + (ActorFunc)EnGb2_Destroy, + (ActorFunc)EnGb2_Update, + (ActorFunc)EnGb2_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0F5E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0F660.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0F6DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0F728.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0F7FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0F8F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0F97C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0FA04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0FA48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0FB24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0FBF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0FD8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0FE18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0FE7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0FEBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B0FFA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B10240.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B10344.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B10584.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B10634.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B10868.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B10924.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B109DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B10A48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B10B5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B10DAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B10E98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B11048.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B110F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B111AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B11268.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B11344.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/EnGb2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/EnGb2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/EnGb2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B1179C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/func_80B117FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gb2_0x80B0F5E0/EnGb2_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.h b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.h new file mode 100644 index 0000000000..4c5f3826ed --- /dev/null +++ b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_GB2_H +#define Z_EN_GB2_H + +#include + +struct EnGb2; + +typedef struct EnGb2 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x150]; +} EnGb2; // size = 0x294 + +extern const ActorInit En_Gb2_InitVars; + +#endif // Z_EN_GB2_H diff --git a/src/overlays/actors/ovl_En_Ge1/overlay.cfg b/src/overlays/actors/ovl_En_Ge1/overlay.cfg new file mode 100644 index 0000000000..ebd643e2a1 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ge1/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ge1 +z_en_ge1.c diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c new file mode 100644 index 0000000000..9525d59eb9 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -0,0 +1,54 @@ +#include "z_en_ge1.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnGe1*)thisx) + +void EnGe1_Init(Actor* thisx, GlobalContext* globalCtx); +void EnGe1_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnGe1_Update(Actor* thisx, GlobalContext* globalCtx); +void EnGe1_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ge1_InitVars = { + ACTOR_EN_GE1, + ACTORTYPE_NPC, + FLAGS, + OBJECT_GE1, + sizeof(EnGe1), + (ActorFunc)EnGe1_Init, + (ActorFunc)EnGe1_Destroy, + (ActorFunc)EnGe1_Update, + (ActorFunc)EnGe1_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/EnGe1_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/EnGe1_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/func_809457EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/func_80945924.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/func_80945A00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/func_80945A9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/func_80945B60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/func_80945C50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/func_80945CAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/func_80945CE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/EnGe1_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/func_80946190.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/func_80946238.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/func_80946368.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge1_0x80945650/EnGe1_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h new file mode 100644 index 0000000000..414f1c2f5a --- /dev/null +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_GE1_H +#define Z_EN_GE1_H + +#include + +struct EnGe1; + +typedef struct EnGe1 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x188]; +} EnGe1; // size = 0x2CC + +extern const ActorInit En_Ge1_InitVars; + +#endif // Z_EN_GE1_H diff --git a/src/overlays/actors/ovl_En_Ge2/overlay.cfg b/src/overlays/actors/ovl_En_Ge2/overlay.cfg new file mode 100644 index 0000000000..965bfcf194 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ge2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ge2 +z_en_ge2.c diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c new file mode 100644 index 0000000000..71e6a52e94 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -0,0 +1,84 @@ +#include "z_en_ge2.h" + +#define FLAGS 0x80000009 + +#define THIS ((EnGe2*)thisx) + +void EnGe2_Init(Actor* thisx, GlobalContext* globalCtx); +void EnGe2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnGe2_Update(Actor* thisx, GlobalContext* globalCtx); +void EnGe2_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ge2_InitVars = { + ACTOR_EN_GE2, + ACTORTYPE_NPC, + FLAGS, + OBJECT_GLA, + sizeof(EnGe2), + (ActorFunc)EnGe2_Init, + (ActorFunc)EnGe2_Destroy, + (ActorFunc)EnGe2_Update, + (ActorFunc)EnGe2_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/EnGe2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/EnGe2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8B514.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8B5AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8B6B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8B7A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8B848.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8B90C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8BA40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8BB3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8BC1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8BC78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8BCEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8BD38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8BD90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8BE08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8BF04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8BFC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8C048.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8C0B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8C13C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8C45C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8C59C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8C644.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8C9B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/EnGe2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8CC0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8CCB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/func_80B8CCFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge2_0x80B8B2D0/EnGe2_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h new file mode 100644 index 0000000000..469d9514e8 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_GE2_H +#define Z_EN_GE2_H + +#include + +struct EnGe2; + +typedef struct EnGe2 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1C8]; +} EnGe2; // size = 0x30C + +extern const ActorInit En_Ge2_InitVars; + +#endif // Z_EN_GE2_H diff --git a/src/overlays/actors/ovl_En_Ge3/overlay.cfg b/src/overlays/actors/ovl_En_Ge3/overlay.cfg new file mode 100644 index 0000000000..5eec23b4bd --- /dev/null +++ b/src/overlays/actors/ovl_En_Ge3/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ge3 +z_en_ge3.c diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c new file mode 100644 index 0000000000..c6a4ef17d9 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -0,0 +1,58 @@ +#include "z_en_ge3.h" + +#define FLAGS 0x80000019 + +#define THIS ((EnGe3*)thisx) + +void EnGe3_Init(Actor* thisx, GlobalContext* globalCtx); +void EnGe3_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnGe3_Update(Actor* thisx, GlobalContext* globalCtx); +void EnGe3_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ge3_InitVars = { + ACTOR_EN_GE3, + ACTORTYPE_NPC, + FLAGS, + OBJECT_GELDB, + sizeof(EnGe3), + (ActorFunc)EnGe3_Init, + (ActorFunc)EnGe3_Destroy, + (ActorFunc)EnGe3_Update, + (ActorFunc)EnGe3_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/EnGe3_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/EnGe3_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A0070.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A00F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A020C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A024C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A0350.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A03AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A03FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A04D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A0820.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A08A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/EnGe3_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A096C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A0A14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/func_809A0C60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ge3_0x8099FEB0/EnGe3_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h new file mode 100644 index 0000000000..a738d30207 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_GE3_H +#define Z_EN_GE3_H + +#include + +struct EnGe3; + +typedef struct EnGe3 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1DC]; +} EnGe3; // size = 0x320 + +extern const ActorInit En_Ge3_InitVars; + +#endif // Z_EN_GE3_H diff --git a/src/overlays/actors/ovl_En_Geg/overlay.cfg b/src/overlays/actors/ovl_En_Geg/overlay.cfg new file mode 100644 index 0000000000..412bb71c1b --- /dev/null +++ b/src/overlays/actors/ovl_En_Geg/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Geg +z_en_geg.c diff --git a/src/overlays/actors/ovl_En_Geg/z_en_geg.c b/src/overlays/actors/ovl_En_Geg/z_en_geg.c new file mode 100644 index 0000000000..31d02caf5a --- /dev/null +++ b/src/overlays/actors/ovl_En_Geg/z_en_geg.c @@ -0,0 +1,98 @@ +#include "z_en_geg.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnGeg*)thisx) + +void EnGeg_Init(Actor* thisx, GlobalContext* globalCtx); +void EnGeg_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnGeg_Update(Actor* thisx, GlobalContext* globalCtx); +void EnGeg_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Geg_InitVars = { + ACTOR_EN_GEG, + ACTORTYPE_NPC, + FLAGS, + OBJECT_OF1D_MAP, + sizeof(EnGeg), + (ActorFunc)EnGeg_Init, + (ActorFunc)EnGeg_Destroy, + (ActorFunc)EnGeg_Update, + (ActorFunc)EnGeg_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB16D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB178C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB18FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB19C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB1B14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB1C1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB1C8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB1D04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB1D64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB1FCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB2020.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB2088.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB217C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB221C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB2520.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB26EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB27D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB2944.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB2A54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB2B1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB2E00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB2F7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB30B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB31B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB32AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB3318.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB347C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/EnGeg_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/EnGeg_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/EnGeg_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB3728.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB3860.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB387C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB39F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB3BE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/func_80BB3CB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Geg_0x80BB16D0/EnGeg_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Geg/z_en_geg.h b/src/overlays/actors/ovl_En_Geg/z_en_geg.h new file mode 100644 index 0000000000..5743b771dc --- /dev/null +++ b/src/overlays/actors/ovl_En_Geg/z_en_geg.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_GEG_H +#define Z_EN_GEG_H + +#include + +struct EnGeg; + +typedef struct EnGeg { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x3AC]; +} EnGeg; // size = 0x4F0 + +extern const ActorInit En_Geg_InitVars; + +#endif // Z_EN_GEG_H diff --git a/src/overlays/actors/ovl_En_Gg/overlay.cfg b/src/overlays/actors/ovl_En_Gg/overlay.cfg new file mode 100644 index 0000000000..5c782de1bc --- /dev/null +++ b/src/overlays/actors/ovl_En_Gg/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Gg +z_en_gg.c diff --git a/src/overlays/actors/ovl_En_Gg/z_en_gg.c b/src/overlays/actors/ovl_En_Gg/z_en_gg.c new file mode 100644 index 0000000000..191d20e799 --- /dev/null +++ b/src/overlays/actors/ovl_En_Gg/z_en_gg.c @@ -0,0 +1,76 @@ +#include "z_en_gg.h" + +#define FLAGS 0x00000089 + +#define THIS ((EnGg*)thisx) + +void EnGg_Init(Actor* thisx, GlobalContext* globalCtx); +void EnGg_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnGg_Update(Actor* thisx, GlobalContext* globalCtx); +void EnGg_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Gg_InitVars = { + ACTOR_EN_GG, + ACTORTYPE_NPC, + FLAGS, + OBJECT_GG, + sizeof(EnGg), + (ActorFunc)EnGg_Init, + (ActorFunc)EnGg_Destroy, + (ActorFunc)EnGg_Update, + (ActorFunc)EnGg_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B34F70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B34FB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B35108.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B351A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B35250.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B352A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B35450.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B3556C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B35634.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B357F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B3584C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B358D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B35968.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B359DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B35B24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B35B44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B35C84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B3610C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B363E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B364D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/EnGg_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/EnGg_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/EnGg_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B368B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/func_80B368F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg_0x80B34F70/EnGg_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Gg/z_en_gg.h b/src/overlays/actors/ovl_En_Gg/z_en_gg.h new file mode 100644 index 0000000000..ce0762fb6e --- /dev/null +++ b/src/overlays/actors/ovl_En_Gg/z_en_gg.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_GG_H +#define Z_EN_GG_H + +#include + +struct EnGg; + +typedef struct EnGg { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x24C]; +} EnGg; // size = 0x390 + +extern const ActorInit En_Gg_InitVars; + +#endif // Z_EN_GG_H diff --git a/src/overlays/actors/ovl_En_Gg2/overlay.cfg b/src/overlays/actors/ovl_En_Gg2/overlay.cfg new file mode 100644 index 0000000000..24b42b858a --- /dev/null +++ b/src/overlays/actors/ovl_En_Gg2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Gg2 +z_en_gg2.c diff --git a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c new file mode 100644 index 0000000000..5d64d912bc --- /dev/null +++ b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c @@ -0,0 +1,66 @@ +#include "z_en_gg2.h" + +#define FLAGS 0x00000089 + +#define THIS ((EnGg2*)thisx) + +void EnGg2_Init(Actor* thisx, GlobalContext* globalCtx); +void EnGg2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnGg2_Update(Actor* thisx, GlobalContext* globalCtx); +void EnGg2_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Gg2_InitVars = { + ACTOR_EN_GG2, + ACTORTYPE_NPC, + FLAGS, + OBJECT_GG, + sizeof(EnGg2), + (ActorFunc)EnGg2_Init, + (ActorFunc)EnGg2_Destroy, + (ActorFunc)EnGg2_Update, + (ActorFunc)EnGg2_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3AC50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3AC94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3ADD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3AE60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3AFB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3B05C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3B0A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3B120.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3B21C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3B294.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3B4B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3B5D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3B648.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3B7E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3B8A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/EnGg2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/EnGg2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/EnGg2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3BD44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/func_80B3BDC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gg2_0x80B3AC50/EnGg2_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.h b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.h new file mode 100644 index 0000000000..cb94ad6dab --- /dev/null +++ b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_GG2_H +#define Z_EN_GG2_H + +#include + +struct EnGg2; + +typedef struct EnGg2 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1CC]; +} EnGg2; // size = 0x310 + +extern const ActorInit En_Gg2_InitVars; + +#endif // Z_EN_GG2_H diff --git a/src/overlays/actors/ovl_En_Giant/overlay.cfg b/src/overlays/actors/ovl_En_Giant/overlay.cfg new file mode 100644 index 0000000000..a56d149b73 --- /dev/null +++ b/src/overlays/actors/ovl_En_Giant/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Giant +z_en_giant.c diff --git a/src/overlays/actors/ovl_En_Giant/z_en_giant.c b/src/overlays/actors/ovl_En_Giant/z_en_giant.c new file mode 100644 index 0000000000..353c6d3557 --- /dev/null +++ b/src/overlays/actors/ovl_En_Giant/z_en_giant.c @@ -0,0 +1,58 @@ +#include "z_en_giant.h" + +#define FLAGS 0x00000030 + +#define THIS ((EnGiant*)thisx) + +void EnGiant_Init(Actor* thisx, GlobalContext* globalCtx); +void EnGiant_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnGiant_Update(Actor* thisx, GlobalContext* globalCtx); +void EnGiant_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Giant_InitVars = { + ACTOR_EN_GIANT, + ACTORTYPE_NPC, + FLAGS, + OBJECT_GIANT, + sizeof(EnGiant), + (ActorFunc)EnGiant_Init, + (ActorFunc)EnGiant_Destroy, + (ActorFunc)EnGiant_Update, + (ActorFunc)EnGiant_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B01990.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B01A74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/EnGiant_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/EnGiant_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B01E84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B01EE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B020A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B0211C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B02234.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B02354.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B023D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B024AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B024D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/EnGiant_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B02688.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/func_80B026C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Giant_0x80B01990/EnGiant_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Giant/z_en_giant.h b/src/overlays/actors/ovl_En_Giant/z_en_giant.h new file mode 100644 index 0000000000..e661415c14 --- /dev/null +++ b/src/overlays/actors/ovl_En_Giant/z_en_giant.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_GIANT_H +#define Z_EN_GIANT_H + +#include + +struct EnGiant; + +typedef struct EnGiant { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x158]; +} EnGiant; // size = 0x29C + +extern const ActorInit En_Giant_InitVars; + +#endif // Z_EN_GIANT_H diff --git a/src/overlays/actors/ovl_En_Ginko_Man/overlay.cfg b/src/overlays/actors/ovl_En_Ginko_Man/overlay.cfg new file mode 100644 index 0000000000..5d02f02dcb --- /dev/null +++ b/src/overlays/actors/ovl_En_Ginko_Man/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ginko_Man +z_en_ginko_man.c diff --git a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c new file mode 100644 index 0000000000..073c46cea5 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c @@ -0,0 +1,66 @@ +#include "z_en_ginko_man.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnGinkoMan*)thisx) + +void EnGinkoMan_Init(Actor* thisx, GlobalContext* globalCtx); +void EnGinkoMan_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnGinkoMan_Update(Actor* thisx, GlobalContext* globalCtx); +void EnGinkoMan_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ginko_Man_InitVars = { + ACTOR_EN_GINKO_MAN, + ACTORTYPE_NPC, + FLAGS, + OBJECT_BOJ, + sizeof(EnGinkoMan), + (ActorFunc)EnGinkoMan_Init, + (ActorFunc)EnGinkoMan_Destroy, + (ActorFunc)EnGinkoMan_Update, + (ActorFunc)EnGinkoMan_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/EnGinkoMan_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/EnGinkoMan_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A64554.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A645A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A646F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A64DC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A65364.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A65490.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A654A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A6557C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A65590.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A656C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A656D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A65800.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A65844.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A65988.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A65A5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/EnGinkoMan_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A65B44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/func_80A65C18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ginko_Man_0x80A644A0/EnGinkoMan_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.h b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.h new file mode 100644 index 0000000000..65c4da8a5a --- /dev/null +++ b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_GINKO_MAN_H +#define Z_EN_GINKO_MAN_H + +#include + +struct EnGinkoMan; + +typedef struct EnGinkoMan { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x124]; +} EnGinkoMan; // size = 0x268 + +extern const ActorInit En_Ginko_Man_InitVars; + +#endif // Z_EN_GINKO_MAN_H diff --git a/src/overlays/actors/ovl_En_GirlA/overlay.cfg b/src/overlays/actors/ovl_En_GirlA/overlay.cfg new file mode 100644 index 0000000000..2083a33774 --- /dev/null +++ b/src/overlays/actors/ovl_En_GirlA/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_GirlA +z_en_girla.c diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c new file mode 100644 index 0000000000..785fa9f2f6 --- /dev/null +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -0,0 +1,109 @@ +#include "z_en_girla.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnGirlA*)thisx) + +void EnGirlA_Init(Actor* thisx, GlobalContext* globalCtx); +void EnGirlA_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnGirlA_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_GirlA_InitVars = { + ACTOR_EN_GIRLA, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnGirlA), + (ActorFunc)EnGirlA_Init, + (ActorFunc)EnGirlA_Destroy, + (ActorFunc)EnGirlA_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863870.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_8086387C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/EnGirlA_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/EnGirlA_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863950.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_808639B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863A10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863AAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863B4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863C08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863C6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863D28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863D60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863DC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863E48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863EC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80863F94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80864034.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_8086406C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_808640A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80864108.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80864168.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80864210.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_8086425C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_808642D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80864320.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_8086436C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_808643B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_8086444C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_808644A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80864558.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_808645A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80864658.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_808646A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_808646E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_808646F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_8086472C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80864744.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80864760.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_80864774.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_808648F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/EnGirlA_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_GirlA_0x80863870/func_808649C8.asm") diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h new file mode 100644 index 0000000000..fc3dce21bd --- /dev/null +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_GIRLA_H +#define Z_EN_GIRLA_H + +#include + +struct EnGirlA; + +typedef struct EnGirlA { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x88]; +} EnGirlA; // size = 0x1CC + +extern const ActorInit En_GirlA_InitVars; + +#endif // Z_EN_GIRLA_H diff --git a/src/overlays/actors/ovl_En_Gk/overlay.cfg b/src/overlays/actors/ovl_En_Gk/overlay.cfg new file mode 100644 index 0000000000..15b8f08e60 --- /dev/null +++ b/src/overlays/actors/ovl_En_Gk/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Gk +z_en_gk.c diff --git a/src/overlays/actors/ovl_En_Gk/z_en_gk.c b/src/overlays/actors/ovl_En_Gk/z_en_gk.c new file mode 100644 index 0000000000..ef64025312 --- /dev/null +++ b/src/overlays/actors/ovl_En_Gk/z_en_gk.c @@ -0,0 +1,102 @@ +#include "z_en_gk.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnGk*)thisx) + +void EnGk_Init(Actor* thisx, GlobalContext* globalCtx); +void EnGk_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnGk_Update(Actor* thisx, GlobalContext* globalCtx); +void EnGk_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Gk_InitVars = { + ACTOR_EN_GK, + ACTORTYPE_NPC, + FLAGS, + OBJECT_GK, + sizeof(EnGk), + (ActorFunc)EnGk_Init, + (ActorFunc)EnGk_Destroy, + (ActorFunc)EnGk_Update, + (ActorFunc)EnGk_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B50410.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B50710.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B507A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B50854.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B50954.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B509A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B50B38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B50C78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B50E14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B50ED4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B5100C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B5123C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B51308.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B51398.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B51410.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B51510.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B51698.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B51760.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B51970.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B51B40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B51D9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B51EA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B51FD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B5202C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B5216C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B521E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B5227C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B52340.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B52430.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B5253C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B525E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B52654.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/EnGk_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/EnGk_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/EnGk_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B52AD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B52AF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/func_80B52D8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gk_0x80B50410/EnGk_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Gk/z_en_gk.h b/src/overlays/actors/ovl_En_Gk/z_en_gk.h new file mode 100644 index 0000000000..b2a13cb45a --- /dev/null +++ b/src/overlays/actors/ovl_En_Gk/z_en_gk.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_GK_H +#define Z_EN_GK_H + +#include + +struct EnGk; + +typedef struct EnGk { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x214]; +} EnGk; // size = 0x358 + +extern const ActorInit En_Gk_InitVars; + +#endif // Z_EN_GK_H diff --git a/src/overlays/actors/ovl_En_Gm/overlay.cfg b/src/overlays/actors/ovl_En_Gm/overlay.cfg new file mode 100644 index 0000000000..d39cd1d30e --- /dev/null +++ b/src/overlays/actors/ovl_En_Gm/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Gm +z_en_gm.c diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c new file mode 100644 index 0000000000..011cf1e02a --- /dev/null +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -0,0 +1,126 @@ +#include "z_en_gm.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnGm*)thisx) + +void EnGm_Init(Actor* thisx, GlobalContext* globalCtx); +void EnGm_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnGm_Update(Actor* thisx, GlobalContext* globalCtx); +void EnGm_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Gm_InitVars = { + ACTOR_EN_GM, + ACTORTYPE_NPC, + FLAGS, + OBJECT_IN2, + sizeof(EnGm), + (ActorFunc)EnGm_Init, + (ActorFunc)EnGm_Destroy, + (ActorFunc)EnGm_Update, + (ActorFunc)EnGm_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094DEE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094DF90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094DFF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094E054.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094E0F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094E1DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094E278.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094E2D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094E454.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094E4D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094E52C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094E69C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094EA34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094EB1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094EDBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094EE84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094EFC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094F074.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094F0E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094F2E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094F3D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094F4EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094F53C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094F7D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094F904.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094FAC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094FCC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094FD88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094FE10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8094FF04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_80950088.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_80950120.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_809501B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_80950280.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_80950388.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_809503F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_80950490.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_80950690.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_80950804.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_8095097C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_80950C24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_80950CDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_80950DB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_80950F2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/EnGm_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/EnGm_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/EnGm_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_809513AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_809514BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/func_80951594.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gm_0x8094DEE0/EnGm_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.h b/src/overlays/actors/ovl_En_Gm/z_en_gm.h new file mode 100644 index 0000000000..51aed87977 --- /dev/null +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_GM_H +#define Z_EN_GM_H + +#include + +struct EnGm; + +typedef struct EnGm { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2C0]; +} EnGm; // size = 0x404 + +extern const ActorInit En_Gm_InitVars; + +#endif // Z_EN_GM_H diff --git a/src/overlays/actors/ovl_En_Go/overlay.cfg b/src/overlays/actors/ovl_En_Go/overlay.cfg new file mode 100644 index 0000000000..3ab4530a45 --- /dev/null +++ b/src/overlays/actors/ovl_En_Go/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Go +z_en_go.c diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c new file mode 100644 index 0000000000..1465bd9897 --- /dev/null +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -0,0 +1,163 @@ +#include "z_en_go.h" + +#define FLAGS 0x02000019 + +#define THIS ((EnGo*)thisx) + +void EnGo_Init(Actor* thisx, GlobalContext* globalCtx); +void EnGo_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnGo_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Go_InitVars = { + ACTOR_EN_GO, + ACTORTYPE_NPC, + FLAGS, + OBJECT_OF1D_MAP, + sizeof(EnGo), + (ActorFunc)EnGo_Init, + (ActorFunc)EnGo_Destroy, + (ActorFunc)EnGo_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A10FD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A11144.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A1143C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A115B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A118F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A11BF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A11EC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A1203C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A1213C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A121F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A1222C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A122EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A123A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A124A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A124FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A125BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A12660.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A126BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A12774.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A12868.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A12954.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A12A64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A12B78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A12C48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A12D6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A12DF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A12E80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A12FE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A131F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A132C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A133A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A13400.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A134B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A134F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A13564.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A136B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A13728.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A137C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A139E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A13B1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A13E80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A14018.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A14104.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A141D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A1428C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A14324.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A143A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A14430.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A1449C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A144F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A145AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A14668.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A146CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A14798.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A149B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A14B30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A14E14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A14E74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A14EB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A14FC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A153FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A15684.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A157C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/EnGo_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/EnGo_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/EnGo_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A15B80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A15D04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A15E38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Go_0x80A10FD0/func_80A15FEC.asm") diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.h b/src/overlays/actors/ovl_En_Go/z_en_go.h new file mode 100644 index 0000000000..0aabbb802a --- /dev/null +++ b/src/overlays/actors/ovl_En_Go/z_en_go.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_GO_H +#define Z_EN_GO_H + +#include + +struct EnGo; + +typedef struct EnGo { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xA34]; +} EnGo; // size = 0xB78 + +extern const ActorInit En_Go_InitVars; + +#endif // Z_EN_GO_H diff --git a/src/overlays/actors/ovl_En_Goroiwa/overlay.cfg b/src/overlays/actors/ovl_En_Goroiwa/overlay.cfg new file mode 100644 index 0000000000..0f4bb5a326 --- /dev/null +++ b/src/overlays/actors/ovl_En_Goroiwa/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Goroiwa +z_en_goroiwa.c diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c new file mode 100644 index 0000000000..f0a21702c1 --- /dev/null +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -0,0 +1,128 @@ +#include "z_en_goroiwa.h" + +#define FLAGS 0x80000010 + +#define THIS ((EnGoroiwa*)thisx) + +void EnGoroiwa_Init(Actor* thisx, GlobalContext* globalCtx); +void EnGoroiwa_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnGoroiwa_Update(Actor* thisx, GlobalContext* globalCtx); +void EnGoroiwa_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Goroiwa_InitVars = { + ACTOR_EN_GOROIWA, + ACTORTYPE_PROP, + FLAGS, + OBJECT_GOROIWA, + sizeof(EnGoroiwa), + (ActorFunc)EnGoroiwa_Init, + (ActorFunc)EnGoroiwa_Destroy, + (ActorFunc)EnGoroiwa_Update, + (ActorFunc)EnGoroiwa_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093E8A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093E91C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093E938.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093E9B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093EAB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093EAD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093EB58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093EB74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093EC50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093ECD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093ED80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093EDB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093EDD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093EE18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093EE64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093EEBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093EEDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093EF54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093F198.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093F34C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093F498.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093F5EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093F6F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093FAA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093FC00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8093FC6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80940090.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80940588.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80940A1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80940E38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80941060.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80941274.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/EnGoroiwa_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/EnGoroiwa_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8094156C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_809419D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80941A10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80941DB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80941E28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80941EB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80941F10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80941F54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80941FA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80942084.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_809420F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_809421E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_8094220C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_809425CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80942604.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/EnGoroiwa_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/func_80942B1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Goroiwa_0x8093E8A0/EnGoroiwa_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h new file mode 100644 index 0000000000..2935485d0b --- /dev/null +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_GOROIWA_H +#define Z_EN_GOROIWA_H + +#include + +struct EnGoroiwa; + +typedef struct EnGoroiwa { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x108]; +} EnGoroiwa; // size = 0x24C + +extern const ActorInit En_Goroiwa_InitVars; + +#endif // Z_EN_GOROIWA_H diff --git a/src/overlays/actors/ovl_En_Grasshopper/overlay.cfg b/src/overlays/actors/ovl_En_Grasshopper/overlay.cfg new file mode 100644 index 0000000000..a5fa8bb0a5 --- /dev/null +++ b/src/overlays/actors/ovl_En_Grasshopper/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Grasshopper +z_en_grasshopper.c diff --git a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c new file mode 100644 index 0000000000..87fbdbf08a --- /dev/null +++ b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c @@ -0,0 +1,88 @@ +#include "z_en_grasshopper.h" + +#define FLAGS 0x00000015 + +#define THIS ((EnGrasshopper*)thisx) + +void EnGrasshopper_Init(Actor* thisx, GlobalContext* globalCtx); +void EnGrasshopper_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnGrasshopper_Update(Actor* thisx, GlobalContext* globalCtx); +void EnGrasshopper_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Grasshopper_InitVars = { + ACTOR_EN_GRASSHOPPER, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_GRASSHOPPER, + sizeof(EnGrasshopper), + (ActorFunc)EnGrasshopper_Init, + (ActorFunc)EnGrasshopper_Destroy, + (ActorFunc)EnGrasshopper_Update, + (ActorFunc)EnGrasshopper_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/EnGrasshopper_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/EnGrasshopper_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A6524.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A65D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A6628.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A6668.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A6754.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A67A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A6B6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A6E18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A6E74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A6F8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A700C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A7134.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A71CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A7494.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A753C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A7844.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A78EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A797C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A7A8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A7AE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A7BBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A7C98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A7CE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A8044.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/EnGrasshopper_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A847C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/EnGrasshopper_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A8870.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A8924.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Grasshopper_0x809A6280/func_809A8A64.asm") diff --git a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.h b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.h new file mode 100644 index 0000000000..52b1af55da --- /dev/null +++ b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_GRASSHOPPER_H +#define Z_EN_GRASSHOPPER_H + +#include + +struct EnGrasshopper; + +typedef struct EnGrasshopper { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0x172C]; +} EnGrasshopper; // size = 0x1870 + +extern const ActorInit En_Grasshopper_InitVars; + +#endif // Z_EN_GRASSHOPPER_H diff --git a/src/overlays/actors/ovl_En_Gs/overlay.cfg b/src/overlays/actors/ovl_En_Gs/overlay.cfg new file mode 100644 index 0000000000..0fc22a8560 --- /dev/null +++ b/src/overlays/actors/ovl_En_Gs/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Gs +z_en_gs.c diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c new file mode 100644 index 0000000000..155274c91c --- /dev/null +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -0,0 +1,86 @@ +#include "z_en_gs.h" + +#define FLAGS 0x02000019 + +#define THIS ((EnGs*)thisx) + +void EnGs_Init(Actor* thisx, GlobalContext* globalCtx); +void EnGs_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnGs_Update(Actor* thisx, GlobalContext* globalCtx); +void EnGs_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Gs_InitVars = { + ACTOR_EN_GS, + ACTORTYPE_PROP, + FLAGS, + OBJECT_GS, + sizeof(EnGs), + (ActorFunc)EnGs_Init, + (ActorFunc)EnGs_Destroy, + (ActorFunc)EnGs_Update, + (ActorFunc)EnGs_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80997A90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80997AFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/EnGs_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/EnGs_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80997D14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80997D38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80997DEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80997E4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80997FF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80998040.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_8099807C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80998300.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80998334.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_809984F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_809985B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80998704.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_8099874C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_809989B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_809989F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80998A48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80998BBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80998D44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80998F9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80999584.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_809995A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80999A8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80999AC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80999B34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/func_80999BC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/EnGs_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Gs_0x80997A90/EnGs_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.h b/src/overlays/actors/ovl_En_Gs/z_en_gs.h new file mode 100644 index 0000000000..ee027308a4 --- /dev/null +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_GS_H +#define Z_EN_GS_H + +#include + +struct EnGs; + +typedef struct EnGs { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xDC]; +} EnGs; // size = 0x220 + +extern const ActorInit En_Gs_InitVars; + +#endif // Z_EN_GS_H diff --git a/src/overlays/actors/ovl_En_Guard_Nuts/overlay.cfg b/src/overlays/actors/ovl_En_Guard_Nuts/overlay.cfg new file mode 100644 index 0000000000..135b80f6cc --- /dev/null +++ b/src/overlays/actors/ovl_En_Guard_Nuts/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Guard_Nuts +z_en_guard_nuts.c diff --git a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c new file mode 100644 index 0000000000..59f0c9a930 --- /dev/null +++ b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c @@ -0,0 +1,50 @@ +#include "z_en_guard_nuts.h" + +#define FLAGS 0x80100009 + +#define THIS ((EnGuardNuts*)thisx) + +void EnGuardNuts_Init(Actor* thisx, GlobalContext* globalCtx); +void EnGuardNuts_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnGuardNuts_Update(Actor* thisx, GlobalContext* globalCtx); +void EnGuardNuts_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Guard_Nuts_InitVars = { + ACTOR_EN_GUARD_NUTS, + ACTORTYPE_NPC, + FLAGS, + OBJECT_DNK, + sizeof(EnGuardNuts), + (ActorFunc)EnGuardNuts_Init, + (ActorFunc)EnGuardNuts_Destroy, + (ActorFunc)EnGuardNuts_Update, + (ActorFunc)EnGuardNuts_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/EnGuardNuts_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/EnGuardNuts_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABB210.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABB29C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABB2D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABB540.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABB590.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABB854.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABB91C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABB990.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/EnGuardNuts_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/func_80ABBC60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guard_Nuts_0x80ABB0E0/EnGuardNuts_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.h b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.h new file mode 100644 index 0000000000..6a98a4fa4e --- /dev/null +++ b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_GUARD_NUTS_H +#define Z_EN_GUARD_NUTS_H + +#include + +struct EnGuardNuts; + +typedef struct EnGuardNuts { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x14C]; +} EnGuardNuts; // size = 0x290 + +extern const ActorInit En_Guard_Nuts_InitVars; + +#endif // Z_EN_GUARD_NUTS_H diff --git a/src/overlays/actors/ovl_En_Guruguru/overlay.cfg b/src/overlays/actors/ovl_En_Guruguru/overlay.cfg new file mode 100644 index 0000000000..727ca7b59b --- /dev/null +++ b/src/overlays/actors/ovl_En_Guruguru/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Guruguru +z_en_guruguru.c diff --git a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c new file mode 100644 index 0000000000..d3d1197104 --- /dev/null +++ b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c @@ -0,0 +1,52 @@ +#include "z_en_guruguru.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnGuruguru*)thisx) + +void EnGuruguru_Init(Actor* thisx, GlobalContext* globalCtx); +void EnGuruguru_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnGuruguru_Update(Actor* thisx, GlobalContext* globalCtx); +void EnGuruguru_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Guruguru_InitVars = { + ACTOR_EN_GURUGURU, + ACTORTYPE_NPC, + FLAGS, + OBJECT_FU, + sizeof(EnGuruguru), + (ActorFunc)EnGuruguru_Init, + (ActorFunc)EnGuruguru_Destroy, + (ActorFunc)EnGuruguru_Update, + (ActorFunc)EnGuruguru_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/EnGuruguru_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/EnGuruguru_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/func_80BC6D64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/func_80BC6E00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/func_80BC6E10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/func_80BC6F14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/func_80BC701C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/func_80BC7068.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/func_80BC73F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/func_80BC7440.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/func_80BC7520.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/EnGuruguru_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/func_80BC77EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Guruguru_0x80BC6BF0/EnGuruguru_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.h b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.h new file mode 100644 index 0000000000..ab46c91c38 --- /dev/null +++ b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_GURUGURU_H +#define Z_EN_GURUGURU_H + +#include + +struct EnGuruguru; + +typedef struct EnGuruguru { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x180]; +} EnGuruguru; // size = 0x2C4 + +extern const ActorInit En_Guruguru_InitVars; + +#endif // Z_EN_GURUGURU_H diff --git a/src/overlays/actors/ovl_En_Hakurock/overlay.cfg b/src/overlays/actors/ovl_En_Hakurock/overlay.cfg new file mode 100644 index 0000000000..93c363b8d9 --- /dev/null +++ b/src/overlays/actors/ovl_En_Hakurock/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Hakurock +z_en_hakurock.c diff --git a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c new file mode 100644 index 0000000000..b4c12b7136 --- /dev/null +++ b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c @@ -0,0 +1,57 @@ +#include "z_en_hakurock.h" + +#define FLAGS 0x00000030 + +#define THIS ((EnHakurock*)thisx) + +void EnHakurock_Init(Actor* thisx, GlobalContext* globalCtx); +void EnHakurock_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnHakurock_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Hakurock_InitVars = { + ACTOR_EN_HAKUROCK, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_BOSS_HAKUGIN, + sizeof(EnHakurock), + (ActorFunc)EnHakurock_Init, + (ActorFunc)EnHakurock_Destroy, + (ActorFunc)EnHakurock_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/EnHakurock_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/EnHakurock_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B21BE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B21EA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B21FFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B22040.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B220A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B221E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B222AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B2242C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B224C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B22500.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B226AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B22750.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/EnHakurock_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B228F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hakurock_0x80B21B00/func_80B229A4.asm") diff --git a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.h b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.h new file mode 100644 index 0000000000..0818480ec5 --- /dev/null +++ b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_HAKUROCK_H +#define Z_EN_HAKUROCK_H + +#include + +struct EnHakurock; + +typedef struct EnHakurock { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x54]; +} EnHakurock; // size = 0x198 + +extern const ActorInit En_Hakurock_InitVars; + +#endif // Z_EN_HAKUROCK_H diff --git a/src/overlays/actors/ovl_En_Hanabi/overlay.cfg b/src/overlays/actors/ovl_En_Hanabi/overlay.cfg new file mode 100644 index 0000000000..67feefe27c --- /dev/null +++ b/src/overlays/actors/ovl_En_Hanabi/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Hanabi +z_en_hanabi.c diff --git a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c new file mode 100644 index 0000000000..3feb2ea14c --- /dev/null +++ b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c @@ -0,0 +1,57 @@ +#include "z_en_hanabi.h" + +#define FLAGS 0x00000030 + +#define THIS ((EnHanabi*)thisx) + +void EnHanabi_Init(Actor* thisx, GlobalContext* globalCtx); +void EnHanabi_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnHanabi_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Hanabi_InitVars = { + ACTOR_EN_HANABI, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnHanabi), + (ActorFunc)EnHanabi_Init, + (ActorFunc)EnHanabi_Destroy, + (ActorFunc)EnHanabi_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B22C00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B22C2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B22C80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B22E0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B22F34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B22FA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/EnHanabi_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/EnHanabi_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B234C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B235CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B236C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B23894.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B238D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B23910.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B23934.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/EnHanabi_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hanabi_0x80B22C00/func_80B23A38.asm") diff --git a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.h b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.h new file mode 100644 index 0000000000..dd411e4fb7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_HANABI_H +#define Z_EN_HANABI_H + +#include + +struct EnHanabi; + +typedef struct EnHanabi { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0x4514]; +} EnHanabi; // size = 0x4658 + +extern const ActorInit En_Hanabi_InitVars; + +#endif // Z_EN_HANABI_H diff --git a/src/overlays/actors/ovl_En_Hata/overlay.cfg b/src/overlays/actors/ovl_En_Hata/overlay.cfg new file mode 100644 index 0000000000..e670da2627 --- /dev/null +++ b/src/overlays/actors/ovl_En_Hata/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Hata +z_en_hata.c diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.c b/src/overlays/actors/ovl_En_Hata/z_en_hata.c new file mode 100644 index 0000000000..99a1d59295 --- /dev/null +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -0,0 +1,34 @@ +#include "z_en_hata.h" + +#define FLAGS 0x00000000 + +#define THIS ((EnHata*)thisx) + +void EnHata_Init(Actor* thisx, GlobalContext* globalCtx); +void EnHata_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnHata_Update(Actor* thisx, GlobalContext* globalCtx); +void EnHata_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Hata_InitVars = { + ACTOR_EN_HATA, + ACTORTYPE_PROP, + FLAGS, + OBJECT_HATA, + sizeof(EnHata), + (ActorFunc)EnHata_Init, + (ActorFunc)EnHata_Destroy, + (ActorFunc)EnHata_Update, + (ActorFunc)EnHata_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hata_0x8089E8E0/EnHata_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hata_0x8089E8E0/EnHata_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hata_0x8089E8E0/EnHata_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hata_0x8089E8E0/func_8089EC68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hata_0x8089E8E0/EnHata_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.h b/src/overlays/actors/ovl_En_Hata/z_en_hata.h new file mode 100644 index 0000000000..907f077a38 --- /dev/null +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_HATA_H +#define Z_EN_HATA_H + +#include + +struct EnHata; + +typedef struct EnHata { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x16C]; +} EnHata; // size = 0x2B0 + +extern const ActorInit En_Hata_InitVars; + +#endif // Z_EN_HATA_H diff --git a/src/overlays/actors/ovl_En_Heishi/overlay.cfg b/src/overlays/actors/ovl_En_Heishi/overlay.cfg new file mode 100644 index 0000000000..3b8a0e40e7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Heishi/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Heishi +z_en_heishi.c diff --git a/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c b/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c new file mode 100644 index 0000000000..58b9f4d30f --- /dev/null +++ b/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c @@ -0,0 +1,42 @@ +#include "z_en_heishi.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnHeishi*)thisx) + +void EnHeishi_Init(Actor* thisx, GlobalContext* globalCtx); +void EnHeishi_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnHeishi_Update(Actor* thisx, GlobalContext* globalCtx); +void EnHeishi_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Heishi_InitVars = { + ACTOR_EN_HEISHI, + ACTORTYPE_NPC, + FLAGS, + OBJECT_SDN, + sizeof(EnHeishi), + (ActorFunc)EnHeishi_Init, + (ActorFunc)EnHeishi_Destroy, + (ActorFunc)EnHeishi_Update, + (ActorFunc)EnHeishi_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Heishi_0x80BE8F20/EnHeishi_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Heishi_0x80BE8F20/EnHeishi_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Heishi_0x80BE8F20/func_80BE90BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Heishi_0x80BE8F20/func_80BE9148.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Heishi_0x80BE8F20/func_80BE91DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Heishi_0x80BE8F20/func_80BE9214.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Heishi_0x80BE8F20/EnHeishi_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Heishi_0x80BE8F20/func_80BE9380.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Heishi_0x80BE8F20/EnHeishi_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Heishi/z_en_heishi.h b/src/overlays/actors/ovl_En_Heishi/z_en_heishi.h new file mode 100644 index 0000000000..4fc2e26ea2 --- /dev/null +++ b/src/overlays/actors/ovl_En_Heishi/z_en_heishi.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_HEISHI_H +#define Z_EN_HEISHI_H + +#include + +struct EnHeishi; + +typedef struct EnHeishi { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x18C]; +} EnHeishi; // size = 0x2D0 + +extern const ActorInit En_Heishi_InitVars; + +#endif // Z_EN_HEISHI_H diff --git a/src/overlays/actors/ovl_En_Hg/overlay.cfg b/src/overlays/actors/ovl_En_Hg/overlay.cfg new file mode 100644 index 0000000000..d3037b31d5 --- /dev/null +++ b/src/overlays/actors/ovl_En_Hg/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Hg +z_en_hg.c diff --git a/src/overlays/actors/ovl_En_Hg/z_en_hg.c b/src/overlays/actors/ovl_En_Hg/z_en_hg.c new file mode 100644 index 0000000000..151fae0602 --- /dev/null +++ b/src/overlays/actors/ovl_En_Hg/z_en_hg.c @@ -0,0 +1,68 @@ +#include "z_en_hg.h" + +#define FLAGS 0x02100019 + +#define THIS ((EnHg*)thisx) + +void EnHg_Init(Actor* thisx, GlobalContext* globalCtx); +void EnHg_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnHg_Update(Actor* thisx, GlobalContext* globalCtx); +void EnHg_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Hg_InitVars = { + ACTOR_EN_HG, + ACTORTYPE_PROP, + FLAGS, + OBJECT_HARFGIBUD, + sizeof(EnHg), + (ActorFunc)EnHg_Init, + (ActorFunc)EnHg_Destroy, + (ActorFunc)EnHg_Update, + (ActorFunc)EnHg_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/EnHg_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/EnHg_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF354.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF398.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF468.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF4AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF5F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF634.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF68C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF6D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF710.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF778.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF7D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF88C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF8A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF93C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCF95C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCFC0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/EnHg_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCFE54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/func_80BCFE70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hg_0x80BCF1D0/EnHg_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Hg/z_en_hg.h b/src/overlays/actors/ovl_En_Hg/z_en_hg.h new file mode 100644 index 0000000000..6e537e7731 --- /dev/null +++ b/src/overlays/actors/ovl_En_Hg/z_en_hg.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_HG_H +#define Z_EN_HG_H + +#include + +struct EnHg; + +typedef struct EnHg { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1D4]; +} EnHg; // size = 0x318 + +extern const ActorInit En_Hg_InitVars; + +#endif // Z_EN_HG_H diff --git a/src/overlays/actors/ovl_En_Hgo/overlay.cfg b/src/overlays/actors/ovl_En_Hgo/overlay.cfg new file mode 100644 index 0000000000..242079637b --- /dev/null +++ b/src/overlays/actors/ovl_En_Hgo/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Hgo +z_en_hgo.c diff --git a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c new file mode 100644 index 0000000000..b45a9124d3 --- /dev/null +++ b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c @@ -0,0 +1,58 @@ +#include "z_en_hgo.h" + +#define FLAGS 0x02000019 + +#define THIS ((EnHgo*)thisx) + +void EnHgo_Init(Actor* thisx, GlobalContext* globalCtx); +void EnHgo_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnHgo_Update(Actor* thisx, GlobalContext* globalCtx); +void EnHgo_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Hgo_InitVars = { + ACTOR_EN_HGO, + ACTORTYPE_NPC, + FLAGS, + OBJECT_HARFGIBUD, + sizeof(EnHgo), + (ActorFunc)EnHgo_Init, + (ActorFunc)EnHgo_Destroy, + (ActorFunc)EnHgo_Update, + (ActorFunc)EnHgo_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/EnHgo_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/EnHgo_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD03EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD0410.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD0420.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD0434.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD049C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD04E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD064C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD0660.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD06FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD0898.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD0B8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/EnHgo_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD0CF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/func_80BD0D38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hgo_0x80BD02B0/EnHgo_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.h b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.h new file mode 100644 index 0000000000..a82ab004c9 --- /dev/null +++ b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_HGO_H +#define Z_EN_HGO_H + +#include + +struct EnHgo; + +typedef struct EnHgo { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1D4]; +} EnHgo; // size = 0x318 + +extern const ActorInit En_Hgo_InitVars; + +#endif // Z_EN_HGO_H diff --git a/src/overlays/actors/ovl_En_Hidden_Nuts/overlay.cfg b/src/overlays/actors/ovl_En_Hidden_Nuts/overlay.cfg new file mode 100644 index 0000000000..491a14d601 --- /dev/null +++ b/src/overlays/actors/ovl_En_Hidden_Nuts/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Hidden_Nuts +z_en_hidden_nuts.c diff --git a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c new file mode 100644 index 0000000000..d0ecc95727 --- /dev/null +++ b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c @@ -0,0 +1,60 @@ +#include "z_en_hidden_nuts.h" + +#define FLAGS 0x02000009 + +#define THIS ((EnHiddenNuts*)thisx) + +void EnHiddenNuts_Init(Actor* thisx, GlobalContext* globalCtx); +void EnHiddenNuts_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnHiddenNuts_Update(Actor* thisx, GlobalContext* globalCtx); +void EnHiddenNuts_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Hidden_Nuts_InitVars = { + ACTOR_EN_HIDDEN_NUTS, + ACTORTYPE_PROP, + FLAGS, + OBJECT_HINTNUTS, + sizeof(EnHiddenNuts), + (ActorFunc)EnHiddenNuts_Init, + (ActorFunc)EnHiddenNuts_Destroy, + (ActorFunc)EnHiddenNuts_Update, + (ActorFunc)EnHiddenNuts_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/EnHiddenNuts_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/EnHiddenNuts_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB1B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB268.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB2B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB580.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB59C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB788.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB7E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB8F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB930.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDB978.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDBA28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDBB48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDBE70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/func_80BDBED4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/EnHiddenNuts_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hidden_Nuts_0x80BDB040/EnHiddenNuts_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.h b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.h new file mode 100644 index 0000000000..cdceff787a --- /dev/null +++ b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_HIDDEN_NUTS_H +#define Z_EN_HIDDEN_NUTS_H + +#include + +struct EnHiddenNuts; + +typedef struct EnHiddenNuts { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x13C]; +} EnHiddenNuts; // size = 0x280 + +extern const ActorInit En_Hidden_Nuts_InitVars; + +#endif // Z_EN_HIDDEN_NUTS_H diff --git a/src/overlays/actors/ovl_En_Hint_Skb/overlay.cfg b/src/overlays/actors/ovl_En_Hint_Skb/overlay.cfg new file mode 100644 index 0000000000..95449a9a4e --- /dev/null +++ b/src/overlays/actors/ovl_En_Hint_Skb/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Hint_Skb +z_en_hint_skb.c diff --git a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c new file mode 100644 index 0000000000..9aea49e5d7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c @@ -0,0 +1,100 @@ +#include "z_en_hint_skb.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnHintSkb*)thisx) + +void EnHintSkb_Init(Actor* thisx, GlobalContext* globalCtx); +void EnHintSkb_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnHintSkb_Update(Actor* thisx, GlobalContext* globalCtx); +void EnHintSkb_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Hint_Skb_InitVars = { + ACTOR_EN_HINT_SKB, + ACTORTYPE_NPC, + FLAGS, + OBJECT_SKB, + sizeof(EnHintSkb), + (ActorFunc)EnHintSkb_Init, + (ActorFunc)EnHintSkb_Destroy, + (ActorFunc)EnHintSkb_Update, + (ActorFunc)EnHintSkb_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/EnHintSkb_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/EnHintSkb_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C1FE0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C1FE20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C1FE30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C1FE80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C1FF30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C1FF88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C2003C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C200B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C2011C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C2016C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20274.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20334.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20484.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C204F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20540.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20590.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C2066C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C2069C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C2075C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C2077C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C208BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C208D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20A74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20B88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20C24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20D64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C20E90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C21250.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C21320.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C21414.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C21468.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C215E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/EnHintSkb_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C21858.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/func_80C219D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hint_Skb_0x80C1FCF0/EnHintSkb_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.h b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.h new file mode 100644 index 0000000000..57e3de4aa5 --- /dev/null +++ b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_HINT_SKB_H +#define Z_EN_HINT_SKB_H + +#include + +struct EnHintSkb; + +typedef struct EnHintSkb { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2A8]; +} EnHintSkb; // size = 0x3EC + +extern const ActorInit En_Hint_Skb_InitVars; + +#endif // Z_EN_HINT_SKB_H diff --git a/src/overlays/actors/ovl_En_Hit_Tag/overlay.cfg b/src/overlays/actors/ovl_En_Hit_Tag/overlay.cfg new file mode 100644 index 0000000000..e7ee964c99 --- /dev/null +++ b/src/overlays/actors/ovl_En_Hit_Tag/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Hit_Tag +z_en_hit_tag.c diff --git a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c new file mode 100644 index 0000000000..e71dc61645 --- /dev/null +++ b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c @@ -0,0 +1,31 @@ +#include "z_en_hit_tag.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnHitTag*)thisx) + +void EnHitTag_Init(Actor* thisx, GlobalContext* globalCtx); +void EnHitTag_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnHitTag_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Hit_Tag_InitVars = { + ACTOR_EN_HIT_TAG, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnHitTag), + (ActorFunc)EnHitTag_Init, + (ActorFunc)EnHitTag_Destroy, + (ActorFunc)EnHitTag_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hit_Tag_0x80BE2030/EnHitTag_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hit_Tag_0x80BE2030/EnHitTag_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hit_Tag_0x80BE2030/func_80BE20E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hit_Tag_0x80BE2030/EnHitTag_Update.asm") diff --git a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.h b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.h new file mode 100644 index 0000000000..1e742be8a1 --- /dev/null +++ b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_HIT_TAG_H +#define Z_EN_HIT_TAG_H + +#include + +struct EnHitTag; + +typedef struct EnHitTag { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x50]; +} EnHitTag; // size = 0x194 + +extern const ActorInit En_Hit_Tag_InitVars; + +#endif // Z_EN_HIT_TAG_H diff --git a/src/overlays/actors/ovl_En_Holl/overlay.cfg b/src/overlays/actors/ovl_En_Holl/overlay.cfg new file mode 100644 index 0000000000..35c8d8f8e3 --- /dev/null +++ b/src/overlays/actors/ovl_En_Holl/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Holl +z_en_holl.c diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/src/overlays/actors/ovl_En_Holl/z_en_holl.c new file mode 100644 index 0000000000..4bde882ff3 --- /dev/null +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -0,0 +1,48 @@ +#include "z_en_holl.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnHoll*)thisx) + +void EnHoll_Init(Actor* thisx, GlobalContext* globalCtx); +void EnHoll_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnHoll_Update(Actor* thisx, GlobalContext* globalCtx); +void EnHoll_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Holl_InitVars = { + ACTOR_EN_HOLL, + ACTORTYPE_DOOR, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnHoll), + (ActorFunc)EnHoll_Init, + (ActorFunc)EnHoll_Destroy, + (ActorFunc)EnHoll_Update, + (ActorFunc)EnHoll_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Holl_0x80899960/func_80899960.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Holl_0x80899960/func_808999B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Holl_0x80899960/EnHoll_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Holl_0x80899960/EnHoll_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Holl_0x80899960/func_80899ACC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Holl_0x80899960/func_80899B88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Holl_0x80899960/func_80899F30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Holl_0x80899960/func_8089A0C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Holl_0x80899960/func_8089A238.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Holl_0x80899960/func_8089A330.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Holl_0x80899960/EnHoll_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Holl_0x80899960/EnHoll_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.h b/src/overlays/actors/ovl_En_Holl/z_en_holl.h new file mode 100644 index 0000000000..a3e4530e42 --- /dev/null +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_HOLL_H +#define Z_EN_HOLL_H + +#include + +struct EnHoll; + +typedef struct EnHoll { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x8]; +} EnHoll; // size = 0x14C + +extern const ActorInit En_Holl_InitVars; + +#endif // Z_EN_HOLL_H diff --git a/src/overlays/actors/ovl_En_Honotrap/overlay.cfg b/src/overlays/actors/ovl_En_Honotrap/overlay.cfg new file mode 100644 index 0000000000..4a20640dee --- /dev/null +++ b/src/overlays/actors/ovl_En_Honotrap/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Honotrap +z_en_honotrap.c diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c new file mode 100644 index 0000000000..a2ece958e9 --- /dev/null +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -0,0 +1,106 @@ +#include "z_en_honotrap.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnHonotrap*)thisx) + +void EnHonotrap_Init(Actor* thisx, GlobalContext* globalCtx); +void EnHonotrap_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnHonotrap_Update(Actor* thisx, GlobalContext* globalCtx); +void EnHonotrap_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Honotrap_InitVars = { + ACTOR_EN_HONOTRAP, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_DANGEON_KEEP, + sizeof(EnHonotrap), + (ActorFunc)EnHonotrap_Init, + (ActorFunc)EnHonotrap_Destroy, + (ActorFunc)EnHonotrap_Update, + (ActorFunc)EnHonotrap_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092E510.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092E5A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092E638.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092E840.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092E988.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/EnHonotrap_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/EnHonotrap_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092EBC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092EBDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092EC9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092ECF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092EDC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092EDD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092EE08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092EE1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092EE68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092EE90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092EF3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092EF98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F05C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F074.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F0A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F0B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F0F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F10C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F1A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F208.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F34C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F3D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F5AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F5EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F7A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F7BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F854.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092F878.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/EnHonotrap_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092FE44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_8092FEFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/EnHonotrap_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_80930030.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Honotrap_0x8092E510/func_80930190.asm") diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h new file mode 100644 index 0000000000..93b67e5fd6 --- /dev/null +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_HONOTRAP_H +#define Z_EN_HONOTRAP_H + +#include + +struct EnHonotrap; + +typedef struct EnHonotrap { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x180]; +} EnHonotrap; // size = 0x2C4 + +extern const ActorInit En_Honotrap_InitVars; + +#endif // Z_EN_HONOTRAP_H diff --git a/src/overlays/actors/ovl_En_Horse/overlay.cfg b/src/overlays/actors/ovl_En_Horse/overlay.cfg new file mode 100644 index 0000000000..90043637c2 --- /dev/null +++ b/src/overlays/actors/ovl_En_Horse/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Horse +z_en_horse.c diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c new file mode 100644 index 0000000000..f518f2b4df --- /dev/null +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -0,0 +1,338 @@ +#include "z_en_horse.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnHorse*)thisx) + +void EnHorse_Init(Actor* thisx, GlobalContext* globalCtx); +void EnHorse_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnHorse_Update(Actor* thisx, GlobalContext* globalCtx); +void EnHorse_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Horse_InitVars = { + ACTOR_EN_HORSE, + ACTORTYPE_BG, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnHorse), + (ActorFunc)EnHorse_Init, + (ActorFunc)EnHorse_Destroy, + (ActorFunc)EnHorse_Update, + (ActorFunc)EnHorse_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087B730.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087B784.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087B7C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C0AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C178.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C1C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C208.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C288.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C2B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C38C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C43C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C590.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C8B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C8D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C8E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C9D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C9EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087C9F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087CA04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/EnHorse_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087D540.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/EnHorse_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087D70C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087D75C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087D814.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087D988.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087DDEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087DE28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087DF64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087E080.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087E0A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087E18C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087E2A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087E350.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087E564.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087E5B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087E5D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087E684.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087E6D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087E92C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087E9D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087EA1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087EB54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087EB78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087EC20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087EC78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087ED10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087EEC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087F078.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087F1FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087F39C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087F590.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087F5B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087F658.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087F9A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087F9C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087FB08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087FB14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087FD94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087FDB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087FF08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8087FF14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808801A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808801F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808802D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808804A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808804CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80880500.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80880534.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808806DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80880844.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80880978.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80880D50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80880DA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80880E00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80881128.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8088126C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80881290.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80881398.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8088159C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80881634.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8088168C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808819D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80881BDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80881C54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80881DA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80881DC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80881F10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80881F48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808821C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808822CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8088247C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80882564.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808826B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80882820.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808829D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808829F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80882A44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80882B9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80882D8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80882DC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80883104.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80883308.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80883B70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80883BEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80883CB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80883D64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80883DE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80883E10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80883EA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80883F18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80883F98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80884010.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808840C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80884194.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8088424C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80884314.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808843B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80884444.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808844E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80884564.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80884604.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808846B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808846DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808846F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80884718.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80884868.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808848C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80884994.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80884A40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80884D04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80884E0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80885060.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808850DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80885220.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808853E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_8088598C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80885A80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80885AF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80885B4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80885C90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80885DA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80886C00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80886DC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80886FA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808870A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_808871A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80887270.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/EnHorse_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80887D20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80887D60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80887E64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80887EBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80887F58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80888C48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/func_80888D18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_0x8087B730/EnHorse_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.h b/src/overlays/actors/ovl_En_Horse/z_en_horse.h new file mode 100644 index 0000000000..03775fac2f --- /dev/null +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_HORSE_H +#define Z_EN_HORSE_H + +#include + +struct EnHorse; + +typedef struct EnHorse { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x450]; +} EnHorse; // size = 0x594 + +extern const ActorInit En_Horse_InitVars; + +#endif // Z_EN_HORSE_H diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/overlay.cfg b/src/overlays/actors/ovl_En_Horse_Game_Check/overlay.cfg new file mode 100644 index 0000000000..b950cc9c29 --- /dev/null +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Horse_Game_Check +z_en_horse_game_check.c diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c new file mode 100644 index 0000000000..e796dfb3b9 --- /dev/null +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -0,0 +1,70 @@ +#include "z_en_horse_game_check.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnHorseGameCheck*)thisx) + +void EnHorseGameCheck_Init(Actor* thisx, GlobalContext* globalCtx); +void EnHorseGameCheck_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnHorseGameCheck_Update(Actor* thisx, GlobalContext* globalCtx); +void EnHorseGameCheck_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Horse_Game_Check_InitVars = { + ACTOR_EN_HORSE_GAME_CHECK, + ACTORTYPE_BG, + FLAGS, + OBJECT_HORSE_GAME_CHECK, + sizeof(EnHorseGameCheck), + (ActorFunc)EnHorseGameCheck_Init, + (ActorFunc)EnHorseGameCheck_Destroy, + (ActorFunc)EnHorseGameCheck_Update, + (ActorFunc)EnHorseGameCheck_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F8AA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F8C24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F8C5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F8C70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F8CCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F8E94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F8EB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F8FAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F96E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F9830.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F9868.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F987C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F990C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F9944.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F9958.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F999C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F99B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F99C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/func_808F99D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/EnHorseGameCheck_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/EnHorseGameCheck_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/EnHorseGameCheck_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Game_Check_0x808F8AA0/EnHorseGameCheck_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h new file mode 100644 index 0000000000..5576996edf --- /dev/null +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_HORSE_GAME_CHECK_H +#define Z_EN_HORSE_GAME_CHECK_H + +#include + +struct EnHorseGameCheck; + +typedef struct EnHorseGameCheck { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x74]; +} EnHorseGameCheck; // size = 0x1B8 + +extern const ActorInit En_Horse_Game_Check_InitVars; + +#endif // Z_EN_HORSE_GAME_CHECK_H diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/overlay.cfg b/src/overlays/actors/ovl_En_Horse_Link_Child/overlay.cfg new file mode 100644 index 0000000000..09ec53e20e --- /dev/null +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Horse_Link_Child +z_en_horse_link_child.c diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c new file mode 100644 index 0000000000..3c81a26859 --- /dev/null +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c @@ -0,0 +1,68 @@ +#include "z_en_horse_link_child.h" + +#define FLAGS 0x02000010 + +#define THIS ((EnHorseLinkChild*)thisx) + +void EnHorseLinkChild_Init(Actor* thisx, GlobalContext* globalCtx); +void EnHorseLinkChild_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnHorseLinkChild_Update(Actor* thisx, GlobalContext* globalCtx); +void EnHorseLinkChild_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Horse_Link_Child_InitVars = { + ACTOR_EN_HORSE_LINK_CHILD, + ACTORTYPE_BG, + FLAGS, + OBJECT_HORSE_LINK_CHILD, + sizeof(EnHorseLinkChild), + (ActorFunc)EnHorseLinkChild_Init, + (ActorFunc)EnHorseLinkChild_Destroy, + (ActorFunc)EnHorseLinkChild_Update, + (ActorFunc)EnHorseLinkChild_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DE5C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DE660.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DE728.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/EnHorseLinkChild_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/EnHorseLinkChild_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DE9A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DEA0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DEA54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DEB14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DECA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DED40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DEFE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DF088.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DF194.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DF560.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DF620.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DF788.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DF838.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/EnHorseLinkChild_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DFC3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/func_808DFDC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Horse_Link_Child_0x808DE5C0/EnHorseLinkChild_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h new file mode 100644 index 0000000000..6fe7f608e4 --- /dev/null +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_HORSE_LINK_CHILD_H +#define Z_EN_HORSE_LINK_CHILD_H + +#include + +struct EnHorseLinkChild; + +typedef struct EnHorseLinkChild { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x158]; +} EnHorseLinkChild; // size = 0x29C + +extern const ActorInit En_Horse_Link_Child_InitVars; + +#endif // Z_EN_HORSE_LINK_CHILD_H diff --git a/src/overlays/actors/ovl_En_Hs/overlay.cfg b/src/overlays/actors/ovl_En_Hs/overlay.cfg new file mode 100644 index 0000000000..dab1cacf78 --- /dev/null +++ b/src/overlays/actors/ovl_En_Hs/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Hs +z_en_hs.c diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c new file mode 100644 index 0000000000..8a658f2393 --- /dev/null +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -0,0 +1,60 @@ +#include "z_en_hs.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnHs*)thisx) + +void EnHs_Init(Actor* thisx, GlobalContext* globalCtx); +void EnHs_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnHs_Update(Actor* thisx, GlobalContext* globalCtx); +void EnHs_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Hs_InitVars = { + ACTOR_EN_HS, + ACTORTYPE_NPC, + FLAGS, + OBJECT_HS, + sizeof(EnHs), + (ActorFunc)EnHs_Init, + (ActorFunc)EnHs_Destroy, + (ActorFunc)EnHs_Update, + (ActorFunc)EnHs_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_80952C50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/EnHs_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/EnHs_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_80952DFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_80952E50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_80952F00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_80952FE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_80953098.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_80953180.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_809532C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_809532D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_80953354.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_809533A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_8095345C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/EnHs_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_8095376C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/func_80953848.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hs_0x80952C50/EnHs_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.h b/src/overlays/actors/ovl_En_Hs/z_en_hs.h new file mode 100644 index 0000000000..c08b527945 --- /dev/null +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_HS_H +#define Z_EN_HS_H + +#include + +struct EnHs; + +typedef struct EnHs { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x254]; +} EnHs; // size = 0x398 + +extern const ActorInit En_Hs_InitVars; + +#endif // Z_EN_HS_H diff --git a/src/overlays/actors/ovl_En_Hs2/overlay.cfg b/src/overlays/actors/ovl_En_Hs2/overlay.cfg new file mode 100644 index 0000000000..a34ed88c5f --- /dev/null +++ b/src/overlays/actors/ovl_En_Hs2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Hs2 +z_en_hs2.c diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c new file mode 100644 index 0000000000..c0adf57897 --- /dev/null +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -0,0 +1,34 @@ +#include "z_en_hs2.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnHs2*)thisx) + +void EnHs2_Init(Actor* thisx, GlobalContext* globalCtx); +void EnHs2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnHs2_Update(Actor* thisx, GlobalContext* globalCtx); +void EnHs2_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Hs2_InitVars = { + ACTOR_EN_HS2, + ACTORTYPE_NPC, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnHs2), + (ActorFunc)EnHs2_Init, + (ActorFunc)EnHs2_Destroy, + (ActorFunc)EnHs2_Update, + (ActorFunc)EnHs2_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hs2_0x8098EF60/EnHs2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hs2_0x8098EF60/EnHs2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hs2_0x8098EF60/func_8098EFAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hs2_0x8098EF60/EnHs2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Hs2_0x8098EF60/EnHs2_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h new file mode 100644 index 0000000000..fc456acc42 --- /dev/null +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_HS2_H +#define Z_EN_HS2_H + +#include + +struct EnHs2; + +typedef struct EnHs2 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x254]; +} EnHs2; // size = 0x398 + +extern const ActorInit En_Hs2_InitVars; + +#endif // Z_EN_HS2_H diff --git a/src/overlays/actors/ovl_En_Ig/overlay.cfg b/src/overlays/actors/ovl_En_Ig/overlay.cfg new file mode 100644 index 0000000000..fa0125cbf3 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ig/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ig +z_en_ig.c diff --git a/src/overlays/actors/ovl_En_Ig/z_en_ig.c b/src/overlays/actors/ovl_En_Ig/z_en_ig.c new file mode 100644 index 0000000000..0468f8d3a0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ig/z_en_ig.c @@ -0,0 +1,100 @@ +#include "z_en_ig.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnIg*)thisx) + +void EnIg_Init(Actor* thisx, GlobalContext* globalCtx); +void EnIg_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnIg_Update(Actor* thisx, GlobalContext* globalCtx); +void EnIg_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ig_InitVars = { + ACTOR_EN_IG, + ACTORTYPE_NPC, + FLAGS, + OBJECT_DAI, + sizeof(EnIg), + (ActorFunc)EnIg_Init, + (ActorFunc)EnIg_Destroy, + (ActorFunc)EnIg_Update, + (ActorFunc)EnIg_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1150.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1200.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1258.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1284.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1354.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF13E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF146C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF14B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF15EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF16C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1744.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF17BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1920.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF19A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1A60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1AE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1B40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1C44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1D78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1DF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF1FA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF219C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF2368.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF2400.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF2470.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF25E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF2890.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF293C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF2A50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF2AF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF2BD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/EnIg_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/EnIg_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/EnIg_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF2EDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF2EFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/func_80BF302C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ig_0x80BF1150/EnIg_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ig/z_en_ig.h b/src/overlays/actors/ovl_En_Ig/z_en_ig.h new file mode 100644 index 0000000000..289fb690a9 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ig/z_en_ig.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_IG_H +#define Z_EN_IG_H + +#include + +struct EnIg; + +typedef struct EnIg { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2C8]; +} EnIg; // size = 0x40C + +extern const ActorInit En_Ig_InitVars; + +#endif // Z_EN_IG_H diff --git a/src/overlays/actors/ovl_En_Ik/overlay.cfg b/src/overlays/actors/ovl_En_Ik/overlay.cfg new file mode 100644 index 0000000000..c4cc60ed31 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ik/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ik +z_en_ik.c diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c new file mode 100644 index 0000000000..496fbac885 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -0,0 +1,106 @@ +#include "z_en_ik.h" + +#define FLAGS 0x00000405 + +#define THIS ((EnIk*)thisx) + +void EnIk_Init(Actor* thisx, GlobalContext* globalCtx); +void EnIk_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnIk_Update(Actor* thisx, GlobalContext* globalCtx); +void EnIk_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ik_InitVars = { + ACTOR_EN_IK, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_IK, + sizeof(EnIk), + (ActorFunc)EnIk_Init, + (ActorFunc)EnIk_Destroy, + (ActorFunc)EnIk_Update, + (ActorFunc)EnIk_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/EnIk_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/EnIk_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_80929AF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_80929B6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_80929BEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_80929C80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_80929D04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_80929E2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_80929E88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_80929F20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_80929FC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092A020.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092A124.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092A188.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092A28C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092A33C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092A570.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092A5BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092A680.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092A754.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092A8D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092A994.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092AA6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092AB14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092AB50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092ABD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092AC4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092ACFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092ADB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092AE14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092AFB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092AFD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092B03C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092B098.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092B1B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092B46C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/EnIk_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092B900.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092B93C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/func_8092BC6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ik_0x80929910/EnIk_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.h b/src/overlays/actors/ovl_En_Ik/z_en_ik.h new file mode 100644 index 0000000000..9c7988ade5 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_IK_H +#define Z_EN_IK_H + +#include + +struct EnIk; + +typedef struct EnIk { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x524]; +} EnIk; // size = 0x668 + +extern const ActorInit En_Ik_InitVars; + +#endif // Z_EN_IK_H diff --git a/src/overlays/actors/ovl_En_In/overlay.cfg b/src/overlays/actors/ovl_En_In/overlay.cfg new file mode 100644 index 0000000000..2a1b953aaa --- /dev/null +++ b/src/overlays/actors/ovl_En_In/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_In +z_en_in.c diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c new file mode 100644 index 0000000000..93f400e32d --- /dev/null +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -0,0 +1,112 @@ +#include "z_en_in.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnIn*)thisx) + +void EnIn_Init(Actor* thisx, GlobalContext* globalCtx); +void EnIn_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnIn_Update(Actor* thisx, GlobalContext* globalCtx); +void EnIn_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_In_InitVars = { + ACTOR_EN_IN, + ACTORTYPE_NPC, + FLAGS, + OBJECT_IN, + sizeof(EnIn), + (ActorFunc)EnIn_Init, + (ActorFunc)EnIn_Destroy, + (ActorFunc)EnIn_Update, + (ActorFunc)EnIn_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F30B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3178.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F322C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F32A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3310.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3334.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F33B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3414.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F35AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F35D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3608.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3618.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3690.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F374C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F38F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F395C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F39DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3AD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3B40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3BD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3C40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3CD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3D40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F3DD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F4054.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F4108.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F4150.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F4270.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F43E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F4414.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F5674.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F5728.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F5994.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F5A34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F5A94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F5B58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F5C98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/EnIn_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/EnIn_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/EnIn_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F6334.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F64A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/func_808F67F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_In_0x808F30B0/EnIn_Draw.asm") diff --git a/src/overlays/actors/ovl_En_In/z_en_in.h b/src/overlays/actors/ovl_En_In/z_en_in.h new file mode 100644 index 0000000000..77ff0e4eb9 --- /dev/null +++ b/src/overlays/actors/ovl_En_In/z_en_in.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_IN_H +#define Z_EN_IN_H + +#include + +struct EnIn; + +typedef struct EnIn { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x388]; +} EnIn; // size = 0x4CC + +extern const ActorInit En_In_InitVars; + +#endif // Z_EN_IN_H diff --git a/src/overlays/actors/ovl_En_Insect/overlay.cfg b/src/overlays/actors/ovl_En_Insect/overlay.cfg new file mode 100644 index 0000000000..f439a7c1b7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Insect/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Insect +z_en_insect.c diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c new file mode 100644 index 0000000000..c695b04758 --- /dev/null +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -0,0 +1,68 @@ +#include "z_en_insect.h" + +#define FLAGS 0x00000000 + +#define THIS ((EnInsect*)thisx) + +void EnInsect_Init(Actor* thisx, GlobalContext* globalCtx); +void EnInsect_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnInsect_Update(Actor* thisx, GlobalContext* globalCtx); +void EnInsect_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Insect_InitVars = { + ACTOR_EN_INSECT, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnInsect), + (ActorFunc)EnInsect_Init, + (ActorFunc)EnInsect_Destroy, + (ActorFunc)EnInsect_Update, + (ActorFunc)EnInsect_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091A8A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091A8C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091A8F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091A9E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/EnInsect_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/EnInsect_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091AC78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091ACC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091AE10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091AE5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091B030.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091B07C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091B274.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091B2D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091B3D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091B440.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091B618.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091B670.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091B928.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/func_8091B984.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/EnInsect_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Insect_0x8091A8A0/EnInsect_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.h b/src/overlays/actors/ovl_En_Insect/z_en_insect.h new file mode 100644 index 0000000000..6a000ede79 --- /dev/null +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_INSECT_H +#define Z_EN_INSECT_H + +#include + +struct EnInsect; + +typedef struct EnInsect { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1D4]; +} EnInsect; // size = 0x318 + +extern const ActorInit En_Insect_InitVars; + +#endif // Z_EN_INSECT_H diff --git a/src/overlays/actors/ovl_En_Invadepoh/overlay.cfg b/src/overlays/actors/ovl_En_Invadepoh/overlay.cfg new file mode 100644 index 0000000000..a05f98b613 --- /dev/null +++ b/src/overlays/actors/ovl_En_Invadepoh/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Invadepoh +z_en_invadepoh.c diff --git a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c new file mode 100644 index 0000000000..3bc8b113d9 --- /dev/null +++ b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c @@ -0,0 +1,511 @@ +#include "z_en_invadepoh.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnInvadepoh*)thisx) + +void EnInvadepoh_Init(Actor* thisx, GlobalContext* globalCtx); +void EnInvadepoh_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnInvadepoh_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Invadepoh_InitVars = { + ACTOR_EN_INVADEPOH, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnInvadepoh), + (ActorFunc)EnInvadepoh_Init, + (ActorFunc)EnInvadepoh_Destroy, + (ActorFunc)EnInvadepoh_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B439B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B43A24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B43A74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B43A9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B43AB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B43AF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B43B80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B43BC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B43DD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B43E6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B43F0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B43F70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44024.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4407C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B440B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44234.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B442E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B443A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B444BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B444F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44514.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44540.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44570.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44620.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44640.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44664.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44690.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B446D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44700.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B447C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44A90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44B78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44B84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44C24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44C80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44E90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44EFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44F58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B44FEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45080.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B450C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4516C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B451A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B452EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B453F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45460.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B454BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45518.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45550.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4560C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45648.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B456A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B457A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B458D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45980.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B459E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45A4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45A94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45B1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45BB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45C04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45CE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B45EC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46118.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46184.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B461DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4627C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46414.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46520.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B465CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46644.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B468B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B469C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46A80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/EnInvadepoh_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46BB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46BC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46C08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46C34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46C50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46C7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46C94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46CC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46CF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46D28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/EnInvadepoh_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46DA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46DC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46E20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46E44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46EC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46EE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46F88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B46FA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47064.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47084.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B470E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47108.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B471C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B471E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47248.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47268.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47278.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47298.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47304.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47324.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/EnInvadepoh_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47380.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B473E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47478.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B474DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47568.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47600.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4770C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B477B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47830.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B478F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47938.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B479E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47BAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47D30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B47FA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B48060.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B481C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4827C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B482D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B48324.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B48374.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B483CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4843C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B484EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B48588.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B48610.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B48620.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4873C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B487B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B48848.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B48948.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B48AD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B48DE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B48E4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B48FB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B490F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B491EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49228.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B492FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4934C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49404.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49454.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49628.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49670.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B497A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B497EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49904.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4994C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B499BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49A00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49B1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49BD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49C38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49DA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49DFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B49F88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4A168.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4A1B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4A2C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4A350.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4A570.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4A5E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4A614.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4A67C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4A7C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4A81C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4A9C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4AB8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4ABDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4ACDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4ACF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4AD3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4AD60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4ADB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4ADCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4AEC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4AEDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4AF80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4AF94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B024.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B048.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B0C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B218.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B3DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B430.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B484.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B510.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B564.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B724.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B768.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B820.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B864.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4B8BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4BA30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4BA84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4BBE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4BC4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4BFFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4C058.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4C1BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4C218.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4C3A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4C568.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4C5C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4C6C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4C730.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4CAB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4CB0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4CC70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4CCCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4CE54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4CFFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4D054.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4D15C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4D290.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4D3E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4D480.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4D670.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4D760.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4D7B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4D9B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4D9D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4D9F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4DB14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E120.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E158.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E1B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E200.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E2AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E324.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E3F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E5B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E61C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E660.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E6E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E784.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_0x80B439B0/func_80B4E7BC.asm") diff --git a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.h b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.h new file mode 100644 index 0000000000..db4b394845 --- /dev/null +++ b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_INVADEPOH_H +#define Z_EN_INVADEPOH_H + +#include + +struct EnInvadepoh; + +typedef struct EnInvadepoh { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x27C]; +} EnInvadepoh; // size = 0x3C0 + +extern const ActorInit En_Invadepoh_InitVars; + +#endif // Z_EN_INVADEPOH_H diff --git a/src/overlays/actors/ovl_En_Invadepoh_Demo/overlay.cfg b/src/overlays/actors/ovl_En_Invadepoh_Demo/overlay.cfg new file mode 100644 index 0000000000..192412f5fd --- /dev/null +++ b/src/overlays/actors/ovl_En_Invadepoh_Demo/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Invadepoh_Demo +z_en_invadepoh_demo.c diff --git a/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c new file mode 100644 index 0000000000..282aea72eb --- /dev/null +++ b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c @@ -0,0 +1,96 @@ +#include "z_en_invadepoh_demo.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnInvadepohDemo*)thisx) + +void EnInvadepohDemo_Init(Actor* thisx, GlobalContext* globalCtx); +void EnInvadepohDemo_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnInvadepohDemo_Update(Actor* thisx, GlobalContext* globalCtx); +void EnInvadepohDemo_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Invadepoh_Demo_InitVars = { + ACTOR_EN_INVADEPOH_DEMO, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnInvadepohDemo), + (ActorFunc)EnInvadepohDemo_Init, + (ActorFunc)EnInvadepohDemo_Destroy, + (ActorFunc)EnInvadepohDemo_Update, + (ActorFunc)EnInvadepohDemo_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C192A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C192B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19334.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C193A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19454.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19498.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1950C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19548.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19564.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19590.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1965C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19688.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19754.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1985C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1987C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C199BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C199EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19AB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19D00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19D48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19E04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19EC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C19F7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A038.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A070.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A168.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A244.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A590.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A650.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A670.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A6C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/func_80C1A854.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/EnInvadepohDemo_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/EnInvadepohDemo_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/EnInvadepohDemo_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invadepoh_Demo_0x80C192A0/EnInvadepohDemo_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.h b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.h new file mode 100644 index 0000000000..2f3256abdf --- /dev/null +++ b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_INVADEPOH_DEMO_H +#define Z_EN_INVADEPOH_DEMO_H + +#include + +struct EnInvadepohDemo; + +typedef struct EnInvadepohDemo { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x184]; +} EnInvadepohDemo; // size = 0x2C8 + +extern const ActorInit En_Invadepoh_Demo_InitVars; + +#endif // Z_EN_INVADEPOH_DEMO_H diff --git a/src/overlays/actors/ovl_En_Invisible_Ruppe/overlay.cfg b/src/overlays/actors/ovl_En_Invisible_Ruppe/overlay.cfg new file mode 100644 index 0000000000..18c1eed56a --- /dev/null +++ b/src/overlays/actors/ovl_En_Invisible_Ruppe/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Invisible_Ruppe +z_en_invisible_ruppe.c diff --git a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c new file mode 100644 index 0000000000..481d3e00c0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c @@ -0,0 +1,35 @@ +#include "z_en_invisible_ruppe.h" + +#define FLAGS 0x00000000 + +#define THIS ((EnInvisibleRuppe*)thisx) + +void EnInvisibleRuppe_Init(Actor* thisx, GlobalContext* globalCtx); +void EnInvisibleRuppe_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnInvisibleRuppe_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Invisible_Ruppe_InitVars = { + ACTOR_EN_INVISIBLE_RUPPE, + ACTORTYPE_NPC, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnInvisibleRuppe), + (ActorFunc)EnInvisibleRuppe_Init, + (ActorFunc)EnInvisibleRuppe_Destroy, + (ActorFunc)EnInvisibleRuppe_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invisible_Ruppe_0x80C258A0/func_80C258A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invisible_Ruppe_0x80C258A0/func_80C2590C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invisible_Ruppe_0x80C258A0/func_80C259E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invisible_Ruppe_0x80C258A0/EnInvisibleRuppe_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invisible_Ruppe_0x80C258A0/EnInvisibleRuppe_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Invisible_Ruppe_0x80C258A0/EnInvisibleRuppe_Update.asm") diff --git a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.h b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.h new file mode 100644 index 0000000000..62ae099d25 --- /dev/null +++ b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_INVISIBLE_RUPPE_H +#define Z_EN_INVISIBLE_RUPPE_H + +#include + +struct EnInvisibleRuppe; + +typedef struct EnInvisibleRuppe { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x54]; +} EnInvisibleRuppe; // size = 0x198 + +extern const ActorInit En_Invisible_Ruppe_InitVars; + +#endif // Z_EN_INVISIBLE_RUPPE_H diff --git a/src/overlays/actors/ovl_En_Ishi/overlay.cfg b/src/overlays/actors/ovl_En_Ishi/overlay.cfg new file mode 100644 index 0000000000..689d8deb5d --- /dev/null +++ b/src/overlays/actors/ovl_En_Ishi/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ishi +z_en_ishi.c diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c new file mode 100644 index 0000000000..e0c5ec2f47 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -0,0 +1,85 @@ +#include "z_en_ishi.h" + +#define FLAGS 0x00800010 + +#define THIS ((EnIshi*)thisx) + +void EnIshi_Init(Actor* thisx, GlobalContext* globalCtx); +void EnIshi_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnIshi_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ishi_InitVars = { + ACTOR_EN_ISHI, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnIshi), + (ActorFunc)EnIshi_Init, + (ActorFunc)EnIshi_Destroy, + (ActorFunc)EnIshi_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095D6E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095D758.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095D804.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095DABC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095DDA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095DE9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095DF90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095DFF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095E14C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095E180.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095E204.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095E2B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/EnIshi_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/EnIshi_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095E5AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095E5C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095E64C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095E660.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095E934.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095E95C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095EA70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095EBDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095F060.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095F0A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095F180.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095F194.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/EnIshi_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095F210.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095F36C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095F61C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ishi_0x8095D6E0/func_8095F654.asm") diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h new file mode 100644 index 0000000000..354d4c5496 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ISHI_H +#define Z_EN_ISHI_H + +#include + +struct EnIshi; + +typedef struct EnIshi { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x54]; +} EnIshi; // size = 0x198 + +extern const ActorInit En_Ishi_InitVars; + +#endif // Z_EN_ISHI_H diff --git a/src/overlays/actors/ovl_En_Ja/overlay.cfg b/src/overlays/actors/ovl_En_Ja/overlay.cfg new file mode 100644 index 0000000000..aab759e94e --- /dev/null +++ b/src/overlays/actors/ovl_En_Ja/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ja +z_en_ja.c diff --git a/src/overlays/actors/ovl_En_Ja/z_en_ja.c b/src/overlays/actors/ovl_En_Ja/z_en_ja.c new file mode 100644 index 0000000000..7510a5352a --- /dev/null +++ b/src/overlays/actors/ovl_En_Ja/z_en_ja.c @@ -0,0 +1,84 @@ +#include "z_en_ja.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnJa*)thisx) + +void EnJa_Init(Actor* thisx, GlobalContext* globalCtx); +void EnJa_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnJa_Update(Actor* thisx, GlobalContext* globalCtx); +void EnJa_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ja_InitVars = { + ACTOR_EN_JA, + ACTORTYPE_NPC, + FLAGS, + OBJECT_BOJ, + sizeof(EnJa), + (ActorFunc)EnJa_Init, + (ActorFunc)EnJa_Destroy, + (ActorFunc)EnJa_Update, + (ActorFunc)EnJa_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC1900.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC192C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC1984.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC19FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC1A68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC1AE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC1B50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC1B60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC1D70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC1E40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC1FC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC203C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC20D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC213C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC2150.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC21A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC2274.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC22F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/EnJa_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/EnJa_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/EnJa_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC25E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC2620.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC2B30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/EnJa_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC2EA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC3154.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC32D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC33C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ja_0x80BC1900/func_80BC3594.asm") diff --git a/src/overlays/actors/ovl_En_Ja/z_en_ja.h b/src/overlays/actors/ovl_En_Ja/z_en_ja.h new file mode 100644 index 0000000000..8323e7dd59 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ja/z_en_ja.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_JA_H +#define Z_EN_JA_H + +#include + +struct EnJa; + +typedef struct EnJa { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x234]; +} EnJa; // size = 0x378 + +extern const ActorInit En_Ja_InitVars; + +#endif // Z_EN_JA_H diff --git a/src/overlays/actors/ovl_En_Jc_Mato/overlay.cfg b/src/overlays/actors/ovl_En_Jc_Mato/overlay.cfg new file mode 100644 index 0000000000..361e01617f --- /dev/null +++ b/src/overlays/actors/ovl_En_Jc_Mato/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Jc_Mato +z_en_jc_mato.c diff --git a/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c b/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c new file mode 100644 index 0000000000..1e032ee9bf --- /dev/null +++ b/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c @@ -0,0 +1,38 @@ +#include "z_en_jc_mato.h" + +#define FLAGS 0x00004030 + +#define THIS ((EnJcMato*)thisx) + +void EnJcMato_Init(Actor* thisx, GlobalContext* globalCtx); +void EnJcMato_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnJcMato_Update(Actor* thisx, GlobalContext* globalCtx); +void EnJcMato_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Jc_Mato_InitVars = { + ACTOR_EN_JC_MATO, + ACTORTYPE_PROP, + FLAGS, + OBJECT_TRU, + sizeof(EnJcMato), + (ActorFunc)EnJcMato_Init, + (ActorFunc)EnJcMato_Destroy, + (ActorFunc)EnJcMato_Update, + (ActorFunc)EnJcMato_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jc_Mato_0x80B9DEE0/func_80B9DEE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jc_Mato_0x80B9DEE0/func_80B9DFC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jc_Mato_0x80B9DEE0/func_80B9DFDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jc_Mato_0x80B9DEE0/EnJcMato_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jc_Mato_0x80B9DEE0/EnJcMato_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jc_Mato_0x80B9DEE0/EnJcMato_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jc_Mato_0x80B9DEE0/EnJcMato_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.h b/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.h new file mode 100644 index 0000000000..e516dc4913 --- /dev/null +++ b/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_JC_MATO_H +#define Z_EN_JC_MATO_H + +#include + +struct EnJcMato; + +typedef struct EnJcMato { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x6C]; +} EnJcMato; // size = 0x1B0 + +extern const ActorInit En_Jc_Mato_InitVars; + +#endif // Z_EN_JC_MATO_H diff --git a/src/overlays/actors/ovl_En_Jg/overlay.cfg b/src/overlays/actors/ovl_En_Jg/overlay.cfg new file mode 100644 index 0000000000..a60b43afc9 --- /dev/null +++ b/src/overlays/actors/ovl_En_Jg/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Jg +z_en_jg.c diff --git a/src/overlays/actors/ovl_En_Jg/z_en_jg.c b/src/overlays/actors/ovl_En_Jg/z_en_jg.c new file mode 100644 index 0000000000..0f5520611c --- /dev/null +++ b/src/overlays/actors/ovl_En_Jg/z_en_jg.c @@ -0,0 +1,84 @@ +#include "z_en_jg.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnJg*)thisx) + +void EnJg_Init(Actor* thisx, GlobalContext* globalCtx); +void EnJg_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnJg_Update(Actor* thisx, GlobalContext* globalCtx); +void EnJg_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Jg_InitVars = { + ACTOR_EN_JG, + ACTORTYPE_NPC, + FLAGS, + OBJECT_JG, + sizeof(EnJg), + (ActorFunc)EnJg_Init, + (ActorFunc)EnJg_Destroy, + (ActorFunc)EnJg_Update, + (ActorFunc)EnJg_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B73A90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B73AE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B73B98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B73C58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B73DF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B73E3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B73F1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B7406C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B7408C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B74134.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B741F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B742F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B74440.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B74550.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B747C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B74840.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B749D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B74AD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B74B54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B74BC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B74E5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B750A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B7517C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B751F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/EnJg_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/EnJg_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/EnJg_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B75658.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/func_80B75708.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jg_0x80B73A90/EnJg_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Jg/z_en_jg.h b/src/overlays/actors/ovl_En_Jg/z_en_jg.h new file mode 100644 index 0000000000..b541bfc003 --- /dev/null +++ b/src/overlays/actors/ovl_En_Jg/z_en_jg.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_JG_H +#define Z_EN_JG_H + +#include + +struct EnJg; + +typedef struct EnJg { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x290]; +} EnJg; // size = 0x3D4 + +extern const ActorInit En_Jg_InitVars; + +#endif // Z_EN_JG_H diff --git a/src/overlays/actors/ovl_En_Jgame_Tsn/overlay.cfg b/src/overlays/actors/ovl_En_Jgame_Tsn/overlay.cfg new file mode 100644 index 0000000000..9d3fbbf9d8 --- /dev/null +++ b/src/overlays/actors/ovl_En_Jgame_Tsn/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Jgame_Tsn +z_en_jgame_tsn.c diff --git a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c new file mode 100644 index 0000000000..34b5e6fcfe --- /dev/null +++ b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c @@ -0,0 +1,90 @@ +#include "z_en_jgame_tsn.h" + +#define FLAGS 0x02000019 + +#define THIS ((EnJgameTsn*)thisx) + +void EnJgameTsn_Init(Actor* thisx, GlobalContext* globalCtx); +void EnJgameTsn_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnJgameTsn_Update(Actor* thisx, GlobalContext* globalCtx); +void EnJgameTsn_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Jgame_Tsn_InitVars = { + ACTOR_EN_JGAME_TSN, + ACTORTYPE_NPC, + FLAGS, + OBJECT_TSN, + sizeof(EnJgameTsn), + (ActorFunc)EnJgameTsn_Init, + (ActorFunc)EnJgameTsn_Destroy, + (ActorFunc)EnJgameTsn_Update, + (ActorFunc)EnJgameTsn_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/EnJgameTsn_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C13A2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/EnJgameTsn_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C13B74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C13BB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C13E6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C13E90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C13F88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C13F9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14030.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14044.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C1410C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C1418C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C141DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14230.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C144E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C144F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14540.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14554.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C145FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14610.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14684.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C1476C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C147B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14960.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C149B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14BCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14D14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14D58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/EnJgameTsn_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14E64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/func_80C14EE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jgame_Tsn_0x80C13930/EnJgameTsn_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.h b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.h new file mode 100644 index 0000000000..e5fb483696 --- /dev/null +++ b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_JGAME_TSN_H +#define Z_EN_JGAME_TSN_H + +#include + +struct EnJgameTsn; + +typedef struct EnJgameTsn { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1C0]; +} EnJgameTsn; // size = 0x304 + +extern const ActorInit En_Jgame_Tsn_InitVars; + +#endif // Z_EN_JGAME_TSN_H diff --git a/src/overlays/actors/ovl_En_Js/overlay.cfg b/src/overlays/actors/ovl_En_Js/overlay.cfg new file mode 100644 index 0000000000..6923c80b4b --- /dev/null +++ b/src/overlays/actors/ovl_En_Js/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Js +z_en_js.c diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.c b/src/overlays/actors/ovl_En_Js/z_en_js.c new file mode 100644 index 0000000000..3accdf7e26 --- /dev/null +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -0,0 +1,96 @@ +#include "z_en_js.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnJs*)thisx) + +void EnJs_Init(Actor* thisx, GlobalContext* globalCtx); +void EnJs_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnJs_Update(Actor* thisx, GlobalContext* globalCtx); +void EnJs_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Js_InitVars = { + ACTOR_EN_JS, + ACTORTYPE_NPC, + FLAGS, + OBJECT_OB, + sizeof(EnJs), + (ActorFunc)EnJs_Init, + (ActorFunc)EnJs_Destroy, + (ActorFunc)EnJs_Update, + (ActorFunc)EnJs_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/EnJs_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/EnJs_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80968A5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80968B18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80968B8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80968CB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80968DD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80968E38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80968F48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_809691B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_809692A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_8096933C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80969400.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80969494.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_809694E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80969530.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_809695FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80969688.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_809696EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_8096971C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80969748.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80969898.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80969AA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80969B5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80969C54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_80969DA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_8096A080.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_8096A104.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_8096A184.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_8096A1E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_8096A2C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_8096A38C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_8096A6F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/EnJs_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/func_8096A9F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Js_0x809687B0/EnJs_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.h b/src/overlays/actors/ovl_En_Js/z_en_js.h new file mode 100644 index 0000000000..52863ef8fc --- /dev/null +++ b/src/overlays/actors/ovl_En_Js/z_en_js.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_JS_H +#define Z_EN_JS_H + +#include + +struct EnJs; + +typedef struct EnJs { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x184]; +} EnJs; // size = 0x2C8 + +extern const ActorInit En_Js_InitVars; + +#endif // Z_EN_JS_H diff --git a/src/overlays/actors/ovl_En_Jso/overlay.cfg b/src/overlays/actors/ovl_En_Jso/overlay.cfg new file mode 100644 index 0000000000..050d8bc675 --- /dev/null +++ b/src/overlays/actors/ovl_En_Jso/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Jso +z_en_jso.c diff --git a/src/overlays/actors/ovl_En_Jso/z_en_jso.c b/src/overlays/actors/ovl_En_Jso/z_en_jso.c new file mode 100644 index 0000000000..84a31a7bc3 --- /dev/null +++ b/src/overlays/actors/ovl_En_Jso/z_en_jso.c @@ -0,0 +1,105 @@ +#include "z_en_jso.h" + +#define FLAGS 0x00000015 + +#define THIS ((EnJso*)thisx) + +void EnJso_Init(Actor* thisx, GlobalContext* globalCtx); +void EnJso_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnJso_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Jso_InitVars = { + ACTOR_EN_JSO, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_JSO, + sizeof(EnJso), + (ActorFunc)EnJso_Init, + (ActorFunc)EnJso_Destroy, + (ActorFunc)EnJso_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/EnJso_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/EnJso_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809ADBC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809ADC7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809ADCB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AE754.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AE87C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AE9B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AEA08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AECA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AED00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AED54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AEDAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AEE44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AEEC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF064.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF110.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF28C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF2F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF368.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF3C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF3FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF440.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF470.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF53C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF5F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF714.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF76C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF7F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF8D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AF99C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AFA58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AFAF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AFC10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809AFE38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809B0034.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/EnJso_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809B0734.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809B0820.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809B0B70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso_0x809AD8E0/func_809B0BB0.asm") diff --git a/src/overlays/actors/ovl_En_Jso/z_en_jso.h b/src/overlays/actors/ovl_En_Jso/z_en_jso.h new file mode 100644 index 0000000000..fe5c9dd7d8 --- /dev/null +++ b/src/overlays/actors/ovl_En_Jso/z_en_jso.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_JSO_H +#define Z_EN_JSO_H + +#include + +struct EnJso; + +typedef struct EnJso { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xEA8]; +} EnJso; // size = 0xFEC + +extern const ActorInit En_Jso_InitVars; + +#endif // Z_EN_JSO_H diff --git a/src/overlays/actors/ovl_En_Jso2/overlay.cfg b/src/overlays/actors/ovl_En_Jso2/overlay.cfg new file mode 100644 index 0000000000..907202195d --- /dev/null +++ b/src/overlays/actors/ovl_En_Jso2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Jso2 +z_en_jso2.c diff --git a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c new file mode 100644 index 0000000000..27f638b95b --- /dev/null +++ b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c @@ -0,0 +1,114 @@ +#include "z_en_jso2.h" + +#define FLAGS 0x80100035 + +#define THIS ((EnJso2*)thisx) + +void EnJso2_Init(Actor* thisx, GlobalContext* globalCtx); +void EnJso2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnJso2_Update(Actor* thisx, GlobalContext* globalCtx); +void EnJso2_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Jso2_InitVars = { + ACTOR_EN_JSO2, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_JSO, + sizeof(EnJso2), + (ActorFunc)EnJso2_Init, + (ActorFunc)EnJso2_Destroy, + (ActorFunc)EnJso2_Update, + (ActorFunc)EnJso2_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/EnJso2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/EnJso2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A776E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A77790.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A77880.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A778D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A778F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A78588.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A785E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A787FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A78868.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A78A70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A78ACC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A78B04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A78B70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A78C08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A78C7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A78E8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A78F04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A78F80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A79038.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A790E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A7919C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A79300.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A79364.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A79450.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A794C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A79524.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A79600.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A796BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A7980C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A79864.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A798C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A7998C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A79A84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A79B60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A79BA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A7A0D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A7A124.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A7A2EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A7A360.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/EnJso2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A7AA48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/func_80A7AA9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Jso2_0x80A773C0/EnJso2_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.h b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.h new file mode 100644 index 0000000000..f1fba2d57b --- /dev/null +++ b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_JSO2_H +#define Z_EN_JSO2_H + +#include + +struct EnJso2; + +typedef struct EnJso2 { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0xF4C]; +} EnJso2; // size = 0x1090 + +extern const ActorInit En_Jso2_InitVars; + +#endif // Z_EN_JSO2_H diff --git a/src/overlays/actors/ovl_En_Kaizoku/overlay.cfg b/src/overlays/actors/ovl_En_Kaizoku/overlay.cfg new file mode 100644 index 0000000000..4f77e7de75 --- /dev/null +++ b/src/overlays/actors/ovl_En_Kaizoku/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Kaizoku +z_en_kaizoku.c diff --git a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c new file mode 100644 index 0000000000..b24006ff3c --- /dev/null +++ b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c @@ -0,0 +1,119 @@ +#include "z_en_kaizoku.h" + +#define FLAGS 0x00100015 + +#define THIS ((EnKaizoku*)thisx) + +void EnKaizoku_Init(Actor* thisx, GlobalContext* globalCtx); +void EnKaizoku_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnKaizoku_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Kaizoku_InitVars = { + ACTOR_EN_KAIZOKU, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_KZ, + sizeof(EnKaizoku), + (ActorFunc)EnKaizoku_Init, + (ActorFunc)EnKaizoku_Destroy, + (ActorFunc)EnKaizoku_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/EnKaizoku_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/EnKaizoku_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B85858.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B85900.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B85A00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B85E18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B85EA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B85F48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B85FA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B86804.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B868B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B86B58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B86B74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B872A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B872F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B874D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B8760C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B87900.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B8798C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B87C7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B87CF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B87D3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B87E28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B87E9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B87F70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B87FDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B88214.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B88278.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B8833C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B88378.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B88770.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B887AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B88910.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B88964.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B88CD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B88D6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B891B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B89280.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B893CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B894C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B8960C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B8971C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B89A08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/EnKaizoku_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B8A318.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B8A468.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B8A6B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kaizoku_0x80B85590/func_80B8A718.asm") diff --git a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.h b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.h new file mode 100644 index 0000000000..684353aad0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_KAIZOKU_H +#define Z_EN_KAIZOKU_H + +#include + +struct EnKaizoku; + +typedef struct EnKaizoku { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4AC]; +} EnKaizoku; // size = 0x5F0 + +extern const ActorInit En_Kaizoku_InitVars; + +#endif // Z_EN_KAIZOKU_H diff --git a/src/overlays/actors/ovl_En_Kakasi/overlay.cfg b/src/overlays/actors/ovl_En_Kakasi/overlay.cfg new file mode 100644 index 0000000000..f933ca862e --- /dev/null +++ b/src/overlays/actors/ovl_En_Kakasi/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Kakasi +z_en_kakasi.c diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c new file mode 100644 index 0000000000..09ebf24daa --- /dev/null +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -0,0 +1,96 @@ +#include "z_en_kakasi.h" + +#define FLAGS 0x02000019 + +#define THIS ((EnKakasi*)thisx) + +void EnKakasi_Init(Actor* thisx, GlobalContext* globalCtx); +void EnKakasi_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnKakasi_Update(Actor* thisx, GlobalContext* globalCtx); +void EnKakasi_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Kakasi_InitVars = { + ACTOR_EN_KAKASI, + ACTORTYPE_NPC, + FLAGS, + OBJECT_KA, + sizeof(EnKakasi), + (ActorFunc)EnKakasi_Init, + (ActorFunc)EnKakasi_Destroy, + (ActorFunc)EnKakasi_Update, + (ActorFunc)EnKakasi_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/EnKakasi_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/EnKakasi_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8096F800.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8096F88C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8096F8D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8096FA18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8096FAAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8096FBB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8096FC8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8096FCC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8096FDE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8096FE00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80970008.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8097006C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_809705E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80970658.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80970740.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80970978.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80970A10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80970A9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80970F20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80970FF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80971064.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80971430.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80971440.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_809714BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80971794.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_809717D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8097185C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_8097193C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80971A38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80971A64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80971AD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/EnKakasi_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/func_80971CE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kakasi_0x8096F5E0/EnKakasi_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h new file mode 100644 index 0000000000..143a589a64 --- /dev/null +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_KAKASI_H +#define Z_EN_KAKASI_H + +#include + +struct EnKakasi; + +typedef struct EnKakasi { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x15C]; +} EnKakasi; // size = 0x2A0 + +extern const ActorInit En_Kakasi_InitVars; + +#endif // Z_EN_KAKASI_H diff --git a/src/overlays/actors/ovl_En_Kame/overlay.cfg b/src/overlays/actors/ovl_En_Kame/overlay.cfg new file mode 100644 index 0000000000..8f2bff1c1a --- /dev/null +++ b/src/overlays/actors/ovl_En_Kame/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Kame +z_en_kame.c diff --git a/src/overlays/actors/ovl_En_Kame/z_en_kame.c b/src/overlays/actors/ovl_En_Kame/z_en_kame.c new file mode 100644 index 0000000000..05d1ef6f63 --- /dev/null +++ b/src/overlays/actors/ovl_En_Kame/z_en_kame.c @@ -0,0 +1,104 @@ +#include "z_en_kame.h" + +#define FLAGS 0x00000405 + +#define THIS ((EnKame*)thisx) + +void EnKame_Init(Actor* thisx, GlobalContext* globalCtx); +void EnKame_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnKame_Update(Actor* thisx, GlobalContext* globalCtx); +void EnKame_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Kame_InitVars = { + ACTOR_EN_KAME, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_TL, + sizeof(EnKame), + (ActorFunc)EnKame_Init, + (ActorFunc)EnKame_Destroy, + (ActorFunc)EnKame_Update, + (ActorFunc)EnKame_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/EnKame_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/EnKame_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD6F34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD6F9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7018.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD70A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD70EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD71B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7254.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD73A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7424.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7568.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD75A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD76CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7798.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD792C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7948.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7B18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7B90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7C54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7D40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7DA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7E0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7EC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7F10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7FA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD7FF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD8060.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD810C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD8148.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD825C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD8364.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD8388.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD84C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/EnKame_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD8A48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD8AF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/EnKame_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD8CEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kame_0x80AD6DD0/func_80AD8D64.asm") diff --git a/src/overlays/actors/ovl_En_Kame/z_en_kame.h b/src/overlays/actors/ovl_En_Kame/z_en_kame.h new file mode 100644 index 0000000000..47376f58d0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Kame/z_en_kame.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_KAME_H +#define Z_EN_KAME_H + +#include + +struct EnKame; + +typedef struct EnKame { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x248]; +} EnKame; // size = 0x38C + +extern const ActorInit En_Kame_InitVars; + +#endif // Z_EN_KAME_H diff --git a/src/overlays/actors/ovl_En_Kanban/overlay.cfg b/src/overlays/actors/ovl_En_Kanban/overlay.cfg new file mode 100644 index 0000000000..1ae4caed5b --- /dev/null +++ b/src/overlays/actors/ovl_En_Kanban/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Kanban +z_en_kanban.c diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c new file mode 100644 index 0000000000..d7defd57ee --- /dev/null +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -0,0 +1,36 @@ +#include "z_en_kanban.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnKanban*)thisx) + +void EnKanban_Init(Actor* thisx, GlobalContext* globalCtx); +void EnKanban_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnKanban_Update(Actor* thisx, GlobalContext* globalCtx); +void EnKanban_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Kanban_InitVars = { + ACTOR_EN_KANBAN, + ACTORTYPE_PROP, + FLAGS, + OBJECT_KANBAN, + sizeof(EnKanban), + (ActorFunc)EnKanban_Init, + (ActorFunc)EnKanban_Destroy, + (ActorFunc)EnKanban_Update, + (ActorFunc)EnKanban_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kanban_0x80954960/func_80954960.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kanban_0x80954960/EnKanban_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kanban_0x80954960/EnKanban_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kanban_0x80954960/func_80954BE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kanban_0x80954960/EnKanban_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kanban_0x80954960/EnKanban_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h new file mode 100644 index 0000000000..ab0eab506c --- /dev/null +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_KANBAN_H +#define Z_EN_KANBAN_H + +#include + +struct EnKanban; + +typedef struct EnKanban { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xAC]; +} EnKanban; // size = 0x1F0 + +extern const ActorInit En_Kanban_InitVars; + +#endif // Z_EN_KANBAN_H diff --git a/src/overlays/actors/ovl_En_Karebaba/overlay.cfg b/src/overlays/actors/ovl_En_Karebaba/overlay.cfg new file mode 100644 index 0000000000..0045038473 --- /dev/null +++ b/src/overlays/actors/ovl_En_Karebaba/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Karebaba +z_en_karebaba.c diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c new file mode 100644 index 0000000000..10a2cc6b53 --- /dev/null +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -0,0 +1,84 @@ +#include "z_en_karebaba.h" + +#define FLAGS 0x00000005 + +#define THIS ((EnKarebaba*)thisx) + +void EnKarebaba_Init(Actor* thisx, GlobalContext* globalCtx); +void EnKarebaba_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnKarebaba_Update(Actor* thisx, GlobalContext* globalCtx); +void EnKarebaba_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Karebaba_InitVars = { + ACTOR_EN_KAREBABA, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_DEKUBABA, + sizeof(EnKarebaba), + (ActorFunc)EnKarebaba_Init, + (ActorFunc)EnKarebaba_Destroy, + (ActorFunc)EnKarebaba_Update, + (ActorFunc)EnKarebaba_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/EnKarebaba_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/EnKarebaba_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F1374.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F13FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F152C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F155C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F15B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F1648.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F169C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F16FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F1778.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F1878.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F190C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F1A3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F1A58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F1BF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F1C84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F1FAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F200C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F20FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F21A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F220C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F228C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F238C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F241C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F24F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F254C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/EnKarebaba_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/func_808F280C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Karebaba_0x808F1200/EnKarebaba_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h new file mode 100644 index 0000000000..e1558e376b --- /dev/null +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_KAREBABA_H +#define Z_EN_KAREBABA_H + +#include + +struct EnKarebaba; + +typedef struct EnKarebaba { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x184]; +} EnKarebaba; // size = 0x2C8 + +extern const ActorInit En_Karebaba_InitVars; + +#endif // Z_EN_KAREBABA_H diff --git a/src/overlays/actors/ovl_En_Kbt/overlay.cfg b/src/overlays/actors/ovl_En_Kbt/overlay.cfg new file mode 100644 index 0000000000..d9195b4b0f --- /dev/null +++ b/src/overlays/actors/ovl_En_Kbt/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Kbt +z_en_kbt.c diff --git a/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c new file mode 100644 index 0000000000..ae08ffbb45 --- /dev/null +++ b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c @@ -0,0 +1,54 @@ +#include "z_en_kbt.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnKbt*)thisx) + +void EnKbt_Init(Actor* thisx, GlobalContext* globalCtx); +void EnKbt_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnKbt_Update(Actor* thisx, GlobalContext* globalCtx); +void EnKbt_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Kbt_InitVars = { + ACTOR_EN_KBT, + ACTORTYPE_NPC, + FLAGS, + OBJECT_KBT, + sizeof(EnKbt), + (ActorFunc)EnKbt_Init, + (ActorFunc)EnKbt_Destroy, + (ActorFunc)EnKbt_Update, + (ActorFunc)EnKbt_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/EnKbt_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/EnKbt_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/func_80B33E64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/func_80B33E8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/func_80B33EF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/func_80B3403C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/func_80B34078.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/func_80B3415C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/func_80B34314.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/func_80B34574.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/func_80B34598.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/EnKbt_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/func_80B349C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/func_80B34A00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kbt_0x80B33D30/EnKbt_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Kbt/z_en_kbt.h b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.h new file mode 100644 index 0000000000..31a86a36f4 --- /dev/null +++ b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_KBT_H +#define Z_EN_KBT_H + +#include + +struct EnKbt; + +typedef struct EnKbt { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x148]; +} EnKbt; // size = 0x28C + +extern const ActorInit En_Kbt_InitVars; + +#endif // Z_EN_KBT_H diff --git a/src/overlays/actors/ovl_En_Kendo_Js/overlay.cfg b/src/overlays/actors/ovl_En_Kendo_Js/overlay.cfg new file mode 100644 index 0000000000..dd63f4c4a8 --- /dev/null +++ b/src/overlays/actors/ovl_En_Kendo_Js/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Kendo_Js +z_en_kendo_js.c diff --git a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c new file mode 100644 index 0000000000..468bb1161c --- /dev/null +++ b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c @@ -0,0 +1,90 @@ +#include "z_en_kendo_js.h" + +#define FLAGS 0x0A000019 + +#define THIS ((EnKendoJs*)thisx) + +void EnKendoJs_Init(Actor* thisx, GlobalContext* globalCtx); +void EnKendoJs_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnKendoJs_Update(Actor* thisx, GlobalContext* globalCtx); +void EnKendoJs_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Kendo_Js_InitVars = { + ACTOR_EN_KENDO_JS, + ACTORTYPE_NPC, + FLAGS, + OBJECT_JS, + sizeof(EnKendoJs), + (ActorFunc)EnKendoJs_Init, + (ActorFunc)EnKendoJs_Destroy, + (ActorFunc)EnKendoJs_Update, + (ActorFunc)EnKendoJs_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/EnKendoJs_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/EnKendoJs_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B26538.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B2654C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B26758.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B269A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B26AE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B26AFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B26BF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B26EB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B26F14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B26F6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B2701C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B27030.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B2714C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B27188.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B273D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B2740C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B274BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B276C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B276D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B27760.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B27774.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B2783C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B27880.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B278C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B279AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B279F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B27A90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/EnKendoJs_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B27B54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/func_80B27B8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kendo_Js_0x80B262A0/EnKendoJs_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.h b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.h new file mode 100644 index 0000000000..208557cd1c --- /dev/null +++ b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_KENDO_JS_H +#define Z_EN_KENDO_JS_H + +#include + +struct EnKendoJs; + +typedef struct EnKendoJs { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x150]; +} EnKendoJs; // size = 0x294 + +extern const ActorInit En_Kendo_Js_InitVars; + +#endif // Z_EN_KENDO_JS_H diff --git a/src/overlays/actors/ovl_En_Kgy/overlay.cfg b/src/overlays/actors/ovl_En_Kgy/overlay.cfg new file mode 100644 index 0000000000..9a9ddfd5ce --- /dev/null +++ b/src/overlays/actors/ovl_En_Kgy/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Kgy +z_en_kgy.c diff --git a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c new file mode 100644 index 0000000000..18fab86572 --- /dev/null +++ b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c @@ -0,0 +1,122 @@ +#include "z_en_kgy.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnKgy*)thisx) + +void EnKgy_Init(Actor* thisx, GlobalContext* globalCtx); +void EnKgy_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnKgy_Update(Actor* thisx, GlobalContext* globalCtx); +void EnKgy_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Kgy_InitVars = { + ACTOR_EN_KGY, + ACTORTYPE_NPC, + FLAGS, + OBJECT_KGY, + sizeof(EnKgy), + (ActorFunc)EnKgy_Init, + (ActorFunc)EnKgy_Destroy, + (ActorFunc)EnKgy_Update, + (ActorFunc)EnKgy_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/EnKgy_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/EnKgy_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40B38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40BC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40BFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40C38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40C74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40D00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40D30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40D64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40D8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40DB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40E18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40E38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40E54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40E74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40EBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B40EE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B411DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B41368.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B413C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B41460.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B41528.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B415A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B4163C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B417B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B41858.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B418C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B419B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B41A48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B41ACC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B41C30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B41C54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B41CBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B41D64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B41E18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B42508.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B425A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B42660.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B42714.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B427C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B4296C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B42A8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B42D28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/EnKgy_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B42FA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B43008.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/func_80B43074.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kgy_0x80B40800/EnKgy_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.h b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.h new file mode 100644 index 0000000000..71f1bef069 --- /dev/null +++ b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_KGY_H +#define Z_EN_KGY_H + +#include + +struct EnKgy; + +typedef struct EnKgy { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1C4]; +} EnKgy; // size = 0x308 + +extern const ActorInit En_Kgy_InitVars; + +#endif // Z_EN_KGY_H diff --git a/src/overlays/actors/ovl_En_Kitan/overlay.cfg b/src/overlays/actors/ovl_En_Kitan/overlay.cfg new file mode 100644 index 0000000000..cd24348d58 --- /dev/null +++ b/src/overlays/actors/ovl_En_Kitan/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Kitan +z_en_kitan.c diff --git a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c new file mode 100644 index 0000000000..c003c601d4 --- /dev/null +++ b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c @@ -0,0 +1,57 @@ +#include "z_en_kitan.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnKitan*)thisx) + +void EnKitan_Init(Actor* thisx, GlobalContext* globalCtx); +void EnKitan_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnKitan_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Kitan_InitVars = { + ACTOR_EN_KITAN, + ACTORTYPE_NPC, + FLAGS, + OBJECT_KITAN, + sizeof(EnKitan), + (ActorFunc)EnKitan_Init, + (ActorFunc)EnKitan_Destroy, + (ActorFunc)EnKitan_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/EnKitan_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/EnKitan_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C0923C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C09390.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C09418.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C094A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C09518.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C095C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C09648.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C09708.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C09990.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C09AA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C09B50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/EnKitan_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C09C74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C09C90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kitan_0x80C090D0/func_80C09CD0.asm") diff --git a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.h b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.h new file mode 100644 index 0000000000..946e64f013 --- /dev/null +++ b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_KITAN_H +#define Z_EN_KITAN_H + +#include + +struct EnKitan; + +typedef struct EnKitan { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x198]; +} EnKitan; // size = 0x2DC + +extern const ActorInit En_Kitan_InitVars; + +#endif // Z_EN_KITAN_H diff --git a/src/overlays/actors/ovl_En_Knight/overlay.cfg b/src/overlays/actors/ovl_En_Knight/overlay.cfg new file mode 100644 index 0000000000..150eab3c7b --- /dev/null +++ b/src/overlays/actors/ovl_En_Knight/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Knight +z_en_knight.c diff --git a/src/overlays/actors/ovl_En_Knight/z_en_knight.c b/src/overlays/actors/ovl_En_Knight/z_en_knight.c new file mode 100644 index 0000000000..5573732cbf --- /dev/null +++ b/src/overlays/actors/ovl_En_Knight/z_en_knight.c @@ -0,0 +1,214 @@ +#include "z_en_knight.h" + +#define FLAGS 0x00000035 + +#define THIS ((EnKnight*)thisx) + +void EnKnight_Init(Actor* thisx, GlobalContext* globalCtx); +void EnKnight_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnKnight_Update(Actor* thisx, GlobalContext* globalCtx); +void EnKnight_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Knight_InitVars = { + ACTOR_EN_KNIGHT, + ACTORTYPE_BOSS, + FLAGS, + OBJECT_KNIGHT, + sizeof(EnKnight), + (ActorFunc)EnKnight_Init, + (ActorFunc)EnKnight_Destroy, + (ActorFunc)EnKnight_Update, + (ActorFunc)EnKnight_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B20F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B21F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B22CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/EnKnight_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/EnKnight_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B2DD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B2F54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B316C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B31E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B329C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B331C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B3394.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B33F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B35BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B3618.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B37C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B3834.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B389C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B3958.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B3A7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B3B94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B3CD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B3DAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B3E9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B3F0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B4024.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B40E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B41D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B41F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B42B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B4308.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B47EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B4880.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B4BFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B4C58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B4E84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B4ED8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B4F90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B5058.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B51DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B52E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B5634.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B5698.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B58D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B592C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B59FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B5B08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B5D38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B5D54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B5E90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B5ED0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B5FA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B601C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B631C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B638C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B6528.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B6574.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B6764.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B6C04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B6C54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B6D38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B6D94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B6EC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B6F40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B7190.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B71DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B7708.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B7778.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B78A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B7950.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B842C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B8458.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B9A18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B9D24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B9E00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809B9F8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BA058.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BA0CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BA940.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BA978.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/EnKnight_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BC2C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BC67C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BC720.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BC8B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BCA80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BCAD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BCB54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BCB78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/EnKnight_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BD1AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BD260.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BD29C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BD490.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Knight_0x809B20F0/func_809BD858.asm") diff --git a/src/overlays/actors/ovl_En_Knight/z_en_knight.h b/src/overlays/actors/ovl_En_Knight/z_en_knight.h new file mode 100644 index 0000000000..60b4d3780d --- /dev/null +++ b/src/overlays/actors/ovl_En_Knight/z_en_knight.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_KNIGHT_H +#define Z_EN_KNIGHT_H + +#include + +struct EnKnight; + +typedef struct EnKnight { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x590]; +} EnKnight; // size = 0x6D4 + +extern const ActorInit En_Knight_InitVars; + +#endif // Z_EN_KNIGHT_H diff --git a/src/overlays/actors/ovl_En_Kujiya/overlay.cfg b/src/overlays/actors/ovl_En_Kujiya/overlay.cfg new file mode 100644 index 0000000000..a47b9648bc --- /dev/null +++ b/src/overlays/actors/ovl_En_Kujiya/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Kujiya +z_en_kujiya.c diff --git a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c new file mode 100644 index 0000000000..c5ef996e59 --- /dev/null +++ b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c @@ -0,0 +1,66 @@ +#include "z_en_kujiya.h" + +#define FLAGS 0x08000009 + +#define THIS ((EnKujiya*)thisx) + +void EnKujiya_Init(Actor* thisx, GlobalContext* globalCtx); +void EnKujiya_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnKujiya_Update(Actor* thisx, GlobalContext* globalCtx); +void EnKujiya_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Kujiya_InitVars = { + ACTOR_EN_KUJIYA, + ACTORTYPE_NPC, + FLAGS, + OBJECT_KUJIYA, + sizeof(EnKujiya), + (ActorFunc)EnKujiya_Init, + (ActorFunc)EnKujiya_Destroy, + (ActorFunc)EnKujiya_Update, + (ActorFunc)EnKujiya_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/EnKujiya_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/EnKujiya_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB09A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB09BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB0B28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB0BF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB0E44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB0E58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB0F24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB0F38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB0F94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB0FA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB0FF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB1088.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB10F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB1168.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB1180.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB1250.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/func_80BB1268.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/EnKujiya_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kujiya_0x80BB08E0/EnKujiya_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.h b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.h new file mode 100644 index 0000000000..9ca2843fcf --- /dev/null +++ b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_KUJIYA_H +#define Z_EN_KUJIYA_H + +#include + +struct EnKujiya; + +typedef struct EnKujiya { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x8]; +} EnKujiya; // size = 0x14C + +extern const ActorInit En_Kujiya_InitVars; + +#endif // Z_EN_KUJIYA_H diff --git a/src/overlays/actors/ovl_En_Kusa/overlay.cfg b/src/overlays/actors/ovl_En_Kusa/overlay.cfg new file mode 100644 index 0000000000..9cded0ca35 --- /dev/null +++ b/src/overlays/actors/ovl_En_Kusa/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Kusa +z_en_kusa.c diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c new file mode 100644 index 0000000000..e89bc834a8 --- /dev/null +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -0,0 +1,85 @@ +#include "z_en_kusa.h" + +#define FLAGS 0x00800010 + +#define THIS ((EnKusa*)thisx) + +void EnKusa_Init(Actor* thisx, GlobalContext* globalCtx); +void EnKusa_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnKusa_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Kusa_InitVars = { + ACTOR_EN_KUSA, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnKusa), + (ActorFunc)EnKusa_Init, + (ActorFunc)EnKusa_Destroy, + (ActorFunc)EnKusa_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809349E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80934AB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80934F58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80934FFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809350C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809350F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_8093517C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809351A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809354F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809355A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_8093561C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/EnKusa_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/EnKusa_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809358C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809358D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80935988.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809359AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80935B94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80935BBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80935CE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80935D64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80936120.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80936168.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809361A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809361B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80936220.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80936290.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809362D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/EnKusa_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_80936414.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa_0x809349E0/func_809365CC.asm") diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h new file mode 100644 index 0000000000..cc2745f445 --- /dev/null +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_KUSA_H +#define Z_EN_KUSA_H + +#include + +struct EnKusa; + +typedef struct EnKusa { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x58]; +} EnKusa; // size = 0x19C + +extern const ActorInit En_Kusa_InitVars; + +#endif // Z_EN_KUSA_H diff --git a/src/overlays/actors/ovl_En_Kusa2/overlay.cfg b/src/overlays/actors/ovl_En_Kusa2/overlay.cfg new file mode 100644 index 0000000000..0e08a700ba --- /dev/null +++ b/src/overlays/actors/ovl_En_Kusa2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Kusa2 +z_en_kusa2.c diff --git a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c new file mode 100644 index 0000000000..ce98509bbe --- /dev/null +++ b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c @@ -0,0 +1,146 @@ +#include "z_en_kusa2.h" + +#define FLAGS 0x00800010 + +#define THIS ((EnKusa2*)thisx) + +void EnKusa2_Init(Actor* thisx, GlobalContext* globalCtx); +void EnKusa2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnKusa2_Update(Actor* thisx, GlobalContext* globalCtx); +void EnKusa2_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Kusa2_InitVars = { + ACTOR_EN_KUSA2, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_FIELD_KEEP, + sizeof(EnKusa2), + (ActorFunc)EnKusa2_Init, + (ActorFunc)EnKusa2_Destroy, + (ActorFunc)EnKusa2_Update, + (ActorFunc)EnKusa2_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5B160.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5B334.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5B3BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5B490.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5B508.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5B954.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5BA58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5BAFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5BB40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5BD14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5BD94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5BDB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5BF38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5BF60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5BF84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5BFD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5C074.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5C0B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5C104.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5C2FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5C410.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5C70C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5C718.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5C7F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5C918.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5CAD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5CAF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5CB74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5CCD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5CD0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5CF44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D178.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/EnKusa2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/EnKusa2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D5E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D5F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D618.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D62C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D6B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D6C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D754.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D794.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D7A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D7C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D964.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5D9C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5DC70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5DC98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5DE18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5DEB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5E1D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5E210.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5E418.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5E4BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5E604.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/EnKusa2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5E6F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5E80C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/EnKusa2_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5E9B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Kusa2_0x80A5B160/func_80A5EA48.asm") diff --git a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.h b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.h new file mode 100644 index 0000000000..69aa51c274 --- /dev/null +++ b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_KUSA2_H +#define Z_EN_KUSA2_H + +#include + +struct EnKusa2; + +typedef struct EnKusa2 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x90]; +} EnKusa2; // size = 0x1D4 + +extern const ActorInit En_Kusa2_InitVars; + +#endif // Z_EN_KUSA2_H diff --git a/src/overlays/actors/ovl_En_Lift_Nuts/overlay.cfg b/src/overlays/actors/ovl_En_Lift_Nuts/overlay.cfg new file mode 100644 index 0000000000..df2faa5f07 --- /dev/null +++ b/src/overlays/actors/ovl_En_Lift_Nuts/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Lift_Nuts +z_en_lift_nuts.c diff --git a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c new file mode 100644 index 0000000000..f33dccdf55 --- /dev/null +++ b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c @@ -0,0 +1,116 @@ +#include "z_en_lift_nuts.h" + +#define FLAGS 0x02000019 + +#define THIS ((EnLiftNuts*)thisx) + +void EnLiftNuts_Init(Actor* thisx, GlobalContext* globalCtx); +void EnLiftNuts_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnLiftNuts_Update(Actor* thisx, GlobalContext* globalCtx); +void EnLiftNuts_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Lift_Nuts_InitVars = { + ACTOR_EN_LIFT_NUTS, + ACTORTYPE_NPC, + FLAGS, + OBJECT_DNT, + sizeof(EnLiftNuts), + (ActorFunc)EnLiftNuts_Init, + (ActorFunc)EnLiftNuts_Destroy, + (ActorFunc)EnLiftNuts_Update, + (ActorFunc)EnLiftNuts_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9A20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9A80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9AC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9B4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9B8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9BCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/EnLiftNuts_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/EnLiftNuts_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9F28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9F70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AE9FC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEA044.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEA0B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEA128.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEA1A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEA7A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEA910.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEABF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEAC64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEACF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEAEAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEAF14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEAF8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEAFA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB114.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB148.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB1C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB230.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB280.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB294.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB3E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB428.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB584.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB598.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB684.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB698.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB828.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB8A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB934.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB974.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEB9E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEBB30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/EnLiftNuts_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEBC18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/func_80AEBC90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Lift_Nuts_0x80AE9A20/EnLiftNuts_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.h b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.h new file mode 100644 index 0000000000..8834e4c875 --- /dev/null +++ b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_LIFT_NUTS_H +#define Z_EN_LIFT_NUTS_H + +#include + +struct EnLiftNuts; + +typedef struct EnLiftNuts { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x214]; +} EnLiftNuts; // size = 0x358 + +extern const ActorInit En_Lift_Nuts_InitVars; + +#endif // Z_EN_LIFT_NUTS_H diff --git a/src/overlays/actors/ovl_En_Light/overlay.cfg b/src/overlays/actors/ovl_En_Light/overlay.cfg new file mode 100644 index 0000000000..763d0ad6dc --- /dev/null +++ b/src/overlays/actors/ovl_En_Light/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Light +z_en_light.c diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.c b/src/overlays/actors/ovl_En_Light/z_en_light.c new file mode 100644 index 0000000000..5ac19e1646 --- /dev/null +++ b/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -0,0 +1,36 @@ +#include "z_en_light.h" + +#define FLAGS 0x00000000 + +#define THIS ((EnLight*)thisx) + +void EnLight_Init(Actor* thisx, GlobalContext* globalCtx); +void EnLight_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnLight_Update(Actor* thisx, GlobalContext* globalCtx); +void EnLight_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Light_InitVars = { + ACTOR_EN_LIGHT, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnLight), + (ActorFunc)EnLight_Init, + (ActorFunc)EnLight_Destroy, + (ActorFunc)EnLight_Update, + (ActorFunc)EnLight_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Light_0x80865990/EnLight_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Light_0x80865990/EnLight_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Light_0x80865990/func_80865BF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Light_0x80865990/EnLight_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Light_0x80865990/func_80865F38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Light_0x80865990/EnLight_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.h b/src/overlays/actors/ovl_En_Light/z_en_light.h new file mode 100644 index 0000000000..b2f477c949 --- /dev/null +++ b/src/overlays/actors/ovl_En_Light/z_en_light.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_LIGHT_H +#define Z_EN_LIGHT_H + +#include + +struct EnLight; + +typedef struct EnLight { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x18]; +} EnLight; // size = 0x15C + +extern const ActorInit En_Light_InitVars; + +#endif // Z_EN_LIGHT_H diff --git a/src/overlays/actors/ovl_En_Look_Nuts/overlay.cfg b/src/overlays/actors/ovl_En_Look_Nuts/overlay.cfg new file mode 100644 index 0000000000..8d594952f8 --- /dev/null +++ b/src/overlays/actors/ovl_En_Look_Nuts/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Look_Nuts +z_en_look_nuts.c diff --git a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c new file mode 100644 index 0000000000..b40c60ea45 --- /dev/null +++ b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c @@ -0,0 +1,48 @@ +#include "z_en_look_nuts.h" + +#define FLAGS 0x80000000 + +#define THIS ((EnLookNuts*)thisx) + +void EnLookNuts_Init(Actor* thisx, GlobalContext* globalCtx); +void EnLookNuts_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnLookNuts_Update(Actor* thisx, GlobalContext* globalCtx); +void EnLookNuts_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Look_Nuts_InitVars = { + ACTOR_EN_LOOK_NUTS, + ACTORTYPE_NPC, + FLAGS, + OBJECT_DNK, + sizeof(EnLookNuts), + (ActorFunc)EnLookNuts_Init, + (ActorFunc)EnLookNuts_Destroy, + (ActorFunc)EnLookNuts_Update, + (ActorFunc)EnLookNuts_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Look_Nuts_0x80A678B0/EnLookNuts_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Look_Nuts_0x80A678B0/EnLookNuts_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Look_Nuts_0x80A678B0/func_80A67A34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Look_Nuts_0x80A678B0/func_80A67AA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Look_Nuts_0x80A678B0/func_80A67C48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Look_Nuts_0x80A678B0/func_80A67D0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Look_Nuts_0x80A678B0/func_80A67F30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Look_Nuts_0x80A678B0/func_80A67FC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Look_Nuts_0x80A678B0/func_80A68080.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Look_Nuts_0x80A678B0/func_80A680FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Look_Nuts_0x80A678B0/EnLookNuts_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Look_Nuts_0x80A678B0/EnLookNuts_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.h b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.h new file mode 100644 index 0000000000..1bbcd16bb9 --- /dev/null +++ b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_LOOK_NUTS_H +#define Z_EN_LOOK_NUTS_H + +#include + +struct EnLookNuts; + +typedef struct EnLookNuts { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x14C]; +} EnLookNuts; // size = 0x290 + +extern const ActorInit En_Look_Nuts_InitVars; + +#endif // Z_EN_LOOK_NUTS_H diff --git a/src/overlays/actors/ovl_En_M_Fire1/overlay.cfg b/src/overlays/actors/ovl_En_M_Fire1/overlay.cfg new file mode 100644 index 0000000000..1d43db7312 --- /dev/null +++ b/src/overlays/actors/ovl_En_M_Fire1/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_M_Fire1 +z_en_m_fire1.c diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c new file mode 100644 index 0000000000..df30a2e076 --- /dev/null +++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c @@ -0,0 +1,29 @@ +#include "z_en_m_fire1.h" + +#define FLAGS 0x00000000 + +#define THIS ((EnMFire1*)thisx) + +void EnMFire1_Init(Actor* thisx, GlobalContext* globalCtx); +void EnMFire1_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnMFire1_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_M_Fire1_InitVars = { + ACTOR_EN_M_FIRE1, + ACTORTYPE_MISC, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnMFire1), + (ActorFunc)EnMFire1_Init, + (ActorFunc)EnMFire1_Destroy, + (ActorFunc)EnMFire1_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_M_Fire1_0x808B5230/EnMFire1_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_M_Fire1_0x808B5230/EnMFire1_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_M_Fire1_0x808B5230/EnMFire1_Update.asm") diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h new file mode 100644 index 0000000000..d2ba9a963c --- /dev/null +++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_M_FIRE1_H +#define Z_EN_M_FIRE1_H + +#include + +struct EnMFire1; + +typedef struct EnMFire1 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x50]; +} EnMFire1; // size = 0x194 + +extern const ActorInit En_M_Fire1_InitVars; + +#endif // Z_EN_M_FIRE1_H diff --git a/src/overlays/actors/ovl_En_M_Thunder/overlay.cfg b/src/overlays/actors/ovl_En_M_Thunder/overlay.cfg new file mode 100644 index 0000000000..5de5ce33a1 --- /dev/null +++ b/src/overlays/actors/ovl_En_M_Thunder/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_M_Thunder +z_en_m_thunder.c diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c new file mode 100644 index 0000000000..565e30e447 --- /dev/null +++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c @@ -0,0 +1,50 @@ +#include "z_en_m_thunder.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnMThunder*)thisx) + +void EnMThunder_Init(Actor* thisx, GlobalContext* globalCtx); +void EnMThunder_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnMThunder_Update(Actor* thisx, GlobalContext* globalCtx); +void EnMThunder_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_M_Thunder_InitVars = { + ACTOR_EN_M_THUNDER, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnMThunder), + (ActorFunc)EnMThunder_Init, + (ActorFunc)EnMThunder_Destroy, + (ActorFunc)EnMThunder_Update, + (ActorFunc)EnMThunder_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/func_808B53C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/EnMThunder_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/EnMThunder_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/func_808B5890.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/func_808B58CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/func_808B5984.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/func_808B5EEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/func_808B5F68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/func_808B60D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/func_808B6310.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/EnMThunder_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/func_808B65BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_M_Thunder_0x808B53C0/EnMThunder_Draw.asm") diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h new file mode 100644 index 0000000000..4d7222ce1c --- /dev/null +++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_M_THUNDER_H +#define Z_EN_M_THUNDER_H + +#include + +struct EnMThunder; + +typedef struct EnMThunder { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x80]; +} EnMThunder; // size = 0x1C4 + +extern const ActorInit En_M_Thunder_InitVars; + +#endif // Z_EN_M_THUNDER_H diff --git a/src/overlays/actors/ovl_En_Ma4/overlay.cfg b/src/overlays/actors/ovl_En_Ma4/overlay.cfg new file mode 100644 index 0000000000..3a0c5af889 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ma4/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ma4 +z_en_ma4.c diff --git a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c new file mode 100644 index 0000000000..349eff0bc0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c @@ -0,0 +1,98 @@ +#include "z_en_ma4.h" + +#define FLAGS 0x02000039 + +#define THIS ((EnMa4*)thisx) + +void EnMa4_Init(Actor* thisx, GlobalContext* globalCtx); +void EnMa4_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnMa4_Update(Actor* thisx, GlobalContext* globalCtx); +void EnMa4_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ma4_InitVars = { + ACTOR_EN_MA4, + ACTORTYPE_NPC, + FLAGS, + OBJECT_MA1, + sizeof(EnMa4), + (ActorFunc)EnMa4_Init, + (ActorFunc)EnMa4_Destroy, + (ActorFunc)EnMa4_Update, + (ActorFunc)EnMa4_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABDCA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABDD2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABDD9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABDE60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/EnMa4_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/EnMa4_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABE1C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABE4A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABE560.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABE6C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABEB6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABEF34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABEF8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF070.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF084.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF0D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF160.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF198.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF218.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF254.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF2FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF354.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF494.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF4A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF51C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF534.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF69C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF6B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF760.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF774.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABF7C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABFCAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABFCD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/EnMa4_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABFD9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/func_80ABFE48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma4_0x80ABDCA0/EnMa4_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.h b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.h new file mode 100644 index 0000000000..fbe815259d --- /dev/null +++ b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_MA4_H +#define Z_EN_MA4_H + +#include + +struct EnMa4; + +typedef struct EnMa4 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1FC]; +} EnMa4; // size = 0x340 + +extern const ActorInit En_Ma4_InitVars; + +#endif // Z_EN_MA4_H diff --git a/src/overlays/actors/ovl_En_Ma_Yto/overlay.cfg b/src/overlays/actors/ovl_En_Ma_Yto/overlay.cfg new file mode 100644 index 0000000000..a1085bf0ef --- /dev/null +++ b/src/overlays/actors/ovl_En_Ma_Yto/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ma_Yto +z_en_ma_yto.c diff --git a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c new file mode 100644 index 0000000000..ba55be0bca --- /dev/null +++ b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c @@ -0,0 +1,146 @@ +#include "z_en_ma_yto.h" + +#define FLAGS 0x02100009 + +#define THIS ((EnMaYto*)thisx) + +void EnMaYto_Init(Actor* thisx, GlobalContext* globalCtx); +void EnMaYto_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnMaYto_Update(Actor* thisx, GlobalContext* globalCtx); +void EnMaYto_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ma_Yto_InitVars = { + ACTOR_EN_MA_YTO, + ACTORTYPE_NPC, + FLAGS, + OBJECT_MA2, + sizeof(EnMaYto), + (ActorFunc)EnMaYto_Init, + (ActorFunc)EnMaYto_Destroy, + (ActorFunc)EnMaYto_Update, + (ActorFunc)EnMaYto_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/EnMaYto_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8E6E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8E84C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8E938.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8EA38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8EABC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/EnMaYto_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8EBDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8EBF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8EC30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8ECAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8ED8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8EDC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8EEAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8EF4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8F074.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8F108.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8F254.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8F2D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8F360.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8F400.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8F744.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8F7F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8F918.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8F998.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8FA14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8FE04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8FE74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8FF80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B8FF94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B9000C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B900AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B900C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90170.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90184.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B902B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B902CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90340.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B9037C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B904D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B904E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B9059C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B905B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B9061C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B9083C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90A78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90C08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90C78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90D98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90DF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90E50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90E84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90EC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90EF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B90F84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B91014.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B9109C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/EnMaYto_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B91154.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/func_80B91250.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yto_0x80B8E520/EnMaYto_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.h b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.h new file mode 100644 index 0000000000..9dd8229ec2 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_MA_YTO_H +#define Z_EN_MA_YTO_H + +#include + +struct EnMaYto; + +typedef struct EnMaYto { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1E0]; +} EnMaYto; // size = 0x324 + +extern const ActorInit En_Ma_Yto_InitVars; + +#endif // Z_EN_MA_YTO_H diff --git a/src/overlays/actors/ovl_En_Ma_Yts/overlay.cfg b/src/overlays/actors/ovl_En_Ma_Yts/overlay.cfg new file mode 100644 index 0000000000..c185a0e537 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ma_Yts/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ma_Yts +z_en_ma_yts.c diff --git a/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c b/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c new file mode 100644 index 0000000000..b53a465901 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c @@ -0,0 +1,68 @@ +#include "z_en_ma_yts.h" + +#define FLAGS 0x02100009 + +#define THIS ((EnMaYts*)thisx) + +void EnMaYts_Init(Actor* thisx, GlobalContext* globalCtx); +void EnMaYts_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnMaYts_Update(Actor* thisx, GlobalContext* globalCtx); +void EnMaYts_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ma_Yts_InitVars = { + ACTOR_EN_MA_YTS, + ACTORTYPE_NPC, + FLAGS, + OBJECT_MA1, + sizeof(EnMaYts), + (ActorFunc)EnMaYts_Init, + (ActorFunc)EnMaYts_Destroy, + (ActorFunc)EnMaYts_Update, + (ActorFunc)EnMaYts_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8D030.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8D0BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8D12C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8D1E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8D2D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/EnMaYts_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/EnMaYts_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8D698.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8D6AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8D6BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8D6F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8D95C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8D970.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8D9E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8DA28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8DBB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8DD88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/EnMaYts_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8DE44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8DF18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/EnMaYts_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ma_Yts_0x80B8D030/func_80B8E0BC.asm") diff --git a/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h b/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h new file mode 100644 index 0000000000..16f115789b --- /dev/null +++ b/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_MA_YTS_H +#define Z_EN_MA_YTS_H + +#include + +struct EnMaYts; + +typedef struct EnMaYts { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1F8]; +} EnMaYts; // size = 0x33C + +extern const ActorInit En_Ma_Yts_InitVars; + +#endif // Z_EN_MA_YTS_H diff --git a/src/overlays/actors/ovl_En_Mag/overlay.cfg b/src/overlays/actors/ovl_En_Mag/overlay.cfg new file mode 100644 index 0000000000..14fce0372c --- /dev/null +++ b/src/overlays/actors/ovl_En_Mag/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Mag +z_en_mag.c diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/src/overlays/actors/ovl_En_Mag/z_en_mag.c new file mode 100644 index 0000000000..8d34040d31 --- /dev/null +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -0,0 +1,46 @@ +#include "z_en_mag.h" + +#define FLAGS 0x00000030 + +#define THIS ((EnMag*)thisx) + +void EnMag_Init(Actor* thisx, GlobalContext* globalCtx); +void EnMag_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnMag_Update(Actor* thisx, GlobalContext* globalCtx); +void EnMag_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Mag_InitVars = { + ACTOR_EN_MAG, + ACTORTYPE_PROP, + FLAGS, + OBJECT_MAG, + sizeof(EnMag), + (ActorFunc)EnMag_Init, + (ActorFunc)EnMag_Destroy, + (ActorFunc)EnMag_Update, + (ActorFunc)EnMag_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mag_0x8096B310/EnMag_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mag_0x8096B310/EnMag_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mag_0x8096B310/func_8096B604.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mag_0x8096B310/EnMag_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mag_0x8096B310/func_8096C998.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mag_0x8096B310/func_8096CBB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mag_0x8096B310/func_8096CDC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mag_0x8096B310/func_8096D230.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mag_0x8096B310/func_8096D60C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mag_0x8096B310/func_8096D74C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mag_0x8096B310/EnMag_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.h b/src/overlays/actors/ovl_En_Mag/z_en_mag.h new file mode 100644 index 0000000000..47fc08f17b --- /dev/null +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_MAG_H +#define Z_EN_MAG_H + +#include + +struct EnMag; + +typedef struct EnMag { + /* 0x00000 */ Actor actor; + /* 0x00144 */ char unk_00144[0x11E34]; +} EnMag; // size = 0x11F78 + +extern const ActorInit En_Mag_InitVars; + +#endif // Z_EN_MAG_H diff --git a/src/overlays/actors/ovl_En_Maruta/overlay.cfg b/src/overlays/actors/ovl_En_Maruta/overlay.cfg new file mode 100644 index 0000000000..6816a8c92b --- /dev/null +++ b/src/overlays/actors/ovl_En_Maruta/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Maruta +z_en_maruta.c diff --git a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c new file mode 100644 index 0000000000..a6986bd077 --- /dev/null +++ b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c @@ -0,0 +1,82 @@ +#include "z_en_maruta.h" + +#define FLAGS 0x00000011 + +#define THIS ((EnMaruta*)thisx) + +void EnMaruta_Init(Actor* thisx, GlobalContext* globalCtx); +void EnMaruta_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnMaruta_Update(Actor* thisx, GlobalContext* globalCtx); +void EnMaruta_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Maruta_InitVars = { + ACTOR_EN_MARUTA, + ACTORTYPE_PROP, + FLAGS, + OBJECT_MARUTA, + sizeof(EnMaruta), + (ActorFunc)EnMaruta_Init, + (ActorFunc)EnMaruta_Destroy, + (ActorFunc)EnMaruta_Update, + (ActorFunc)EnMaruta_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/EnMaruta_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/EnMaruta_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B372B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B372CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37364.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B3738C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B373F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37428.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B374B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B374FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37590.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37950.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37998.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B379C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37A14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37A64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37A8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37AA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37B78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37C04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37C60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37CA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B37EC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B38028.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B38060.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B3828C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/func_80B382E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/EnMaruta_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Maruta_0x80B37080/EnMaruta_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.h b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.h new file mode 100644 index 0000000000..9780e1ed25 --- /dev/null +++ b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_MARUTA_H +#define Z_EN_MARUTA_H + +#include + +struct EnMaruta; + +typedef struct EnMaruta { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xE0]; +} EnMaruta; // size = 0x224 + +extern const ActorInit En_Maruta_InitVars; + +#endif // Z_EN_MARUTA_H diff --git a/src/overlays/actors/ovl_En_Minideath/overlay.cfg b/src/overlays/actors/ovl_En_Minideath/overlay.cfg new file mode 100644 index 0000000000..deffea103b --- /dev/null +++ b/src/overlays/actors/ovl_En_Minideath/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Minideath +z_en_minideath.c diff --git a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c new file mode 100644 index 0000000000..a12a7e4a16 --- /dev/null +++ b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c @@ -0,0 +1,93 @@ +#include "z_en_minideath.h" + +#define FLAGS 0x00000015 + +#define THIS ((EnMinideath*)thisx) + +void EnMinideath_Init(Actor* thisx, GlobalContext* globalCtx); +void EnMinideath_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnMinideath_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Minideath_InitVars = { + ACTOR_EN_MINIDEATH, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_DEATH, + sizeof(EnMinideath), + (ActorFunc)EnMinideath_Init, + (ActorFunc)EnMinideath_Destroy, + (ActorFunc)EnMinideath_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/EnMinideath_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/EnMinideath_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CA268.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CA308.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CA34C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CA458.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CA7D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CA860.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CA8E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CA8F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CAAC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CAAEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CAB90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CABB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CAC54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CACD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CAE00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CAE18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CAF08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CAF68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB07C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB094.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB0C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB22C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB418.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB454.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB524.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB59C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB6A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB6D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB7B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB7CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB810.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/func_808CB8F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minideath_0x808CA0B0/EnMinideath_Update.asm") diff --git a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.h b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.h new file mode 100644 index 0000000000..878ad5b40c --- /dev/null +++ b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_MINIDEATH_H +#define Z_EN_MINIDEATH_H + +#include + +struct EnMinideath; + +typedef struct EnMinideath { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x168]; +} EnMinideath; // size = 0x2AC + +extern const ActorInit En_Minideath_InitVars; + +#endif // Z_EN_MINIDEATH_H diff --git a/src/overlays/actors/ovl_En_Minifrog/overlay.cfg b/src/overlays/actors/ovl_En_Minifrog/overlay.cfg new file mode 100644 index 0000000000..db7e2a8424 --- /dev/null +++ b/src/overlays/actors/ovl_En_Minifrog/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Minifrog +z_en_minifrog.c diff --git a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c new file mode 100644 index 0000000000..d15298402c --- /dev/null +++ b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c @@ -0,0 +1,80 @@ +#include "z_en_minifrog.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnMinifrog*)thisx) + +void EnMinifrog_Init(Actor* thisx, GlobalContext* globalCtx); +void EnMinifrog_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnMinifrog_Update(Actor* thisx, GlobalContext* globalCtx); +void EnMinifrog_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Minifrog_InitVars = { + ACTOR_EN_MINIFROG, + ACTORTYPE_NPC, + FLAGS, + OBJECT_FR, + sizeof(EnMinifrog), + (ActorFunc)EnMinifrog_Init, + (ActorFunc)EnMinifrog_Destroy, + (ActorFunc)EnMinifrog_Update, + (ActorFunc)EnMinifrog_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/EnMinifrog_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/EnMinifrog_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A3930.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A3980.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A39EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A3A44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A3B04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A3B3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A3B74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A3DA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A3F88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A4040.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A410C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A41A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A4214.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A42D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A4328.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A43A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A44BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A45A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A4634.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A46E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A4914.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/EnMinifrog_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A4AC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A4AF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/func_808A4B3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minifrog_0x808A3670/EnMinifrog_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.h b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.h new file mode 100644 index 0000000000..0bb814b634 --- /dev/null +++ b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_MINIFROG_H +#define Z_EN_MINIFROG_H + +#include + +struct EnMinifrog; + +typedef struct EnMinifrog { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1C0]; +} EnMinifrog; // size = 0x304 + +extern const ActorInit En_Minifrog_InitVars; + +#endif // Z_EN_MINIFROG_H diff --git a/src/overlays/actors/ovl_En_Minislime/overlay.cfg b/src/overlays/actors/ovl_En_Minislime/overlay.cfg new file mode 100644 index 0000000000..795b335cb1 --- /dev/null +++ b/src/overlays/actors/ovl_En_Minislime/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Minislime +z_en_minislime.c diff --git a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c new file mode 100644 index 0000000000..1c6cf90508 --- /dev/null +++ b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c @@ -0,0 +1,97 @@ +#include "z_en_minislime.h" + +#define FLAGS 0x00000235 + +#define THIS ((EnMinislime*)thisx) + +void EnMinislime_Init(Actor* thisx, GlobalContext* globalCtx); +void EnMinislime_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnMinislime_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Minislime_InitVars = { + ACTOR_EN_MINISLIME, + ACTORTYPE_BOSS, + FLAGS, + OBJECT_BIGSLIME, + sizeof(EnMinislime), + (ActorFunc)EnMinislime_Init, + (ActorFunc)EnMinislime_Destroy, + (ActorFunc)EnMinislime_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/EnMinislime_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/EnMinislime_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_8098399C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80983B38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80983DBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80983E9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80983EB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80983F1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80984030.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_809840A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_8098419C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_8098420C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80984248.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80984410.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80984450.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_809844FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_809845A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_8098470C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80984748.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80984964.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_809849C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80984B34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80984C28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80984CA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80984D08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80984E38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80984ECC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80985018.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80985088.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80985154.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80985168.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_8098518C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_809851E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_809852DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_8098537C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/func_80985480.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Minislime_0x809838F0/EnMinislime_Update.asm") diff --git a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.h b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.h new file mode 100644 index 0000000000..f8508fba4f --- /dev/null +++ b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_MINISLIME_H +#define Z_EN_MINISLIME_H + +#include + +struct EnMinislime; + +typedef struct EnMinislime { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x68]; +} EnMinislime; // size = 0x1AC + +extern const ActorInit En_Minislime_InitVars; + +#endif // Z_EN_MINISLIME_H diff --git a/src/overlays/actors/ovl_En_Mk/overlay.cfg b/src/overlays/actors/ovl_En_Mk/overlay.cfg new file mode 100644 index 0000000000..7463d059af --- /dev/null +++ b/src/overlays/actors/ovl_En_Mk/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Mk +z_en_mk.c diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/src/overlays/actors/ovl_En_Mk/z_en_mk.c new file mode 100644 index 0000000000..d147057fc8 --- /dev/null +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -0,0 +1,58 @@ +#include "z_en_mk.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnMk*)thisx) + +void EnMk_Init(Actor* thisx, GlobalContext* globalCtx); +void EnMk_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnMk_Update(Actor* thisx, GlobalContext* globalCtx); +void EnMk_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Mk_InitVars = { + ACTOR_EN_MK, + ACTORTYPE_NPC, + FLAGS, + OBJECT_MK, + sizeof(EnMk), + (ActorFunc)EnMk_Init, + (ActorFunc)EnMk_Destroy, + (ActorFunc)EnMk_Update, + (ActorFunc)EnMk_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_809592E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/EnMk_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/EnMk_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_80959524.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_8095954C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_80959624.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_809596A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_80959774.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_80959844.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_80959A24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_80959C94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_80959D28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_80959E18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/EnMk_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_8095A150.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/func_8095A198.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mk_0x809592E0/EnMk_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.h b/src/overlays/actors/ovl_En_Mk/z_en_mk.h new file mode 100644 index 0000000000..e6d7fb0953 --- /dev/null +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_MK_H +#define Z_EN_MK_H + +#include + +struct EnMk; + +typedef struct EnMk { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x140]; +} EnMk; // size = 0x284 + +extern const ActorInit En_Mk_InitVars; + +#endif // Z_EN_MK_H diff --git a/src/overlays/actors/ovl_En_Mkk/overlay.cfg b/src/overlays/actors/ovl_En_Mkk/overlay.cfg new file mode 100644 index 0000000000..490c7cd58a --- /dev/null +++ b/src/overlays/actors/ovl_En_Mkk/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Mkk +z_en_mkk.c diff --git a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c new file mode 100644 index 0000000000..651de18fca --- /dev/null +++ b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c @@ -0,0 +1,70 @@ +#include "z_en_mkk.h" + +#define FLAGS 0x00000005 + +#define THIS ((EnMkk*)thisx) + +void EnMkk_Init(Actor* thisx, GlobalContext* globalCtx); +void EnMkk_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnMkk_Update(Actor* thisx, GlobalContext* globalCtx); +void EnMkk_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Mkk_InitVars = { + ACTOR_EN_MKK, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_MKK, + sizeof(EnMkk), + (ActorFunc)EnMkk_Init, + (ActorFunc)EnMkk_Destroy, + (ActorFunc)EnMkk_Update, + (ActorFunc)EnMkk_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/EnMkk_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/EnMkk_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4E0CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4E100.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4E190.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4E1F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4E22C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4E2B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4E2E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4E58C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4E60C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4E67C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4E72C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4E84C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4EBBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/EnMkk_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4EDF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4EE48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4EEF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4EF74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4F16C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/EnMkk_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mkk_0x80A4DED0/func_80A4F4C8.asm") diff --git a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.h b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.h new file mode 100644 index 0000000000..773420085f --- /dev/null +++ b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_MKK_H +#define Z_EN_MKK_H + +#include + +struct EnMkk; + +typedef struct EnMkk { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x90]; +} EnMkk; // size = 0x1D4 + +extern const ActorInit En_Mkk_InitVars; + +#endif // Z_EN_MKK_H diff --git a/src/overlays/actors/ovl_En_Mm/overlay.cfg b/src/overlays/actors/ovl_En_Mm/overlay.cfg new file mode 100644 index 0000000000..db9f54ab33 --- /dev/null +++ b/src/overlays/actors/ovl_En_Mm/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Mm +z_en_mm.c diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.c b/src/overlays/actors/ovl_En_Mm/z_en_mm.c new file mode 100644 index 0000000000..672a40e3b0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -0,0 +1,42 @@ +#include "z_en_mm.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnMm*)thisx) + +void EnMm_Init(Actor* thisx, GlobalContext* globalCtx); +void EnMm_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnMm_Update(Actor* thisx, GlobalContext* globalCtx); +void EnMm_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Mm_InitVars = { + ACTOR_EN_MM, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnMm), + (ActorFunc)EnMm_Init, + (ActorFunc)EnMm_Destroy, + (ActorFunc)EnMm_Update, + (ActorFunc)EnMm_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm_0x80965BB0/func_80965BB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm_0x80965BB0/func_80965BBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm_0x80965BB0/EnMm_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm_0x80965BB0/EnMm_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm_0x80965BB0/func_80965D3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm_0x80965BB0/func_80965DB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm_0x80965BB0/func_8096611C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm_0x80965BB0/EnMm_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm_0x80965BB0/EnMm_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.h b/src/overlays/actors/ovl_En_Mm/z_en_mm.h new file mode 100644 index 0000000000..16e9efdf9a --- /dev/null +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_MM_H +#define Z_EN_MM_H + +#include + +struct EnMm; + +typedef struct EnMm { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x54]; +} EnMm; // size = 0x198 + +extern const ActorInit En_Mm_InitVars; + +#endif // Z_EN_MM_H diff --git a/src/overlays/actors/ovl_En_Mm2/overlay.cfg b/src/overlays/actors/ovl_En_Mm2/overlay.cfg new file mode 100644 index 0000000000..ee3394df9e --- /dev/null +++ b/src/overlays/actors/ovl_En_Mm2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Mm2 +z_en_mm2.c diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c new file mode 100644 index 0000000000..9d00cfe0e7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -0,0 +1,36 @@ +#include "z_en_mm2.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnMm2*)thisx) + +void EnMm2_Init(Actor* thisx, GlobalContext* globalCtx); +void EnMm2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnMm2_Update(Actor* thisx, GlobalContext* globalCtx); +void EnMm2_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Mm2_InitVars = { + ACTOR_EN_MM2, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnMm2), + (ActorFunc)EnMm2_Init, + (ActorFunc)EnMm2_Destroy, + (ActorFunc)EnMm2_Update, + (ActorFunc)EnMm2_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm2_0x809A2030/EnMm2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm2_0x809A2030/EnMm2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm2_0x809A2030/func_809A2080.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm2_0x809A2030/func_809A20FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm2_0x809A2030/EnMm2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm2_0x809A2030/EnMm2_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h new file mode 100644 index 0000000000..646030eea7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_MM2_H +#define Z_EN_MM2_H + +#include + +struct EnMm2; + +typedef struct EnMm2 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x170]; +} EnMm2; // size = 0x2B4 + +extern const ActorInit En_Mm2_InitVars; + +#endif // Z_EN_MM2_H diff --git a/src/overlays/actors/ovl_En_Mm3/overlay.cfg b/src/overlays/actors/ovl_En_Mm3/overlay.cfg new file mode 100644 index 0000000000..d1162759f0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Mm3/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Mm3 +z_en_mm3.c diff --git a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c new file mode 100644 index 0000000000..22aafbaa33 --- /dev/null +++ b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c @@ -0,0 +1,66 @@ +#include "z_en_mm3.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnMm3*)thisx) + +void EnMm3_Init(Actor* thisx, GlobalContext* globalCtx); +void EnMm3_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnMm3_Update(Actor* thisx, GlobalContext* globalCtx); +void EnMm3_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Mm3_InitVars = { + ACTOR_EN_MM3, + ACTORTYPE_NPC, + FLAGS, + OBJECT_MM, + sizeof(EnMm3), + (ActorFunc)EnMm3_Init, + (ActorFunc)EnMm3_Destroy, + (ActorFunc)EnMm3_Update, + (ActorFunc)EnMm3_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/EnMm3_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/EnMm3_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6F22C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6F270.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6F2C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6F3B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6F5E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6F9C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6F9DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6FBA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6FBFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6FE1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6FE30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6FED8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6FEEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A6FFAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A70084.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/EnMm3_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A701E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/func_80A702B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mm3_0x80A6F0A0/EnMm3_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.h b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.h new file mode 100644 index 0000000000..457b8f09b5 --- /dev/null +++ b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_MM3_H +#define Z_EN_MM3_H + +#include + +struct EnMm3; + +typedef struct EnMm3 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x174]; +} EnMm3; // size = 0x2B8 + +extern const ActorInit En_Mm3_InitVars; + +#endif // Z_EN_MM3_H diff --git a/src/overlays/actors/ovl_En_Mnk/overlay.cfg b/src/overlays/actors/ovl_En_Mnk/overlay.cfg new file mode 100644 index 0000000000..456c850ac3 --- /dev/null +++ b/src/overlays/actors/ovl_En_Mnk/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Mnk +z_en_mnk.c diff --git a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c new file mode 100644 index 0000000000..32f6c741b9 --- /dev/null +++ b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c @@ -0,0 +1,196 @@ +#include "z_en_mnk.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnMnk*)thisx) + +void EnMnk_Init(Actor* thisx, GlobalContext* globalCtx); +void EnMnk_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnMnk_Update(Actor* thisx, GlobalContext* globalCtx); +void EnMnk_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Mnk_InitVars = { + ACTOR_EN_MNK, + ACTORTYPE_NPC, + FLAGS, + OBJECT_MNK, + sizeof(EnMnk), + (ActorFunc)EnMnk_Init, + (ActorFunc)EnMnk_Destroy, + (ActorFunc)EnMnk_Update, + (ActorFunc)EnMnk_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB4D10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB4E34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB4E58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB4E88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB4F68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB4F8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB50B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB50D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB5148.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB51C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB52E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/EnMnk_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/EnMnk_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB5A64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB5B38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB5B84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB5BCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB5C14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB5C74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB5CD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB5F6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB60FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB61E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB6304.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB63CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB64B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB65F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB675C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB6870.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB6920.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB69C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB6AF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB6B78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB6BE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB6E08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB6EB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB6F98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB7108.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB7204.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB72BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB7354.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB740C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB7488.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB7504.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB75A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB7620.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB76B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB794C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB7AC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB7B20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB7DCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB7E50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8040.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB80BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB81D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8478.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB852C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB85C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8644.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB86AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8750.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8878.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8968.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB89F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8A74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8B18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8BD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8C60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8CFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8E4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8EF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB8FD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB9084.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB92CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB94E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/EnMnk_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB96A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB96E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB9708.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB973C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB977C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB97B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB99D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/EnMnk_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB9BAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mnk_0x80AB4D10/func_80AB9C4C.asm") diff --git a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.h b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.h new file mode 100644 index 0000000000..ddb4505978 --- /dev/null +++ b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_MNK_H +#define Z_EN_MNK_H + +#include + +struct EnMnk; + +typedef struct EnMnk { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2A8]; +} EnMnk; // size = 0x3EC + +extern const ActorInit En_Mnk_InitVars; + +#endif // Z_EN_MNK_H diff --git a/src/overlays/actors/ovl_En_Ms/overlay.cfg b/src/overlays/actors/ovl_En_Ms/overlay.cfg new file mode 100644 index 0000000000..f8f57266ec --- /dev/null +++ b/src/overlays/actors/ovl_En_Ms/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ms +z_en_ms.c diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c new file mode 100644 index 0000000000..73fce4ff8f --- /dev/null +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -0,0 +1,40 @@ +#include "z_en_ms.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnMs*)thisx) + +void EnMs_Init(Actor* thisx, GlobalContext* globalCtx); +void EnMs_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnMs_Update(Actor* thisx, GlobalContext* globalCtx); +void EnMs_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ms_InitVars = { + ACTOR_EN_MS, + ACTORTYPE_NPC, + FLAGS, + OBJECT_MS, + sizeof(EnMs), + (ActorFunc)EnMs_Init, + (ActorFunc)EnMs_Destroy, + (ActorFunc)EnMs_Update, + (ActorFunc)EnMs_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ms_0x80952620/EnMs_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ms_0x80952620/EnMs_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ms_0x80952620/func_80952734.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ms_0x80952620/func_809527F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ms_0x80952620/func_809529AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ms_0x80952620/func_80952A1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ms_0x80952620/EnMs_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ms_0x80952620/EnMs_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.h b/src/overlays/actors/ovl_En_Ms/z_en_ms.h new file mode 100644 index 0000000000..71385fdcc7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_MS_H +#define Z_EN_MS_H + +#include + +struct EnMs; + +typedef struct EnMs { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x100]; +} EnMs; // size = 0x244 + +extern const ActorInit En_Ms_InitVars; + +#endif // Z_EN_MS_H diff --git a/src/overlays/actors/ovl_En_Mt_tag/overlay.cfg b/src/overlays/actors/ovl_En_Mt_tag/overlay.cfg new file mode 100644 index 0000000000..dcf4dadff8 --- /dev/null +++ b/src/overlays/actors/ovl_En_Mt_tag/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Mt_tag +z_en_mt_tag.c diff --git a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c new file mode 100644 index 0000000000..94ccd03691 --- /dev/null +++ b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c @@ -0,0 +1,61 @@ +#include "z_en_mt_tag.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnMttag*)thisx) + +void EnMttag_Init(Actor* thisx, GlobalContext* globalCtx); +void EnMttag_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnMttag_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Mt_tag_InitVars = { + ACTOR_EN_MT_TAG, + ACTORTYPE_BG, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnMttag), + (ActorFunc)EnMttag_Init, + (ActorFunc)EnMttag_Destroy, + (ActorFunc)EnMttag_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CF350.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CF394.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CF444.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CF4EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CF67C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CF848.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CF8EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CF950.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CF9A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CFA00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CFA54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CFBC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CFC38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CFD98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CFE28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/func_809CFF94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/EnMttag_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/EnMttag_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mt_tag_0x809CF350/EnMttag_Update.asm") diff --git a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.h b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.h new file mode 100644 index 0000000000..3e527cb4b2 --- /dev/null +++ b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_MT_TAG_H +#define Z_EN_MT_TAG_H + +#include + +struct EnMttag; + +typedef struct EnMttag { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x24]; +} EnMttag; // size = 0x168 + +extern const ActorInit En_Mt_tag_InitVars; + +#endif // Z_EN_MT_TAG_H diff --git a/src/overlays/actors/ovl_En_Mushi2/overlay.cfg b/src/overlays/actors/ovl_En_Mushi2/overlay.cfg new file mode 100644 index 0000000000..d8a7c2e85f --- /dev/null +++ b/src/overlays/actors/ovl_En_Mushi2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Mushi2 +z_en_mushi2.c diff --git a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c new file mode 100644 index 0000000000..c33ef5c7a3 --- /dev/null +++ b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c @@ -0,0 +1,128 @@ +#include "z_en_mushi2.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnMushi2*)thisx) + +void EnMushi2_Init(Actor* thisx, GlobalContext* globalCtx); +void EnMushi2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnMushi2_Update(Actor* thisx, GlobalContext* globalCtx); +void EnMushi2_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Mushi2_InitVars = { + ACTOR_EN_MUSHI2, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnMushi2), + (ActorFunc)EnMushi2_Init, + (ActorFunc)EnMushi2_Destroy, + (ActorFunc)EnMushi2_Update, + (ActorFunc)EnMushi2_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A687A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68808.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68860.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68910.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68A78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68B3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68B6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68BA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68BC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68C5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68CE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68DD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68ED8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68F24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A68F9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A690C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A691EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A69388.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A69424.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A69468.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6958C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6969C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A697C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A699E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A69AA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A69ADC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A69CE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A69D3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A69EE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A69F5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6A024.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6A058.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6A094.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6A0D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/EnMushi2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/EnMushi2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6A300.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6A36C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6A508.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6A5C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6A794.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6A824.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6A984.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6A9E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6AAA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6AB08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6AE14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6AE7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6B078.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/func_80A6B0D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/EnMushi2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Mushi2_0x80A687A0/EnMushi2_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.h b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.h new file mode 100644 index 0000000000..c002c0d588 --- /dev/null +++ b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_MUSHI2_H +#define Z_EN_MUSHI2_H + +#include + +struct EnMushi2; + +typedef struct EnMushi2 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x230]; +} EnMushi2; // size = 0x374 + +extern const ActorInit En_Mushi2_InitVars; + +#endif // Z_EN_MUSHI2_H diff --git a/src/overlays/actors/ovl_En_Muto/overlay.cfg b/src/overlays/actors/ovl_En_Muto/overlay.cfg new file mode 100644 index 0000000000..3fd3e42b55 --- /dev/null +++ b/src/overlays/actors/ovl_En_Muto/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Muto +z_en_muto.c diff --git a/src/overlays/actors/ovl_En_Muto/z_en_muto.c b/src/overlays/actors/ovl_En_Muto/z_en_muto.c new file mode 100644 index 0000000000..0bfc652b08 --- /dev/null +++ b/src/overlays/actors/ovl_En_Muto/z_en_muto.c @@ -0,0 +1,46 @@ +#include "z_en_muto.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnMuto*)thisx) + +void EnMuto_Init(Actor* thisx, GlobalContext* globalCtx); +void EnMuto_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnMuto_Update(Actor* thisx, GlobalContext* globalCtx); +void EnMuto_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Muto_InitVars = { + ACTOR_EN_MUTO, + ACTORTYPE_NPC, + FLAGS, + OBJECT_TORYO, + sizeof(EnMuto), + (ActorFunc)EnMuto_Init, + (ActorFunc)EnMuto_Destroy, + (ActorFunc)EnMuto_Update, + (ActorFunc)EnMuto_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Muto_0x80BE7B00/EnMuto_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Muto_0x80BE7B00/EnMuto_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Muto_0x80BE7B00/func_80BE7C94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Muto_0x80BE7B00/func_80BE7D20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Muto_0x80BE7B00/func_80BE7DB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Muto_0x80BE7B00/func_80BE7DEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Muto_0x80BE7B00/func_80BE7F88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Muto_0x80BE7B00/func_80BE7FEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Muto_0x80BE7B00/EnMuto_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Muto_0x80BE7B00/func_80BE8328.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Muto_0x80BE7B00/EnMuto_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Muto/z_en_muto.h b/src/overlays/actors/ovl_En_Muto/z_en_muto.h new file mode 100644 index 0000000000..8833d17f4d --- /dev/null +++ b/src/overlays/actors/ovl_En_Muto/z_en_muto.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_MUTO_H +#define Z_EN_MUTO_H + +#include + +struct EnMuto; + +typedef struct EnMuto { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x19C]; +} EnMuto; // size = 0x2E0 + +extern const ActorInit En_Muto_InitVars; + +#endif // Z_EN_MUTO_H diff --git a/src/overlays/actors/ovl_En_Nb/overlay.cfg b/src/overlays/actors/ovl_En_Nb/overlay.cfg new file mode 100644 index 0000000000..27d485b84d --- /dev/null +++ b/src/overlays/actors/ovl_En_Nb/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Nb +z_en_nb.c diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c new file mode 100644 index 0000000000..7e527ada6d --- /dev/null +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -0,0 +1,86 @@ +#include "z_en_nb.h" + +#define FLAGS 0x00000039 + +#define THIS ((EnNb*)thisx) + +void EnNb_Init(Actor* thisx, GlobalContext* globalCtx); +void EnNb_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnNb_Update(Actor* thisx, GlobalContext* globalCtx); +void EnNb_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Nb_InitVars = { + ACTOR_EN_NB, + ACTORTYPE_NPC, + FLAGS, + OBJECT_NB, + sizeof(EnNb), + (ActorFunc)EnNb_Init, + (ActorFunc)EnNb_Destroy, + (ActorFunc)EnNb_Update, + (ActorFunc)EnNb_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BBFDB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BBFE60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BBFE8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BBFF24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BBFF90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BBFFD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC0050.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC00AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC01DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC045C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC04FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC05A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC06C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC0800.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC08E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC0978.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC0A18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC0B98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC0C0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC0C80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC0D08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC0D1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC0D84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC0EAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/EnNb_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/EnNb_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/EnNb_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC1174.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC11B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/func_80BC1278.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nb_0x80BBFDB0/EnNb_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.h b/src/overlays/actors/ovl_En_Nb/z_en_nb.h new file mode 100644 index 0000000000..295144fb53 --- /dev/null +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_NB_H +#define Z_EN_NB_H + +#include + +struct EnNb; + +typedef struct EnNb { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x158]; +} EnNb; // size = 0x29C + +extern const ActorInit En_Nb_InitVars; + +#endif // Z_EN_NB_H diff --git a/src/overlays/actors/ovl_En_Neo_Reeba/overlay.cfg b/src/overlays/actors/ovl_En_Neo_Reeba/overlay.cfg new file mode 100644 index 0000000000..b5d488d53f --- /dev/null +++ b/src/overlays/actors/ovl_En_Neo_Reeba/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Neo_Reeba +z_en_neo_reeba.c diff --git a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c new file mode 100644 index 0000000000..ccb3ed0821 --- /dev/null +++ b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c @@ -0,0 +1,90 @@ +#include "z_en_neo_reeba.h" + +#define FLAGS 0x00000205 + +#define THIS ((EnNeoReeba*)thisx) + +void EnNeoReeba_Init(Actor* thisx, GlobalContext* globalCtx); +void EnNeoReeba_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnNeoReeba_Update(Actor* thisx, GlobalContext* globalCtx); +void EnNeoReeba_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Neo_Reeba_InitVars = { + ACTOR_EN_NEO_REEBA, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_RB, + sizeof(EnNeoReeba), + (ActorFunc)EnNeoReeba_Init, + (ActorFunc)EnNeoReeba_Destroy, + (ActorFunc)EnNeoReeba_Update, + (ActorFunc)EnNeoReeba_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/EnNeoReeba_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/EnNeoReeba_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CA34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CA70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CB3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CB88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CCE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CD28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CE34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CE94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CFA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7CFFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D130.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D150.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D254.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D2E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D360.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D398.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D3EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D47C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D4FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D5A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D6D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D788.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7D9B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7DC80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7DD7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7DF34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7E0BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7E260.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/EnNeoReeba_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/func_80B7E378.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Neo_Reeba_0x80B7C890/EnNeoReeba_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.h b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.h new file mode 100644 index 0000000000..a7ad8e9329 --- /dev/null +++ b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_NEO_REEBA_H +#define Z_EN_NEO_REEBA_H + +#include + +struct EnNeoReeba; + +typedef struct EnNeoReeba { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1D0]; +} EnNeoReeba; // size = 0x314 + +extern const ActorInit En_Neo_Reeba_InitVars; + +#endif // Z_EN_NEO_REEBA_H diff --git a/src/overlays/actors/ovl_En_Nimotsu/overlay.cfg b/src/overlays/actors/ovl_En_Nimotsu/overlay.cfg new file mode 100644 index 0000000000..8558fc330c --- /dev/null +++ b/src/overlays/actors/ovl_En_Nimotsu/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Nimotsu +z_en_nimotsu.c diff --git a/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c b/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c new file mode 100644 index 0000000000..16f25bd63a --- /dev/null +++ b/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c @@ -0,0 +1,34 @@ +#include "z_en_nimotsu.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnNimotsu*)thisx) + +void EnNimotsu_Init(Actor* thisx, GlobalContext* globalCtx); +void EnNimotsu_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnNimotsu_Update(Actor* thisx, GlobalContext* globalCtx); +void EnNimotsu_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Nimotsu_InitVars = { + ACTOR_EN_NIMOTSU, + ACTORTYPE_PROP, + FLAGS, + OBJECT_BOJ, + sizeof(EnNimotsu), + (ActorFunc)EnNimotsu_Init, + (ActorFunc)EnNimotsu_Destroy, + (ActorFunc)EnNimotsu_Update, + (ActorFunc)EnNimotsu_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nimotsu_0x80BE1C80/func_80BE1C80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nimotsu_0x80BE1C80/EnNimotsu_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nimotsu_0x80BE1C80/EnNimotsu_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nimotsu_0x80BE1C80/EnNimotsu_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nimotsu_0x80BE1C80/EnNimotsu_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.h b/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.h new file mode 100644 index 0000000000..42a8cb490d --- /dev/null +++ b/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_NIMOTSU_H +#define Z_EN_NIMOTSU_H + +#include + +struct EnNimotsu; + +typedef struct EnNimotsu { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x98]; +} EnNimotsu; // size = 0x1DC + +extern const ActorInit En_Nimotsu_InitVars; + +#endif // Z_EN_NIMOTSU_H diff --git a/src/overlays/actors/ovl_En_Niw/overlay.cfg b/src/overlays/actors/ovl_En_Niw/overlay.cfg new file mode 100644 index 0000000000..26dacb3bbe --- /dev/null +++ b/src/overlays/actors/ovl_En_Niw/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Niw +z_en_niw.c diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/src/overlays/actors/ovl_En_Niw/z_en_niw.c new file mode 100644 index 0000000000..4e1d6a0472 --- /dev/null +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -0,0 +1,72 @@ +#include "z_en_niw.h" + +#define FLAGS 0x00800010 + +#define THIS ((EnNiw*)thisx) + +void EnNiw_Init(Actor* thisx, GlobalContext* globalCtx); +void EnNiw_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnNiw_Update(Actor* thisx, GlobalContext* globalCtx); +void EnNiw_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Niw_InitVars = { + ACTOR_EN_NIW, + ACTORTYPE_PROP, + FLAGS, + OBJECT_NIW, + sizeof(EnNiw), + (ActorFunc)EnNiw_Init, + (ActorFunc)EnNiw_Destroy, + (ActorFunc)EnNiw_Update, + (ActorFunc)EnNiw_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/EnNiw_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/EnNiw_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_80891320.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_808916B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_808917F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_80891974.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_808919E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_80891D78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_80891F60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_808920A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_80892248.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_80892274.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_808922D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_80892390.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_80892414.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_808924B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_808925F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_8089262C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/EnNiw_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_80892E70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/EnNiw_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_80893008.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_808930FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Niw_0x80891060/func_808932B0.asm") diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.h b/src/overlays/actors/ovl_En_Niw/z_en_niw.h new file mode 100644 index 0000000000..8ff8546d38 --- /dev/null +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_NIW_H +#define Z_EN_NIW_H + +#include + +struct EnNiw; + +typedef struct EnNiw { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x678]; +} EnNiw; // size = 0x7BC + +extern const ActorInit En_Niw_InitVars; + +#endif // Z_EN_NIW_H diff --git a/src/overlays/actors/ovl_En_Nnh/overlay.cfg b/src/overlays/actors/ovl_En_Nnh/overlay.cfg new file mode 100644 index 0000000000..01d2bec044 --- /dev/null +++ b/src/overlays/actors/ovl_En_Nnh/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Nnh +z_en_nnh.c diff --git a/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c new file mode 100644 index 0000000000..f27285ff6a --- /dev/null +++ b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c @@ -0,0 +1,40 @@ +#include "z_en_nnh.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnNnh*)thisx) + +void EnNnh_Init(Actor* thisx, GlobalContext* globalCtx); +void EnNnh_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnNnh_Update(Actor* thisx, GlobalContext* globalCtx); +void EnNnh_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Nnh_InitVars = { + ACTOR_EN_NNH, + ACTORTYPE_PROP, + FLAGS, + OBJECT_NNH, + sizeof(EnNnh), + (ActorFunc)EnNnh_Init, + (ActorFunc)EnNnh_Destroy, + (ActorFunc)EnNnh_Update, + (ActorFunc)EnNnh_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nnh_0x80C08760/EnNnh_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nnh_0x80C08760/EnNnh_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nnh_0x80C08760/func_80C08828.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nnh_0x80C08760/func_80C0883C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nnh_0x80C08760/func_80C088A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nnh_0x80C08760/func_80C088B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nnh_0x80C08760/EnNnh_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nnh_0x80C08760/EnNnh_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Nnh/z_en_nnh.h b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.h new file mode 100644 index 0000000000..43149e9c91 --- /dev/null +++ b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_NNH_H +#define Z_EN_NNH_H + +#include + +struct EnNnh; + +typedef struct EnNnh { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x50]; +} EnNnh; // size = 0x194 + +extern const ActorInit En_Nnh_InitVars; + +#endif // Z_EN_NNH_H diff --git a/src/overlays/actors/ovl_En_Nutsball/overlay.cfg b/src/overlays/actors/ovl_En_Nutsball/overlay.cfg new file mode 100644 index 0000000000..cc188400cf --- /dev/null +++ b/src/overlays/actors/ovl_En_Nutsball/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Nutsball +z_en_nutsball.c diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c new file mode 100644 index 0000000000..18082ab9ce --- /dev/null +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -0,0 +1,34 @@ +#include "z_en_nutsball.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnNutsball*)thisx) + +void EnNutsball_Init(Actor* thisx, GlobalContext* globalCtx); +void EnNutsball_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnNutsball_Update(Actor* thisx, GlobalContext* globalCtx); +void EnNutsball_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Nutsball_InitVars = { + ACTOR_EN_NUTSBALL, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnNutsball), + (ActorFunc)EnNutsball_Init, + (ActorFunc)EnNutsball_Destroy, + (ActorFunc)EnNutsball_Update, + (ActorFunc)EnNutsball_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nutsball_0x80985C40/EnNutsball_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nutsball_0x80985C40/EnNutsball_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nutsball_0x80985C40/func_80985D3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nutsball_0x80985C40/EnNutsball_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nutsball_0x80985C40/EnNutsball_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h new file mode 100644 index 0000000000..296cdceb4e --- /dev/null +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_NUTSBALL_H +#define Z_EN_NUTSBALL_H + +#include + +struct EnNutsball; + +typedef struct EnNutsball { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x50]; +} EnNutsball; // size = 0x194 + +extern const ActorInit En_Nutsball_InitVars; + +#endif // Z_EN_NUTSBALL_H diff --git a/src/overlays/actors/ovl_En_Nwc/overlay.cfg b/src/overlays/actors/ovl_En_Nwc/overlay.cfg new file mode 100644 index 0000000000..d479e7da40 --- /dev/null +++ b/src/overlays/actors/ovl_En_Nwc/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Nwc +z_en_nwc.c diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c new file mode 100644 index 0000000000..42c20af85e --- /dev/null +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c @@ -0,0 +1,64 @@ +#include "z_en_nwc.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnNwc*)thisx) + +void EnNwc_Init(Actor* thisx, GlobalContext* globalCtx); +void EnNwc_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnNwc_Update(Actor* thisx, GlobalContext* globalCtx); +void EnNwc_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Nwc_InitVars = { + ACTOR_EN_NWC, + ACTORTYPE_PROP, + FLAGS, + OBJECT_NWC, + sizeof(EnNwc), + (ActorFunc)EnNwc_Init, + (ActorFunc)EnNwc_Destroy, + (ActorFunc)EnNwc_Update, + (ActorFunc)EnNwc_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/EnNwc_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/EnNwc_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_80944320.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_80944554.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_80944590.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_809445D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_80944630.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_809447A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_80944818.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_809448A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_809449D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_80944A50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_80944E44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_80944EFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_80944FA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_8094506C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/EnNwc_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/EnNwc_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_8094529C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Nwc_0x809441E0/func_80945310.asm") diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h new file mode 100644 index 0000000000..3bedcfd56f --- /dev/null +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_NWC_H +#define Z_EN_NWC_H + +#include + +struct EnNwc; + +typedef struct EnNwc { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x124]; +} EnNwc; // size = 0x268 + +extern const ActorInit En_Nwc_InitVars; + +#endif // Z_EN_NWC_H diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/overlay.cfg b/src/overlays/actors/ovl_En_Okarina_Effect/overlay.cfg new file mode 100644 index 0000000000..02325ddea1 --- /dev/null +++ b/src/overlays/actors/ovl_En_Okarina_Effect/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Okarina_Effect +z_en_okarina_effect.c diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c new file mode 100644 index 0000000000..42640c97be --- /dev/null +++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c @@ -0,0 +1,37 @@ +#include "z_en_okarina_effect.h" + +#define FLAGS 0x02000010 + +#define THIS ((EnOkarinaEffect*)thisx) + +void EnOkarinaEffect_Init(Actor* thisx, GlobalContext* globalCtx); +void EnOkarinaEffect_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnOkarinaEffect_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Okarina_Effect_InitVars = { + ACTOR_EN_OKARINA_EFFECT, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnOkarinaEffect), + (ActorFunc)EnOkarinaEffect_Init, + (ActorFunc)EnOkarinaEffect_Destroy, + (ActorFunc)EnOkarinaEffect_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okarina_Effect_0x8096B0A0/func_8096B0A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okarina_Effect_0x8096B0A0/EnOkarinaEffect_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okarina_Effect_0x8096B0A0/EnOkarinaEffect_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okarina_Effect_0x8096B0A0/func_8096B104.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okarina_Effect_0x8096B0A0/func_8096B174.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okarina_Effect_0x8096B0A0/func_8096B1FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okarina_Effect_0x8096B0A0/EnOkarinaEffect_Update.asm") diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h new file mode 100644 index 0000000000..ccf36394b6 --- /dev/null +++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_OKARINA_EFFECT_H +#define Z_EN_OKARINA_EFFECT_H + +#include + +struct EnOkarinaEffect; + +typedef struct EnOkarinaEffect { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x8]; +} EnOkarinaEffect; // size = 0x14C + +extern const ActorInit En_Okarina_Effect_InitVars; + +#endif // Z_EN_OKARINA_EFFECT_H diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/overlay.cfg b/src/overlays/actors/ovl_En_Okarina_Tag/overlay.cfg new file mode 100644 index 0000000000..908da18884 --- /dev/null +++ b/src/overlays/actors/ovl_En_Okarina_Tag/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Okarina_Tag +z_en_okarina_tag.c diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c new file mode 100644 index 0000000000..5fec0a1ac0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c @@ -0,0 +1,33 @@ +#include "z_en_okarina_tag.h" + +#define FLAGS 0x0A000010 + +#define THIS ((EnOkarinaTag*)thisx) + +void EnOkarinaTag_Init(Actor* thisx, GlobalContext* globalCtx); +void EnOkarinaTag_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnOkarinaTag_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Okarina_Tag_InitVars = { + ACTOR_EN_OKARINA_TAG, + ACTORTYPE_SWITCH, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnOkarinaTag), + (ActorFunc)EnOkarinaTag_Init, + (ActorFunc)EnOkarinaTag_Destroy, + (ActorFunc)EnOkarinaTag_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okarina_Tag_0x8093E420/EnOkarinaTag_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okarina_Tag_0x8093E420/EnOkarinaTag_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okarina_Tag_0x8093E420/func_8093E518.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okarina_Tag_0x8093E420/func_8093E68C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okarina_Tag_0x8093E420/EnOkarinaTag_Update.asm") diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h new file mode 100644 index 0000000000..c7f4642c4f --- /dev/null +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_OKARINA_TAG_H +#define Z_EN_OKARINA_TAG_H + +#include + +struct EnOkarinaTag; + +typedef struct EnOkarinaTag { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x18]; +} EnOkarinaTag; // size = 0x15C + +extern const ActorInit En_Okarina_Tag_InitVars; + +#endif // Z_EN_OKARINA_TAG_H diff --git a/src/overlays/actors/ovl_En_Okuta/overlay.cfg b/src/overlays/actors/ovl_En_Okuta/overlay.cfg new file mode 100644 index 0000000000..8863e71691 --- /dev/null +++ b/src/overlays/actors/ovl_En_Okuta/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Okuta +z_en_okuta.c diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c new file mode 100644 index 0000000000..6dfc1746b1 --- /dev/null +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -0,0 +1,100 @@ +#include "z_en_okuta.h" + +#define FLAGS 0x00000005 + +#define THIS ((EnOkuta*)thisx) + +void EnOkuta_Init(Actor* thisx, GlobalContext* globalCtx); +void EnOkuta_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnOkuta_Update(Actor* thisx, GlobalContext* globalCtx); +void EnOkuta_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Okuta_InitVars = { + ACTOR_EN_OKUTA, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_OKUTA, + sizeof(EnOkuta), + (ActorFunc)EnOkuta_Init, + (ActorFunc)EnOkuta_Destroy, + (ActorFunc)EnOkuta_Update, + (ActorFunc)EnOkuta_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/EnOkuta_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/EnOkuta_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E084.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E0F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E168.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E214.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E27C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E2C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E378.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E3B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E4FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E52C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E5E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E658.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E7A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E7E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E8E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086E948.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086EAE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086EC00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086EE8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086EF14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086EF90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086EFE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086F2FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086F434.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086F4B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086F4F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086F57C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086F694.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086F8FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_8086FCA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/EnOkuta_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_808700C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_80870254.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_808704DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/func_808705C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Okuta_0x8086DE20/EnOkuta_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h new file mode 100644 index 0000000000..31ae2b3a59 --- /dev/null +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_OKUTA_H +#define Z_EN_OKUTA_H + +#include + +struct EnOkuta; + +typedef struct EnOkuta { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1F0]; +} EnOkuta; // size = 0x334 + +extern const ActorInit En_Okuta_InitVars; + +#endif // Z_EN_OKUTA_H diff --git a/src/overlays/actors/ovl_En_Onpuman/overlay.cfg b/src/overlays/actors/ovl_En_Onpuman/overlay.cfg new file mode 100644 index 0000000000..50f24d4ace --- /dev/null +++ b/src/overlays/actors/ovl_En_Onpuman/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Onpuman +z_en_onpuman.c diff --git a/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c new file mode 100644 index 0000000000..07f2695580 --- /dev/null +++ b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c @@ -0,0 +1,39 @@ +#include "z_en_onpuman.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnOnpuman*)thisx) + +void EnOnpuman_Init(Actor* thisx, GlobalContext* globalCtx); +void EnOnpuman_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnOnpuman_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Onpuman_InitVars = { + ACTOR_EN_ONPUMAN, + ACTORTYPE_NPC, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnOnpuman), + (ActorFunc)EnOnpuman_Init, + (ActorFunc)EnOnpuman_Destroy, + (ActorFunc)EnOnpuman_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Onpuman_0x80B11E60/EnOnpuman_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Onpuman_0x80B11E60/EnOnpuman_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Onpuman_0x80B11E60/func_80B11F44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Onpuman_0x80B11E60/func_80B11F78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Onpuman_0x80B11E60/func_80B1202C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Onpuman_0x80B11E60/func_80B1217C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Onpuman_0x80B11E60/func_80B121D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Onpuman_0x80B11E60/EnOnpuman_Update.asm") diff --git a/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.h b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.h new file mode 100644 index 0000000000..76d59fd6b9 --- /dev/null +++ b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ONPUMAN_H +#define Z_EN_ONPUMAN_H + +#include + +struct EnOnpuman; + +typedef struct EnOnpuman { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x168]; +} EnOnpuman; // size = 0x2AC + +extern const ActorInit En_Onpuman_InitVars; + +#endif // Z_EN_ONPUMAN_H diff --git a/src/overlays/actors/ovl_En_Osk/overlay.cfg b/src/overlays/actors/ovl_En_Osk/overlay.cfg new file mode 100644 index 0000000000..3d963dc09c --- /dev/null +++ b/src/overlays/actors/ovl_En_Osk/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Osk +z_en_osk.c diff --git a/src/overlays/actors/ovl_En_Osk/z_en_osk.c b/src/overlays/actors/ovl_En_Osk/z_en_osk.c new file mode 100644 index 0000000000..b5e5d51515 --- /dev/null +++ b/src/overlays/actors/ovl_En_Osk/z_en_osk.c @@ -0,0 +1,60 @@ +#include "z_en_osk.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnOsk*)thisx) + +void EnOsk_Init(Actor* thisx, GlobalContext* globalCtx); +void EnOsk_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnOsk_Update(Actor* thisx, GlobalContext* globalCtx); +void EnOsk_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Osk_InitVars = { + ACTOR_EN_OSK, + ACTORTYPE_NPC, + FLAGS, + OBJECT_IKN_DEMO, + sizeof(EnOsk), + (ActorFunc)EnOsk_Init, + (ActorFunc)EnOsk_Destroy, + (ActorFunc)EnOsk_Update, + (ActorFunc)EnOsk_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/EnOsk_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/EnOsk_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF5E00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF5E68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF5EBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF5F60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF5F70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF609C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF61EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF6314.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF6478.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF656C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF67A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF68E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF6A20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/EnOsk_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/func_80BF6C54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osk_0x80BF5C20/EnOsk_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Osk/z_en_osk.h b/src/overlays/actors/ovl_En_Osk/z_en_osk.h new file mode 100644 index 0000000000..ca7c8f7399 --- /dev/null +++ b/src/overlays/actors/ovl_En_Osk/z_en_osk.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_OSK_H +#define Z_EN_OSK_H + +#include + +struct EnOsk; + +typedef struct EnOsk { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x120]; +} EnOsk; // size = 0x264 + +extern const ActorInit En_Osk_InitVars; + +#endif // Z_EN_OSK_H diff --git a/src/overlays/actors/ovl_En_Osn/overlay.cfg b/src/overlays/actors/ovl_En_Osn/overlay.cfg new file mode 100644 index 0000000000..59f9f2343a --- /dev/null +++ b/src/overlays/actors/ovl_En_Osn/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Osn +z_en_osn.c diff --git a/src/overlays/actors/ovl_En_Osn/z_en_osn.c b/src/overlays/actors/ovl_En_Osn/z_en_osn.c new file mode 100644 index 0000000000..5e66769647 --- /dev/null +++ b/src/overlays/actors/ovl_En_Osn/z_en_osn.c @@ -0,0 +1,66 @@ +#include "z_en_osn.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnOsn*)thisx) + +void EnOsn_Init(Actor* thisx, GlobalContext* globalCtx); +void EnOsn_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnOsn_Update(Actor* thisx, GlobalContext* globalCtx); +void EnOsn_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Osn_InitVars = { + ACTOR_EN_OSN, + ACTORTYPE_NPC, + FLAGS, + OBJECT_OSN, + sizeof(EnOsn), + (ActorFunc)EnOsn_Init, + (ActorFunc)EnOsn_Destroy, + (ActorFunc)EnOsn_Update, + (ActorFunc)EnOsn_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD0830.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD08B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD0998.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD0A24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD0AB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD0B38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD0E10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD10FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD1398.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD144C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD14C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD1634.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD16A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD19A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD1A4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/EnOsn_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/EnOsn_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/EnOsn_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD1DA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/func_80AD1E28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Osn_0x80AD0830/EnOsn_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Osn/z_en_osn.h b/src/overlays/actors/ovl_En_Osn/z_en_osn.h new file mode 100644 index 0000000000..6952509d93 --- /dev/null +++ b/src/overlays/actors/ovl_En_Osn/z_en_osn.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_OSN_H +#define Z_EN_OSN_H + +#include + +struct EnOsn; + +typedef struct EnOsn { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xBC]; +} EnOsn; // size = 0x200 + +extern const ActorInit En_Osn_InitVars; + +#endif // Z_EN_OSN_H diff --git a/src/overlays/actors/ovl_En_Ossan/overlay.cfg b/src/overlays/actors/ovl_En_Ossan/overlay.cfg new file mode 100644 index 0000000000..be58d6c1ec --- /dev/null +++ b/src/overlays/actors/ovl_En_Ossan/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ossan +z_en_ossan.c diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c new file mode 100644 index 0000000000..41565c1f70 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -0,0 +1,159 @@ +#include "z_en_ossan.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnOssan*)thisx) + +void EnOssan_Init(Actor* thisx, GlobalContext* globalCtx); +void EnOssan_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnOssan_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ossan_InitVars = { + ACTOR_EN_OSSAN, + ACTORTYPE_NPC, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnOssan), + (ActorFunc)EnOssan_Init, + (ActorFunc)EnOssan_Destroy, + (ActorFunc)EnOssan_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A80A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A80AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A812C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A8218.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A82F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/EnOssan_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/EnOssan_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A849C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A8500.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A85FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A8644.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A86A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A8708.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A875C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A8798.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A890C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A8B74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A8CC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A8DF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A8E84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A8EEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A90A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A91B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A935C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A9400.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A94FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A95F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A980C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A98E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A9AB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A9C8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A9D64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A9E20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A9E5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808A9E98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AA0C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AA1B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AA224.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AA2C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AA33C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AA404.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AA5E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AA6D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AA79C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AA7C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AA85C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AA8E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AAA64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AAB30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AACE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AAD14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AADB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AAE1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AAE84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AAFB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AB0B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AB16C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AB404.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/EnOssan_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AB52C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AB78C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808AB928.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808ABCD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808ABD10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808ABD60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808ABE18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808ABE58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ossan_0x808A80A0/func_808ABF30.asm") diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h new file mode 100644 index 0000000000..12c844674f --- /dev/null +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_OSSAN_H +#define Z_EN_OSSAN_H + +#include + +struct EnOssan; + +typedef struct EnOssan { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2C8]; +} EnOssan; // size = 0x40C + +extern const ActorInit En_Ossan_InitVars; + +#endif // Z_EN_OSSAN_H diff --git a/src/overlays/actors/ovl_En_Ot/overlay.cfg b/src/overlays/actors/ovl_En_Ot/overlay.cfg new file mode 100644 index 0000000000..53a5992e9a --- /dev/null +++ b/src/overlays/actors/ovl_En_Ot/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ot +z_en_ot.c diff --git a/src/overlays/actors/ovl_En_Ot/z_en_ot.c b/src/overlays/actors/ovl_En_Ot/z_en_ot.c new file mode 100644 index 0000000000..7adec15688 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ot/z_en_ot.c @@ -0,0 +1,126 @@ +#include "z_en_ot.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnOt*)thisx) + +void EnOt_Init(Actor* thisx, GlobalContext* globalCtx); +void EnOt_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnOt_Update(Actor* thisx, GlobalContext* globalCtx); +void EnOt_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ot_InitVars = { + ACTOR_EN_OT, + ACTORTYPE_NPC, + FLAGS, + OBJECT_OT, + sizeof(EnOt), + (ActorFunc)EnOt_Init, + (ActorFunc)EnOt_Destroy, + (ActorFunc)EnOt_Update, + (ActorFunc)EnOt_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5B2E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/EnOt_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/EnOt_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5BAAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5BB38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5BDA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5BE04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5BE88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5BED4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5BF60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5BFB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C154.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C1CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C244.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C25C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C3B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C3D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C634.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C64C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C684.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C6DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C910.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C950.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C9A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C9C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5C9D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5CA30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5CAD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5CB0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5CBA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5CBEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5CC88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5CCA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5CCF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5CD40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5CE6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5CEC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5D114.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5D160.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5D37C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5D470.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5D648.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5D750.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/EnOt_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5DAEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5DB6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/EnOt_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5DECC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5DF58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5E078.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ot_0x80B5B2E0/func_80B5E1D8.asm") diff --git a/src/overlays/actors/ovl_En_Ot/z_en_ot.h b/src/overlays/actors/ovl_En_Ot/z_en_ot.h new file mode 100644 index 0000000000..e86379303a --- /dev/null +++ b/src/overlays/actors/ovl_En_Ot/z_en_ot.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_OT_H +#define Z_EN_OT_H + +#include + +struct EnOt; + +typedef struct EnOt { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x614]; +} EnOt; // size = 0x758 + +extern const ActorInit En_Ot_InitVars; + +#endif // Z_EN_OT_H diff --git a/src/overlays/actors/ovl_En_Owl/overlay.cfg b/src/overlays/actors/ovl_En_Owl/overlay.cfg new file mode 100644 index 0000000000..c3609f9923 --- /dev/null +++ b/src/overlays/actors/ovl_En_Owl/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Owl +z_en_owl.c diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c new file mode 100644 index 0000000000..d8f2b2896c --- /dev/null +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -0,0 +1,132 @@ +#include "z_en_owl.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnOwl*)thisx) + +void EnOwl_Init(Actor* thisx, GlobalContext* globalCtx); +void EnOwl_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnOwl_Update(Actor* thisx, GlobalContext* globalCtx); +void EnOwl_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Owl_InitVars = { + ACTOR_EN_OWL, + ACTORTYPE_NPC, + FLAGS, + OBJECT_OWL, + sizeof(EnOwl), + (ActorFunc)EnOwl_Init, + (ActorFunc)EnOwl_Destroy, + (ActorFunc)EnOwl_Update, + (ActorFunc)EnOwl_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095A510.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/EnOwl_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/EnOwl_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095A920.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095A978.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095A9FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095AA70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095AAD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095AB1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095AB4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095ABA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095ABF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095AC50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095ACEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095AD54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095AE00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095AE60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095AEC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095AF2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095AFEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B06C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B0C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B158.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B1E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B254.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B2F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B3DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B480.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B574.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B650.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B6C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B76C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B960.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095B9FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095BA84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095BE0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095BF20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095BF58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095BF78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095C09C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095C1C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095C258.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095C328.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095C408.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095C484.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095C510.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095C568.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/EnOwl_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095CCF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095CE18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095CF44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/EnOwl_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095D074.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Owl_0x8095A510/func_8095D24C.asm") diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.h b/src/overlays/actors/ovl_En_Owl/z_en_owl.h new file mode 100644 index 0000000000..82d6542e6e --- /dev/null +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_OWL_H +#define Z_EN_OWL_H + +#include + +struct EnOwl; + +typedef struct EnOwl { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2D4]; +} EnOwl; // size = 0x418 + +extern const ActorInit En_Owl_InitVars; + +#endif // Z_EN_OWL_H diff --git a/src/overlays/actors/ovl_En_Pamera/overlay.cfg b/src/overlays/actors/ovl_En_Pamera/overlay.cfg new file mode 100644 index 0000000000..544499e92c --- /dev/null +++ b/src/overlays/actors/ovl_En_Pamera/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Pamera +z_en_pamera.c diff --git a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c new file mode 100644 index 0000000000..c77924de68 --- /dev/null +++ b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c @@ -0,0 +1,140 @@ +#include "z_en_pamera.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnPamera*)thisx) + +void EnPamera_Init(Actor* thisx, GlobalContext* globalCtx); +void EnPamera_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnPamera_Update(Actor* thisx, GlobalContext* globalCtx); +void EnPamera_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Pamera_InitVars = { + ACTOR_EN_PAMERA, + ACTORTYPE_NPC, + FLAGS, + OBJECT_PAMERA, + sizeof(EnPamera), + (ActorFunc)EnPamera_Init, + (ActorFunc)EnPamera_Destroy, + (ActorFunc)EnPamera_Update, + (ActorFunc)EnPamera_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/EnPamera_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD84F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8588.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8658.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/EnPamera_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8700.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8758.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8908.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8964.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8A38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8A7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8B50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8B70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8CCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8D1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8D80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8DB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8F0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8F60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD8FF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD909C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD90AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9234.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD92D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9338.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9384.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD93CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD93F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD94E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/EnPamera_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9648.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9690.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/EnPamera_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9840.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9904.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9928.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9938.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD994C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9A9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9AB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9B4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9C70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9CB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9E60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9E78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9E88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9ED0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9EE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BD9F3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BDA038.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BDA090.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BDA0A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BDA0FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BDA170.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BDA1C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BDA288.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BDA2E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pamera_0x80BD82B0/func_80BDA344.asm") diff --git a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.h b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.h new file mode 100644 index 0000000000..05484ed327 --- /dev/null +++ b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_PAMERA_H +#define Z_EN_PAMERA_H + +#include + +struct EnPamera; + +typedef struct EnPamera { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1E4]; +} EnPamera; // size = 0x328 + +extern const ActorInit En_Pamera_InitVars; + +#endif // Z_EN_PAMERA_H diff --git a/src/overlays/actors/ovl_En_Pametfrog/overlay.cfg b/src/overlays/actors/ovl_En_Pametfrog/overlay.cfg new file mode 100644 index 0000000000..de6a9fa77d --- /dev/null +++ b/src/overlays/actors/ovl_En_Pametfrog/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Pametfrog +z_en_pametfrog.c diff --git a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c new file mode 100644 index 0000000000..ee2aa278b2 --- /dev/null +++ b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c @@ -0,0 +1,164 @@ +#include "z_en_pametfrog.h" + +#define FLAGS 0x00000035 + +#define THIS ((EnPametfrog*)thisx) + +void EnPametfrog_Init(Actor* thisx, GlobalContext* globalCtx); +void EnPametfrog_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnPametfrog_Update(Actor* thisx, GlobalContext* globalCtx); +void EnPametfrog_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Pametfrog_InitVars = { + ACTOR_EN_PAMETFROG, + ACTORTYPE_BOSS, + FLAGS, + OBJECT_BIGSLIME, + sizeof(EnPametfrog), + (ActorFunc)EnPametfrog_Init, + (ActorFunc)EnPametfrog_Destroy, + (ActorFunc)EnPametfrog_Update, + (ActorFunc)EnPametfrog_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/EnPametfrog_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/EnPametfrog_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_80869FBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A024.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A068.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A0F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A1A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A238.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A2CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A428.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A4E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A554.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A6B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A724.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A80C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A878.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A8C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086A964.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086AA60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086AAA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086AB04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086AB68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086AC0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086AD34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086AE48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086AEC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086AFC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086B140.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086B478.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086B570.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086B66C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086B794.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086B864.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086B8CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086B9D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086BA6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086BB4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086BB9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086BBE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086BDA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086BE60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086BEEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086BF90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C088.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C0CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C1AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C274.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C4B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C5A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C618.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C6D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C72C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C7C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C81C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C94C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086C99C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086CB4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086CC04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086CC84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086CD04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086CD6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086CEB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086CEF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086D084.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086D140.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086D1E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086D230.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/EnPametfrog_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/func_8086D730.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pametfrog_0x80869D90/EnPametfrog_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h new file mode 100644 index 0000000000..8fe0d5a6f6 --- /dev/null +++ b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_PAMETFROG_H +#define Z_EN_PAMETFROG_H + +#include + +struct EnPametfrog; + +typedef struct EnPametfrog { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2E0]; +} EnPametfrog; // size = 0x424 + +extern const ActorInit En_Pametfrog_InitVars; + +#endif // Z_EN_PAMETFROG_H diff --git a/src/overlays/actors/ovl_En_Paper/overlay.cfg b/src/overlays/actors/ovl_En_Paper/overlay.cfg new file mode 100644 index 0000000000..f2b122194d --- /dev/null +++ b/src/overlays/actors/ovl_En_Paper/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Paper +z_en_paper.c diff --git a/src/overlays/actors/ovl_En_Paper/z_en_paper.c b/src/overlays/actors/ovl_En_Paper/z_en_paper.c new file mode 100644 index 0000000000..f9f9ea0421 --- /dev/null +++ b/src/overlays/actors/ovl_En_Paper/z_en_paper.c @@ -0,0 +1,46 @@ +#include "z_en_paper.h" + +#define FLAGS 0x02100010 + +#define THIS ((EnPaper*)thisx) + +void EnPaper_Init(Actor* thisx, GlobalContext* globalCtx); +void EnPaper_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnPaper_Update(Actor* thisx, GlobalContext* globalCtx); +void EnPaper_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Paper_InitVars = { + ACTOR_EN_PAPER, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_BAL, + sizeof(EnPaper), + (ActorFunc)EnPaper_Init, + (ActorFunc)EnPaper_Destroy, + (ActorFunc)EnPaper_Update, + (ActorFunc)EnPaper_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Paper_0x80C1F3D0/EnPaper_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Paper_0x80C1F3D0/EnPaper_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Paper_0x80C1F3D0/func_80C1F46C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Paper_0x80C1F3D0/func_80C1F480.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Paper_0x80C1F3D0/func_80C1F4E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Paper_0x80C1F3D0/func_80C1F4FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Paper_0x80C1F3D0/func_80C1F55C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Paper_0x80C1F3D0/func_80C1F6E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Paper_0x80C1F3D0/func_80C1F87C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Paper_0x80C1F3D0/EnPaper_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Paper_0x80C1F3D0/EnPaper_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Paper/z_en_paper.h b/src/overlays/actors/ovl_En_Paper/z_en_paper.h new file mode 100644 index 0000000000..5ed8426d7f --- /dev/null +++ b/src/overlays/actors/ovl_En_Paper/z_en_paper.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_PAPER_H +#define Z_EN_PAPER_H + +#include + +struct EnPaper; + +typedef struct EnPaper { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xC44]; +} EnPaper; // size = 0xD88 + +extern const ActorInit En_Paper_InitVars; + +#endif // Z_EN_PAPER_H diff --git a/src/overlays/actors/ovl_En_Part/overlay.cfg b/src/overlays/actors/ovl_En_Part/overlay.cfg new file mode 100644 index 0000000000..883554d5bb --- /dev/null +++ b/src/overlays/actors/ovl_En_Part/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Part +z_en_part.c diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.c b/src/overlays/actors/ovl_En_Part/z_en_part.c new file mode 100644 index 0000000000..fcb797927c --- /dev/null +++ b/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -0,0 +1,36 @@ +#include "z_en_part.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnPart*)thisx) + +void EnPart_Init(Actor* thisx, GlobalContext* globalCtx); +void EnPart_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnPart_Update(Actor* thisx, GlobalContext* globalCtx); +void EnPart_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Part_InitVars = { + ACTOR_EN_PART, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnPart), + (ActorFunc)EnPart_Init, + (ActorFunc)EnPart_Destroy, + (ActorFunc)EnPart_Update, + (ActorFunc)EnPart_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Part_0x80865370/EnPart_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Part_0x80865370/EnPart_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Part_0x80865370/func_80865390.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Part_0x80865370/func_808654C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Part_0x80865370/EnPart_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Part_0x80865370/EnPart_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.h b/src/overlays/actors/ovl_En_Part/z_en_part.h new file mode 100644 index 0000000000..affe2ad5c8 --- /dev/null +++ b/src/overlays/actors/ovl_En_Part/z_en_part.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_PART_H +#define Z_EN_PART_H + +#include + +struct EnPart; + +typedef struct EnPart { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x10]; +} EnPart; // size = 0x154 + +extern const ActorInit En_Part_InitVars; + +#endif // Z_EN_PART_H diff --git a/src/overlays/actors/ovl_En_Peehat/overlay.cfg b/src/overlays/actors/ovl_En_Peehat/overlay.cfg new file mode 100644 index 0000000000..588e53bd7b --- /dev/null +++ b/src/overlays/actors/ovl_En_Peehat/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Peehat +z_en_peehat.c diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c new file mode 100644 index 0000000000..cfd918bc0c --- /dev/null +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -0,0 +1,90 @@ +#include "z_en_peehat.h" + +#define FLAGS 0x00000015 + +#define THIS ((EnPeehat*)thisx) + +void EnPeehat_Init(Actor* thisx, GlobalContext* globalCtx); +void EnPeehat_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnPeehat_Update(Actor* thisx, GlobalContext* globalCtx); +void EnPeehat_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Peehat_InitVars = { + ACTOR_EN_PEEHAT, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_PH, + sizeof(EnPeehat), + (ActorFunc)EnPeehat_Init, + (ActorFunc)EnPeehat_Destroy, + (ActorFunc)EnPeehat_Update, + (ActorFunc)EnPeehat_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/EnPeehat_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/EnPeehat_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897170.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_808971DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897258.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897390.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897498.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897520.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897648.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_808976DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897864.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897910.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897A34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897A94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897D00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897D48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897EAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80897F44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80898124.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80898144.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_808982E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80898338.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80898414.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80898454.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_808984E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80898594.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80898654.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_808986A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_8089874C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/EnPeehat_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80898E74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/func_80899024.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Peehat_0x80896F30/EnPeehat_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h new file mode 100644 index 0000000000..48c242abf7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_PEEHAT_H +#define Z_EN_PEEHAT_H + +#include + +struct EnPeehat; + +typedef struct EnPeehat { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x3FC]; +} EnPeehat; // size = 0x540 + +extern const ActorInit En_Peehat_InitVars; + +#endif // Z_EN_PEEHAT_H diff --git a/src/overlays/actors/ovl_En_Pm/overlay.cfg b/src/overlays/actors/ovl_En_Pm/overlay.cfg new file mode 100644 index 0000000000..43905ae8cf --- /dev/null +++ b/src/overlays/actors/ovl_En_Pm/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Pm +z_en_pm.c diff --git a/src/overlays/actors/ovl_En_Pm/z_en_pm.c b/src/overlays/actors/ovl_En_Pm/z_en_pm.c new file mode 100644 index 0000000000..9ca6ddcfa6 --- /dev/null +++ b/src/overlays/actors/ovl_En_Pm/z_en_pm.c @@ -0,0 +1,124 @@ +#include "z_en_pm.h" + +#define FLAGS 0x00000039 + +#define THIS ((EnPm*)thisx) + +void EnPm_Init(Actor* thisx, GlobalContext* globalCtx); +void EnPm_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnPm_Update(Actor* thisx, GlobalContext* globalCtx); +void EnPm_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Pm_InitVars = { + ACTOR_EN_PM, + ACTORTYPE_NPC, + FLAGS, + OBJECT_MM, + sizeof(EnPm), + (ActorFunc)EnPm_Init, + (ActorFunc)EnPm_Destroy, + (ActorFunc)EnPm_Update, + (ActorFunc)EnPm_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF7B40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF7BAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF7CB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF7D60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF7DC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF7E6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF7E98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF7F68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF8040.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF80F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF8170.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF81E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF8348.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF8478.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF8540.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF86F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF87C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF8890.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF898C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF8AC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF8BA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF8C68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF8D84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF8DD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF8ED4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF9008.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF91E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF94AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF95E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF98A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF992C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF9A0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF9AB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF9B54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF9BF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF9D04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AF9E7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AFA170.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AFA334.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AFA438.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AFA4D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AFA5FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AFA724.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/EnPm_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/EnPm_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/EnPm_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AFAA04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AFAA44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/func_80AFABAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pm_0x80AF7B40/EnPm_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Pm/z_en_pm.h b/src/overlays/actors/ovl_En_Pm/z_en_pm.h new file mode 100644 index 0000000000..25febec89c --- /dev/null +++ b/src/overlays/actors/ovl_En_Pm/z_en_pm.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_PM_H +#define Z_EN_PM_H + +#include + +struct EnPm; + +typedef struct EnPm { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x25C]; +} EnPm; // size = 0x3A0 + +extern const ActorInit En_Pm_InitVars; + +#endif // Z_EN_PM_H diff --git a/src/overlays/actors/ovl_En_Po_Composer/overlay.cfg b/src/overlays/actors/ovl_En_Po_Composer/overlay.cfg new file mode 100644 index 0000000000..25791e887e --- /dev/null +++ b/src/overlays/actors/ovl_En_Po_Composer/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Po_Composer +z_en_po_composer.c diff --git a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c new file mode 100644 index 0000000000..1bad5b4798 --- /dev/null +++ b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c @@ -0,0 +1,92 @@ +#include "z_en_po_composer.h" + +#define FLAGS 0x02100019 + +#define THIS ((EnPoComposer*)thisx) + +void EnPoComposer_Init(Actor* thisx, GlobalContext* globalCtx); +void EnPoComposer_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnPoComposer_Update(Actor* thisx, GlobalContext* globalCtx); +void EnPoComposer_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Po_Composer_InitVars = { + ACTOR_EN_PO_COMPOSER, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_PO_COMPOSER, + sizeof(EnPoComposer), + (ActorFunc)EnPoComposer_Init, + (ActorFunc)EnPoComposer_Destroy, + (ActorFunc)EnPoComposer_Update, + (ActorFunc)EnPoComposer_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/EnPoComposer_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/EnPoComposer_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5250.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5294.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC52D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC52F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC538C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC53A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC53B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5404.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC552C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5570.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5580.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC55E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC562C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5670.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5680.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC56D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5738.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5780.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC57E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5830.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5898.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC58E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC59BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC59EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5CC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5D34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5DEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC5FE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/EnPoComposer_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC60BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/func_80BC617C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Composer_0x80BC4F30/EnPoComposer_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h new file mode 100644 index 0000000000..d247c5cfc8 --- /dev/null +++ b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_PO_COMPOSER_H +#define Z_EN_PO_COMPOSER_H + +#include + +struct EnPoComposer; + +typedef struct EnPoComposer { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1FC]; +} EnPoComposer; // size = 0x340 + +extern const ActorInit En_Po_Composer_InitVars; + +#endif // Z_EN_PO_COMPOSER_H diff --git a/src/overlays/actors/ovl_En_Po_Fusen/overlay.cfg b/src/overlays/actors/ovl_En_Po_Fusen/overlay.cfg new file mode 100644 index 0000000000..71a747b65c --- /dev/null +++ b/src/overlays/actors/ovl_En_Po_Fusen/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Po_Fusen +z_en_po_fusen.c diff --git a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c new file mode 100644 index 0000000000..598fdcc40a --- /dev/null +++ b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c @@ -0,0 +1,54 @@ +#include "z_en_po_fusen.h" + +#define FLAGS 0x80100030 + +#define THIS ((EnPoFusen*)thisx) + +void EnPoFusen_Init(Actor* thisx, GlobalContext* globalCtx); +void EnPoFusen_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnPoFusen_Update(Actor* thisx, GlobalContext* globalCtx); +void EnPoFusen_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Po_Fusen_InitVars = { + ACTOR_EN_PO_FUSEN, + ACTORTYPE_PROP, + FLAGS, + OBJECT_PO_FUSEN, + sizeof(EnPoFusen), + (ActorFunc)EnPoFusen_Init, + (ActorFunc)EnPoFusen_Destroy, + (ActorFunc)EnPoFusen_Update, + (ActorFunc)EnPoFusen_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/EnPoFusen_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/EnPoFusen_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/func_80AC1450.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/func_80AC14A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/func_80AC1574.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/func_80AC158C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/func_80AC18EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/func_80AC192C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/func_80AC19B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/func_80AC19DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/EnPoFusen_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/func_80AC1A68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/func_80AC1CE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/func_80AC1D00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Fusen_0x80AC1270/EnPoFusen_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.h b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.h new file mode 100644 index 0000000000..5b610c32bb --- /dev/null +++ b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_PO_FUSEN_H +#define Z_EN_PO_FUSEN_H + +#include + +struct EnPoFusen; + +typedef struct EnPoFusen { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x130]; +} EnPoFusen; // size = 0x274 + +extern const ActorInit En_Po_Fusen_InitVars; + +#endif // Z_EN_PO_FUSEN_H diff --git a/src/overlays/actors/ovl_En_Po_Sisters/overlay.cfg b/src/overlays/actors/ovl_En_Po_Sisters/overlay.cfg new file mode 100644 index 0000000000..7c59c1704f --- /dev/null +++ b/src/overlays/actors/ovl_En_Po_Sisters/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Po_Sisters +z_en_po_sisters.c diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c new file mode 100644 index 0000000000..1782d7e553 --- /dev/null +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c @@ -0,0 +1,114 @@ +#include "z_en_po_sisters.h" + +#define FLAGS 0x00005015 + +#define THIS ((EnPoSisters*)thisx) + +void EnPoSisters_Init(Actor* thisx, GlobalContext* globalCtx); +void EnPoSisters_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnPoSisters_Update(Actor* thisx, GlobalContext* globalCtx); +void EnPoSisters_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Po_Sisters_InitVars = { + ACTOR_EN_PO_SISTERS, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_PO_SISTERS, + sizeof(EnPoSisters), + (ActorFunc)EnPoSisters_Init, + (ActorFunc)EnPoSisters_Destroy, + (ActorFunc)EnPoSisters_Update, + (ActorFunc)EnPoSisters_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/EnPoSisters_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/EnPoSisters_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1A648.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1A768.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1A894.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1A9B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1AA88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1AAE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1AB5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1ABB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1AC40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1ACB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1AE28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1AE3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1AF8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B020.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B0E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B168.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B280.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B2F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B3A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B444.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B5B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B628.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B70C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B7BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B860.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1B940.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1BA3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1BA90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1BC4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1BCA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1BCF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1BE4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1BF2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1C030.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1C0A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1C2E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1C340.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1C408.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/EnPoSisters_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1C974.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1CB44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/func_80B1CD34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Po_Sisters_0x80B1A3B0/EnPoSisters_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h new file mode 100644 index 0000000000..1ceae0f92f --- /dev/null +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_PO_SISTERS_H +#define Z_EN_PO_SISTERS_H + +#include + +struct EnPoSisters; + +typedef struct EnPoSisters { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x254]; +} EnPoSisters; // size = 0x398 + +extern const ActorInit En_Po_Sisters_InitVars; + +#endif // Z_EN_PO_SISTERS_H diff --git a/src/overlays/actors/ovl_En_Poh/overlay.cfg b/src/overlays/actors/ovl_En_Poh/overlay.cfg new file mode 100644 index 0000000000..d83d8bd2f7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Poh/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Poh +z_en_poh.c diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/src/overlays/actors/ovl_En_Poh/z_en_poh.c new file mode 100644 index 0000000000..9b72f42196 --- /dev/null +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -0,0 +1,118 @@ +#include "z_en_poh.h" + +#define FLAGS 0x00001205 + +#define THIS ((EnPoh*)thisx) + +void EnPoh_Init(Actor* thisx, GlobalContext* globalCtx); +void EnPoh_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnPoh_Update(Actor* thisx, GlobalContext* globalCtx); +void EnPoh_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Poh_InitVars = { + ACTOR_EN_POH, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_PO, + sizeof(EnPoh), + (ActorFunc)EnPoh_Init, + (ActorFunc)EnPoh_Destroy, + (ActorFunc)EnPoh_Update, + (ActorFunc)EnPoh_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/EnPoh_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/EnPoh_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2C910.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2C9B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2CA4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2CAA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2CB60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2CBBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2CD14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2CD64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2CEC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2CF28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2CFF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D07C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D0E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D140.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D2C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D300.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D5DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D628.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D694.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D6EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D76C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D7D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D924.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2D980.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2DAD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2DB44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2DC50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2DD2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2DDF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2E0B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2E180.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2E1D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2E230.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2E3B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2E3F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2E438.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2E55C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2E6C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2E8E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/EnPoh_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2ED14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2EDD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/EnPoh_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2F328.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Poh_0x80B2C6F0/func_80B2F37C.asm") diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.h b/src/overlays/actors/ovl_En_Poh/z_en_poh.h new file mode 100644 index 0000000000..809ed95fde --- /dev/null +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_POH_H +#define Z_EN_POH_H + +#include + +struct EnPoh; + +typedef struct EnPoh { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2D4]; +} EnPoh; // size = 0x418 + +extern const ActorInit En_Poh_InitVars; + +#endif // Z_EN_POH_H diff --git a/src/overlays/actors/ovl_En_Pp/overlay.cfg b/src/overlays/actors/ovl_En_Pp/overlay.cfg new file mode 100644 index 0000000000..3cca2c18d2 --- /dev/null +++ b/src/overlays/actors/ovl_En_Pp/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Pp +z_en_pp.c diff --git a/src/overlays/actors/ovl_En_Pp/z_en_pp.c b/src/overlays/actors/ovl_En_Pp/z_en_pp.c new file mode 100644 index 0000000000..a33a2a6ba7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Pp/z_en_pp.c @@ -0,0 +1,92 @@ +#include "z_en_pp.h" + +#define FLAGS 0x00000005 + +#define THIS ((EnPp*)thisx) + +void EnPp_Init(Actor* thisx, GlobalContext* globalCtx); +void EnPp_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnPp_Update(Actor* thisx, GlobalContext* globalCtx); +void EnPp_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Pp_InitVars = { + ACTOR_EN_PP, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_PP, + sizeof(EnPp), + (ActorFunc)EnPp_Init, + (ActorFunc)EnPp_Destroy, + (ActorFunc)EnPp_Update, + (ActorFunc)EnPp_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/EnPp_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/EnPp_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1E29C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1E3D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1E5A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1E680.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1E778.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1E958.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1E970.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1EBD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1EC24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1EFFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1F048.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1F0A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1F188.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1F244.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1F29C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1F4A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1F560.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1F664.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1F6B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1F770.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1F940.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1FAD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1FC7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B1FF20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B20030.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B202B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B203BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B20668.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/EnPp_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B20E6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/func_80B20F70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pp_0x80B1DEB0/EnPp_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Pp/z_en_pp.h b/src/overlays/actors/ovl_En_Pp/z_en_pp.h new file mode 100644 index 0000000000..f6b34baa20 --- /dev/null +++ b/src/overlays/actors/ovl_En_Pp/z_en_pp.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_PP_H +#define Z_EN_PP_H + +#include + +struct EnPp; + +typedef struct EnPp { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4A8]; +} EnPp; // size = 0x5EC + +extern const ActorInit En_Pp_InitVars; + +#endif // Z_EN_PP_H diff --git a/src/overlays/actors/ovl_En_Pr/overlay.cfg b/src/overlays/actors/ovl_En_Pr/overlay.cfg new file mode 100644 index 0000000000..efb1dfb564 --- /dev/null +++ b/src/overlays/actors/ovl_En_Pr/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Pr +z_en_pr.c diff --git a/src/overlays/actors/ovl_En_Pr/z_en_pr.c b/src/overlays/actors/ovl_En_Pr/z_en_pr.c new file mode 100644 index 0000000000..bbda3fe0d5 --- /dev/null +++ b/src/overlays/actors/ovl_En_Pr/z_en_pr.c @@ -0,0 +1,72 @@ +#include "z_en_pr.h" + +#define FLAGS 0x00000015 + +#define THIS ((EnPr*)thisx) + +void EnPr_Init(Actor* thisx, GlobalContext* globalCtx); +void EnPr_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnPr_Update(Actor* thisx, GlobalContext* globalCtx); +void EnPr_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Pr_InitVars = { + ACTOR_EN_PR, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_PR, + sizeof(EnPr), + (ActorFunc)EnPr_Init, + (ActorFunc)EnPr_Destroy, + (ActorFunc)EnPr_Update, + (ActorFunc)EnPr_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/EnPr_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/EnPr_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A3242C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A324E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A325E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A326F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A32740.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A32854.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A3289C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A3295C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A32984.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A32A40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A32AF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A32B20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A32CDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A32D28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A32E60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A32EA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A32F48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A33098.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/EnPr_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A3357C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/func_80A335B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr_0x80A32210/EnPr_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Pr/z_en_pr.h b/src/overlays/actors/ovl_En_Pr/z_en_pr.h new file mode 100644 index 0000000000..919ba8c864 --- /dev/null +++ b/src/overlays/actors/ovl_En_Pr/z_en_pr.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_PR_H +#define Z_EN_PR_H + +#include + +struct EnPr; + +typedef struct EnPr { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x204]; +} EnPr; // size = 0x348 + +extern const ActorInit En_Pr_InitVars; + +#endif // Z_EN_PR_H diff --git a/src/overlays/actors/ovl_En_Pr2/overlay.cfg b/src/overlays/actors/ovl_En_Pr2/overlay.cfg new file mode 100644 index 0000000000..11a975ed02 --- /dev/null +++ b/src/overlays/actors/ovl_En_Pr2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Pr2 +z_en_pr2.c diff --git a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c new file mode 100644 index 0000000000..d1ac8ffeaf --- /dev/null +++ b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c @@ -0,0 +1,62 @@ +#include "z_en_pr2.h" + +#define FLAGS 0x00000015 + +#define THIS ((EnPr2*)thisx) + +void EnPr2_Init(Actor* thisx, GlobalContext* globalCtx); +void EnPr2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnPr2_Update(Actor* thisx, GlobalContext* globalCtx); +void EnPr2_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Pr2_InitVars = { + ACTOR_EN_PR2, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_PR, + sizeof(EnPr2), + (ActorFunc)EnPr2_Init, + (ActorFunc)EnPr2_Destroy, + (ActorFunc)EnPr2_Update, + (ActorFunc)EnPr2_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/EnPr2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/EnPr2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A7429C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A7436C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A74510.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A745C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A745FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A74888.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A748E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A74DEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A74E90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A751B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A75310.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A755D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/EnPr2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A758E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A75950.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/func_80A759D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pr2_0x80A73FA0/EnPr2_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h new file mode 100644 index 0000000000..f4c936a649 --- /dev/null +++ b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_PR2_H +#define Z_EN_PR2_H + +#include + +struct EnPr2; + +typedef struct EnPr2 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x184]; +} EnPr2; // size = 0x2C8 + +extern const ActorInit En_Pr2_InitVars; + +#endif // Z_EN_PR2_H diff --git a/src/overlays/actors/ovl_En_Prz/overlay.cfg b/src/overlays/actors/ovl_En_Prz/overlay.cfg new file mode 100644 index 0000000000..dc79492a03 --- /dev/null +++ b/src/overlays/actors/ovl_En_Prz/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Prz +z_en_prz.c diff --git a/src/overlays/actors/ovl_En_Prz/z_en_prz.c b/src/overlays/actors/ovl_En_Prz/z_en_prz.c new file mode 100644 index 0000000000..9b2c1d6696 --- /dev/null +++ b/src/overlays/actors/ovl_En_Prz/z_en_prz.c @@ -0,0 +1,60 @@ +#include "z_en_prz.h" + +#define FLAGS 0x00000015 + +#define THIS ((EnPrz*)thisx) + +void EnPrz_Init(Actor* thisx, GlobalContext* globalCtx); +void EnPrz_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnPrz_Update(Actor* thisx, GlobalContext* globalCtx); +void EnPrz_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Prz_InitVars = { + ACTOR_EN_PRZ, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_PR, + sizeof(EnPrz), + (ActorFunc)EnPrz_Init, + (ActorFunc)EnPrz_Destroy, + (ActorFunc)EnPrz_Update, + (ActorFunc)EnPrz_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/EnPrz_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/EnPrz_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A75F18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A75FA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A76070.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A762C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A76388.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A763E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A76604.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A76634.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A76748.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A767A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A76A1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A76B14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/EnPrz_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A76F70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/func_80A76FCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Prz_0x80A75DC0/EnPrz_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Prz/z_en_prz.h b/src/overlays/actors/ovl_En_Prz/z_en_prz.h new file mode 100644 index 0000000000..abcf286c1e --- /dev/null +++ b/src/overlays/actors/ovl_En_Prz/z_en_prz.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_PRZ_H +#define Z_EN_PRZ_H + +#include + +struct EnPrz; + +typedef struct EnPrz { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x12C]; +} EnPrz; // size = 0x270 + +extern const ActorInit En_Prz_InitVars; + +#endif // Z_EN_PRZ_H diff --git a/src/overlays/actors/ovl_En_Pst/overlay.cfg b/src/overlays/actors/ovl_En_Pst/overlay.cfg new file mode 100644 index 0000000000..857d2ee7e7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Pst/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Pst +z_en_pst.c diff --git a/src/overlays/actors/ovl_En_Pst/z_en_pst.c b/src/overlays/actors/ovl_En_Pst/z_en_pst.c new file mode 100644 index 0000000000..143771b149 --- /dev/null +++ b/src/overlays/actors/ovl_En_Pst/z_en_pst.c @@ -0,0 +1,56 @@ +#include "z_en_pst.h" + +#define FLAGS 0x00000001 + +#define THIS ((EnPst*)thisx) + +void EnPst_Init(Actor* thisx, GlobalContext* globalCtx); +void EnPst_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnPst_Update(Actor* thisx, GlobalContext* globalCtx); +void EnPst_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Pst_InitVars = { + ACTOR_EN_PST, + ACTORTYPE_PROP, + FLAGS, + OBJECT_PST, + sizeof(EnPst), + (ActorFunc)EnPst_Init, + (ActorFunc)EnPst_Destroy, + (ActorFunc)EnPst_Update, + (ActorFunc)EnPst_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/func_80B2B830.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/func_80B2B874.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/func_80B2B8F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/func_80B2B974.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/func_80B2BAA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/func_80B2BBFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/func_80B2BCF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/func_80B2BD30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/func_80B2BD88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/func_80B2BD98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/func_80B2BE54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/EnPst_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/EnPst_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/EnPst_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/func_80B2C11C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Pst_0x80B2B830/EnPst_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Pst/z_en_pst.h b/src/overlays/actors/ovl_En_Pst/z_en_pst.h new file mode 100644 index 0000000000..c67ee0d070 --- /dev/null +++ b/src/overlays/actors/ovl_En_Pst/z_en_pst.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_PST_H +#define Z_EN_PST_H + +#include + +struct EnPst; + +typedef struct EnPst { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xDC]; +} EnPst; // size = 0x220 + +extern const ActorInit En_Pst_InitVars; + +#endif // Z_EN_PST_H diff --git a/src/overlays/actors/ovl_En_Racedog/overlay.cfg b/src/overlays/actors/ovl_En_Racedog/overlay.cfg new file mode 100644 index 0000000000..6461b9ff5a --- /dev/null +++ b/src/overlays/actors/ovl_En_Racedog/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Racedog +z_en_racedog.c diff --git a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c new file mode 100644 index 0000000000..053d657afc --- /dev/null +++ b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c @@ -0,0 +1,70 @@ +#include "z_en_racedog.h" + +#define FLAGS 0x80000010 + +#define THIS ((EnRacedog*)thisx) + +void EnRacedog_Init(Actor* thisx, GlobalContext* globalCtx); +void EnRacedog_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnRacedog_Update(Actor* thisx, GlobalContext* globalCtx); +void EnRacedog_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Racedog_InitVars = { + ACTOR_EN_RACEDOG, + ACTORTYPE_NPC, + FLAGS, + OBJECT_DOG, + sizeof(EnRacedog), + (ActorFunc)EnRacedog_Init, + (ActorFunc)EnRacedog_Destroy, + (ActorFunc)EnRacedog_Update, + (ActorFunc)EnRacedog_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B24630.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B246F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B2478C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B248B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/EnRacedog_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/EnRacedog_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B24C14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B24CB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B24E14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B24F08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B251EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B252F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B2538C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B25448.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B25490.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B255AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B256BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/EnRacedog_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B2583C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B258D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B25A74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/func_80B25A90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Racedog_0x80B24630/EnRacedog_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.h b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.h new file mode 100644 index 0000000000..9ed9a4906e --- /dev/null +++ b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_RACEDOG_H +#define Z_EN_RACEDOG_H + +#include + +struct EnRacedog; + +typedef struct EnRacedog { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x184]; +} EnRacedog; // size = 0x2C8 + +extern const ActorInit En_Racedog_InitVars; + +#endif // Z_EN_RACEDOG_H diff --git a/src/overlays/actors/ovl_En_Raf/overlay.cfg b/src/overlays/actors/ovl_En_Raf/overlay.cfg new file mode 100644 index 0000000000..086e64a725 --- /dev/null +++ b/src/overlays/actors/ovl_En_Raf/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Raf +z_en_raf.c diff --git a/src/overlays/actors/ovl_En_Raf/z_en_raf.c b/src/overlays/actors/ovl_En_Raf/z_en_raf.c new file mode 100644 index 0000000000..c258ac60fa --- /dev/null +++ b/src/overlays/actors/ovl_En_Raf/z_en_raf.c @@ -0,0 +1,78 @@ +#include "z_en_raf.h" + +#define FLAGS 0x08000000 + +#define THIS ((EnRaf*)thisx) + +void EnRaf_Init(Actor* thisx, GlobalContext* globalCtx); +void EnRaf_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnRaf_Update(Actor* thisx, GlobalContext* globalCtx); +void EnRaf_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Raf_InitVars = { + ACTOR_EN_RAF, + ACTORTYPE_PROP, + FLAGS, + OBJECT_RAF, + sizeof(EnRaf), + (ActorFunc)EnRaf_Init, + (ActorFunc)EnRaf_Destroy, + (ActorFunc)EnRaf_Update, + (ActorFunc)EnRaf_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A16D40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A16D6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/EnRaf_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/EnRaf_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A17060.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A1712C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A171D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A17414.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A17464.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A17530.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A175E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A17848.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A178A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A179C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A17C6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A17D14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A17D54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A17DDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A17E1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A18080.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A180B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/EnRaf_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A1859C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/EnRaf_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A18A90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A18B8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Raf_0x80A16D40/func_80A18DA0.asm") diff --git a/src/overlays/actors/ovl_En_Raf/z_en_raf.h b/src/overlays/actors/ovl_En_Raf/z_en_raf.h new file mode 100644 index 0000000000..7f1d69ea7e --- /dev/null +++ b/src/overlays/actors/ovl_En_Raf/z_en_raf.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_RAF_H +#define Z_EN_RAF_H + +#include + +struct EnRaf; + +typedef struct EnRaf { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x9A0]; +} EnRaf; // size = 0xAE4 + +extern const ActorInit En_Raf_InitVars; + +#endif // Z_EN_RAF_H diff --git a/src/overlays/actors/ovl_En_Rail_Skb/overlay.cfg b/src/overlays/actors/ovl_En_Rail_Skb/overlay.cfg new file mode 100644 index 0000000000..df550bd198 --- /dev/null +++ b/src/overlays/actors/ovl_En_Rail_Skb/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Rail_Skb +z_en_rail_skb.c diff --git a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c new file mode 100644 index 0000000000..e2eab94418 --- /dev/null +++ b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c @@ -0,0 +1,128 @@ +#include "z_en_rail_skb.h" + +#define FLAGS 0x00000015 + +#define THIS ((EnRailSkb*)thisx) + +void EnRailSkb_Init(Actor* thisx, GlobalContext* globalCtx); +void EnRailSkb_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnRailSkb_Update(Actor* thisx, GlobalContext* globalCtx); +void EnRailSkb_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Rail_Skb_InitVars = { + ACTOR_EN_RAIL_SKB, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_SKB, + sizeof(EnRailSkb), + (ActorFunc)EnRailSkb_Init, + (ActorFunc)EnRailSkb_Destroy, + (ActorFunc)EnRailSkb_Update, + (ActorFunc)EnRailSkb_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B708C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B70AB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B70B04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B70D24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/EnRailSkb_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/EnRailSkb_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B70FA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B70FF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B710AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B710E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71114.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B7114C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71228.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B7123C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B712FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71314.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71354.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B713A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71488.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B714D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B7151C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B715AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71650.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B716A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B717C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B717E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B718B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B718C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71910.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71954.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71A08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71A58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71B6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71BB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71D8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71DF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71EA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B71F3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B72100.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B72190.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B723F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B72430.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B725C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B726B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B72830.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B7285C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B72880.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B72970.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/EnRailSkb_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B72E88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/func_80B7302C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rail_Skb_0x80B708C0/EnRailSkb_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.h b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.h new file mode 100644 index 0000000000..902dc2d13c --- /dev/null +++ b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_RAIL_SKB_H +#define Z_EN_RAIL_SKB_H + +#include + +struct EnRailSkb; + +typedef struct EnRailSkb { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2C0]; +} EnRailSkb; // size = 0x404 + +extern const ActorInit En_Rail_Skb_InitVars; + +#endif // Z_EN_RAIL_SKB_H diff --git a/src/overlays/actors/ovl_En_Railgibud/overlay.cfg b/src/overlays/actors/ovl_En_Railgibud/overlay.cfg new file mode 100644 index 0000000000..6c055c27c3 --- /dev/null +++ b/src/overlays/actors/ovl_En_Railgibud/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Railgibud +z_en_railgibud.c diff --git a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c new file mode 100644 index 0000000000..89af474f98 --- /dev/null +++ b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c @@ -0,0 +1,124 @@ +#include "z_en_railgibud.h" + +#define FLAGS 0x00000415 + +#define THIS ((EnRailgibud*)thisx) + +void EnRailgibud_Init(Actor* thisx, GlobalContext* globalCtx); +void EnRailgibud_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnRailgibud_Update(Actor* thisx, GlobalContext* globalCtx); +void EnRailgibud_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Railgibud_InitVars = { + ACTOR_EN_RAILGIBUD, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_RD, + sizeof(EnRailgibud), + (ActorFunc)EnRailgibud_Init, + (ActorFunc)EnRailgibud_Destroy, + (ActorFunc)EnRailgibud_Update, + (ActorFunc)EnRailgibud_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA5400.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/EnRailgibud_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/EnRailgibud_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA57A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA57F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA59F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA5A34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA5AF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA5B64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA5DBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA5E18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6054.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA60B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6158.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA61A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6284.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA62D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6440.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA64AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6584.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6604.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6664.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA66C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6800.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6974.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6B30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6B9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6D10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6DAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA6DF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7088.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA71E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7234.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7388.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7434.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7578.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA76C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/EnRailgibud_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7878.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA789C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA78F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/EnRailgibud_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7B6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7C78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7CF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7D04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7D14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7D30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA7DC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Railgibud_0x80BA5400/func_80BA8050.asm") diff --git a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.h b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.h new file mode 100644 index 0000000000..44dc53d6e1 --- /dev/null +++ b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_RAILGIBUD_H +#define Z_EN_RAILGIBUD_H + +#include + +struct EnRailgibud; + +typedef struct EnRailgibud { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2C4]; +} EnRailgibud; // size = 0x408 + +extern const ActorInit En_Railgibud_InitVars; + +#endif // Z_EN_RAILGIBUD_H diff --git a/src/overlays/actors/ovl_En_Rat/overlay.cfg b/src/overlays/actors/ovl_En_Rat/overlay.cfg new file mode 100644 index 0000000000..3562582caf --- /dev/null +++ b/src/overlays/actors/ovl_En_Rat/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Rat +z_en_rat.c diff --git a/src/overlays/actors/ovl_En_Rat/z_en_rat.c b/src/overlays/actors/ovl_En_Rat/z_en_rat.c new file mode 100644 index 0000000000..21eb7764af --- /dev/null +++ b/src/overlays/actors/ovl_En_Rat/z_en_rat.c @@ -0,0 +1,82 @@ +#include "z_en_rat.h" + +#define FLAGS 0x00000205 + +#define THIS ((EnRat*)thisx) + +void EnRat_Init(Actor* thisx, GlobalContext* globalCtx); +void EnRat_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnRat_Update(Actor* thisx, GlobalContext* globalCtx); +void EnRat_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Rat_InitVars = { + ACTOR_EN_RAT, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_RAT, + sizeof(EnRat), + (ActorFunc)EnRat_Init, + (ActorFunc)EnRat_Destroy, + (ActorFunc)EnRat_Update, + (ActorFunc)EnRat_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/EnRat_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/EnRat_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A563CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A56444.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A5665C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A566E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A56994.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A56AFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A56EB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A56F68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57010.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57118.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57180.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A5723C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57330.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57384.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57488.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A574E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57570.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A575F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A5764C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57918.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57984.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57A08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57A9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/EnRat_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57F10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/func_80A57F4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rat_0x80A56150/EnRat_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Rat/z_en_rat.h b/src/overlays/actors/ovl_En_Rat/z_en_rat.h new file mode 100644 index 0000000000..9335fac6f9 --- /dev/null +++ b/src/overlays/actors/ovl_En_Rat/z_en_rat.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_RAT_H +#define Z_EN_RAT_H + +#include + +struct EnRat; + +typedef struct EnRat { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x17C]; +} EnRat; // size = 0x2C0 + +extern const ActorInit En_Rat_InitVars; + +#endif // Z_EN_RAT_H diff --git a/src/overlays/actors/ovl_En_Rd/overlay.cfg b/src/overlays/actors/ovl_En_Rd/overlay.cfg new file mode 100644 index 0000000000..3864774ca9 --- /dev/null +++ b/src/overlays/actors/ovl_En_Rd/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Rd +z_en_rd.c diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c new file mode 100644 index 0000000000..ea17ab4ba4 --- /dev/null +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -0,0 +1,122 @@ +#include "z_en_rd.h" + +#define FLAGS 0x00000415 + +#define THIS ((EnRd*)thisx) + +void EnRd_Init(Actor* thisx, GlobalContext* globalCtx); +void EnRd_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnRd_Update(Actor* thisx, GlobalContext* globalCtx); +void EnRd_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Rd_InitVars = { + ACTOR_EN_RD, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_RD, + sizeof(EnRd), + (ActorFunc)EnRd_Init, + (ActorFunc)EnRd_Destroy, + (ActorFunc)EnRd_Update, + (ActorFunc)EnRd_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/EnRd_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/EnRd_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D4190.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D41FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D4260.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D4308.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D43AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D45D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D4660.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D47DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D4868.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D49E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D4A90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D4B20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D4CA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D4DC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D4E60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D4FE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D506C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D53C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D5440.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D5660.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D56E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D586C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D58CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D5C54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D5CCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D5D88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D5DF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D5E98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D5F18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D6008.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D6054.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D60B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D6130.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D616C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D6200.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D6310.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D6388.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D64D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D65BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D66A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D6814.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D6A94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D6B64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/EnRd_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D6DA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/func_808D6DFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rd_0x808D3E20/EnRd_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.h b/src/overlays/actors/ovl_En_Rd/z_en_rd.h new file mode 100644 index 0000000000..c524b7720a --- /dev/null +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_RD_H +#define Z_EN_RD_H + +#include + +struct EnRd; + +typedef struct EnRd { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2B0]; +} EnRd; // size = 0x3F4 + +extern const ActorInit En_Rd_InitVars; + +#endif // Z_EN_RD_H diff --git a/src/overlays/actors/ovl_En_Recepgirl/overlay.cfg b/src/overlays/actors/ovl_En_Recepgirl/overlay.cfg new file mode 100644 index 0000000000..bec7425dee --- /dev/null +++ b/src/overlays/actors/ovl_En_Recepgirl/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Recepgirl +z_en_recepgirl.c diff --git a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c new file mode 100644 index 0000000000..e3d016fd7c --- /dev/null +++ b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c @@ -0,0 +1,46 @@ +#include "z_en_recepgirl.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnRecepgirl*)thisx) + +void EnRecepgirl_Init(Actor* thisx, GlobalContext* globalCtx); +void EnRecepgirl_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnRecepgirl_Update(Actor* thisx, GlobalContext* globalCtx); +void EnRecepgirl_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Recepgirl_InitVars = { + ACTOR_EN_RECEPGIRL, + ACTORTYPE_NPC, + FLAGS, + OBJECT_BG, + sizeof(EnRecepgirl), + (ActorFunc)EnRecepgirl_Init, + (ActorFunc)EnRecepgirl_Destroy, + (ActorFunc)EnRecepgirl_Update, + (ActorFunc)EnRecepgirl_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Recepgirl_0x80C0FFD0/EnRecepgirl_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Recepgirl_0x80C0FFD0/EnRecepgirl_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Recepgirl_0x80C0FFD0/func_80C100DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Recepgirl_0x80C0FFD0/func_80C10148.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Recepgirl_0x80C0FFD0/func_80C1019C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Recepgirl_0x80C0FFD0/func_80C10290.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Recepgirl_0x80C0FFD0/func_80C102D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Recepgirl_0x80C0FFD0/EnRecepgirl_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Recepgirl_0x80C0FFD0/func_80C10558.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Recepgirl_0x80C0FFD0/func_80C10590.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Recepgirl_0x80C0FFD0/EnRecepgirl_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.h b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.h new file mode 100644 index 0000000000..05d58b591c --- /dev/null +++ b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_RECEPGIRL_H +#define Z_EN_RECEPGIRL_H + +#include + +struct EnRecepgirl; + +typedef struct EnRecepgirl { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x170]; +} EnRecepgirl; // size = 0x2B4 + +extern const ActorInit En_Recepgirl_InitVars; + +#endif // Z_EN_RECEPGIRL_H diff --git a/src/overlays/actors/ovl_En_Rg/overlay.cfg b/src/overlays/actors/ovl_En_Rg/overlay.cfg new file mode 100644 index 0000000000..4cbc296973 --- /dev/null +++ b/src/overlays/actors/ovl_En_Rg/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Rg +z_en_rg.c diff --git a/src/overlays/actors/ovl_En_Rg/z_en_rg.c b/src/overlays/actors/ovl_En_Rg/z_en_rg.c new file mode 100644 index 0000000000..42cc156ac0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Rg/z_en_rg.c @@ -0,0 +1,86 @@ +#include "z_en_rg.h" + +#define FLAGS 0x80000010 + +#define THIS ((EnRg*)thisx) + +void EnRg_Init(Actor* thisx, GlobalContext* globalCtx); +void EnRg_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnRg_Update(Actor* thisx, GlobalContext* globalCtx); +void EnRg_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Rg_InitVars = { + ACTOR_EN_RG, + ACTORTYPE_NPC, + FLAGS, + OBJECT_OF1D_MAP, + sizeof(EnRg), + (ActorFunc)EnRg_Init, + (ActorFunc)EnRg_Destroy, + (ActorFunc)EnRg_Update, + (ActorFunc)EnRg_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF3920.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF3C64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF3DA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF3DC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF3E88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF3ED4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF3F14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF3FF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF4024.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF409C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF40F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF416C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF4220.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF42BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF43FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF4560.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF45B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF47AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF4934.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF4964.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF4AB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF4D64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF4DA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF4EBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF4FC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/EnRg_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/EnRg_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/EnRg_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF547C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/func_80BF5588.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rg_0x80BF3920/EnRg_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Rg/z_en_rg.h b/src/overlays/actors/ovl_En_Rg/z_en_rg.h new file mode 100644 index 0000000000..9fe4c686a3 --- /dev/null +++ b/src/overlays/actors/ovl_En_Rg/z_en_rg.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_RG_H +#define Z_EN_RG_H + +#include + +struct EnRg; + +typedef struct EnRg { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x988]; +} EnRg; // size = 0xACC + +extern const ActorInit En_Rg_InitVars; + +#endif // Z_EN_RG_H diff --git a/src/overlays/actors/ovl_En_River_Sound/overlay.cfg b/src/overlays/actors/ovl_En_River_Sound/overlay.cfg new file mode 100644 index 0000000000..82d1e4c4ab --- /dev/null +++ b/src/overlays/actors/ovl_En_River_Sound/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_River_Sound +z_en_river_sound.c diff --git a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c new file mode 100644 index 0000000000..1b8cb1a372 --- /dev/null +++ b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c @@ -0,0 +1,29 @@ +#include "z_en_river_sound.h" + +#define FLAGS 0x00000030 + +#define THIS ((EnRiverSound*)thisx) + +void EnRiverSound_Init(Actor* thisx, GlobalContext* globalCtx); +void EnRiverSound_Update(Actor* thisx, GlobalContext* globalCtx); +void EnRiverSound_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_River_Sound_InitVars = { + ACTOR_EN_RIVER_SOUND, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnRiverSound), + (ActorFunc)EnRiverSound_Init, + (ActorFunc)func_800BDFB0, + (ActorFunc)EnRiverSound_Update, + (ActorFunc)EnRiverSound_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_River_Sound_0x808A7E30/EnRiverSound_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_River_Sound_0x808A7E30/EnRiverSound_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_River_Sound_0x808A7E30/EnRiverSound_Draw.asm") diff --git a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h new file mode 100644 index 0000000000..b782deb3ba --- /dev/null +++ b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_RIVER_SOUND_H +#define Z_EN_RIVER_SOUND_H + +#include + +struct EnRiverSound; + +typedef struct EnRiverSound { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x8]; +} EnRiverSound; // size = 0x14C + +extern const ActorInit En_River_Sound_InitVars; + +#endif // Z_EN_RIVER_SOUND_H diff --git a/src/overlays/actors/ovl_En_Rr/overlay.cfg b/src/overlays/actors/ovl_En_Rr/overlay.cfg new file mode 100644 index 0000000000..d7730c1f0c --- /dev/null +++ b/src/overlays/actors/ovl_En_Rr/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Rr +z_en_rr.c diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c new file mode 100644 index 0000000000..27ffb1928b --- /dev/null +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -0,0 +1,84 @@ +#include "z_en_rr.h" + +#define FLAGS 0x00000405 + +#define THIS ((EnRr*)thisx) + +void EnRr_Init(Actor* thisx, GlobalContext* globalCtx); +void EnRr_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnRr_Update(Actor* thisx, GlobalContext* globalCtx); +void EnRr_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Rr_InitVars = { + ACTOR_EN_RR, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_RR, + sizeof(EnRr), + (ActorFunc)EnRr_Init, + (ActorFunc)EnRr_Destroy, + (ActorFunc)EnRr_Update, + (ActorFunc)EnRr_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/EnRr_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/EnRr_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA01C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA11C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA19C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA238.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA260.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA344.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA3F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA4F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA6B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA7AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA870.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA910.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FA9CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FAA94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FAC80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FAD1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FAE50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FAF94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FB088.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FB1C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FB2C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FB398.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FB42C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FB680.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FB710.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/func_808FB794.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/EnRr_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rr_0x808F9E00/EnRr_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.h b/src/overlays/actors/ovl_En_Rr/z_en_rr.h new file mode 100644 index 0000000000..16b0ff1a93 --- /dev/null +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_RR_H +#define Z_EN_RR_H + +#include + +struct EnRr; + +typedef struct EnRr { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x280]; +} EnRr; // size = 0x3C4 + +extern const ActorInit En_Rr_InitVars; + +#endif // Z_EN_RR_H diff --git a/src/overlays/actors/ovl_En_Rsn/overlay.cfg b/src/overlays/actors/ovl_En_Rsn/overlay.cfg new file mode 100644 index 0000000000..f99efb1a6b --- /dev/null +++ b/src/overlays/actors/ovl_En_Rsn/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Rsn +z_en_rsn.c diff --git a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c new file mode 100644 index 0000000000..72e808def4 --- /dev/null +++ b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c @@ -0,0 +1,40 @@ +#include "z_en_rsn.h" + +#define FLAGS 0x02000019 + +#define THIS ((EnRsn*)thisx) + +void EnRsn_Init(Actor* thisx, GlobalContext* globalCtx); +void EnRsn_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnRsn_Update(Actor* thisx, GlobalContext* globalCtx); +void EnRsn_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Rsn_InitVars = { + ACTOR_EN_RSN, + ACTORTYPE_NPC, + FLAGS, + OBJECT_RS, + sizeof(EnRsn), + (ActorFunc)EnRsn_Init, + (ActorFunc)EnRsn_Destroy, + (ActorFunc)EnRsn_Update, + (ActorFunc)EnRsn_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rsn_0x80C25D40/func_80C25D40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rsn_0x80C25D40/func_80C25D84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rsn_0x80C25D40/EnRsn_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rsn_0x80C25D40/EnRsn_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rsn_0x80C25D40/EnRsn_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rsn_0x80C25D40/func_80C25EB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rsn_0x80C25D40/func_80C25EF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rsn_0x80C25D40/EnRsn_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.h b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.h new file mode 100644 index 0000000000..9e9e8f09d6 --- /dev/null +++ b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_RSN_H +#define Z_EN_RSN_H + +#include + +struct EnRsn; + +typedef struct EnRsn { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xA0]; +} EnRsn; // size = 0x1E4 + +extern const ActorInit En_Rsn_InitVars; + +#endif // Z_EN_RSN_H diff --git a/src/overlays/actors/ovl_En_Ru/overlay.cfg b/src/overlays/actors/ovl_En_Ru/overlay.cfg new file mode 100644 index 0000000000..4080303857 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ru/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ru +z_en_ru.c diff --git a/src/overlays/actors/ovl_En_Ru/z_en_ru.c b/src/overlays/actors/ovl_En_Ru/z_en_ru.c new file mode 100644 index 0000000000..2aea4112cd --- /dev/null +++ b/src/overlays/actors/ovl_En_Ru/z_en_ru.c @@ -0,0 +1,48 @@ +#include "z_en_ru.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnRu*)thisx) + +void EnRu_Init(Actor* thisx, GlobalContext* globalCtx); +void EnRu_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnRu_Update(Actor* thisx, GlobalContext* globalCtx); +void EnRu_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ru_InitVars = { + ACTOR_EN_RU, + ACTORTYPE_NPC, + FLAGS, + OBJECT_RU2, + sizeof(EnRu), + (ActorFunc)EnRu_Init, + (ActorFunc)EnRu_Destroy, + (ActorFunc)EnRu_Update, + (ActorFunc)EnRu_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ru_0x80A389A0/func_80A389A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ru_0x80A389A0/func_80A38A68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ru_0x80A389A0/func_80A38B7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ru_0x80A389A0/func_80A38BF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ru_0x80A389A0/func_80A38C70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ru_0x80A389A0/func_80A38DF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ru_0x80A389A0/EnRu_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ru_0x80A389A0/EnRu_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ru_0x80A389A0/EnRu_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ru_0x80A389A0/func_80A38FB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ru_0x80A389A0/func_80A390F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ru_0x80A389A0/EnRu_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ru/z_en_ru.h b/src/overlays/actors/ovl_En_Ru/z_en_ru.h new file mode 100644 index 0000000000..92eb352989 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ru/z_en_ru.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_RU_H +#define Z_EN_RU_H + +#include + +struct EnRu; + +typedef struct EnRu { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x310]; +} EnRu; // size = 0x454 + +extern const ActorInit En_Ru_InitVars; + +#endif // Z_EN_RU_H diff --git a/src/overlays/actors/ovl_En_Ruppecrow/overlay.cfg b/src/overlays/actors/ovl_En_Ruppecrow/overlay.cfg new file mode 100644 index 0000000000..63f0bbb60c --- /dev/null +++ b/src/overlays/actors/ovl_En_Ruppecrow/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ruppecrow +z_en_ruppecrow.c diff --git a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c new file mode 100644 index 0000000000..2a40d41755 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c @@ -0,0 +1,68 @@ +#include "z_en_ruppecrow.h" + +#define FLAGS 0x00004030 + +#define THIS ((EnRuppecrow*)thisx) + +void EnRuppecrow_Init(Actor* thisx, GlobalContext* globalCtx); +void EnRuppecrow_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnRuppecrow_Update(Actor* thisx, GlobalContext* globalCtx); +void EnRuppecrow_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ruppecrow_InitVars = { + ACTOR_EN_RUPPECROW, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_CROW, + sizeof(EnRuppecrow), + (ActorFunc)EnRuppecrow_Init, + (ActorFunc)EnRuppecrow_Destroy, + (ActorFunc)EnRuppecrow_Update, + (ActorFunc)EnRuppecrow_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE2260.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE2330.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE24CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE2668.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE2728.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE2794.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE2808.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE2874.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE2B80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE2D4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE2E18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE2F6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE30F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE3178.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE32DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE3354.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE348C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/func_80BE35A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/EnRuppecrow_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/EnRuppecrow_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/EnRuppecrow_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ruppecrow_0x80BE2260/EnRuppecrow_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h new file mode 100644 index 0000000000..e74ab02a4d --- /dev/null +++ b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_RUPPECROW_H +#define Z_EN_RUPPECROW_H + +#include + +struct EnRuppecrow; + +typedef struct EnRuppecrow { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1C0]; +} EnRuppecrow; // size = 0x304 + +extern const ActorInit En_Ruppecrow_InitVars; + +#endif // Z_EN_RUPPECROW_H diff --git a/src/overlays/actors/ovl_En_Rz/overlay.cfg b/src/overlays/actors/ovl_En_Rz/overlay.cfg new file mode 100644 index 0000000000..10c34f949b --- /dev/null +++ b/src/overlays/actors/ovl_En_Rz/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Rz +z_en_rz.c diff --git a/src/overlays/actors/ovl_En_Rz/z_en_rz.c b/src/overlays/actors/ovl_En_Rz/z_en_rz.c new file mode 100644 index 0000000000..5291280dbd --- /dev/null +++ b/src/overlays/actors/ovl_En_Rz/z_en_rz.c @@ -0,0 +1,88 @@ +#include "z_en_rz.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnRz*)thisx) + +void EnRz_Init(Actor* thisx, GlobalContext* globalCtx); +void EnRz_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnRz_Update(Actor* thisx, GlobalContext* globalCtx); +void EnRz_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Rz_InitVars = { + ACTOR_EN_RZ, + ACTORTYPE_NPC, + FLAGS, + OBJECT_RZ, + sizeof(EnRz), + (ActorFunc)EnRz_Init, + (ActorFunc)EnRz_Destroy, + (ActorFunc)EnRz_Update, + (ActorFunc)EnRz_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/EnRz_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFB780.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFB864.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFB9E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFBA1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFBA50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFBB44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFBC78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFBCEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFBD54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFBDA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFBDFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/EnRz_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFBE70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFBFAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC058.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC078.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC19C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC214.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC270.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC2F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC36C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC3F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC608.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC674.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC728.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC7E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC8AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFC8F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/EnRz_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/func_80BFCAD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Rz_0x80BFB480/EnRz_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Rz/z_en_rz.h b/src/overlays/actors/ovl_En_Rz/z_en_rz.h new file mode 100644 index 0000000000..e6600b8102 --- /dev/null +++ b/src/overlays/actors/ovl_En_Rz/z_en_rz.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_RZ_H +#define Z_EN_RZ_H + +#include + +struct EnRz; + +typedef struct EnRz { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2F0]; +} EnRz; // size = 0x434 + +extern const ActorInit En_Rz_InitVars; + +#endif // Z_EN_RZ_H diff --git a/src/overlays/actors/ovl_En_S_Goro/overlay.cfg b/src/overlays/actors/ovl_En_S_Goro/overlay.cfg new file mode 100644 index 0000000000..195f952eae --- /dev/null +++ b/src/overlays/actors/ovl_En_S_Goro/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_S_Goro +z_en_s_goro.c diff --git a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c new file mode 100644 index 0000000000..b2b5e83c63 --- /dev/null +++ b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c @@ -0,0 +1,98 @@ +#include "z_en_s_goro.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnSGoro*)thisx) + +void EnSGoro_Init(Actor* thisx, GlobalContext* globalCtx); +void EnSGoro_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnSGoro_Update(Actor* thisx, GlobalContext* globalCtx); +void EnSGoro_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_S_Goro_InitVars = { + ACTOR_EN_S_GORO, + ACTORTYPE_NPC, + FLAGS, + OBJECT_OF1D_MAP, + sizeof(EnSGoro), + (ActorFunc)EnSGoro_Init, + (ActorFunc)EnSGoro_Destroy, + (ActorFunc)EnSGoro_Update, + (ActorFunc)EnSGoro_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBCA80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBD348.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBD8F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBD93C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBD98C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBDACC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBDC34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBDCFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBDDF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBDE78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBDF28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBDFA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBE05C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBE0E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBE144.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBE374.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBE498.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBE73C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBE844.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBE904.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBE9F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBEAD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBEBF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBECBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBEEB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBEF34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBEFA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBF01C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/EnSGoro_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/EnSGoro_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/EnSGoro_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBF298.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBF3D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBF3EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBF5F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/func_80BBF6BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_S_Goro_0x80BBCA80/EnSGoro_Draw.asm") diff --git a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.h b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.h new file mode 100644 index 0000000000..4cefd9e155 --- /dev/null +++ b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_S_GORO_H +#define Z_EN_S_GORO_H + +#include + +struct EnSGoro; + +typedef struct EnSGoro { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1CC]; +} EnSGoro; // size = 0x310 + +extern const ActorInit En_S_Goro_InitVars; + +#endif // Z_EN_S_GORO_H diff --git a/src/overlays/actors/ovl_En_Sb/overlay.cfg b/src/overlays/actors/ovl_En_Sb/overlay.cfg new file mode 100644 index 0000000000..12658e7639 --- /dev/null +++ b/src/overlays/actors/ovl_En_Sb/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Sb +z_en_sb.c diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c new file mode 100644 index 0000000000..ab46491b93 --- /dev/null +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -0,0 +1,64 @@ +#include "z_en_sb.h" + +#define FLAGS 0x00000005 + +#define THIS ((EnSb*)thisx) + +void EnSb_Init(Actor* thisx, GlobalContext* globalCtx); +void EnSb_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnSb_Update(Actor* thisx, GlobalContext* globalCtx); +void EnSb_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Sb_InitVars = { + ACTOR_EN_SB, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_SB, + sizeof(EnSb), + (ActorFunc)EnSb_Init, + (ActorFunc)EnSb_Destroy, + (ActorFunc)EnSb_Update, + (ActorFunc)EnSb_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/EnSb_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/EnSb_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E401C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E40CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E4144.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E41C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E4234.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E42DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E4354.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E4458.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E44D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E45A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E4654.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E4740.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E47E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E491C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E4984.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/EnSb_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/func_808E4C18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sb_0x808E3EF0/EnSb_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.h b/src/overlays/actors/ovl_En_Sb/z_en_sb.h new file mode 100644 index 0000000000..2c313c05bb --- /dev/null +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_SB_H +#define Z_EN_SB_H + +#include + +struct EnSb; + +typedef struct EnSb { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x110]; +} EnSb; // size = 0x254 + +extern const ActorInit En_Sb_InitVars; + +#endif // Z_EN_SB_H diff --git a/src/overlays/actors/ovl_En_Sc_Ruppe/overlay.cfg b/src/overlays/actors/ovl_En_Sc_Ruppe/overlay.cfg new file mode 100644 index 0000000000..2262aa0bbf --- /dev/null +++ b/src/overlays/actors/ovl_En_Sc_Ruppe/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Sc_Ruppe +z_en_sc_ruppe.c diff --git a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c new file mode 100644 index 0000000000..55a90506a0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c @@ -0,0 +1,40 @@ +#include "z_en_sc_ruppe.h" + +#define FLAGS 0x00000030 + +#define THIS ((EnScRuppe*)thisx) + +void EnScRuppe_Init(Actor* thisx, GlobalContext* globalCtx); +void EnScRuppe_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnScRuppe_Update(Actor* thisx, GlobalContext* globalCtx); +void EnScRuppe_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Sc_Ruppe_InitVars = { + ACTOR_EN_SC_RUPPE, + ACTORTYPE_NPC, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnScRuppe), + (ActorFunc)EnScRuppe_Init, + (ActorFunc)EnScRuppe_Destroy, + (ActorFunc)EnScRuppe_Update, + (ActorFunc)EnScRuppe_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sc_Ruppe_0x80BD6910/func_80BD6910.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sc_Ruppe_0x80BD6910/func_80BD697C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sc_Ruppe_0x80BD6910/func_80BD6A8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sc_Ruppe_0x80BD6910/func_80BD6B18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sc_Ruppe_0x80BD6910/EnScRuppe_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sc_Ruppe_0x80BD6910/EnScRuppe_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sc_Ruppe_0x80BD6910/EnScRuppe_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sc_Ruppe_0x80BD6910/EnScRuppe_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.h b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.h new file mode 100644 index 0000000000..f11bee5b45 --- /dev/null +++ b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_SC_RUPPE_H +#define Z_EN_SC_RUPPE_H + +#include + +struct EnScRuppe; + +typedef struct EnScRuppe { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x54]; +} EnScRuppe; // size = 0x198 + +extern const ActorInit En_Sc_Ruppe_InitVars; + +#endif // Z_EN_SC_RUPPE_H diff --git a/src/overlays/actors/ovl_En_Scopecoin/overlay.cfg b/src/overlays/actors/ovl_En_Scopecoin/overlay.cfg new file mode 100644 index 0000000000..2c605c8bc2 --- /dev/null +++ b/src/overlays/actors/ovl_En_Scopecoin/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Scopecoin +z_en_scopecoin.c diff --git a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c new file mode 100644 index 0000000000..7f0fed21a5 --- /dev/null +++ b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c @@ -0,0 +1,36 @@ +#include "z_en_scopecoin.h" + +#define FLAGS 0x00000030 + +#define THIS ((EnScopecoin*)thisx) + +void EnScopecoin_Init(Actor* thisx, GlobalContext* globalCtx); +void EnScopecoin_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnScopecoin_Update(Actor* thisx, GlobalContext* globalCtx); +void EnScopecoin_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Scopecoin_InitVars = { + ACTOR_EN_SCOPECOIN, + ACTORTYPE_NPC, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnScopecoin), + (ActorFunc)EnScopecoin_Init, + (ActorFunc)EnScopecoin_Destroy, + (ActorFunc)EnScopecoin_Update, + (ActorFunc)EnScopecoin_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecoin_0x80BFCFA0/func_80BFCFA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecoin_0x80BFCFA0/func_80BFCFB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecoin_0x80BFCFA0/EnScopecoin_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecoin_0x80BFCFA0/EnScopecoin_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecoin_0x80BFCFA0/EnScopecoin_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecoin_0x80BFCFA0/EnScopecoin_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.h b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.h new file mode 100644 index 0000000000..9f70ec53d3 --- /dev/null +++ b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_SCOPECOIN_H +#define Z_EN_SCOPECOIN_H + +#include + +struct EnScopecoin; + +typedef struct EnScopecoin { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x8]; +} EnScopecoin; // size = 0x14C + +extern const ActorInit En_Scopecoin_InitVars; + +#endif // Z_EN_SCOPECOIN_H diff --git a/src/overlays/actors/ovl_En_Scopecrow/overlay.cfg b/src/overlays/actors/ovl_En_Scopecrow/overlay.cfg new file mode 100644 index 0000000000..880bf55391 --- /dev/null +++ b/src/overlays/actors/ovl_En_Scopecrow/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Scopecrow +z_en_scopecrow.c diff --git a/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c new file mode 100644 index 0000000000..5e6726688c --- /dev/null +++ b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c @@ -0,0 +1,48 @@ +#include "z_en_scopecrow.h" + +#define FLAGS 0x00000030 + +#define THIS ((EnScopecrow*)thisx) + +void EnScopecrow_Init(Actor* thisx, GlobalContext* globalCtx); +void EnScopecrow_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnScopecrow_Update(Actor* thisx, GlobalContext* globalCtx); +void EnScopecrow_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Scopecrow_InitVars = { + ACTOR_EN_SCOPECROW, + ACTORTYPE_NPC, + FLAGS, + OBJECT_CROW, + sizeof(EnScopecrow), + (ActorFunc)EnScopecrow_Init, + (ActorFunc)EnScopecrow_Destroy, + (ActorFunc)EnScopecrow_Update, + (ActorFunc)EnScopecrow_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecrow_0x80BCD000/func_80BCD000.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecrow_0x80BCD000/func_80BCD09C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecrow_0x80BCD000/func_80BCD1AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecrow_0x80BCD000/func_80BCD2BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecrow_0x80BCD000/func_80BCD334.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecrow_0x80BCD000/func_80BCD4D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecrow_0x80BCD000/func_80BCD590.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecrow_0x80BCD000/func_80BCD640.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecrow_0x80BCD000/EnScopecrow_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecrow_0x80BCD000/EnScopecrow_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecrow_0x80BCD000/EnScopecrow_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopecrow_0x80BCD000/EnScopecrow_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.h b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.h new file mode 100644 index 0000000000..7eac7a419e --- /dev/null +++ b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_SCOPECROW_H +#define Z_EN_SCOPECROW_H + +#include + +struct EnScopecrow; + +typedef struct EnScopecrow { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x124]; +} EnScopecrow; // size = 0x268 + +extern const ActorInit En_Scopecrow_InitVars; + +#endif // Z_EN_SCOPECROW_H diff --git a/src/overlays/actors/ovl_En_Scopenuts/overlay.cfg b/src/overlays/actors/ovl_En_Scopenuts/overlay.cfg new file mode 100644 index 0000000000..5989378a15 --- /dev/null +++ b/src/overlays/actors/ovl_En_Scopenuts/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Scopenuts +z_en_scopenuts.c diff --git a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c new file mode 100644 index 0000000000..b361822df8 --- /dev/null +++ b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c @@ -0,0 +1,82 @@ +#include "z_en_scopenuts.h" + +#define FLAGS 0x00000039 + +#define THIS ((EnScopenuts*)thisx) + +void EnScopenuts_Init(Actor* thisx, GlobalContext* globalCtx); +void EnScopenuts_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnScopenuts_Update(Actor* thisx, GlobalContext* globalCtx); +void EnScopenuts_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Scopenuts_InitVars = { + ACTOR_EN_SCOPENUTS, + ACTORTYPE_NPC, + FLAGS, + OBJECT_DNT, + sizeof(EnScopenuts), + (ActorFunc)EnScopenuts_Init, + (ActorFunc)EnScopenuts_Destroy, + (ActorFunc)EnScopenuts_Update, + (ActorFunc)EnScopenuts_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCABF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCAC40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCAD64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCAE78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCAF0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCAFA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCB078.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCB1C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCB230.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCB4DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCB52C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCB6D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCB90C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCB980.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCBA00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCBC60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCBD28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCBF0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCBFFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCC288.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCC2AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCC448.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/EnScopenuts_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/EnScopenuts_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/EnScopenuts_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCC828.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCC9CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/func_80BCC9E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Scopenuts_0x80BCABF0/EnScopenuts_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.h b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.h new file mode 100644 index 0000000000..5bb4f0b90e --- /dev/null +++ b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_SCOPENUTS_H +#define Z_EN_SCOPENUTS_H + +#include + +struct EnScopenuts; + +typedef struct EnScopenuts { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x230]; +} EnScopenuts; // size = 0x374 + +extern const ActorInit En_Scopenuts_InitVars; + +#endif // Z_EN_SCOPENUTS_H diff --git a/src/overlays/actors/ovl_En_Sda/overlay.cfg b/src/overlays/actors/ovl_En_Sda/overlay.cfg new file mode 100644 index 0000000000..694122dd7a --- /dev/null +++ b/src/overlays/actors/ovl_En_Sda/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Sda +z_en_sda.c diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.c b/src/overlays/actors/ovl_En_Sda/z_en_sda.c new file mode 100644 index 0000000000..f7bf57bff5 --- /dev/null +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -0,0 +1,38 @@ +#include "z_en_sda.h" + +#define FLAGS 0x00000030 + +#define THIS ((EnSda*)thisx) + +void EnSda_Init(Actor* thisx, GlobalContext* globalCtx); +void EnSda_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnSda_Update(Actor* thisx, GlobalContext* globalCtx); +void EnSda_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Sda_InitVars = { + ACTOR_EN_SDA, + ACTORTYPE_BOSS, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnSda), + (ActorFunc)EnSda_Init, + (ActorFunc)EnSda_Destroy, + (ActorFunc)EnSda_Update, + (ActorFunc)EnSda_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sda_0x809468D0/EnSda_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sda_0x809468D0/EnSda_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sda_0x809468D0/EnSda_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sda_0x809468D0/EnSda_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sda_0x809468D0/func_809469C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sda_0x809468D0/func_8094702C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sda_0x809468D0/func_80947668.asm") diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.h b/src/overlays/actors/ovl_En_Sda/z_en_sda.h new file mode 100644 index 0000000000..13b1befc4a --- /dev/null +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.h @@ -0,0 +1,14 @@ +#ifndef Z_EN_SDA_H +#define Z_EN_SDA_H + +#include + +struct EnSda; + +typedef struct EnSda { + /* 0x000 */ Actor actor; +} EnSda; // size = 0x144 + +extern const ActorInit En_Sda_InitVars; + +#endif // Z_EN_SDA_H diff --git a/src/overlays/actors/ovl_En_Sekihi/overlay.cfg b/src/overlays/actors/ovl_En_Sekihi/overlay.cfg new file mode 100644 index 0000000000..96c2eae2ff --- /dev/null +++ b/src/overlays/actors/ovl_En_Sekihi/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Sekihi +z_en_sekihi.c diff --git a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c new file mode 100644 index 0000000000..5c0f64f109 --- /dev/null +++ b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c @@ -0,0 +1,39 @@ +#include "z_en_sekihi.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnSekihi*)thisx) + +void EnSekihi_Init(Actor* thisx, GlobalContext* globalCtx); +void EnSekihi_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnSekihi_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Sekihi_InitVars = { + ACTOR_EN_SEKIHI, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnSekihi), + (ActorFunc)EnSekihi_Init, + (ActorFunc)EnSekihi_Destroy, + (ActorFunc)EnSekihi_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sekihi_0x80A44C80/EnSekihi_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sekihi_0x80A44C80/EnSekihi_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sekihi_0x80A44C80/func_80A44DE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sekihi_0x80A44C80/func_80A44F40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sekihi_0x80A44C80/func_80A450B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sekihi_0x80A44C80/func_80A45130.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sekihi_0x80A44C80/EnSekihi_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sekihi_0x80A44C80/func_80A45164.asm") diff --git a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.h b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.h new file mode 100644 index 0000000000..d9b011711e --- /dev/null +++ b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_SEKIHI_H +#define Z_EN_SEKIHI_H + +#include + +struct EnSekihi; + +typedef struct EnSekihi { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x28]; +} EnSekihi; // size = 0x16C + +extern const ActorInit En_Sekihi_InitVars; + +#endif // Z_EN_SEKIHI_H diff --git a/src/overlays/actors/ovl_En_Sellnuts/overlay.cfg b/src/overlays/actors/ovl_En_Sellnuts/overlay.cfg new file mode 100644 index 0000000000..f3b9a3eca1 --- /dev/null +++ b/src/overlays/actors/ovl_En_Sellnuts/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Sellnuts +z_en_sellnuts.c diff --git a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c new file mode 100644 index 0000000000..c6b67160dc --- /dev/null +++ b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c @@ -0,0 +1,100 @@ +#include "z_en_sellnuts.h" + +#define FLAGS 0x00000039 + +#define THIS ((EnSellnuts*)thisx) + +void EnSellnuts_Init(Actor* thisx, GlobalContext* globalCtx); +void EnSellnuts_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnSellnuts_Update(Actor* thisx, GlobalContext* globalCtx); +void EnSellnuts_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Sellnuts_InitVars = { + ACTOR_EN_SELLNUTS, + ACTORTYPE_NPC, + FLAGS, + OBJECT_DNT, + sizeof(EnSellnuts), + (ActorFunc)EnSellnuts_Init, + (ActorFunc)EnSellnuts_Destroy, + (ActorFunc)EnSellnuts_Update, + (ActorFunc)EnSellnuts_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADADD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADAE64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADAFC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADB040.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADB08C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADB0D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADB254.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADB4F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADB544.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADB924.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADBAB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADBBEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADBC60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADBCE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADBD64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADBE80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADBFA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADC034.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADC118.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADC2CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADC37C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADC580.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADC5A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADC6D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADC7B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADC8C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADCA64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADCC04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADCD3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADCE4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADCFE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/EnSellnuts_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/EnSellnuts_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/EnSellnuts_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADD4E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADD7B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/func_80ADD7CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sellnuts_0x80ADADD0/EnSellnuts_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.h b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.h new file mode 100644 index 0000000000..912a9a5203 --- /dev/null +++ b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_SELLNUTS_H +#define Z_EN_SELLNUTS_H + +#include + +struct EnSellnuts; + +typedef struct EnSellnuts { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x234]; +} EnSellnuts; // size = 0x378 + +extern const ActorInit En_Sellnuts_InitVars; + +#endif // Z_EN_SELLNUTS_H diff --git a/src/overlays/actors/ovl_En_Shn/overlay.cfg b/src/overlays/actors/ovl_En_Shn/overlay.cfg new file mode 100644 index 0000000000..f0526f58cd --- /dev/null +++ b/src/overlays/actors/ovl_En_Shn/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Shn +z_en_shn.c diff --git a/src/overlays/actors/ovl_En_Shn/z_en_shn.c b/src/overlays/actors/ovl_En_Shn/z_en_shn.c new file mode 100644 index 0000000000..64ac7f772f --- /dev/null +++ b/src/overlays/actors/ovl_En_Shn/z_en_shn.c @@ -0,0 +1,64 @@ +#include "z_en_shn.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnShn*)thisx) + +void EnShn_Init(Actor* thisx, GlobalContext* globalCtx); +void EnShn_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnShn_Update(Actor* thisx, GlobalContext* globalCtx); +void EnShn_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Shn_InitVars = { + ACTOR_EN_SHN, + ACTORTYPE_NPC, + FLAGS, + OBJECT_SHN, + sizeof(EnShn), + (ActorFunc)EnShn_Init, + (ActorFunc)EnShn_Destroy, + (ActorFunc)EnShn_Update, + (ActorFunc)EnShn_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE6130.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE615C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE61C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE625C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE626C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE63A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE6488.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE65F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE6704.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE6880.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE68F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE69E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE6A64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/EnShn_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/EnShn_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/EnShn_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE6CF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE6D40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/func_80AE6D90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Shn_0x80AE6130/EnShn_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Shn/z_en_shn.h b/src/overlays/actors/ovl_En_Shn/z_en_shn.h new file mode 100644 index 0000000000..996c6ee5ed --- /dev/null +++ b/src/overlays/actors/ovl_En_Shn/z_en_shn.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_SHN_H +#define Z_EN_SHN_H + +#include + +struct EnShn; + +typedef struct EnShn { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1AC]; +} EnShn; // size = 0x2F0 + +extern const ActorInit En_Shn_InitVars; + +#endif // Z_EN_SHN_H diff --git a/src/overlays/actors/ovl_En_Si/overlay.cfg b/src/overlays/actors/ovl_En_Si/overlay.cfg new file mode 100644 index 0000000000..67fe955184 --- /dev/null +++ b/src/overlays/actors/ovl_En_Si/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Si +z_en_si.c diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.c b/src/overlays/actors/ovl_En_Si/z_en_si.c new file mode 100644 index 0000000000..5a3a9bcb5e --- /dev/null +++ b/src/overlays/actors/ovl_En_Si/z_en_si.c @@ -0,0 +1,40 @@ +#include "z_en_si.h" + +#define FLAGS 0x00000201 + +#define THIS ((EnSi*)thisx) + +void EnSi_Init(Actor* thisx, GlobalContext* globalCtx); +void EnSi_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnSi_Update(Actor* thisx, GlobalContext* globalCtx); +void EnSi_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Si_InitVars = { + ACTOR_EN_SI, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_ST, + sizeof(EnSi), + (ActorFunc)EnSi_Init, + (ActorFunc)EnSi_Destroy, + (ActorFunc)EnSi_Update, + (ActorFunc)EnSi_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Si_0x8098CA20/func_8098CA20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Si_0x8098CA20/func_8098CAD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Si_0x8098CA20/func_8098CB70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Si_0x8098CA20/func_8098CBDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Si_0x8098CA20/EnSi_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Si_0x8098CA20/EnSi_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Si_0x8098CA20/EnSi_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Si_0x8098CA20/EnSi_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.h b/src/overlays/actors/ovl_En_Si/z_en_si.h new file mode 100644 index 0000000000..f05dab2606 --- /dev/null +++ b/src/overlays/actors/ovl_En_Si/z_en_si.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_SI_H +#define Z_EN_SI_H + +#include + +struct EnSi; + +typedef struct EnSi { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x5C]; +} EnSi; // size = 0x1A0 + +extern const ActorInit En_Si_InitVars; + +#endif // Z_EN_SI_H diff --git a/src/overlays/actors/ovl_En_Skb/overlay.cfg b/src/overlays/actors/ovl_En_Skb/overlay.cfg new file mode 100644 index 0000000000..dfa528943e --- /dev/null +++ b/src/overlays/actors/ovl_En_Skb/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Skb +z_en_skb.c diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c new file mode 100644 index 0000000000..526716242f --- /dev/null +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -0,0 +1,132 @@ +#include "z_en_skb.h" + +#define FLAGS 0x00000005 + +#define THIS ((EnSkb*)thisx) + +void EnSkb_Init(Actor* thisx, GlobalContext* globalCtx); +void EnSkb_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnSkb_Update(Actor* thisx, GlobalContext* globalCtx); +void EnSkb_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Skb_InitVars = { + ACTOR_EN_SKB, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_SKB, + sizeof(EnSkb), + (ActorFunc)EnSkb_Init, + (ActorFunc)EnSkb_Destroy, + (ActorFunc)EnSkb_Update, + (ActorFunc)EnSkb_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809947B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_8099495C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809949C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80994A30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80994A9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/EnSkb_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/EnSkb_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80994DA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80994E2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80994E94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80994F7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_8099504C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995068.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995190.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995244.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809952D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_8099533C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809953E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_8099544C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809954F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_8099556C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_8099571C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995818.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809958F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_8099599C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995A30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995A8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995C24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995C84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995D3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995DC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995E08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995E64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80995F98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809960AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809961E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80996284.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809962D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_8099630C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809963C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809963D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80996474.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809964A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809964DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80996544.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80996594.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_8099672C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80996AD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80996BEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80996D68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/EnSkb_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_80996F78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/func_809970D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Skb_0x809947B0/EnSkb_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.h b/src/overlays/actors/ovl_En_Skb/z_en_skb.h new file mode 100644 index 0000000000..1a4b985e46 --- /dev/null +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_SKB_H +#define Z_EN_SKB_H + +#include + +struct EnSkb; + +typedef struct EnSkb { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2A4]; +} EnSkb; // size = 0x3E8 + +extern const ActorInit En_Skb_InitVars; + +#endif // Z_EN_SKB_H diff --git a/src/overlays/actors/ovl_En_Slime/overlay.cfg b/src/overlays/actors/ovl_En_Slime/overlay.cfg new file mode 100644 index 0000000000..ad13869e8c --- /dev/null +++ b/src/overlays/actors/ovl_En_Slime/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Slime +z_en_slime.c diff --git a/src/overlays/actors/ovl_En_Slime/z_en_slime.c b/src/overlays/actors/ovl_En_Slime/z_en_slime.c new file mode 100644 index 0000000000..bb134714cc --- /dev/null +++ b/src/overlays/actors/ovl_En_Slime/z_en_slime.c @@ -0,0 +1,106 @@ +#include "z_en_slime.h" + +#define FLAGS 0x00000215 + +#define THIS ((EnSlime*)thisx) + +void EnSlime_Init(Actor* thisx, GlobalContext* globalCtx); +void EnSlime_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnSlime_Update(Actor* thisx, GlobalContext* globalCtx); +void EnSlime_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Slime_InitVars = { + ACTOR_EN_SLIME, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_SLIME, + sizeof(EnSlime), + (ActorFunc)EnSlime_Init, + (ActorFunc)EnSlime_Destroy, + (ActorFunc)EnSlime_Update, + (ActorFunc)EnSlime_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/EnSlime_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/EnSlime_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2EFAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F028.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F0A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F110.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F140.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F180.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F1A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F354.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F418.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F684.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F6CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F8B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F8E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2F9A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2FA88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2FB60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2FBA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2FD94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A2FE38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30018.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30344.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30454.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A304B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A3072C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30778.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30820.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30924.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30944.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A309C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30A20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30A90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30AE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30BE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30C2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30C68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30CEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/func_80A30F98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/EnSlime_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Slime_0x80A2EDA0/EnSlime_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Slime/z_en_slime.h b/src/overlays/actors/ovl_En_Slime/z_en_slime.h new file mode 100644 index 0000000000..4d45ef5629 --- /dev/null +++ b/src/overlays/actors/ovl_En_Slime/z_en_slime.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_SLIME_H +#define Z_EN_SLIME_H + +#include + +struct EnSlime; + +typedef struct EnSlime { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xC4]; +} EnSlime; // size = 0x208 + +extern const ActorInit En_Slime_InitVars; + +#endif // Z_EN_SLIME_H diff --git a/src/overlays/actors/ovl_En_Snowman/overlay.cfg b/src/overlays/actors/ovl_En_Snowman/overlay.cfg new file mode 100644 index 0000000000..97b6aa6e91 --- /dev/null +++ b/src/overlays/actors/ovl_En_Snowman/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Snowman +z_en_snowman.c diff --git a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c new file mode 100644 index 0000000000..1784fec113 --- /dev/null +++ b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c @@ -0,0 +1,102 @@ +#include "z_en_snowman.h" + +#define FLAGS 0x00000005 + +#define THIS ((EnSnowman*)thisx) + +void EnSnowman_Init(Actor* thisx, GlobalContext* globalCtx); +void EnSnowman_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnSnowman_Update(Actor* thisx, GlobalContext* globalCtx); +void EnSnowman_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Snowman_InitVars = { + ACTOR_EN_SNOWMAN, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_SNOWMAN, + sizeof(EnSnowman), + (ActorFunc)EnSnowman_Init, + (ActorFunc)EnSnowman_Destroy, + (ActorFunc)EnSnowman_Update, + (ActorFunc)EnSnowman_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/EnSnowman_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/EnSnowman_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B16FC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B17144.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B173D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B1746C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B177EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B178B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B179D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B17A58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B17CE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B17D78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B17EB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B17EFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B17F4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B17FE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B180A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B18124.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B18380.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B183A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B183C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B1848C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B18600.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B1861C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B18908.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B189C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B189D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B18A04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B18A28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B18B30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B18BB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B18C7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B18F50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/EnSnowman_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B19474.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B19718.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/EnSnowman_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B19948.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowman_0x80B16B00/func_80B19998.asm") diff --git a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.h b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.h new file mode 100644 index 0000000000..3f7930a2a6 --- /dev/null +++ b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_SNOWMAN_H +#define Z_EN_SNOWMAN_H + +#include + +struct EnSnowman; + +typedef struct EnSnowman { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x234]; +} EnSnowman; // size = 0x378 + +extern const ActorInit En_Snowman_InitVars; + +#endif // Z_EN_SNOWMAN_H diff --git a/src/overlays/actors/ovl_En_Snowwd/overlay.cfg b/src/overlays/actors/ovl_En_Snowwd/overlay.cfg new file mode 100644 index 0000000000..4a44958334 --- /dev/null +++ b/src/overlays/actors/ovl_En_Snowwd/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Snowwd +z_en_snowwd.c diff --git a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c new file mode 100644 index 0000000000..f6344ea58d --- /dev/null +++ b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c @@ -0,0 +1,34 @@ +#include "z_en_snowwd.h" + +#define FLAGS 0x00000000 + +#define THIS ((EnSnowwd*)thisx) + +void EnSnowwd_Init(Actor* thisx, GlobalContext* globalCtx); +void EnSnowwd_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnSnowwd_Update(Actor* thisx, GlobalContext* globalCtx); +void EnSnowwd_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Snowwd_InitVars = { + ACTOR_EN_SNOWWD, + ACTORTYPE_PROP, + FLAGS, + OBJECT_SNOWWD, + sizeof(EnSnowwd), + (ActorFunc)EnSnowwd_Init, + (ActorFunc)EnSnowwd_Destroy, + (ActorFunc)EnSnowwd_Update, + (ActorFunc)EnSnowwd_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowwd_0x80AF7640/EnSnowwd_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowwd_0x80AF7640/EnSnowwd_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowwd_0x80AF7640/func_80AF76F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowwd_0x80AF7640/EnSnowwd_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Snowwd_0x80AF7640/EnSnowwd_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.h b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.h new file mode 100644 index 0000000000..1cf6f8633d --- /dev/null +++ b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_SNOWWD_H +#define Z_EN_SNOWWD_H + +#include + +struct EnSnowwd; + +typedef struct EnSnowwd { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x54]; +} EnSnowwd; // size = 0x198 + +extern const ActorInit En_Snowwd_InitVars; + +#endif // Z_EN_SNOWWD_H diff --git a/src/overlays/actors/ovl_En_Sob1/overlay.cfg b/src/overlays/actors/ovl_En_Sob1/overlay.cfg new file mode 100644 index 0000000000..cd2fa2a2ea --- /dev/null +++ b/src/overlays/actors/ovl_En_Sob1/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Sob1 +z_en_sob1.c diff --git a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c new file mode 100644 index 0000000000..e4250f29ed --- /dev/null +++ b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c @@ -0,0 +1,175 @@ +#include "z_en_sob1.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnSob1*)thisx) + +void EnSob1_Init(Actor* thisx, GlobalContext* globalCtx); +void EnSob1_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnSob1_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Sob1_InitVars = { + ACTOR_EN_OSSAN, + ACTORTYPE_NPC, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnSob1), + (ActorFunc)EnSob1_Init, + (ActorFunc)EnSob1_Destroy, + (ActorFunc)EnSob1_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0C810.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0C8AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0C8B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0C938.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0CA38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0CC88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0CCEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0CD48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0CE10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/EnSob1_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/EnSob1_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D034.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D0B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D188.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D1F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D258.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D2B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D320.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D388.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D3C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D414.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D4A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D628.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D74C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D77C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D850.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0D904.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0DA5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0DAAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0DB78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0DCC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0DD40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0DE64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0DFD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0E0C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0E1B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0E258.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0E330.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0E420.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0E4DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0E518.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0E554.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0E884.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0E96C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0E9E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0EA84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0EAF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0EBC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0EC98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0ED7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0EDA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0EE3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0EEC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0EF48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0F014.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0F1C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0F284.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0F2C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0F2FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0F39C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0F3D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0F470.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0F554.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0F638.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0F6B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/EnSob1_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0FADC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0FD4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A0FEE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A10290.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A102C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A10308.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A10344.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A10368.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A104E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sob1_0x80A0C810/func_80A10608.asm") diff --git a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.h b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.h new file mode 100644 index 0000000000..47db68a5dd --- /dev/null +++ b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_SOB1_H +#define Z_EN_SOB1_H + +#include + +struct EnSob1; + +typedef struct EnSob1 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x28C]; +} EnSob1; // size = 0x3D0 + +extern const ActorInit En_Sob1_InitVars; + +#endif // Z_EN_SOB1_H diff --git a/src/overlays/actors/ovl_En_Ssh/overlay.cfg b/src/overlays/actors/ovl_En_Ssh/overlay.cfg new file mode 100644 index 0000000000..f8a88c0bed --- /dev/null +++ b/src/overlays/actors/ovl_En_Ssh/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Ssh +z_en_ssh.c diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c new file mode 100644 index 0000000000..35320336e8 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -0,0 +1,118 @@ +#include "z_en_ssh.h" + +#define FLAGS 0x00000035 + +#define THIS ((EnSsh*)thisx) + +void EnSsh_Init(Actor* thisx, GlobalContext* globalCtx); +void EnSsh_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnSsh_Update(Actor* thisx, GlobalContext* globalCtx); +void EnSsh_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Ssh_InitVars = { + ACTOR_EN_SSH, + ACTORTYPE_NPC, + FLAGS, + OBJECT_SSH, + sizeof(EnSsh), + (ActorFunc)EnSsh_Init, + (ActorFunc)EnSsh_Destroy, + (ActorFunc)EnSsh_Update, + (ActorFunc)EnSsh_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80973EF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80973EFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80973F84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974080.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974118.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974220.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_8097424C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974374.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_809744A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_809744C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_809744FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974540.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974590.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_809745BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974730.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_8097480C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_809748DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_8097497C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_809749B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974A24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974B0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974B44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974B84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974CC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974D3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974E44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974EA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80974F78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_8097502C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80975070.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80975128.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80975300.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/EnSsh_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/EnSsh_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_809755C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_8097561C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_809756D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80975720.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_809758B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80975998.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80975A98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80975B6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80975C14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/EnSsh_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80975DBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/func_80975EB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Ssh_0x80973EF0/EnSsh_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h new file mode 100644 index 0000000000..8b12b91633 --- /dev/null +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_SSH_H +#define Z_EN_SSH_H + +#include + +struct EnSsh; + +typedef struct EnSsh { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x488]; +} EnSsh; // size = 0x5CC + +extern const ActorInit En_Ssh_InitVars; + +#endif // Z_EN_SSH_H diff --git a/src/overlays/actors/ovl_En_St/overlay.cfg b/src/overlays/actors/ovl_En_St/overlay.cfg new file mode 100644 index 0000000000..b384f8265a --- /dev/null +++ b/src/overlays/actors/ovl_En_St/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_St +z_en_st.c diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c new file mode 100644 index 0000000000..6273573985 --- /dev/null +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -0,0 +1,83 @@ +#include "z_en_st.h" + +#define FLAGS 0x01004035 + +#define THIS ((EnSt*)thisx) + +void EnSt_Init(Actor* thisx, GlobalContext* globalCtx); +void EnSt_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnSt_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_St_InitVars = { + ACTOR_EN_ST, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_ST, + sizeof(EnSt), + (ActorFunc)EnSt_Init, + (ActorFunc)EnSt_Destroy, + (ActorFunc)EnSt_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A5050.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A52A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A54B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A576C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A5988.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A5AF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A5BEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A5CCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A5D7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A5DCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A5F28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A6064.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A60E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A61F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A6220.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A63E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A6468.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A650C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A6580.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A6A3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A6A78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A6C04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A6D84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A6E24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A701C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/EnSt_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/EnSt_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/EnSt_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A73E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_St_0x808A5050/func_808A7478.asm") diff --git a/src/overlays/actors/ovl_En_St/z_en_st.h b/src/overlays/actors/ovl_En_St/z_en_st.h new file mode 100644 index 0000000000..015dbfae20 --- /dev/null +++ b/src/overlays/actors/ovl_En_St/z_en_st.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ST_H +#define Z_EN_ST_H + +#include + +struct EnSt; + +typedef struct EnSt { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x40C]; +} EnSt; // size = 0x550 + +extern const ActorInit En_St_InitVars; + +#endif // Z_EN_ST_H diff --git a/src/overlays/actors/ovl_En_Sth/overlay.cfg b/src/overlays/actors/ovl_En_Sth/overlay.cfg new file mode 100644 index 0000000000..9420fb8f13 --- /dev/null +++ b/src/overlays/actors/ovl_En_Sth/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Sth +z_en_sth.c diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/src/overlays/actors/ovl_En_Sth/z_en_sth.c new file mode 100644 index 0000000000..dda4678352 --- /dev/null +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -0,0 +1,75 @@ +#include "z_en_sth.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnSth*)thisx) + +void EnSth_Init(Actor* thisx, GlobalContext* globalCtx); +void EnSth_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnSth_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Sth_InitVars = { + ACTOR_EN_STH, + ACTORTYPE_NPC, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnSth), + (ActorFunc)EnSth_Init, + (ActorFunc)EnSth_Destroy, + (ActorFunc)EnSth_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/EnSth_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/EnSth_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B6703C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B670A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67148.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B671A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67208.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B672A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67348.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67458.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67540.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B677BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67838.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B678A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67958.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67984.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67AB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67B50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67C1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67DA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B67E20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/EnSth_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B680A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B681E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B68310.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth_0x80B66D30/func_80B6849C.asm") diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.h b/src/overlays/actors/ovl_En_Sth/z_en_sth.h new file mode 100644 index 0000000000..b6989be3b4 --- /dev/null +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_STH_H +#define Z_EN_STH_H + +#include + +struct EnSth; + +typedef struct EnSth { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x160]; +} EnSth; // size = 0x2A4 + +extern const ActorInit En_Sth_InitVars; + +#endif // Z_EN_STH_H diff --git a/src/overlays/actors/ovl_En_Sth2/overlay.cfg b/src/overlays/actors/ovl_En_Sth2/overlay.cfg new file mode 100644 index 0000000000..594b965737 --- /dev/null +++ b/src/overlays/actors/ovl_En_Sth2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Sth2 +z_en_sth2.c diff --git a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c new file mode 100644 index 0000000000..87614c0e05 --- /dev/null +++ b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c @@ -0,0 +1,39 @@ +#include "z_en_sth2.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnSth2*)thisx) + +void EnSth2_Init(Actor* thisx, GlobalContext* globalCtx); +void EnSth2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnSth2_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Sth2_InitVars = { + ACTOR_EN_STH2, + ACTORTYPE_NPC, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnSth2), + (ActorFunc)EnSth2_Init, + (ActorFunc)EnSth2_Destroy, + (ActorFunc)EnSth2_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth2_0x80BF74E0/EnSth2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth2_0x80BF74E0/EnSth2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth2_0x80BF74E0/func_80BF75A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth2_0x80BF74E0/EnSth2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth2_0x80BF74E0/func_80BF7688.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth2_0x80BF74E0/func_80BF76AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth2_0x80BF74E0/func_80BF77AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sth2_0x80BF74E0/func_80BF7814.asm") diff --git a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.h b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.h new file mode 100644 index 0000000000..7f13e13e36 --- /dev/null +++ b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_STH2_H +#define Z_EN_STH2_H + +#include + +struct EnSth2; + +typedef struct EnSth2 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x10C]; +} EnSth2; // size = 0x250 + +extern const ActorInit En_Sth2_InitVars; + +#endif // Z_EN_STH2_H diff --git a/src/overlays/actors/ovl_En_Stone_heishi/overlay.cfg b/src/overlays/actors/ovl_En_Stone_heishi/overlay.cfg new file mode 100644 index 0000000000..743a4bb0f1 --- /dev/null +++ b/src/overlays/actors/ovl_En_Stone_heishi/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Stone_heishi +z_en_stone_heishi.c diff --git a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c new file mode 100644 index 0000000000..cd0254b493 --- /dev/null +++ b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c @@ -0,0 +1,62 @@ +#include "z_en_stone_heishi.h" + +#define FLAGS 0x00000089 + +#define THIS ((EnStoneheishi*)thisx) + +void EnStoneheishi_Init(Actor* thisx, GlobalContext* globalCtx); +void EnStoneheishi_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnStoneheishi_Update(Actor* thisx, GlobalContext* globalCtx); +void EnStoneheishi_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Stone_heishi_InitVars = { + ACTOR_EN_STONE_HEISHI, + ACTORTYPE_NPC, + FLAGS, + OBJECT_SDN, + sizeof(EnStoneheishi), + (ActorFunc)EnStoneheishi_Init, + (ActorFunc)EnStoneheishi_Destroy, + (ActorFunc)EnStoneheishi_Update, + (ActorFunc)EnStoneheishi_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/EnStoneheishi_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/EnStoneheishi_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC935C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC941C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC94B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC9560.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC9660.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC9680.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC98EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC9908.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC9A10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC9A2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC9C88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC9D28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BC9E50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/EnStoneheishi_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BCA0AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/func_80BCA104.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stone_heishi_0x80BC9270/EnStoneheishi_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.h b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.h new file mode 100644 index 0000000000..ed5acf4225 --- /dev/null +++ b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_STONE_HEISHI_H +#define Z_EN_STONE_HEISHI_H + +#include + +struct EnStoneheishi; + +typedef struct EnStoneheishi { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x180]; +} EnStoneheishi; // size = 0x2C4 + +extern const ActorInit En_Stone_heishi_InitVars; + +#endif // Z_EN_STONE_HEISHI_H diff --git a/src/overlays/actors/ovl_En_Stop_heishi/overlay.cfg b/src/overlays/actors/ovl_En_Stop_heishi/overlay.cfg new file mode 100644 index 0000000000..cf5960b30a --- /dev/null +++ b/src/overlays/actors/ovl_En_Stop_heishi/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Stop_heishi +z_en_stop_heishi.c diff --git a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c new file mode 100644 index 0000000000..34ee2b3fa3 --- /dev/null +++ b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c @@ -0,0 +1,54 @@ +#include "z_en_stop_heishi.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnStopheishi*)thisx) + +void EnStopheishi_Init(Actor* thisx, GlobalContext* globalCtx); +void EnStopheishi_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnStopheishi_Update(Actor* thisx, GlobalContext* globalCtx); +void EnStopheishi_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Stop_heishi_InitVars = { + ACTOR_EN_STOP_HEISHI, + ACTORTYPE_NPC, + FLAGS, + OBJECT_SDN, + sizeof(EnStopheishi), + (ActorFunc)EnStopheishi_Init, + (ActorFunc)EnStopheishi_Destroy, + (ActorFunc)EnStopheishi_Update, + (ActorFunc)EnStopheishi_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/EnStopheishi_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/EnStopheishi_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/func_80AE750C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/func_80AE75C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/func_80AE7718.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/func_80AE77D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/func_80AE795C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/func_80AE7E9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/func_80AE7F34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/func_80AE854C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/func_80AE85C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/EnStopheishi_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/func_80AE87A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/func_80AE87EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stop_heishi_0x80AE73A0/EnStopheishi_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.h b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.h new file mode 100644 index 0000000000..095b1f00aa --- /dev/null +++ b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_STOP_HEISHI_H +#define Z_EN_STOP_HEISHI_H + +#include + +struct EnStopheishi; + +typedef struct EnStopheishi { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1A4]; +} EnStopheishi; // size = 0x2E8 + +extern const ActorInit En_Stop_heishi_InitVars; + +#endif // Z_EN_STOP_HEISHI_H diff --git a/src/overlays/actors/ovl_En_Stream/overlay.cfg b/src/overlays/actors/ovl_En_Stream/overlay.cfg new file mode 100644 index 0000000000..3789ae1fee --- /dev/null +++ b/src/overlays/actors/ovl_En_Stream/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Stream +z_en_stream.c diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.c b/src/overlays/actors/ovl_En_Stream/z_en_stream.c new file mode 100644 index 0000000000..75d97ba812 --- /dev/null +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -0,0 +1,40 @@ +#include "z_en_stream.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnStream*)thisx) + +void EnStream_Init(Actor* thisx, GlobalContext* globalCtx); +void EnStream_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnStream_Update(Actor* thisx, GlobalContext* globalCtx); +void EnStream_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Stream_InitVars = { + ACTOR_EN_STREAM, + ACTORTYPE_BG, + FLAGS, + OBJECT_STREAM, + sizeof(EnStream), + (ActorFunc)EnStream_Init, + (ActorFunc)EnStream_Destroy, + (ActorFunc)EnStream_Update, + (ActorFunc)EnStream_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stream_0x80965650/func_80965650.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stream_0x80965650/EnStream_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stream_0x80965650/EnStream_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stream_0x80965650/func_809656D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stream_0x80965650/func_809657F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stream_0x80965650/func_8096597C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stream_0x80965650/EnStream_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Stream_0x80965650/EnStream_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.h b/src/overlays/actors/ovl_En_Stream/z_en_stream.h new file mode 100644 index 0000000000..30800e785c --- /dev/null +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_STREAM_H +#define Z_EN_STREAM_H + +#include + +struct EnStream; + +typedef struct EnStream { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xC]; +} EnStream; // size = 0x150 + +extern const ActorInit En_Stream_InitVars; + +#endif // Z_EN_STREAM_H diff --git a/src/overlays/actors/ovl_En_Suttari/overlay.cfg b/src/overlays/actors/ovl_En_Suttari/overlay.cfg new file mode 100644 index 0000000000..9eea97af53 --- /dev/null +++ b/src/overlays/actors/ovl_En_Suttari/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Suttari +z_en_suttari.c diff --git a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c new file mode 100644 index 0000000000..54fe9dc879 --- /dev/null +++ b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c @@ -0,0 +1,130 @@ +#include "z_en_suttari.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnSuttari*)thisx) + +void EnSuttari_Init(Actor* thisx, GlobalContext* globalCtx); +void EnSuttari_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnSuttari_Update(Actor* thisx, GlobalContext* globalCtx); +void EnSuttari_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Suttari_InitVars = { + ACTOR_EN_SUTTARI, + ACTORTYPE_NPC, + FLAGS, + OBJECT_BOJ, + sizeof(EnSuttari), + (ActorFunc)EnSuttari_Init, + (ActorFunc)EnSuttari_Destroy, + (ActorFunc)EnSuttari_Update, + (ActorFunc)EnSuttari_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAA6D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAA848.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAA88C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAA8D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAA904.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAA9B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAAA94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAAB78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAAF1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAAFDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAB1A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAB374.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAB434.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAB490.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAB4F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAB698.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAB758.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAB8F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BABA90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BABB90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BABC48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BABDD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BABF64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BABFD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAC220.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAC2FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAC6E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BACA14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BACBB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BACD2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BACE4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BACEE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAD004.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAD130.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAD230.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAD2B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAD380.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAD5F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAD7F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BADA08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BADA9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BADD0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BADDB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BADE14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BADE8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BADF3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/EnSuttari_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/EnSuttari_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/EnSuttari_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAE250.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAE3C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/func_80BAE524.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Suttari_0x80BAA6D0/EnSuttari_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.h b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.h new file mode 100644 index 0000000000..16b58369fe --- /dev/null +++ b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_SUTTARI_H +#define Z_EN_SUTTARI_H + +#include + +struct EnSuttari; + +typedef struct EnSuttari { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x318]; +} EnSuttari; // size = 0x45C + +extern const ActorInit En_Suttari_InitVars; + +#endif // Z_EN_SUTTARI_H diff --git a/src/overlays/actors/ovl_En_Sw/overlay.cfg b/src/overlays/actors/ovl_En_Sw/overlay.cfg new file mode 100644 index 0000000000..af7fca6eaa --- /dev/null +++ b/src/overlays/actors/ovl_En_Sw/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Sw +z_en_sw.c diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/src/overlays/actors/ovl_En_Sw/z_en_sw.c new file mode 100644 index 0000000000..3f2dec9a33 --- /dev/null +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -0,0 +1,100 @@ +#include "z_en_sw.h" + +#define FLAGS 0x00000005 + +#define THIS ((EnSw*)thisx) + +void EnSw_Init(Actor* thisx, GlobalContext* globalCtx); +void EnSw_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnSw_Update(Actor* thisx, GlobalContext* globalCtx); +void EnSw_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Sw_InitVars = { + ACTOR_EN_SW, + ACTORTYPE_NPC, + FLAGS, + OBJECT_ST, + sizeof(EnSw), + (ActorFunc)EnSw_Init, + (ActorFunc)EnSw_Destroy, + (ActorFunc)EnSw_Update, + (ActorFunc)EnSw_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D8940.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D8B58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D8D60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D8ED0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D8FC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D90C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D90F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D91C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D93BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D9440.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D94D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D9894.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D9968.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D99C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D9A70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D9C18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D9DA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D9E44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D9F08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808D9F78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DA024.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DA08C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DA350.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DA3F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DA578.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DA6FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DA89C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DAA60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DACF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DAEB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DB100.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DB25C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DB2E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/EnSw_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/EnSw_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/EnSw_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/func_808DB7F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Sw_0x808D8940/EnSw_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.h b/src/overlays/actors/ovl_En_Sw/z_en_sw.h new file mode 100644 index 0000000000..3a383a5d0d --- /dev/null +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_SW_H +#define Z_EN_SW_H + +#include + +struct EnSw; + +typedef struct EnSw { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x360]; +} EnSw; // size = 0x4A4 + +extern const ActorInit En_Sw_InitVars; + +#endif // Z_EN_SW_H diff --git a/src/overlays/actors/ovl_En_Syateki_Crow/overlay.cfg b/src/overlays/actors/ovl_En_Syateki_Crow/overlay.cfg new file mode 100644 index 0000000000..5a90d72e02 --- /dev/null +++ b/src/overlays/actors/ovl_En_Syateki_Crow/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Syateki_Crow +z_en_syateki_crow.c diff --git a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c new file mode 100644 index 0000000000..d5d13733ad --- /dev/null +++ b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c @@ -0,0 +1,52 @@ +#include "z_en_syateki_crow.h" + +#define FLAGS 0x08000030 + +#define THIS ((EnSyatekiCrow*)thisx) + +void EnSyatekiCrow_Init(Actor* thisx, GlobalContext* globalCtx); +void EnSyatekiCrow_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnSyatekiCrow_Update(Actor* thisx, GlobalContext* globalCtx); +void EnSyatekiCrow_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Syateki_Crow_InitVars = { + ACTOR_EN_SYATEKI_CROW, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_CROW, + sizeof(EnSyatekiCrow), + (ActorFunc)EnSyatekiCrow_Init, + (ActorFunc)EnSyatekiCrow_Destroy, + (ActorFunc)EnSyatekiCrow_Update, + (ActorFunc)EnSyatekiCrow_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/EnSyatekiCrow_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/EnSyatekiCrow_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/func_809CA5D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/func_809CA67C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/func_809CA71C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/func_809CA840.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/func_809CA8E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/func_809CAAF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/func_809CABC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/func_809CACD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/EnSyatekiCrow_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/func_809CAE5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/func_809CAF2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Crow_0x809CA3F0/EnSyatekiCrow_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.h b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.h new file mode 100644 index 0000000000..65f978f0a0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_SYATEKI_CROW_H +#define Z_EN_SYATEKI_CROW_H + +#include + +struct EnSyatekiCrow; + +typedef struct EnSyatekiCrow { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x158]; +} EnSyatekiCrow; // size = 0x29C + +extern const ActorInit En_Syateki_Crow_InitVars; + +#endif // Z_EN_SYATEKI_CROW_H diff --git a/src/overlays/actors/ovl_En_Syateki_Dekunuts/overlay.cfg b/src/overlays/actors/ovl_En_Syateki_Dekunuts/overlay.cfg new file mode 100644 index 0000000000..1165e9df02 --- /dev/null +++ b/src/overlays/actors/ovl_En_Syateki_Dekunuts/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Syateki_Dekunuts +z_en_syateki_dekunuts.c diff --git a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c new file mode 100644 index 0000000000..2976375d28 --- /dev/null +++ b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c @@ -0,0 +1,68 @@ +#include "z_en_syateki_dekunuts.h" + +#define FLAGS 0x08000030 + +#define THIS ((EnSyatekiDekunuts*)thisx) + +void EnSyatekiDekunuts_Init(Actor* thisx, GlobalContext* globalCtx); +void EnSyatekiDekunuts_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnSyatekiDekunuts_Update(Actor* thisx, GlobalContext* globalCtx); +void EnSyatekiDekunuts_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Syateki_Dekunuts_InitVars = { + ACTOR_EN_SYATEKI_DEKUNUTS, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_DEKUNUTS, + sizeof(EnSyatekiDekunuts), + (ActorFunc)EnSyatekiDekunuts_Init, + (ActorFunc)EnSyatekiDekunuts_Destroy, + (ActorFunc)EnSyatekiDekunuts_Update, + (ActorFunc)EnSyatekiDekunuts_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/EnSyatekiDekunuts_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/EnSyatekiDekunuts_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2BE54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2BF18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2BFC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C0F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C150.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C168.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C1AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C208.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C27C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C2E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C33C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C3AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C3F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C478.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C48C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C4D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C5DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/EnSyatekiDekunuts_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/func_80A2C8A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Dekunuts_0x80A2BC00/EnSyatekiDekunuts_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.h b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.h new file mode 100644 index 0000000000..36aeebbcf3 --- /dev/null +++ b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_SYATEKI_DEKUNUTS_H +#define Z_EN_SYATEKI_DEKUNUTS_H + +#include + +struct EnSyatekiDekunuts; + +typedef struct EnSyatekiDekunuts { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x12C]; +} EnSyatekiDekunuts; // size = 0x270 + +extern const ActorInit En_Syateki_Dekunuts_InitVars; + +#endif // Z_EN_SYATEKI_DEKUNUTS_H diff --git a/src/overlays/actors/ovl_En_Syateki_Man/overlay.cfg b/src/overlays/actors/ovl_En_Syateki_Man/overlay.cfg new file mode 100644 index 0000000000..492b143b5c --- /dev/null +++ b/src/overlays/actors/ovl_En_Syateki_Man/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Syateki_Man +z_en_syateki_man.c diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c new file mode 100644 index 0000000000..3cbd9ebd44 --- /dev/null +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c @@ -0,0 +1,88 @@ +#include "z_en_syateki_man.h" + +#define FLAGS 0x08000019 + +#define THIS ((EnSyatekiMan*)thisx) + +void EnSyatekiMan_Init(Actor* thisx, GlobalContext* globalCtx); +void EnSyatekiMan_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnSyatekiMan_Update(Actor* thisx, GlobalContext* globalCtx); +void EnSyatekiMan_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Syateki_Man_InitVars = { + ACTOR_EN_SYATEKI_MAN, + ACTORTYPE_NPC, + FLAGS, + OBJECT_SHN, + sizeof(EnSyatekiMan), + (ActorFunc)EnSyatekiMan_Init, + (ActorFunc)EnSyatekiMan_Destroy, + (ActorFunc)EnSyatekiMan_Update, + (ActorFunc)EnSyatekiMan_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C64C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/EnSyatekiMan_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/EnSyatekiMan_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C6720.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C6810.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C6848.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C6A04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C6C2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C6E30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C6F98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C72D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C7380.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C7620.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C7990.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C7A90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C7C14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C7D14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C7EB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C7FFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C80C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C81D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C8488.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C8610.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C8710.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C8808.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C898C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C8BF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C8DE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/EnSyatekiMan_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C8EE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/func_809C8FAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Man_0x809C64C0/EnSyatekiMan_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h new file mode 100644 index 0000000000..98cb6d4aec --- /dev/null +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_SYATEKI_MAN_H +#define Z_EN_SYATEKI_MAN_H + +#include + +struct EnSyatekiMan; + +typedef struct EnSyatekiMan { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x144]; +} EnSyatekiMan; // size = 0x288 + +extern const ActorInit En_Syateki_Man_InitVars; + +#endif // Z_EN_SYATEKI_MAN_H diff --git a/src/overlays/actors/ovl_En_Syateki_Okuta/overlay.cfg b/src/overlays/actors/ovl_En_Syateki_Okuta/overlay.cfg new file mode 100644 index 0000000000..5c4c2e7c53 --- /dev/null +++ b/src/overlays/actors/ovl_En_Syateki_Okuta/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Syateki_Okuta +z_en_syateki_okuta.c diff --git a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c new file mode 100644 index 0000000000..9e100a3f52 --- /dev/null +++ b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c @@ -0,0 +1,74 @@ +#include "z_en_syateki_okuta.h" + +#define FLAGS 0x08000030 + +#define THIS ((EnSyatekiOkuta*)thisx) + +void EnSyatekiOkuta_Init(Actor* thisx, GlobalContext* globalCtx); +void EnSyatekiOkuta_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnSyatekiOkuta_Update(Actor* thisx, GlobalContext* globalCtx); +void EnSyatekiOkuta_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Syateki_Okuta_InitVars = { + ACTOR_EN_SYATEKI_OKUTA, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_OKUTA, + sizeof(EnSyatekiOkuta), + (ActorFunc)EnSyatekiOkuta_Init, + (ActorFunc)EnSyatekiOkuta_Destroy, + (ActorFunc)EnSyatekiOkuta_Update, + (ActorFunc)EnSyatekiOkuta_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/EnSyatekiOkuta_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/EnSyatekiOkuta_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36148.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A361B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A361F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36260.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A362A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A362F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36350.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36360.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A363B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36444.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36488.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A364C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36504.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A3657C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A365EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A368E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36A90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36AF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/EnSyatekiOkuta_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A36CB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A370EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/func_80A37294.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Okuta_0x80A35FF0/EnSyatekiOkuta_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.h b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.h new file mode 100644 index 0000000000..023cdb34d0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_SYATEKI_OKUTA_H +#define Z_EN_SYATEKI_OKUTA_H + +#include + +struct EnSyatekiOkuta; + +typedef struct EnSyatekiOkuta { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x168]; +} EnSyatekiOkuta; // size = 0x2AC + +extern const ActorInit En_Syateki_Okuta_InitVars; + +#endif // Z_EN_SYATEKI_OKUTA_H diff --git a/src/overlays/actors/ovl_En_Syateki_Wf/overlay.cfg b/src/overlays/actors/ovl_En_Syateki_Wf/overlay.cfg new file mode 100644 index 0000000000..4a5373e732 --- /dev/null +++ b/src/overlays/actors/ovl_En_Syateki_Wf/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Syateki_Wf +z_en_syateki_wf.c diff --git a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c new file mode 100644 index 0000000000..caeb20b359 --- /dev/null +++ b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c @@ -0,0 +1,66 @@ +#include "z_en_syateki_wf.h" + +#define FLAGS 0x08000030 + +#define THIS ((EnSyatekiWf*)thisx) + +void EnSyatekiWf_Init(Actor* thisx, GlobalContext* globalCtx); +void EnSyatekiWf_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnSyatekiWf_Update(Actor* thisx, GlobalContext* globalCtx); +void EnSyatekiWf_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Syateki_Wf_InitVars = { + ACTOR_EN_SYATEKI_WF, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_WF, + sizeof(EnSyatekiWf), + (ActorFunc)EnSyatekiWf_Init, + (ActorFunc)EnSyatekiWf_Destroy, + (ActorFunc)EnSyatekiWf_Update, + (ActorFunc)EnSyatekiWf_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/EnSyatekiWf_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/EnSyatekiWf_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A200E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A201CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20284.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A2030C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20320.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20378.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A203DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20670.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A206DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20710.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A2075C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A2079C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20800.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20858.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A208F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/EnSyatekiWf_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20CF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/func_80A20D10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Syateki_Wf_0x80A1FE50/EnSyatekiWf_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.h b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.h new file mode 100644 index 0000000000..b3551aea14 --- /dev/null +++ b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_SYATEKI_WF_H +#define Z_EN_SYATEKI_WF_H + +#include + +struct EnSyatekiWf; + +typedef struct EnSyatekiWf { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x288]; +} EnSyatekiWf; // size = 0x3CC + +extern const ActorInit En_Syateki_Wf_InitVars; + +#endif // Z_EN_SYATEKI_WF_H diff --git a/src/overlays/actors/ovl_En_Tab/overlay.cfg b/src/overlays/actors/ovl_En_Tab/overlay.cfg new file mode 100644 index 0000000000..2342018302 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tab/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Tab +z_en_tab.c diff --git a/src/overlays/actors/ovl_En_Tab/z_en_tab.c b/src/overlays/actors/ovl_En_Tab/z_en_tab.c new file mode 100644 index 0000000000..ec5f42ce6f --- /dev/null +++ b/src/overlays/actors/ovl_En_Tab/z_en_tab.c @@ -0,0 +1,80 @@ +#include "z_en_tab.h" + +#define FLAGS 0x00000039 + +#define THIS ((EnTab*)thisx) + +void EnTab_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTab_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTab_Update(Actor* thisx, GlobalContext* globalCtx); +void EnTab_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Tab_InitVars = { + ACTOR_EN_TAB, + ACTORTYPE_NPC, + FLAGS, + OBJECT_TAB, + sizeof(EnTab), + (ActorFunc)EnTab_Init, + (ActorFunc)EnTab_Destroy, + (ActorFunc)EnTab_Update, + (ActorFunc)EnTab_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE04E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE0590.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE05BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE0620.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE0664.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE06DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE0778.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE07A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE09A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE0A98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE0C04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE0D38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE0D60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE0E04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE0F04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE0FC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE1060.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE10BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE1224.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE127C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE1348.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/EnTab_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/EnTab_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/EnTab_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE1648.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE16B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/func_80BE1704.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tab_0x80BE04E0/EnTab_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Tab/z_en_tab.h b/src/overlays/actors/ovl_En_Tab/z_en_tab.h new file mode 100644 index 0000000000..bee20da51d --- /dev/null +++ b/src/overlays/actors/ovl_En_Tab/z_en_tab.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TAB_H +#define Z_EN_TAB_H + +#include + +struct EnTab; + +typedef struct EnTab { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1F8]; +} EnTab; // size = 0x33C + +extern const ActorInit En_Tab_InitVars; + +#endif // Z_EN_TAB_H diff --git a/src/overlays/actors/ovl_En_Tag_Obj/overlay.cfg b/src/overlays/actors/ovl_En_Tag_Obj/overlay.cfg new file mode 100644 index 0000000000..0939c8b841 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tag_Obj/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Tag_Obj +z_en_tag_obj.c diff --git a/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c b/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c new file mode 100644 index 0000000000..ca4e276387 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c @@ -0,0 +1,29 @@ +#include "z_en_tag_obj.h" + +#define FLAGS 0x00000000 + +#define THIS ((EnTagObj*)thisx) + +void EnTagObj_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTagObj_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTagObj_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Tag_Obj_InitVars = { + ACTOR_EN_TAG_OBJ, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnTagObj), + (ActorFunc)EnTagObj_Init, + (ActorFunc)EnTagObj_Destroy, + (ActorFunc)EnTagObj_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tag_Obj_0x80B12870/EnTagObj_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tag_Obj_0x80B12870/EnTagObj_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tag_Obj_0x80B12870/EnTagObj_Update.asm") diff --git a/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.h b/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.h new file mode 100644 index 0000000000..3c1fbcda53 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TAG_OBJ_H +#define Z_EN_TAG_OBJ_H + +#include + +struct EnTagObj; + +typedef struct EnTagObj { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x54]; +} EnTagObj; // size = 0x198 + +extern const ActorInit En_Tag_Obj_InitVars; + +#endif // Z_EN_TAG_OBJ_H diff --git a/src/overlays/actors/ovl_En_Takaraya/overlay.cfg b/src/overlays/actors/ovl_En_Takaraya/overlay.cfg new file mode 100644 index 0000000000..3fbedd25e5 --- /dev/null +++ b/src/overlays/actors/ovl_En_Takaraya/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Takaraya +z_en_takaraya.c diff --git a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c new file mode 100644 index 0000000000..90d8d54d24 --- /dev/null +++ b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c @@ -0,0 +1,68 @@ +#include "z_en_takaraya.h" + +#define FLAGS 0x00000039 + +#define THIS ((EnTakaraya*)thisx) + +void EnTakaraya_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTakaraya_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTakaraya_Update(Actor* thisx, GlobalContext* globalCtx); +void EnTakaraya_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Takaraya_InitVars = { + ACTOR_EN_TAKARAYA, + ACTORTYPE_NPC, + FLAGS, + OBJECT_BG, + sizeof(EnTakaraya), + (ActorFunc)EnTakaraya_Init, + (ActorFunc)EnTakaraya_Destroy, + (ActorFunc)EnTakaraya_Update, + (ActorFunc)EnTakaraya_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/EnTakaraya_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/EnTakaraya_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADED8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADEDF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADEE4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADEF74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF03C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF050.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF2D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF338.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF4E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF520.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF608.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF654.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF6DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF730.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF7B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF7CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/EnTakaraya_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF94C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/func_80ADF984.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Takaraya_0x80ADEB90/EnTakaraya_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.h b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.h new file mode 100644 index 0000000000..0af9884c0f --- /dev/null +++ b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TAKARAYA_H +#define Z_EN_TAKARAYA_H + +#include + +struct EnTakaraya; + +typedef struct EnTakaraya { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x178]; +} EnTakaraya; // size = 0x2BC + +extern const ActorInit En_Takaraya_InitVars; + +#endif // Z_EN_TAKARAYA_H diff --git a/src/overlays/actors/ovl_En_Talk/overlay.cfg b/src/overlays/actors/ovl_En_Talk/overlay.cfg new file mode 100644 index 0000000000..3fed504a46 --- /dev/null +++ b/src/overlays/actors/ovl_En_Talk/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Talk +z_en_talk.c diff --git a/src/overlays/actors/ovl_En_Talk/z_en_talk.c b/src/overlays/actors/ovl_En_Talk/z_en_talk.c new file mode 100644 index 0000000000..b8895f9d95 --- /dev/null +++ b/src/overlays/actors/ovl_En_Talk/z_en_talk.c @@ -0,0 +1,33 @@ +#include "z_en_talk.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnTalk*)thisx) + +void EnTalk_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTalk_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTalk_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Talk_InitVars = { + ACTOR_EN_TALK, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnTalk), + (ActorFunc)EnTalk_Init, + (ActorFunc)EnTalk_Destroy, + (ActorFunc)EnTalk_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_0x80BDDFE0/EnTalk_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_0x80BDDFE0/EnTalk_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_0x80BDDFE0/func_80BDE058.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_0x80BDDFE0/func_80BDE090.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_0x80BDDFE0/EnTalk_Update.asm") diff --git a/src/overlays/actors/ovl_En_Talk/z_en_talk.h b/src/overlays/actors/ovl_En_Talk/z_en_talk.h new file mode 100644 index 0000000000..82b837585a --- /dev/null +++ b/src/overlays/actors/ovl_En_Talk/z_en_talk.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TALK_H +#define Z_EN_TALK_H + +#include + +struct EnTalk; + +typedef struct EnTalk { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4]; +} EnTalk; // size = 0x148 + +extern const ActorInit En_Talk_InitVars; + +#endif // Z_EN_TALK_H diff --git a/src/overlays/actors/ovl_En_Talk_Gibud/overlay.cfg b/src/overlays/actors/ovl_En_Talk_Gibud/overlay.cfg new file mode 100644 index 0000000000..9f776a0932 --- /dev/null +++ b/src/overlays/actors/ovl_En_Talk_Gibud/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Talk_Gibud +z_en_talk_gibud.c diff --git a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c new file mode 100644 index 0000000000..6465af284f --- /dev/null +++ b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c @@ -0,0 +1,124 @@ +#include "z_en_talk_gibud.h" + +#define FLAGS 0x00000415 + +#define THIS ((EnTalkGibud*)thisx) + +void EnTalkGibud_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTalkGibud_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTalkGibud_Update(Actor* thisx, GlobalContext* globalCtx); +void EnTalkGibud_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Talk_Gibud_InitVars = { + ACTOR_EN_TALK_GIBUD, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_RD, + sizeof(EnTalkGibud), + (ActorFunc)EnTalkGibud_Init, + (ActorFunc)EnTalkGibud_Destroy, + (ActorFunc)EnTalkGibud_Update, + (ActorFunc)EnTalkGibud_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/EnTalkGibud_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/EnTalkGibud_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFEB38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFEB7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFEC08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFEC4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFED08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFED7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFEFD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF030.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF22C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF288.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF330.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF378.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF45C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF4AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF618.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF6A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF700.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF76C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF880.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF8E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFF9CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFA68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFAB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFC10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFC9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFD3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFE3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFE94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFFA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80AFFFBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B000FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00158.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00384.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B0040C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00484.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B004D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B005EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00760.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B008BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B008FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B0094C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00B8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00C94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00D9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/EnTalkGibud_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00F08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/func_80B00F64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Talk_Gibud_0x80AFE8A0/EnTalkGibud_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.h b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.h new file mode 100644 index 0000000000..366ae98916 --- /dev/null +++ b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TALK_GIBUD_H +#define Z_EN_TALK_GIBUD_H + +#include + +struct EnTalkGibud; + +typedef struct EnTalkGibud { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2B4]; +} EnTalkGibud; // size = 0x3F8 + +extern const ActorInit En_Talk_Gibud_InitVars; + +#endif // Z_EN_TALK_GIBUD_H diff --git a/src/overlays/actors/ovl_En_Tanron1/overlay.cfg b/src/overlays/actors/ovl_En_Tanron1/overlay.cfg new file mode 100644 index 0000000000..5a6959a4e4 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tanron1/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Tanron1 +z_en_tanron1.c diff --git a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c new file mode 100644 index 0000000000..cc47a3558c --- /dev/null +++ b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c @@ -0,0 +1,38 @@ +#include "z_en_tanron1.h" + +#define FLAGS 0x00000035 + +#define THIS ((EnTanron1*)thisx) + +void EnTanron1_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTanron1_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTanron1_Update(Actor* thisx, GlobalContext* globalCtx); +void EnTanron1_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Tanron1_InitVars = { + ACTOR_EN_TANRON1, + ACTORTYPE_ENEMY, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnTanron1), + (ActorFunc)EnTanron1_Init, + (ActorFunc)EnTanron1_Destroy, + (ActorFunc)EnTanron1_Update, + (ActorFunc)EnTanron1_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron1_0x80BB4E00/EnTanron1_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron1_0x80BB4E00/EnTanron1_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron1_0x80BB4E00/func_80BB4E50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron1_0x80BB4E00/EnTanron1_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron1_0x80BB4E00/EnTanron1_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron1_0x80BB4E00/func_80BB5318.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron1_0x80BB4E00/func_80BB5AAC.asm") diff --git a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.h b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.h new file mode 100644 index 0000000000..333e6ec29e --- /dev/null +++ b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TANRON1_H +#define Z_EN_TANRON1_H + +#include + +struct EnTanron1; + +typedef struct EnTanron1 { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0x3228]; +} EnTanron1; // size = 0x336C + +extern const ActorInit En_Tanron1_InitVars; + +#endif // Z_EN_TANRON1_H diff --git a/src/overlays/actors/ovl_En_Tanron2/overlay.cfg b/src/overlays/actors/ovl_En_Tanron2/overlay.cfg new file mode 100644 index 0000000000..c585d560b3 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tanron2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Tanron2 +z_en_tanron2.c diff --git a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c new file mode 100644 index 0000000000..72691fa7db --- /dev/null +++ b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c @@ -0,0 +1,54 @@ +#include "z_en_tanron2.h" + +#define FLAGS 0x00000035 + +#define THIS ((EnTanron2*)thisx) + +void EnTanron2_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTanron2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTanron2_Update(Actor* thisx, GlobalContext* globalCtx); +void EnTanron2_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Tanron2_InitVars = { + ACTOR_EN_TANRON2, + ACTORTYPE_BOSS, + FLAGS, + OBJECT_BOSS04, + sizeof(EnTanron2), + (ActorFunc)EnTanron2_Init, + (ActorFunc)EnTanron2_Destroy, + (ActorFunc)EnTanron2_Update, + (ActorFunc)EnTanron2_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/EnTanron2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/EnTanron2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/func_80BB69C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/func_80BB69FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/func_80BB6B80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/func_80BB6BD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/func_80BB6F64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/func_80BB6F78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/func_80BB71C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/func_80BB7398.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/func_80BB7408.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/func_80BB7578.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/EnTanron2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/func_80BB7B90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron2_0x80BB67D0/EnTanron2_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.h b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.h new file mode 100644 index 0000000000..083aa6dc98 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TANRON2_H +#define Z_EN_TANRON2_H + +#include + +struct EnTanron2; + +typedef struct EnTanron2 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xB8]; +} EnTanron2; // size = 0x1FC + +extern const ActorInit En_Tanron2_InitVars; + +#endif // Z_EN_TANRON2_H diff --git a/src/overlays/actors/ovl_En_Tanron3/overlay.cfg b/src/overlays/actors/ovl_En_Tanron3/overlay.cfg new file mode 100644 index 0000000000..1084615efe --- /dev/null +++ b/src/overlays/actors/ovl_En_Tanron3/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Tanron3 +z_en_tanron3.c diff --git a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c new file mode 100644 index 0000000000..5537d1e093 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c @@ -0,0 +1,48 @@ +#include "z_en_tanron3.h" + +#define FLAGS 0x00000035 + +#define THIS ((EnTanron3*)thisx) + +void EnTanron3_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTanron3_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTanron3_Update(Actor* thisx, GlobalContext* globalCtx); +void EnTanron3_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Tanron3_InitVars = { + ACTOR_EN_TANRON3, + ACTORTYPE_BOSS, + FLAGS, + OBJECT_BOSS03, + sizeof(EnTanron3), + (ActorFunc)EnTanron3_Init, + (ActorFunc)EnTanron3_Destroy, + (ActorFunc)EnTanron3_Update, + (ActorFunc)EnTanron3_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron3_0x80BB85A0/func_80BB85A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron3_0x80BB85A0/EnTanron3_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron3_0x80BB85A0/EnTanron3_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron3_0x80BB85A0/func_80BB87D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron3_0x80BB85A0/func_80BB897C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron3_0x80BB85A0/func_80BB8A48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron3_0x80BB85A0/func_80BB91D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron3_0x80BB85A0/func_80BB9288.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron3_0x80BB85A0/func_80BB9308.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron3_0x80BB85A0/EnTanron3_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron3_0x80BB85A0/func_80BB95FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron3_0x80BB85A0/EnTanron3_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.h b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.h new file mode 100644 index 0000000000..4e4e8f948e --- /dev/null +++ b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TANRON3_H +#define Z_EN_TANRON3_H + +#include + +struct EnTanron3; + +typedef struct EnTanron3 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1B8]; +} EnTanron3; // size = 0x2FC + +extern const ActorInit En_Tanron3_InitVars; + +#endif // Z_EN_TANRON3_H diff --git a/src/overlays/actors/ovl_En_Tanron4/overlay.cfg b/src/overlays/actors/ovl_En_Tanron4/overlay.cfg new file mode 100644 index 0000000000..734d70ac7d --- /dev/null +++ b/src/overlays/actors/ovl_En_Tanron4/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Tanron4 +z_en_tanron4.c diff --git a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c new file mode 100644 index 0000000000..cb62d08305 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c @@ -0,0 +1,40 @@ +#include "z_en_tanron4.h" + +#define FLAGS 0x02000010 + +#define THIS ((EnTanron4*)thisx) + +void EnTanron4_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTanron4_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTanron4_Update(Actor* thisx, GlobalContext* globalCtx); +void EnTanron4_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Tanron4_InitVars = { + ACTOR_EN_TANRON4, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_TANRON4, + sizeof(EnTanron4), + (ActorFunc)EnTanron4_Init, + (ActorFunc)EnTanron4_Destroy, + (ActorFunc)EnTanron4_Update, + (ActorFunc)EnTanron4_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron4_0x80BE3B80/EnTanron4_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron4_0x80BE3B80/EnTanron4_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron4_0x80BE3B80/func_80BE3DC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron4_0x80BE3B80/func_80BE3DFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron4_0x80BE3B80/func_80BE4268.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron4_0x80BE3B80/func_80BE42A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron4_0x80BE3B80/EnTanron4_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron4_0x80BE3B80/EnTanron4_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.h b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.h new file mode 100644 index 0000000000..5b6ba460da --- /dev/null +++ b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TANRON4_H +#define Z_EN_TANRON4_H + +#include + +struct EnTanron4; + +typedef struct EnTanron4 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xEC]; +} EnTanron4; // size = 0x230 + +extern const ActorInit En_Tanron4_InitVars; + +#endif // Z_EN_TANRON4_H diff --git a/src/overlays/actors/ovl_En_Tanron5/overlay.cfg b/src/overlays/actors/ovl_En_Tanron5/overlay.cfg new file mode 100644 index 0000000000..4a522458e8 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tanron5/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Tanron5 +z_en_tanron5.c diff --git a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c new file mode 100644 index 0000000000..5622524b30 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c @@ -0,0 +1,40 @@ +#include "z_en_tanron5.h" + +#define FLAGS 0x00000030 + +#define THIS ((EnTanron5*)thisx) + +void EnTanron5_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTanron5_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTanron5_Update(Actor* thisx, GlobalContext* globalCtx); +void EnTanron5_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Tanron5_InitVars = { + ACTOR_EN_TANRON5, + ACTORTYPE_BOSS, + FLAGS, + OBJECT_BOSS02, + sizeof(EnTanron5), + (ActorFunc)EnTanron5_Init, + (ActorFunc)EnTanron5_Destroy, + (ActorFunc)EnTanron5_Update, + (ActorFunc)EnTanron5_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron5_0x80BE4930/func_80BE4930.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron5_0x80BE4930/func_80BE4A2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron5_0x80BE4930/EnTanron5_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron5_0x80BE4930/EnTanron5_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron5_0x80BE4930/EnTanron5_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron5_0x80BE4930/func_80BE5818.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron5_0x80BE4930/EnTanron5_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron5_0x80BE4930/func_80BE5C10.asm") diff --git a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.h b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.h new file mode 100644 index 0000000000..dc105c3a80 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TANRON5_H +#define Z_EN_TANRON5_H + +#include + +struct EnTanron5; + +typedef struct EnTanron5 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x60]; +} EnTanron5; // size = 0x1A4 + +extern const ActorInit En_Tanron5_InitVars; + +#endif // Z_EN_TANRON5_H diff --git a/src/overlays/actors/ovl_En_Tanron6/overlay.cfg b/src/overlays/actors/ovl_En_Tanron6/overlay.cfg new file mode 100644 index 0000000000..2e81ae1217 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tanron6/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Tanron6 +z_en_tanron6.c diff --git a/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c b/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c new file mode 100644 index 0000000000..49ba2d1239 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c @@ -0,0 +1,36 @@ +#include "z_en_tanron6.h" + +#define FLAGS 0x00000005 + +#define THIS ((EnTanron6*)thisx) + +void EnTanron6_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTanron6_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTanron6_Update(Actor* thisx, GlobalContext* globalCtx); +void EnTanron6_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Tanron6_InitVars = { + ACTOR_EN_TANRON6, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_TANRON5, + sizeof(EnTanron6), + (ActorFunc)EnTanron6_Init, + (ActorFunc)EnTanron6_Destroy, + (ActorFunc)EnTanron6_Update, + (ActorFunc)EnTanron6_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron6_0x80BE6040/EnTanron6_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron6_0x80BE6040/EnTanron6_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron6_0x80BE6040/func_80BE60BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron6_0x80BE6040/func_80BE60D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron6_0x80BE6040/EnTanron6_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tanron6_0x80BE6040/EnTanron6_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.h b/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.h new file mode 100644 index 0000000000..656f744faa --- /dev/null +++ b/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TANRON6_H +#define Z_EN_TANRON6_H + +#include + +struct EnTanron6; + +typedef struct EnTanron6 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xC0]; +} EnTanron6; // size = 0x204 + +extern const ActorInit En_Tanron6_InitVars; + +#endif // Z_EN_TANRON6_H diff --git a/src/overlays/actors/ovl_En_Test/overlay.cfg b/src/overlays/actors/ovl_En_Test/overlay.cfg new file mode 100644 index 0000000000..3f264536a7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Test/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Test +z_en_test.c diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.c b/src/overlays/actors/ovl_En_Test/z_en_test.c new file mode 100644 index 0000000000..32a946d1c5 --- /dev/null +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -0,0 +1,42 @@ +#include "z_en_test.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnTest*)thisx) + +void EnTest_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTest_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTest_Update(Actor* thisx, GlobalContext* globalCtx); +void EnTest_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Test_InitVars = { + ACTOR_EN_TEST, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnTest), + (ActorFunc)EnTest_Init, + (ActorFunc)EnTest_Destroy, + (ActorFunc)EnTest_Update, + (ActorFunc)EnTest_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test_0x80862B70/func_80862B70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test_0x80862B70/func_80862CBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test_0x80862B70/func_80862EDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test_0x80862B70/func_80863048.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test_0x80862B70/EnTest_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test_0x80862B70/EnTest_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test_0x80862B70/EnTest_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test_0x80862B70/func_808634B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test_0x80862B70/EnTest_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.h b/src/overlays/actors/ovl_En_Test/z_en_test.h new file mode 100644 index 0000000000..7101a2fcb0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Test/z_en_test.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TEST_H +#define Z_EN_TEST_H + +#include + +struct EnTest; + +typedef struct EnTest { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x578]; +} EnTest; // size = 0x6BC + +extern const ActorInit En_Test_InitVars; + +#endif // Z_EN_TEST_H diff --git a/src/overlays/actors/ovl_En_Test2/overlay.cfg b/src/overlays/actors/ovl_En_Test2/overlay.cfg new file mode 100644 index 0000000000..8a698679cd --- /dev/null +++ b/src/overlays/actors/ovl_En_Test2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Test2 +z_en_test2.c diff --git a/src/overlays/actors/ovl_En_Test2/z_en_test2.c b/src/overlays/actors/ovl_En_Test2/z_en_test2.c new file mode 100644 index 0000000000..58c872c2aa --- /dev/null +++ b/src/overlays/actors/ovl_En_Test2/z_en_test2.c @@ -0,0 +1,30 @@ +#include "z_en_test2.h" + +#define FLAGS 0x00000090 + +#define THIS ((EnTest2*)thisx) + +void EnTest2_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTest2_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Test2_InitVars = { + ACTOR_EN_TEST2, + ACTORTYPE_BG, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnTest2), + (ActorFunc)EnTest2_Init, + (ActorFunc)func_800BDFB0, + (ActorFunc)EnTest2_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test2_0x80A3E390/EnTest2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test2_0x80A3E390/EnTest2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test2_0x80A3E390/func_80A3E4EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test2_0x80A3E390/func_80A3E524.asm") diff --git a/src/overlays/actors/ovl_En_Test2/z_en_test2.h b/src/overlays/actors/ovl_En_Test2/z_en_test2.h new file mode 100644 index 0000000000..3956e0ef32 --- /dev/null +++ b/src/overlays/actors/ovl_En_Test2/z_en_test2.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TEST2_H +#define Z_EN_TEST2_H + +#include + +struct EnTest2; + +typedef struct EnTest2 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4]; +} EnTest2; // size = 0x148 + +extern const ActorInit En_Test2_InitVars; + +#endif // Z_EN_TEST2_H diff --git a/src/overlays/actors/ovl_En_Test3/overlay.cfg b/src/overlays/actors/ovl_En_Test3/overlay.cfg new file mode 100644 index 0000000000..25736e068d --- /dev/null +++ b/src/overlays/actors/ovl_En_Test3/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Test3 +z_en_test3.c diff --git a/src/overlays/actors/ovl_En_Test3/z_en_test3.c b/src/overlays/actors/ovl_En_Test3/z_en_test3.c new file mode 100644 index 0000000000..bb4318ad4b --- /dev/null +++ b/src/overlays/actors/ovl_En_Test3/z_en_test3.c @@ -0,0 +1,129 @@ +#include "z_en_test3.h" + +#define FLAGS 0x04000030 + +#define THIS ((EnTest3*)thisx) + +void EnTest3_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTest3_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTest3_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Test3_InitVars = { + ACTOR_EN_TEST3, + ACTORTYPE_NPC, + FLAGS, + OBJECT_TEST3, + sizeof(EnTest3), + (ActorFunc)EnTest3_Init, + (ActorFunc)EnTest3_Destroy, + (ActorFunc)EnTest3_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3E7E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3E80C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3E870.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3E884.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3E898.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3E960.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3E97C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3E9DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3EA30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3EAC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3EAF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3EB8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3EBFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3EC30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3EC44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3ECEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3ED24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/EnTest3_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/EnTest3_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F080.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F09C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F0B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F114.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F15C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F2BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F384.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F4A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F534.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F5A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F62C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F73C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F8D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F9A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3F9E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3FA58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3FBCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3FBE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3FDE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3FE20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3FF10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A3FFD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A40098.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A40230.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A40678.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A40824.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A4084C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A40908.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A409D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A40A6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/EnTest3_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A40CF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A40F34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test3_0x80A3E7E0/func_80A4129C.asm") diff --git a/src/overlays/actors/ovl_En_Test3/z_en_test3.h b/src/overlays/actors/ovl_En_Test3/z_en_test3.h new file mode 100644 index 0000000000..e824598328 --- /dev/null +++ b/src/overlays/actors/ovl_En_Test3/z_en_test3.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TEST3_H +#define Z_EN_TEST3_H + +#include + +struct EnTest3; + +typedef struct EnTest3 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xC74]; +} EnTest3; // size = 0xDB8 + +extern const ActorInit En_Test3_InitVars; + +#endif // Z_EN_TEST3_H diff --git a/src/overlays/actors/ovl_En_Test4/overlay.cfg b/src/overlays/actors/ovl_En_Test4/overlay.cfg new file mode 100644 index 0000000000..06bfe78393 --- /dev/null +++ b/src/overlays/actors/ovl_En_Test4/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Test4 +z_en_test4.c diff --git a/src/overlays/actors/ovl_En_Test4/z_en_test4.c b/src/overlays/actors/ovl_En_Test4/z_en_test4.c new file mode 100644 index 0000000000..f439c5f8a7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Test4/z_en_test4.c @@ -0,0 +1,47 @@ +#include "z_en_test4.h" + +#define FLAGS 0x00100030 + +#define THIS ((EnTest4*)thisx) + +void EnTest4_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTest4_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTest4_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Test4_InitVars = { + ACTOR_EN_TEST4, + ACTORTYPE_SWITCH, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnTest4), + (ActorFunc)EnTest4_Init, + (ActorFunc)EnTest4_Destroy, + (ActorFunc)EnTest4_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test4_0x80A41D70/func_80A41D70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test4_0x80A41D70/func_80A41FA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test4_0x80A41D70/func_80A42198.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test4_0x80A41D70/func_80A425E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test4_0x80A41D70/EnTest4_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test4_0x80A41D70/EnTest4_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test4_0x80A41D70/func_80A42AB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test4_0x80A41D70/func_80A42F20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test4_0x80A41D70/func_80A430C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test4_0x80A41D70/func_80A431C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test4_0x80A41D70/func_80A4323C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test4_0x80A41D70/EnTest4_Update.asm") diff --git a/src/overlays/actors/ovl_En_Test4/z_en_test4.h b/src/overlays/actors/ovl_En_Test4/z_en_test4.h new file mode 100644 index 0000000000..f237374c57 --- /dev/null +++ b/src/overlays/actors/ovl_En_Test4/z_en_test4.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TEST4_H +#define Z_EN_TEST4_H + +#include + +struct EnTest4; + +typedef struct EnTest4 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x10]; +} EnTest4; // size = 0x154 + +extern const ActorInit En_Test4_InitVars; + +#endif // Z_EN_TEST4_H diff --git a/src/overlays/actors/ovl_En_Test5/overlay.cfg b/src/overlays/actors/ovl_En_Test5/overlay.cfg new file mode 100644 index 0000000000..9ad6cee31d --- /dev/null +++ b/src/overlays/actors/ovl_En_Test5/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Test5 +z_en_test5.c diff --git a/src/overlays/actors/ovl_En_Test5/z_en_test5.c b/src/overlays/actors/ovl_En_Test5/z_en_test5.c new file mode 100644 index 0000000000..79fe68053a --- /dev/null +++ b/src/overlays/actors/ovl_En_Test5/z_en_test5.c @@ -0,0 +1,33 @@ +#include "z_en_test5.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnTest5*)thisx) + +void EnTest5_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTest5_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTest5_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Test5_InitVars = { + ACTOR_EN_TEST5, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnTest5), + (ActorFunc)EnTest5_Init, + (ActorFunc)EnTest5_Destroy, + (ActorFunc)EnTest5_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test5_0x80A903B0/func_80A903B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test5_0x80A903B0/EnTest5_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test5_0x80A903B0/EnTest5_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test5_0x80A903B0/func_80A90478.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test5_0x80A903B0/EnTest5_Update.asm") diff --git a/src/overlays/actors/ovl_En_Test5/z_en_test5.h b/src/overlays/actors/ovl_En_Test5/z_en_test5.h new file mode 100644 index 0000000000..e625bc4e44 --- /dev/null +++ b/src/overlays/actors/ovl_En_Test5/z_en_test5.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TEST5_H +#define Z_EN_TEST5_H + +#include + +struct EnTest5; + +typedef struct EnTest5 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x18]; +} EnTest5; // size = 0x15C + +extern const ActorInit En_Test5_InitVars; + +#endif // Z_EN_TEST5_H diff --git a/src/overlays/actors/ovl_En_Test6/overlay.cfg b/src/overlays/actors/ovl_En_Test6/overlay.cfg new file mode 100644 index 0000000000..35635730d5 --- /dev/null +++ b/src/overlays/actors/ovl_En_Test6/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Test6 +z_en_test6.c diff --git a/src/overlays/actors/ovl_En_Test6/z_en_test6.c b/src/overlays/actors/ovl_En_Test6/z_en_test6.c new file mode 100644 index 0000000000..8783ef9582 --- /dev/null +++ b/src/overlays/actors/ovl_En_Test6/z_en_test6.c @@ -0,0 +1,70 @@ +#include "z_en_test6.h" + +#define FLAGS 0x02200030 + +#define THIS ((EnTest6*)thisx) + +void EnTest6_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTest6_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTest6_Update(Actor* thisx, GlobalContext* globalCtx); +void EnTest6_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Test6_InitVars = { + ACTOR_EN_TEST6, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnTest6), + (ActorFunc)EnTest6_Init, + (ActorFunc)EnTest6_Destroy, + (ActorFunc)EnTest6_Update, + (ActorFunc)EnTest6_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A90730.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A90C08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A90C34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A90C54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A90D20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A90D34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A90FC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A91324.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/EnTest6_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/EnTest6_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A9156C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A91690.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A916F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A91760.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A920C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A92118.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A92188.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/EnTest6_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A92950.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A93298.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A9369C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/func_80A939E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test6_0x80A90730/EnTest6_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Test6/z_en_test6.h b/src/overlays/actors/ovl_En_Test6/z_en_test6.h new file mode 100644 index 0000000000..eaca9af64e --- /dev/null +++ b/src/overlays/actors/ovl_En_Test6/z_en_test6.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TEST6_H +#define Z_EN_TEST6_H + +#include + +struct EnTest6; + +typedef struct EnTest6 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x144]; +} EnTest6; // size = 0x288 + +extern const ActorInit En_Test6_InitVars; + +#endif // Z_EN_TEST6_H diff --git a/src/overlays/actors/ovl_En_Test7/overlay.cfg b/src/overlays/actors/ovl_En_Test7/overlay.cfg new file mode 100644 index 0000000000..5a898f7c09 --- /dev/null +++ b/src/overlays/actors/ovl_En_Test7/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Test7 +z_en_test7.c diff --git a/src/overlays/actors/ovl_En_Test7/z_en_test7.c b/src/overlays/actors/ovl_En_Test7/z_en_test7.c new file mode 100644 index 0000000000..90b64d69f3 --- /dev/null +++ b/src/overlays/actors/ovl_En_Test7/z_en_test7.c @@ -0,0 +1,100 @@ +#include "z_en_test7.h" + +#define FLAGS 0x02300030 + +#define THIS ((EnTest7*)thisx) + +void EnTest7_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTest7_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTest7_Update(Actor* thisx, GlobalContext* globalCtx); +void EnTest7_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Test7_InitVars = { + ACTOR_EN_TEST7, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnTest7), + (ActorFunc)EnTest7_Init, + (ActorFunc)EnTest7_Destroy, + (ActorFunc)EnTest7_Update, + (ActorFunc)EnTest7_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF0820.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF082C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF0838.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF0984.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF0C30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF0CDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF10D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF118C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF14FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF1730.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/EnTest7_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/EnTest7_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF19A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF1A2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF1B68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF1CA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF1E44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF1F48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2030.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF21E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2318.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2350.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF24D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2654.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2808.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2854.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2938.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF29C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2AE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2BAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2C48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2DB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2EC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF2F98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF30F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/EnTest7_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/func_80AF31D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Test7_0x80AF0820/EnTest7_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Test7/z_en_test7.h b/src/overlays/actors/ovl_En_Test7/z_en_test7.h new file mode 100644 index 0000000000..c9f2b0f88d --- /dev/null +++ b/src/overlays/actors/ovl_En_Test7/z_en_test7.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TEST7_H +#define Z_EN_TEST7_H + +#include + +struct EnTest7; + +typedef struct EnTest7 { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0x1D58]; +} EnTest7; // size = 0x1E9C + +extern const ActorInit En_Test7_InitVars; + +#endif // Z_EN_TEST7_H diff --git a/src/overlays/actors/ovl_En_Tg/overlay.cfg b/src/overlays/actors/ovl_En_Tg/overlay.cfg new file mode 100644 index 0000000000..99ad048ba3 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tg/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Tg +z_en_tg.c diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.c b/src/overlays/actors/ovl_En_Tg/z_en_tg.c new file mode 100644 index 0000000000..e06a5d2255 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.c @@ -0,0 +1,50 @@ +#include "z_en_tg.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnTg*)thisx) + +void EnTg_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTg_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTg_Update(Actor* thisx, GlobalContext* globalCtx); +void EnTg_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Tg_InitVars = { + ACTOR_EN_TG, + ACTORTYPE_NPC, + FLAGS, + OBJECT_MU, + sizeof(EnTg), + (ActorFunc)EnTg_Init, + (ActorFunc)EnTg_Destroy, + (ActorFunc)EnTg_Update, + (ActorFunc)EnTg_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/func_8098F800.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/func_8098F8A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/func_8098F928.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/EnTg_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/EnTg_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/func_8098FA70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/EnTg_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/func_8098FBB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/func_8098FBD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/EnTg_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/func_8098FD50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/func_8098FEA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tg_0x8098F800/func_8099000C.asm") diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.h b/src/overlays/actors/ovl_En_Tg/z_en_tg.h new file mode 100644 index 0000000000..30fa9ee03c --- /dev/null +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TG_H +#define Z_EN_TG_H + +#include + +struct EnTg; + +typedef struct EnTg { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x404]; +} EnTg; // size = 0x548 + +extern const ActorInit En_Tg_InitVars; + +#endif // Z_EN_TG_H diff --git a/src/overlays/actors/ovl_En_Thiefbird/overlay.cfg b/src/overlays/actors/ovl_En_Thiefbird/overlay.cfg new file mode 100644 index 0000000000..f469c156a6 --- /dev/null +++ b/src/overlays/actors/ovl_En_Thiefbird/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Thiefbird +z_en_thiefbird.c diff --git a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c new file mode 100644 index 0000000000..17f157fbee --- /dev/null +++ b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c @@ -0,0 +1,92 @@ +#include "z_en_thiefbird.h" + +#define FLAGS 0x80001205 + +#define THIS ((EnThiefbird*)thisx) + +void EnThiefbird_Init(Actor* thisx, GlobalContext* globalCtx); +void EnThiefbird_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnThiefbird_Update(Actor* thisx, GlobalContext* globalCtx); +void EnThiefbird_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Thiefbird_InitVars = { + ACTOR_EN_THIEFBIRD, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_THIEFBIRD, + sizeof(EnThiefbird), + (ActorFunc)EnThiefbird_Init, + (ActorFunc)EnThiefbird_Destroy, + (ActorFunc)EnThiefbird_Update, + (ActorFunc)EnThiefbird_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/EnThiefbird_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/EnThiefbird_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C10984.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C10B0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C10DE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C10E98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C11338.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C11454.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C114C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C11538.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C11590.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C118E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C1193C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C11C60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C11D14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C11DC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C11DF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C11F6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C1215C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C12308.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C12378.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C1242C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C124B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C126A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C126D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C12744.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C127F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C12B1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C12D00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/EnThiefbird_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C130EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C1315C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/func_80C13354.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Thiefbird_0x80C10770/EnThiefbird_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h new file mode 100644 index 0000000000..f18cc848da --- /dev/null +++ b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_THIEFBIRD_H +#define Z_EN_THIEFBIRD_H + +#include + +struct EnThiefbird; + +typedef struct EnThiefbird { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x84C]; +} EnThiefbird; // size = 0x990 + +extern const ActorInit En_Thiefbird_InitVars; + +#endif // Z_EN_THIEFBIRD_H diff --git a/src/overlays/actors/ovl_En_Time_Tag/overlay.cfg b/src/overlays/actors/ovl_En_Time_Tag/overlay.cfg new file mode 100644 index 0000000000..9759bee865 --- /dev/null +++ b/src/overlays/actors/ovl_En_Time_Tag/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Time_Tag +z_en_time_tag.c diff --git a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c new file mode 100644 index 0000000000..2535266e4b --- /dev/null +++ b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c @@ -0,0 +1,59 @@ +#include "z_en_time_tag.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnTimeTag*)thisx) + +void EnTimeTag_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTimeTag_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTimeTag_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Time_Tag_InitVars = { + ACTOR_EN_TIME_TAG, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnTimeTag), + (ActorFunc)EnTimeTag_Init, + (ActorFunc)EnTimeTag_Destroy, + (ActorFunc)EnTimeTag_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/EnTimeTag_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/EnTimeTag_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80AC9FD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80AC9FE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA0A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA12C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA184.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA208.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA268.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA348.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA3C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA418.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA5F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA714.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA724.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA7C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/func_80ACA840.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Time_Tag_0x80AC9EA0/EnTimeTag_Update.asm") diff --git a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h new file mode 100644 index 0000000000..9abe20013b --- /dev/null +++ b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TIME_TAG_H +#define Z_EN_TIME_TAG_H + +#include + +struct EnTimeTag; + +typedef struct EnTimeTag { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4]; +} EnTimeTag; // size = 0x148 + +extern const ActorInit En_Time_Tag_InitVars; + +#endif // Z_EN_TIME_TAG_H diff --git a/src/overlays/actors/ovl_En_Tite/overlay.cfg b/src/overlays/actors/ovl_En_Tite/overlay.cfg new file mode 100644 index 0000000000..0d91c61fe0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tite/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Tite +z_en_tite.c diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c new file mode 100644 index 0000000000..17bfae212f --- /dev/null +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -0,0 +1,126 @@ +#include "z_en_tite.h" + +#define FLAGS 0x00000205 + +#define THIS ((EnTite*)thisx) + +void EnTite_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTite_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTite_Update(Actor* thisx, GlobalContext* globalCtx); +void EnTite_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Tite_InitVars = { + ACTOR_EN_TITE, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_TITE, + sizeof(EnTite), + (ActorFunc)EnTite_Init, + (ActorFunc)EnTite_Destroy, + (ActorFunc)EnTite_Update, + (ActorFunc)EnTite_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/EnTite_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/EnTite_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80893A18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80893A34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80893A9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80893ADC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80893B10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80893B70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80893BCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80893DD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80893E54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80893ED4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80893F30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80893FD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80894024.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_8089408C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_808942B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80894414.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80894454.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_8089452C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_808945B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_808945EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80894638.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_8089484C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80894910.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80894B2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80894BC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80894DD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80894E0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80895020.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_808951B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_808952EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80895424.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_808955E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80895640.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_808956B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_808956FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80895738.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_8089595C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80895A10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80895AC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80895CB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80895D08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80895DE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80895E28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80895FF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_808963B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/EnTite_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80896750.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/func_80896788.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tite_0x808937F0/EnTite_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.h b/src/overlays/actors/ovl_En_Tite/z_en_tite.h new file mode 100644 index 0000000000..b218b8e1ee --- /dev/null +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TITE_H +#define Z_EN_TITE_H + +#include + +struct EnTite; + +typedef struct EnTite { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2C0]; +} EnTite; // size = 0x404 + +extern const ActorInit En_Tite_InitVars; + +#endif // Z_EN_TITE_H diff --git a/src/overlays/actors/ovl_En_Tk/overlay.cfg b/src/overlays/actors/ovl_En_Tk/overlay.cfg new file mode 100644 index 0000000000..a7ca23e6e7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tk/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Tk +z_en_tk.c diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c new file mode 100644 index 0000000000..67caed266a --- /dev/null +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -0,0 +1,138 @@ +#include "z_en_tk.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnTk*)thisx) + +void EnTk_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTk_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTk_Update(Actor* thisx, GlobalContext* globalCtx); +void EnTk_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Tk_InitVars = { + ACTOR_EN_TK, + ACTORTYPE_NPC, + FLAGS, + OBJECT_TK, + sizeof(EnTk), + (ActorFunc)EnTk_Init, + (ActorFunc)EnTk_Destroy, + (ActorFunc)EnTk_Update, + (ActorFunc)EnTk_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEC460.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEC524.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEC658.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/EnTk_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/EnTk_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AECA3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AECA90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AECB0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AECB6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AECE0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AECE60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AED354.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AED38C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AED4F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AED544.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AED610.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AED898.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AED940.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEDBEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEDC4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEDCBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEDD4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEDDA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEDE10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEDF5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE2A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE2C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE300.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE374.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE414.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE478.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE4D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE650.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE6B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE784.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE7E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE86C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEE9B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEEA4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEEAD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEEB88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEED38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF048.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF094.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF15C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF1B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF1C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF210.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF220.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF278.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF2C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF2D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/EnTk_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF5F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF65C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/func_80AEF6A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tk_0x80AEC460/EnTk_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.h b/src/overlays/actors/ovl_En_Tk/z_en_tk.h new file mode 100644 index 0000000000..2ff772c2ae --- /dev/null +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TK_H +#define Z_EN_TK_H + +#include + +struct EnTk; + +typedef struct EnTk { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2B0]; +} EnTk; // size = 0x3F4 + +extern const ActorInit En_Tk_InitVars; + +#endif // Z_EN_TK_H diff --git a/src/overlays/actors/ovl_En_Torch/overlay.cfg b/src/overlays/actors/ovl_En_Torch/overlay.cfg new file mode 100644 index 0000000000..0815135431 --- /dev/null +++ b/src/overlays/actors/ovl_En_Torch/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Torch +z_en_torch.c diff --git a/src/overlays/actors/ovl_En_Torch/z_en_torch.c b/src/overlays/actors/ovl_En_Torch/z_en_torch.c new file mode 100644 index 0000000000..b702a61c41 --- /dev/null +++ b/src/overlays/actors/ovl_En_Torch/z_en_torch.c @@ -0,0 +1,23 @@ +#include "z_en_torch.h" + +#define FLAGS 0x00000000 + +#define THIS ((EnTorch*)thisx) + +void EnTorch_Init(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Torch_InitVars = { + ACTOR_EN_TORCH, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnTorch), + (ActorFunc)EnTorch_Init, + (ActorFunc)NULL, + (ActorFunc)NULL, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Torch_0x80973550/EnTorch_Init.asm") diff --git a/src/overlays/actors/ovl_En_Torch/z_en_torch.h b/src/overlays/actors/ovl_En_Torch/z_en_torch.h new file mode 100644 index 0000000000..a1fb910784 --- /dev/null +++ b/src/overlays/actors/ovl_En_Torch/z_en_torch.h @@ -0,0 +1,14 @@ +#ifndef Z_EN_TORCH_H +#define Z_EN_TORCH_H + +#include + +struct EnTorch; + +typedef struct EnTorch { + /* 0x000 */ Actor actor; +} EnTorch; // size = 0x144 + +extern const ActorInit En_Torch_InitVars; + +#endif // Z_EN_TORCH_H diff --git a/src/overlays/actors/ovl_En_Torch2/overlay.cfg b/src/overlays/actors/ovl_En_Torch2/overlay.cfg new file mode 100644 index 0000000000..25ddefa7f1 --- /dev/null +++ b/src/overlays/actors/ovl_En_Torch2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Torch2 +z_en_torch2.c diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c new file mode 100644 index 0000000000..bab31c66d0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -0,0 +1,36 @@ +#include "z_en_torch2.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnTorch2*)thisx) + +void EnTorch2_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTorch2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTorch2_Update(Actor* thisx, GlobalContext* globalCtx); +void EnTorch2_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Torch2_InitVars = { + ACTOR_EN_TORCH2, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnTorch2), + (ActorFunc)EnTorch2_Init, + (ActorFunc)EnTorch2_Destroy, + (ActorFunc)EnTorch2_Update, + (ActorFunc)EnTorch2_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Torch2_0x808A31B0/EnTorch2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Torch2_0x808A31B0/EnTorch2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Torch2_0x808A31B0/EnTorch2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Torch2_0x808A31B0/func_808A3428.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Torch2_0x808A31B0/func_808A3458.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Torch2_0x808A31B0/EnTorch2_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h new file mode 100644 index 0000000000..0381de1434 --- /dev/null +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TORCH2_H +#define Z_EN_TORCH2_H + +#include + +struct EnTorch2; + +typedef struct EnTorch2 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x50]; +} EnTorch2; // size = 0x194 + +extern const ActorInit En_Torch2_InitVars; + +#endif // Z_EN_TORCH2_H diff --git a/src/overlays/actors/ovl_En_Toto/overlay.cfg b/src/overlays/actors/ovl_En_Toto/overlay.cfg new file mode 100644 index 0000000000..48534631ec --- /dev/null +++ b/src/overlays/actors/ovl_En_Toto/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Toto +z_en_toto.c diff --git a/src/overlays/actors/ovl_En_Toto/z_en_toto.c b/src/overlays/actors/ovl_En_Toto/z_en_toto.c new file mode 100644 index 0000000000..ea9f43dd2a --- /dev/null +++ b/src/overlays/actors/ovl_En_Toto/z_en_toto.c @@ -0,0 +1,106 @@ +#include "z_en_toto.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnToto*)thisx) + +void EnToto_Init(Actor* thisx, GlobalContext* globalCtx); +void EnToto_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnToto_Update(Actor* thisx, GlobalContext* globalCtx); +void EnToto_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Toto_InitVars = { + ACTOR_EN_TOTO, + ACTORTYPE_NPC, + FLAGS, + OBJECT_ZM, + sizeof(EnToto), + (ActorFunc)EnToto_Init, + (ActorFunc)EnToto_Destroy, + (ActorFunc)EnToto_Update, + (ActorFunc)EnToto_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA36C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/EnToto_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/EnToto_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA383C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA3930.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA397C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA39C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA3BFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA3C88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA3CC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA3D38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA3DBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA3EC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA3ED4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA3EE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA3F2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA3FB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA3FCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA402C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA407C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA40D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA4128.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA415C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA4204.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA42BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA43F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA445C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA44A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA44D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA4530.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA46D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA4740.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA47E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA49A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA4A00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA4B24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA4C0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA4C44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/func_80BA4CB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/EnToto_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Toto_0x80BA36C0/EnToto_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Toto/z_en_toto.h b/src/overlays/actors/ovl_En_Toto/z_en_toto.h new file mode 100644 index 0000000000..faa91cd792 --- /dev/null +++ b/src/overlays/actors/ovl_En_Toto/z_en_toto.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TOTO_H +#define Z_EN_TOTO_H + +#include + +struct EnToto; + +typedef struct EnToto { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x188]; +} EnToto; // size = 0x2CC + +extern const ActorInit En_Toto_InitVars; + +#endif // Z_EN_TOTO_H diff --git a/src/overlays/actors/ovl_En_Trt/overlay.cfg b/src/overlays/actors/ovl_En_Trt/overlay.cfg new file mode 100644 index 0000000000..d0b1d075f4 --- /dev/null +++ b/src/overlays/actors/ovl_En_Trt/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Trt +z_en_trt.c diff --git a/src/overlays/actors/ovl_En_Trt/z_en_trt.c b/src/overlays/actors/ovl_En_Trt/z_en_trt.c new file mode 100644 index 0000000000..febc52f60f --- /dev/null +++ b/src/overlays/actors/ovl_En_Trt/z_en_trt.c @@ -0,0 +1,188 @@ +#include "z_en_trt.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnTrt*)thisx) + +void EnTrt_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTrt_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTrt_Update(Actor* thisx, GlobalContext* globalCtx); +void EnTrt_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Trt_InitVars = { + ACTOR_EN_TRT, + ACTORTYPE_NPC, + FLAGS, + OBJECT_TRT, + sizeof(EnTrt), + (ActorFunc)EnTrt_Init, + (ActorFunc)EnTrt_Destroy, + (ActorFunc)EnTrt_Update, + (ActorFunc)EnTrt_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8B770.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8B80C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8B88C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8B964.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8B9B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8BA3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8BAF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8BB3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8BB8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8BC8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8BCD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8BD28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8BD7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8BDD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8BEF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8BF24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8BFE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8C168.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8C1E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8C288.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8C488.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8C564.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8C64C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8C6CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8C74C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8C8A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8C98C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8CA2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8CB0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8CBFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8CCB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8CCF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8CD2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8CEE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8D094.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8D380.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8D5C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8D880.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8D9CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8DAAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8DBBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8DD10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8DD60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8DEBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8DF20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8DFBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E02C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E0D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E26C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E30C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E330.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E3CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E458.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E4D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E5A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E754.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E774.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E79C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E830.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E890.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E91C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E92C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E94C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8E9A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8EB4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8EB9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8EBD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8ECA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8ED3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8EFA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8EFF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8F268.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8F404.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/EnTrt_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/EnTrt_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/EnTrt_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8F8C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8FA00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8FB34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8FBB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/func_80A8FC64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt_0x80A8B770/EnTrt_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Trt/z_en_trt.h b/src/overlays/actors/ovl_En_Trt/z_en_trt.h new file mode 100644 index 0000000000..a39e32d2d4 --- /dev/null +++ b/src/overlays/actors/ovl_En_Trt/z_en_trt.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TRT_H +#define Z_EN_TRT_H + +#include + +struct EnTrt; + +typedef struct EnTrt { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2EC]; +} EnTrt; // size = 0x430 + +extern const ActorInit En_Trt_InitVars; + +#endif // Z_EN_TRT_H diff --git a/src/overlays/actors/ovl_En_Trt2/overlay.cfg b/src/overlays/actors/ovl_En_Trt2/overlay.cfg new file mode 100644 index 0000000000..60a280872a --- /dev/null +++ b/src/overlays/actors/ovl_En_Trt2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Trt2 +z_en_trt2.c diff --git a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c new file mode 100644 index 0000000000..bfdc52913d --- /dev/null +++ b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c @@ -0,0 +1,117 @@ +#include "z_en_trt2.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnTrt2*)thisx) + +void EnTrt2_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTrt2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTrt2_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Trt2_InitVars = { + ACTOR_EN_TRT2, + ACTORTYPE_NPC, + FLAGS, + OBJECT_TRT, + sizeof(EnTrt2), + (ActorFunc)EnTrt2_Init, + (ActorFunc)EnTrt2_Destroy, + (ActorFunc)EnTrt2_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3380.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD341C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD349C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3530.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3664.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD36EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD381C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD38B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3A24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3AE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3B6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3BE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3C94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3CEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3DA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3E34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3EF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD3FF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD40AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD4110.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD417C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD4298.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD431C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD434C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD4550.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD4608.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD469C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD46F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD475C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD48F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD49B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD4A78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD4B08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD4B4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD4C4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD4CCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD4DB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD4FE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/EnTrt2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/EnTrt2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/EnTrt2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD5234.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD5394.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD54C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD5584.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD566C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Trt2_0x80AD3380/func_80AD56E8.asm") diff --git a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.h b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.h new file mode 100644 index 0000000000..77ce71536e --- /dev/null +++ b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TRT2_H +#define Z_EN_TRT2_H + +#include + +struct EnTrt2; + +typedef struct EnTrt2 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x298]; +} EnTrt2; // size = 0x3DC + +extern const ActorInit En_Trt2_InitVars; + +#endif // Z_EN_TRT2_H diff --git a/src/overlays/actors/ovl_En_Tru/overlay.cfg b/src/overlays/actors/ovl_En_Tru/overlay.cfg new file mode 100644 index 0000000000..49e1ffdd98 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tru/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Tru +z_en_tru.c diff --git a/src/overlays/actors/ovl_En_Tru/z_en_tru.c b/src/overlays/actors/ovl_En_Tru/z_en_tru.c new file mode 100644 index 0000000000..a64da72a6e --- /dev/null +++ b/src/overlays/actors/ovl_En_Tru/z_en_tru.c @@ -0,0 +1,94 @@ +#include "z_en_tru.h" + +#define FLAGS 0x00000039 + +#define THIS ((EnTru*)thisx) + +void EnTru_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTru_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTru_Update(Actor* thisx, GlobalContext* globalCtx); +void EnTru_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Tru_InitVars = { + ACTOR_EN_TRU, + ACTORTYPE_NPC, + FLAGS, + OBJECT_TRU, + sizeof(EnTru), + (ActorFunc)EnTru_Init, + (ActorFunc)EnTru_Destroy, + (ActorFunc)EnTru_Update, + (ActorFunc)EnTru_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A85620.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A85788.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A85AA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A85BCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A85E2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A85F84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A86384.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A86460.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A86674.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A86770.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A868F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A86924.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A8697C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A869DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A86B0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A86BAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A86DB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A871E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A872AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A873B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A87400.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A875AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A8777C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A87880.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A87B48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A87DC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A87FD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A881E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/EnTru_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/EnTru_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/EnTru_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A885B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A88698.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/func_80A886D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_0x80A85620/EnTru_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Tru/z_en_tru.h b/src/overlays/actors/ovl_En_Tru/z_en_tru.h new file mode 100644 index 0000000000..9d0750172c --- /dev/null +++ b/src/overlays/actors/ovl_En_Tru/z_en_tru.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TRU_H +#define Z_EN_TRU_H + +#include + +struct EnTru; + +typedef struct EnTru { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x7F0]; +} EnTru; // size = 0x934 + +extern const ActorInit En_Tru_InitVars; + +#endif // Z_EN_TRU_H diff --git a/src/overlays/actors/ovl_En_Tru_Mt/overlay.cfg b/src/overlays/actors/ovl_En_Tru_Mt/overlay.cfg new file mode 100644 index 0000000000..8c432043ff --- /dev/null +++ b/src/overlays/actors/ovl_En_Tru_Mt/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Tru_Mt +z_en_tru_mt.c diff --git a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c new file mode 100644 index 0000000000..e401f81927 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c @@ -0,0 +1,72 @@ +#include "z_en_tru_mt.h" + +#define FLAGS 0x00000039 + +#define THIS ((EnTruMt*)thisx) + +void EnTruMt_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTruMt_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTruMt_Update(Actor* thisx, GlobalContext* globalCtx); +void EnTruMt_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Tru_Mt_InitVars = { + ACTOR_EN_TRU_MT, + ACTORTYPE_NPC, + FLAGS, + OBJECT_TRU, + sizeof(EnTruMt), + (ActorFunc)EnTruMt_Init, + (ActorFunc)EnTruMt_Destroy, + (ActorFunc)EnTruMt_Update, + (ActorFunc)EnTruMt_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76030.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76110.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76188.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B761FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76368.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B763C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76440.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76540.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76600.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B7679C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B768F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76924.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76980.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76A64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76BB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76C38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/EnTruMt_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/EnTruMt_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/EnTruMt_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B76ED4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B77008.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B77078.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/func_80B77354.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tru_Mt_0x80B76030/EnTruMt_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.h b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.h new file mode 100644 index 0000000000..8ea52c640b --- /dev/null +++ b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TRU_MT_H +#define Z_EN_TRU_MT_H + +#include + +struct EnTruMt; + +typedef struct EnTruMt { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x264]; +} EnTruMt; // size = 0x3A8 + +extern const ActorInit En_Tru_Mt_InitVars; + +#endif // Z_EN_TRU_MT_H diff --git a/src/overlays/actors/ovl_En_Tsn/overlay.cfg b/src/overlays/actors/ovl_En_Tsn/overlay.cfg new file mode 100644 index 0000000000..7c91103898 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tsn/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Tsn +z_en_tsn.c diff --git a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c new file mode 100644 index 0000000000..887abb2946 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c @@ -0,0 +1,66 @@ +#include "z_en_tsn.h" + +#define FLAGS 0x02000019 + +#define THIS ((EnTsn*)thisx) + +void EnTsn_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTsn_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTsn_Update(Actor* thisx, GlobalContext* globalCtx); +void EnTsn_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Tsn_InitVars = { + ACTOR_EN_TSN, + ACTORTYPE_NPC, + FLAGS, + OBJECT_TSN, + sizeof(EnTsn), + (ActorFunc)EnTsn_Init, + (ActorFunc)EnTsn_Destroy, + (ActorFunc)EnTsn_Update, + (ActorFunc)EnTsn_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80ADFCA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80ADFCEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/EnTsn_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/EnTsn_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80ADFF84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE0010.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE0304.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE0418.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE0460.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE04C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE04FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE0698.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE0704.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE0C88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE0D10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE0D78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/EnTsn_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE0F84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE0FA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/func_80AE1024.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tsn_0x80ADFCA0/EnTsn_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.h b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.h new file mode 100644 index 0000000000..68d0dd2755 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TSN_H +#define Z_EN_TSN_H + +#include + +struct EnTsn; + +typedef struct EnTsn { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xF0]; +} EnTsn; // size = 0x234 + +extern const ActorInit En_Tsn_InitVars; + +#endif // Z_EN_TSN_H diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/overlay.cfg b/src/overlays/actors/ovl_En_Tubo_Trap/overlay.cfg new file mode 100644 index 0000000000..364d4c7e9b --- /dev/null +++ b/src/overlays/actors/ovl_En_Tubo_Trap/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Tubo_Trap +z_en_tubo_trap.c diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c new file mode 100644 index 0000000000..42590ba602 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -0,0 +1,46 @@ +#include "z_en_tubo_trap.h" + +#define FLAGS 0x00000000 + +#define THIS ((EnTuboTrap*)thisx) + +void EnTuboTrap_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTuboTrap_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTuboTrap_Update(Actor* thisx, GlobalContext* globalCtx); +void EnTuboTrap_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Tubo_Trap_InitVars = { + ACTOR_EN_TUBO_TRAP, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_DANGEON_KEEP, + sizeof(EnTuboTrap), + (ActorFunc)EnTuboTrap_Init, + (ActorFunc)EnTuboTrap_Destroy, + (ActorFunc)EnTuboTrap_Update, + (ActorFunc)EnTuboTrap_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tubo_Trap_0x809307E0/EnTuboTrap_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tubo_Trap_0x809307E0/EnTuboTrap_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tubo_Trap_0x809307E0/func_8093089C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tubo_Trap_0x809307E0/func_809308F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tubo_Trap_0x809307E0/func_80930B60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tubo_Trap_0x809307E0/func_80930DDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tubo_Trap_0x809307E0/func_80931004.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tubo_Trap_0x809307E0/func_80931138.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tubo_Trap_0x809307E0/func_809311C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tubo_Trap_0x809307E0/EnTuboTrap_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Tubo_Trap_0x809307E0/EnTuboTrap_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h new file mode 100644 index 0000000000..1579cbd425 --- /dev/null +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TUBO_TRAP_H +#define Z_EN_TUBO_TRAP_H + +#include + +struct EnTuboTrap; + +typedef struct EnTuboTrap { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x60]; +} EnTuboTrap; // size = 0x1A4 + +extern const ActorInit En_Tubo_Trap_InitVars; + +#endif // Z_EN_TUBO_TRAP_H diff --git a/src/overlays/actors/ovl_En_Twig/overlay.cfg b/src/overlays/actors/ovl_En_Twig/overlay.cfg new file mode 100644 index 0000000000..29491912c0 --- /dev/null +++ b/src/overlays/actors/ovl_En_Twig/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Twig +z_en_twig.c diff --git a/src/overlays/actors/ovl_En_Twig/z_en_twig.c b/src/overlays/actors/ovl_En_Twig/z_en_twig.c new file mode 100644 index 0000000000..3ed5183fa9 --- /dev/null +++ b/src/overlays/actors/ovl_En_Twig/z_en_twig.c @@ -0,0 +1,44 @@ +#include "z_en_twig.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnTwig*)thisx) + +void EnTwig_Init(Actor* thisx, GlobalContext* globalCtx); +void EnTwig_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnTwig_Update(Actor* thisx, GlobalContext* globalCtx); +void EnTwig_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Twig_InitVars = { + ACTOR_EN_TWIG, + ACTORTYPE_MISC, + FLAGS, + OBJECT_TWIG, + sizeof(EnTwig), + (ActorFunc)EnTwig_Init, + (ActorFunc)EnTwig_Destroy, + (ActorFunc)EnTwig_Update, + (ActorFunc)EnTwig_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Twig_0x80AC0830/EnTwig_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Twig_0x80AC0830/EnTwig_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Twig_0x80AC0830/func_80AC0A54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Twig_0x80AC0830/func_80AC0A6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Twig_0x80AC0830/func_80AC0A7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Twig_0x80AC0830/func_80AC0AC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Twig_0x80AC0830/func_80AC0CC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Twig_0x80AC0830/func_80AC0D2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Twig_0x80AC0830/EnTwig_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Twig_0x80AC0830/EnTwig_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Twig/z_en_twig.h b/src/overlays/actors/ovl_En_Twig/z_en_twig.h new file mode 100644 index 0000000000..299a06c77f --- /dev/null +++ b/src/overlays/actors/ovl_En_Twig/z_en_twig.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_TWIG_H +#define Z_EN_TWIG_H + +#include + +struct EnTwig; + +typedef struct EnTwig { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x48]; +} EnTwig; // size = 0x18C + +extern const ActorInit En_Twig_InitVars; + +#endif // Z_EN_TWIG_H diff --git a/src/overlays/actors/ovl_En_Viewer/overlay.cfg b/src/overlays/actors/ovl_En_Viewer/overlay.cfg new file mode 100644 index 0000000000..3faa113d44 --- /dev/null +++ b/src/overlays/actors/ovl_En_Viewer/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Viewer +z_en_viewer.c diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c new file mode 100644 index 0000000000..7599af2fb6 --- /dev/null +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -0,0 +1,44 @@ +#include "z_en_viewer.h" + +#define FLAGS 0x00200030 + +#define THIS ((EnViewer*)thisx) + +void EnViewer_Init(Actor* thisx, GlobalContext* globalCtx); +void EnViewer_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnViewer_Update(Actor* thisx, GlobalContext* globalCtx); +void EnViewer_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Viewer_InitVars = { + ACTOR_EN_VIEWER, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnViewer), + (ActorFunc)EnViewer_Init, + (ActorFunc)EnViewer_Destroy, + (ActorFunc)EnViewer_Update, + (ActorFunc)EnViewer_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Viewer_0x8089EE20/func_8089EE20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Viewer_0x8089EE20/EnViewer_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Viewer_0x8089EE20/EnViewer_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Viewer_0x8089EE20/func_8089F014.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Viewer_0x8089EE20/func_8089F0A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Viewer_0x8089EE20/func_8089F17C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Viewer_0x8089EE20/func_8089F218.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Viewer_0x8089EE20/func_8089F2C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Viewer_0x8089EE20/EnViewer_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Viewer_0x8089EE20/EnViewer_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h new file mode 100644 index 0000000000..2dc6710b73 --- /dev/null +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_VIEWER_H +#define Z_EN_VIEWER_H + +#include + +struct EnViewer; + +typedef struct EnViewer { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x14]; +} EnViewer; // size = 0x158 + +extern const ActorInit En_Viewer_InitVars; + +#endif // Z_EN_VIEWER_H diff --git a/src/overlays/actors/ovl_En_Vm/overlay.cfg b/src/overlays/actors/ovl_En_Vm/overlay.cfg new file mode 100644 index 0000000000..7c1774086f --- /dev/null +++ b/src/overlays/actors/ovl_En_Vm/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Vm +z_en_vm.c diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c new file mode 100644 index 0000000000..81c1176dfc --- /dev/null +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -0,0 +1,62 @@ +#include "z_en_vm.h" + +#define FLAGS 0x00000405 + +#define THIS ((EnVm*)thisx) + +void EnVm_Init(Actor* thisx, GlobalContext* globalCtx); +void EnVm_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnVm_Update(Actor* thisx, GlobalContext* globalCtx); +void EnVm_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Vm_InitVars = { + ACTOR_EN_VM, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_VM, + sizeof(EnVm), + (ActorFunc)EnVm_Init, + (ActorFunc)EnVm_Destroy, + (ActorFunc)EnVm_Update, + (ActorFunc)EnVm_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/EnVm_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/EnVm_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CC420.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CC490.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CC5C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CC610.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CC788.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CC820.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CCA10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CCAA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CCB08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CCB50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CCBE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CCCF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CCDE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/EnVm_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CD020.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/func_808CD08C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Vm_0x808CC260/EnVm_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.h b/src/overlays/actors/ovl_En_Vm/z_en_vm.h new file mode 100644 index 0000000000..a884ae627a --- /dev/null +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_VM_H +#define Z_EN_VM_H + +#include + +struct EnVm; + +typedef struct EnVm { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x218]; +} EnVm; // size = 0x35C + +extern const ActorInit En_Vm_InitVars; + +#endif // Z_EN_VM_H diff --git a/src/overlays/actors/ovl_En_Wallmas/overlay.cfg b/src/overlays/actors/ovl_En_Wallmas/overlay.cfg new file mode 100644 index 0000000000..badbf57d02 --- /dev/null +++ b/src/overlays/actors/ovl_En_Wallmas/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Wallmas +z_en_wallmas.c diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c new file mode 100644 index 0000000000..74e6538599 --- /dev/null +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -0,0 +1,98 @@ +#include "z_en_wallmas.h" + +#define FLAGS 0x00000415 + +#define THIS ((EnWallmas*)thisx) + +void EnWallmas_Init(Actor* thisx, GlobalContext* globalCtx); +void EnWallmas_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnWallmas_Update(Actor* thisx, GlobalContext* globalCtx); +void EnWallmas_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Wallmas_InitVars = { + ACTOR_EN_WALLMAS, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_WALLMASTER, + sizeof(EnWallmas), + (ActorFunc)EnWallmas_Init, + (ActorFunc)EnWallmas_Destroy, + (ActorFunc)EnWallmas_Update, + (ActorFunc)EnWallmas_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/EnWallmas_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/EnWallmas_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80874A88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80874B04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80874B88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80874BE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80874D1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80874DE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80874F14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80874FD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80875014.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80875054.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_808750B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80875108.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_808751C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_8087520C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80875248.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_808752CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_808753F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80875484.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80875518.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_8087556C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_808755A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80875638.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_808756AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_8087571C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_808758C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80875910.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_8087596C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_808759B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80875A0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80875A74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/EnWallmas_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80875F04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_808760A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/func_80876118.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wallmas_0x80874810/EnWallmas_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h new file mode 100644 index 0000000000..afe89c6639 --- /dev/null +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_WALLMAS_H +#define Z_EN_WALLMAS_H + +#include + +struct EnWallmas; + +typedef struct EnWallmas { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x260]; +} EnWallmas; // size = 0x3A4 + +extern const ActorInit En_Wallmas_InitVars; + +#endif // Z_EN_WALLMAS_H diff --git a/src/overlays/actors/ovl_En_Warp_Uzu/overlay.cfg b/src/overlays/actors/ovl_En_Warp_Uzu/overlay.cfg new file mode 100644 index 0000000000..833f1a0b61 --- /dev/null +++ b/src/overlays/actors/ovl_En_Warp_Uzu/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Warp_Uzu +z_en_warp_uzu.c diff --git a/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c b/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c new file mode 100644 index 0000000000..0c0d96dba3 --- /dev/null +++ b/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c @@ -0,0 +1,40 @@ +#include "z_en_warp_uzu.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnWarpUzu*)thisx) + +void EnWarpUzu_Init(Actor* thisx, GlobalContext* globalCtx); +void EnWarpUzu_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnWarpUzu_Update(Actor* thisx, GlobalContext* globalCtx); +void EnWarpUzu_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Warp_Uzu_InitVars = { + ACTOR_EN_WARP_UZU, + ACTORTYPE_PROP, + FLAGS, + OBJECT_WARP_UZU, + sizeof(EnWarpUzu), + (ActorFunc)EnWarpUzu_Init, + (ActorFunc)EnWarpUzu_Destroy, + (ActorFunc)EnWarpUzu_Update, + (ActorFunc)EnWarpUzu_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_Uzu_0x80A66180/EnWarpUzu_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_Uzu_0x80A66180/EnWarpUzu_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_Uzu_0x80A66180/func_80A66208.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_Uzu_0x80A66180/func_80A66278.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_Uzu_0x80A66180/func_80A66384.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_Uzu_0x80A66180/func_80A663E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_Uzu_0x80A66180/EnWarpUzu_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_Uzu_0x80A66180/EnWarpUzu_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.h b/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.h new file mode 100644 index 0000000000..2ea4c8d305 --- /dev/null +++ b/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_WARP_UZU_H +#define Z_EN_WARP_UZU_H + +#include + +struct EnWarpUzu; + +typedef struct EnWarpUzu { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x50]; +} EnWarpUzu; // size = 0x194 + +extern const ActorInit En_Warp_Uzu_InitVars; + +#endif // Z_EN_WARP_UZU_H diff --git a/src/overlays/actors/ovl_En_Warp_tag/overlay.cfg b/src/overlays/actors/ovl_En_Warp_tag/overlay.cfg new file mode 100644 index 0000000000..a70ec6a5c2 --- /dev/null +++ b/src/overlays/actors/ovl_En_Warp_tag/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Warp_tag +z_en_warp_tag.c diff --git a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c new file mode 100644 index 0000000000..c1671fcb1d --- /dev/null +++ b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c @@ -0,0 +1,43 @@ +#include "z_en_warp_tag.h" + +#define FLAGS 0x0A000011 + +#define THIS ((EnWarptag*)thisx) + +void EnWarptag_Init(Actor* thisx, GlobalContext* globalCtx); +void EnWarptag_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnWarptag_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Warp_tag_InitVars = { + ACTOR_EN_WARP_TAG, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnWarptag), + (ActorFunc)EnWarptag_Init, + (ActorFunc)EnWarptag_Destroy, + (ActorFunc)EnWarptag_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_tag_0x809C0760/EnWarptag_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_tag_0x809C0760/EnWarptag_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_tag_0x809C0760/func_809C085C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_tag_0x809C0760/func_809C08E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_tag_0x809C0760/func_809C09A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_tag_0x809C0760/func_809C0A20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_tag_0x809C0760/func_809C0AB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_tag_0x809C0760/func_809C0E30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_tag_0x809C0760/EnWarptag_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Warp_tag_0x809C0760/func_809C0F3C.asm") diff --git a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.h b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.h new file mode 100644 index 0000000000..2f66aaaf6c --- /dev/null +++ b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_WARP_TAG_H +#define Z_EN_WARP_TAG_H + +#include + +struct EnWarptag; + +typedef struct EnWarptag { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x20]; +} EnWarptag; // size = 0x164 + +extern const ActorInit En_Warp_tag_InitVars; + +#endif // Z_EN_WARP_TAG_H diff --git a/src/overlays/actors/ovl_En_Water_Effect/overlay.cfg b/src/overlays/actors/ovl_En_Water_Effect/overlay.cfg new file mode 100644 index 0000000000..7aac8fdd83 --- /dev/null +++ b/src/overlays/actors/ovl_En_Water_Effect/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Water_Effect +z_en_water_effect.c diff --git a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c new file mode 100644 index 0000000000..a78fd7f12c --- /dev/null +++ b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c @@ -0,0 +1,46 @@ +#include "z_en_water_effect.h" + +#define FLAGS 0x00000035 + +#define THIS ((EnWaterEffect*)thisx) + +void EnWaterEffect_Init(Actor* thisx, GlobalContext* globalCtx); +void EnWaterEffect_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnWaterEffect_Update(Actor* thisx, GlobalContext* globalCtx); +void EnWaterEffect_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Water_Effect_InitVars = { + ACTOR_EN_WATER_EFFECT, + ACTORTYPE_BOSS, + FLAGS, + OBJECT_WATER_EFFECT, + sizeof(EnWaterEffect), + (ActorFunc)EnWaterEffect_Init, + (ActorFunc)EnWaterEffect_Destroy, + (ActorFunc)EnWaterEffect_Update, + (ActorFunc)EnWaterEffect_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Water_Effect_0x80A587A0/func_80A587A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Water_Effect_0x80A587A0/func_80A58908.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Water_Effect_0x80A587A0/EnWaterEffect_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Water_Effect_0x80A587A0/EnWaterEffect_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Water_Effect_0x80A587A0/EnWaterEffect_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Water_Effect_0x80A587A0/EnWaterEffect_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Water_Effect_0x80A587A0/func_80A599E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Water_Effect_0x80A587A0/func_80A59C04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Water_Effect_0x80A587A0/func_80A5A184.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Water_Effect_0x80A587A0/func_80A5A534.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Water_Effect_0x80A587A0/func_80A5A6B8.asm") diff --git a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.h b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.h new file mode 100644 index 0000000000..c31e71e9c5 --- /dev/null +++ b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_WATER_EFFECT_H +#define Z_EN_WATER_EFFECT_H + +#include + +struct EnWaterEffect; + +typedef struct EnWaterEffect { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xCF8]; +} EnWaterEffect; // size = 0xE3C + +extern const ActorInit En_Water_Effect_InitVars; + +#endif // Z_EN_WATER_EFFECT_H diff --git a/src/overlays/actors/ovl_En_Wdhand/overlay.cfg b/src/overlays/actors/ovl_En_Wdhand/overlay.cfg new file mode 100644 index 0000000000..501a7b6ed8 --- /dev/null +++ b/src/overlays/actors/ovl_En_Wdhand/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Wdhand +z_en_wdhand.c diff --git a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c new file mode 100644 index 0000000000..6e4b216fde --- /dev/null +++ b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c @@ -0,0 +1,72 @@ +#include "z_en_wdhand.h" + +#define FLAGS 0x00000005 + +#define THIS ((EnWdhand*)thisx) + +void EnWdhand_Init(Actor* thisx, GlobalContext* globalCtx); +void EnWdhand_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnWdhand_Update(Actor* thisx, GlobalContext* globalCtx); +void EnWdhand_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Wdhand_InitVars = { + ACTOR_EN_WDHAND, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_WDHAND, + sizeof(EnWdhand), + (ActorFunc)EnWdhand_Init, + (ActorFunc)EnWdhand_Destroy, + (ActorFunc)EnWdhand_Update, + (ActorFunc)EnWdhand_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/EnWdhand_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/EnWdhand_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF4608.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF4670.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF46F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF488C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF48D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF4964.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF4A88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF4C18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF4C64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF4ED0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF4F30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF4F6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF4FF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF5130.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF520C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF5650.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF56A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF5820.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF5E3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/EnWdhand_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/func_80AF5FE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wdhand_0x80AF43F0/EnWdhand_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.h b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.h new file mode 100644 index 0000000000..77ee54bc40 --- /dev/null +++ b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_WDHAND_H +#define Z_EN_WDHAND_H + +#include + +struct EnWdhand; + +typedef struct EnWdhand { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x310]; +} EnWdhand; // size = 0x454 + +extern const ActorInit En_Wdhand_InitVars; + +#endif // Z_EN_WDHAND_H diff --git a/src/overlays/actors/ovl_En_Weather_Tag/overlay.cfg b/src/overlays/actors/ovl_En_Weather_Tag/overlay.cfg new file mode 100644 index 0000000000..9b75932442 --- /dev/null +++ b/src/overlays/actors/ovl_En_Weather_Tag/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Weather_Tag +z_en_weather_tag.c diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c new file mode 100644 index 0000000000..510cca534d --- /dev/null +++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c @@ -0,0 +1,78 @@ +#include "z_en_weather_tag.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnWeatherTag*)thisx) + +void EnWeatherTag_Init(Actor* thisx, GlobalContext* globalCtx); +void EnWeatherTag_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnWeatherTag_Update(Actor* thisx, GlobalContext* globalCtx); +void EnWeatherTag_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Weather_Tag_InitVars = { + ACTOR_EN_WEATHER_TAG, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(EnWeatherTag), + (ActorFunc)EnWeatherTag_Init, + (ActorFunc)EnWeatherTag_Destroy, + (ActorFunc)EnWeatherTag_Update, + (ActorFunc)EnWeatherTag_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966410.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/EnWeatherTag_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/EnWeatherTag_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966608.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966758.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_8096689C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966A08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966A68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966AE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966B08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966BF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966D20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966E0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966E84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966EF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966F74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80966FEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80967060.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80967148.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_809671A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_809671B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80967250.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_809672DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_809674C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/func_80967608.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/EnWeatherTag_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Weather_Tag_0x80966410/EnWeatherTag_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h new file mode 100644 index 0000000000..a13279ed19 --- /dev/null +++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_WEATHER_TAG_H +#define Z_EN_WEATHER_TAG_H + +#include + +struct EnWeatherTag; + +typedef struct EnWeatherTag { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x18]; +} EnWeatherTag; // size = 0x15C + +extern const ActorInit En_Weather_Tag_InitVars; + +#endif // Z_EN_WEATHER_TAG_H diff --git a/src/overlays/actors/ovl_En_Wf/overlay.cfg b/src/overlays/actors/ovl_En_Wf/overlay.cfg new file mode 100644 index 0000000000..d24cd8a277 --- /dev/null +++ b/src/overlays/actors/ovl_En_Wf/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Wf +z_en_wf.c diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/src/overlays/actors/ovl_En_Wf/z_en_wf.c new file mode 100644 index 0000000000..cede8cd40b --- /dev/null +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -0,0 +1,138 @@ +#include "z_en_wf.h" + +#define FLAGS 0x00000415 + +#define THIS ((EnWf*)thisx) + +void EnWf_Init(Actor* thisx, GlobalContext* globalCtx); +void EnWf_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnWf_Update(Actor* thisx, GlobalContext* globalCtx); +void EnWf_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Wf_InitVars = { + ACTOR_EN_WF, + ACTORTYPE_PROP, + FLAGS, + OBJECT_WF, + sizeof(EnWf), + (ActorFunc)EnWf_Init, + (ActorFunc)EnWf_Destroy, + (ActorFunc)EnWf_Update, + (ActorFunc)EnWf_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/EnWf_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/EnWf_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_809907D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80990854.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_809908E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80990948.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80990C6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80990E4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80990EAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80990ED4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80990F0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80990F50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80990FC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80991040.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_809910F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80991174.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80991200.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80991280.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80991438.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_8099149C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80991738.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_8099177C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80991948.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_809919F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80991C04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80991C80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80991FD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80992068.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_8099223C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_809922B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_809923B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_809923E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_8099245C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_809924EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_809926D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80992784.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_8099282C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_809928CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80992A74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80992B8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80992D6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80992E0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80992FD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80993018.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80993148.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80993194.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80993350.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_809933A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80993524.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_8099357C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80993738.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_8099386C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/EnWf_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80993E50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_80993E94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/EnWf_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wf_0x80990310/func_8099408C.asm") diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.h b/src/overlays/actors/ovl_En_Wf/z_en_wf.h new file mode 100644 index 0000000000..c87a0df87b --- /dev/null +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_WF_H +#define Z_EN_WF_H + +#include + +struct EnWf; + +typedef struct EnWf { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x3A4]; +} EnWf; // size = 0x4E8 + +extern const ActorInit En_Wf_InitVars; + +#endif // Z_EN_WF_H diff --git a/src/overlays/actors/ovl_En_Wiz/overlay.cfg b/src/overlays/actors/ovl_En_Wiz/overlay.cfg new file mode 100644 index 0000000000..a52f236dcf --- /dev/null +++ b/src/overlays/actors/ovl_En_Wiz/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Wiz +z_en_wiz.c diff --git a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c new file mode 100644 index 0000000000..6750a264be --- /dev/null +++ b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c @@ -0,0 +1,80 @@ +#include "z_en_wiz.h" + +#define FLAGS 0x88101035 + +#define THIS ((EnWiz*)thisx) + +void EnWiz_Init(Actor* thisx, GlobalContext* globalCtx); +void EnWiz_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnWiz_Update(Actor* thisx, GlobalContext* globalCtx); +void EnWiz_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Wiz_InitVars = { + ACTOR_EN_WIZ, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_WIZ, + sizeof(EnWiz), + (ActorFunc)EnWiz_Init, + (ActorFunc)EnWiz_Destroy, + (ActorFunc)EnWiz_Update, + (ActorFunc)EnWiz_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/EnWiz_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/EnWiz_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A455C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A456A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A45CD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A460A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A46280.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A462F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A46414.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A4668C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A46764.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A468CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A46990.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A46C88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A46CC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A46DDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A46E24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A47000.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A470D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A47298.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A473B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A4767C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A476C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A477E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/EnWiz_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A47FCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/func_80A48138.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_0x80A45360/EnWiz_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.h b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.h new file mode 100644 index 0000000000..a3e5004b4c --- /dev/null +++ b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_WIZ_H +#define Z_EN_WIZ_H + +#include + +struct EnWiz; + +typedef struct EnWiz { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xC3C]; +} EnWiz; // size = 0xD80 + +extern const ActorInit En_Wiz_InitVars; + +#endif // Z_EN_WIZ_H diff --git a/src/overlays/actors/ovl_En_Wiz_Brock/overlay.cfg b/src/overlays/actors/ovl_En_Wiz_Brock/overlay.cfg new file mode 100644 index 0000000000..8976343c87 --- /dev/null +++ b/src/overlays/actors/ovl_En_Wiz_Brock/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Wiz_Brock +z_en_wiz_brock.c diff --git a/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c new file mode 100644 index 0000000000..aaeaf98689 --- /dev/null +++ b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c @@ -0,0 +1,36 @@ +#include "z_en_wiz_brock.h" + +#define FLAGS 0x08000010 + +#define THIS ((EnWizBrock*)thisx) + +void EnWizBrock_Init(Actor* thisx, GlobalContext* globalCtx); +void EnWizBrock_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnWizBrock_Update(Actor* thisx, GlobalContext* globalCtx); +void EnWizBrock_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Wiz_Brock_InitVars = { + ACTOR_EN_WIZ_BROCK, + ACTORTYPE_PROP, + FLAGS, + OBJECT_WIZ, + sizeof(EnWizBrock), + (ActorFunc)EnWizBrock_Init, + (ActorFunc)EnWizBrock_Destroy, + (ActorFunc)EnWizBrock_Update, + (ActorFunc)EnWizBrock_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Brock_0x80A48FE0/EnWizBrock_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Brock_0x80A48FE0/EnWizBrock_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Brock_0x80A48FE0/func_80A490E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Brock_0x80A48FE0/func_80A490FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Brock_0x80A48FE0/EnWizBrock_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Brock_0x80A48FE0/EnWizBrock_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.h b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.h new file mode 100644 index 0000000000..4252bde39d --- /dev/null +++ b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_WIZ_BROCK_H +#define Z_EN_WIZ_BROCK_H + +#include + +struct EnWizBrock; + +typedef struct EnWizBrock { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x6C]; +} EnWizBrock; // size = 0x1B0 + +extern const ActorInit En_Wiz_Brock_InitVars; + +#endif // Z_EN_WIZ_BROCK_H diff --git a/src/overlays/actors/ovl_En_Wiz_Fire/overlay.cfg b/src/overlays/actors/ovl_En_Wiz_Fire/overlay.cfg new file mode 100644 index 0000000000..47aa9022a7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Wiz_Fire/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Wiz_Fire +z_en_wiz_fire.c diff --git a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c new file mode 100644 index 0000000000..b657e00492 --- /dev/null +++ b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c @@ -0,0 +1,56 @@ +#include "z_en_wiz_fire.h" + +#define FLAGS 0x08000015 + +#define THIS ((EnWizFire*)thisx) + +void EnWizFire_Init(Actor* thisx, GlobalContext* globalCtx); +void EnWizFire_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnWizFire_Update(Actor* thisx, GlobalContext* globalCtx); +void EnWizFire_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Wiz_Fire_InitVars = { + ACTOR_EN_WIZ_FIRE, + ACTORTYPE_ENEMY, + FLAGS, + OBJECT_WIZ, + sizeof(EnWizFire), + (ActorFunc)EnWizFire_Init, + (ActorFunc)EnWizFire_Destroy, + (ActorFunc)EnWizFire_Update, + (ActorFunc)EnWizFire_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/EnWizFire_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/EnWizFire_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/func_80A4984C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/func_80A49A44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/func_80A49F38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/func_80A49FD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/func_80A4A11C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/func_80A4A608.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/EnWizFire_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/func_80A4B0C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/func_80A4B33C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/EnWizFire_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/func_80A4BAB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/func_80A4BC74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/func_80A4BDDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wiz_Fire_0x80A496A0/func_80A4BF78.asm") diff --git a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.h b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.h new file mode 100644 index 0000000000..646f1a8c2a --- /dev/null +++ b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_WIZ_FIRE_H +#define Z_EN_WIZ_FIRE_H + +#include + +struct EnWizFire; + +typedef struct EnWizFire { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0x29B0]; +} EnWizFire; // size = 0x2AF4 + +extern const ActorInit En_Wiz_Fire_InitVars; + +#endif // Z_EN_WIZ_FIRE_H diff --git a/src/overlays/actors/ovl_En_Wood02/overlay.cfg b/src/overlays/actors/ovl_En_Wood02/overlay.cfg new file mode 100644 index 0000000000..52dbc67e44 --- /dev/null +++ b/src/overlays/actors/ovl_En_Wood02/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Wood02 +z_en_wood02.c diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c new file mode 100644 index 0000000000..68d0cfa489 --- /dev/null +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -0,0 +1,38 @@ +#include "z_en_wood02.h" + +#define FLAGS 0x00000000 + +#define THIS ((EnWood02*)thisx) + +void EnWood02_Init(Actor* thisx, GlobalContext* globalCtx); +void EnWood02_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnWood02_Update(Actor* thisx, GlobalContext* globalCtx); +void EnWood02_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Wood02_InitVars = { + ACTOR_EN_WOOD02, + ACTORTYPE_PROP, + FLAGS, + OBJECT_WOOD02, + sizeof(EnWood02), + (ActorFunc)EnWood02_Init, + (ActorFunc)EnWood02_Destroy, + (ActorFunc)EnWood02_Update, + (ActorFunc)EnWood02_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wood02_0x808C3C00/func_808C3C00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wood02_0x808C3C00/func_808C3D28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wood02_0x808C3C00/EnWood02_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wood02_0x808C3C00/EnWood02_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wood02_0x808C3C00/func_808C4458.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wood02_0x808C3C00/EnWood02_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Wood02_0x808C3C00/EnWood02_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h new file mode 100644 index 0000000000..1394a54d24 --- /dev/null +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_WOOD02_H +#define Z_EN_WOOD02_H + +#include + +struct EnWood02; + +typedef struct EnWood02 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x5C]; +} EnWood02; // size = 0x1A0 + +extern const ActorInit En_Wood02_InitVars; + +#endif // Z_EN_WOOD02_H diff --git a/src/overlays/actors/ovl_En_Yb/overlay.cfg b/src/overlays/actors/ovl_En_Yb/overlay.cfg new file mode 100644 index 0000000000..5293ea603c --- /dev/null +++ b/src/overlays/actors/ovl_En_Yb/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Yb +z_en_yb.c diff --git a/src/overlays/actors/ovl_En_Yb/z_en_yb.c b/src/overlays/actors/ovl_En_Yb/z_en_yb.c new file mode 100644 index 0000000000..c9095fde8b --- /dev/null +++ b/src/overlays/actors/ovl_En_Yb/z_en_yb.c @@ -0,0 +1,68 @@ +#include "z_en_yb.h" + +#define FLAGS 0x02000019 + +#define THIS ((EnYb*)thisx) + +void EnYb_Init(Actor* thisx, GlobalContext* globalCtx); +void EnYb_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnYb_Update(Actor* thisx, GlobalContext* globalCtx); +void EnYb_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Yb_InitVars = { + ACTOR_EN_YB, + ACTORTYPE_NPC, + FLAGS, + OBJECT_YB, + sizeof(EnYb), + (ActorFunc)EnYb_Init, + (ActorFunc)EnYb_Destroy, + (ActorFunc)EnYb_Update, + (ActorFunc)EnYb_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/EnYb_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/EnYb_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFA2FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFA350.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFA444.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFA5CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFA634.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFA67C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFA6E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFA710.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFA730.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFA868.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFA91C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFA9D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFAB4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFABF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFAC88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFAE80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/EnYb_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFB074.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/func_80BFB0E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Yb_0x80BFA100/EnYb_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Yb/z_en_yb.h b/src/overlays/actors/ovl_En_Yb/z_en_yb.h new file mode 100644 index 0000000000..c508502bee --- /dev/null +++ b/src/overlays/actors/ovl_En_Yb/z_en_yb.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_YB_H +#define Z_EN_YB_H + +#include + +struct EnYb; + +typedef struct EnYb { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2E0]; +} EnYb; // size = 0x424 + +extern const ActorInit En_Yb_InitVars; + +#endif // Z_EN_YB_H diff --git a/src/overlays/actors/ovl_En_Zl1/overlay.cfg b/src/overlays/actors/ovl_En_Zl1/overlay.cfg new file mode 100644 index 0000000000..188c2f1d51 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zl1/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Zl1 +z_en_zl1.c diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c new file mode 100644 index 0000000000..e5810b2a68 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -0,0 +1,32 @@ +#include "z_en_zl1.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnZl1*)thisx) + +void EnZl1_Init(Actor* thisx, GlobalContext* globalCtx); +void EnZl1_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnZl1_Update(Actor* thisx, GlobalContext* globalCtx); +void EnZl1_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Zl1_InitVars = { + ACTOR_EN_ZL1, + ACTORTYPE_NPC, + FLAGS, + OBJECT_ZL1, + sizeof(EnZl1), + (ActorFunc)EnZl1_Init, + (ActorFunc)EnZl1_Destroy, + (ActorFunc)EnZl1_Update, + (ActorFunc)EnZl1_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zl1_0x8089ED90/EnZl1_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zl1_0x8089ED90/EnZl1_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zl1_0x8089ED90/EnZl1_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zl1_0x8089ED90/EnZl1_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h new file mode 100644 index 0000000000..d26fbc2f42 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ZL1_H +#define Z_EN_ZL1_H + +#include + +struct EnZl1; + +typedef struct EnZl1 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xC0]; +} EnZl1; // size = 0x204 + +extern const ActorInit En_Zl1_InitVars; + +#endif // Z_EN_ZL1_H diff --git a/src/overlays/actors/ovl_En_Zl4/overlay.cfg b/src/overlays/actors/ovl_En_Zl4/overlay.cfg new file mode 100644 index 0000000000..91cec56107 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zl4/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Zl4 +z_en_zl4.c diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c new file mode 100644 index 0000000000..75b9c31f47 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -0,0 +1,46 @@ +#include "z_en_zl4.h" + +#define FLAGS 0x00000030 + +#define THIS ((EnZl4*)thisx) + +void EnZl4_Init(Actor* thisx, GlobalContext* globalCtx); +void EnZl4_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnZl4_Update(Actor* thisx, GlobalContext* globalCtx); +void EnZl4_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Zl4_InitVars = { + ACTOR_EN_ZL4, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_STK, + sizeof(EnZl4), + (ActorFunc)EnZl4_Init, + (ActorFunc)EnZl4_Destroy, + (ActorFunc)EnZl4_Update, + (ActorFunc)EnZl4_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zl4_0x809A1BB0/func_809A1BB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zl4_0x809A1BB0/EnZl4_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zl4_0x809A1BB0/EnZl4_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zl4_0x809A1BB0/func_809A1D0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zl4_0x809A1BB0/EnZl4_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zl4_0x809A1BB0/func_809A1D60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zl4_0x809A1BB0/func_809A1DA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zl4_0x809A1BB0/func_809A1DBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zl4_0x809A1BB0/func_809A1DD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zl4_0x809A1BB0/func_809A1E28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zl4_0x809A1BB0/EnZl4_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h new file mode 100644 index 0000000000..b82a843c36 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ZL4_H +#define Z_EN_ZL4_H + +#include + +struct EnZl4; + +typedef struct EnZl4 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1B0]; +} EnZl4; // size = 0x2F4 + +extern const ActorInit En_Zl4_InitVars; + +#endif // Z_EN_ZL4_H diff --git a/src/overlays/actors/ovl_En_Zo/overlay.cfg b/src/overlays/actors/ovl_En_Zo/overlay.cfg new file mode 100644 index 0000000000..eeedbff837 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zo/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Zo +z_en_zo.c diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c new file mode 100644 index 0000000000..d2ee69a1e6 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -0,0 +1,54 @@ +#include "z_en_zo.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnZo*)thisx) + +void EnZo_Init(Actor* thisx, GlobalContext* globalCtx); +void EnZo_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnZo_Update(Actor* thisx, GlobalContext* globalCtx); +void EnZo_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Zo_InitVars = { + ACTOR_EN_ZO, + ACTORTYPE_NPC, + FLAGS, + OBJECT_ZO, + sizeof(EnZo), + (ActorFunc)EnZo_Init, + (ActorFunc)EnZo_Destroy, + (ActorFunc)EnZo_Update, + (ActorFunc)EnZo_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/func_8099E790.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/func_8099E858.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/func_8099E96C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/func_8099E9E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/func_8099EA60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/func_8099EBD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/func_8099EC50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/func_8099ED4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/func_8099EE24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/EnZo_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/EnZo_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/EnZo_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/func_8099EFF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/func_8099F15C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zo_0x8099E790/EnZo_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.h b/src/overlays/actors/ovl_En_Zo/z_en_zo.h new file mode 100644 index 0000000000..73bd213143 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ZO_H +#define Z_EN_ZO_H + +#include + +struct EnZo; + +typedef struct EnZo { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2E0]; +} EnZo; // size = 0x424 + +extern const ActorInit En_Zo_InitVars; + +#endif // Z_EN_ZO_H diff --git a/src/overlays/actors/ovl_En_Zob/overlay.cfg b/src/overlays/actors/ovl_En_Zob/overlay.cfg new file mode 100644 index 0000000000..e8a11666fc --- /dev/null +++ b/src/overlays/actors/ovl_En_Zob/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Zob +z_en_zob.c diff --git a/src/overlays/actors/ovl_En_Zob/z_en_zob.c b/src/overlays/actors/ovl_En_Zob/z_en_zob.c new file mode 100644 index 0000000000..fbc7a27fe7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zob/z_en_zob.c @@ -0,0 +1,88 @@ +#include "z_en_zob.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnZob*)thisx) + +void EnZob_Init(Actor* thisx, GlobalContext* globalCtx); +void EnZob_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnZob_Update(Actor* thisx, GlobalContext* globalCtx); +void EnZob_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Zob_InitVars = { + ACTOR_EN_ZOB, + ACTORTYPE_NPC, + FLAGS, + OBJECT_ZOB, + sizeof(EnZob), + (ActorFunc)EnZob_Init, + (ActorFunc)EnZob_Destroy, + (ActorFunc)EnZob_Update, + (ActorFunc)EnZob_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/EnZob_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/EnZob_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80B9F7E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80B9F86C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80B9FA3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80B9FC0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80B9FC70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80B9FCA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80B9FD24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80B9FDDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80B9FE1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80B9FE5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80B9FF20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80B9FF80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA005C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA00BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA0318.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA0374.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA0610.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA06BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA0728.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA08E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA09E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA0A04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA0AD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA0BB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA0C14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA0CF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/EnZob_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA0F64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/func_80BA0FAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zob_0x80B9F570/EnZob_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Zob/z_en_zob.h b/src/overlays/actors/ovl_En_Zob/z_en_zob.h new file mode 100644 index 0000000000..2f1ed08280 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zob/z_en_zob.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ZOB_H +#define Z_EN_ZOB_H + +#include + +struct EnZob; + +typedef struct EnZob { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1D4]; +} EnZob; // size = 0x318 + +extern const ActorInit En_Zob_InitVars; + +#endif // Z_EN_ZOB_H diff --git a/src/overlays/actors/ovl_En_Zod/overlay.cfg b/src/overlays/actors/ovl_En_Zod/overlay.cfg new file mode 100644 index 0000000000..8acdefc35f --- /dev/null +++ b/src/overlays/actors/ovl_En_Zod/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Zod +z_en_zod.c diff --git a/src/overlays/actors/ovl_En_Zod/z_en_zod.c b/src/overlays/actors/ovl_En_Zod/z_en_zod.c new file mode 100644 index 0000000000..2ac79a3d47 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zod/z_en_zod.c @@ -0,0 +1,70 @@ +#include "z_en_zod.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnZod*)thisx) + +void EnZod_Init(Actor* thisx, GlobalContext* globalCtx); +void EnZod_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnZod_Update(Actor* thisx, GlobalContext* globalCtx); +void EnZod_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Zod_InitVars = { + ACTOR_EN_ZOD, + ACTORTYPE_NPC, + FLAGS, + OBJECT_ZOD, + sizeof(EnZod), + (ActorFunc)EnZod_Init, + (ActorFunc)EnZod_Destroy, + (ActorFunc)EnZod_Update, + (ActorFunc)EnZod_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/EnZod_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/EnZod_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAF1EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAF2B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAF338.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAF3E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAF4D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAF7CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAF99C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAFA44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAFADC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAFB84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAFC00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAFC10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAFD00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAFDB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAFE34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BAFF14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/EnZod_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BB0128.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BB0170.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/func_80BB01B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zod_0x80BAEF70/EnZod_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Zod/z_en_zod.h b/src/overlays/actors/ovl_En_Zod/z_en_zod.h new file mode 100644 index 0000000000..89f0229b95 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zod/z_en_zod.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ZOD_H +#define Z_EN_ZOD_H + +#include + +struct EnZod; + +typedef struct EnZod { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x15C]; +} EnZod; // size = 0x2A0 + +extern const ActorInit En_Zod_InitVars; + +#endif // Z_EN_ZOD_H diff --git a/src/overlays/actors/ovl_En_Zog/overlay.cfg b/src/overlays/actors/ovl_En_Zog/overlay.cfg new file mode 100644 index 0000000000..fe913a71e4 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zog/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Zog +z_en_zog.c diff --git a/src/overlays/actors/ovl_En_Zog/z_en_zog.c b/src/overlays/actors/ovl_En_Zog/z_en_zog.c new file mode 100644 index 0000000000..1bd1496340 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zog/z_en_zog.c @@ -0,0 +1,86 @@ +#include "z_en_zog.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnZog*)thisx) + +void EnZog_Init(Actor* thisx, GlobalContext* globalCtx); +void EnZog_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnZog_Update(Actor* thisx, GlobalContext* globalCtx); +void EnZog_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Zog_InitVars = { + ACTOR_EN_ZOG, + ACTORTYPE_NPC, + FLAGS, + OBJECT_ZOG, + sizeof(EnZog), + (ActorFunc)EnZog_Init, + (ActorFunc)EnZog_Destroy, + (ActorFunc)EnZog_Update, + (ActorFunc)EnZog_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B93310.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B93468.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/EnZog_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/EnZog_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B939C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B93A48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B93B44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B93BA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B93BE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B93D2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B93DE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B93EA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B943A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B943C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B943EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B94470.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B9451C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B9461C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B946B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B946FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B948A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B94A00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B94C5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B94D0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B94E34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B95128.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B95240.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/EnZog_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B954C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/func_80B95598.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zog_0x80B93310/EnZog_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Zog/z_en_zog.h b/src/overlays/actors/ovl_En_Zog/z_en_zog.h new file mode 100644 index 0000000000..7b67ba55e7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zog/z_en_zog.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ZOG_H +#define Z_EN_ZOG_H + +#include + +struct EnZog; + +typedef struct EnZog { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1E8]; +} EnZog; // size = 0x32C + +extern const ActorInit En_Zog_InitVars; + +#endif // Z_EN_ZOG_H diff --git a/src/overlays/actors/ovl_En_Zoraegg/overlay.cfg b/src/overlays/actors/ovl_En_Zoraegg/overlay.cfg new file mode 100644 index 0000000000..f7f5fde0b1 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zoraegg/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Zoraegg +z_en_zoraegg.c diff --git a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c new file mode 100644 index 0000000000..18fa9bb11b --- /dev/null +++ b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c @@ -0,0 +1,100 @@ +#include "z_en_zoraegg.h" + +#define FLAGS 0x00000010 + +#define THIS ((EnZoraegg*)thisx) + +void EnZoraegg_Init(Actor* thisx, GlobalContext* globalCtx); +void EnZoraegg_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnZoraegg_Update(Actor* thisx, GlobalContext* globalCtx); +void EnZoraegg_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Zoraegg_InitVars = { + ACTOR_EN_ZORAEGG, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_ZORAEGG, + sizeof(EnZoraegg), + (ActorFunc)EnZoraegg_Init, + (ActorFunc)EnZoraegg_Destroy, + (ActorFunc)EnZoraegg_Update, + (ActorFunc)EnZoraegg_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B31590.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/EnZoraegg_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/EnZoraegg_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B319A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B319D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B31A34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B31C40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B31CB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B31D14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B31D64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B31E00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32084.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32094.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B320E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B321D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32228.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B322BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32390.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B324B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32644.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B326F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32820.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32928.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32A88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32B10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32B3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32B70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32BB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32C34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32D08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/EnZoraegg_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B32F04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B331C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B3336C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B333DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B33480.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/func_80B33818.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zoraegg_0x80B31590/EnZoraegg_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.h b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.h new file mode 100644 index 0000000000..9bef54d616 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ZORAEGG_H +#define Z_EN_ZORAEGG_H + +#include + +struct EnZoraegg; + +typedef struct EnZoraegg { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xB8]; +} EnZoraegg; // size = 0x1FC + +extern const ActorInit En_Zoraegg_InitVars; + +#endif // Z_EN_ZORAEGG_H diff --git a/src/overlays/actors/ovl_En_Zos/overlay.cfg b/src/overlays/actors/ovl_En_Zos/overlay.cfg new file mode 100644 index 0000000000..a83ca10170 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zos/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Zos +z_en_zos.c diff --git a/src/overlays/actors/ovl_En_Zos/z_en_zos.c b/src/overlays/actors/ovl_En_Zos/z_en_zos.c new file mode 100644 index 0000000000..609185cb9a --- /dev/null +++ b/src/overlays/actors/ovl_En_Zos/z_en_zos.c @@ -0,0 +1,82 @@ +#include "z_en_zos.h" + +#define FLAGS 0x02000009 + +#define THIS ((EnZos*)thisx) + +void EnZos_Init(Actor* thisx, GlobalContext* globalCtx); +void EnZos_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnZos_Update(Actor* thisx, GlobalContext* globalCtx); +void EnZos_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Zos_InitVars = { + ACTOR_EN_ZOS, + ACTORTYPE_NPC, + FLAGS, + OBJECT_ZOS, + sizeof(EnZos), + (ActorFunc)EnZos_Init, + (ActorFunc)EnZos_Destroy, + (ActorFunc)EnZos_Update, + (ActorFunc)EnZos_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/EnZos_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/EnZos_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBAE84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBAF5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBAFFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBB0D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBB15C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBB2C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBB354.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBB414.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBB4CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBB574.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBB718.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBB8AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBBB84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBBCBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBBD5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBBDE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBBFBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBC070.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBC14C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBC22C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBC24C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBC298.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBC37C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/EnZos_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBC4E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/func_80BBC500.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zos_0x80BBACA0/EnZos_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Zos/z_en_zos.h b/src/overlays/actors/ovl_En_Zos/z_en_zos.h new file mode 100644 index 0000000000..315728d892 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zos/z_en_zos.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ZOS_H +#define Z_EN_ZOS_H + +#include + +struct EnZos; + +typedef struct EnZos { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x180]; +} EnZos; // size = 0x2C4 + +extern const ActorInit En_Zos_InitVars; + +#endif // Z_EN_ZOS_H diff --git a/src/overlays/actors/ovl_En_Zot/overlay.cfg b/src/overlays/actors/ovl_En_Zot/overlay.cfg new file mode 100644 index 0000000000..0d4db225f4 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zot/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Zot +z_en_zot.c diff --git a/src/overlays/actors/ovl_En_Zot/z_en_zot.c b/src/overlays/actors/ovl_En_Zot/z_en_zot.c new file mode 100644 index 0000000000..d104477f6a --- /dev/null +++ b/src/overlays/actors/ovl_En_Zot/z_en_zot.c @@ -0,0 +1,132 @@ +#include "z_en_zot.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnZot*)thisx) + +void EnZot_Init(Actor* thisx, GlobalContext* globalCtx); +void EnZot_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnZot_Update(Actor* thisx, GlobalContext* globalCtx); +void EnZot_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Zot_InitVars = { + ACTOR_EN_ZOT, + ACTORTYPE_NPC, + FLAGS, + OBJECT_ZO, + sizeof(EnZot), + (ActorFunc)EnZot_Init, + (ActorFunc)EnZot_Destroy, + (ActorFunc)EnZot_Update, + (ActorFunc)EnZot_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B965D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/EnZot_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/EnZot_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B96BEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B96CE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B96D4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B96DF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B96E5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B96FB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97100.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97110.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97194.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97240.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B972E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B973BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B975F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B9765C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97708.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B9787C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B979DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97A44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97B5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97BF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97C40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97CC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97D6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97E0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97E4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B97FD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B980FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B98178.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B98348.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B9849C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B9854C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B985EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B98728.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B98998.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B98A4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B98AD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B98BF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B98CA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B98E10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B98F30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B98F94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B990A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B99160.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B991E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B992C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B99384.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/EnZot_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B99580.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B995A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/func_80B99758.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zot_0x80B965D0/EnZot_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Zot/z_en_zot.h b/src/overlays/actors/ovl_En_Zot/z_en_zot.h new file mode 100644 index 0000000000..d09cb0d66f --- /dev/null +++ b/src/overlays/actors/ovl_En_Zot/z_en_zot.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ZOT_H +#define Z_EN_ZOT_H + +#include + +struct EnZot; + +typedef struct EnZot { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1B8]; +} EnZot; // size = 0x2FC + +extern const ActorInit En_Zot_InitVars; + +#endif // Z_EN_ZOT_H diff --git a/src/overlays/actors/ovl_En_Zov/overlay.cfg b/src/overlays/actors/ovl_En_Zov/overlay.cfg new file mode 100644 index 0000000000..6e8d4a17a5 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zov/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Zov +z_en_zov.c diff --git a/src/overlays/actors/ovl_En_Zov/z_en_zov.c b/src/overlays/actors/ovl_En_Zov/z_en_zov.c new file mode 100644 index 0000000000..0785b68675 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zov/z_en_zov.c @@ -0,0 +1,72 @@ +#include "z_en_zov.h" + +#define FLAGS 0x00000009 + +#define THIS ((EnZov*)thisx) + +void EnZov_Init(Actor* thisx, GlobalContext* globalCtx); +void EnZov_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnZov_Update(Actor* thisx, GlobalContext* globalCtx); +void EnZov_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Zov_InitVars = { + ACTOR_EN_ZOV, + ACTORTYPE_NPC, + FLAGS, + OBJECT_ZOV, + sizeof(EnZov), + (ActorFunc)EnZov_Init, + (ActorFunc)EnZov_Destroy, + (ActorFunc)EnZov_Update, + (ActorFunc)EnZov_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/EnZov_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/EnZov_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD13DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1440.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1470.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1570.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD15A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD160C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1764.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD187C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD19FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1AE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1BF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1C38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1C84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1D30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1D94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1DB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1F1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD1FC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/EnZov_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD2380.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/func_80BD2404.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zov_0x80BD11E0/EnZov_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Zov/z_en_zov.h b/src/overlays/actors/ovl_En_Zov/z_en_zov.h new file mode 100644 index 0000000000..9d0ad33185 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zov/z_en_zov.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ZOV_H +#define Z_EN_ZOV_H + +#include + +struct EnZov; + +typedef struct EnZov { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1F0]; +} EnZov; // size = 0x334 + +extern const ActorInit En_Zov_InitVars; + +#endif // Z_EN_ZOV_H diff --git a/src/overlays/actors/ovl_En_Zow/overlay.cfg b/src/overlays/actors/ovl_En_Zow/overlay.cfg new file mode 100644 index 0000000000..ba17bffc79 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zow/overlay.cfg @@ -0,0 +1,2 @@ +ovl_En_Zow +z_en_zow.c diff --git a/src/overlays/actors/ovl_En_Zow/z_en_zow.c b/src/overlays/actors/ovl_En_Zow/z_en_zow.c new file mode 100644 index 0000000000..75357f1cd2 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zow/z_en_zow.c @@ -0,0 +1,78 @@ +#include "z_en_zow.h" + +#define FLAGS 0x00000019 + +#define THIS ((EnZow*)thisx) + +void EnZow_Init(Actor* thisx, GlobalContext* globalCtx); +void EnZow_Destroy(Actor* thisx, GlobalContext* globalCtx); +void EnZow_Update(Actor* thisx, GlobalContext* globalCtx); +void EnZow_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit En_Zow_InitVars = { + ACTOR_EN_ZOW, + ACTORTYPE_NPC, + FLAGS, + OBJECT_ZO, + sizeof(EnZow), + (ActorFunc)EnZow_Init, + (ActorFunc)EnZow_Destroy, + (ActorFunc)EnZow_Update, + (ActorFunc)EnZow_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDC270.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDC2D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDC3C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDC50C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDC5C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDC6F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDC830.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDC9DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDCB84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDCD38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDCDA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/EnZow_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/EnZow_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDD04C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDD154.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDD1E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDD350.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDD490.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDD570.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDD634.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDD6BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDD79C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/EnZow_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDDA7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDDAA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/func_80BDDAE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_En_Zow_0x80BDC270/EnZow_Draw.asm") diff --git a/src/overlays/actors/ovl_En_Zow/z_en_zow.h b/src/overlays/actors/ovl_En_Zow/z_en_zow.h new file mode 100644 index 0000000000..e2b8bbe6ae --- /dev/null +++ b/src/overlays/actors/ovl_En_Zow/z_en_zow.h @@ -0,0 +1,15 @@ +#ifndef Z_EN_ZOW_H +#define Z_EN_ZOW_H + +#include + +struct EnZow; + +typedef struct EnZow { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4D8]; +} EnZow; // size = 0x61C + +extern const ActorInit En_Zow_InitVars; + +#endif // Z_EN_ZOW_H diff --git a/src/overlays/actors/ovl_Item_B_Heart/overlay.cfg b/src/overlays/actors/ovl_Item_B_Heart/overlay.cfg new file mode 100644 index 0000000000..092976e2b5 --- /dev/null +++ b/src/overlays/actors/ovl_Item_B_Heart/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Item_B_Heart +z_item_b_heart.c diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c new file mode 100644 index 0000000000..234e18b997 --- /dev/null +++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c @@ -0,0 +1,34 @@ +#include "z_item_b_heart.h" + +#define FLAGS 0x00000000 + +#define THIS ((ItemBHeart*)thisx) + +void ItemBHeart_Init(Actor* thisx, GlobalContext* globalCtx); +void ItemBHeart_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ItemBHeart_Update(Actor* thisx, GlobalContext* globalCtx); +void ItemBHeart_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Item_B_Heart_InitVars = { + ACTOR_ITEM_B_HEART, + ACTORTYPE_BOSS, + FLAGS, + OBJECT_GI_HEARTS, + sizeof(ItemBHeart), + (ActorFunc)ItemBHeart_Init, + (ActorFunc)ItemBHeart_Destroy, + (ActorFunc)ItemBHeart_Update, + (ActorFunc)ItemBHeart_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Item_B_Heart_0x808BCDF0/ItemBHeart_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Item_B_Heart_0x808BCDF0/ItemBHeart_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Item_B_Heart_0x808BCDF0/ItemBHeart_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Item_B_Heart_0x808BCDF0/func_808BCF54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Item_B_Heart_0x808BCDF0/ItemBHeart_Draw.asm") diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h new file mode 100644 index 0000000000..8c55234f4b --- /dev/null +++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h @@ -0,0 +1,15 @@ +#ifndef Z_ITEM_B_HEART_H +#define Z_ITEM_B_HEART_H + +#include + +struct ItemBHeart; + +typedef struct ItemBHeart { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x28]; +} ItemBHeart; // size = 0x16C + +extern const ActorInit Item_B_Heart_InitVars; + +#endif // Z_ITEM_B_HEART_H diff --git a/src/overlays/actors/ovl_Item_Etcetera/overlay.cfg b/src/overlays/actors/ovl_Item_Etcetera/overlay.cfg new file mode 100644 index 0000000000..bf610d3f65 --- /dev/null +++ b/src/overlays/actors/ovl_Item_Etcetera/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Item_Etcetera +z_item_etcetera.c diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c new file mode 100644 index 0000000000..dcaabfb5f5 --- /dev/null +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -0,0 +1,41 @@ +#include "z_item_etcetera.h" + +#define FLAGS 0x00000010 + +#define THIS ((ItemEtcetera*)thisx) + +void ItemEtcetera_Init(Actor* thisx, GlobalContext* globalCtx); +void ItemEtcetera_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ItemEtcetera_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Item_Etcetera_InitVars = { + ACTOR_ITEM_ETCETERA, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ItemEtcetera), + (ActorFunc)ItemEtcetera_Init, + (ActorFunc)ItemEtcetera_Destroy, + (ActorFunc)ItemEtcetera_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Item_Etcetera_0x8091FEF0/func_8091FEF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Item_Etcetera_0x8091FEF0/ItemEtcetera_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Item_Etcetera_0x8091FEF0/ItemEtcetera_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Item_Etcetera_0x8091FEF0/func_80920044.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Item_Etcetera_0x8091FEF0/func_8092009C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Item_Etcetera_0x8091FEF0/func_809200F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Item_Etcetera_0x8091FEF0/ItemEtcetera_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Item_Etcetera_0x8091FEF0/func_80920164.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Item_Etcetera_0x8091FEF0/func_809201BC.asm") diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h new file mode 100644 index 0000000000..af726cb160 --- /dev/null +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h @@ -0,0 +1,15 @@ +#ifndef Z_ITEM_ETCETERA_H +#define Z_ITEM_ETCETERA_H + +#include + +struct ItemEtcetera; + +typedef struct ItemEtcetera { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x14]; +} ItemEtcetera; // size = 0x158 + +extern const ActorInit Item_Etcetera_InitVars; + +#endif // Z_ITEM_ETCETERA_H diff --git a/src/overlays/actors/ovl_Item_Inbox/overlay.cfg b/src/overlays/actors/ovl_Item_Inbox/overlay.cfg new file mode 100644 index 0000000000..e6d4ee8244 --- /dev/null +++ b/src/overlays/actors/ovl_Item_Inbox/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Item_Inbox +z_item_inbox.c diff --git a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c new file mode 100644 index 0000000000..25bcb2efcc --- /dev/null +++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c @@ -0,0 +1,34 @@ +#include "z_item_inbox.h" + +#define FLAGS 0x00000009 + +#define THIS ((ItemInbox*)thisx) + +void ItemInbox_Init(Actor* thisx, GlobalContext* globalCtx); +void ItemInbox_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ItemInbox_Update(Actor* thisx, GlobalContext* globalCtx); +void ItemInbox_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Item_Inbox_InitVars = { + ACTOR_ITEM_INBOX, + ACTORTYPE_NPC, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ItemInbox), + (ActorFunc)ItemInbox_Init, + (ActorFunc)ItemInbox_Destroy, + (ActorFunc)ItemInbox_Update, + (ActorFunc)ItemInbox_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Item_Inbox_0x809454F0/ItemInbox_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Item_Inbox_0x809454F0/ItemInbox_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Item_Inbox_0x809454F0/func_80945534.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Item_Inbox_0x809454F0/ItemInbox_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Item_Inbox_0x809454F0/ItemInbox_Draw.asm") diff --git a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h new file mode 100644 index 0000000000..9c9b42b0f1 --- /dev/null +++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h @@ -0,0 +1,15 @@ +#ifndef Z_ITEM_INBOX_H +#define Z_ITEM_INBOX_H + +#include + +struct ItemInbox; + +typedef struct ItemInbox { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4]; +} ItemInbox; // size = 0x148 + +extern const ActorInit Item_Inbox_InitVars; + +#endif // Z_ITEM_INBOX_H diff --git a/src/overlays/actors/ovl_Mir_Ray/overlay.cfg b/src/overlays/actors/ovl_Mir_Ray/overlay.cfg new file mode 100644 index 0000000000..9010673e36 --- /dev/null +++ b/src/overlays/actors/ovl_Mir_Ray/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Mir_Ray +z_mir_ray.c diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c new file mode 100644 index 0000000000..2e5d6063d0 --- /dev/null +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -0,0 +1,46 @@ +#include "z_mir_ray.h" + +#define FLAGS 0x00000030 + +#define THIS ((MirRay*)thisx) + +void MirRay_Init(Actor* thisx, GlobalContext* globalCtx); +void MirRay_Destroy(Actor* thisx, GlobalContext* globalCtx); +void MirRay_Update(Actor* thisx, GlobalContext* globalCtx); +void MirRay_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Mir_Ray_InitVars = { + ACTOR_MIR_RAY, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_MIR_RAY, + sizeof(MirRay), + (ActorFunc)MirRay_Init, + (ActorFunc)MirRay_Destroy, + (ActorFunc)MirRay_Update, + (ActorFunc)MirRay_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray_0x808E2600/func_808E2600.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray_0x808E2600/func_808E26C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray_0x808E2600/MirRay_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray_0x808E2600/MirRay_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray_0x808E2600/MirRay_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray_0x808E2600/func_808E2C68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray_0x808E2600/func_808E2E1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray_0x808E2600/func_808E2FF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray_0x808E2600/func_808E30FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray_0x808E2600/MirRay_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray_0x808E2600/func_808E3984.asm") diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h new file mode 100644 index 0000000000..07ecf5a108 --- /dev/null +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h @@ -0,0 +1,15 @@ +#ifndef Z_MIR_RAY_H +#define Z_MIR_RAY_H + +#include + +struct MirRay; + +typedef struct MirRay { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x164]; +} MirRay; // size = 0x2A8 + +extern const ActorInit Mir_Ray_InitVars; + +#endif // Z_MIR_RAY_H diff --git a/src/overlays/actors/ovl_Mir_Ray2/overlay.cfg b/src/overlays/actors/ovl_Mir_Ray2/overlay.cfg new file mode 100644 index 0000000000..2a1947005c --- /dev/null +++ b/src/overlays/actors/ovl_Mir_Ray2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Mir_Ray2 +z_mir_ray2.c diff --git a/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c b/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c new file mode 100644 index 0000000000..4adaaecf2e --- /dev/null +++ b/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c @@ -0,0 +1,36 @@ +#include "z_mir_ray2.h" + +#define FLAGS 0x00000030 + +#define THIS ((MirRay2*)thisx) + +void MirRay2_Init(Actor* thisx, GlobalContext* globalCtx); +void MirRay2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void MirRay2_Update(Actor* thisx, GlobalContext* globalCtx); +void MirRay2_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Mir_Ray2_InitVars = { + ACTOR_MIR_RAY2, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_MIR_RAY, + sizeof(MirRay2), + (ActorFunc)MirRay2_Init, + (ActorFunc)MirRay2_Destroy, + (ActorFunc)MirRay2_Update, + (ActorFunc)MirRay2_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray2_0x80AF3F70/func_80AF3F70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray2_0x80AF3F70/func_80AF3FE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray2_0x80AF3F70/MirRay2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray2_0x80AF3F70/MirRay2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray2_0x80AF3F70/MirRay2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray2_0x80AF3F70/MirRay2_Draw.asm") diff --git a/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.h b/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.h new file mode 100644 index 0000000000..20ca8d8aa9 --- /dev/null +++ b/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.h @@ -0,0 +1,15 @@ +#ifndef Z_MIR_RAY2_H +#define Z_MIR_RAY2_H + +#include + +struct MirRay2; + +typedef struct MirRay2 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x7C]; +} MirRay2; // size = 0x1C0 + +extern const ActorInit Mir_Ray2_InitVars; + +#endif // Z_MIR_RAY2_H diff --git a/src/overlays/actors/ovl_Mir_Ray3/overlay.cfg b/src/overlays/actors/ovl_Mir_Ray3/overlay.cfg new file mode 100644 index 0000000000..b2553ef0fe --- /dev/null +++ b/src/overlays/actors/ovl_Mir_Ray3/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Mir_Ray3 +z_mir_ray3.c diff --git a/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c new file mode 100644 index 0000000000..6d81918794 --- /dev/null +++ b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c @@ -0,0 +1,40 @@ +#include "z_mir_ray3.h" + +#define FLAGS 0x00000030 + +#define THIS ((MirRay3*)thisx) + +void MirRay3_Init(Actor* thisx, GlobalContext* globalCtx); +void MirRay3_Destroy(Actor* thisx, GlobalContext* globalCtx); +void MirRay3_Update(Actor* thisx, GlobalContext* globalCtx); +void MirRay3_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Mir_Ray3_InitVars = { + ACTOR_MIR_RAY3, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_MIR_RAY, + sizeof(MirRay3), + (ActorFunc)MirRay3_Init, + (ActorFunc)MirRay3_Destroy, + (ActorFunc)MirRay3_Update, + (ActorFunc)MirRay3_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray3_0x80B9E2C0/MirRay3_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray3_0x80B9E2C0/MirRay3_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray3_0x80B9E2C0/MirRay3_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray3_0x80B9E2C0/func_80B9E544.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray3_0x80B9E2C0/func_80B9E5F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray3_0x80B9E2C0/func_80B9E7D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray3_0x80B9E2C0/func_80B9E8D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Mir_Ray3_0x80B9E2C0/MirRay3_Draw.asm") diff --git a/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.h b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.h new file mode 100644 index 0000000000..cad3ff3d7b --- /dev/null +++ b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.h @@ -0,0 +1,15 @@ +#ifndef Z_MIR_RAY3_H +#define Z_MIR_RAY3_H + +#include + +struct MirRay3; + +typedef struct MirRay3 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x120]; +} MirRay3; // size = 0x264 + +extern const ActorInit Mir_Ray3_InitVars; + +#endif // Z_MIR_RAY3_H diff --git a/src/overlays/actors/ovl_Obj_Aqua/overlay.cfg b/src/overlays/actors/ovl_Obj_Aqua/overlay.cfg new file mode 100644 index 0000000000..fa2c65abcd --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Aqua/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Aqua +z_obj_aqua.c diff --git a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c new file mode 100644 index 0000000000..e5ba110242 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c @@ -0,0 +1,54 @@ +#include "z_obj_aqua.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjAqua*)thisx) + +void ObjAqua_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjAqua_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjAqua_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjAqua_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Aqua_InitVars = { + ACTOR_OBJ_AQUA, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjAqua), + (ActorFunc)ObjAqua_Init, + (ActorFunc)ObjAqua_Destroy, + (ActorFunc)ObjAqua_Update, + (ActorFunc)ObjAqua_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/func_80ACB6A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/func_80ACB7F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/func_80ACB940.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/func_80ACBA10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/func_80ACBA60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/ObjAqua_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/ObjAqua_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/func_80ACBC70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/func_80ACBC8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/func_80ACBD34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/func_80ACBD48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/func_80ACBDCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/func_80ACBDFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/ObjAqua_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Aqua_0x80ACB6A0/ObjAqua_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.h b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.h new file mode 100644 index 0000000000..8909e70b81 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_AQUA_H +#define Z_OBJ_AQUA_H + +#include + +struct ObjAqua; + +typedef struct ObjAqua { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x58]; +} ObjAqua; // size = 0x19C + +extern const ActorInit Obj_Aqua_InitVars; + +#endif // Z_OBJ_AQUA_H diff --git a/src/overlays/actors/ovl_Obj_Armos/overlay.cfg b/src/overlays/actors/ovl_Obj_Armos/overlay.cfg new file mode 100644 index 0000000000..1b54f7a3e0 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Armos/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Armos +z_obj_armos.c diff --git a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c new file mode 100644 index 0000000000..cf30d0b5d2 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c @@ -0,0 +1,58 @@ +#include "z_obj_armos.h" + +#define FLAGS 0x04000010 + +#define THIS ((ObjArmos*)thisx) + +void ObjArmos_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjArmos_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjArmos_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjArmos_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Armos_InitVars = { + ACTOR_OBJ_ARMOS, + ACTORTYPE_PROP, + FLAGS, + OBJECT_AM, + sizeof(ObjArmos), + (ActorFunc)ObjArmos_Init, + (ActorFunc)ObjArmos_Destroy, + (ActorFunc)ObjArmos_Update, + (ActorFunc)ObjArmos_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A4E00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A4E68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A4F00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A500C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A518C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/ObjArmos_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/ObjArmos_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A54B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A54E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A5610.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A562C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A57D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A57F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/ObjArmos_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A5960.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/func_809A5A3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Armos_0x809A4E00/ObjArmos_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.h b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.h new file mode 100644 index 0000000000..4b4b02fc21 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_ARMOS_H +#define Z_OBJ_ARMOS_H + +#include + +struct ObjArmos; + +typedef struct ObjArmos { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x130]; +} ObjArmos; // size = 0x274 + +extern const ActorInit Obj_Armos_InitVars; + +#endif // Z_OBJ_ARMOS_H diff --git a/src/overlays/actors/ovl_Obj_Bean/overlay.cfg b/src/overlays/actors/ovl_Obj_Bean/overlay.cfg new file mode 100644 index 0000000000..24317cd060 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Bean/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Bean +z_obj_bean.c diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c new file mode 100644 index 0000000000..2a9a2b671a --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -0,0 +1,149 @@ +#include "z_obj_bean.h" + +#define FLAGS 0x00400000 + +#define THIS ((ObjBean*)thisx) + +void ObjBean_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjBean_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjBean_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Bean_InitVars = { + ACTOR_OBJ_BEAN, + ACTORTYPE_BG, + FLAGS, + OBJECT_MAMENOKI, + sizeof(ObjBean), + (ActorFunc)ObjBean_Init, + (ActorFunc)ObjBean_Destroy, + (ActorFunc)ObjBean_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80936CF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80936D58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80936F04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80936F24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937130.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937160.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937238.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937268.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809372A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809372D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937468.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809374F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809375C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809375F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/ObjBean_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/ObjBean_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937B54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937C10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937C24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937C30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937CA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937CE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937D54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937DD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937DEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937FB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80937FC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809381B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809381C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938284.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938298.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_8093833C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938358.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809383B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809383D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938408.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938444.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809384E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938504.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938588.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809385A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938670.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_8093868C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938704.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938728.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_8093876C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938780.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938804.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938834.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938874.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809388A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_8093892C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938958.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938998.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_809389BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938A14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938A5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938AA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938AD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938C1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/ObjBean_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938E00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bean_0x80936CF0/func_80938F50.asm") diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h new file mode 100644 index 0000000000..a220b24965 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_BEAN_H +#define Z_OBJ_BEAN_H + +#include + +struct ObjBean; + +typedef struct ObjBean { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xC0]; +} ObjBean; // size = 0x204 + +extern const ActorInit Obj_Bean_InitVars; + +#endif // Z_OBJ_BEAN_H diff --git a/src/overlays/actors/ovl_Obj_Bell/overlay.cfg b/src/overlays/actors/ovl_Obj_Bell/overlay.cfg new file mode 100644 index 0000000000..40a295642b --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Bell/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Bell +z_obj_bell.c diff --git a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c new file mode 100644 index 0000000000..3379604ce8 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c @@ -0,0 +1,46 @@ +#include "z_obj_bell.h" + +#define FLAGS 0x00000030 + +#define THIS ((ObjBell*)thisx) + +void ObjBell_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjBell_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjBell_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjBell_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Bell_InitVars = { + ACTOR_OBJ_BELL, + ACTORTYPE_PROP, + FLAGS, + OBJECT_F52_OBJ, + sizeof(ObjBell), + (ActorFunc)ObjBell_Init, + (ActorFunc)ObjBell_Destroy, + (ActorFunc)ObjBell_Update, + (ActorFunc)ObjBell_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bell_0x80A35510/func_80A35510.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bell_0x80A35510/func_80A356D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bell_0x80A35510/func_80A357A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bell_0x80A35510/func_80A358FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bell_0x80A35510/func_80A359B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bell_0x80A35510/func_80A35B18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bell_0x80A35510/func_80A35BD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bell_0x80A35510/ObjBell_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bell_0x80A35510/ObjBell_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bell_0x80A35510/ObjBell_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bell_0x80A35510/ObjBell_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.h b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.h new file mode 100644 index 0000000000..0aa485f76e --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_BELL_H +#define Z_OBJ_BELL_H + +#include + +struct ObjBell; + +typedef struct ObjBell { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xE4]; +} ObjBell; // size = 0x228 + +extern const ActorInit Obj_Bell_InitVars; + +#endif // Z_OBJ_BELL_H diff --git a/src/overlays/actors/ovl_Obj_Bigicicle/overlay.cfg b/src/overlays/actors/ovl_Obj_Bigicicle/overlay.cfg new file mode 100644 index 0000000000..7f70ff3502 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Bigicicle/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Bigicicle +z_obj_bigicicle.c diff --git a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c new file mode 100644 index 0000000000..20c4d71bb5 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c @@ -0,0 +1,44 @@ +#include "z_obj_bigicicle.h" + +#define FLAGS 0x00000000 + +#define THIS ((ObjBigicicle*)thisx) + +void ObjBigicicle_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjBigicicle_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjBigicicle_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjBigicicle_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Bigicicle_InitVars = { + ACTOR_OBJ_BIGICICLE, + ACTORTYPE_PROP, + FLAGS, + OBJECT_BIGICICLE, + sizeof(ObjBigicicle), + (ActorFunc)ObjBigicicle_Init, + (ActorFunc)ObjBigicicle_Destroy, + (ActorFunc)ObjBigicicle_Update, + (ActorFunc)ObjBigicicle_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bigicicle_0x80AE8B70/ObjBigicicle_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bigicicle_0x80AE8B70/ObjBigicicle_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bigicicle_0x80AE8B70/func_80AE8DE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bigicicle_0x80AE8B70/func_80AE8FD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bigicicle_0x80AE8B70/func_80AE9090.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bigicicle_0x80AE8B70/func_80AE9180.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bigicicle_0x80AE8B70/func_80AE9258.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bigicicle_0x80AE8B70/func_80AE939C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bigicicle_0x80AE8B70/ObjBigicicle_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bigicicle_0x80AE8B70/ObjBigicicle_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.h b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.h new file mode 100644 index 0000000000..755ab2226c --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_BIGICICLE_H +#define Z_OBJ_BIGICICLE_H + +#include + +struct ObjBigicicle; + +typedef struct ObjBigicicle { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xA0]; +} ObjBigicicle; // size = 0x1E4 + +extern const ActorInit Obj_Bigicicle_InitVars; + +#endif // Z_OBJ_BIGICICLE_H diff --git a/src/overlays/actors/ovl_Obj_Blockstop/overlay.cfg b/src/overlays/actors/ovl_Obj_Blockstop/overlay.cfg new file mode 100644 index 0000000000..0c337eb0e6 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Blockstop/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Blockstop +z_obj_blockstop.c diff --git a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c new file mode 100644 index 0000000000..4f6ca6c537 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c @@ -0,0 +1,30 @@ +#include "z_obj_blockstop.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjBlockstop*)thisx) + +void ObjBlockstop_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjBlockstop_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Blockstop_InitVars = { + ACTOR_OBJ_BLOCKSTOP, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjBlockstop), + (ActorFunc)ObjBlockstop_Init, + (ActorFunc)func_800BDFB0, + (ActorFunc)ObjBlockstop_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Blockstop_0x809466A0/ObjBlockstop_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Blockstop_0x809466A0/func_809466F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Blockstop_0x809466A0/func_809467E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Blockstop_0x809466A0/ObjBlockstop_Update.asm") diff --git a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h new file mode 100644 index 0000000000..f2e3998d18 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_BLOCKSTOP_H +#define Z_OBJ_BLOCKSTOP_H + +#include + +struct ObjBlockstop; + +typedef struct ObjBlockstop { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4]; +} ObjBlockstop; // size = 0x148 + +extern const ActorInit Obj_Blockstop_InitVars; + +#endif // Z_OBJ_BLOCKSTOP_H diff --git a/src/overlays/actors/ovl_Obj_Boat/overlay.cfg b/src/overlays/actors/ovl_Obj_Boat/overlay.cfg new file mode 100644 index 0000000000..8617a82288 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Boat/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Boat +z_obj_boat.c diff --git a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c new file mode 100644 index 0000000000..cb3b4eabed --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c @@ -0,0 +1,38 @@ +#include "z_obj_boat.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjBoat*)thisx) + +void ObjBoat_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjBoat_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjBoat_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjBoat_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Boat_InitVars = { + ACTOR_OBJ_BOAT, + ACTORTYPE_BG, + FLAGS, + OBJECT_KAIZOKU_OBJ, + sizeof(ObjBoat), + (ActorFunc)ObjBoat_Init, + (ActorFunc)ObjBoat_Destroy, + (ActorFunc)ObjBoat_Update, + (ActorFunc)ObjBoat_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boat_0x80B9AF50/func_80B9AF50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boat_0x80B9AF50/ObjBoat_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boat_0x80B9AF50/ObjBoat_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boat_0x80B9AF50/func_80B9B124.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boat_0x80B9AF50/ObjBoat_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boat_0x80B9AF50/func_80B9B428.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boat_0x80B9AF50/ObjBoat_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.h b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.h new file mode 100644 index 0000000000..e9f0525451 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_BOAT_H +#define Z_OBJ_BOAT_H + +#include + +struct ObjBoat; + +typedef struct ObjBoat { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x24]; +} ObjBoat; // size = 0x168 + +extern const ActorInit Obj_Boat_InitVars; + +#endif // Z_OBJ_BOAT_H diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/overlay.cfg b/src/overlays/actors/ovl_Obj_Bombiwa/overlay.cfg new file mode 100644 index 0000000000..d18e4301f3 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Bombiwa/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Bombiwa +z_obj_bombiwa.c diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c new file mode 100644 index 0000000000..c0a8c954c1 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -0,0 +1,55 @@ +#include "z_obj_bombiwa.h" + +#define FLAGS 0x00000000 + +#define THIS ((ObjBombiwa*)thisx) + +void ObjBombiwa_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjBombiwa_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjBombiwa_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Bombiwa_InitVars = { + ACTOR_OBJ_BOMBIWA, + ACTORTYPE_PROP, + FLAGS, + OBJECT_BOMBIWA, + sizeof(ObjBombiwa), + (ActorFunc)ObjBombiwa_Init, + (ActorFunc)ObjBombiwa_Destroy, + (ActorFunc)ObjBombiwa_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_809393B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_80939470.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_8093951C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_80939594.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/ObjBombiwa_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/ObjBombiwa_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_80939794.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_80939994.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_80939C50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_80939EE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_80939EF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_8093A080.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_8093A1F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/ObjBombiwa_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_8093A418.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Bombiwa_0x809393B0/func_8093A608.asm") diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h new file mode 100644 index 0000000000..97a8a38f01 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_BOMBIWA_H +#define Z_OBJ_BOMBIWA_H + +#include + +struct ObjBombiwa; + +typedef struct ObjBombiwa { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xC4]; +} ObjBombiwa; // size = 0x208 + +extern const ActorInit Obj_Bombiwa_InitVars; + +#endif // Z_OBJ_BOMBIWA_H diff --git a/src/overlays/actors/ovl_Obj_Boyo/overlay.cfg b/src/overlays/actors/ovl_Obj_Boyo/overlay.cfg new file mode 100644 index 0000000000..c024ce5ed8 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Boyo/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Boyo +z_obj_boyo.c diff --git a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c new file mode 100644 index 0000000000..55e43ad224 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c @@ -0,0 +1,40 @@ +#include "z_obj_boyo.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjBoyo*)thisx) + +void ObjBoyo_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjBoyo_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjBoyo_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjBoyo_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Boyo_InitVars = { + ACTOR_OBJ_BOYO, + ACTORTYPE_PROP, + FLAGS, + OBJECT_BOYO, + sizeof(ObjBoyo), + (ActorFunc)ObjBoyo_Init, + (ActorFunc)ObjBoyo_Destroy, + (ActorFunc)ObjBoyo_Update, + (ActorFunc)ObjBoyo_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boyo_0x809A5D10/ObjBoyo_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boyo_0x809A5D10/ObjBoyo_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boyo_0x809A5D10/func_809A5DC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boyo_0x809A5D10/func_809A5DE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boyo_0x809A5D10/func_809A5E14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boyo_0x809A5D10/func_809A5E24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boyo_0x809A5D10/ObjBoyo_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Boyo_0x809A5D10/ObjBoyo_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.h b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.h new file mode 100644 index 0000000000..c390e4aa69 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_BOYO_H +#define Z_OBJ_BOYO_H + +#include + +struct ObjBoyo; + +typedef struct ObjBoyo { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x6C]; +} ObjBoyo; // size = 0x1B0 + +extern const ActorInit Obj_Boyo_InitVars; + +#endif // Z_OBJ_BOYO_H diff --git a/src/overlays/actors/ovl_Obj_Chan/overlay.cfg b/src/overlays/actors/ovl_Obj_Chan/overlay.cfg new file mode 100644 index 0000000000..6480f28ff6 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Chan/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Chan +z_obj_chan.c diff --git a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c new file mode 100644 index 0000000000..c784236cae --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c @@ -0,0 +1,50 @@ +#include "z_obj_chan.h" + +#define FLAGS 0x00000030 + +#define THIS ((ObjChan*)thisx) + +void ObjChan_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjChan_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjChan_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjChan_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Chan_InitVars = { + ACTOR_OBJ_CHAN, + ACTORTYPE_BG, + FLAGS, + OBJECT_OBJECT_UNSET_CHAN, + sizeof(ObjChan), + (ActorFunc)ObjChan_Init, + (ActorFunc)ObjChan_Destroy, + (ActorFunc)ObjChan_Update, + (ActorFunc)ObjChan_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/ObjChan_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/ObjChan_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/func_80BB9A1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/func_80BB9B40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/func_80BB9C08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/func_80BB9F24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/func_80BBA2FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/func_80BBA314.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/func_80BBA488.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/ObjChan_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/ObjChan_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/func_80BBA894.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chan_0x80BB98E0/func_80BBA930.asm") diff --git a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.h b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.h new file mode 100644 index 0000000000..afc29a8993 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_CHAN_H +#define Z_OBJ_CHAN_H + +#include + +struct ObjChan; + +typedef struct ObjChan { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xA0]; +} ObjChan; // size = 0x1E4 + +extern const ActorInit Obj_Chan_InitVars; + +#endif // Z_OBJ_CHAN_H diff --git a/src/overlays/actors/ovl_Obj_Chikuwa/overlay.cfg b/src/overlays/actors/ovl_Obj_Chikuwa/overlay.cfg new file mode 100644 index 0000000000..d2599907ae --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Chikuwa/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Chikuwa +z_obj_chikuwa.c diff --git a/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c new file mode 100644 index 0000000000..e21e12af48 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c @@ -0,0 +1,38 @@ +#include "z_obj_chikuwa.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjChikuwa*)thisx) + +void ObjChikuwa_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjChikuwa_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjChikuwa_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjChikuwa_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Chikuwa_InitVars = { + ACTOR_OBJ_CHIKUWA, + ACTORTYPE_BG, + FLAGS, + OBJECT_D_LIFT, + sizeof(ObjChikuwa), + (ActorFunc)ObjChikuwa_Init, + (ActorFunc)ObjChikuwa_Destroy, + (ActorFunc)ObjChikuwa_Update, + (ActorFunc)ObjChikuwa_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chikuwa_0x809B1550/func_809B1550.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chikuwa_0x809B1550/ObjChikuwa_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chikuwa_0x809B1550/ObjChikuwa_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chikuwa_0x809B1550/func_809B17D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chikuwa_0x809B1550/func_809B1AA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chikuwa_0x809B1550/ObjChikuwa_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Chikuwa_0x809B1550/ObjChikuwa_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.h b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.h new file mode 100644 index 0000000000..6989d2b79a --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_CHIKUWA_H +#define Z_OBJ_CHIKUWA_H + +#include + +struct ObjChikuwa; + +typedef struct ObjChikuwa { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x864]; +} ObjChikuwa; // size = 0x9A8 + +extern const ActorInit Obj_Chikuwa_InitVars; + +#endif // Z_OBJ_CHIKUWA_H diff --git a/src/overlays/actors/ovl_Obj_Comb/overlay.cfg b/src/overlays/actors/ovl_Obj_Comb/overlay.cfg new file mode 100644 index 0000000000..69f62abc44 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Comb/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Comb +z_obj_comb.c diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c new file mode 100644 index 0000000000..6ca7749e6c --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -0,0 +1,62 @@ +#include "z_obj_comb.h" + +#define FLAGS 0x00000000 + +#define THIS ((ObjComb*)thisx) + +void ObjComb_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjComb_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjComb_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjComb_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Comb_InitVars = { + ACTOR_OBJ_COMB, + ACTORTYPE_PROP, + FLAGS, + OBJECT_COMB, + sizeof(ObjComb), + (ActorFunc)ObjComb_Init, + (ActorFunc)ObjComb_Destroy, + (ActorFunc)ObjComb_Update, + (ActorFunc)ObjComb_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098CE40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098CEAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098D19C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098D47C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098D6E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098D870.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098D8C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098D99C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098DA74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/ObjComb_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/ObjComb_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098DC44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098DC60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098DE58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098DEA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098E098.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/func_8098E0B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/ObjComb_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Comb_0x8098CE40/ObjComb_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h new file mode 100644 index 0000000000..5a1814bd7f --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_COMB_H +#define Z_OBJ_COMB_H + +#include + +struct ObjComb; + +typedef struct ObjComb { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x78]; +} ObjComb; // size = 0x1BC + +extern const ActorInit Obj_Comb_InitVars; + +#endif // Z_OBJ_COMB_H diff --git a/src/overlays/actors/ovl_Obj_Danpeilift/overlay.cfg b/src/overlays/actors/ovl_Obj_Danpeilift/overlay.cfg new file mode 100644 index 0000000000..d2836d0123 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Danpeilift/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Danpeilift +z_obj_danpeilift.c diff --git a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c new file mode 100644 index 0000000000..14ac77e7ed --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c @@ -0,0 +1,42 @@ +#include "z_obj_danpeilift.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjDanpeilift*)thisx) + +void ObjDanpeilift_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjDanpeilift_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjDanpeilift_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjDanpeilift_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Danpeilift_InitVars = { + ACTOR_OBJ_DANPEILIFT, + ACTORTYPE_BG, + FLAGS, + OBJECT_OBJECT_UNSET_DANPEILIFT, + sizeof(ObjDanpeilift), + (ActorFunc)ObjDanpeilift_Init, + (ActorFunc)ObjDanpeilift_Destroy, + (ActorFunc)ObjDanpeilift_Update, + (ActorFunc)ObjDanpeilift_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Danpeilift_0x80C1ADC0/func_80C1ADC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Danpeilift_0x80C1ADC0/ObjDanpeilift_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Danpeilift_0x80C1ADC0/ObjDanpeilift_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Danpeilift_0x80C1ADC0/func_80C1AF84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Danpeilift_0x80C1ADC0/func_80C1AF94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Danpeilift_0x80C1ADC0/func_80C1B210.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Danpeilift_0x80C1ADC0/func_80C1B26C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Danpeilift_0x80C1ADC0/ObjDanpeilift_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Danpeilift_0x80C1ADC0/ObjDanpeilift_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.h b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.h new file mode 100644 index 0000000000..50eddc61c2 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_DANPEILIFT_H +#define Z_OBJ_DANPEILIFT_H + +#include + +struct ObjDanpeilift; + +typedef struct ObjDanpeilift { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x48]; +} ObjDanpeilift; // size = 0x18C + +extern const ActorInit Obj_Danpeilift_InitVars; + +#endif // Z_OBJ_DANPEILIFT_H diff --git a/src/overlays/actors/ovl_Obj_Demo/overlay.cfg b/src/overlays/actors/ovl_Obj_Demo/overlay.cfg new file mode 100644 index 0000000000..feba3b348c --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Demo/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Demo +z_obj_demo.c diff --git a/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c b/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c new file mode 100644 index 0000000000..a5ac0b66d1 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c @@ -0,0 +1,32 @@ +#include "z_obj_demo.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjDemo*)thisx) + +void ObjDemo_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjDemo_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Demo_InitVars = { + ACTOR_OBJ_DEMO, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjDemo), + (ActorFunc)ObjDemo_Init, + (ActorFunc)func_800BDFB0, + (ActorFunc)ObjDemo_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Demo_0x80983520/ObjDemo_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Demo_0x80983520/func_80983634.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Demo_0x80983520/func_80983678.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Demo_0x80983520/func_80983704.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Demo_0x80983520/ObjDemo_Update.asm") diff --git a/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.h b/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.h new file mode 100644 index 0000000000..ceca7b5156 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_DEMO_H +#define Z_OBJ_DEMO_H + +#include + +struct ObjDemo; + +typedef struct ObjDemo { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x10]; +} ObjDemo; // size = 0x154 + +extern const ActorInit Obj_Demo_InitVars; + +#endif // Z_OBJ_DEMO_H diff --git a/src/overlays/actors/ovl_Obj_Dhouse/overlay.cfg b/src/overlays/actors/ovl_Obj_Dhouse/overlay.cfg new file mode 100644 index 0000000000..0e58d06667 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Dhouse/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Dhouse +z_obj_dhouse.c diff --git a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c new file mode 100644 index 0000000000..9f956544e6 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c @@ -0,0 +1,64 @@ +#include "z_obj_dhouse.h" + +#define FLAGS 0x00400010 + +#define THIS ((ObjDhouse*)thisx) + +void ObjDhouse_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjDhouse_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjDhouse_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjDhouse_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Dhouse_InitVars = { + ACTOR_OBJ_DHOUSE, + ACTORTYPE_BG, + FLAGS, + OBJECT_DHOUSE, + sizeof(ObjDhouse), + (ActorFunc)ObjDhouse_Init, + (ActorFunc)ObjDhouse_Destroy, + (ActorFunc)ObjDhouse_Update, + (ActorFunc)ObjDhouse_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/ObjDhouse_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/ObjDhouse_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B12A50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B12A88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B12B38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B12D78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B12E7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B13170.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B13474.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B13724.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B13908.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B1391C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B1392C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B13940.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B139D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B139F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/ObjDhouse_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/ObjDhouse_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B13C08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dhouse_0x80B12980/func_80B13E40.asm") diff --git a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.h b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.h new file mode 100644 index 0000000000..5bc89d69c8 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_DHOUSE_H +#define Z_OBJ_DHOUSE_H + +#include + +struct ObjDhouse; + +typedef struct ObjDhouse { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0x1230]; +} ObjDhouse; // size = 0x1374 + +extern const ActorInit Obj_Dhouse_InitVars; + +#endif // Z_OBJ_DHOUSE_H diff --git a/src/overlays/actors/ovl_Obj_Dinner/overlay.cfg b/src/overlays/actors/ovl_Obj_Dinner/overlay.cfg new file mode 100644 index 0000000000..3fc58dccdf --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Dinner/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Dinner +z_obj_dinner.c diff --git a/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c b/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c new file mode 100644 index 0000000000..d487dc7bc5 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c @@ -0,0 +1,32 @@ +#include "z_obj_dinner.h" + +#define FLAGS 0x00000020 + +#define THIS ((ObjDinner*)thisx) + +void ObjDinner_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjDinner_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjDinner_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjDinner_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Dinner_InitVars = { + ACTOR_OBJ_DINNER, + ACTORTYPE_PROP, + FLAGS, + OBJECT_OBJECT_UNSET_DINNER, + sizeof(ObjDinner), + (ActorFunc)ObjDinner_Init, + (ActorFunc)ObjDinner_Destroy, + (ActorFunc)ObjDinner_Update, + (ActorFunc)ObjDinner_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dinner_0x80BEB940/ObjDinner_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dinner_0x80BEB940/ObjDinner_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dinner_0x80BEB940/ObjDinner_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dinner_0x80BEB940/ObjDinner_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.h b/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.h new file mode 100644 index 0000000000..25d68c999d --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_DINNER_H +#define Z_OBJ_DINNER_H + +#include + +struct ObjDinner; + +typedef struct ObjDinner { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4]; +} ObjDinner; // size = 0x148 + +extern const ActorInit Obj_Dinner_InitVars; + +#endif // Z_OBJ_DINNER_H diff --git a/src/overlays/actors/ovl_Obj_Dora/overlay.cfg b/src/overlays/actors/ovl_Obj_Dora/overlay.cfg new file mode 100644 index 0000000000..1bb5f302a3 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Dora/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Dora +z_obj_dora.c diff --git a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c new file mode 100644 index 0000000000..b40881e456 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c @@ -0,0 +1,44 @@ +#include "z_obj_dora.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjDora*)thisx) + +void ObjDora_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjDora_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjDora_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjDora_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Dora_InitVars = { + ACTOR_OBJ_DORA, + ACTORTYPE_NPC, + FLAGS, + OBJECT_DORA, + sizeof(ObjDora), + (ActorFunc)ObjDora_Init, + (ActorFunc)ObjDora_Destroy, + (ActorFunc)ObjDora_Update, + (ActorFunc)ObjDora_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dora_0x80B60AD0/ObjDora_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dora_0x80B60AD0/ObjDora_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dora_0x80B60AD0/func_80B60C9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dora_0x80B60AD0/func_80B60CB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dora_0x80B60AD0/func_80B60CC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dora_0x80B60AD0/func_80B60D34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dora_0x80B60AD0/func_80B60E54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dora_0x80B60AD0/func_80B60EE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dora_0x80B60AD0/ObjDora_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dora_0x80B60AD0/ObjDora_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.h b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.h new file mode 100644 index 0000000000..d264e10b9a --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_DORA_H +#define Z_OBJ_DORA_H + +#include + +struct ObjDora; + +typedef struct ObjDora { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x268]; +} ObjDora; // size = 0x3AC + +extern const ActorInit Obj_Dora_InitVars; + +#endif // Z_OBJ_DORA_H diff --git a/src/overlays/actors/ovl_Obj_Dowsing/overlay.cfg b/src/overlays/actors/ovl_Obj_Dowsing/overlay.cfg new file mode 100644 index 0000000000..e8dbfc20ae --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Dowsing/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Dowsing +z_obj_dowsing.c diff --git a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c new file mode 100644 index 0000000000..4e58c81416 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c @@ -0,0 +1,33 @@ +#include "z_obj_dowsing.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjDowsing*)thisx) + +void ObjDowsing_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjDowsing_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjDowsing_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Dowsing_InitVars = { + ACTOR_OBJ_DOWSING, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjDowsing), + (ActorFunc)ObjDowsing_Init, + (ActorFunc)ObjDowsing_Destroy, + (ActorFunc)ObjDowsing_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dowsing_0x80B23D50/func_80B23D50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dowsing_0x80B23D50/func_80B23DD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dowsing_0x80B23D50/ObjDowsing_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dowsing_0x80B23D50/ObjDowsing_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Dowsing_0x80B23D50/ObjDowsing_Update.asm") diff --git a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.h b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.h new file mode 100644 index 0000000000..cb3fca8c63 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.h @@ -0,0 +1,14 @@ +#ifndef Z_OBJ_DOWSING_H +#define Z_OBJ_DOWSING_H + +#include + +struct ObjDowsing; + +typedef struct ObjDowsing { + /* 0x000 */ Actor actor; +} ObjDowsing; // size = 0x144 + +extern const ActorInit Obj_Dowsing_InitVars; + +#endif // Z_OBJ_DOWSING_H diff --git a/src/overlays/actors/ovl_Obj_Driftice/overlay.cfg b/src/overlays/actors/ovl_Obj_Driftice/overlay.cfg new file mode 100644 index 0000000000..1b85d29a1d --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Driftice/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Driftice +z_obj_driftice.c diff --git a/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c new file mode 100644 index 0000000000..3764716f14 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c @@ -0,0 +1,62 @@ +#include "z_obj_driftice.h" + +#define FLAGS 0x00000000 + +#define THIS ((ObjDriftice*)thisx) + +void ObjDriftice_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjDriftice_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjDriftice_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjDriftice_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Driftice_InitVars = { + ACTOR_OBJ_DRIFTICE, + ACTORTYPE_BG, + FLAGS, + OBJECT_DRIFTICE, + sizeof(ObjDriftice), + (ActorFunc)ObjDriftice_Init, + (ActorFunc)ObjDriftice_Destroy, + (ActorFunc)ObjDriftice_Update, + (ActorFunc)ObjDriftice_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A66570.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A665AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A665EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A667F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A66930.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A66C4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A66E30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/ObjDriftice_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/ObjDriftice_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A671A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A671BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A671CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A671E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A6743C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A67450.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A674A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/func_80A674C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/ObjDriftice_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Driftice_0x80A66570/ObjDriftice_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.h b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.h new file mode 100644 index 0000000000..705c0186db --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_DRIFTICE_H +#define Z_OBJ_DRIFTICE_H + +#include + +struct ObjDriftice; + +typedef struct ObjDriftice { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x10C]; +} ObjDriftice; // size = 0x250 + +extern const ActorInit Obj_Driftice_InitVars; + +#endif // Z_OBJ_DRIFTICE_H diff --git a/src/overlays/actors/ovl_Obj_Ending/overlay.cfg b/src/overlays/actors/ovl_Obj_Ending/overlay.cfg new file mode 100644 index 0000000000..4930e52266 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Ending/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Ending +z_obj_ending.c diff --git a/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c new file mode 100644 index 0000000000..71978adf29 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c @@ -0,0 +1,29 @@ +#include "z_obj_ending.h" + +#define FLAGS 0x00000030 + +#define THIS ((ObjEnding*)thisx) + +void ObjEnding_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjEnding_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjEnding_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Ending_InitVars = { + ACTOR_OBJ_ENDING, + ACTORTYPE_BG, + FLAGS, + OBJECT_ENDING_OBJ, + sizeof(ObjEnding), + (ActorFunc)ObjEnding_Init, + (ActorFunc)func_800BDFB0, + (ActorFunc)ObjEnding_Update, + (ActorFunc)ObjEnding_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ending_0x80C25BC0/ObjEnding_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ending_0x80C25BC0/ObjEnding_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ending_0x80C25BC0/ObjEnding_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.h b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.h new file mode 100644 index 0000000000..269279c1ee --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_ENDING_H +#define Z_OBJ_ENDING_H + +#include + +struct ObjEnding; + +typedef struct ObjEnding { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x8]; +} ObjEnding; // size = 0x14C + +extern const ActorInit Obj_Ending_InitVars; + +#endif // Z_OBJ_ENDING_H diff --git a/src/overlays/actors/ovl_Obj_Entotu/overlay.cfg b/src/overlays/actors/ovl_Obj_Entotu/overlay.cfg new file mode 100644 index 0000000000..55d5ebe5f9 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Entotu/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Entotu +z_obj_entotu.c diff --git a/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c new file mode 100644 index 0000000000..1579cab280 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c @@ -0,0 +1,40 @@ +#include "z_obj_entotu.h" + +#define FLAGS 0x00000030 + +#define THIS ((ObjEntotu*)thisx) + +void ObjEntotu_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjEntotu_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjEntotu_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjEntotu_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Entotu_InitVars = { + ACTOR_OBJ_ENTOTU, + ACTORTYPE_PROP, + FLAGS, + OBJECT_F53_OBJ, + sizeof(ObjEntotu), + (ActorFunc)ObjEntotu_Init, + (ActorFunc)ObjEntotu_Destroy, + (ActorFunc)ObjEntotu_Update, + (ActorFunc)ObjEntotu_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Entotu_0x80A34700/func_80A34700.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Entotu_0x80A34700/func_80A349C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Entotu_0x80A34700/func_80A34A44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Entotu_0x80A34700/func_80A34B28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Entotu_0x80A34700/ObjEntotu_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Entotu_0x80A34700/ObjEntotu_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Entotu_0x80A34700/ObjEntotu_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Entotu_0x80A34700/ObjEntotu_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.h b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.h new file mode 100644 index 0000000000..37f0e57605 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_ENTOTU_H +#define Z_OBJ_ENTOTU_H + +#include + +struct ObjEntotu; + +typedef struct ObjEntotu { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x84]; +} ObjEntotu; // size = 0x1C8 + +extern const ActorInit Obj_Entotu_InitVars; + +#endif // Z_OBJ_ENTOTU_H diff --git a/src/overlays/actors/ovl_Obj_Etcetera/overlay.cfg b/src/overlays/actors/ovl_Obj_Etcetera/overlay.cfg new file mode 100644 index 0000000000..d8a2390689 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Etcetera/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Etcetera +z_obj_etcetera.c diff --git a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c new file mode 100644 index 0000000000..eea67adc66 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c @@ -0,0 +1,45 @@ +#include "z_obj_etcetera.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjEtcetera*)thisx) + +void ObjEtcetera_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjEtcetera_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjEtcetera_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Etcetera_InitVars = { + ACTOR_OBJ_ETCETERA, + ACTORTYPE_BG, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjEtcetera), + (ActorFunc)ObjEtcetera_Init, + (ActorFunc)ObjEtcetera_Destroy, + (ActorFunc)ObjEtcetera_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Etcetera_0x80A7BC70/ObjEtcetera_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Etcetera_0x80A7BC70/ObjEtcetera_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Etcetera_0x80A7BC70/func_80A7BDC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Etcetera_0x80A7BC70/func_80A7BE8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Etcetera_0x80A7BC70/func_80A7BF08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Etcetera_0x80A7BC70/func_80A7C168.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Etcetera_0x80A7BC70/func_80A7C1F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Etcetera_0x80A7BC70/func_80A7C308.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Etcetera_0x80A7BC70/ObjEtcetera_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Etcetera_0x80A7BC70/func_80A7C690.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Etcetera_0x80A7BC70/func_80A7C718.asm") diff --git a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h new file mode 100644 index 0000000000..22229ac667 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_ETCETERA_H +#define Z_OBJ_ETCETERA_H + +#include + +struct ObjEtcetera; + +typedef struct ObjEtcetera { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x140]; +} ObjEtcetera; // size = 0x284 + +extern const ActorInit Obj_Etcetera_InitVars; + +#endif // Z_OBJ_ETCETERA_H diff --git a/src/overlays/actors/ovl_Obj_Fireshield/overlay.cfg b/src/overlays/actors/ovl_Obj_Fireshield/overlay.cfg new file mode 100644 index 0000000000..e5006379ab --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Fireshield/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Fireshield +z_obj_fireshield.c diff --git a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c new file mode 100644 index 0000000000..7d0ea0f15b --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c @@ -0,0 +1,52 @@ +#include "z_obj_fireshield.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjFireshield*)thisx) + +void ObjFireshield_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjFireshield_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjFireshield_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjFireshield_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Fireshield_InitVars = { + ACTOR_OBJ_FIRESHIELD, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjFireshield), + (ActorFunc)ObjFireshield_Init, + (ActorFunc)ObjFireshield_Destroy, + (ActorFunc)ObjFireshield_Update, + (ActorFunc)ObjFireshield_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/func_80A4CA90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/func_80A4CABC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/func_80A4CB7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/func_80A4CC54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/func_80A4CCBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/func_80A4CD28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/func_80A4CD34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/func_80A4CE28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/func_80A4D174.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/func_80A4D1CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/ObjFireshield_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/ObjFireshield_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/ObjFireshield_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Fireshield_0x80A4CA90/ObjFireshield_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.h b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.h new file mode 100644 index 0000000000..06df872f86 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_FIRESHIELD_H +#define Z_OBJ_FIRESHIELD_H + +#include + +struct ObjFireshield; + +typedef struct ObjFireshield { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x68]; +} ObjFireshield; // size = 0x1AC + +extern const ActorInit Obj_Fireshield_InitVars; + +#endif // Z_OBJ_FIRESHIELD_H diff --git a/src/overlays/actors/ovl_Obj_Flowerpot/overlay.cfg b/src/overlays/actors/ovl_Obj_Flowerpot/overlay.cfg new file mode 100644 index 0000000000..f6aa9dc164 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Flowerpot/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Flowerpot +z_obj_flowerpot.c diff --git a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c new file mode 100644 index 0000000000..98e00c0c23 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c @@ -0,0 +1,70 @@ +#include "z_obj_flowerpot.h" + +#define FLAGS 0x00000000 + +#define THIS ((ObjFlowerpot*)thisx) + +void ObjFlowerpot_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjFlowerpot_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjFlowerpot_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjFlowerpot_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Flowerpot_InitVars = { + ACTOR_OBJ_FLOWERPOT, + ACTORTYPE_PROP, + FLAGS, + OBJECT_FLOWERPOT, + sizeof(ObjFlowerpot), + (ActorFunc)ObjFlowerpot_Init, + (ActorFunc)ObjFlowerpot_Destroy, + (ActorFunc)ObjFlowerpot_Update, + (ActorFunc)ObjFlowerpot_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1B3D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1B840.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1B914.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1B994.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1B9CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1BA04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1BA44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1BD80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1C0FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1C328.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1C554.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1C5E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1C62C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/ObjFlowerpot_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/ObjFlowerpot_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1C818.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1C838.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1CBF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1CC0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1CD10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/func_80A1CEF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/ObjFlowerpot_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Flowerpot_0x80A1B3D0/ObjFlowerpot_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.h b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.h new file mode 100644 index 0000000000..3ce1bf236e --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_FLOWERPOT_H +#define Z_OBJ_FLOWERPOT_H + +#include + +struct ObjFlowerpot; + +typedef struct ObjFlowerpot { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xAC]; +} ObjFlowerpot; // size = 0x1F0 + +extern const ActorInit Obj_Flowerpot_InitVars; + +#endif // Z_OBJ_FLOWERPOT_H diff --git a/src/overlays/actors/ovl_Obj_Funen/overlay.cfg b/src/overlays/actors/ovl_Obj_Funen/overlay.cfg new file mode 100644 index 0000000000..e67ba5e19a --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Funen/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Funen +z_obj_funen.c diff --git a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c new file mode 100644 index 0000000000..b4c17f5778 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c @@ -0,0 +1,26 @@ +#include "z_obj_funen.h" + +#define FLAGS 0x00000030 + +#define THIS ((ObjFunen*)thisx) + +void ObjFunen_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjFunen_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Funen_InitVars = { + ACTOR_OBJ_FUNEN, + ACTORTYPE_PROP, + FLAGS, + OBJECT_FUNEN, + sizeof(ObjFunen), + (ActorFunc)ObjFunen_Init, + (ActorFunc)func_800BDFB0, + (ActorFunc)func_800BDFB0, + (ActorFunc)ObjFunen_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Funen_0x80A19740/ObjFunen_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Funen_0x80A19740/ObjFunen_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.h b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.h new file mode 100644 index 0000000000..b750f1d6d6 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.h @@ -0,0 +1,14 @@ +#ifndef Z_OBJ_FUNEN_H +#define Z_OBJ_FUNEN_H + +#include + +struct ObjFunen; + +typedef struct ObjFunen { + /* 0x000 */ Actor actor; +} ObjFunen; // size = 0x144 + +extern const ActorInit Obj_Funen_InitVars; + +#endif // Z_OBJ_FUNEN_H diff --git a/src/overlays/actors/ovl_Obj_Ghaka/overlay.cfg b/src/overlays/actors/ovl_Obj_Ghaka/overlay.cfg new file mode 100644 index 0000000000..c760e169fb --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Ghaka/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Ghaka +z_obj_ghaka.c diff --git a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c new file mode 100644 index 0000000000..474e520742 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c @@ -0,0 +1,46 @@ +#include "z_obj_ghaka.h" + +#define FLAGS 0x00000029 + +#define THIS ((ObjGhaka*)thisx) + +void ObjGhaka_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjGhaka_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjGhaka_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjGhaka_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Ghaka_InitVars = { + ACTOR_OBJ_GHAKA, + ACTORTYPE_PROP, + FLAGS, + OBJECT_GHAKA, + sizeof(ObjGhaka), + (ActorFunc)ObjGhaka_Init, + (ActorFunc)ObjGhaka_Destroy, + (ActorFunc)ObjGhaka_Update, + (ActorFunc)ObjGhaka_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ghaka_0x80B3C260/func_80B3C260.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ghaka_0x80B3C260/func_80B3C29C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ghaka_0x80B3C260/func_80B3C2B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ghaka_0x80B3C260/func_80B3C2C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ghaka_0x80B3C260/func_80B3C39C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ghaka_0x80B3C260/func_80B3C4E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ghaka_0x80B3C260/func_80B3C624.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ghaka_0x80B3C260/ObjGhaka_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ghaka_0x80B3C260/ObjGhaka_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ghaka_0x80B3C260/ObjGhaka_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ghaka_0x80B3C260/ObjGhaka_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.h b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.h new file mode 100644 index 0000000000..a65ac9ffb0 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_GHAKA_H +#define Z_OBJ_GHAKA_H + +#include + +struct ObjGhaka; + +typedef struct ObjGhaka { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x28]; +} ObjGhaka; // size = 0x16C + +extern const ActorInit Obj_Ghaka_InitVars; + +#endif // Z_OBJ_GHAKA_H diff --git a/src/overlays/actors/ovl_Obj_Grass/overlay.cfg b/src/overlays/actors/ovl_Obj_Grass/overlay.cfg new file mode 100644 index 0000000000..6aec3207dd --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Grass/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Grass +z_obj_grass.c diff --git a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c new file mode 100644 index 0000000000..7c95fe5f69 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c @@ -0,0 +1,52 @@ +#include "z_obj_grass.h" + +#define FLAGS 0x00000030 + +#define THIS ((ObjGrass*)thisx) + +void ObjGrass_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjGrass_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjGrass_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjGrass_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Grass_InitVars = { + ACTOR_OBJ_GRASS, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_FIELD_KEEP, + sizeof(ObjGrass), + (ActorFunc)ObjGrass_Init, + (ActorFunc)ObjGrass_Destroy, + (ActorFunc)ObjGrass_Update, + (ActorFunc)ObjGrass_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/func_809A9110.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/func_809A91FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/func_809A92D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/func_809A9314.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/ObjGrass_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/ObjGrass_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/func_809A9790.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/func_809A983C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/func_809A9DB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/ObjGrass_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/func_809AA278.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/func_809AA54C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/func_809AA798.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_0x809A9110/ObjGrass_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.h b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.h new file mode 100644 index 0000000000..250226a729 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_GRASS_H +#define Z_OBJ_GRASS_H + +#include + +struct ObjGrass; + +typedef struct ObjGrass { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0x315C]; +} ObjGrass; // size = 0x32A0 + +extern const ActorInit Obj_Grass_InitVars; + +#endif // Z_OBJ_GRASS_H diff --git a/src/overlays/actors/ovl_Obj_Grass_Carry/overlay.cfg b/src/overlays/actors/ovl_Obj_Grass_Carry/overlay.cfg new file mode 100644 index 0000000000..41ae3cfcda --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Grass_Carry/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Grass_Carry +z_obj_grass_carry.c diff --git a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c new file mode 100644 index 0000000000..86731dd7f9 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c @@ -0,0 +1,63 @@ +#include "z_obj_grass_carry.h" + +#define FLAGS 0x00800030 + +#define THIS ((ObjGrassCarry*)thisx) + +void ObjGrassCarry_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjGrassCarry_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjGrassCarry_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Grass_Carry_InitVars = { + ACTOR_OBJ_GRASS_CARRY, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_FIELD_KEEP, + sizeof(ObjGrassCarry), + (ActorFunc)ObjGrassCarry_Init, + (ActorFunc)ObjGrassCarry_Destroy, + (ActorFunc)ObjGrassCarry_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AAE60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AAE94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AAF18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AAF58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AAF9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AAFE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/ObjGrassCarry_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/ObjGrassCarry_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB3C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB3D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB428.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB43C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB474.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB4A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB5FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB610.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB6FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809AB77C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/ObjGrassCarry_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Carry_0x809AAE60/func_809ABB7C.asm") diff --git a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.h b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.h new file mode 100644 index 0000000000..e99c1d62a1 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_GRASS_CARRY_H +#define Z_OBJ_GRASS_CARRY_H + +#include + +struct ObjGrassCarry; + +typedef struct ObjGrassCarry { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x5C]; +} ObjGrassCarry; // size = 0x1A0 + +extern const ActorInit Obj_Grass_Carry_InitVars; + +#endif // Z_OBJ_GRASS_CARRY_H diff --git a/src/overlays/actors/ovl_Obj_Grass_Unit/overlay.cfg b/src/overlays/actors/ovl_Obj_Grass_Unit/overlay.cfg new file mode 100644 index 0000000000..d67028b99e --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Grass_Unit/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Grass_Unit +z_obj_grass_unit.c diff --git a/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c b/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c new file mode 100644 index 0000000000..ff70b3b6a9 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c @@ -0,0 +1,31 @@ +#include "z_obj_grass_unit.h" + +#define FLAGS 0x00000000 + +#define THIS ((ObjGrassUnit*)thisx) + +void ObjGrassUnit_Init(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Grass_Unit_InitVars = { + ACTOR_OBJ_GRASS_UNIT, + ACTORTYPE_BG, + FLAGS, + GAMEPLAY_FIELD_KEEP, + sizeof(ObjGrassUnit), + (ActorFunc)ObjGrassUnit_Init, + (ActorFunc)func_800BDFB0, + (ActorFunc)func_800BDFB0, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Unit_0x809ABDE0/func_809ABDE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Unit_0x809ABDE0/func_809ABE54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Unit_0x809ABDE0/func_809ABEC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Unit_0x809ABDE0/func_809ABF38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Grass_Unit_0x809ABDE0/ObjGrassUnit_Init.asm") diff --git a/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.h b/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.h new file mode 100644 index 0000000000..f5838096d3 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.h @@ -0,0 +1,14 @@ +#ifndef Z_OBJ_GRASS_UNIT_H +#define Z_OBJ_GRASS_UNIT_H + +#include + +struct ObjGrassUnit; + +typedef struct ObjGrassUnit { + /* 0x000 */ Actor actor; +} ObjGrassUnit; // size = 0x144 + +extern const ActorInit Obj_Grass_Unit_InitVars; + +#endif // Z_OBJ_GRASS_UNIT_H diff --git a/src/overlays/actors/ovl_Obj_Hakaisi/overlay.cfg b/src/overlays/actors/ovl_Obj_Hakaisi/overlay.cfg new file mode 100644 index 0000000000..5d1fb24adf --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Hakaisi/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Hakaisi +z_obj_hakaisi.c diff --git a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c new file mode 100644 index 0000000000..4295dc6592 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c @@ -0,0 +1,72 @@ +#include "z_obj_hakaisi.h" + +#define FLAGS 0x00000029 + +#define THIS ((ObjHakaisi*)thisx) + +void ObjHakaisi_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjHakaisi_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjHakaisi_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjHakaisi_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Hakaisi_InitVars = { + ACTOR_OBJ_HAKAISI, + ACTORTYPE_PROP, + FLAGS, + OBJECT_HAKAISI, + sizeof(ObjHakaisi), + (ActorFunc)ObjHakaisi_Init, + (ActorFunc)ObjHakaisi_Destroy, + (ActorFunc)ObjHakaisi_Update, + (ActorFunc)ObjHakaisi_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/ObjHakaisi_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/ObjHakaisi_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B1444C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B14460.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B14510.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B14524.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B14558.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B1456C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B145F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B14648.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B149A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B149C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B14A24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B14B6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B14CF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B14F4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/ObjHakaisi_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/ObjHakaisi_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B151E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B15254.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B15264.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B15330.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B1544C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hakaisi_0x80B14180/func_80B154A0.asm") diff --git a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.h b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.h new file mode 100644 index 0000000000..3d8b0b9317 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_HAKAISI_H +#define Z_OBJ_HAKAISI_H + +#include + +struct ObjHakaisi; + +typedef struct ObjHakaisi { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x5C]; +} ObjHakaisi; // size = 0x1A0 + +extern const ActorInit Obj_Hakaisi_InitVars; + +#endif // Z_OBJ_HAKAISI_H diff --git a/src/overlays/actors/ovl_Obj_Hamishi/overlay.cfg b/src/overlays/actors/ovl_Obj_Hamishi/overlay.cfg new file mode 100644 index 0000000000..902311cdcf --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Hamishi/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Hamishi +z_obj_hamishi.c diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c new file mode 100644 index 0000000000..53d4a93400 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -0,0 +1,42 @@ +#include "z_obj_hamishi.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjHamishi*)thisx) + +void ObjHamishi_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjHamishi_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjHamishi_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjHamishi_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Hamishi_InitVars = { + ACTOR_OBJ_HAMISHI, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_FIELD_KEEP, + sizeof(ObjHamishi), + (ActorFunc)ObjHamishi_Init, + (ActorFunc)ObjHamishi_Destroy, + (ActorFunc)ObjHamishi_Update, + (ActorFunc)ObjHamishi_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hamishi_0x809A0F20/func_809A0F20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hamishi_0x809A0F20/func_809A0F78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hamishi_0x809A0F20/func_809A10F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hamishi_0x809A0F20/func_809A13A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hamishi_0x809A0F20/func_809A1408.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hamishi_0x809A0F20/ObjHamishi_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hamishi_0x809A0F20/ObjHamishi_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hamishi_0x809A0F20/ObjHamishi_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hamishi_0x809A0F20/ObjHamishi_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h new file mode 100644 index 0000000000..828bc95e3d --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_HAMISHI_H +#define Z_OBJ_HAMISHI_H + +#include + +struct ObjHamishi; + +typedef struct ObjHamishi { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x60]; +} ObjHamishi; // size = 0x1A4 + +extern const ActorInit Obj_Hamishi_InitVars; + +#endif // Z_OBJ_HAMISHI_H diff --git a/src/overlays/actors/ovl_Obj_Hana/overlay.cfg b/src/overlays/actors/ovl_Obj_Hana/overlay.cfg new file mode 100644 index 0000000000..8d04d632c0 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Hana/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Hana +z_obj_hana.c diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c new file mode 100644 index 0000000000..4a8833f856 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c @@ -0,0 +1,32 @@ +#include "z_obj_hana.h" + +#define FLAGS 0x00000000 + +#define THIS ((ObjHana*)thisx) + +void ObjHana_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjHana_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjHana_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjHana_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Hana_InitVars = { + ACTOR_OBJ_HANA, + ACTORTYPE_PROP, + FLAGS, + OBJECT_HANA, + sizeof(ObjHana), + (ActorFunc)ObjHana_Init, + (ActorFunc)ObjHana_Destroy, + (ActorFunc)ObjHana_Update, + (ActorFunc)ObjHana_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hana_0x8095FB10/ObjHana_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hana_0x8095FB10/ObjHana_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hana_0x8095FB10/ObjHana_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hana_0x8095FB10/ObjHana_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h new file mode 100644 index 0000000000..e1ad18ca21 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h @@ -0,0 +1,14 @@ +#ifndef Z_OBJ_HANA_H +#define Z_OBJ_HANA_H + +#include + +struct ObjHana; + +typedef struct ObjHana { + /* 0x000 */ Actor actor; +} ObjHana; // size = 0x144 + +extern const ActorInit Obj_Hana_InitVars; + +#endif // Z_OBJ_HANA_H diff --git a/src/overlays/actors/ovl_Obj_Hariko/overlay.cfg b/src/overlays/actors/ovl_Obj_Hariko/overlay.cfg new file mode 100644 index 0000000000..98c352eb49 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Hariko/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Hariko +z_obj_hariko.c diff --git a/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c new file mode 100644 index 0000000000..b671f8f8bb --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c @@ -0,0 +1,42 @@ +#include "z_obj_hariko.h" + +#define FLAGS 0x02000020 + +#define THIS ((ObjHariko*)thisx) + +void ObjHariko_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjHariko_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjHariko_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjHariko_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Hariko_InitVars = { + ACTOR_OBJ_HARIKO, + ACTORTYPE_PROP, + FLAGS, + OBJECT_HARIKO, + sizeof(ObjHariko), + (ActorFunc)ObjHariko_Init, + (ActorFunc)ObjHariko_Destroy, + (ActorFunc)ObjHariko_Update, + (ActorFunc)ObjHariko_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hariko_0x80B66A20/ObjHariko_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hariko_0x80B66A20/ObjHariko_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hariko_0x80B66A20/func_80B66A7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hariko_0x80B66A20/func_80B66A90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hariko_0x80B66A20/func_80B66AA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hariko_0x80B66A20/func_80B66AC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hariko_0x80B66A20/func_80B66B78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hariko_0x80B66A20/ObjHariko_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hariko_0x80B66A20/ObjHariko_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.h b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.h new file mode 100644 index 0000000000..e05ee6e31f --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_HARIKO_H +#define Z_OBJ_HARIKO_H + +#include + +struct ObjHariko; + +typedef struct ObjHariko { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x14]; +} ObjHariko; // size = 0x158 + +extern const ActorInit Obj_Hariko_InitVars; + +#endif // Z_OBJ_HARIKO_H diff --git a/src/overlays/actors/ovl_Obj_Hgdoor/overlay.cfg b/src/overlays/actors/ovl_Obj_Hgdoor/overlay.cfg new file mode 100644 index 0000000000..4bd3103fbf --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Hgdoor/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Hgdoor +z_obj_hgdoor.c diff --git a/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c new file mode 100644 index 0000000000..04926b9e14 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c @@ -0,0 +1,56 @@ +#include "z_obj_hgdoor.h" + +#define FLAGS 0x00100000 + +#define THIS ((ObjHgdoor*)thisx) + +void ObjHgdoor_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjHgdoor_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjHgdoor_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjHgdoor_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Hgdoor_InitVars = { + ACTOR_OBJ_HGDOOR, + ACTORTYPE_PROP, + FLAGS, + OBJECT_HGDOOR, + sizeof(ObjHgdoor), + (ActorFunc)ObjHgdoor_Init, + (ActorFunc)ObjHgdoor_Destroy, + (ActorFunc)ObjHgdoor_Update, + (ActorFunc)ObjHgdoor_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/func_80BD4090.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/func_80BD40D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/ObjHgdoor_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/ObjHgdoor_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/func_80BD41E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/func_80BD41FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/func_80BD42AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/func_80BD42C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/func_80BD433C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/func_80BD4358.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/func_80BD4460.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/func_80BD4478.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/func_80BD44D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/func_80BD4500.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/ObjHgdoor_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hgdoor_0x80BD4090/ObjHgdoor_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.h b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.h new file mode 100644 index 0000000000..dec4b7df17 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_HGDOOR_H +#define Z_OBJ_HGDOOR_H + +#include + +struct ObjHgdoor; + +typedef struct ObjHgdoor { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x24]; +} ObjHgdoor; // size = 0x168 + +extern const ActorInit Obj_Hgdoor_InitVars; + +#endif // Z_OBJ_HGDOOR_H diff --git a/src/overlays/actors/ovl_Obj_HsStump/overlay.cfg b/src/overlays/actors/ovl_Obj_HsStump/overlay.cfg new file mode 100644 index 0000000000..ddf618a65d --- /dev/null +++ b/src/overlays/actors/ovl_Obj_HsStump/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_HsStump +z_obj_hsstump.c diff --git a/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c new file mode 100644 index 0000000000..88a1da9f4e --- /dev/null +++ b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c @@ -0,0 +1,40 @@ +#include "z_obj_hsstump.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjHsStump*)thisx) + +void ObjHsStump_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjHsStump_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjHsStump_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjHsStump_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_HsStump_InitVars = { + ACTOR_OBJ_HSSTUMP, + ACTORTYPE_BG, + FLAGS, + OBJECT_HSSTUMP, + sizeof(ObjHsStump), + (ActorFunc)ObjHsStump_Init, + (ActorFunc)ObjHsStump_Destroy, + (ActorFunc)ObjHsStump_Update, + (ActorFunc)ObjHsStump_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_HsStump_0x80BDAA30/ObjHsStump_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_HsStump_0x80BDAA30/func_80BDAB00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_HsStump_0x80BDAA30/func_80BDAB18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_HsStump_0x80BDAA30/func_80BDAB6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_HsStump_0x80BDAA30/func_80BDABCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_HsStump_0x80BDAA30/ObjHsStump_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_HsStump_0x80BDAA30/ObjHsStump_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_HsStump_0x80BDAA30/ObjHsStump_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.h b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.h new file mode 100644 index 0000000000..b8ce0529d9 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_HSSTUMP_H +#define Z_OBJ_HSSTUMP_H + +#include + +struct ObjHsStump; + +typedef struct ObjHsStump { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x28]; +} ObjHsStump; // size = 0x16C + +extern const ActorInit Obj_HsStump_InitVars; + +#endif // Z_OBJ_HSSTUMP_H diff --git a/src/overlays/actors/ovl_Obj_Hsblock/overlay.cfg b/src/overlays/actors/ovl_Obj_Hsblock/overlay.cfg new file mode 100644 index 0000000000..19cd6470bf --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Hsblock/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Hsblock +z_obj_hsblock.c diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c new file mode 100644 index 0000000000..0f060800f5 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -0,0 +1,46 @@ +#include "z_obj_hsblock.h" + +#define FLAGS 0x00000000 + +#define THIS ((ObjHsblock*)thisx) + +void ObjHsblock_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjHsblock_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjHsblock_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjHsblock_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Hsblock_InitVars = { + ACTOR_OBJ_HSBLOCK, + ACTORTYPE_BG, + FLAGS, + OBJECT_D_HSBLOCK, + sizeof(ObjHsblock), + (ActorFunc)ObjHsblock_Init, + (ActorFunc)ObjHsblock_Destroy, + (ActorFunc)ObjHsblock_Update, + (ActorFunc)ObjHsblock_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hsblock_0x8093DEA0/func_8093DEA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hsblock_0x8093DEA0/func_8093DEAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hsblock_0x8093DEA0/ObjHsblock_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hsblock_0x8093DEA0/ObjHsblock_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hsblock_0x8093DEA0/func_8093E03C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hsblock_0x8093DEA0/func_8093E05C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hsblock_0x8093DEA0/func_8093E0A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hsblock_0x8093DEA0/func_8093E0E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hsblock_0x8093DEA0/func_8093E10C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hsblock_0x8093DEA0/ObjHsblock_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hsblock_0x8093DEA0/ObjHsblock_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h new file mode 100644 index 0000000000..6687302020 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_HSBLOCK_H +#define Z_OBJ_HSBLOCK_H + +#include + +struct ObjHsblock; + +typedef struct ObjHsblock { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1C]; +} ObjHsblock; // size = 0x160 + +extern const ActorInit Obj_Hsblock_InitVars; + +#endif // Z_OBJ_HSBLOCK_H diff --git a/src/overlays/actors/ovl_Obj_Hugebombiwa/overlay.cfg b/src/overlays/actors/ovl_Obj_Hugebombiwa/overlay.cfg new file mode 100644 index 0000000000..baf0417f66 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Hugebombiwa/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Hugebombiwa +z_obj_hugebombiwa.c diff --git a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c new file mode 100644 index 0000000000..7d54b56a72 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c @@ -0,0 +1,62 @@ +#include "z_obj_hugebombiwa.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjHugebombiwa*)thisx) + +void ObjHugebombiwa_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjHugebombiwa_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjHugebombiwa_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjHugebombiwa_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Hugebombiwa_InitVars = { + ACTOR_OBJ_HUGEBOMBIWA, + ACTORTYPE_PROP, + FLAGS, + OBJECT_BOMBIWA, + sizeof(ObjHugebombiwa), + (ActorFunc)ObjHugebombiwa_Init, + (ActorFunc)ObjHugebombiwa_Destroy, + (ActorFunc)ObjHugebombiwa_Update, + (ActorFunc)ObjHugebombiwa_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A53BE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A53E60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A541F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A54600.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A54980.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A54A0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/ObjHugebombiwa_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/ObjHugebombiwa_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A54BF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A54C04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A54CD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A54CEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A54E10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A55064.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A55310.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A55564.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/ObjHugebombiwa_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/ObjHugebombiwa_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hugebombiwa_0x80A53BE0/func_80A55B34.asm") diff --git a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.h b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.h new file mode 100644 index 0000000000..d5a0f6416d --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_HUGEBOMBIWA_H +#define Z_OBJ_HUGEBOMBIWA_H + +#include + +struct ObjHugebombiwa; + +typedef struct ObjHugebombiwa { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x374]; +} ObjHugebombiwa; // size = 0x4B8 + +extern const ActorInit Obj_Hugebombiwa_InitVars; + +#endif // Z_OBJ_HUGEBOMBIWA_H diff --git a/src/overlays/actors/ovl_Obj_Hunsui/overlay.cfg b/src/overlays/actors/ovl_Obj_Hunsui/overlay.cfg new file mode 100644 index 0000000000..939fc35641 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Hunsui/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Hunsui +z_obj_hunsui.c diff --git a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c new file mode 100644 index 0000000000..b2caac5967 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c @@ -0,0 +1,58 @@ +#include "z_obj_hunsui.h" + +#define FLAGS 0x00000030 + +#define THIS ((ObjHunsui*)thisx) + +void ObjHunsui_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjHunsui_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjHunsui_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjHunsui_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Hunsui_InitVars = { + ACTOR_OBJ_HUNSUI, + ACTORTYPE_BG, + FLAGS, + OBJECT_HUNSUI, + sizeof(ObjHunsui), + (ActorFunc)ObjHunsui_Init, + (ActorFunc)ObjHunsui_Destroy, + (ActorFunc)ObjHunsui_Update, + (ActorFunc)ObjHunsui_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9C450.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9C5E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/ObjHunsui_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/ObjHunsui_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/ObjHunsui_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9CE64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9D094.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9D0FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9D120.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9D288.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9D2BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9D334.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9D4D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9D508.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9D714.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/ObjHunsui_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hunsui_0x80B9C450/func_80B9DA60.asm") diff --git a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.h b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.h new file mode 100644 index 0000000000..b99245c095 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_HUNSUI_H +#define Z_OBJ_HUNSUI_H + +#include + +struct ObjHunsui; + +typedef struct ObjHunsui { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x74]; +} ObjHunsui; // size = 0x1B8 + +extern const ActorInit Obj_Hunsui_InitVars; + +#endif // Z_OBJ_HUNSUI_H diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/overlay.cfg b/src/overlays/actors/ovl_Obj_Ice_Poly/overlay.cfg new file mode 100644 index 0000000000..d77c80fcbf --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Ice_Poly/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Ice_Poly +z_obj_ice_poly.c diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c new file mode 100644 index 0000000000..a754cd3cc1 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c @@ -0,0 +1,40 @@ +#include "z_obj_ice_poly.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjIcePoly*)thisx) + +void ObjIcePoly_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjIcePoly_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjIcePoly_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjIcePoly_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Ice_Poly_InitVars = { + ACTOR_OBJ_ICE_POLY, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjIcePoly), + (ActorFunc)ObjIcePoly_Init, + (ActorFunc)ObjIcePoly_Destroy, + (ActorFunc)ObjIcePoly_Update, + (ActorFunc)ObjIcePoly_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ice_Poly_0x80931560/ObjIcePoly_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ice_Poly_0x80931560/ObjIcePoly_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ice_Poly_0x80931560/func_80931828.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ice_Poly_0x80931560/func_80931A38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ice_Poly_0x80931560/func_80931E58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ice_Poly_0x80931560/func_80931EEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ice_Poly_0x80931560/ObjIcePoly_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ice_Poly_0x80931560/ObjIcePoly_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h new file mode 100644 index 0000000000..e06c7a1de9 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_ICE_POLY_H +#define Z_OBJ_ICE_POLY_H + +#include + +struct ObjIcePoly; + +typedef struct ObjIcePoly { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x138]; +} ObjIcePoly; // size = 0x27C + +extern const ActorInit Obj_Ice_Poly_InitVars; + +#endif // Z_OBJ_ICE_POLY_H diff --git a/src/overlays/actors/ovl_Obj_Iceblock/overlay.cfg b/src/overlays/actors/ovl_Obj_Iceblock/overlay.cfg new file mode 100644 index 0000000000..a72f4e3c80 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Iceblock/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Iceblock +z_obj_iceblock.c diff --git a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c new file mode 100644 index 0000000000..21477232eb --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c @@ -0,0 +1,154 @@ +#include "z_obj_iceblock.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjIceblock*)thisx) + +void ObjIceblock_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjIceblock_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjIceblock_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjIceblock_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Iceblock_InitVars = { + ACTOR_OBJ_ICEBLOCK, + ACTORTYPE_BG, + FLAGS, + OBJECT_ICE_BLOCK, + sizeof(ObjIceblock), + (ActorFunc)ObjIceblock_Init, + (ActorFunc)ObjIceblock_Destroy, + (ActorFunc)ObjIceblock_Update, + (ActorFunc)ObjIceblock_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A23090.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A2311C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A2319C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A232C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A23370.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A2339C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A23690.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A236D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A237A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A23938.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A23B88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A23D08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A23F90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A24118.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A24384.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A243E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A24680.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A246D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A2491C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A24954.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A24A48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A24AA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A24B74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A24BDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A24DC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A24DD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A2508C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25238.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A252DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25404.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A2541C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25440.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/ObjIceblock_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/ObjIceblock_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A257A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A257B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25824.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A2586C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25978.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25994.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25A8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25AA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25BA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25BBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25C5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25C70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25CF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25D28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25E3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25E50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25FA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A25FD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A260E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A26144.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A262BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A262EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A26574.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A265C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A266C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A266E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/ObjIceblock_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A26B64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A26B74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/func_80A26BF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Iceblock_0x80A23090/ObjIceblock_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.h b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.h new file mode 100644 index 0000000000..ed6194cfb9 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_ICEBLOCK_H +#define Z_OBJ_ICEBLOCK_H + +#include + +struct ObjIceblock; + +typedef struct ObjIceblock { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x174]; +} ObjIceblock; // size = 0x2B8 + +extern const ActorInit Obj_Iceblock_InitVars; + +#endif // Z_OBJ_ICEBLOCK_H diff --git a/src/overlays/actors/ovl_Obj_Jg_Gakki/overlay.cfg b/src/overlays/actors/ovl_Obj_Jg_Gakki/overlay.cfg new file mode 100644 index 0000000000..f4ae147d73 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Jg_Gakki/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Jg_Gakki +z_obj_jg_gakki.c diff --git a/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c b/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c new file mode 100644 index 0000000000..c2464d2a52 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c @@ -0,0 +1,32 @@ +#include "z_obj_jg_gakki.h" + +#define FLAGS 0x00000020 + +#define THIS ((ObjJgGakki*)thisx) + +void ObjJgGakki_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjJgGakki_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjJgGakki_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjJgGakki_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Jg_Gakki_InitVars = { + ACTOR_OBJ_JG_GAKKI, + ACTORTYPE_PROP, + FLAGS, + OBJECT_JG, + sizeof(ObjJgGakki), + (ActorFunc)ObjJgGakki_Init, + (ActorFunc)ObjJgGakki_Destroy, + (ActorFunc)ObjJgGakki_Update, + (ActorFunc)ObjJgGakki_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Jg_Gakki_0x80B961E0/ObjJgGakki_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Jg_Gakki_0x80B961E0/ObjJgGakki_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Jg_Gakki_0x80B961E0/ObjJgGakki_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Jg_Gakki_0x80B961E0/ObjJgGakki_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.h b/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.h new file mode 100644 index 0000000000..2dcd30fc06 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_JG_GAKKI_H +#define Z_OBJ_JG_GAKKI_H + +#include + +struct ObjJgGakki; + +typedef struct ObjJgGakki { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x90]; +} ObjJgGakki; // size = 0x1D4 + +extern const ActorInit Obj_Jg_Gakki_InitVars; + +#endif // Z_OBJ_JG_GAKKI_H diff --git a/src/overlays/actors/ovl_Obj_Jgame_Light/overlay.cfg b/src/overlays/actors/ovl_Obj_Jgame_Light/overlay.cfg new file mode 100644 index 0000000000..932e67c12e --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Jgame_Light/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Jgame_Light +z_obj_jgame_light.c diff --git a/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c new file mode 100644 index 0000000000..9b8373d9e3 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c @@ -0,0 +1,38 @@ +#include "z_obj_jgame_light.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjJgameLight*)thisx) + +void ObjJgameLight_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjJgameLight_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjJgameLight_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjJgameLight_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Jgame_Light_InitVars = { + ACTOR_OBJ_JGAME_LIGHT, + ACTORTYPE_PROP, + FLAGS, + OBJECT_SYOKUDAI, + sizeof(ObjJgameLight), + (ActorFunc)ObjJgameLight_Init, + (ActorFunc)ObjJgameLight_Destroy, + (ActorFunc)ObjJgameLight_Update, + (ActorFunc)ObjJgameLight_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Jgame_Light_0x80C152F0/ObjJgameLight_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Jgame_Light_0x80C152F0/ObjJgameLight_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Jgame_Light_0x80C152F0/func_80C15474.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Jgame_Light_0x80C152F0/func_80C156C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Jgame_Light_0x80C152F0/func_80C15718.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Jgame_Light_0x80C152F0/ObjJgameLight_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Jgame_Light_0x80C152F0/ObjJgameLight_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.h b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.h new file mode 100644 index 0000000000..7877e3db5c --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_JGAME_LIGHT_H +#define Z_OBJ_JGAME_LIGHT_H + +#include + +struct ObjJgameLight; + +typedef struct ObjJgameLight { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x78]; +} ObjJgameLight; // size = 0x1BC + +extern const ActorInit Obj_Jgame_Light_InitVars; + +#endif // Z_OBJ_JGAME_LIGHT_H diff --git a/src/overlays/actors/ovl_Obj_Kendo_Kanban/overlay.cfg b/src/overlays/actors/ovl_Obj_Kendo_Kanban/overlay.cfg new file mode 100644 index 0000000000..e1992b42b3 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Kendo_Kanban/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Kendo_Kanban +z_obj_kendo_kanban.c diff --git a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c new file mode 100644 index 0000000000..cfe42d073e --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c @@ -0,0 +1,50 @@ +#include "z_obj_kendo_kanban.h" + +#define FLAGS 0x00000000 + +#define THIS ((ObjKendoKanban*)thisx) + +void ObjKendoKanban_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjKendoKanban_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjKendoKanban_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjKendoKanban_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Kendo_Kanban_InitVars = { + ACTOR_OBJ_KENDO_KANBAN, + ACTORTYPE_NPC, + FLAGS, + OBJECT_DORA, + sizeof(ObjKendoKanban), + (ActorFunc)ObjKendoKanban_Init, + (ActorFunc)ObjKendoKanban_Destroy, + (ActorFunc)ObjKendoKanban_Update, + (ActorFunc)ObjKendoKanban_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/ObjKendoKanban_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/ObjKendoKanban_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B65880.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B65894.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B658A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B65CE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B65D54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B65D68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B65DA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B6618C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/func_80B66304.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/ObjKendoKanban_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kendo_Kanban_0x80B654C0/ObjKendoKanban_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.h b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.h new file mode 100644 index 0000000000..6a6fce48f8 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_KENDO_KANBAN_H +#define Z_OBJ_KENDO_KANBAN_H + +#include + +struct ObjKendoKanban; + +typedef struct ObjKendoKanban { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1CC]; +} ObjKendoKanban; // size = 0x310 + +extern const ActorInit Obj_Kendo_Kanban_InitVars; + +#endif // Z_OBJ_KENDO_KANBAN_H diff --git a/src/overlays/actors/ovl_Obj_Kepn_Koya/overlay.cfg b/src/overlays/actors/ovl_Obj_Kepn_Koya/overlay.cfg new file mode 100644 index 0000000000..8a6c7b560d --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Kepn_Koya/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Kepn_Koya +z_obj_kepn_koya.c diff --git a/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c new file mode 100644 index 0000000000..a7df934a6b --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c @@ -0,0 +1,32 @@ +#include "z_obj_kepn_koya.h" + +#define FLAGS 0x00000000 + +#define THIS ((ObjKepnKoya*)thisx) + +void ObjKepnKoya_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjKepnKoya_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjKepnKoya_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjKepnKoya_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Kepn_Koya_InitVars = { + ACTOR_OBJ_KEPN_KOYA, + ACTORTYPE_PROP, + FLAGS, + OBJECT_KEPN_KOYA, + sizeof(ObjKepnKoya), + (ActorFunc)ObjKepnKoya_Init, + (ActorFunc)ObjKepnKoya_Destroy, + (ActorFunc)ObjKepnKoya_Update, + (ActorFunc)ObjKepnKoya_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kepn_Koya_0x80C07B20/ObjKepnKoya_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kepn_Koya_0x80C07B20/ObjKepnKoya_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kepn_Koya_0x80C07B20/ObjKepnKoya_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kepn_Koya_0x80C07B20/ObjKepnKoya_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.h b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.h new file mode 100644 index 0000000000..6c34339b53 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_KEPN_KOYA_H +#define Z_OBJ_KEPN_KOYA_H + +#include + +struct ObjKepnKoya; + +typedef struct ObjKepnKoya { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1C]; +} ObjKepnKoya; // size = 0x160 + +extern const ActorInit Obj_Kepn_Koya_InitVars; + +#endif // Z_OBJ_KEPN_KOYA_H diff --git a/src/overlays/actors/ovl_Obj_Kibako/overlay.cfg b/src/overlays/actors/ovl_Obj_Kibako/overlay.cfg new file mode 100644 index 0000000000..d0a8b240a3 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Kibako/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Kibako +z_obj_kibako.c diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c new file mode 100644 index 0000000000..57ba86d3aa --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -0,0 +1,61 @@ +#include "z_obj_kibako.h" + +#define FLAGS 0x04000010 + +#define THIS ((ObjKibako*)thisx) + +void ObjKibako_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjKibako_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjKibako_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Kibako_InitVars = { + ACTOR_OBJ_KIBAKO, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjKibako), + (ActorFunc)ObjKibako_Init, + (ActorFunc)ObjKibako_Destroy, + (ActorFunc)ObjKibako_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_809261B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_80926224.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_809262BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_80926318.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_80926394.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/ObjKibako_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/ObjKibako_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_8092650C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_809267EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_80926B40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_80926B54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_80926BE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_80926BF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_80926EF4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_80926F08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_8092703C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_809270F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/ObjKibako_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako_0x809261B0/func_80927334.asm") diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h new file mode 100644 index 0000000000..16e37224c4 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_KIBAKO_H +#define Z_OBJ_KIBAKO_H + +#include + +struct ObjKibako; + +typedef struct ObjKibako { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x58]; +} ObjKibako; // size = 0x19C + +extern const ActorInit Obj_Kibako_InitVars; + +#endif // Z_OBJ_KIBAKO_H diff --git a/src/overlays/actors/ovl_Obj_Kibako2/overlay.cfg b/src/overlays/actors/ovl_Obj_Kibako2/overlay.cfg new file mode 100644 index 0000000000..436504fc83 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Kibako2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Kibako2 +z_obj_kibako2.c diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c new file mode 100644 index 0000000000..b78d7049f7 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -0,0 +1,48 @@ +#include "z_obj_kibako2.h" + +#define FLAGS 0x00000000 + +#define THIS ((ObjKibako2*)thisx) + +void ObjKibako2_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjKibako2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjKibako2_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjKibako2_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Kibako2_InitVars = { + ACTOR_OBJ_KIBAKO2, + ACTORTYPE_BG, + FLAGS, + OBJECT_KIBAKO2, + sizeof(ObjKibako2), + (ActorFunc)ObjKibako2_Init, + (ActorFunc)ObjKibako2_Destroy, + (ActorFunc)ObjKibako2_Update, + (ActorFunc)ObjKibako2_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako2_0x8098E5C0/func_8098E5C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako2_0x8098E5C0/func_8098E62C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako2_0x8098E5C0/func_8098E8A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako2_0x8098E5C0/func_8098E900.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako2_0x8098E5C0/func_8098E9C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako2_0x8098E5C0/ObjKibako2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako2_0x8098E5C0/ObjKibako2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako2_0x8098E5C0/func_8098EB78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako2_0x8098E5C0/func_8098EC68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako2_0x8098E5C0/func_8098ED20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako2_0x8098E5C0/ObjKibako2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kibako2_0x8098E5C0/ObjKibako2_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h new file mode 100644 index 0000000000..1bd77a2706 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_KIBAKO2_H +#define Z_OBJ_KIBAKO2_H + +#include + +struct ObjKibako2; + +typedef struct ObjKibako2 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x6C]; +} ObjKibako2; // size = 0x1B0 + +extern const ActorInit Obj_Kibako2_InitVars; + +#endif // Z_OBJ_KIBAKO2_H diff --git a/src/overlays/actors/ovl_Obj_Kinoko/overlay.cfg b/src/overlays/actors/ovl_Obj_Kinoko/overlay.cfg new file mode 100644 index 0000000000..071ad6a34d --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Kinoko/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Kinoko +z_obj_kinoko.c diff --git a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c new file mode 100644 index 0000000000..18393e3d8c --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c @@ -0,0 +1,32 @@ +#include "z_obj_kinoko.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjKinoko*)thisx) + +void ObjKinoko_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjKinoko_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjKinoko_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjKinoko_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Kinoko_InitVars = { + ACTOR_OBJ_KINOKO, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjKinoko), + (ActorFunc)ObjKinoko_Init, + (ActorFunc)ObjKinoko_Destroy, + (ActorFunc)ObjKinoko_Update, + (ActorFunc)ObjKinoko_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kinoko_0x80BB4700/ObjKinoko_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kinoko_0x80BB4700/ObjKinoko_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kinoko_0x80BB4700/ObjKinoko_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kinoko_0x80BB4700/ObjKinoko_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.h b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.h new file mode 100644 index 0000000000..720a5dee66 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.h @@ -0,0 +1,14 @@ +#ifndef Z_OBJ_KINOKO_H +#define Z_OBJ_KINOKO_H + +#include + +struct ObjKinoko; + +typedef struct ObjKinoko { + /* 0x000 */ Actor actor; +} ObjKinoko; // size = 0x144 + +extern const ActorInit Obj_Kinoko_InitVars; + +#endif // Z_OBJ_KINOKO_H diff --git a/src/overlays/actors/ovl_Obj_Kzsaku/overlay.cfg b/src/overlays/actors/ovl_Obj_Kzsaku/overlay.cfg new file mode 100644 index 0000000000..c2a20d7055 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Kzsaku/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Kzsaku +z_obj_kzsaku.c diff --git a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c new file mode 100644 index 0000000000..d85f394cc4 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c @@ -0,0 +1,44 @@ +#include "z_obj_kzsaku.h" + +#define FLAGS 0x00000030 + +#define THIS ((ObjKzsaku*)thisx) + +void ObjKzsaku_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjKzsaku_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjKzsaku_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjKzsaku_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Kzsaku_InitVars = { + ACTOR_OBJ_KZSAKU, + ACTORTYPE_PROP, + FLAGS, + OBJECT_KZSAKU, + sizeof(ObjKzsaku), + (ActorFunc)ObjKzsaku_Init, + (ActorFunc)ObjKzsaku_Destroy, + (ActorFunc)ObjKzsaku_Update, + (ActorFunc)ObjKzsaku_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kzsaku_0x80C08A80/ObjKzsaku_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kzsaku_0x80C08A80/ObjKzsaku_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kzsaku_0x80C08A80/func_80C08B60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kzsaku_0x80C08A80/func_80C08B7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kzsaku_0x80C08A80/func_80C08BBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kzsaku_0x80C08A80/func_80C08BD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kzsaku_0x80C08A80/func_80C08C84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kzsaku_0x80C08A80/func_80C08CB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kzsaku_0x80C08A80/ObjKzsaku_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Kzsaku_0x80C08A80/ObjKzsaku_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.h b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.h new file mode 100644 index 0000000000..765ddc9028 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_KZSAKU_H +#define Z_OBJ_KZSAKU_H + +#include + +struct ObjKzsaku; + +typedef struct ObjKzsaku { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x28]; +} ObjKzsaku; // size = 0x16C + +extern const ActorInit Obj_Kzsaku_InitVars; + +#endif // Z_OBJ_KZSAKU_H diff --git a/src/overlays/actors/ovl_Obj_Lift/overlay.cfg b/src/overlays/actors/ovl_Obj_Lift/overlay.cfg new file mode 100644 index 0000000000..fca4821746 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Lift/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Lift +z_obj_lift.c diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c new file mode 100644 index 0000000000..22b9b7a799 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -0,0 +1,52 @@ +#include "z_obj_lift.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjLift*)thisx) + +void ObjLift_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjLift_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjLift_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjLift_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Lift_InitVars = { + ACTOR_OBJ_LIFT, + ACTORTYPE_BG, + FLAGS, + OBJECT_D_LIFT, + sizeof(ObjLift), + (ActorFunc)ObjLift_Init, + (ActorFunc)ObjLift_Destroy, + (ActorFunc)ObjLift_Update, + (ActorFunc)ObjLift_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/func_8093D3C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/ObjLift_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/ObjLift_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/func_8093D760.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/func_8093D7A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/func_8093D88C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/func_8093D8B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/func_8093D9C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/func_8093DA48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/func_8093DB70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/func_8093DB90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/ObjLift_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/ObjLift_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lift_0x8093D3C0/func_8093DC90.asm") diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h new file mode 100644 index 0000000000..2dc7e28c24 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_LIFT_H +#define Z_OBJ_LIFT_H + +#include + +struct ObjLift; + +typedef struct ObjLift { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x38]; +} ObjLift; // size = 0x17C + +extern const ActorInit Obj_Lift_InitVars; + +#endif // Z_OBJ_LIFT_H diff --git a/src/overlays/actors/ovl_Obj_Lightblock/overlay.cfg b/src/overlays/actors/ovl_Obj_Lightblock/overlay.cfg new file mode 100644 index 0000000000..ecf5da6faa --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Lightblock/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Lightblock +z_obj_lightblock.c diff --git a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c new file mode 100644 index 0000000000..38d2cb9299 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c @@ -0,0 +1,46 @@ +#include "z_obj_lightblock.h" + +#define FLAGS 0x00000000 + +#define THIS ((ObjLightblock*)thisx) + +void ObjLightblock_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjLightblock_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjLightblock_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjLightblock_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Lightblock_InitVars = { + ACTOR_OBJ_LIGHTBLOCK, + ACTORTYPE_BG, + FLAGS, + OBJECT_LIGHTBLOCK, + sizeof(ObjLightblock), + (ActorFunc)ObjLightblock_Init, + (ActorFunc)ObjLightblock_Destroy, + (ActorFunc)ObjLightblock_Update, + (ActorFunc)ObjLightblock_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightblock_0x80AF3910/func_80AF3910.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightblock_0x80AF3910/ObjLightblock_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightblock_0x80AF3910/ObjLightblock_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightblock_0x80AF3910/func_80AF3AC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightblock_0x80AF3910/func_80AF3ADC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightblock_0x80AF3910/func_80AF3B8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightblock_0x80AF3910/func_80AF3BA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightblock_0x80AF3910/func_80AF3C18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightblock_0x80AF3910/func_80AF3C34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightblock_0x80AF3910/ObjLightblock_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightblock_0x80AF3910/ObjLightblock_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.h b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.h new file mode 100644 index 0000000000..65894acafb --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_LIGHTBLOCK_H +#define Z_OBJ_LIGHTBLOCK_H + +#include + +struct ObjLightblock; + +typedef struct ObjLightblock { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x6C]; +} ObjLightblock; // size = 0x1B0 + +extern const ActorInit Obj_Lightblock_InitVars; + +#endif // Z_OBJ_LIGHTBLOCK_H diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/overlay.cfg b/src/overlays/actors/ovl_Obj_Lightswitch/overlay.cfg new file mode 100644 index 0000000000..cafaebb115 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Lightswitch/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Lightswitch +z_obj_lightswitch.c diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c new file mode 100644 index 0000000000..2a3e8f367a --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -0,0 +1,66 @@ +#include "z_obj_lightswitch.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjLightswitch*)thisx) + +void ObjLightswitch_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjLightswitch_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjLightswitch_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjLightswitch_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Lightswitch_InitVars = { + ACTOR_OBJ_LIGHTSWITCH, + ACTORTYPE_SWITCH, + FLAGS, + OBJECT_LIGHTSWITCH, + sizeof(ObjLightswitch), + (ActorFunc)ObjLightswitch_Init, + (ActorFunc)ObjLightswitch_Destroy, + (ActorFunc)ObjLightswitch_Update, + (ActorFunc)ObjLightswitch_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_8095FBF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_8095FC94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_8095FCEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/ObjLightswitch_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/ObjLightswitch_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_8095FFF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_80960014.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_80960088.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_809600BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_8096012C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_80960148.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_80960224.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_80960260.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_8096034C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_80960370.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_80960424.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_80960440.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/ObjLightswitch_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_809605F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/func_80960880.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lightswitch_0x8095FBF0/ObjLightswitch_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h new file mode 100644 index 0000000000..5e13ada89b --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_LIGHTSWITCH_H +#define Z_OBJ_LIGHTSWITCH_H + +#include + +struct ObjLightswitch; + +typedef struct ObjLightswitch { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x7C]; +} ObjLightswitch; // size = 0x1C0 + +extern const ActorInit Obj_Lightswitch_InitVars; + +#endif // Z_OBJ_LIGHTSWITCH_H diff --git a/src/overlays/actors/ovl_Obj_Lupygamelift/overlay.cfg b/src/overlays/actors/ovl_Obj_Lupygamelift/overlay.cfg new file mode 100644 index 0000000000..ad62438910 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Lupygamelift/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Lupygamelift +z_obj_lupygamelift.c diff --git a/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c new file mode 100644 index 0000000000..4010d26e65 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c @@ -0,0 +1,42 @@ +#include "z_obj_lupygamelift.h" + +#define FLAGS 0x00000030 + +#define THIS ((ObjLupygamelift*)thisx) + +void ObjLupygamelift_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjLupygamelift_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjLupygamelift_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjLupygamelift_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Lupygamelift_InitVars = { + ACTOR_OBJ_LUPYGAMELIFT, + ACTORTYPE_BG, + FLAGS, + OBJECT_RAILLIFT, + sizeof(ObjLupygamelift), + (ActorFunc)ObjLupygamelift_Init, + (ActorFunc)ObjLupygamelift_Destroy, + (ActorFunc)ObjLupygamelift_Update, + (ActorFunc)ObjLupygamelift_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lupygamelift_0x80AF0170/ObjLupygamelift_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lupygamelift_0x80AF0170/ObjLupygamelift_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lupygamelift_0x80AF0170/func_80AF0394.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lupygamelift_0x80AF0170/func_80AF04BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lupygamelift_0x80AF0170/func_80AF04D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lupygamelift_0x80AF0170/func_80AF0514.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lupygamelift_0x80AF0170/func_80AF0530.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lupygamelift_0x80AF0170/ObjLupygamelift_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Lupygamelift_0x80AF0170/ObjLupygamelift_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.h b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.h new file mode 100644 index 0000000000..d3feed31a5 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_LUPYGAMELIFT_H +#define Z_OBJ_LUPYGAMELIFT_H + +#include + +struct ObjLupygamelift; + +typedef struct ObjLupygamelift { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x30]; +} ObjLupygamelift; // size = 0x174 + +extern const ActorInit Obj_Lupygamelift_InitVars; + +#endif // Z_OBJ_LUPYGAMELIFT_H diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/overlay.cfg b/src/overlays/actors/ovl_Obj_Makekinsuta/overlay.cfg new file mode 100644 index 0000000000..d636029699 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Makekinsuta +z_obj_makekinsuta.c diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c new file mode 100644 index 0000000000..d3e9a592fc --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -0,0 +1,35 @@ +#include "z_obj_makekinsuta.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjMakekinsuta*)thisx) + +void ObjMakekinsuta_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjMakekinsuta_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjMakekinsuta_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Makekinsuta_InitVars = { + ACTOR_OBJ_MAKEKINSUTA, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjMakekinsuta), + (ActorFunc)ObjMakekinsuta_Init, + (ActorFunc)ObjMakekinsuta_Destroy, + (ActorFunc)ObjMakekinsuta_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Makekinsuta_0x8099FA40/func_8099FA40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Makekinsuta_0x8099FA40/ObjMakekinsuta_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Makekinsuta_0x8099FA40/ObjMakekinsuta_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Makekinsuta_0x8099FA40/func_8099FB64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Makekinsuta_0x8099FA40/ObjMakekinsuta_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Makekinsuta_0x8099FA40/func_8099FD7C.asm") diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h new file mode 100644 index 0000000000..1446bb4d10 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_MAKEKINSUTA_H +#define Z_OBJ_MAKEKINSUTA_H + +#include + +struct ObjMakekinsuta; + +typedef struct ObjMakekinsuta { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4]; +} ObjMakekinsuta; // size = 0x148 + +extern const ActorInit Obj_Makekinsuta_InitVars; + +#endif // Z_OBJ_MAKEKINSUTA_H diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/overlay.cfg b/src/overlays/actors/ovl_Obj_Makeoshihiki/overlay.cfg new file mode 100644 index 0000000000..7d4fbe22da --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Makeoshihiki +z_obj_makeoshihiki.c diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c new file mode 100644 index 0000000000..153ab2be86 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c @@ -0,0 +1,30 @@ +#include "z_obj_makeoshihiki.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjMakeoshihiki*)thisx) + +void ObjMakeoshihiki_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjMakeoshihiki_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Makeoshihiki_InitVars = { + ACTOR_OBJ_MAKEOSHIHIKI, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjMakeoshihiki), + (ActorFunc)ObjMakeoshihiki_Init, + (ActorFunc)func_800BDFB0, + (ActorFunc)ObjMakeoshihiki_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Makeoshihiki_0x80972350/func_80972350.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Makeoshihiki_0x80972350/func_809723C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Makeoshihiki_0x80972350/ObjMakeoshihiki_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Makeoshihiki_0x80972350/ObjMakeoshihiki_Update.asm") diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h new file mode 100644 index 0000000000..b1bd486992 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_MAKEOSHIHIKI_H +#define Z_OBJ_MAKEOSHIHIKI_H + +#include + +struct ObjMakeoshihiki; + +typedef struct ObjMakeoshihiki { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x8]; +} ObjMakeoshihiki; // size = 0x14C + +extern const ActorInit Obj_Makeoshihiki_InitVars; + +#endif // Z_OBJ_MAKEOSHIHIKI_H diff --git a/src/overlays/actors/ovl_Obj_Milk_Bin/overlay.cfg b/src/overlays/actors/ovl_Obj_Milk_Bin/overlay.cfg new file mode 100644 index 0000000000..a5f995b328 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Milk_Bin/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Milk_Bin +z_obj_milk_bin.c diff --git a/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c new file mode 100644 index 0000000000..453f2fddfe --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c @@ -0,0 +1,32 @@ +#include "z_obj_milk_bin.h" + +#define FLAGS 0x00000000 + +#define THIS ((ObjMilkBin*)thisx) + +void ObjMilkBin_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjMilkBin_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjMilkBin_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjMilkBin_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Milk_Bin_InitVars = { + ACTOR_OBJ_MILK_BIN, + ACTORTYPE_PROP, + FLAGS, + OBJECT_OBJECT_UNSET_MILK_BIN, + sizeof(ObjMilkBin), + (ActorFunc)ObjMilkBin_Init, + (ActorFunc)ObjMilkBin_Destroy, + (ActorFunc)ObjMilkBin_Update, + (ActorFunc)ObjMilkBin_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Milk_Bin_0x80C08E40/ObjMilkBin_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Milk_Bin_0x80C08E40/ObjMilkBin_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Milk_Bin_0x80C08E40/ObjMilkBin_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Milk_Bin_0x80C08E40/ObjMilkBin_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.h b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.h new file mode 100644 index 0000000000..fbdeee6cf2 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_MILK_BIN_H +#define Z_OBJ_MILK_BIN_H + +#include + +struct ObjMilkBin; + +typedef struct ObjMilkBin { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x58]; +} ObjMilkBin; // size = 0x19C + +extern const ActorInit Obj_Milk_Bin_InitVars; + +#endif // Z_OBJ_MILK_BIN_H diff --git a/src/overlays/actors/ovl_Obj_Mine/overlay.cfg b/src/overlays/actors/ovl_Obj_Mine/overlay.cfg new file mode 100644 index 0000000000..7d0fb28e9f --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Mine/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Mine +z_obj_mine.c diff --git a/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c new file mode 100644 index 0000000000..cfad349868 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c @@ -0,0 +1,118 @@ +#include "z_obj_mine.h" + +#define FLAGS 0x00000000 + +#define THIS ((ObjMine*)thisx) + +void ObjMine_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjMine_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjMine_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjMine_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Mine_InitVars = { + ACTOR_OBJ_MINE, + ACTORTYPE_PROP, + FLAGS, + OBJECT_NY, + sizeof(ObjMine), + (ActorFunc)ObjMine_Init, + (ActorFunc)ObjMine_Destroy, + (ActorFunc)ObjMine_Update, + (ActorFunc)ObjMine_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A811D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A8120C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81288.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A8131C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81384.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A8140C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A8146C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81544.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81640.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A8164C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81684.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81714.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81818.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81868.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A819A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81A00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81AA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81B14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81B7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81D70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81DEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81E7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A81FFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A828A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A82C28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/ObjMine_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/ObjMine_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A82F84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A82F98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A82FA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A82FC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A83214.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A83258.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A832BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A832D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A83A74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A83A88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A83B14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A83B28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A83CEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A83D00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/ObjMine_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A83E7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/ObjMine_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A83FBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A84088.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mine_0x80A811D0/func_80A84338.asm") diff --git a/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.h b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.h new file mode 100644 index 0000000000..3de93be78a --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_MINE_H +#define Z_OBJ_MINE_H + +#include + +struct ObjMine; + +typedef struct ObjMine { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0x1270]; +} ObjMine; // size = 0x13B4 + +extern const ActorInit Obj_Mine_InitVars; + +#endif // Z_OBJ_MINE_H diff --git a/src/overlays/actors/ovl_Obj_Moon_Stone/overlay.cfg b/src/overlays/actors/ovl_Obj_Moon_Stone/overlay.cfg new file mode 100644 index 0000000000..0b388c672f --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Moon_Stone/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Moon_Stone +z_obj_moon_stone.c diff --git a/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c new file mode 100644 index 0000000000..947e4d62a8 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c @@ -0,0 +1,48 @@ +#include "z_obj_moon_stone.h" + +#define FLAGS 0x00100010 + +#define THIS ((ObjMoonStone*)thisx) + +void ObjMoonStone_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjMoonStone_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjMoonStone_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjMoonStone_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Moon_Stone_InitVars = { + ACTOR_OBJ_MOON_STONE, + ACTORTYPE_PROP, + FLAGS, + OBJECT_GI_RESERVE00, + sizeof(ObjMoonStone), + (ActorFunc)ObjMoonStone_Init, + (ActorFunc)ObjMoonStone_Destroy, + (ActorFunc)ObjMoonStone_Update, + (ActorFunc)ObjMoonStone_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Moon_Stone_0x80C06510/ObjMoonStone_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Moon_Stone_0x80C06510/ObjMoonStone_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Moon_Stone_0x80C06510/func_80C0662C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Moon_Stone_0x80C06510/func_80C06640.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Moon_Stone_0x80C06510/func_80C066F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Moon_Stone_0x80C06510/func_80C0670C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Moon_Stone_0x80C06510/func_80C0673C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Moon_Stone_0x80C06510/func_80C06768.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Moon_Stone_0x80C06510/func_80C0685C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Moon_Stone_0x80C06510/func_80C06870.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Moon_Stone_0x80C06510/ObjMoonStone_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Moon_Stone_0x80C06510/ObjMoonStone_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.h b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.h new file mode 100644 index 0000000000..00b2a3a642 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_MOON_STONE_H +#define Z_OBJ_MOON_STONE_H + +#include + +struct ObjMoonStone; + +typedef struct ObjMoonStone { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x54]; +} ObjMoonStone; // size = 0x198 + +extern const ActorInit Obj_Moon_Stone_InitVars; + +#endif // Z_OBJ_MOON_STONE_H diff --git a/src/overlays/actors/ovl_Obj_Mu_Pict/overlay.cfg b/src/overlays/actors/ovl_Obj_Mu_Pict/overlay.cfg new file mode 100644 index 0000000000..77c10a6df0 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Mu_Pict/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Mu_Pict +z_obj_mu_pict.c diff --git a/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c b/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c new file mode 100644 index 0000000000..a559d51024 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c @@ -0,0 +1,50 @@ +#include "z_obj_mu_pict.h" + +#define FLAGS 0x00000009 + +#define THIS ((ObjMuPict*)thisx) + +void ObjMuPict_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjMuPict_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjMuPict_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjMuPict_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Mu_Pict_InitVars = { + ACTOR_OBJ_MU_PICT, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjMuPict), + (ActorFunc)ObjMuPict_Init, + (ActorFunc)ObjMuPict_Destroy, + (ActorFunc)ObjMuPict_Update, + (ActorFunc)ObjMuPict_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/ObjMuPict_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/ObjMuPict_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06B5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06B70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06C54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06C68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06CC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06CD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06D90.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06DC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/func_80C06E88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/ObjMuPict_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mu_Pict_0x80C06AA0/ObjMuPict_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.h b/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.h new file mode 100644 index 0000000000..2f3ffc5657 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_MU_PICT_H +#define Z_OBJ_MU_PICT_H + +#include + +struct ObjMuPict; + +typedef struct ObjMuPict { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xC]; +} ObjMuPict; // size = 0x150 + +extern const ActorInit Obj_Mu_Pict_InitVars; + +#endif // Z_OBJ_MU_PICT_H diff --git a/src/overlays/actors/ovl_Obj_Mure/overlay.cfg b/src/overlays/actors/ovl_Obj_Mure/overlay.cfg new file mode 100644 index 0000000000..99c755b9a0 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Mure/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Mure +z_obj_mure.c diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c new file mode 100644 index 0000000000..d43f3cbf24 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -0,0 +1,63 @@ +#include "z_obj_mure.h" + +#define FLAGS 0x00000000 + +#define THIS ((ObjMure*)thisx) + +void ObjMure_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjMure_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjMure_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Mure_InitVars = { + ACTOR_OBJ_MURE, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjMure), + (ActorFunc)ObjMure_Init, + (ActorFunc)ObjMure_Destroy, + (ActorFunc)ObjMure_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D78D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D7928.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/ObjMure_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/ObjMure_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D7A14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D7A40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D7A68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D7C64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D7DC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D7E14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D7F0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D7F2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D7FFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D8014.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D8074.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D814C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D82CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D84F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/func_808D8678.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure_0x808D78D0/ObjMure_Update.asm") diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h new file mode 100644 index 0000000000..1fb4e2a8ae --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_MURE_H +#define Z_OBJ_MURE_H + +#include + +struct ObjMure; + +typedef struct ObjMure { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x60]; +} ObjMure; // size = 0x1A4 + +extern const ActorInit Obj_Mure_InitVars; + +#endif // Z_OBJ_MURE_H diff --git a/src/overlays/actors/ovl_Obj_Mure2/overlay.cfg b/src/overlays/actors/ovl_Obj_Mure2/overlay.cfg new file mode 100644 index 0000000000..dcb1eb3ac9 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Mure2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Mure2 +z_obj_mure2.c diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c new file mode 100644 index 0000000000..c22e2af89f --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c @@ -0,0 +1,52 @@ +#include "z_obj_mure2.h" + +#define FLAGS 0x00000000 + +#define THIS ((ObjMure2*)thisx) + +void ObjMure2_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjMure2_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Mure2_InitVars = { + ACTOR_OBJ_MURE2, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjMure2), + (ActorFunc)ObjMure2_Init, + (ActorFunc)func_800BDFB0, + (ActorFunc)ObjMure2_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_80960CF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_80960E0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_80960F0C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_80961018.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_8096104C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_809611BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_809612BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/ObjMure2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_809613B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_809613C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_809613E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_809613FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_8096147C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/func_80961490.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure2_0x80960CF0/ObjMure2_Update.asm") diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h new file mode 100644 index 0000000000..69320b5d1a --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_MURE2_H +#define Z_OBJ_MURE2_H + +#include + +struct ObjMure2; + +typedef struct ObjMure2 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x3C]; +} ObjMure2; // size = 0x180 + +extern const ActorInit Obj_Mure2_InitVars; + +#endif // Z_OBJ_MURE2_H diff --git a/src/overlays/actors/ovl_Obj_Mure3/overlay.cfg b/src/overlays/actors/ovl_Obj_Mure3/overlay.cfg new file mode 100644 index 0000000000..7774442db7 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Mure3/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Mure3 +z_obj_mure3.c diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c new file mode 100644 index 0000000000..c03847db04 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c @@ -0,0 +1,51 @@ +#include "z_obj_mure3.h" + +#define FLAGS 0x00000000 + +#define THIS ((ObjMure3*)thisx) + +void ObjMure3_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjMure3_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjMure3_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Mure3_InitVars = { + ACTOR_OBJ_MURE3, + ACTORTYPE_BG, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjMure3), + (ActorFunc)ObjMure3_Init, + (ActorFunc)ObjMure3_Destroy, + (ActorFunc)ObjMure3_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/func_8098F040.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/func_8098F110.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/func_8098F220.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/func_8098F364.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/func_8098F438.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/ObjMure3_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/ObjMure3_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/func_8098F598.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/func_8098F5AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/func_8098F5D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/func_8098F5E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/func_8098F66C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/func_8098F680.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Mure3_0x8098F040/ObjMure3_Update.asm") diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h new file mode 100644 index 0000000000..799a3e543e --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_MURE3_H +#define Z_OBJ_MURE3_H + +#include + +struct ObjMure3; + +typedef struct ObjMure3 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x24]; +} ObjMure3; // size = 0x168 + +extern const ActorInit Obj_Mure3_InitVars; + +#endif // Z_OBJ_MURE3_H diff --git a/src/overlays/actors/ovl_Obj_Nozoki/overlay.cfg b/src/overlays/actors/ovl_Obj_Nozoki/overlay.cfg new file mode 100644 index 0000000000..9173a80559 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Nozoki/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Nozoki +z_obj_nozoki.c diff --git a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c new file mode 100644 index 0000000000..b3c8ff9f29 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c @@ -0,0 +1,63 @@ +#include "z_obj_nozoki.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjNozoki*)thisx) + +void ObjNozoki_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjNozoki_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjNozoki_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Nozoki_InitVars = { + ACTOR_OBJ_NOZOKI, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjNozoki), + (ActorFunc)ObjNozoki_Init, + (ActorFunc)ObjNozoki_Destroy, + (ActorFunc)ObjNozoki_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA2420.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/ObjNozoki_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/ObjNozoki_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA2514.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA26A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA2708.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA2790.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA27C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA28DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA2AB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA2B64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA2BA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA2C28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA2C94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA3044.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA311C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA3230.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA3344.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/ObjNozoki_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Nozoki_0x80BA2420/func_80BA3434.asm") diff --git a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.h b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.h new file mode 100644 index 0000000000..efb4cedcc2 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_NOZOKI_H +#define Z_OBJ_NOZOKI_H + +#include + +struct ObjNozoki; + +typedef struct ObjNozoki { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x20]; +} ObjNozoki; // size = 0x164 + +extern const ActorInit Obj_Nozoki_InitVars; + +#endif // Z_OBJ_NOZOKI_H diff --git a/src/overlays/actors/ovl_Obj_Ocarinalift/overlay.cfg b/src/overlays/actors/ovl_Obj_Ocarinalift/overlay.cfg new file mode 100644 index 0000000000..3d9eef7c45 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Ocarinalift/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Ocarinalift +z_obj_ocarinalift.c diff --git a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c new file mode 100644 index 0000000000..8bf351645b --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c @@ -0,0 +1,62 @@ +#include "z_obj_ocarinalift.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjOcarinalift*)thisx) + +void ObjOcarinalift_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjOcarinalift_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjOcarinalift_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjOcarinalift_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Ocarinalift_InitVars = { + ACTOR_OBJ_OCARINALIFT, + ACTORTYPE_BG, + FLAGS, + OBJECT_RAILLIFT, + sizeof(ObjOcarinalift), + (ActorFunc)ObjOcarinalift_Init, + (ActorFunc)ObjOcarinalift_Destroy, + (ActorFunc)ObjOcarinalift_Update, + (ActorFunc)ObjOcarinalift_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC94C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/ObjOcarinalift_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/ObjOcarinalift_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9680.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC96A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC96B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC96D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC99C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC99D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9A68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9A7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9AB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9AE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9B48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9B5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9C20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/func_80AC9C48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/ObjOcarinalift_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Ocarinalift_0x80AC94C0/ObjOcarinalift_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.h b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.h new file mode 100644 index 0000000000..6e07405969 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_OCARINALIFT_H +#define Z_OBJ_OCARINALIFT_H + +#include + +struct ObjOcarinalift; + +typedef struct ObjOcarinalift { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x34]; +} ObjOcarinalift; // size = 0x178 + +extern const ActorInit Obj_Ocarinalift_InitVars; + +#endif // Z_OBJ_OCARINALIFT_H diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/overlay.cfg b/src/overlays/actors/ovl_Obj_Oshihiki/overlay.cfg new file mode 100644 index 0000000000..48cf4049fb --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Oshihiki/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Oshihiki +z_obj_oshihiki.c diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c new file mode 100644 index 0000000000..b806795ccd --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -0,0 +1,80 @@ +#include "z_obj_oshihiki.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjOshihiki*)thisx) + +void ObjOshihiki_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjOshihiki_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjOshihiki_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjOshihiki_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Oshihiki_InitVars = { + ACTOR_OBJ_OSHIHIKI, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_DANGEON_KEEP, + sizeof(ObjOshihiki), + (ActorFunc)ObjOshihiki_Init, + (ActorFunc)ObjOshihiki_Destroy, + (ActorFunc)ObjOshihiki_Update, + (ActorFunc)ObjOshihiki_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917290.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_809172E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_8091734C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917378.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917408.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917538.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917604.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_8091763C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_8091768C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/ObjOshihiki_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/ObjOshihiki_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917840.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_809179A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917AEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917B44.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917B9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917C14.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917E8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917F88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80917FC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_809180C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80918108.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80918314.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_8091834C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_8091851C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/func_80918574.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/ObjOshihiki_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Oshihiki_0x80917290/ObjOshihiki_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h new file mode 100644 index 0000000000..2ab864a05b --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_OSHIHIKI_H +#define Z_OBJ_OSHIHIKI_H + +#include + +struct ObjOshihiki; + +typedef struct ObjOshihiki { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x88]; +} ObjOshihiki; // size = 0x1CC + +extern const ActorInit Obj_Oshihiki_InitVars; + +#endif // Z_OBJ_OSHIHIKI_H diff --git a/src/overlays/actors/ovl_Obj_Purify/overlay.cfg b/src/overlays/actors/ovl_Obj_Purify/overlay.cfg new file mode 100644 index 0000000000..966356722d --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Purify/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Purify +z_obj_purify.c diff --git a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c new file mode 100644 index 0000000000..a2effad909 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c @@ -0,0 +1,61 @@ +#include "z_obj_purify.h" + +#define FLAGS 0x00000030 + +#define THIS ((ObjPurify*)thisx) + +void ObjPurify_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjPurify_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjPurify_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Purify_InitVars = { + ACTOR_OBJ_PURIFY, + ACTORTYPE_BG, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjPurify), + (ActorFunc)ObjPurify_Init, + (ActorFunc)ObjPurify_Destroy, + (ActorFunc)ObjPurify_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A84CD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A84CF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/ObjPurify_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/ObjPurify_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A84EAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A84EC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A84FA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A84FB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A84FEC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A85010.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A85048.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A85074.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A850B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A850E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A8515C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A85194.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/ObjPurify_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A851C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Purify_0x80A84CD0/func_80A85304.asm") diff --git a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.h b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.h new file mode 100644 index 0000000000..6fa181775d --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_PURIFY_H +#define Z_OBJ_PURIFY_H + +#include + +struct ObjPurify; + +typedef struct ObjPurify { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2C]; +} ObjPurify; // size = 0x170 + +extern const ActorInit Obj_Purify_InitVars; + +#endif // Z_OBJ_PURIFY_H diff --git a/src/overlays/actors/ovl_Obj_Pzlblock/overlay.cfg b/src/overlays/actors/ovl_Obj_Pzlblock/overlay.cfg new file mode 100644 index 0000000000..d2b05c1ff0 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Pzlblock/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Pzlblock +z_obj_pzlblock.c diff --git a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c new file mode 100644 index 0000000000..a9043a4c2a --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c @@ -0,0 +1,55 @@ +#include "z_obj_pzlblock.h" + +#define FLAGS 0x04000010 + +#define THIS ((ObjPzlblock*)thisx) + +void ObjPzlblock_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjPzlblock_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjPzlblock_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Pzlblock_InitVars = { + ACTOR_OBJ_PZLBLOCK, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjPzlblock), + (ActorFunc)ObjPzlblock_Init, + (ActorFunc)ObjPzlblock_Destroy, + (ActorFunc)ObjPzlblock_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A33E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A3448.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A34E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A35EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A376C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/ObjPzlblock_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/ObjPzlblock_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A3A48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A3A74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A3BA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A3BC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A3D1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A3D38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/ObjPzlblock_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A3E58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Pzlblock_0x809A33E0/func_809A3F0C.asm") diff --git a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.h b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.h new file mode 100644 index 0000000000..5bbd0a245b --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_PZLBLOCK_H +#define Z_OBJ_PZLBLOCK_H + +#include + +struct ObjPzlblock; + +typedef struct ObjPzlblock { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x38]; +} ObjPzlblock; // size = 0x17C + +extern const ActorInit Obj_Pzlblock_InitVars; + +#endif // Z_OBJ_PZLBLOCK_H diff --git a/src/overlays/actors/ovl_Obj_Raillift/overlay.cfg b/src/overlays/actors/ovl_Obj_Raillift/overlay.cfg new file mode 100644 index 0000000000..69c3fc70c5 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Raillift/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Raillift +z_obj_raillift.c diff --git a/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c new file mode 100644 index 0000000000..654c144c98 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c @@ -0,0 +1,50 @@ +#include "z_obj_raillift.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjRaillift*)thisx) + +void ObjRaillift_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjRaillift_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjRaillift_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjRaillift_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Raillift_InitVars = { + ACTOR_OBJ_RAILLIFT, + ACTORTYPE_BG, + FLAGS, + OBJECT_RAILLIFT, + sizeof(ObjRaillift), + (ActorFunc)ObjRaillift_Init, + (ActorFunc)ObjRaillift_Destroy, + (ActorFunc)ObjRaillift_Update, + (ActorFunc)ObjRaillift_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/func_80A19910.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/ObjRaillift_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/ObjRaillift_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/func_80A19B98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/func_80A19BA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/func_80A19E84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/func_80A19EE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/func_80A19F18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/func_80A19F78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/ObjRaillift_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/ObjRaillift_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/func_80A1A330.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Raillift_0x80A19910/func_80A1A360.asm") diff --git a/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.h b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.h new file mode 100644 index 0000000000..8b00890e48 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_RAILLIFT_H +#define Z_OBJ_RAILLIFT_H + +#include + +struct ObjRaillift; + +typedef struct ObjRaillift { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x48]; +} ObjRaillift; // size = 0x18C + +extern const ActorInit Obj_Raillift_InitVars; + +#endif // Z_OBJ_RAILLIFT_H diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/overlay.cfg b/src/overlays/actors/ovl_Obj_Roomtimer/overlay.cfg new file mode 100644 index 0000000000..b4eef84273 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Roomtimer/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Roomtimer +z_obj_roomtimer.c diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c new file mode 100644 index 0000000000..cb2689e598 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c @@ -0,0 +1,35 @@ +#include "z_obj_roomtimer.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjRoomtimer*)thisx) + +void ObjRoomtimer_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjRoomtimer_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjRoomtimer_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Roomtimer_InitVars = { + ACTOR_OBJ_ROOMTIMER, + ACTORTYPE_ENEMY, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjRoomtimer), + (ActorFunc)ObjRoomtimer_Init, + (ActorFunc)ObjRoomtimer_Destroy, + (ActorFunc)ObjRoomtimer_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Roomtimer_0x80973C50/ObjRoomtimer_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Roomtimer_0x80973C50/ObjRoomtimer_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Roomtimer_0x80973C50/func_80973CD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Roomtimer_0x80973C50/func_80973D3C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Roomtimer_0x80973C50/func_80973DE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Roomtimer_0x80973C50/ObjRoomtimer_Update.asm") diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h new file mode 100644 index 0000000000..436c7ddbd2 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_ROOMTIMER_H +#define Z_OBJ_ROOMTIMER_H + +#include + +struct ObjRoomtimer; + +typedef struct ObjRoomtimer { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x8]; +} ObjRoomtimer; // size = 0x14C + +extern const ActorInit Obj_Roomtimer_InitVars; + +#endif // Z_OBJ_ROOMTIMER_H diff --git a/src/overlays/actors/ovl_Obj_Rotlift/overlay.cfg b/src/overlays/actors/ovl_Obj_Rotlift/overlay.cfg new file mode 100644 index 0000000000..7c2884ce4a --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Rotlift/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Rotlift +z_obj_rotlift.c diff --git a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c new file mode 100644 index 0000000000..3435ff410f --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c @@ -0,0 +1,34 @@ +#include "z_obj_rotlift.h" + +#define FLAGS 0x00000000 + +#define THIS ((ObjRotlift*)thisx) + +void ObjRotlift_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjRotlift_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjRotlift_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjRotlift_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Rotlift_InitVars = { + ACTOR_OBJ_ROTLIFT, + ACTORTYPE_BG, + FLAGS, + OBJECT_ROTLIFT, + sizeof(ObjRotlift), + (ActorFunc)ObjRotlift_Init, + (ActorFunc)ObjRotlift_Destroy, + (ActorFunc)ObjRotlift_Update, + (ActorFunc)ObjRotlift_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Rotlift_0x80B95E20/func_80B95E20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Rotlift_0x80B95E20/ObjRotlift_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Rotlift_0x80B95E20/ObjRotlift_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Rotlift_0x80B95E20/ObjRotlift_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Rotlift_0x80B95E20/ObjRotlift_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.h b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.h new file mode 100644 index 0000000000..8cfc593bf5 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_ROTLIFT_H +#define Z_OBJ_ROTLIFT_H + +#include + +struct ObjRotlift; + +typedef struct ObjRotlift { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x20]; +} ObjRotlift; // size = 0x164 + +extern const ActorInit Obj_Rotlift_InitVars; + +#endif // Z_OBJ_ROTLIFT_H diff --git a/src/overlays/actors/ovl_Obj_Shutter/overlay.cfg b/src/overlays/actors/ovl_Obj_Shutter/overlay.cfg new file mode 100644 index 0000000000..9b5210eb47 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Shutter/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Shutter +z_obj_shutter.c diff --git a/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c new file mode 100644 index 0000000000..1e48acc17e --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c @@ -0,0 +1,32 @@ +#include "z_obj_shutter.h" + +#define FLAGS 0x00000030 + +#define THIS ((ObjShutter*)thisx) + +void ObjShutter_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjShutter_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjShutter_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjShutter_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Shutter_InitVars = { + ACTOR_OBJ_SHUTTER, + ACTORTYPE_PROP, + FLAGS, + OBJECT_F53_OBJ, + sizeof(ObjShutter), + (ActorFunc)ObjShutter_Init, + (ActorFunc)ObjShutter_Destroy, + (ActorFunc)ObjShutter_Update, + (ActorFunc)ObjShutter_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Shutter_0x80A37ED0/ObjShutter_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Shutter_0x80A37ED0/ObjShutter_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Shutter_0x80A37ED0/ObjShutter_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Shutter_0x80A37ED0/ObjShutter_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.h b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.h new file mode 100644 index 0000000000..7ce77e2d49 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_SHUTTER_H +#define Z_OBJ_SHUTTER_H + +#include + +struct ObjShutter; + +typedef struct ObjShutter { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x8]; +} ObjShutter; // size = 0x14C + +extern const ActorInit Obj_Shutter_InitVars; + +#endif // Z_OBJ_SHUTTER_H diff --git a/src/overlays/actors/ovl_Obj_Skateblock/overlay.cfg b/src/overlays/actors/ovl_Obj_Skateblock/overlay.cfg new file mode 100644 index 0000000000..bb4e2fec88 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Skateblock/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Skateblock +z_obj_skateblock.c diff --git a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c new file mode 100644 index 0000000000..1e79deb410 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c @@ -0,0 +1,84 @@ +#include "z_obj_skateblock.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjSkateblock*)thisx) + +void ObjSkateblock_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjSkateblock_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjSkateblock_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjSkateblock_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Skateblock_InitVars = { + ACTOR_OBJ_SKATEBLOCK, + ACTORTYPE_BG, + FLAGS, + GAMEPLAY_DANGEON_KEEP, + sizeof(ObjSkateblock), + (ActorFunc)ObjSkateblock_Init, + (ActorFunc)ObjSkateblock_Destroy, + (ActorFunc)ObjSkateblock_Update, + (ActorFunc)ObjSkateblock_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21150.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A211F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A212F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21370.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21548.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A216D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21934.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21990.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21C30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21C88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21CB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21CD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21D1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21E9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21F68.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A21F74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/ObjSkateblock_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/ObjSkateblock_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A22308.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A22334.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A2244C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A224A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A22628.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A2264C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A22728.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A2273C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A227A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/func_80A227C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/ObjSkateblock_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Skateblock_0x80A21150/ObjSkateblock_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.h b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.h new file mode 100644 index 0000000000..7407461f54 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_SKATEBLOCK_H +#define Z_OBJ_SKATEBLOCK_H + +#include + +struct ObjSkateblock; + +typedef struct ObjSkateblock { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x80]; +} ObjSkateblock; // size = 0x1C4 + +extern const ActorInit Obj_Skateblock_InitVars; + +#endif // Z_OBJ_SKATEBLOCK_H diff --git a/src/overlays/actors/ovl_Obj_Smork/overlay.cfg b/src/overlays/actors/ovl_Obj_Smork/overlay.cfg new file mode 100644 index 0000000000..35a105b7d0 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Smork/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Smork +z_obj_smork.c diff --git a/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c new file mode 100644 index 0000000000..2765fad158 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c @@ -0,0 +1,38 @@ +#include "z_obj_smork.h" + +#define FLAGS 0x00000030 + +#define THIS ((ObjSmork*)thisx) + +void ObjSmork_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjSmork_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjSmork_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjSmork_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Smork_InitVars = { + ACTOR_OBJ_SMORK, + ACTORTYPE_PROP, + FLAGS, + OBJECT_F53_OBJ, + sizeof(ObjSmork), + (ActorFunc)ObjSmork_Init, + (ActorFunc)ObjSmork_Destroy, + (ActorFunc)ObjSmork_Update, + (ActorFunc)ObjSmork_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Smork_0x80A3D680/func_80A3D680.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Smork_0x80A3D680/func_80A3D940.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Smork_0x80A3D680/func_80A3D9C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Smork_0x80A3D680/ObjSmork_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Smork_0x80A3D680/ObjSmork_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Smork_0x80A3D680/ObjSmork_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Smork_0x80A3D680/ObjSmork_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.h b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.h new file mode 100644 index 0000000000..a401ae1685 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_SMORK_H +#define Z_OBJ_SMORK_H + +#include + +struct ObjSmork; + +typedef struct ObjSmork { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x84]; +} ObjSmork; // size = 0x1C8 + +extern const ActorInit Obj_Smork_InitVars; + +#endif // Z_OBJ_SMORK_H diff --git a/src/overlays/actors/ovl_Obj_Snowball/overlay.cfg b/src/overlays/actors/ovl_Obj_Snowball/overlay.cfg new file mode 100644 index 0000000000..45a8a39bda --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Snowball/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Snowball +z_obj_snowball.c diff --git a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c new file mode 100644 index 0000000000..ea7b0c68b4 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c @@ -0,0 +1,74 @@ +#include "z_obj_snowball.h" + +#define FLAGS 0x00000000 + +#define THIS ((ObjSnowball*)thisx) + +void ObjSnowball_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjSnowball_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjSnowball_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjSnowball_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Snowball_InitVars = { + ACTOR_OBJ_SNOWBALL, + ACTORTYPE_PROP, + FLAGS, + OBJECT_GOROIWA, + sizeof(ObjSnowball), + (ActorFunc)ObjSnowball_Init, + (ActorFunc)ObjSnowball_Destroy, + (ActorFunc)ObjSnowball_Update, + (ActorFunc)ObjSnowball_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B02CD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B02D58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B02DB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B02E54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B02EE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B030F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B03688.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B03A80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B03E2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B03FF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/ObjSnowball_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/ObjSnowball_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B04338.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B04350.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B04540.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B0457C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B04608.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B04648.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B046E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B047C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B04B48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B04B60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/ObjSnowball_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/ObjSnowball_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball_0x80B02CD0/func_80B04D34.asm") diff --git a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.h b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.h new file mode 100644 index 0000000000..711d7722e2 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_SNOWBALL_H +#define Z_OBJ_SNOWBALL_H + +#include + +struct ObjSnowball; + +typedef struct ObjSnowball { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xD0]; +} ObjSnowball; // size = 0x214 + +extern const ActorInit Obj_Snowball_InitVars; + +#endif // Z_OBJ_SNOWBALL_H diff --git a/src/overlays/actors/ovl_Obj_Snowball2/overlay.cfg b/src/overlays/actors/ovl_Obj_Snowball2/overlay.cfg new file mode 100644 index 0000000000..5d740b086a --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Snowball2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Snowball2 +z_obj_snowball2.c diff --git a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c new file mode 100644 index 0000000000..25a0eff173 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c @@ -0,0 +1,72 @@ +#include "z_obj_snowball2.h" + +#define FLAGS 0x00800000 + +#define THIS ((ObjSnowball2*)thisx) + +void ObjSnowball2_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjSnowball2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjSnowball2_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjSnowball2_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Snowball2_InitVars = { + ACTOR_OBJ_SNOWBALL2, + ACTORTYPE_PROP, + FLAGS, + OBJECT_GOROIWA, + sizeof(ObjSnowball2), + (ActorFunc)ObjSnowball2_Init, + (ActorFunc)ObjSnowball2_Destroy, + (ActorFunc)ObjSnowball2_Update, + (ActorFunc)ObjSnowball2_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B38E20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B38E88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B38EFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B39108.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B39470.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B395C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B395EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B39638.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B39834.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B39908.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B39B28.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B39B5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/ObjSnowball2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/ObjSnowball2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B39C78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B39C9C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B39F60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B39FA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B3A0D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B3A13C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B3A498.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/func_80B3A500.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/ObjSnowball2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Snowball2_0x80B38E20/ObjSnowball2_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.h b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.h new file mode 100644 index 0000000000..79d2793f85 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_SNOWBALL2_H +#define Z_OBJ_SNOWBALL2_H + +#include + +struct ObjSnowball2; + +typedef struct ObjSnowball2 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x70]; +} ObjSnowball2; // size = 0x1B4 + +extern const ActorInit Obj_Snowball2_InitVars; + +#endif // Z_OBJ_SNOWBALL2_H diff --git a/src/overlays/actors/ovl_Obj_Sound/overlay.cfg b/src/overlays/actors/ovl_Obj_Sound/overlay.cfg new file mode 100644 index 0000000000..d1863878bc --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Sound/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Sound +z_obj_sound.c diff --git a/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c b/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c new file mode 100644 index 0000000000..f7329e6af1 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c @@ -0,0 +1,31 @@ +#include "z_obj_sound.h" + +#define FLAGS 0x00000030 + +#define THIS ((ObjSound*)thisx) + +void ObjSound_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjSound_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjSound_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Sound_InitVars = { + ACTOR_OBJ_SOUND, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjSound), + (ActorFunc)ObjSound_Init, + (ActorFunc)ObjSound_Destroy, + (ActorFunc)ObjSound_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Sound_0x8099A920/ObjSound_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Sound_0x8099A920/ObjSound_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Sound_0x8099A920/ObjSound_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Sound_0x8099A920/func_8099AA84.asm") diff --git a/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.h b/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.h new file mode 100644 index 0000000000..fa1711910c --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_SOUND_H +#define Z_OBJ_SOUND_H + +#include + +struct ObjSound; + +typedef struct ObjSound { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4]; +} ObjSound; // size = 0x148 + +extern const ActorInit Obj_Sound_InitVars; + +#endif // Z_OBJ_SOUND_H diff --git a/src/overlays/actors/ovl_Obj_Spidertent/overlay.cfg b/src/overlays/actors/ovl_Obj_Spidertent/overlay.cfg new file mode 100644 index 0000000000..f5f13b8ad0 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Spidertent/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Spidertent +z_obj_spidertent.c diff --git a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c new file mode 100644 index 0000000000..0d5031e730 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c @@ -0,0 +1,56 @@ +#include "z_obj_spidertent.h" + +#define FLAGS 0x10000000 + +#define THIS ((ObjSpidertent*)thisx) + +void ObjSpidertent_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjSpidertent_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjSpidertent_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjSpidertent_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Spidertent_InitVars = { + ACTOR_OBJ_SPIDERTENT, + ACTORTYPE_BG, + FLAGS, + OBJECT_SPIDERTENT, + sizeof(ObjSpidertent), + (ActorFunc)ObjSpidertent_Init, + (ActorFunc)ObjSpidertent_Destroy, + (ActorFunc)ObjSpidertent_Update, + (ActorFunc)ObjSpidertent_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/func_80B2FB10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/func_80B2FB94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/func_80B2FC98.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/func_80B300F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/func_80B30410.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/func_80B30480.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/ObjSpidertent_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/ObjSpidertent_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/func_80B307E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/func_80B30808.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/func_80B30A2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/func_80B30A4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/func_80B30AD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/func_80B30AF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/ObjSpidertent_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spidertent_0x80B2FB10/ObjSpidertent_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.h b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.h new file mode 100644 index 0000000000..8cf7221cde --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_SPIDERTENT_H +#define Z_OBJ_SPIDERTENT_H + +#include + +struct ObjSpidertent; + +typedef struct ObjSpidertent { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x288]; +} ObjSpidertent; // size = 0x3CC + +extern const ActorInit Obj_Spidertent_InitVars; + +#endif // Z_OBJ_SPIDERTENT_H diff --git a/src/overlays/actors/ovl_Obj_Spinyroll/overlay.cfg b/src/overlays/actors/ovl_Obj_Spinyroll/overlay.cfg new file mode 100644 index 0000000000..38ea69b6d7 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Spinyroll/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Spinyroll +z_obj_spinyroll.c diff --git a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c new file mode 100644 index 0000000000..b595545399 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c @@ -0,0 +1,94 @@ +#include "z_obj_spinyroll.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjSpinyroll*)thisx) + +void ObjSpinyroll_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjSpinyroll_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjSpinyroll_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjSpinyroll_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Spinyroll_InitVars = { + ACTOR_OBJ_SPINYROLL, + ACTORTYPE_PROP, + FLAGS, + OBJECT_SPINYROLL, + sizeof(ObjSpinyroll), + (ActorFunc)ObjSpinyroll_Init, + (ActorFunc)ObjSpinyroll_Destroy, + (ActorFunc)ObjSpinyroll_Update, + (ActorFunc)ObjSpinyroll_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DA50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DAAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DB2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DC5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DCCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DD18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DE10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DE58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DE84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DEB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1DFA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E074.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E2D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E334.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E394.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E3D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E648.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E694.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E6D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/ObjSpinyroll_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/ObjSpinyroll_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E9C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1E9E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1EA10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1EA4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1EAAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1EAE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1EB40.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1EB54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1EC24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1EC38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1ECC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/func_80A1ECD4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/ObjSpinyroll_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Spinyroll_0x80A1DA50/ObjSpinyroll_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.h b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.h new file mode 100644 index 0000000000..96074482d8 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_SPINYROLL_H +#define Z_OBJ_SPINYROLL_H + +#include + +struct ObjSpinyroll; + +typedef struct ObjSpinyroll { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x3A0]; +} ObjSpinyroll; // size = 0x4E4 + +extern const ActorInit Obj_Spinyroll_InitVars; + +#endif // Z_OBJ_SPINYROLL_H diff --git a/src/overlays/actors/ovl_Obj_Switch/overlay.cfg b/src/overlays/actors/ovl_Obj_Switch/overlay.cfg new file mode 100644 index 0000000000..683d4ae005 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Switch/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Switch +z_obj_switch.c diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c new file mode 100644 index 0000000000..ae01451c5d --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -0,0 +1,138 @@ +#include "z_obj_switch.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjSwitch*)thisx) + +void ObjSwitch_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjSwitch_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjSwitch_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjSwitch_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Switch_InitVars = { + ACTOR_OBJ_SWITCH, + ACTORTYPE_SWITCH, + FLAGS, + GAMEPLAY_DANGEON_KEEP, + sizeof(ObjSwitch), + (ActorFunc)ObjSwitch_Init, + (ActorFunc)ObjSwitch_Destroy, + (ActorFunc)ObjSwitch_Update, + (ActorFunc)ObjSwitch_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093ABD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093AC6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093ADA8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093AE1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093AE74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093AE88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093AEC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093AEF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093AF1C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093AF54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/ObjSwitch_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/ObjSwitch_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093B648.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093B668.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093B6F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093B710.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093B92C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093B940.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093B9C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093B9E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BB5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BB70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BBD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BCC8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BCDC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BD34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BD4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BDAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BDC0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BE10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BE2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BEF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BF04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BF50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093BF70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C0A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C0B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C138.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C15C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C23C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C250.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C2B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C2D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C3C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C3DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C460.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C488.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C584.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C598.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/ObjSwitch_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C778.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C888.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C8B8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093C99C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093CA80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/func_8093CAC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Switch_0x8093ABD0/ObjSwitch_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h new file mode 100644 index 0000000000..1b88648af4 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_SWITCH_H +#define Z_OBJ_SWITCH_H + +#include + +struct ObjSwitch; + +typedef struct ObjSwitch { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x114]; +} ObjSwitch; // size = 0x258 + +extern const ActorInit Obj_Switch_InitVars; + +#endif // Z_OBJ_SWITCH_H diff --git a/src/overlays/actors/ovl_Obj_Swprize/overlay.cfg b/src/overlays/actors/ovl_Obj_Swprize/overlay.cfg new file mode 100644 index 0000000000..4b73ca304f --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Swprize/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Swprize +z_obj_swprize.c diff --git a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c new file mode 100644 index 0000000000..3a4b5c4ba0 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c @@ -0,0 +1,49 @@ +#include "z_obj_swprize.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjSwprize*)thisx) + +void ObjSwprize_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjSwprize_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjSwprize_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Swprize_InitVars = { + ACTOR_OBJ_SWPRIZE, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjSwprize), + (ActorFunc)ObjSwprize_Init, + (ActorFunc)ObjSwprize_Destroy, + (ActorFunc)ObjSwprize_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/func_80C25360.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/func_80C253D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/ObjSwprize_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/ObjSwprize_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/func_80C25640.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/func_80C25654.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/func_80C25698.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/func_80C256AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/func_80C25710.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/func_80C2572C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/func_80C25780.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/func_80C25794.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Swprize_0x80C25360/ObjSwprize_Update.asm") diff --git a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.h b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.h new file mode 100644 index 0000000000..88c4056015 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_SWPRIZE_H +#define Z_OBJ_SWPRIZE_H + +#include + +struct ObjSwprize; + +typedef struct ObjSwprize { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x8]; +} ObjSwprize; // size = 0x14C + +extern const ActorInit Obj_Swprize_InitVars; + +#endif // Z_OBJ_SWPRIZE_H diff --git a/src/overlays/actors/ovl_Obj_Syokudai/overlay.cfg b/src/overlays/actors/ovl_Obj_Syokudai/overlay.cfg new file mode 100644 index 0000000000..e03e132b7c --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Syokudai/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Syokudai +z_obj_syokudai.c diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c new file mode 100644 index 0000000000..363739d730 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -0,0 +1,32 @@ +#include "z_obj_syokudai.h" + +#define FLAGS 0x00000410 + +#define THIS ((ObjSyokudai*)thisx) + +void ObjSyokudai_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjSyokudai_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjSyokudai_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Syokudai_InitVars = { + ACTOR_OBJ_SYOKUDAI, + ACTORTYPE_PROP, + FLAGS, + OBJECT_SYOKUDAI, + sizeof(ObjSyokudai), + (ActorFunc)ObjSyokudai_Init, + (ActorFunc)ObjSyokudai_Destroy, + (ActorFunc)ObjSyokudai_Update, + (ActorFunc)ObjSyokudai_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Syokudai_0x808BC010/ObjSyokudai_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Syokudai_0x808BC010/ObjSyokudai_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Syokudai_0x808BC010/ObjSyokudai_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Syokudai_0x808BC010/ObjSyokudai_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h new file mode 100644 index 0000000000..22f6e6200f --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_SYOKUDAI_H +#define Z_OBJ_SYOKUDAI_H + +#include + +struct ObjSyokudai; + +typedef struct ObjSyokudai { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xB0]; +} ObjSyokudai; // size = 0x1F4 + +extern const ActorInit Obj_Syokudai_InitVars; + +#endif // Z_OBJ_SYOKUDAI_H diff --git a/src/overlays/actors/ovl_Obj_Takaraya_Wall/overlay.cfg b/src/overlays/actors/ovl_Obj_Takaraya_Wall/overlay.cfg new file mode 100644 index 0000000000..71b838a3a4 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Takaraya_Wall/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Takaraya_Wall +z_obj_takaraya_wall.c diff --git a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c new file mode 100644 index 0000000000..d06d9fbed4 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c @@ -0,0 +1,42 @@ +#include "z_obj_takaraya_wall.h" + +#define FLAGS 0x00000030 + +#define THIS ((ObjTakarayaWall*)thisx) + +void ObjTakarayaWall_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjTakarayaWall_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjTakarayaWall_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjTakarayaWall_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Takaraya_Wall_InitVars = { + ACTOR_OBJ_TAKARAYA_WALL, + ACTORTYPE_BG, + FLAGS, + OBJECT_TAKARAYA_OBJECTS, + sizeof(ObjTakarayaWall), + (ActorFunc)ObjTakarayaWall_Init, + (ActorFunc)ObjTakarayaWall_Destroy, + (ActorFunc)ObjTakarayaWall_Update, + (ActorFunc)ObjTakarayaWall_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Takaraya_Wall_0x80AD9240/func_80AD9240.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Takaraya_Wall_0x80AD9240/func_80AD92FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Takaraya_Wall_0x80AD9240/func_80AD9358.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Takaraya_Wall_0x80AD9240/func_80AD9488.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Takaraya_Wall_0x80AD9240/ObjTakarayaWall_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Takaraya_Wall_0x80AD9240/ObjTakarayaWall_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Takaraya_Wall_0x80AD9240/func_80AD9B04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Takaraya_Wall_0x80AD9240/ObjTakarayaWall_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Takaraya_Wall_0x80AD9240/ObjTakarayaWall_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.h b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.h new file mode 100644 index 0000000000..bd4d6e5707 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_TAKARAYA_WALL_H +#define Z_OBJ_TAKARAYA_WALL_H + +#include + +struct ObjTakarayaWall; + +typedef struct ObjTakarayaWall { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x9C]; +} ObjTakarayaWall; // size = 0x1E0 + +extern const ActorInit Obj_Takaraya_Wall_InitVars; + +#endif // Z_OBJ_TAKARAYA_WALL_H diff --git a/src/overlays/actors/ovl_Obj_Taru/overlay.cfg b/src/overlays/actors/ovl_Obj_Taru/overlay.cfg new file mode 100644 index 0000000000..70ba0b5b39 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Taru/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Taru +z_obj_taru.c diff --git a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c new file mode 100644 index 0000000000..26d145416b --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c @@ -0,0 +1,52 @@ +#include "z_obj_taru.h" + +#define FLAGS 0x00000000 + +#define THIS ((ObjTaru*)thisx) + +void ObjTaru_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjTaru_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjTaru_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjTaru_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Taru_InitVars = { + ACTOR_OBJ_TARU, + ACTORTYPE_BG, + FLAGS, + OBJECT_TARU, + sizeof(ObjTaru), + (ActorFunc)ObjTaru_Init, + (ActorFunc)ObjTaru_Destroy, + (ActorFunc)ObjTaru_Update, + (ActorFunc)ObjTaru_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/func_80B9B6E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/func_80B9B74C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/func_80B9B9C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/func_80B9BC64.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/func_80B9BCBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/func_80B9BD84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/ObjTaru_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/ObjTaru_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/func_80B9BF7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/func_80B9C07C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/func_80B9C174.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/func_80B9C1A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/ObjTaru_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Taru_0x80B9B6E0/ObjTaru_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.h b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.h new file mode 100644 index 0000000000..51aaceee58 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_TARU_H +#define Z_OBJ_TARU_H + +#include + +struct ObjTaru; + +typedef struct ObjTaru { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x6C]; +} ObjTaru; // size = 0x1B0 + +extern const ActorInit Obj_Taru_InitVars; + +#endif // Z_OBJ_TARU_H diff --git a/src/overlays/actors/ovl_Obj_Toge/overlay.cfg b/src/overlays/actors/ovl_Obj_Toge/overlay.cfg new file mode 100644 index 0000000000..0a249ec38c --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Toge/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Toge +z_obj_toge.c diff --git a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c new file mode 100644 index 0000000000..2a056bb6b3 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c @@ -0,0 +1,52 @@ +#include "z_obj_toge.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjToge*)thisx) + +void ObjToge_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjToge_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjToge_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjToge_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Toge_InitVars = { + ACTOR_OBJ_TOGE, + ACTORTYPE_PROP, + FLAGS, + OBJECT_TRAP, + sizeof(ObjToge), + (ActorFunc)ObjToge_Init, + (ActorFunc)ObjToge_Destroy, + (ActorFunc)ObjToge_Update, + (ActorFunc)ObjToge_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/func_809A41C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/func_809A42A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/func_809A43A8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/func_809A43EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/ObjToge_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/ObjToge_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/func_809A4744.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/func_809A477C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/func_809A4804.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/func_809A481C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/func_809A488C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/func_809A48AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/ObjToge_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toge_0x809A41C0/ObjToge_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.h b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.h new file mode 100644 index 0000000000..6279a2748e --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_TOGE_H +#define Z_OBJ_TOGE_H + +#include + +struct ObjToge; + +typedef struct ObjToge { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x8C]; +} ObjToge; // size = 0x1D0 + +extern const ActorInit Obj_Toge_InitVars; + +#endif // Z_OBJ_TOGE_H diff --git a/src/overlays/actors/ovl_Obj_Tokei_Step/overlay.cfg b/src/overlays/actors/ovl_Obj_Tokei_Step/overlay.cfg new file mode 100644 index 0000000000..1f100873ca --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Tokei_Step/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Tokei_Step +z_obj_tokei_step.c diff --git a/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c new file mode 100644 index 0000000000..d5c9425559 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c @@ -0,0 +1,64 @@ +#include "z_obj_tokei_step.h" + +#define FLAGS 0x00400010 + +#define THIS ((ObjTokeiStep*)thisx) + +void ObjTokeiStep_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjTokeiStep_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjTokeiStep_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjTokeiStep_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Tokei_Step_InitVars = { + ACTOR_OBJ_TOKEI_STEP, + ACTORTYPE_BG, + FLAGS, + OBJECT_TOKEI_STEP, + sizeof(ObjTokeiStep), + (ActorFunc)ObjTokeiStep_Init, + (ActorFunc)ObjTokeiStep_Destroy, + (ActorFunc)ObjTokeiStep_Update, + (ActorFunc)ObjTokeiStep_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD5BB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD5BE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD5C70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD5DFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD5EB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD5F70.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD5FB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/ObjTokeiStep_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/ObjTokeiStep_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD6348.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD635C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD63D4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD63E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD63F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD642C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD6480.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD64A4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/ObjTokeiStep_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/ObjTokeiStep_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Step_0x80AD5BB0/func_80AD6508.asm") diff --git a/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.h b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.h new file mode 100644 index 0000000000..dac311185f --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_TOKEI_STEP_H +#define Z_OBJ_TOKEI_STEP_H + +#include + +struct ObjTokeiStep; + +typedef struct ObjTokeiStep { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xA8]; +} ObjTokeiStep; // size = 0x1EC + +extern const ActorInit Obj_Tokei_Step_InitVars; + +#endif // Z_OBJ_TOKEI_STEP_H diff --git a/src/overlays/actors/ovl_Obj_Tokei_Tobira/overlay.cfg b/src/overlays/actors/ovl_Obj_Tokei_Tobira/overlay.cfg new file mode 100644 index 0000000000..3182fc3f45 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Tokei_Tobira/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Tokei_Tobira +z_obj_tokei_tobira.c diff --git a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c new file mode 100644 index 0000000000..886cbb4854 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c @@ -0,0 +1,34 @@ +#include "z_obj_tokei_tobira.h" + +#define FLAGS 0x00000000 + +#define THIS ((ObjTokeiTobira*)thisx) + +void ObjTokeiTobira_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjTokeiTobira_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjTokeiTobira_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjTokeiTobira_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Tokei_Tobira_InitVars = { + ACTOR_OBJ_TOKEI_TOBIRA, + ACTORTYPE_BG, + FLAGS, + OBJECT_TOKEI_TOBIRA, + sizeof(ObjTokeiTobira), + (ActorFunc)ObjTokeiTobira_Init, + (ActorFunc)ObjTokeiTobira_Destroy, + (ActorFunc)ObjTokeiTobira_Update, + (ActorFunc)ObjTokeiTobira_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Tobira_0x80ABD1D0/ObjTokeiTobira_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Tobira_0x80ABD1D0/ObjTokeiTobira_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Tobira_0x80ABD1D0/func_80ABD3B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Tobira_0x80ABD1D0/ObjTokeiTobira_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Tobira_0x80ABD1D0/ObjTokeiTobira_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.h b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.h new file mode 100644 index 0000000000..1c544d68d1 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_TOKEI_TOBIRA_H +#define Z_OBJ_TOKEI_TOBIRA_H + +#include + +struct ObjTokeiTobira; + +typedef struct ObjTokeiTobira { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x2C]; +} ObjTokeiTobira; // size = 0x170 + +extern const ActorInit Obj_Tokei_Tobira_InitVars; + +#endif // Z_OBJ_TOKEI_TOBIRA_H diff --git a/src/overlays/actors/ovl_Obj_Tokei_Turret/overlay.cfg b/src/overlays/actors/ovl_Obj_Tokei_Turret/overlay.cfg new file mode 100644 index 0000000000..57bac89fa6 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Tokei_Turret/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Tokei_Turret +z_obj_tokei_turret.c diff --git a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c new file mode 100644 index 0000000000..5747ab5dcb --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c @@ -0,0 +1,32 @@ +#include "z_obj_tokei_turret.h" + +#define FLAGS 0x00000000 + +#define THIS ((ObjTokeiTurret*)thisx) + +void ObjTokeiTurret_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjTokeiTurret_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjTokeiTurret_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjTokeiTurret_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Tokei_Turret_InitVars = { + ACTOR_OBJ_TOKEI_TURRET, + ACTORTYPE_BG, + FLAGS, + OBJECT_TOKEI_TURRET, + sizeof(ObjTokeiTurret), + (ActorFunc)ObjTokeiTurret_Init, + (ActorFunc)ObjTokeiTurret_Destroy, + (ActorFunc)ObjTokeiTurret_Update, + (ActorFunc)ObjTokeiTurret_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Turret_0x80B91CC0/ObjTokeiTurret_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Turret_0x80B91CC0/ObjTokeiTurret_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Turret_0x80B91CC0/ObjTokeiTurret_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokei_Turret_0x80B91CC0/ObjTokeiTurret_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.h b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.h new file mode 100644 index 0000000000..7c38907b2b --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_TOKEI_TURRET_H +#define Z_OBJ_TOKEI_TURRET_H + +#include + +struct ObjTokeiTurret; + +typedef struct ObjTokeiTurret { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x18]; +} ObjTokeiTurret; // size = 0x15C + +extern const ActorInit Obj_Tokei_Turret_InitVars; + +#endif // Z_OBJ_TOKEI_TURRET_H diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/overlay.cfg b/src/overlays/actors/ovl_Obj_Tokeidai/overlay.cfg new file mode 100644 index 0000000000..4458dfd697 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Tokeidai/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Tokeidai +z_obj_tokeidai.c diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c new file mode 100644 index 0000000000..e21383859e --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -0,0 +1,102 @@ +#include "z_obj_tokeidai.h" + +#define FLAGS 0x00000030 + +#define THIS ((ObjTokeidai*)thisx) + +void ObjTokeidai_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjTokeidai_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjTokeidai_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjTokeidai_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Tokeidai_InitVars = { + ACTOR_OBJ_TOKEIDAI, + ACTORTYPE_PROP, + FLAGS, + OBJECT_OBJECT_UNSET_TOKEIDAI, + sizeof(ObjTokeidai), + (ActorFunc)ObjTokeidai_Init, + (ActorFunc)ObjTokeidai_Destroy, + (ActorFunc)ObjTokeidai_Update, + (ActorFunc)ObjTokeidai_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB2790.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB27B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB2834.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB28C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB29F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB2BBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/ObjTokeidai_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/ObjTokeidai_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3010.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB319C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3240.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB32F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3370.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB34CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3544.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3598.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB363C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB365C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB36C4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3808.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3880.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB38B0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB39BC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3A7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3B34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3BB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3BD8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3BE8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3C50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3CCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB3ED0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB4040.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB4080.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB4160.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/ObjTokeidai_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/ObjTokeidai_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB4394.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB4664.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tokeidai_0x80AB2790/func_80AB4894.asm") diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h new file mode 100644 index 0000000000..3f8064f1e2 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_TOKEIDAI_H +#define Z_OBJ_TOKEIDAI_H + +#include + +struct ObjTokeidai; + +typedef struct ObjTokeidai { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x34]; +} ObjTokeidai; // size = 0x178 + +extern const ActorInit Obj_Tokeidai_InitVars; + +#endif // Z_OBJ_TOKEIDAI_H diff --git a/src/overlays/actors/ovl_Obj_Toudai/overlay.cfg b/src/overlays/actors/ovl_Obj_Toudai/overlay.cfg new file mode 100644 index 0000000000..fec5d2975c --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Toudai/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Toudai +z_obj_toudai.c diff --git a/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c new file mode 100644 index 0000000000..32ec91b8d0 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c @@ -0,0 +1,38 @@ +#include "z_obj_toudai.h" + +#define FLAGS 0x00000030 + +#define THIS ((ObjToudai*)thisx) + +void ObjToudai_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjToudai_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjToudai_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjToudai_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Toudai_InitVars = { + ACTOR_OBJ_TOUDAI, + ACTORTYPE_PROP, + FLAGS, + OBJECT_F53_OBJ, + sizeof(ObjToudai), + (ActorFunc)ObjToudai_Init, + (ActorFunc)ObjToudai_Destroy, + (ActorFunc)ObjToudai_Update, + (ActorFunc)ObjToudai_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toudai_0x80A33B00/func_80A33B00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toudai_0x80A33B00/func_80A33BB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toudai_0x80A33B00/func_80A342F4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toudai_0x80A33B00/ObjToudai_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toudai_0x80A33B00/ObjToudai_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toudai_0x80A33B00/ObjToudai_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Toudai_0x80A33B00/ObjToudai_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.h b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.h new file mode 100644 index 0000000000..150dbbfae9 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_TOUDAI_H +#define Z_OBJ_TOUDAI_H + +#include + +struct ObjToudai; + +typedef struct ObjToudai { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xFC]; +} ObjToudai; // size = 0x240 + +extern const ActorInit Obj_Toudai_InitVars; + +#endif // Z_OBJ_TOUDAI_H diff --git a/src/overlays/actors/ovl_Obj_Tree/overlay.cfg b/src/overlays/actors/ovl_Obj_Tree/overlay.cfg new file mode 100644 index 0000000000..c3a0007c9e --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Tree/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Tree +z_obj_tree.c diff --git a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c new file mode 100644 index 0000000000..9aabdda722 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c @@ -0,0 +1,42 @@ +#include "z_obj_tree.h" + +#define FLAGS 0x02000000 + +#define THIS ((ObjTree*)thisx) + +void ObjTree_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjTree_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjTree_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjTree_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Tree_InitVars = { + ACTOR_OBJ_TREE, + ACTORTYPE_PROP, + FLAGS, + OBJECT_TREE, + sizeof(ObjTree), + (ActorFunc)ObjTree_Init, + (ActorFunc)ObjTree_Destroy, + (ActorFunc)ObjTree_Update, + (ActorFunc)ObjTree_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tree_0x80B9A0B0/ObjTree_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tree_0x80B9A0B0/ObjTree_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tree_0x80B9A0B0/func_80B9A20C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tree_0x80B9A0B0/func_80B9A220.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tree_0x80B9A0B0/func_80B9A230.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tree_0x80B9A0B0/func_80B9A27C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tree_0x80B9A0B0/func_80B9A348.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tree_0x80B9A0B0/ObjTree_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tree_0x80B9A0B0/ObjTree_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.h b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.h new file mode 100644 index 0000000000..cf82e46247 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_TREE_H +#define Z_OBJ_TREE_H + +#include + +struct ObjTree; + +typedef struct ObjTree { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x74]; +} ObjTree; // size = 0x1B8 + +extern const ActorInit Obj_Tree_InitVars; + +#endif // Z_OBJ_TREE_H diff --git a/src/overlays/actors/ovl_Obj_Tsubo/overlay.cfg b/src/overlays/actors/ovl_Obj_Tsubo/overlay.cfg new file mode 100644 index 0000000000..00f17aeb56 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Tsubo/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Tsubo +z_obj_tsubo.c diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c new file mode 100644 index 0000000000..facb0125d2 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -0,0 +1,79 @@ +#include "z_obj_tsubo.h" + +#define FLAGS 0x04800010 + +#define THIS ((ObjTsubo*)thisx) + +void ObjTsubo_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjTsubo_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjTsubo_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Tsubo_InitVars = { + ACTOR_OBJ_TSUBO, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjTsubo), + (ActorFunc)ObjTsubo_Init, + (ActorFunc)ObjTsubo_Destroy, + (ActorFunc)ObjTsubo_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_809275C0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_8092762C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80927690.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80927714.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_8092776C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80927818.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80927864.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_8092788C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/ObjTsubo_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/ObjTsubo_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80927A78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80927D2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80927FCC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_809282F0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_8092860C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80928904.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80928914.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80928928.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_809289B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_809289E4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80928D6C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80928D80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80928E74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_80928F18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_809291DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_8092926C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/ObjTsubo_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Tsubo_0x809275C0/func_809294B0.asm") diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h new file mode 100644 index 0000000000..b2f1a6279c --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_TSUBO_H +#define Z_OBJ_TSUBO_H + +#include + +struct ObjTsubo; + +typedef struct ObjTsubo { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x58]; +} ObjTsubo; // size = 0x19C + +extern const ActorInit Obj_Tsubo_InitVars; + +#endif // Z_OBJ_TSUBO_H diff --git a/src/overlays/actors/ovl_Obj_Um/overlay.cfg b/src/overlays/actors/ovl_Obj_Um/overlay.cfg new file mode 100644 index 0000000000..a8eb50a9b0 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Um/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Um +z_obj_um.c diff --git a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c new file mode 100644 index 0000000000..c85191a0f3 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c @@ -0,0 +1,132 @@ +#include "z_obj_um.h" + +#define FLAGS 0x00000039 + +#define THIS ((ObjUm*)thisx) + +void ObjUm_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjUm_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjUm_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjUm_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Um_InitVars = { + ACTOR_OBJ_UM, + ACTORTYPE_NPC, + FLAGS, + OBJECT_UM, + sizeof(ObjUm), + (ActorFunc)ObjUm_Init, + (ActorFunc)ObjUm_Destroy, + (ActorFunc)ObjUm_Update, + (ActorFunc)ObjUm_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B77770.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B77FA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B781DC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B783E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B78764.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B78A54.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B78C18.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B78D08.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B78DF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B78E2C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B78E38.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B78E88.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B78EBC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B78EFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/ObjUm_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/ObjUm_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B79524.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B79560.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B795A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B79734.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B797EC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7984C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B79A24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B79A50.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B79BA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B79F10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B79FFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7A070.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7A0E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7A144.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7A1B4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7A240.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7A2AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7A394.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7A400.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7A494.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7A614.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7A7AC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7A860.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7AB78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7ABE4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7AC94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7AD34.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7AE58.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7AEFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7AF30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7B154.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7B18C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/ObjUm_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7B598.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7B93C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7BABC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/func_80B7BEA4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Um_0x80B77770/ObjUm_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Um/z_obj_um.h b/src/overlays/actors/ovl_Obj_Um/z_obj_um.h new file mode 100644 index 0000000000..5b7aa40e32 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Um/z_obj_um.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_UM_H +#define Z_OBJ_UM_H + +#include + +struct ObjUm; + +typedef struct ObjUm { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x3A0]; +} ObjUm; // size = 0x4E4 + +extern const ActorInit Obj_Um_InitVars; + +#endif // Z_OBJ_UM_H diff --git a/src/overlays/actors/ovl_Obj_Usiyane/overlay.cfg b/src/overlays/actors/ovl_Obj_Usiyane/overlay.cfg new file mode 100644 index 0000000000..82fd486bbf --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Usiyane/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Usiyane +z_obj_usiyane.c diff --git a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c new file mode 100644 index 0000000000..2bd6b850ea --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c @@ -0,0 +1,48 @@ +#include "z_obj_usiyane.h" + +#define FLAGS 0x00000020 + +#define THIS ((ObjUsiyane*)thisx) + +void ObjUsiyane_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjUsiyane_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjUsiyane_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjUsiyane_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Usiyane_InitVars = { + ACTOR_OBJ_USIYANE, + ACTORTYPE_PROP, + FLAGS, + OBJECT_OBJECT_UNSET_USIYANE, + sizeof(ObjUsiyane), + (ActorFunc)ObjUsiyane_Init, + (ActorFunc)ObjUsiyane_Destroy, + (ActorFunc)ObjUsiyane_Update, + (ActorFunc)ObjUsiyane_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Usiyane_0x80C07C80/func_80C07C80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Usiyane_0x80C07C80/func_80C07CD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Usiyane_0x80C07C80/func_80C07DC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Usiyane_0x80C07C80/func_80C07DFC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Usiyane_0x80C07C80/func_80C07F30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Usiyane_0x80C07C80/func_80C081C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Usiyane_0x80C07C80/func_80C082CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Usiyane_0x80C07C80/func_80C082E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Usiyane_0x80C07C80/ObjUsiyane_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Usiyane_0x80C07C80/ObjUsiyane_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Usiyane_0x80C07C80/ObjUsiyane_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Usiyane_0x80C07C80/ObjUsiyane_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.h b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.h new file mode 100644 index 0000000000..c665ebc139 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_USIYANE_H +#define Z_OBJ_USIYANE_H + +#include + +struct ObjUsiyane; + +typedef struct ObjUsiyane { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x604]; +} ObjUsiyane; // size = 0x748 + +extern const ActorInit Obj_Usiyane_InitVars; + +#endif // Z_OBJ_USIYANE_H diff --git a/src/overlays/actors/ovl_Obj_Visiblock/overlay.cfg b/src/overlays/actors/ovl_Obj_Visiblock/overlay.cfg new file mode 100644 index 0000000000..9436fe9e31 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Visiblock/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Visiblock +z_obj_visiblock.c diff --git a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c new file mode 100644 index 0000000000..d1aa7b0d29 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c @@ -0,0 +1,29 @@ +#include "z_obj_visiblock.h" + +#define FLAGS 0x00000080 + +#define THIS ((ObjVisiblock*)thisx) + +void ObjVisiblock_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjVisiblock_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjVisiblock_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Visiblock_InitVars = { + ACTOR_OBJ_VISIBLOCK, + ACTORTYPE_BG, + FLAGS, + OBJECT_VISIBLOCK, + sizeof(ObjVisiblock), + (ActorFunc)ObjVisiblock_Init, + (ActorFunc)ObjVisiblock_Destroy, + (ActorFunc)func_800BDFB0, + (ActorFunc)ObjVisiblock_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Visiblock_0x80ADEA70/ObjVisiblock_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Visiblock_0x80ADEA70/ObjVisiblock_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Visiblock_0x80ADEA70/ObjVisiblock_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.h b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.h new file mode 100644 index 0000000000..1224de956d --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_VISIBLOCK_H +#define Z_OBJ_VISIBLOCK_H + +#include + +struct ObjVisiblock; + +typedef struct ObjVisiblock { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1C]; +} ObjVisiblock; // size = 0x160 + +extern const ActorInit Obj_Visiblock_InitVars; + +#endif // Z_OBJ_VISIBLOCK_H diff --git a/src/overlays/actors/ovl_Obj_Vspinyroll/overlay.cfg b/src/overlays/actors/ovl_Obj_Vspinyroll/overlay.cfg new file mode 100644 index 0000000000..0b324c9664 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Vspinyroll/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Vspinyroll +z_obj_vspinyroll.c diff --git a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c new file mode 100644 index 0000000000..0ee6554ec1 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c @@ -0,0 +1,78 @@ +#include "z_obj_vspinyroll.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjVspinyroll*)thisx) + +void ObjVspinyroll_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjVspinyroll_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjVspinyroll_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjVspinyroll_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Vspinyroll_InitVars = { + ACTOR_OBJ_VSPINYROLL, + ACTORTYPE_PROP, + FLAGS, + OBJECT_SPINYROLL, + sizeof(ObjVspinyroll), + (ActorFunc)ObjVspinyroll_Init, + (ActorFunc)ObjVspinyroll_Destroy, + (ActorFunc)ObjVspinyroll_Update, + (ActorFunc)ObjVspinyroll_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3C4E0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3C560.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3C658.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3C6A0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3C6CC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3C700.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3C7E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3C8D8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CB94.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CBF0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CC30.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CC84.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/ObjVspinyroll_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/ObjVspinyroll_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CEC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CEE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CF10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CF4C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CFAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3CFE0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3D024.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3D038.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3D0E8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3D0FC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/ObjVspinyroll_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/ObjVspinyroll_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Vspinyroll_0x80A3C4E0/func_80A3D2C0.asm") diff --git a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.h b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.h new file mode 100644 index 0000000000..131e7fd05d --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_VSPINYROLL_H +#define Z_OBJ_VSPINYROLL_H + +#include + +struct ObjVspinyroll; + +typedef struct ObjVspinyroll { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x288]; +} ObjVspinyroll; // size = 0x3CC + +extern const ActorInit Obj_Vspinyroll_InitVars; + +#endif // Z_OBJ_VSPINYROLL_H diff --git a/src/overlays/actors/ovl_Obj_Warpstone/overlay.cfg b/src/overlays/actors/ovl_Obj_Warpstone/overlay.cfg new file mode 100644 index 0000000000..2f3fe66eab --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Warpstone/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Warpstone +z_obj_warpstone.c diff --git a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c new file mode 100644 index 0000000000..5a2cc5795a --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c @@ -0,0 +1,42 @@ +#include "z_obj_warpstone.h" + +#define FLAGS 0x00000009 + +#define THIS ((ObjWarpstone*)thisx) + +void ObjWarpstone_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjWarpstone_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjWarpstone_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjWarpstone_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Warpstone_InitVars = { + ACTOR_OBJ_WARPSTONE, + ACTORTYPE_ITEMACTION, + FLAGS, + OBJECT_SEK, + sizeof(ObjWarpstone), + (ActorFunc)ObjWarpstone_Init, + (ActorFunc)ObjWarpstone_Destroy, + (ActorFunc)ObjWarpstone_Update, + (ActorFunc)ObjWarpstone_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Warpstone_0x80B92B10/func_80B92B10.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Warpstone_0x80B92B10/ObjWarpstone_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Warpstone_0x80B92B10/ObjWarpstone_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Warpstone_0x80B92B10/func_80B92C00.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Warpstone_0x80B92B10/func_80B92C48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Warpstone_0x80B92B10/func_80B92CD0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Warpstone_0x80B92B10/func_80B92DC4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Warpstone_0x80B92B10/ObjWarpstone_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Warpstone_0x80B92B10/ObjWarpstone_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.h b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.h new file mode 100644 index 0000000000..ab9ef3e8e4 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_WARPSTONE_H +#define Z_OBJ_WARPSTONE_H + +#include + +struct ObjWarpstone; + +typedef struct ObjWarpstone { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x6C]; +} ObjWarpstone; // size = 0x1B0 + +extern const ActorInit Obj_Warpstone_InitVars; + +#endif // Z_OBJ_WARPSTONE_H diff --git a/src/overlays/actors/ovl_Obj_Wind/overlay.cfg b/src/overlays/actors/ovl_Obj_Wind/overlay.cfg new file mode 100644 index 0000000000..7f65da5cf7 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Wind/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Wind +z_obj_wind.c diff --git a/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c new file mode 100644 index 0000000000..8384405841 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c @@ -0,0 +1,32 @@ +#include "z_obj_wind.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjWind*)thisx) + +void ObjWind_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjWind_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjWind_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjWind_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Wind_InitVars = { + ACTOR_OBJ_WIND, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjWind), + (ActorFunc)ObjWind_Init, + (ActorFunc)ObjWind_Destroy, + (ActorFunc)ObjWind_Update, + (ActorFunc)ObjWind_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wind_0x80B23ED0/ObjWind_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wind_0x80B23ED0/ObjWind_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wind_0x80B23ED0/ObjWind_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wind_0x80B23ED0/ObjWind_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.h b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.h new file mode 100644 index 0000000000..be1ee3d83e --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_WIND_H +#define Z_OBJ_WIND_H + +#include + +struct ObjWind; + +typedef struct ObjWind { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4]; +} ObjWind; // size = 0x148 + +extern const ActorInit Obj_Wind_InitVars; + +#endif // Z_OBJ_WIND_H diff --git a/src/overlays/actors/ovl_Obj_Wturn/overlay.cfg b/src/overlays/actors/ovl_Obj_Wturn/overlay.cfg new file mode 100644 index 0000000000..07e4b563d2 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Wturn/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Wturn +z_obj_wturn.c diff --git a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c new file mode 100644 index 0000000000..790787bc43 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c @@ -0,0 +1,42 @@ +#include "z_obj_wturn.h" + +#define FLAGS 0x02100010 + +#define THIS ((ObjWturn*)thisx) + +void ObjWturn_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjWturn_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Wturn_InitVars = { + ACTOR_OBJ_WTURN, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjWturn), + (ActorFunc)ObjWturn_Init, + (ActorFunc)func_800BDFB0, + (ActorFunc)ObjWturn_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wturn_0x808A7930/ObjWturn_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wturn_0x808A7930/func_808A7954.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wturn_0x808A7930/func_808A7968.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wturn_0x808A7930/func_808A7A24.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wturn_0x808A7930/func_808A7A5C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wturn_0x808A7930/func_808A7AAC.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wturn_0x808A7930/func_808A7BA0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wturn_0x808A7930/func_808A7C04.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wturn_0x808A7930/func_808A7C78.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Wturn_0x808A7930/ObjWturn_Update.asm") diff --git a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.h b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.h new file mode 100644 index 0000000000..e3244775f3 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_WTURN_H +#define Z_OBJ_WTURN_H + +#include + +struct ObjWturn; + +typedef struct ObjWturn { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x8]; +} ObjWturn; // size = 0x14C + +extern const ActorInit Obj_Wturn_InitVars; + +#endif // Z_OBJ_WTURN_H diff --git a/src/overlays/actors/ovl_Obj_Y2lift/overlay.cfg b/src/overlays/actors/ovl_Obj_Y2lift/overlay.cfg new file mode 100644 index 0000000000..432bb3e7fc --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Y2lift/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Y2lift +z_obj_y2lift.c diff --git a/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c new file mode 100644 index 0000000000..d63022ff2d --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c @@ -0,0 +1,32 @@ +#include "z_obj_y2lift.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjY2lift*)thisx) + +void ObjY2lift_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjY2lift_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjY2lift_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjY2lift_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Y2lift_InitVars = { + ACTOR_OBJ_Y2LIFT, + ACTORTYPE_BG, + FLAGS, + OBJECT_KAIZOKU_OBJ, + sizeof(ObjY2lift), + (ActorFunc)ObjY2lift_Init, + (ActorFunc)ObjY2lift_Destroy, + (ActorFunc)ObjY2lift_Update, + (ActorFunc)ObjY2lift_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Y2lift_0x80B9A650/ObjY2lift_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Y2lift_0x80B9A650/ObjY2lift_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Y2lift_0x80B9A650/ObjY2lift_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Y2lift_0x80B9A650/ObjY2lift_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.h b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.h new file mode 100644 index 0000000000..1274dc0bb4 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_Y2LIFT_H +#define Z_OBJ_Y2LIFT_H + +#include + +struct ObjY2lift; + +typedef struct ObjY2lift { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1C]; +} ObjY2lift; // size = 0x160 + +extern const ActorInit Obj_Y2lift_InitVars; + +#endif // Z_OBJ_Y2LIFT_H diff --git a/src/overlays/actors/ovl_Obj_Y2shutter/overlay.cfg b/src/overlays/actors/ovl_Obj_Y2shutter/overlay.cfg new file mode 100644 index 0000000000..913e424059 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Y2shutter/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Y2shutter +z_obj_y2shutter.c diff --git a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c new file mode 100644 index 0000000000..a918be1ac2 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c @@ -0,0 +1,34 @@ +#include "z_obj_y2shutter.h" + +#define FLAGS 0x00000010 + +#define THIS ((ObjY2shutter*)thisx) + +void ObjY2shutter_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjY2shutter_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjY2shutter_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjY2shutter_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Y2shutter_InitVars = { + ACTOR_OBJ_Y2SHUTTER, + ACTORTYPE_BG, + FLAGS, + OBJECT_KAIZOKU_OBJ, + sizeof(ObjY2shutter), + (ActorFunc)ObjY2shutter_Init, + (ActorFunc)ObjY2shutter_Destroy, + (ActorFunc)ObjY2shutter_Update, + (ActorFunc)ObjY2shutter_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Y2shutter_0x80B9A980/ObjY2shutter_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Y2shutter_0x80B9A980/ObjY2shutter_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Y2shutter_0x80B9A980/func_80B9AA20.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Y2shutter_0x80B9A980/ObjY2shutter_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Y2shutter_0x80B9A980/ObjY2shutter_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.h b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.h new file mode 100644 index 0000000000..d6438dfe95 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_Y2SHUTTER_H +#define Z_OBJ_Y2SHUTTER_H + +#include + +struct ObjY2shutter; + +typedef struct ObjY2shutter { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x1C]; +} ObjY2shutter; // size = 0x160 + +extern const ActorInit Obj_Y2shutter_InitVars; + +#endif // Z_OBJ_Y2SHUTTER_H diff --git a/src/overlays/actors/ovl_Obj_Yado/overlay.cfg b/src/overlays/actors/ovl_Obj_Yado/overlay.cfg new file mode 100644 index 0000000000..091dbfce7a --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Yado/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Yado +z_obj_yado.c diff --git a/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c new file mode 100644 index 0000000000..ad76b5ae59 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c @@ -0,0 +1,32 @@ +#include "z_obj_yado.h" + +#define FLAGS 0x00000030 + +#define THIS ((ObjYado*)thisx) + +void ObjYado_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjYado_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjYado_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjYado_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Yado_InitVars = { + ACTOR_OBJ_YADO, + ACTORTYPE_BG, + FLAGS, + OBJECT_YADO_OBJ, + sizeof(ObjYado), + (ActorFunc)ObjYado_Init, + (ActorFunc)ObjYado_Destroy, + (ActorFunc)ObjYado_Update, + (ActorFunc)ObjYado_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Yado_0x80C161E0/ObjYado_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Yado_0x80C161E0/ObjYado_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Yado_0x80C161E0/ObjYado_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Yado_0x80C161E0/ObjYado_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.h b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.h new file mode 100644 index 0000000000..9db10a9444 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_YADO_H +#define Z_OBJ_YADO_H + +#include + +struct ObjYado; + +typedef struct ObjYado { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4]; +} ObjYado; // size = 0x148 + +extern const ActorInit Obj_Yado_InitVars; + +#endif // Z_OBJ_YADO_H diff --git a/src/overlays/actors/ovl_Obj_Yasi/overlay.cfg b/src/overlays/actors/ovl_Obj_Yasi/overlay.cfg new file mode 100644 index 0000000000..e1d3b9f4e0 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Yasi/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Obj_Yasi +z_obj_yasi.c diff --git a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c new file mode 100644 index 0000000000..6bf4567a45 --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c @@ -0,0 +1,32 @@ +#include "z_obj_yasi.h" + +#define FLAGS 0x00000000 + +#define THIS ((ObjYasi*)thisx) + +void ObjYasi_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjYasi_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjYasi_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjYasi_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Obj_Yasi_InitVars = { + ACTOR_OBJ_YASI, + ACTORTYPE_PROP, + FLAGS, + OBJECT_OBJECT_UNSET_YASI, + sizeof(ObjYasi), + (ActorFunc)ObjYasi_Init, + (ActorFunc)ObjYasi_Destroy, + (ActorFunc)ObjYasi_Update, + (ActorFunc)ObjYasi_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Yasi_0x80BB4AF0/ObjYasi_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Yasi_0x80BB4AF0/ObjYasi_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Yasi_0x80BB4AF0/ObjYasi_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Obj_Yasi_0x80BB4AF0/ObjYasi_Draw.asm") diff --git a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.h b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.h new file mode 100644 index 0000000000..a6cfca12bf --- /dev/null +++ b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJ_YASI_H +#define Z_OBJ_YASI_H + +#include + +struct ObjYasi; + +typedef struct ObjYasi { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x18]; +} ObjYasi; // size = 0x15C + +extern const ActorInit Obj_Yasi_InitVars; + +#endif // Z_OBJ_YASI_H diff --git a/src/overlays/actors/ovl_Object_Kankyo/overlay.cfg b/src/overlays/actors/ovl_Object_Kankyo/overlay.cfg new file mode 100644 index 0000000000..9c4704cae2 --- /dev/null +++ b/src/overlays/actors/ovl_Object_Kankyo/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Object_Kankyo +z_object_kankyo.c diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c new file mode 100644 index 0000000000..94ccd09f03 --- /dev/null +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -0,0 +1,60 @@ +#include "z_object_kankyo.h" + +#define FLAGS 0x02000030 + +#define THIS ((ObjectKankyo*)thisx) + +void ObjectKankyo_Init(Actor* thisx, GlobalContext* globalCtx); +void ObjectKankyo_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ObjectKankyo_Update(Actor* thisx, GlobalContext* globalCtx); +void ObjectKankyo_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Object_Kankyo_InitVars = { + ACTOR_OBJECT_KANKYO, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ObjectKankyo), + (ActorFunc)ObjectKankyo_Init, + (ActorFunc)ObjectKankyo_Destroy, + (ActorFunc)ObjectKankyo_Update, + (ActorFunc)ObjectKankyo_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DBE80.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DBE8C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DBEB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DBFB0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DC038.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/ObjectKankyo_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/ObjectKankyo_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DC18C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DC454.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DCB7C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DCBF8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DCDB4.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/ObjectKankyo_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/ObjectKankyo_Draw.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DD3C8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DD970.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DDE74.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Object_Kankyo_0x808DBE80/func_808DDE9C.asm") diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h new file mode 100644 index 0000000000..7bca2f4149 --- /dev/null +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h @@ -0,0 +1,15 @@ +#ifndef Z_OBJECT_KANKYO_H +#define Z_OBJECT_KANKYO_H + +#include + +struct ObjectKankyo; + +typedef struct ObjectKankyo { + /* 0x0000 */ Actor actor; + /* 0x0144 */ char unk_0144[0x1010]; +} ObjectKankyo; // size = 0x1154 + +extern const ActorInit Object_Kankyo_InitVars; + +#endif // Z_OBJECT_KANKYO_H diff --git a/src/overlays/actors/ovl_Oceff_Spot/overlay.cfg b/src/overlays/actors/ovl_Oceff_Spot/overlay.cfg new file mode 100644 index 0000000000..e302cce9a0 --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Spot/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Oceff_Spot +z_oceff_spot.c diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c new file mode 100644 index 0000000000..0675223010 --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -0,0 +1,40 @@ +#include "z_oceff_spot.h" + +#define FLAGS 0x02000010 + +#define THIS ((OceffSpot*)thisx) + +void OceffSpot_Init(Actor* thisx, GlobalContext* globalCtx); +void OceffSpot_Destroy(Actor* thisx, GlobalContext* globalCtx); +void OceffSpot_Update(Actor* thisx, GlobalContext* globalCtx); +void OceffSpot_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Oceff_Spot_InitVars = { + ACTOR_OCEFF_SPOT, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(OceffSpot), + (ActorFunc)OceffSpot_Init, + (ActorFunc)OceffSpot_Destroy, + (ActorFunc)OceffSpot_Update, + (ActorFunc)OceffSpot_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Spot_0x80972680/func_80972680.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Spot_0x80972680/OceffSpot_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Spot_0x80972680/OceffSpot_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Spot_0x80972680/func_80972844.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Spot_0x80972680/func_809728F8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Spot_0x80972680/func_80972934.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Spot_0x80972680/OceffSpot_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Spot_0x80972680/OceffSpot_Draw.asm") diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h new file mode 100644 index 0000000000..78b0e57724 --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h @@ -0,0 +1,15 @@ +#ifndef Z_OCEFF_SPOT_H +#define Z_OCEFF_SPOT_H + +#include + +struct OceffSpot; + +typedef struct OceffSpot { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x34]; +} OceffSpot; // size = 0x178 + +extern const ActorInit Oceff_Spot_InitVars; + +#endif // Z_OCEFF_SPOT_H diff --git a/src/overlays/actors/ovl_Oceff_Storm/overlay.cfg b/src/overlays/actors/ovl_Oceff_Storm/overlay.cfg new file mode 100644 index 0000000000..6845a11171 --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Storm/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Oceff_Storm +z_oceff_storm.c diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c new file mode 100644 index 0000000000..853b301201 --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -0,0 +1,42 @@ +#include "z_oceff_storm.h" + +#define FLAGS 0x02000030 + +#define THIS ((OceffStorm*)thisx) + +void OceffStorm_Init(Actor* thisx, GlobalContext* globalCtx); +void OceffStorm_Destroy(Actor* thisx, GlobalContext* globalCtx); +void OceffStorm_Update(Actor* thisx, GlobalContext* globalCtx); +void OceffStorm_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Oceff_Storm_InitVars = { + ACTOR_OCEFF_STORM, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(OceffStorm), + (ActorFunc)OceffStorm_Init, + (ActorFunc)OceffStorm_Destroy, + (ActorFunc)OceffStorm_Update, + (ActorFunc)OceffStorm_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Storm_0x80981760/func_80981760.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Storm_0x80981760/func_8098176C.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Storm_0x80981760/OceffStorm_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Storm_0x80981760/OceffStorm_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Storm_0x80981760/func_80981928.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Storm_0x80981760/func_80981B48.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Storm_0x80981760/OceffStorm_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Storm_0x80981760/func_80981BB8.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Storm_0x80981760/OceffStorm_Draw.asm") diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h new file mode 100644 index 0000000000..e92a293b8d --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h @@ -0,0 +1,15 @@ +#ifndef Z_OCEFF_STORM_H +#define Z_OCEFF_STORM_H + +#include + +struct OceffStorm; + +typedef struct OceffStorm { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0xC]; +} OceffStorm; // size = 0x150 + +extern const ActorInit Oceff_Storm_InitVars; + +#endif // Z_OCEFF_STORM_H diff --git a/src/overlays/actors/ovl_Oceff_Wipe/overlay.cfg b/src/overlays/actors/ovl_Oceff_Wipe/overlay.cfg new file mode 100644 index 0000000000..c10e855cf6 --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Wipe/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Oceff_Wipe +z_oceff_wipe.c diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c new file mode 100644 index 0000000000..346679d264 --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -0,0 +1,32 @@ +#include "z_oceff_wipe.h" + +#define FLAGS 0x02000010 + +#define THIS ((OceffWipe*)thisx) + +void OceffWipe_Init(Actor* thisx, GlobalContext* globalCtx); +void OceffWipe_Destroy(Actor* thisx, GlobalContext* globalCtx); +void OceffWipe_Update(Actor* thisx, GlobalContext* globalCtx); +void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Oceff_Wipe_InitVars = { + ACTOR_OCEFF_WIPE, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(OceffWipe), + (ActorFunc)OceffWipe_Init, + (ActorFunc)OceffWipe_Destroy, + (ActorFunc)OceffWipe_Update, + (ActorFunc)OceffWipe_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe_0x809764B0/OceffWipe_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe_0x809764B0/OceffWipe_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe_0x809764B0/OceffWipe_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe_0x809764B0/OceffWipe_Draw.asm") diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h new file mode 100644 index 0000000000..0c32f47252 --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h @@ -0,0 +1,15 @@ +#ifndef Z_OCEFF_WIPE_H +#define Z_OCEFF_WIPE_H + +#include + +struct OceffWipe; + +typedef struct OceffWipe { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4]; +} OceffWipe; // size = 0x148 + +extern const ActorInit Oceff_Wipe_InitVars; + +#endif // Z_OCEFF_WIPE_H diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/overlay.cfg b/src/overlays/actors/ovl_Oceff_Wipe2/overlay.cfg new file mode 100644 index 0000000000..a8d56b9bba --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Wipe2/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Oceff_Wipe2 +z_oceff_wipe2.c diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c new file mode 100644 index 0000000000..522ccb83ed --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -0,0 +1,32 @@ +#include "z_oceff_wipe2.h" + +#define FLAGS 0x02000010 + +#define THIS ((OceffWipe2*)thisx) + +void OceffWipe2_Init(Actor* thisx, GlobalContext* globalCtx); +void OceffWipe2_Destroy(Actor* thisx, GlobalContext* globalCtx); +void OceffWipe2_Update(Actor* thisx, GlobalContext* globalCtx); +void OceffWipe2_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Oceff_Wipe2_InitVars = { + ACTOR_OCEFF_WIPE2, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(OceffWipe2), + (ActorFunc)OceffWipe2_Init, + (ActorFunc)OceffWipe2_Destroy, + (ActorFunc)OceffWipe2_Update, + (ActorFunc)OceffWipe2_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe2_0x80986270/OceffWipe2_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe2_0x80986270/OceffWipe2_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe2_0x80986270/OceffWipe2_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe2_0x80986270/OceffWipe2_Draw.asm") diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h new file mode 100644 index 0000000000..96a1128d89 --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h @@ -0,0 +1,15 @@ +#ifndef Z_OCEFF_WIPE2_H +#define Z_OCEFF_WIPE2_H + +#include + +struct OceffWipe2; + +typedef struct OceffWipe2 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4]; +} OceffWipe2; // size = 0x148 + +extern const ActorInit Oceff_Wipe2_InitVars; + +#endif // Z_OCEFF_WIPE2_H diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/overlay.cfg b/src/overlays/actors/ovl_Oceff_Wipe3/overlay.cfg new file mode 100644 index 0000000000..5aca74d993 --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Wipe3/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Oceff_Wipe3 +z_oceff_wipe3.c diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c new file mode 100644 index 0000000000..ba998a4fbb --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -0,0 +1,32 @@ +#include "z_oceff_wipe3.h" + +#define FLAGS 0x02000010 + +#define THIS ((OceffWipe3*)thisx) + +void OceffWipe3_Init(Actor* thisx, GlobalContext* globalCtx); +void OceffWipe3_Destroy(Actor* thisx, GlobalContext* globalCtx); +void OceffWipe3_Update(Actor* thisx, GlobalContext* globalCtx); +void OceffWipe3_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Oceff_Wipe3_InitVars = { + ACTOR_OCEFF_WIPE3, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(OceffWipe3), + (ActorFunc)OceffWipe3_Init, + (ActorFunc)OceffWipe3_Destroy, + (ActorFunc)OceffWipe3_Update, + (ActorFunc)OceffWipe3_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe3_0x809879E0/OceffWipe3_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe3_0x809879E0/OceffWipe3_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe3_0x809879E0/OceffWipe3_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe3_0x809879E0/OceffWipe3_Draw.asm") diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h new file mode 100644 index 0000000000..af65f7a023 --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h @@ -0,0 +1,15 @@ +#ifndef Z_OCEFF_WIPE3_H +#define Z_OCEFF_WIPE3_H + +#include + +struct OceffWipe3; + +typedef struct OceffWipe3 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4]; +} OceffWipe3; // size = 0x148 + +extern const ActorInit Oceff_Wipe3_InitVars; + +#endif // Z_OCEFF_WIPE3_H diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/overlay.cfg b/src/overlays/actors/ovl_Oceff_Wipe4/overlay.cfg new file mode 100644 index 0000000000..64cd25b042 --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Wipe4/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Oceff_Wipe4 +z_oceff_wipe4.c diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c new file mode 100644 index 0000000000..b1762d95e0 --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -0,0 +1,32 @@ +#include "z_oceff_wipe4.h" + +#define FLAGS 0x02000010 + +#define THIS ((OceffWipe4*)thisx) + +void OceffWipe4_Init(Actor* thisx, GlobalContext* globalCtx); +void OceffWipe4_Destroy(Actor* thisx, GlobalContext* globalCtx); +void OceffWipe4_Update(Actor* thisx, GlobalContext* globalCtx); +void OceffWipe4_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Oceff_Wipe4_InitVars = { + ACTOR_OCEFF_WIPE4, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(OceffWipe4), + (ActorFunc)OceffWipe4_Init, + (ActorFunc)OceffWipe4_Destroy, + (ActorFunc)OceffWipe4_Update, + (ActorFunc)OceffWipe4_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe4_0x8099D780/OceffWipe4_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe4_0x8099D780/OceffWipe4_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe4_0x8099D780/OceffWipe4_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe4_0x8099D780/OceffWipe4_Draw.asm") diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h new file mode 100644 index 0000000000..d144a5a964 --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h @@ -0,0 +1,15 @@ +#ifndef Z_OCEFF_WIPE4_H +#define Z_OCEFF_WIPE4_H + +#include + +struct OceffWipe4; + +typedef struct OceffWipe4 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4]; +} OceffWipe4; // size = 0x148 + +extern const ActorInit Oceff_Wipe4_InitVars; + +#endif // Z_OCEFF_WIPE4_H diff --git a/src/overlays/actors/ovl_Oceff_Wipe5/overlay.cfg b/src/overlays/actors/ovl_Oceff_Wipe5/overlay.cfg new file mode 100644 index 0000000000..274c53c0fc --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Wipe5/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Oceff_Wipe5 +z_oceff_wipe5.c diff --git a/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c b/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c new file mode 100644 index 0000000000..7064a6f229 --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c @@ -0,0 +1,32 @@ +#include "z_oceff_wipe5.h" + +#define FLAGS 0x02000010 + +#define THIS ((OceffWipe5*)thisx) + +void OceffWipe5_Init(Actor* thisx, GlobalContext* globalCtx); +void OceffWipe5_Destroy(Actor* thisx, GlobalContext* globalCtx); +void OceffWipe5_Update(Actor* thisx, GlobalContext* globalCtx); +void OceffWipe5_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Oceff_Wipe5_InitVars = { + ACTOR_OCEFF_WIPE5, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(OceffWipe5), + (ActorFunc)OceffWipe5_Init, + (ActorFunc)OceffWipe5_Destroy, + (ActorFunc)OceffWipe5_Update, + (ActorFunc)OceffWipe5_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe5_0x80BC7AD0/OceffWipe5_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe5_0x80BC7AD0/OceffWipe5_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe5_0x80BC7AD0/OceffWipe5_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe5_0x80BC7AD0/OceffWipe5_Draw.asm") diff --git a/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.h b/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.h new file mode 100644 index 0000000000..a6e368a49b --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.h @@ -0,0 +1,15 @@ +#ifndef Z_OCEFF_WIPE5_H +#define Z_OCEFF_WIPE5_H + +#include + +struct OceffWipe5; + +typedef struct OceffWipe5 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4]; +} OceffWipe5; // size = 0x148 + +extern const ActorInit Oceff_Wipe5_InitVars; + +#endif // Z_OCEFF_WIPE5_H diff --git a/src/overlays/actors/ovl_Oceff_Wipe6/overlay.cfg b/src/overlays/actors/ovl_Oceff_Wipe6/overlay.cfg new file mode 100644 index 0000000000..722d519790 --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Wipe6/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Oceff_Wipe6 +z_oceff_wipe6.c diff --git a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c new file mode 100644 index 0000000000..bcf3b611c3 --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c @@ -0,0 +1,32 @@ +#include "z_oceff_wipe6.h" + +#define FLAGS 0x02000010 + +#define THIS ((OceffWipe6*)thisx) + +void OceffWipe6_Init(Actor* thisx, GlobalContext* globalCtx); +void OceffWipe6_Destroy(Actor* thisx, GlobalContext* globalCtx); +void OceffWipe6_Update(Actor* thisx, GlobalContext* globalCtx); +void OceffWipe6_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Oceff_Wipe6_InitVars = { + ACTOR_OCEFF_WIPE6, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(OceffWipe6), + (ActorFunc)OceffWipe6_Init, + (ActorFunc)OceffWipe6_Destroy, + (ActorFunc)OceffWipe6_Update, + (ActorFunc)OceffWipe6_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe6_0x80BCA5A0/OceffWipe6_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe6_0x80BCA5A0/OceffWipe6_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe6_0x80BCA5A0/OceffWipe6_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe6_0x80BCA5A0/OceffWipe6_Draw.asm") diff --git a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.h b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.h new file mode 100644 index 0000000000..2fc4bf1165 --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.h @@ -0,0 +1,15 @@ +#ifndef Z_OCEFF_WIPE6_H +#define Z_OCEFF_WIPE6_H + +#include + +struct OceffWipe6; + +typedef struct OceffWipe6 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4]; +} OceffWipe6; // size = 0x148 + +extern const ActorInit Oceff_Wipe6_InitVars; + +#endif // Z_OCEFF_WIPE6_H diff --git a/src/overlays/actors/ovl_Oceff_Wipe7/overlay.cfg b/src/overlays/actors/ovl_Oceff_Wipe7/overlay.cfg new file mode 100644 index 0000000000..0956cdd61b --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Wipe7/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Oceff_Wipe7 +z_oceff_wipe7.c diff --git a/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c b/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c new file mode 100644 index 0000000000..b75c9c5fb7 --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c @@ -0,0 +1,32 @@ +#include "z_oceff_wipe7.h" + +#define FLAGS 0x02000010 + +#define THIS ((OceffWipe7*)thisx) + +void OceffWipe7_Init(Actor* thisx, GlobalContext* globalCtx); +void OceffWipe7_Destroy(Actor* thisx, GlobalContext* globalCtx); +void OceffWipe7_Update(Actor* thisx, GlobalContext* globalCtx); +void OceffWipe7_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Oceff_Wipe7_InitVars = { + ACTOR_OCEFF_WIPE7, + ACTORTYPE_ITEMACTION, + FLAGS, + GAMEPLAY_KEEP, + sizeof(OceffWipe7), + (ActorFunc)OceffWipe7_Init, + (ActorFunc)OceffWipe7_Destroy, + (ActorFunc)OceffWipe7_Update, + (ActorFunc)OceffWipe7_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe7_0x80BCDCB0/OceffWipe7_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe7_0x80BCDCB0/OceffWipe7_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe7_0x80BCDCB0/OceffWipe7_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Oceff_Wipe7_0x80BCDCB0/OceffWipe7_Draw.asm") diff --git a/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.h b/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.h new file mode 100644 index 0000000000..daf5380988 --- /dev/null +++ b/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.h @@ -0,0 +1,15 @@ +#ifndef Z_OCEFF_WIPE7_H +#define Z_OCEFF_WIPE7_H + +#include + +struct OceffWipe7; + +typedef struct OceffWipe7 { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4]; +} OceffWipe7; // size = 0x148 + +extern const ActorInit Oceff_Wipe7_InitVars; + +#endif // Z_OCEFF_WIPE7_H diff --git a/src/overlays/actors/ovl_Shot_Sun/overlay.cfg b/src/overlays/actors/ovl_Shot_Sun/overlay.cfg new file mode 100644 index 0000000000..bd210022d0 --- /dev/null +++ b/src/overlays/actors/ovl_Shot_Sun/overlay.cfg @@ -0,0 +1,2 @@ +ovl_Shot_Sun +z_shot_sun.c diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c new file mode 100644 index 0000000000..dbdcda9309 --- /dev/null +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -0,0 +1,37 @@ +#include "z_shot_sun.h" + +#define FLAGS 0x00000009 + +#define THIS ((ShotSun*)thisx) + +void ShotSun_Init(Actor* thisx, GlobalContext* globalCtx); +void ShotSun_Destroy(Actor* thisx, GlobalContext* globalCtx); +void ShotSun_Update(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit Shot_Sun_InitVars = { + ACTOR_SHOT_SUN, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(ShotSun), + (ActorFunc)ShotSun_Init, + (ActorFunc)ShotSun_Destroy, + (ActorFunc)ShotSun_Update, + (ActorFunc)NULL +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_Shot_Sun_0x80973640/ShotSun_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Shot_Sun_0x80973640/ShotSun_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Shot_Sun_0x80973640/func_80973740.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Shot_Sun_0x80973640/func_80973804.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Shot_Sun_0x80973640/func_809738D0.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Shot_Sun_0x80973640/func_80973960.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_Shot_Sun_0x80973640/ShotSun_Update.asm") diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h new file mode 100644 index 0000000000..cfd8babe48 --- /dev/null +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h @@ -0,0 +1,15 @@ +#ifndef Z_SHOT_SUN_H +#define Z_SHOT_SUN_H + +#include + +struct ShotSun; + +typedef struct ShotSun { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x5C]; +} ShotSun; // size = 0x1A0 + +extern const ActorInit Shot_Sun_InitVars; + +#endif // Z_SHOT_SUN_H diff --git a/src/overlays/actors/ovl_TG_Sw/overlay.cfg b/src/overlays/actors/ovl_TG_Sw/overlay.cfg new file mode 100644 index 0000000000..d0341bf095 --- /dev/null +++ b/src/overlays/actors/ovl_TG_Sw/overlay.cfg @@ -0,0 +1,2 @@ +ovl_TG_Sw +z_tg_sw.c diff --git a/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c b/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c new file mode 100644 index 0000000000..90580a6a49 --- /dev/null +++ b/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c @@ -0,0 +1,36 @@ +#include "z_tg_sw.h" + +#define FLAGS 0x00000010 + +#define THIS ((TGSw*)thisx) + +void TGSw_Init(Actor* thisx, GlobalContext* globalCtx); +void TGSw_Destroy(Actor* thisx, GlobalContext* globalCtx); +void TGSw_Update(Actor* thisx, GlobalContext* globalCtx); +void TGSw_Draw(Actor* thisx, GlobalContext* globalCtx); + +/* +const ActorInit TG_Sw_InitVars = { + ACTOR_TG_SW, + ACTORTYPE_PROP, + FLAGS, + GAMEPLAY_KEEP, + sizeof(TGSw), + (ActorFunc)TGSw_Init, + (ActorFunc)TGSw_Destroy, + (ActorFunc)TGSw_Update, + (ActorFunc)TGSw_Draw +}; +*/ + +GLOBAL_ASM("asm/non_matchings/ovl_TG_Sw_0x80B19F60/func_80B19F60.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_TG_Sw_0x80B19F60/func_80B1A008.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_TG_Sw_0x80B19F60/TGSw_Init.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_TG_Sw_0x80B19F60/TGSw_Destroy.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_TG_Sw_0x80B19F60/TGSw_Update.asm") + +GLOBAL_ASM("asm/non_matchings/ovl_TG_Sw_0x80B19F60/TGSw_Draw.asm") diff --git a/src/overlays/actors/ovl_TG_Sw/z_tg_sw.h b/src/overlays/actors/ovl_TG_Sw/z_tg_sw.h new file mode 100644 index 0000000000..5eea5a3b74 --- /dev/null +++ b/src/overlays/actors/ovl_TG_Sw/z_tg_sw.h @@ -0,0 +1,15 @@ +#ifndef Z_TG_SW_H +#define Z_TG_SW_H + +#include + +struct TGSw; + +typedef struct TGSw { + /* 0x000 */ Actor actor; + /* 0x144 */ char unk_144[0x4]; +} TGSw; // size = 0x148 + +extern const ActorInit TG_Sw_InitVars; + +#endif // Z_TG_SW_H diff --git a/tables/files_with_nonmatching.txt b/tables/files_with_nonmatching.txt index f31bb23c78..899251880b 100644 --- a/tables/files_with_nonmatching.txt +++ b/tables/files_with_nonmatching.txt @@ -20,3 +20,573 @@ z_scene z_view z_rcp z_prenmi +ovl_En_Test_0x80862B70 +ovl_En_GirlA_0x80863870 +ovl_En_Part_0x80865370 +ovl_En_Light_0x80865990 +ovl_En_Door_0x80866800 +ovl_En_Box_0x80867BD0 +ovl_En_Pametfrog_0x80869D90 +ovl_En_Okuta_0x8086DE20 +ovl_En_Bom_0x80870DB0 +ovl_En_Wallmas_0x80874810 +ovl_En_Dodongo_0x80876670 +ovl_En_Firefly_0x808796F0 +ovl_En_Horse_0x8087B730 +ovl_En_Arrow_0x8088A240 +ovl_En_Elf_0x8088C510 +ovl_En_Niw_0x80891060 +ovl_En_Tite_0x808937F0 +ovl_En_Peehat_0x80896F30 +ovl_En_Butte_0x8091C0A0 +ovl_En_Insect_0x8091A8A0 +ovl_En_Fish_0x8091D630 +ovl_En_Holl_0x80899960 +ovl_En_Dinofos_0x8089A6E0 +ovl_En_Hata_0x8089E8E0 +ovl_En_Zl1_0x8089ED90 +ovl_En_Viewer_0x8089EE20 +ovl_En_Bubble_0x8089F4E0 +ovl_Door_Shutter_0x808A08F0 +ovl_En_Boom_0x808A24D0 +ovl_En_Torch2_0x808A31B0 +ovl_En_Minifrog_0x808A3670 +ovl_En_St_0x808A5050 +ovl_Obj_Wturn_0x808A7930 +ovl_En_River_Sound_0x808A7E30 +ovl_En_Ossan_0x808A80A0 +ovl_En_Famos_0x808AC920 +ovl_En_Bombf_0x808AE8C0 +ovl_En_Am_0x808AFCD0 +ovl_En_Dekubaba_0x808B1330 +ovl_En_M_Fire1_0x808B5230 +ovl_En_M_Thunder_0x808B53C0 +ovl_Bg_Breakwall_0x808B7360 +ovl_Door_Warp1_0x808B8490 +ovl_Obj_Syokudai_0x808BC010 +ovl_Item_B_Heart_0x808BCDF0 +ovl_En_Dekunuts_0x808BD1E0 +ovl_En_Bbfall_0x808BF220 +ovl_Arms_Hook_0x808C1030 +ovl_En_Bb_0x808C1D40 +ovl_Bg_Keikoku_Spr_0x808C3A50 +ovl_En_Wood02_0x808C3C00 +ovl_En_Death_0x808C4F80 +ovl_En_Minideath_0x808CA0B0 +ovl_En_Vm_0x808CC260 +ovl_Demo_Effect_0x808CD740 +ovl_Demo_Kankyo_0x808CE450 +ovl_En_Floormas_0x808D0680 +ovl_En_Rd_0x808D3E20 +ovl_Bg_F40_Flift_0x808D7550 +ovl_Obj_Mure_0x808D78D0 +ovl_En_Sw_0x808D8940 +ovl_Object_Kankyo_0x808DBE80 +ovl_En_Horse_Link_Child_0x808DE5C0 +ovl_Door_Ana_0x808E01A0 +ovl_En_Encount1_0x808E0830 +ovl_Demo_Tre_Lgt_0x808E0E40 +ovl_En_Encount2_0x808E1560 +ovl_En_Fire_Rock_0x808E1FE0 +ovl_Bg_Ctower_Rot_0x808E2070 +ovl_Mir_Ray_0x808E2600 +ovl_En_Sb_0x808E3EF0 +ovl_En_Bigslime_0x808E4FC0 +ovl_En_Karebaba_0x808F1200 +ovl_En_In_0x808F30B0 +ovl_En_Ru_0x80A389A0 +ovl_En_Bom_Chu_0x808F74B0 +ovl_En_Horse_Game_Check_0x808F8AA0 +ovl_En_Rr_0x808F9E00 +ovl_En_Fr_0x808FC550 +ovl_Obj_Oshihiki_0x80917290 +ovl_Eff_Dust_0x80918B40 +ovl_Bg_Umajump_0x80919F30 +ovl_Arrow_Fire_0x80920340 +ovl_Arrow_Ice_0x80922430 +ovl_Arrow_Light_0x80924300 +ovl_Item_Etcetera_0x8091FEF0 +ovl_Obj_Kibako_0x809261B0 +ovl_Obj_Tsubo_0x809275C0 +ovl_En_Ik_0x80929910 +ovl_Demo_Shd_0x8092C530 +ovl_En_Dns_0x8092C5C0 +ovl_Elf_Msg_0x8092DF90 +ovl_En_Honotrap_0x8092E510 +ovl_En_Tubo_Trap_0x809307E0 +ovl_Obj_Ice_Poly_0x80931560 +ovl_En_Fz_0x80932490 +ovl_En_Kusa_0x809349E0 +ovl_Obj_Bean_0x80936CF0 +ovl_Obj_Bombiwa_0x809393B0 +ovl_Obj_Switch_0x8093ABD0 +ovl_Obj_Lift_0x8093D3C0 +ovl_Obj_Hsblock_0x8093DEA0 +ovl_En_Okarina_Tag_0x8093E420 +ovl_En_Goroiwa_0x8093E8A0 +ovl_En_Daiku_0x809434B0 +ovl_En_Nwc_0x809441E0 +ovl_Item_Inbox_0x809454F0 +ovl_En_Ge1_0x80945650 +ovl_Obj_Blockstop_0x809466A0 +ovl_En_Sda_0x809468D0 +ovl_En_Clear_Tag_0x80947F60 +ovl_En_Gm_0x8094DEE0 +ovl_En_Ms_0x80952620 +ovl_En_Hs_0x80952C50 +ovl_Bg_Ingate_0x80953A90 +ovl_En_Kanban_0x80954960 +ovl_En_Attack_Niw_0x809580C0 +ovl_En_Mk_0x809592E0 +ovl_En_Owl_0x8095A510 +ovl_En_Ishi_0x8095D6E0 +ovl_Obj_Hana_0x8095FB10 +ovl_Obj_Lightswitch_0x8095FBF0 +ovl_Obj_Mure2_0x80960CF0 +ovl_En_Fu_0x809616E0 +ovl_En_Stream_0x80965650 +ovl_En_Mm_0x80965BB0 +ovl_En_Weather_Tag_0x80966410 +ovl_En_Ani_0x809679D0 +ovl_En_Js_0x809687B0 +ovl_En_Okarina_Effect_0x8096B0A0 +ovl_En_Mag_0x8096B310 +ovl_Elf_Msg2_0x8096EC40 +ovl_Bg_F40_Swlift_0x8096F160 +ovl_En_Kakasi_0x8096F5E0 +ovl_Obj_Makeoshihiki_0x80972350 +ovl_Oceff_Spot_0x80972680 +ovl_En_Torch_0x80973550 +ovl_Shot_Sun_0x80973640 +ovl_Obj_Roomtimer_0x80973C50 +ovl_En_Ssh_0x80973EF0 +ovl_Oceff_Wipe_0x809764B0 +ovl_Oceff_Storm_0x80981760 +ovl_Obj_Demo_0x80983520 +ovl_En_Minislime_0x809838F0 +ovl_En_Nutsball_0x80985C40 +ovl_Oceff_Wipe2_0x80986270 +ovl_Oceff_Wipe3_0x809879E0 +ovl_En_Dg_0x80989140 +ovl_En_Si_0x8098CA20 +ovl_Obj_Comb_0x8098CE40 +ovl_Obj_Kibako2_0x8098E5C0 +ovl_En_Hs2_0x8098EF60 +ovl_Obj_Mure3_0x8098F040 +ovl_En_Tg_0x8098F800 +ovl_En_Wf_0x80990310 +ovl_En_Skb_0x809947B0 +ovl_En_Gs_0x80997A90 +ovl_Obj_Sound_0x8099A920 +ovl_En_Crow_0x8099AB30 +ovl_En_Cow_0x8099C290 +ovl_Oceff_Wipe4_0x8099D780 +ovl_En_Zo_0x8099E790 +ovl_Obj_Makekinsuta_0x8099FA40 +ovl_En_Ge3_0x8099FEB0 +ovl_Obj_Hamishi_0x809A0F20 +ovl_En_Zl4_0x809A1BB0 +ovl_En_Mm2_0x809A2030 +ovl_Door_Spiral_0x809A2B60 +ovl_Obj_Pzlblock_0x809A33E0 +ovl_Obj_Toge_0x809A41C0 +ovl_Obj_Armos_0x809A4E00 +ovl_Obj_Boyo_0x809A5D10 +ovl_En_Grasshopper_0x809A6280 +ovl_Obj_Grass_0x809A9110 +ovl_Obj_Grass_Carry_0x809AAE60 +ovl_Obj_Grass_Unit_0x809ABDE0 +ovl_Bg_Fire_Wall_0x809AC4B0 +ovl_En_Bu_0x809ACD90 +ovl_En_Encount3_0x809ACF40 +ovl_En_Jso_0x809AD8E0 +ovl_Obj_Chikuwa_0x809B1550 +ovl_En_Knight_0x809B20F0 +ovl_En_Warp_tag_0x809C0760 +ovl_En_Aob_01_0x809C10B0 +ovl_En_Boj_01_0x809C3D80 +ovl_En_Boj_02_0x809C3E10 +ovl_En_Boj_03_0x809C3EA0 +ovl_En_Encount4_0x809C3F30 +ovl_En_Bom_Bowl_Man_0x809C4790 +ovl_En_Syateki_Man_0x809C64C0 +ovl_Bg_Icicle_0x809C9A60 +ovl_En_Syateki_Crow_0x809CA3F0 +ovl_En_Boj_04_0x809CB200 +ovl_En_Cne_01_0x809CB290 +ovl_En_Bba_01_0x809CC060 +ovl_En_Bji_01_0x809CCDE0 +ovl_Bg_Spdweb_0x809CDEC0 +ovl_En_Mt_tag_0x809CF350 +ovl_Boss_01_0x809D0530 +ovl_Boss_02_0x809DA1D0 +ovl_Boss_03_0x809E2760 +ovl_Boss_04_0x809EC040 +ovl_Boss_05_0x809EE4E0 +ovl_Boss_06_0x809F2120 +ovl_Boss_07_0x809F4980 +ovl_Bg_Dy_Yoseizo_0x80A0A8A0 +ovl_En_Boj_05_0x80A0C780 +ovl_En_Sob1_0x80A0C810 +ovl_En_Go_0x80A10FD0 +ovl_En_Raf_0x80A16D40 +ovl_Obj_Funen_0x80A19740 +ovl_Obj_Raillift_0x80A19910 +ovl_Bg_Numa_Hana_0x80A1A500 +ovl_Obj_Flowerpot_0x80A1B3D0 +ovl_Obj_Spinyroll_0x80A1DA50 +ovl_Dm_Hina_0x80A1F410 +ovl_En_Syateki_Wf_0x80A1FE50 +ovl_Obj_Skateblock_0x80A21150 +ovl_Obj_Iceblock_0x80A23090 +ovl_En_Bigpamet_0x80A27520 +ovl_En_Syateki_Dekunuts_0x80A2BC00 +ovl_Elf_Msg3_0x80A2CD10 +ovl_En_Fg_0x80A2D280 +ovl_Dm_Ravine_0x80A2E7A0 +ovl_Dm_Sa_0x80A2E960 +ovl_En_Slime_0x80A2EDA0 +ovl_En_Pr_0x80A32210 +ovl_Obj_Toudai_0x80A33B00 +ovl_Obj_Entotu_0x80A34700 +ovl_Obj_Bell_0x80A35510 +ovl_En_Syateki_Okuta_0x80A35FF0 +ovl_Obj_Shutter_0x80A37ED0 +ovl_Dm_Zl_0x80A38190 +ovl_En_Elfgrp_0x80A396B0 +ovl_Dm_Tsg_0x80A3AC60 +ovl_En_Baguo_0x80A3B080 +ovl_Obj_Vspinyroll_0x80A3C4E0 +ovl_Obj_Smork_0x80A3D680 +ovl_En_Test2_0x80A3E390 +ovl_En_Test3_0x80A3E7E0 +ovl_En_Test4_0x80A41D70 +ovl_En_Bat_0x80A434E0 +ovl_En_Sekihi_0x80A44C80 +ovl_En_Wiz_0x80A45360 +ovl_En_Wiz_Brock_0x80A48FE0 +ovl_En_Wiz_Fire_0x80A496A0 +ovl_Eff_Change_0x80A4C490 +ovl_Dm_Statue_0x80A4C9B0 +ovl_Obj_Fireshield_0x80A4CA90 +ovl_Bg_Ladder_0x80A4D9F0 +ovl_En_Mkk_0x80A4DED0 +ovl_Demo_Getitem_0x80A4FA40 +ovl_En_Dnb_0x80A4FDD0 +ovl_En_Dnh_0x80A50D40 +ovl_En_Dnk_0x80A514F0 +ovl_En_Dnq_0x80A52530 +ovl_Bg_Keikoku_Saku_0x80A537D0 +ovl_Obj_Hugebombiwa_0x80A53BE0 +ovl_En_Firefly2_0x80A560C0 +ovl_En_Rat_0x80A56150 +ovl_En_Water_Effect_0x80A587A0 +ovl_En_Kusa2_0x80A5B160 +ovl_Bg_Spout_Fire_0x80A60B20 +ovl_Bg_Dblue_Movebg_0x80A29A80 +ovl_En_Dy_Extra_0x80A612B0 +ovl_En_Bal_0x80A61810 +ovl_En_Ginko_Man_0x80A644A0 +ovl_En_Warp_Uzu_0x80A66180 +ovl_Obj_Driftice_0x80A66570 +ovl_En_Look_Nuts_0x80A678B0 +ovl_En_Mushi2_0x80A687A0 +ovl_En_Fall_0x80A6BF90 +ovl_En_Mm3_0x80A6F0A0 +ovl_Bg_Crace_Movebg_0x80A706F0 +ovl_En_Dno_0x80A711D0 +ovl_En_Pr2_0x80A73FA0 +ovl_En_Prz_0x80A75DC0 +ovl_En_Jso2_0x80A773C0 +ovl_Obj_Etcetera_0x80A7BC70 +ovl_En_Egol_0x80A7C990 +ovl_Obj_Mine_0x80A811D0 +ovl_Obj_Purify_0x80A84CD0 +ovl_En_Tru_0x80A85620 +ovl_En_Trt_0x80A8B770 +ovl_En_Test5_0x80A903B0 +ovl_En_Test6_0x80A90730 +ovl_En_Az_0x80A94A30 +ovl_En_Estone_0x80A99EA0 +ovl_Bg_Hakugin_Post_0x80A9ACD0 +ovl_Dm_Opstage_0x80A9F950 +ovl_Dm_Stk_0x80A9FDB0 +ovl_Dm_Char00_0x80AA5580 +ovl_Dm_Char01_0x80AA81E0 +ovl_Dm_Char02_0x80AAAE30 +ovl_Dm_Char03_0x80AAB4A0 +ovl_Dm_Char04_0x80AABC40 +ovl_Dm_Char05_0x80AAC5A0 +ovl_Dm_Char06_0x80AAE680 +ovl_Dm_Char07_0x80AAE9C0 +ovl_Dm_Char08_0x80AAF050 +ovl_Dm_Char09_0x80AB1E10 +ovl_Obj_Tokeidai_0x80AB2790 +ovl_En_Mnk_0x80AB4D10 +ovl_En_Egblock_0x80ABA7A0 +ovl_En_Guard_Nuts_0x80ABB0E0 +ovl_Bg_Hakugin_Bombwall_0x80ABBFC0 +ovl_Obj_Tokei_Tobira_0x80ABD1D0 +ovl_Bg_Hakugin_Elvpole_0x80ABD830 +ovl_En_Ma4_0x80ABDCA0 +ovl_En_Twig_0x80AC0830 +ovl_En_Po_Fusen_0x80AC1270 +ovl_En_Door_Etc_0x80AC1ED0 +ovl_En_Bigokuta_0x80AC26F0 +ovl_Bg_Icefloe_0x80AC48F0 +ovl_Obj_Ocarinalift_0x80AC94C0 +ovl_En_Time_Tag_0x80AC9EA0 +ovl_Bg_Open_Shutter_0x80ACAB10 +ovl_Bg_Open_Spot_0x80ACB1E0 +ovl_Obj_Aqua_0x80ACB6A0 +ovl_En_Elforg_0x80ACC470 +ovl_En_Elfbub_0x80ACDCD0 +ovl_En_Fu_Mato_0x80ACE330 +ovl_En_Fu_Kago_0x80ACF780 +ovl_En_Osn_0x80AD0830 +ovl_Bg_Ctower_Gear_0x80AD2B70 +ovl_En_Trt2_0x80AD3380 +ovl_Obj_Tokei_Step_0x80AD5BB0 +ovl_Bg_Lotus_0x80AD6760 +ovl_En_Kame_0x80AD6DD0 +ovl_Obj_Takaraya_Wall_0x80AD9240 +ovl_Bg_Fu_Mizu_0x80ADAAF0 +ovl_En_Sellnuts_0x80ADADD0 +ovl_Bg_Dkjail_Ivy_0x80ADE230 +ovl_Obj_Visiblock_0x80ADEA70 +ovl_En_Takaraya_0x80ADEB90 +ovl_En_Tsn_0x80ADFCA0 +ovl_En_Ds2n_0x80AE1650 +ovl_En_Fsn_0x80AE1B70 +ovl_En_Shn_0x80AE6130 +ovl_En_Stop_heishi_0x80AE73A0 +ovl_Obj_Bigicicle_0x80AE8B70 +ovl_En_Lift_Nuts_0x80AE9A20 +ovl_En_Tk_0x80AEC460 +ovl_Bg_Market_Step_0x80AF0060 +ovl_Obj_Lupygamelift_0x80AF0170 +ovl_En_Test7_0x80AF0820 +ovl_Obj_Lightblock_0x80AF3910 +ovl_Mir_Ray2_0x80AF3F70 +ovl_En_Wdhand_0x80AF43F0 +ovl_En_Gamelupy_0x80AF6760 +ovl_Bg_Danpei_Movebg_0x80AF6DE0 +ovl_En_Snowwd_0x80AF7640 +ovl_En_Pm_0x80AF7B40 +ovl_En_Gakufu_0x80AFC960 +ovl_Elf_Msg4_0x80AFD380 +ovl_Elf_Msg5_0x80AFD990 +ovl_En_Col_Man_0x80AFDC40 +ovl_En_Talk_Gibud_0x80AFE8A0 +ovl_En_Giant_0x80B01990 +ovl_Obj_Snowball_0x80B02CD0 +ovl_Boss_Hakugin_0x80B05290 +ovl_En_Gb2_0x80B0F5E0 +ovl_En_Onpuman_0x80B11E60 +ovl_Bg_Tobira01_0x80B12430 +ovl_En_Tag_Obj_0x80B12870 +ovl_Obj_Dhouse_0x80B12980 +ovl_Obj_Hakaisi_0x80B14180 +ovl_Bg_Hakugin_Switch_0x80B15790 +ovl_En_Snowman_0x80B16B00 +ovl_TG_Sw_0x80B19F60 +ovl_En_Po_Sisters_0x80B1A3B0 +ovl_En_Pp_0x80B1DEB0 +ovl_En_Hakurock_0x80B21B00 +ovl_En_Hanabi_0x80B22C00 +ovl_Obj_Dowsing_0x80B23D50 +ovl_Obj_Wind_0x80B23ED0 +ovl_En_Racedog_0x80B24630 +ovl_En_Kendo_Js_0x80B262A0 +ovl_Bg_Botihasira_0x80B28080 +ovl_En_Fish2_0x80B28370 +ovl_En_Pst_0x80B2B830 +ovl_En_Poh_0x80B2C6F0 +ovl_Obj_Spidertent_0x80B2FB10 +ovl_En_Zoraegg_0x80B31590 +ovl_En_Kbt_0x80B33D30 +ovl_En_Gg_0x80B34F70 +ovl_En_Maruta_0x80B37080 +ovl_Obj_Snowball2_0x80B38E20 +ovl_En_Gg2_0x80B3AC50 +ovl_Obj_Ghaka_0x80B3C260 +ovl_En_Dnp_0x80B3CA20 +ovl_En_Dai_0x80B3DFF0 +ovl_Bg_Goron_Oyu_0x80B40080 +ovl_En_Kgy_0x80B40800 +ovl_En_Invadepoh_0x80B439B0 +ovl_En_Gk_0x80B50410 +ovl_En_An_0x80B53840 +ovl_En_Bee_0x80B5A720 +ovl_En_Ot_0x80B5B2E0 +ovl_En_Dragon_0x80B5E890 +ovl_Obj_Dora_0x80B60AD0 +ovl_En_Bigpo_0x80B615E0 +ovl_Obj_Kendo_Kanban_0x80B654C0 +ovl_Obj_Hariko_0x80B66A20 +ovl_En_Sth_0x80B66D30 +ovl_Bg_Sinkai_Kabe_0x80B6D660 +ovl_Bg_Haka_Curtain_0x80B6DBE0 +ovl_Bg_Kin2_Bombwall_0x80B6E020 +ovl_Bg_Kin2_Fence_0x80B6E820 +ovl_Bg_Kin2_Picture_0x80B6EFA0 +ovl_Bg_Kin2_Shelf_0x80B6FB30 +ovl_En_Rail_Skb_0x80B708C0 +ovl_En_Jg_0x80B73A90 +ovl_En_Tru_Mt_0x80B76030 +ovl_Obj_Um_0x80B77770 +ovl_En_Neo_Reeba_0x80B7C890 +ovl_Bg_Mbar_Chair_0x80B7E930 +ovl_Bg_Ikana_Block_0x80B7EA60 +ovl_Bg_Ikana_Mirror_0x80B7F730 +ovl_Bg_Ikana_Rotaryroom_0x80B802E0 +ovl_Bg_Dblue_Balance_0x80B823B0 +ovl_Bg_Dblue_Waterfall_0x80B83C80 +ovl_En_Kaizoku_0x80B85590 +ovl_En_Ge2_0x80B8B2D0 +ovl_En_Ma_Yts_0x80B8D030 +ovl_En_Ma_Yto_0x80B8E520 +ovl_Obj_Tokei_Turret_0x80B91CC0 +ovl_Bg_Dblue_Elevator_0x80B91F20 +ovl_Obj_Warpstone_0x80B92B10 +ovl_En_Zog_0x80B93310 +ovl_Obj_Rotlift_0x80B95E20 +ovl_Obj_Jg_Gakki_0x80B961E0 +ovl_Bg_Inibs_Movebg_0x80B96410 +ovl_En_Zot_0x80B965D0 +ovl_Obj_Tree_0x80B9A0B0 +ovl_Obj_Y2lift_0x80B9A650 +ovl_Obj_Y2shutter_0x80B9A980 +ovl_Obj_Boat_0x80B9AF50 +ovl_Obj_Taru_0x80B9B6E0 +ovl_Obj_Hunsui_0x80B9C450 +ovl_En_Jc_Mato_0x80B9DEE0 +ovl_Mir_Ray3_0x80B9E2C0 +ovl_En_Zob_0x80B9F570 +ovl_Elf_Msg6_0x80BA15A0 +ovl_Obj_Nozoki_0x80BA2420 +ovl_En_Toto_0x80BA36C0 +ovl_En_Railgibud_0x80BA5400 +ovl_En_Baba_0x80BA8820 +ovl_En_Suttari_0x80BAA6D0 +ovl_En_Zod_0x80BAEF70 +ovl_En_Kujiya_0x80BB08E0 +ovl_En_Geg_0x80BB16D0 +ovl_Obj_Kinoko_0x80BB4700 +ovl_Obj_Yasi_0x80BB4AF0 +ovl_En_Tanron1_0x80BB4E00 +ovl_En_Tanron2_0x80BB67D0 +ovl_En_Tanron3_0x80BB85A0 +ovl_Obj_Chan_0x80BB98E0 +ovl_En_Zos_0x80BBACA0 +ovl_En_S_Goro_0x80BBCA80 +ovl_En_Nb_0x80BBFDB0 +ovl_En_Ja_0x80BC1900 +ovl_Bg_F40_Block_0x80BC3980 +ovl_Bg_F40_Switch_0x80BC47B0 +ovl_En_Po_Composer_0x80BC4F30 +ovl_En_Guruguru_0x80BC6BF0 +ovl_Oceff_Wipe5_0x80BC7AD0 +ovl_En_Stone_heishi_0x80BC9270 +ovl_Oceff_Wipe6_0x80BCA5A0 +ovl_En_Scopenuts_0x80BCABF0 +ovl_En_Scopecrow_0x80BCD000 +ovl_Oceff_Wipe7_0x80BCDCB0 +ovl_Eff_Kamejima_Wave_0x80BCEB20 +ovl_En_Hg_0x80BCF1D0 +ovl_En_Hgo_0x80BD02B0 +ovl_En_Zov_0x80BD11E0 +ovl_En_Ah_0x80BD2A30 +ovl_Obj_Hgdoor_0x80BD4090 +ovl_Bg_Ikana_Bombwall_0x80BD4720 +ovl_Bg_Ikana_Shutter_0x80BD5690 +ovl_Bg_Haka_Bombwall_0x80BD5E00 +ovl_Bg_Haka_Tomb_0x80BD6580 +ovl_En_Sc_Ruppe_0x80BD6910 +ovl_Bg_Iknv_Doukutu_0x80BD6F10 +ovl_Bg_Iknv_Obj_0x80BD7AB0 +ovl_En_Pamera_0x80BD82B0 +ovl_Obj_HsStump_0x80BDAA30 +ovl_En_Hidden_Nuts_0x80BDB040 +ovl_En_Zow_0x80BDC270 +ovl_En_Talk_0x80BDDFE0 +ovl_En_Al_0x80BDE1A0 +ovl_En_Tab_0x80BE04E0 +ovl_En_Nimotsu_0x80BE1C80 +ovl_En_Hit_Tag_0x80BE2030 +ovl_En_Ruppecrow_0x80BE2260 +ovl_En_Tanron4_0x80BE3B80 +ovl_En_Tanron5_0x80BE4930 +ovl_En_Tanron6_0x80BE6040 +ovl_En_Daiku2_0x80BE61D0 +ovl_En_Muto_0x80BE7B00 +ovl_En_Baisen_0x80BE84F0 +ovl_En_Heishi_0x80BE8F20 +ovl_En_Demo_heishi_0x80BE9510 +ovl_En_Dt_0x80BE9B20 +ovl_En_Cha_0x80BEB520 +ovl_Obj_Dinner_0x80BEB940 +ovl_Eff_Lastday_0x80BEBAC0 +ovl_Bg_Ikana_Dharma_0x80BEC240 +ovl_En_Akindonuts_0x80BECBE0 +ovl_Eff_Stk_0x80BF0D90 +ovl_En_Ig_0x80BF1150 +ovl_En_Rg_0x80BF3920 +ovl_En_Osk_0x80BF5C20 +ovl_En_Sth2_0x80BF74E0 +ovl_En_Yb_0x80BFA100 +ovl_En_Rz_0x80BFB480 +ovl_En_Scopecoin_0x80BFCFA0 +ovl_En_Bjt_0x80BFD2E0 +ovl_En_Bomjima_0x80BFE170 +ovl_En_Bomjimb_0x80C00EA0 +ovl_En_Bombers_0x80C03530 +ovl_En_Bombers2_0x80C04930 +ovl_En_Bombal_0x80C05A70 +ovl_Obj_Moon_Stone_0x80C06510 +ovl_Obj_Mu_Pict_0x80C06AA0 +ovl_Bg_Ikninside_0x80C07110 +ovl_Eff_Zoraband_0x80C07740 +ovl_Obj_Kepn_Koya_0x80C07B20 +ovl_Obj_Usiyane_0x80C07C80 +ovl_En_Nnh_0x80C08760 +ovl_Obj_Kzsaku_0x80C08A80 +ovl_Obj_Milk_Bin_0x80C08E40 +ovl_En_Kitan_0x80C090D0 +ovl_Bg_Astr_Bombwall_0x80C09ED0 +ovl_Bg_Iknin_Susceil_0x80C0A740 +ovl_En_Bsb_0x80C0B290 +ovl_En_Recepgirl_0x80C0FFD0 +ovl_En_Thiefbird_0x80C10770 +ovl_En_Jgame_Tsn_0x80C13930 +ovl_Obj_Jgame_Light_0x80C152F0 +ovl_Obj_Yado_0x80C161E0 +ovl_Demo_Syoten_0x80C16480 +ovl_Demo_Moonend_0x80C17A10 +ovl_Bg_Lbfshot_0x80C18120 +ovl_Bg_Last_Bwall_0x80C18240 +ovl_En_And_0x80C18B90 +ovl_En_Invadepoh_Demo_0x80C192A0 +ovl_Obj_Danpeilift_0x80C1ADC0 +ovl_En_Fall2_0x80C1B640 +ovl_Dm_Al_0x80C1BD90 +ovl_Dm_An_0x80C1C410 +ovl_Dm_Ah_0x80C1D410 +ovl_Dm_Nb_0x80C1DED0 +ovl_En_Drs_0x80C1E290 +ovl_En_Ending_Hero_0x80C1E690 +ovl_Dm_Bal_0x80C1E9E0 +ovl_En_Paper_0x80C1F3D0 +ovl_En_Hint_Skb_0x80C1FCF0 +ovl_Dm_Tag_0x80C22350 +ovl_En_Bh_0x80C22D40 +ovl_En_Ending_Hero2_0x80C23230 +ovl_En_Ending_Hero3_0x80C23460 +ovl_En_Ending_Hero4_0x80C23690 +ovl_En_Ending_Hero5_0x80C238C0 +ovl_En_Ending_Hero6_0x80C23C90 +ovl_Dm_Gm_0x80C24360 +ovl_Obj_Swprize_0x80C25360 +ovl_En_Invisible_Ruppe_0x80C258A0 +ovl_Obj_Ending_0x80C25BC0 +ovl_En_Rsn_0x80C25D40 diff --git a/tables/variables.txt b/tables/variables.txt index 6bb8f05af1..a9fd159fc5 100644 --- a/tables/variables.txt +++ b/tables/variables.txt @@ -14387,7 +14387,7 @@ 0x80ACB3C0:("bgOpenSpotOverlayInfo","OverlayRelocationSection","",0x14), 0x80ACB3D4:("bgOpenSpotOverlayRelocations","u32","[7]",0x1c), 0x80ACB3FC:("bgOpenSpotOverlayInfoOffset","u32","",0x4), - 0x80ACB630:("bgFuKaitenInitData","ActorInit","",0x20), + 0x80ACB630:("Bg_Fu_Kaiten_InitVars","ActorInit","",0x20), 0x80ACB650:("D_80ACB650","f32","",0x4), 0x80ACB660:("bgFuKaitenOverlayInfo","OverlayRelocationSection","",0x14), 0x80ACB674:("bgFuKaitenOverlayRelocations","u32","[8]",0x20), @@ -17804,7 +17804,7 @@ 0x80BD5300:("bgIkanaBombwallOverlayInfo","OverlayRelocationSection","",0x14), 0x80BD5314:("bgIkanaBombwallOverlayRelocations","u32","[39]",0x9c), 0x80BD53BC:("bgIkanaBombwallOverlayInfoOffset","u32","",0x4), - 0x80BD55D0:("bgIkanaRayInitData","ActorInit","",0x20), + 0x80BD55D0:("Bg_Ikana_Ray_InitVars","ActorInit","",0x20), 0x80BD55F0:("bgIkanaRayCylinderInit","ColCylinderInit","",0x2c), 0x80BD561C:("bgIkanaRayCompInit","ActorInitVar","[4]",0x10), 0x80BD5630:("bgIkanaRayOverlayInfo","OverlayRelocationSection","",0x14), diff --git a/tools/bootstrap_actors.py b/tools/bootstrap_actors.py new file mode 100644 index 0000000000..4eaf14bb52 --- /dev/null +++ b/tools/bootstrap_actors.py @@ -0,0 +1,2642 @@ +#!/usr/bin/env python3 +import argparse, os, struct, collections, re + +actor_names = [ + "ACTOR_EN_TEST", + "ACTOR_EN_GIRLA", + "ACTOR_EN_PART", + "ACTOR_EN_LIGHT", + "ACTOR_EN_DOOR", + "ACTOR_EN_BOX", + "ACTOR_EN_PAMETFROG", + "ACTOR_EN_OKUTA", + "ACTOR_EN_BOM", + "ACTOR_EN_WALLMAS", + "ACTOR_EN_DODONGO", + "ACTOR_EN_FIREFLY", + "ACTOR_EN_HORSE", + "ACTOR_EN_ARROW", + "ACTOR_EN_ELF", + "ACTOR_EN_NIW", + "ACTOR_EN_TITE", + "ACTOR_EN_PEEHAT", + "ACTOR_EN_BUTTE", + "ACTOR_EN_INSECT", + "ACTOR_EN_FISH", + "ACTOR_EN_HOLL", + "ACTOR_EN_DINOFOS", + "ACTOR_EN_HATA", + "ACTOR_EN_ZL1", + "ACTOR_EN_VIEWER", + "ACTOR_EN_BUBBLE", + "ACTOR_DOOR_SHUTTER", + "ACTOR_EN_BOOM", + "ACTOR_EN_TORCH2", + "ACTOR_EN_MINIFROG", + "ACTOR_EN_ST", + "ACTOR_OBJ_WTURN", + "ACTOR_EN_RIVER_SOUND", + "ACTOR_EN_OSSAN", + "ACTOR_EN_FAMOS", + "ACTOR_EN_BOMBF", + "ACTOR_EN_AM", + "ACTOR_EN_DEKUBABA", + "ACTOR_EN_M_FIRE1", + "ACTOR_EN_M_THUNDER", + "ACTOR_BG_BREAKWALL", + "ACTOR_DOOR_WARP1", + "ACTOR_OBJ_SYOKUDAI", + "ACTOR_ITEM_B_HEART", + "ACTOR_EN_DEKUNUTS", + "ACTOR_EN_BBFALL", + "ACTOR_ARMS_HOOK", + "ACTOR_EN_BB", + "ACTOR_BG_KEIKOKU_SPR", + "ACTOR_EN_WOOD02", + "ACTOR_EN_DEATH", + "ACTOR_EN_MINIDEATH", + "ACTOR_EN_VM", + "ACTOR_DEMO_EFFECT", + "ACTOR_DEMO_KANKYO", + "ACTOR_EN_FLOORMAS", + "ACTOR_EN_RD", + "ACTOR_BG_F40_FLIFT", + "ACTOR_OBJ_MURE", + "ACTOR_EN_SW", + "ACTOR_OBJECT_KANKYO", + "ACTOR_EN_HORSE_LINK_CHILD", + "ACTOR_DOOR_ANA", + "ACTOR_EN_ENCOUNT1", + "ACTOR_DEMO_TRE_LGT", + "ACTOR_EN_ENCOUNT2", + "ACTOR_EN_FIRE_ROCK", + "ACTOR_BG_CTOWER_ROT", + "ACTOR_MIR_RAY", + "ACTOR_EN_SB", + "ACTOR_EN_BIGSLIME", + "ACTOR_EN_KAREBABA", + "ACTOR_EN_IN", + "ACTOR_EN_RU", + "ACTOR_EN_BOM_CHU", + "ACTOR_EN_HORSE_GAME_CHECK", + "ACTOR_EN_RR", + "ACTOR_EN_FR", + "ACTOR_OBJ_OSHIHIKI", + "ACTOR_EFF_DUST", + "ACTOR_BG_UMAJUMP", + "ACTOR_ARROW_FIRE", + "ACTOR_ARROW_ICE", + "ACTOR_ARROW_LIGHT", + "ACTOR_ITEM_ETCETERA", + "ACTOR_OBJ_KIBAKO", + "ACTOR_OBJ_TSUBO", + "ACTOR_EN_IK", + "ACTOR_DEMO_SHD", + "ACTOR_EN_DNS", + "ACTOR_ELF_MSG", + "ACTOR_EN_HONOTRAP", + "ACTOR_EN_TUBO_TRAP", + "ACTOR_OBJ_ICE_POLY", + "ACTOR_EN_FZ", + "ACTOR_EN_KUSA", + "ACTOR_OBJ_BEAN", + "ACTOR_OBJ_BOMBIWA", + "ACTOR_OBJ_SWITCH", + "ACTOR_OBJ_LIFT", + "ACTOR_OBJ_HSBLOCK", + "ACTOR_EN_OKARINA_TAG", + "ACTOR_EN_GOROIWA", + "ACTOR_EN_DAIKU", + "ACTOR_EN_NWC", + "ACTOR_ITEM_INBOX", + "ACTOR_EN_GE1", + "ACTOR_OBJ_BLOCKSTOP", + "ACTOR_EN_SDA", + "ACTOR_EN_CLEAR_TAG", + "ACTOR_EN_GM", + "ACTOR_EN_MS", + "ACTOR_EN_HS", + "ACTOR_BG_INGATE", + "ACTOR_EN_KANBAN", + "ACTOR_EN_ATTACK_NIW", + "ACTOR_EN_MK", + "ACTOR_EN_OWL", + "ACTOR_EN_ISHI", + "ACTOR_OBJ_HANA", + "ACTOR_OBJ_LIGHTSWITCH", + "ACTOR_OBJ_MURE2", + "ACTOR_EN_FU", + "ACTOR_EN_STREAM", + "ACTOR_EN_MM", + "ACTOR_EN_WEATHER_TAG", + "ACTOR_EN_ANI", + "ACTOR_EN_JS", + "ACTOR_EN_OKARINA_EFFECT", + "ACTOR_EN_MAG", + "ACTOR_ELF_MSG2", + "ACTOR_BG_F40_SWLIFT", + "ACTOR_EN_KAKASI", + "ACTOR_OBJ_MAKEOSHIHIKI", + "ACTOR_OCEFF_SPOT", + "ACTOR_EN_TORCH", + "ACTOR_SHOT_SUN", + "ACTOR_OBJ_ROOMTIMER", + "ACTOR_EN_SSH", + "ACTOR_OCEFF_WIPE", + "ACTOR_OCEFF_STORM", + "ACTOR_OBJ_DEMO", + "ACTOR_EN_MINISLIME", + "ACTOR_EN_NUTSBALL", + "ACTOR_OCEFF_WIPE2", + "ACTOR_OCEFF_WIPE3", + "ACTOR_EN_DG", + "ACTOR_EN_SI", + "ACTOR_OBJ_COMB", + "ACTOR_OBJ_KIBAKO2", + "ACTOR_EN_HS2", + "ACTOR_OBJ_MURE3", + "ACTOR_EN_TG", + "ACTOR_EN_WF", + "ACTOR_EN_SKB", + "ACTOR_EN_GS", + "ACTOR_OBJ_SOUND", + "ACTOR_EN_CROW", + "ACTOR_EN_COW", + "ACTOR_OCEFF_WIPE4", + "ACTOR_EN_ZO", + "ACTOR_OBJ_MAKEKINSUTA", + "ACTOR_EN_GE3", + "ACTOR_OBJ_HAMISHI", + "ACTOR_EN_ZL4", + "ACTOR_EN_MM2", + "ACTOR_DOOR_SPIRAL", + "ACTOR_OBJ_PZLBLOCK", + "ACTOR_OBJ_TOGE", + "ACTOR_OBJ_ARMOS", + "ACTOR_OBJ_BOYO", + "ACTOR_EN_GRASSHOPPER", + "ACTOR_OBJ_GRASS", + "ACTOR_OBJ_GRASS_CARRY", + "ACTOR_OBJ_GRASS_UNIT", + "ACTOR_BG_FIRE_WALL", + "ACTOR_EN_BU", + "ACTOR_EN_ENCOUNT3", + "ACTOR_EN_JSO", + "ACTOR_OBJ_CHIKUWA", + "ACTOR_EN_KNIGHT", + "ACTOR_EN_WARP_TAG", + "ACTOR_EN_AOB_01", + "ACTOR_EN_BOJ_01", + "ACTOR_EN_BOJ_02", + "ACTOR_EN_BOJ_03", + "ACTOR_EN_ENCOUNT4", + "ACTOR_EN_BOM_BOWL_MAN", + "ACTOR_EN_SYATEKI_MAN", + "ACTOR_BG_ICICLE", + "ACTOR_EN_SYATEKI_CROW", + "ACTOR_EN_BOJ_04", + "ACTOR_EN_CNE_01", + "ACTOR_EN_BBA_01", + "ACTOR_EN_BJI_01", + "ACTOR_BG_SPDWEB", + "ACTOR_EN_MT_TAG", + "ACTOR_BOSS_01", + "ACTOR_BOSS_02", + "ACTOR_BOSS_03", + "ACTOR_BOSS_04", + "ACTOR_BOSS_05", + "ACTOR_BOSS_06", + "ACTOR_BOSS_07", + "ACTOR_BG_DY_YOSEIZO", + "ACTOR_EN_BOJ_05", + "ACTOR_EN_SOB1", + "ACTOR_EN_GO", + "ACTOR_EN_RAF", + "ACTOR_OBJ_FUNEN", + "ACTOR_OBJ_RAILLIFT", + "ACTOR_BG_NUMA_HANA", + "ACTOR_OBJ_FLOWERPOT", + "ACTOR_OBJ_SPINYROLL", + "ACTOR_DM_HINA", + "ACTOR_EN_SYATEKI_WF", + "ACTOR_OBJ_SKATEBLOCK", + "ACTOR_OBJ_ICEBLOCK", + "ACTOR_EN_BIGPAMET", + "ACTOR_EN_SYATEKI_DEKUNUTS", + "ACTOR_ELF_MSG3", + "ACTOR_EN_FG", + "ACTOR_DM_RAVINE", + "ACTOR_DM_SA", + "ACTOR_EN_SLIME", + "ACTOR_EN_PR", + "ACTOR_OBJ_TOUDAI", + "ACTOR_OBJ_ENTOTU", + "ACTOR_OBJ_BELL", + "ACTOR_EN_SYATEKI_OKUTA", + "ACTOR_OBJ_SHUTTER", + "ACTOR_DM_ZL", + "ACTOR_EN_ELFGRP", + "ACTOR_DM_TSG", + "ACTOR_EN_BAGUO", + "ACTOR_OBJ_VSPINYROLL", + "ACTOR_OBJ_SMORK", + "ACTOR_EN_TEST2", + "ACTOR_EN_TEST3", + "ACTOR_EN_TEST4", + "ACTOR_EN_BAT", + "ACTOR_EN_SEKIHI", + "ACTOR_EN_WIZ", + "ACTOR_EN_WIZ_BROCK", + "ACTOR_EN_WIZ_FIRE", + "ACTOR_EFF_CHANGE", + "ACTOR_DM_STATUE", + "ACTOR_OBJ_FIRESHIELD", + "ACTOR_BG_LADDER", + "ACTOR_EN_MKK", + "ACTOR_DEMO_GETITEM", + "ACTOR_EN_DNB", + "ACTOR_EN_DNH", + "ACTOR_EN_DNK", + "ACTOR_EN_DNQ", + "ACTOR_BG_KEIKOKU_SAKU", + "ACTOR_OBJ_HUGEBOMBIWA", + "ACTOR_EN_FIREFLY2", + "ACTOR_EN_RAT", + "ACTOR_EN_WATER_EFFECT", + "ACTOR_EN_KUSA2", + "ACTOR_BG_SPOUT_FIRE", + "ACTOR_BG_DBLUE_MOVEBG", + "ACTOR_EN_DY_EXTRA", + "ACTOR_EN_BAL", + "ACTOR_EN_GINKO_MAN", + "ACTOR_EN_WARP_UZU", + "ACTOR_OBJ_DRIFTICE", + "ACTOR_EN_LOOK_NUTS", + "ACTOR_EN_MUSHI2", + "ACTOR_EN_FALL", + "ACTOR_EN_MM3", + "ACTOR_BG_CRACE_MOVEBG", + "ACTOR_EN_DNO", + "ACTOR_EN_PR2", + "ACTOR_EN_PRZ", + "ACTOR_EN_JSO2", + "ACTOR_OBJ_ETCETERA", + "ACTOR_EN_EGOL", + "ACTOR_OBJ_MINE", + "ACTOR_OBJ_PURIFY", + "ACTOR_EN_TRU", + "ACTOR_EN_TRT", + "ACTOR_EN_TEST5", + "ACTOR_EN_TEST6", + "ACTOR_EN_AZ", + "ACTOR_EN_ESTONE", + "ACTOR_BG_HAKUGIN_POST", + "ACTOR_DM_OPSTAGE", + "ACTOR_DM_STK", + "ACTOR_DM_CHAR00", + "ACTOR_DM_CHAR01", + "ACTOR_DM_CHAR02", + "ACTOR_DM_CHAR03", + "ACTOR_DM_CHAR04", + "ACTOR_DM_CHAR05", + "ACTOR_DM_CHAR06", + "ACTOR_DM_CHAR07", + "ACTOR_DM_CHAR08", + "ACTOR_DM_CHAR09", + "ACTOR_OBJ_TOKEIDAI", + "ACTOR_EN_MNK", + "ACTOR_EN_EGBLOCK", + "ACTOR_EN_GUARD_NUTS", + "ACTOR_BG_HAKUGIN_BOMBWALL", + "ACTOR_OBJ_TOKEI_TOBIRA", + "ACTOR_BG_HAKUGIN_ELVPOLE", + "ACTOR_EN_MA4", + "ACTOR_EN_TWIG", + "ACTOR_EN_PO_FUSEN", + "ACTOR_EN_DOOR_ETC", + "ACTOR_EN_BIGOKUTA", + "ACTOR_BG_ICEFLOE", + "ACTOR_OBJ_OCARINALIFT", + "ACTOR_EN_TIME_TAG", + "ACTOR_BG_OPEN_SHUTTER", + "ACTOR_BG_OPEN_SPOT", + "ACTOR_BG_FU_KAITEN", + "ACTOR_OBJ_AQUA", + "ACTOR_EN_ELFORG", + "ACTOR_EN_ELFBUB", + "ACTOR_EN_FU_MATO", + "ACTOR_EN_FU_KAGO", + "ACTOR_EN_OSN", + "ACTOR_BG_CTOWER_GEAR", + "ACTOR_EN_TRT2", + "ACTOR_OBJ_TOKEI_STEP", + "ACTOR_BG_LOTUS", + "ACTOR_EN_KAME", + "ACTOR_OBJ_TAKARAYA_WALL", + "ACTOR_BG_FU_MIZU", + "ACTOR_EN_SELLNUTS", + "ACTOR_BG_DKJAIL_IVY", + "ACTOR_OBJ_VISIBLOCK", + "ACTOR_EN_TAKARAYA", + "ACTOR_EN_TSN", + "ACTOR_EN_DS2N", + "ACTOR_EN_FSN", + "ACTOR_EN_SHN", + "ACTOR_EN_STOP_HEISHI", + "ACTOR_OBJ_BIGICICLE", + "ACTOR_EN_LIFT_NUTS", + "ACTOR_EN_TK", + "ACTOR_BG_MARKET_STEP", + "ACTOR_OBJ_LUPYGAMELIFT", + "ACTOR_EN_TEST7", + "ACTOR_OBJ_LIGHTBLOCK", + "ACTOR_MIR_RAY2", + "ACTOR_EN_WDHAND", + "ACTOR_EN_GAMELUPY", + "ACTOR_BG_DANPEI_MOVEBG", + "ACTOR_EN_SNOWWD", + "ACTOR_EN_PM", + "ACTOR_EN_GAKUFU", + "ACTOR_ELF_MSG4", + "ACTOR_ELF_MSG5", + "ACTOR_EN_COL_MAN", + "ACTOR_EN_TALK_GIBUD", + "ACTOR_EN_GIANT", + "ACTOR_OBJ_SNOWBALL", + "ACTOR_BOSS_HAKUGIN", + "ACTOR_EN_GB2", + "ACTOR_EN_ONPUMAN", + "ACTOR_BG_TOBIRA01", + "ACTOR_EN_TAG_OBJ", + "ACTOR_OBJ_DHOUSE", + "ACTOR_OBJ_HAKAISI", + "ACTOR_BG_HAKUGIN_SWITCH", + "ACTOR_EN_SNOWMAN", + "ACTOR_TG_SW", + "ACTOR_EN_PO_SISTERS", + "ACTOR_EN_PP", + "ACTOR_EN_HAKUROCK", + "ACTOR_EN_HANABI", + "ACTOR_OBJ_DOWSING", + "ACTOR_OBJ_WIND", + "ACTOR_EN_RACEDOG", + "ACTOR_EN_KENDO_JS", + "ACTOR_BG_BOTIHASIRA", + "ACTOR_EN_FISH2", + "ACTOR_EN_PST", + "ACTOR_EN_POH", + "ACTOR_OBJ_SPIDERTENT", + "ACTOR_EN_ZORAEGG", + "ACTOR_EN_KBT", + "ACTOR_EN_GG", + "ACTOR_EN_MARUTA", + "ACTOR_OBJ_SNOWBALL2", + "ACTOR_EN_GG2", + "ACTOR_OBJ_GHAKA", + "ACTOR_EN_DNP", + "ACTOR_EN_DAI", + "ACTOR_BG_GORON_OYU", + "ACTOR_EN_KGY", + "ACTOR_EN_INVADEPOH", + "ACTOR_EN_GK", + "ACTOR_EN_AN", + "ACTOR_EN_BEE", + "ACTOR_EN_OT", + "ACTOR_EN_DRAGON", + "ACTOR_OBJ_DORA", + "ACTOR_EN_BIGPO", + "ACTOR_OBJ_KENDO_KANBAN", + "ACTOR_OBJ_HARIKO", + "ACTOR_EN_STH", + "ACTOR_BG_SINKAI_KABE", + "ACTOR_BG_HAKA_CURTAIN", + "ACTOR_BG_KIN2_BOMBWALL", + "ACTOR_BG_KIN2_FENCE", + "ACTOR_BG_KIN2_PICTURE", + "ACTOR_BG_KIN2_SHELF", + "ACTOR_EN_RAIL_SKB", + "ACTOR_EN_JG", + "ACTOR_EN_TRU_MT", + "ACTOR_OBJ_UM", + "ACTOR_EN_NEO_REEBA", + "ACTOR_BG_MBAR_CHAIR", + "ACTOR_BG_IKANA_BLOCK", + "ACTOR_BG_IKANA_MIRROR", + "ACTOR_BG_IKANA_ROTARYROOM", + "ACTOR_BG_DBLUE_BALANCE", + "ACTOR_BG_DBLUE_WATERFALL", + "ACTOR_EN_KAIZOKU", + "ACTOR_EN_GE2", + "ACTOR_EN_MA_YTS", + "ACTOR_EN_MA_YTO", + "ACTOR_OBJ_TOKEI_TURRET", + "ACTOR_BG_DBLUE_ELEVATOR", + "ACTOR_OBJ_WARPSTONE", + "ACTOR_EN_ZOG", + "ACTOR_OBJ_ROTLIFT", + "ACTOR_OBJ_JG_GAKKI", + "ACTOR_BG_INIBS_MOVEBG", + "ACTOR_EN_ZOT", + "ACTOR_OBJ_TREE", + "ACTOR_OBJ_Y2LIFT", + "ACTOR_OBJ_Y2SHUTTER", + "ACTOR_OBJ_BOAT", + "ACTOR_OBJ_TARU", + "ACTOR_OBJ_HUNSUI", + "ACTOR_EN_JC_MATO", + "ACTOR_MIR_RAY3", + "ACTOR_EN_ZOB", + "ACTOR_ELF_MSG6", + "ACTOR_OBJ_NOZOKI", + "ACTOR_EN_TOTO", + "ACTOR_EN_RAILGIBUD", + "ACTOR_EN_BABA", + "ACTOR_EN_SUTTARI", + "ACTOR_EN_ZOD", + "ACTOR_EN_KUJIYA", + "ACTOR_EN_GEG", + "ACTOR_OBJ_KINOKO", + "ACTOR_OBJ_YASI", + "ACTOR_EN_TANRON1", + "ACTOR_EN_TANRON2", + "ACTOR_EN_TANRON3", + "ACTOR_OBJ_CHAN", + "ACTOR_EN_ZOS", + "ACTOR_EN_S_GORO", + "ACTOR_EN_NB", + "ACTOR_EN_JA", + "ACTOR_BG_F40_BLOCK", + "ACTOR_BG_F40_SWITCH", + "ACTOR_EN_PO_COMPOSER", + "ACTOR_EN_GURUGURU", + "ACTOR_OCEFF_WIPE5", + "ACTOR_EN_STONE_HEISHI", + "ACTOR_OCEFF_WIPE6", + "ACTOR_EN_SCOPENUTS", + "ACTOR_EN_SCOPECROW", + "ACTOR_OCEFF_WIPE7", + "ACTOR_EFF_KAMEJIMA_WAVE", + "ACTOR_EN_HG", + "ACTOR_EN_HGO", + "ACTOR_EN_ZOV", + "ACTOR_EN_AH", + "ACTOR_OBJ_HGDOOR", + "ACTOR_BG_IKANA_BOMBWALL", + "ACTOR_BG_IKANA_RAY", + "ACTOR_BG_IKANA_SHUTTER", + "ACTOR_BG_HAKA_BOMBWALL", + "ACTOR_BG_HAKA_TOMB", + "ACTOR_EN_SC_RUPPE", + "ACTOR_BG_IKNV_DOUKUTU", + "ACTOR_BG_IKNV_OBJ", + "ACTOR_EN_PAMERA", + "ACTOR_OBJ_HSSTUMP", + "ACTOR_EN_HIDDEN_NUTS", + "ACTOR_EN_ZOW", + "ACTOR_EN_TALK", + "ACTOR_EN_AL", + "ACTOR_EN_TAB", + "ACTOR_EN_NIMOTSU", + "ACTOR_EN_HIT_TAG", + "ACTOR_EN_RUPPECROW", + "ACTOR_EN_TANRON4", + "ACTOR_EN_TANRON5", + "ACTOR_EN_TANRON6", + "ACTOR_EN_DAIKU2", + "ACTOR_EN_MUTO", + "ACTOR_EN_BAISEN", + "ACTOR_EN_HEISHI", + "ACTOR_EN_DEMO_HEISHI", + "ACTOR_EN_DT", + "ACTOR_EN_CHA", + "ACTOR_OBJ_DINNER", + "ACTOR_EFF_LASTDAY", + "ACTOR_BG_IKANA_DHARMA", + "ACTOR_EN_AKINDONUTS", + "ACTOR_EFF_STK", + "ACTOR_EN_IG", + "ACTOR_EN_RG", + "ACTOR_EN_OSK", + "ACTOR_EN_STH2", + "ACTOR_EN_YB", + "ACTOR_EN_RZ", + "ACTOR_EN_SCOPECOIN", + "ACTOR_EN_BJT", + "ACTOR_EN_BOMJIMA", + "ACTOR_EN_BOMJIMB", + "ACTOR_EN_BOMBERS", + "ACTOR_EN_BOMBERS2", + "ACTOR_EN_BOMBAL", + "ACTOR_OBJ_MOON_STONE", + "ACTOR_OBJ_MU_PICT", + "ACTOR_BG_IKNINSIDE", + "ACTOR_EFF_ZORABAND", + "ACTOR_OBJ_KEPN_KOYA", + "ACTOR_OBJ_USIYANE", + "ACTOR_EN_NNH", + "ACTOR_OBJ_KZSAKU", + "ACTOR_OBJ_MILK_BIN", + "ACTOR_EN_KITAN", + "ACTOR_BG_ASTR_BOMBWALL", + "ACTOR_BG_IKNIN_SUSCEIL", + "ACTOR_EN_BSB", + "ACTOR_EN_RECEPGIRL", + "ACTOR_EN_THIEFBIRD", + "ACTOR_EN_JGAME_TSN", + "ACTOR_OBJ_JGAME_LIGHT", + "ACTOR_OBJ_YADO", + "ACTOR_DEMO_SYOTEN", + "ACTOR_DEMO_MOONEND", + "ACTOR_BG_LBFSHOT", + "ACTOR_BG_LAST_BWALL", + "ACTOR_EN_AND", + "ACTOR_EN_INVADEPOH_DEMO", + "ACTOR_OBJ_DANPEILIFT", + "ACTOR_EN_FALL2", + "ACTOR_DM_AL", + "ACTOR_DM_AN", + "ACTOR_DM_AH", + "ACTOR_DM_NB", + "ACTOR_EN_DRS", + "ACTOR_EN_ENDING_HERO", + "ACTOR_DM_BAL", + "ACTOR_EN_PAPER", + "ACTOR_EN_HINT_SKB", + "ACTOR_DM_TAG", + "ACTOR_EN_BH", + "ACTOR_EN_ENDING_HERO2", + "ACTOR_EN_ENDING_HERO3", + "ACTOR_EN_ENDING_HERO4", + "ACTOR_EN_ENDING_HERO5", + "ACTOR_EN_ENDING_HERO6", + "ACTOR_DM_GM", + "ACTOR_OBJ_SWPRIZE", + "ACTOR_EN_INVISIBLE_RUPPE", + "ACTOR_OBJ_ENDING", + "ACTOR_EN_RSN", +] + +overlay_names = [ + "ovl_En_Test", + "ovl_En_GirlA", + "ovl_En_Part", + "ovl_En_Light", + "ovl_En_Door", + "ovl_En_Box", + "ovl_En_Pametfrog", + "ovl_En_Okuta", + "ovl_En_Bom", + "ovl_En_Wallmas", + "ovl_En_Dodongo", + "ovl_En_Firefly", + "ovl_En_Horse", + "ovl_En_Arrow", + "ovl_En_Elf", + "ovl_En_Niw", + "ovl_En_Tite", + "ovl_En_Peehat", + "ovl_En_Butte", + "ovl_En_Insect", + "ovl_En_Fish", + "ovl_En_Holl", + "ovl_En_Dinofos", + "ovl_En_Hata", + "ovl_En_Zl1", + "ovl_En_Viewer", + "ovl_En_Bubble", + "ovl_Door_Shutter", + "ovl_En_Boom", + "ovl_En_Torch2", + "ovl_En_Minifrog", + "ovl_En_St", + "ovl_Obj_Wturn", + "ovl_En_River_Sound", + "ovl_En_Ossan", + "ovl_En_Famos", + "ovl_En_Bombf", + "ovl_En_Am", + "ovl_En_Dekubaba", + "ovl_En_M_Fire1", + "ovl_En_M_Thunder", + "ovl_Bg_Breakwall", + "ovl_Door_Warp1", + "ovl_Obj_Syokudai", + "ovl_Item_B_Heart", + "ovl_En_Dekunuts", + "ovl_En_Bbfall", + "ovl_Arms_Hook", + "ovl_En_Bb", + "ovl_Bg_Keikoku_Spr", + "ovl_En_Wood02", + "ovl_En_Death", + "ovl_En_Minideath", + "ovl_En_Vm", + "ovl_Demo_Effect", + "ovl_Demo_Kankyo", + "ovl_En_Floormas", + "ovl_En_Rd", + "ovl_Bg_F40_Flift", + "ovl_Obj_Mure", + "ovl_En_Sw", + "ovl_Object_Kankyo", + "ovl_En_Horse_Link_Child", + "ovl_Door_Ana", + "ovl_En_Encount1", + "ovl_Demo_Tre_Lgt", + "ovl_En_Encount2", + "ovl_En_Fire_Rock", + "ovl_Bg_Ctower_Rot", + "ovl_Mir_Ray", + "ovl_En_Sb", + "ovl_En_Bigslime", + "ovl_En_Karebaba", + "ovl_En_In", + "ovl_En_Ru", + "ovl_En_Bom_Chu", + "ovl_En_Horse_Game_Check", + "ovl_En_Rr", + "ovl_En_Fr", + "ovl_Obj_Oshihiki", + "ovl_Eff_Dust", + "ovl_Bg_Umajump", + "ovl_Arrow_Fire", + "ovl_Arrow_Ice", + "ovl_Arrow_Light", + "ovl_Item_Etcetera", + "ovl_Obj_Kibako", + "ovl_Obj_Tsubo", + "ovl_En_Ik", + "ovl_Demo_Shd", + "ovl_En_Dns", + "ovl_Elf_Msg", + "ovl_En_Honotrap", + "ovl_En_Tubo_Trap", + "ovl_Obj_Ice_Poly", + "ovl_En_Fz", + "ovl_En_Kusa", + "ovl_Obj_Bean", + "ovl_Obj_Bombiwa", + "ovl_Obj_Switch", + "ovl_Obj_Lift", + "ovl_Obj_Hsblock", + "ovl_En_Okarina_Tag", + "ovl_En_Goroiwa", + "ovl_En_Daiku", + "ovl_En_Nwc", + "ovl_Item_Inbox", + "ovl_En_Ge1", + "ovl_Obj_Blockstop", + "ovl_En_Sda", + "ovl_En_Clear_Tag", + "ovl_En_Gm", + "ovl_En_Ms", + "ovl_En_Hs", + "ovl_Bg_Ingate", + "ovl_En_Kanban", + "ovl_En_Attack_Niw", + "ovl_En_Mk", + "ovl_En_Owl", + "ovl_En_Ishi", + "ovl_Obj_Hana", + "ovl_Obj_Lightswitch", + "ovl_Obj_Mure2", + "ovl_En_Fu", + "ovl_En_Stream", + "ovl_En_Mm", + "ovl_En_Weather_Tag", + "ovl_En_Ani", + "ovl_En_Js", + "ovl_En_Okarina_Effect", + "ovl_En_Mag", + "ovl_Elf_Msg2", + "ovl_Bg_F40_Swlift", + "ovl_En_Kakasi", + "ovl_Obj_Makeoshihiki", + "ovl_Oceff_Spot", + "ovl_En_Torch", + "ovl_Shot_Sun", + "ovl_Obj_Roomtimer", + "ovl_En_Ssh", + "ovl_Oceff_Wipe", + "ovl_Oceff_Storm", + "ovl_Obj_Demo", + "ovl_En_Minislime", + "ovl_En_Nutsball", + "ovl_Oceff_Wipe2", + "ovl_Oceff_Wipe3", + "ovl_En_Dg", + "ovl_En_Si", + "ovl_Obj_Comb", + "ovl_Obj_Kibako2", + "ovl_En_Hs2", + "ovl_Obj_Mure3", + "ovl_En_Tg", + "ovl_En_Wf", + "ovl_En_Skb", + "ovl_En_Gs", + "ovl_Obj_Sound", + "ovl_En_Crow", + "ovl_En_Cow", + "ovl_Oceff_Wipe4", + "ovl_En_Zo", + "ovl_Obj_Makekinsuta", + "ovl_En_Ge3", + "ovl_Obj_Hamishi", + "ovl_En_Zl4", + "ovl_En_Mm2", + "ovl_Door_Spiral", + "ovl_Obj_Pzlblock", + "ovl_Obj_Toge", + "ovl_Obj_Armos", + "ovl_Obj_Boyo", + "ovl_En_Grasshopper", + "ovl_Obj_Grass", + "ovl_Obj_Grass_Carry", + "ovl_Obj_Grass_Unit", + "ovl_Bg_Fire_Wall", + "ovl_En_Bu", + "ovl_En_Encount3", + "ovl_En_Jso", + "ovl_Obj_Chikuwa", + "ovl_En_Knight", + "ovl_En_Warp_tag", + "ovl_En_Aob_01", + "ovl_En_Boj_01", + "ovl_En_Boj_02", + "ovl_En_Boj_03", + "ovl_En_Encount4", + "ovl_En_Bom_Bowl_Man", + "ovl_En_Syateki_Man", + "ovl_Bg_Icicle", + "ovl_En_Syateki_Crow", + "ovl_En_Boj_04", + "ovl_En_Cne_01", + "ovl_En_Bba_01", + "ovl_En_Bji_01", + "ovl_Bg_Spdweb", + "ovl_En_Mt_tag", + "ovl_Boss_01", + "ovl_Boss_02", + "ovl_Boss_03", + "ovl_Boss_04", + "ovl_Boss_05", + "ovl_Boss_06", + "ovl_Boss_07", + "ovl_Bg_Dy_Yoseizo", + "ovl_En_Boj_05", + "ovl_En_Sob1", + "ovl_En_Go", + "ovl_En_Raf", + "ovl_Obj_Funen", + "ovl_Obj_Raillift", + "ovl_Bg_Numa_Hana", + "ovl_Obj_Flowerpot", + "ovl_Obj_Spinyroll", + "ovl_Dm_Hina", + "ovl_En_Syateki_Wf", + "ovl_Obj_Skateblock", + "ovl_Obj_Iceblock", + "ovl_En_Bigpamet", + "ovl_En_Syateki_Dekunuts", + "ovl_Elf_Msg3", + "ovl_En_Fg", + "ovl_Dm_Ravine", + "ovl_Dm_Sa", + "ovl_En_Slime", + "ovl_En_Pr", + "ovl_Obj_Toudai", + "ovl_Obj_Entotu", + "ovl_Obj_Bell", + "ovl_En_Syateki_Okuta", + "ovl_Obj_Shutter", + "ovl_Dm_Zl", + "ovl_En_Elfgrp", + "ovl_Dm_Tsg", + "ovl_En_Baguo", + "ovl_Obj_Vspinyroll", + "ovl_Obj_Smork", + "ovl_En_Test2", + "ovl_En_Test3", + "ovl_En_Test4", + "ovl_En_Bat", + "ovl_En_Sekihi", + "ovl_En_Wiz", + "ovl_En_Wiz_Brock", + "ovl_En_Wiz_Fire", + "ovl_Eff_Change", + "ovl_Dm_Statue", + "ovl_Obj_Fireshield", + "ovl_Bg_Ladder", + "ovl_En_Mkk", + "ovl_Demo_Getitem", + "ovl_En_Dnb", + "ovl_En_Dnh", + "ovl_En_Dnk", + "ovl_En_Dnq", + "ovl_Bg_Keikoku_Saku", + "ovl_Obj_Hugebombiwa", + "ovl_En_Firefly2", + "ovl_En_Rat", + "ovl_En_Water_Effect", + "ovl_En_Kusa2", + "ovl_Bg_Spout_Fire", + "ovl_Bg_Dblue_Movebg", + "ovl_En_Dy_Extra", + "ovl_En_Bal", + "ovl_En_Ginko_Man", + "ovl_En_Warp_Uzu", + "ovl_Obj_Driftice", + "ovl_En_Look_Nuts", + "ovl_En_Mushi2", + "ovl_En_Fall", + "ovl_En_Mm3", + "ovl_Bg_Crace_Movebg", + "ovl_En_Dno", + "ovl_En_Pr2", + "ovl_En_Prz", + "ovl_En_Jso2", + "ovl_Obj_Etcetera", + "ovl_En_Egol", + "ovl_Obj_Mine", + "ovl_Obj_Purify", + "ovl_En_Tru", + "ovl_En_Trt", + "ovl_En_Test5", + "ovl_En_Test6", + "ovl_En_Az", + "ovl_En_Estone", + "ovl_Bg_Hakugin_Post", + "ovl_Dm_Opstage", + "ovl_Dm_Stk", + "ovl_Dm_Char00", + "ovl_Dm_Char01", + "ovl_Dm_Char02", + "ovl_Dm_Char03", + "ovl_Dm_Char04", + "ovl_Dm_Char05", + "ovl_Dm_Char06", + "ovl_Dm_Char07", + "ovl_Dm_Char08", + "ovl_Dm_Char09", + "ovl_Obj_Tokeidai", + "ovl_En_Mnk", + "ovl_En_Egblock", + "ovl_En_Guard_Nuts", + "ovl_Bg_Hakugin_Bombwall", + "ovl_Obj_Tokei_Tobira", + "ovl_Bg_Hakugin_Elvpole", + "ovl_En_Ma4", + "ovl_En_Twig", + "ovl_En_Po_Fusen", + "ovl_En_Door_Etc", + "ovl_En_Bigokuta", + "ovl_Bg_Icefloe", + "ovl_Obj_Ocarinalift", + "ovl_En_Time_Tag", + "ovl_Bg_Open_Shutter", + "ovl_Bg_Open_Spot", + "ovl_Bg_Fu_Kaiten", + "ovl_Obj_Aqua", + "ovl_En_Elforg", + "ovl_En_Elfbub", + "ovl_En_Fu_Mato", + "ovl_En_Fu_Kago", + "ovl_En_Osn", + "ovl_Bg_Ctower_Gear", + "ovl_En_Trt2", + "ovl_Obj_Tokei_Step", + "ovl_Bg_Lotus", + "ovl_En_Kame", + "ovl_Obj_Takaraya_Wall", + "ovl_Bg_Fu_Mizu", + "ovl_En_Sellnuts", + "ovl_Bg_Dkjail_Ivy", + "ovl_Obj_Visiblock", + "ovl_En_Takaraya", + "ovl_En_Tsn", + "ovl_En_Ds2n", + "ovl_En_Fsn", + "ovl_En_Shn", + "ovl_En_Stop_heishi", + "ovl_Obj_Bigicicle", + "ovl_En_Lift_Nuts", + "ovl_En_Tk", + "ovl_Bg_Market_Step", + "ovl_Obj_Lupygamelift", + "ovl_En_Test7", + "ovl_Obj_Lightblock", + "ovl_Mir_Ray2", + "ovl_En_Wdhand", + "ovl_En_Gamelupy", + "ovl_Bg_Danpei_Movebg", + "ovl_En_Snowwd", + "ovl_En_Pm", + "ovl_En_Gakufu", + "ovl_Elf_Msg4", + "ovl_Elf_Msg5", + "ovl_En_Col_Man", + "ovl_En_Talk_Gibud", + "ovl_En_Giant", + "ovl_Obj_Snowball", + "ovl_Boss_Hakugin", + "ovl_En_Gb2", + "ovl_En_Onpuman", + "ovl_Bg_Tobira01", + "ovl_En_Tag_Obj", + "ovl_Obj_Dhouse", + "ovl_Obj_Hakaisi", + "ovl_Bg_Hakugin_Switch", + "ovl_En_Snowman", + "ovl_TG_Sw", + "ovl_En_Po_Sisters", + "ovl_En_Pp", + "ovl_En_Hakurock", + "ovl_En_Hanabi", + "ovl_Obj_Dowsing", + "ovl_Obj_Wind", + "ovl_En_Racedog", + "ovl_En_Kendo_Js", + "ovl_Bg_Botihasira", + "ovl_En_Fish2", + "ovl_En_Pst", + "ovl_En_Poh", + "ovl_Obj_Spidertent", + "ovl_En_Zoraegg", + "ovl_En_Kbt", + "ovl_En_Gg", + "ovl_En_Maruta", + "ovl_Obj_Snowball2", + "ovl_En_Gg2", + "ovl_Obj_Ghaka", + "ovl_En_Dnp", + "ovl_En_Dai", + "ovl_Bg_Goron_Oyu", + "ovl_En_Kgy", + "ovl_En_Invadepoh", + "ovl_En_Gk", + "ovl_En_An", + "ovl_En_Bee", + "ovl_En_Ot", + "ovl_En_Dragon", + "ovl_Obj_Dora", + "ovl_En_Bigpo", + "ovl_Obj_Kendo_Kanban", + "ovl_Obj_Hariko", + "ovl_En_Sth", + "ovl_Bg_Sinkai_Kabe", + "ovl_Bg_Haka_Curtain", + "ovl_Bg_Kin2_Bombwall", + "ovl_Bg_Kin2_Fence", + "ovl_Bg_Kin2_Picture", + "ovl_Bg_Kin2_Shelf", + "ovl_En_Rail_Skb", + "ovl_En_Jg", + "ovl_En_Tru_Mt", + "ovl_Obj_Um", + "ovl_En_Neo_Reeba", + "ovl_Bg_Mbar_Chair", + "ovl_Bg_Ikana_Block", + "ovl_Bg_Ikana_Mirror", + "ovl_Bg_Ikana_Rotaryroom", + "ovl_Bg_Dblue_Balance", + "ovl_Bg_Dblue_Waterfall", + "ovl_En_Kaizoku", + "ovl_En_Ge2", + "ovl_En_Ma_Yts", + "ovl_En_Ma_Yto", + "ovl_Obj_Tokei_Turret", + "ovl_Bg_Dblue_Elevator", + "ovl_Obj_Warpstone", + "ovl_En_Zog", + "ovl_Obj_Rotlift", + "ovl_Obj_Jg_Gakki", + "ovl_Bg_Inibs_Movebg", + "ovl_En_Zot", + "ovl_Obj_Tree", + "ovl_Obj_Y2lift", + "ovl_Obj_Y2shutter", + "ovl_Obj_Boat", + "ovl_Obj_Taru", + "ovl_Obj_Hunsui", + "ovl_En_Jc_Mato", + "ovl_Mir_Ray3", + "ovl_En_Zob", + "ovl_Elf_Msg6", + "ovl_Obj_Nozoki", + "ovl_En_Toto", + "ovl_En_Railgibud", + "ovl_En_Baba", + "ovl_En_Suttari", + "ovl_En_Zod", + "ovl_En_Kujiya", + "ovl_En_Geg", + "ovl_Obj_Kinoko", + "ovl_Obj_Yasi", + "ovl_En_Tanron1", + "ovl_En_Tanron2", + "ovl_En_Tanron3", + "ovl_Obj_Chan", + "ovl_En_Zos", + "ovl_En_S_Goro", + "ovl_En_Nb", + "ovl_En_Ja", + "ovl_Bg_F40_Block", + "ovl_Bg_F40_Switch", + "ovl_En_Po_Composer", + "ovl_En_Guruguru", + "ovl_Oceff_Wipe5", + "ovl_En_Stone_heishi", + "ovl_Oceff_Wipe6", + "ovl_En_Scopenuts", + "ovl_En_Scopecrow", + "ovl_Oceff_Wipe7", + "ovl_Eff_Kamejima_Wave", + "ovl_En_Hg", + "ovl_En_Hgo", + "ovl_En_Zov", + "ovl_En_Ah", + "ovl_Obj_Hgdoor", + "ovl_Bg_Ikana_Bombwall", + "ovl_Bg_Ikana_Ray", + "ovl_Bg_Ikana_Shutter", + "ovl_Bg_Haka_Bombwall", + "ovl_Bg_Haka_Tomb", + "ovl_En_Sc_Ruppe", + "ovl_Bg_Iknv_Doukutu", + "ovl_Bg_Iknv_Obj", + "ovl_En_Pamera", + "ovl_Obj_HsStump", + "ovl_En_Hidden_Nuts", + "ovl_En_Zow", + "ovl_En_Talk", + "ovl_En_Al", + "ovl_En_Tab", + "ovl_En_Nimotsu", + "ovl_En_Hit_Tag", + "ovl_En_Ruppecrow", + "ovl_En_Tanron4", + "ovl_En_Tanron5", + "ovl_En_Tanron6", + "ovl_En_Daiku2", + "ovl_En_Muto", + "ovl_En_Baisen", + "ovl_En_Heishi", + "ovl_En_Demo_heishi", + "ovl_En_Dt", + "ovl_En_Cha", + "ovl_Obj_Dinner", + "ovl_Eff_Lastday", + "ovl_Bg_Ikana_Dharma", + "ovl_En_Akindonuts", + "ovl_Eff_Stk", + "ovl_En_Ig", + "ovl_En_Rg", + "ovl_En_Osk", + "ovl_En_Sth2", + "ovl_En_Yb", + "ovl_En_Rz", + "ovl_En_Scopecoin", + "ovl_En_Bjt", + "ovl_En_Bomjima", + "ovl_En_Bomjimb", + "ovl_En_Bombers", + "ovl_En_Bombers2", + "ovl_En_Bombal", + "ovl_Obj_Moon_Stone", + "ovl_Obj_Mu_Pict", + "ovl_Bg_Ikninside", + "ovl_Eff_Zoraband", + "ovl_Obj_Kepn_Koya", + "ovl_Obj_Usiyane", + "ovl_En_Nnh", + "ovl_Obj_Kzsaku", + "ovl_Obj_Milk_Bin", + "ovl_En_Kitan", + "ovl_Bg_Astr_Bombwall", + "ovl_Bg_Iknin_Susceil", + "ovl_En_Bsb", + "ovl_En_Recepgirl", + "ovl_En_Thiefbird", + "ovl_En_Jgame_Tsn", + "ovl_Obj_Jgame_Light", + "ovl_Obj_Yado", + "ovl_Demo_Syoten", + "ovl_Demo_Moonend", + "ovl_Bg_Lbfshot", + "ovl_Bg_Last_Bwall", + "ovl_En_And", + "ovl_En_Invadepoh_Demo", + "ovl_Obj_Danpeilift", + "ovl_En_Fall2", + "ovl_Dm_Al", + "ovl_Dm_An", + "ovl_Dm_Ah", + "ovl_Dm_Nb", + "ovl_En_Drs", + "ovl_En_Ending_Hero", + "ovl_Dm_Bal", + "ovl_En_Paper", + "ovl_En_Hint_Skb", + "ovl_Dm_Tag", + "ovl_En_Bh", + "ovl_En_Ending_Hero2", + "ovl_En_Ending_Hero3", + "ovl_En_Ending_Hero4", + "ovl_En_Ending_Hero5", + "ovl_En_Ending_Hero6", + "ovl_Dm_Gm", + "ovl_Obj_Swprize", + "ovl_En_Invisible_Ruppe", + "ovl_Obj_Ending", + "ovl_En_Rsn", +] + +actor_type_enum = [ + "ACTORTYPE_SWITCH", + "ACTORTYPE_BG", + "ACTORTYPE_PLAYER", + "ACTORTYPE_EXPLOSIVES", + "ACTORTYPE_NPC", + "ACTORTYPE_ENEMY", + "ACTORTYPE_PROP", + "ACTORTYPE_ITEMACTION", + "ACTORTYPE_MISC", + "ACTORTYPE_BOSS", + "ACTORTYPE_DOOR", + "ACTORTYPE_CHEST" +] + +actor_enum = [ + "ACTOR_PLAYER", + "ACTOR_EN_TEST", + "ACTOR_EN_GIRLA", + "ACTOR_EN_PART", + "ACTOR_EN_LIGHT", + "ACTOR_EN_DOOR", + "ACTOR_EN_BOX", + "ACTOR_EN_PAMETFROG", + "ACTOR_EN_OKUTA", + "ACTOR_EN_BOM", + "ACTOR_EN_WALLMAS", + "ACTOR_EN_DODONGO", + "ACTOR_EN_FIREFLY", + "ACTOR_EN_HORSE", + "ACTOR_EN_ITEM00", + "ACTOR_EN_ARROW", + "ACTOR_EN_ELF", + "ACTOR_EN_NIW", + "ACTOR_EN_TITE", + "ACTOR_UNSET_13", + "ACTOR_EN_PEEHAT", + "ACTOR_EN_BUTTE", + "ACTOR_EN_INSECT", + "ACTOR_EN_FISH", + "ACTOR_EN_HOLL", + "ACTOR_EN_DINOFOS", + "ACTOR_EN_HATA", + "ACTOR_EN_ZL1", + "ACTOR_EN_VIEWER", + "ACTOR_EN_BUBBLE", + "ACTOR_DOOR_SHUTTER", + "ACTOR_UNSET_1F", + "ACTOR_EN_BOOM", + "ACTOR_EN_TORCH2", + "ACTOR_EN_MINIFROG", + "ACTOR_UNSET_23", + "ACTOR_EN_ST", + "ACTOR_UNSET_25", + "ACTOR_EN_A_OBJ", + "ACTOR_OBJ_WTURN", + "ACTOR_EN_RIVER_SOUND", + "ACTOR_UNSET_29", + "ACTOR_EN_OSSAN", + "ACTOR_UNSET_2B", + "ACTOR_UNSET_2C", + "ACTOR_EN_FAMOS", + "ACTOR_UNSET_2E", + "ACTOR_EN_BOMBF", + "ACTOR_UNSET_30", + "ACTOR_UNSET_31", + "ACTOR_EN_AM", + "ACTOR_EN_DEKUBABA", + "ACTOR_EN_M_FIRE1", + "ACTOR_EN_M_THUNDER", + "ACTOR_BG_BREAKWALL", + "ACTOR_UNSET_37", + "ACTOR_DOOR_WARP1", + "ACTOR_OBJ_SYOKUDAI", + "ACTOR_ITEM_B_HEART", + "ACTOR_EN_DEKUNUTS", + "ACTOR_EN_BBFALL", + "ACTOR_ARMS_HOOK", + "ACTOR_EN_BB", + "ACTOR_BG_KEIKOKU_SPR", + "ACTOR_UNSET_40", + "ACTOR_EN_WOOD02", + "ACTOR_UNSET_42", + "ACTOR_EN_DEATH", + "ACTOR_EN_MINIDEATH", + "ACTOR_UNSET_45", + "ACTOR_UNSET_46", + "ACTOR_EN_VM", + "ACTOR_DEMO_EFFECT", + "ACTOR_DEMO_KANKYO", + "ACTOR_EN_FLOORMAS", + "ACTOR_UNSET_4B", + "ACTOR_EN_RD", + "ACTOR_BG_F40_FLIFT", + "ACTOR_UNSET_4E", + "ACTOR_OBJ_MURE", + "ACTOR_EN_SW", + "ACTOR_OBJECT_KANKYO", + "ACTOR_UNSET_52", + "ACTOR_UNSET_53", + "ACTOR_EN_HORSE_LINK_CHILD", + "ACTOR_DOOR_ANA", + "ACTOR_UNSET_56", + "ACTOR_UNSET_57", + "ACTOR_UNSET_58", + "ACTOR_UNSET_59", + "ACTOR_UNSET_5A", + "ACTOR_EN_ENCOUNT1", + "ACTOR_DEMO_TRE_LGT", + "ACTOR_UNSET_5D", + "ACTOR_UNSET_5E", + "ACTOR_EN_ENCOUNT2", + "ACTOR_EN_FIRE_ROCK", + "ACTOR_BG_CTOWER_ROT", + "ACTOR_MIR_RAY", + "ACTOR_UNSET_63", + "ACTOR_EN_SB", + "ACTOR_EN_BIGSLIME", + "ACTOR_EN_KAREBABA", + "ACTOR_EN_IN", + "ACTOR_UNSET_68", + "ACTOR_EN_RU", + "ACTOR_EN_BOM_CHU", + "ACTOR_EN_HORSE_GAME_CHECK", + "ACTOR_EN_RR", + "ACTOR_UNSET_6D", + "ACTOR_UNSET_6E", + "ACTOR_UNSET_6F", + "ACTOR_UNSET_70", + "ACTOR_UNSET_71", + "ACTOR_UNSET_72", + "ACTOR_EN_FR", + "ACTOR_UNSET_74", + "ACTOR_UNSET_75", + "ACTOR_UNSET_76", + "ACTOR_UNSET_77", + "ACTOR_UNSET_78", + "ACTOR_UNSET_79", + "ACTOR_OBJ_OSHIHIKI", + "ACTOR_EFF_DUST", + "ACTOR_BG_UMAJUMP", + "ACTOR_ARROW_FIRE", + "ACTOR_ARROW_ICE", + "ACTOR_ARROW_LIGHT", + "ACTOR_ITEM_ETCETERA", + "ACTOR_OBJ_KIBAKO", + "ACTOR_OBJ_TSUBO", + "ACTOR_UNSET_83", + "ACTOR_EN_IK", + "ACTOR_UNSET_85", + "ACTOR_UNSET_86", + "ACTOR_UNSET_87", + "ACTOR_UNSET_88", + "ACTOR_DEMO_SHD", + "ACTOR_EN_DNS", + "ACTOR_ELF_MSG", + "ACTOR_EN_HONOTRAP", + "ACTOR_EN_TUBO_TRAP", + "ACTOR_OBJ_ICE_POLY", + "ACTOR_EN_FZ", + "ACTOR_EN_KUSA", + "ACTOR_OBJ_BEAN", + "ACTOR_OBJ_BOMBIWA", + "ACTOR_OBJ_SWITCH", + "ACTOR_UNSET_94", + "ACTOR_OBJ_LIFT", + "ACTOR_OBJ_HSBLOCK", + "ACTOR_EN_OKARINA_TAG", + "ACTOR_UNSET_98", + "ACTOR_EN_GOROIWA", + "ACTOR_UNSET_9A", + "ACTOR_UNSET_9B", + "ACTOR_EN_DAIKU", + "ACTOR_EN_NWC", + "ACTOR_ITEM_INBOX", + "ACTOR_EN_GE1", + "ACTOR_OBJ_BLOCKSTOP", + "ACTOR_EN_SDA", + "ACTOR_EN_CLEAR_TAG", + "ACTOR_UNSET_A3", + "ACTOR_EN_GM", + "ACTOR_EN_MS", + "ACTOR_EN_HS", + "ACTOR_BG_INGATE", + "ACTOR_EN_KANBAN", + "ACTOR_UNSET_A9", + "ACTOR_EN_ATTACK_NIW", + "ACTOR_UNSET_AB", + "ACTOR_UNSET_AC", + "ACTOR_UNSET_AD", + "ACTOR_EN_MK", + "ACTOR_EN_OWL", + "ACTOR_EN_ISHI", + "ACTOR_OBJ_HANA", + "ACTOR_OBJ_LIGHTSWITCH", + "ACTOR_OBJ_MURE2", + "ACTOR_UNSET_B4", + "ACTOR_EN_FU", + "ACTOR_UNSET_B6", + "ACTOR_UNSET_B7", + "ACTOR_EN_STREAM", + "ACTOR_EN_MM", + "ACTOR_UNSET_BA", + "ACTOR_UNSET_BB", + "ACTOR_EN_WEATHER_TAG", + "ACTOR_EN_ANI", + "ACTOR_UNSET_BE", + "ACTOR_EN_JS", + "ACTOR_UNSET_C0", + "ACTOR_UNSET_C1", + "ACTOR_UNSET_C2", + "ACTOR_UNSET_C3", + "ACTOR_EN_OKARINA_EFFECT", + "ACTOR_EN_MAG", + "ACTOR_ELF_MSG2", + "ACTOR_BG_F40_SWLIFT", + "ACTOR_UNSET_C8", + "ACTOR_UNSET_C9", + "ACTOR_EN_KAKASI", + "ACTOR_OBJ_MAKEOSHIHIKI", + "ACTOR_OCEFF_SPOT", + "ACTOR_UNSET_CD", + "ACTOR_EN_TORCH", + "ACTOR_UNSET_CF", + "ACTOR_SHOT_SUN", + "ACTOR_UNSET_D1", + "ACTOR_UNSET_D2", + "ACTOR_OBJ_ROOMTIMER", + "ACTOR_EN_SSH", + "ACTOR_UNSET_D5", + "ACTOR_OCEFF_WIPE", + "ACTOR_OCEFF_STORM", + "ACTOR_OBJ_DEMO", + "ACTOR_EN_MINISLIME", + "ACTOR_EN_NUTSBALL", + "ACTOR_UNSET_DB", + "ACTOR_UNSET_DC", + "ACTOR_UNSET_DD", + "ACTOR_UNSET_DE", + "ACTOR_OCEFF_WIPE2", + "ACTOR_OCEFF_WIPE3", + "ACTOR_UNSET_E1", + "ACTOR_EN_DG", + "ACTOR_EN_SI", + "ACTOR_OBJ_COMB", + "ACTOR_OBJ_KIBAKO2", + "ACTOR_UNSET_E6", + "ACTOR_EN_HS2", + "ACTOR_OBJ_MURE3", + "ACTOR_EN_TG", + "ACTOR_UNSET_EA", + "ACTOR_UNSET_EB", + "ACTOR_EN_WF", + "ACTOR_EN_SKB", + "ACTOR_UNSET_EE", + "ACTOR_EN_GS", + "ACTOR_OBJ_SOUND", + "ACTOR_EN_CROW", + "ACTOR_UNSET_F2", + "ACTOR_EN_COW", + "ACTOR_UNSET_F4", + "ACTOR_UNSET_F5", + "ACTOR_OCEFF_WIPE4", + "ACTOR_UNSET_F7", + "ACTOR_EN_ZO", + "ACTOR_OBJ_MAKEKINSUTA", + "ACTOR_EN_GE3", + "ACTOR_UNSET_FB", + "ACTOR_OBJ_HAMISHI", + "ACTOR_EN_ZL4", + "ACTOR_EN_MM2", + "ACTOR_UNSET_FF", + "ACTOR_DOOR_SPIRAL", + "ACTOR_UNSET_101", + "ACTOR_OBJ_PZLBLOCK", + "ACTOR_OBJ_TOGE", + "ACTOR_UNSET_104", + "ACTOR_OBJ_ARMOS", + "ACTOR_OBJ_BOYO", + "ACTOR_UNSET_107", + "ACTOR_UNSET_108", + "ACTOR_EN_GRASSHOPPER", + "ACTOR_UNSET_10A", + "ACTOR_OBJ_GRASS", + "ACTOR_OBJ_GRASS_CARRY", + "ACTOR_OBJ_GRASS_UNIT", + "ACTOR_UNSET_10E", + "ACTOR_UNSET_10F", + "ACTOR_BG_FIRE_WALL", + "ACTOR_EN_BU", + "ACTOR_EN_ENCOUNT3", + "ACTOR_EN_JSO", + "ACTOR_OBJ_CHIKUWA", + "ACTOR_EN_KNIGHT", + "ACTOR_EN_WARP_TAG", + "ACTOR_EN_AOB_01", + "ACTOR_EN_BOJ_01", + "ACTOR_EN_BOJ_02", + "ACTOR_EN_BOJ_03", + "ACTOR_EN_ENCOUNT4", + "ACTOR_EN_BOM_BOWL_MAN", + "ACTOR_EN_SYATEKI_MAN", + "ACTOR_UNSET_11E", + "ACTOR_BG_ICICLE", + "ACTOR_EN_SYATEKI_CROW", + "ACTOR_EN_BOJ_04", + "ACTOR_EN_CNE_01", + "ACTOR_EN_BBA_01", + "ACTOR_EN_BJI_01", + "ACTOR_BG_SPDWEB", + "ACTOR_UNSET_126", + "ACTOR_UNSET_127", + "ACTOR_EN_MT_TAG", + "ACTOR_BOSS_01", + "ACTOR_BOSS_02", + "ACTOR_BOSS_03", + "ACTOR_BOSS_04", + "ACTOR_BOSS_05", + "ACTOR_BOSS_06", + "ACTOR_BOSS_07", + "ACTOR_BG_DY_YOSEIZO", + "ACTOR_UNSET_131", + "ACTOR_EN_BOJ_05", + "ACTOR_UNSET_133", + "ACTOR_UNSET_134", + "ACTOR_EN_SOB1", + "ACTOR_UNSET_136", + "ACTOR_UNSET_137", + "ACTOR_EN_GO", + "ACTOR_UNSET_139", + "ACTOR_EN_RAF", + "ACTOR_OBJ_FUNEN", + "ACTOR_OBJ_RAILLIFT", + "ACTOR_BG_NUMA_HANA", + "ACTOR_OBJ_FLOWERPOT", + "ACTOR_OBJ_SPINYROLL", + "ACTOR_DM_HINA", + "ACTOR_EN_SYATEKI_WF", + "ACTOR_OBJ_SKATEBLOCK", + "ACTOR_OBJ_ICEBLOCK", + "ACTOR_EN_BIGPAMET", + "ACTOR_EN_SYATEKI_DEKUNUTS", + "ACTOR_ELF_MSG3", + "ACTOR_EN_FG", + "ACTOR_DM_RAVINE", + "ACTOR_DM_SA", + "ACTOR_EN_SLIME", + "ACTOR_EN_PR", + "ACTOR_OBJ_TOUDAI", + "ACTOR_OBJ_ENTOTU", + "ACTOR_OBJ_BELL", + "ACTOR_EN_SYATEKI_OKUTA", + "ACTOR_UNSET_150", + "ACTOR_OBJ_SHUTTER", + "ACTOR_DM_ZL", + "ACTOR_EN_ELFGRP", + "ACTOR_DM_TSG", + "ACTOR_EN_BAGUO", + "ACTOR_OBJ_VSPINYROLL", + "ACTOR_OBJ_SMORK", + "ACTOR_EN_TEST2", + "ACTOR_EN_TEST3", + "ACTOR_EN_TEST4", + "ACTOR_EN_BAT", + "ACTOR_EN_SEKIHI", + "ACTOR_EN_WIZ", + "ACTOR_EN_WIZ_BROCK", + "ACTOR_EN_WIZ_FIRE", + "ACTOR_EFF_CHANGE", + "ACTOR_DM_STATUE", + "ACTOR_OBJ_FIRESHIELD", + "ACTOR_BG_LADDER", + "ACTOR_EN_MKK", + "ACTOR_DEMO_GETITEM", + "ACTOR_UNSET_166", + "ACTOR_EN_DNB", + "ACTOR_EN_DNH", + "ACTOR_EN_DNK", + "ACTOR_EN_DNQ", + "ACTOR_UNSET_16B", + "ACTOR_BG_KEIKOKU_SAKU", + "ACTOR_OBJ_HUGEBOMBIWA", + "ACTOR_EN_FIREFLY2", + "ACTOR_EN_RAT", + "ACTOR_EN_WATER_EFFECT", + "ACTOR_EN_KUSA2", + "ACTOR_BG_SPOUT_FIRE", + "ACTOR_UNSET_173", + "ACTOR_BG_DBLUE_MOVEBG", + "ACTOR_EN_DY_EXTRA", + "ACTOR_EN_BAL", + "ACTOR_EN_GINKO_MAN", + "ACTOR_EN_WARP_UZU", + "ACTOR_OBJ_DRIFTICE", + "ACTOR_EN_LOOK_NUTS", + "ACTOR_EN_MUSHI2", + "ACTOR_EN_FALL", + "ACTOR_EN_MM3", + "ACTOR_BG_CRACE_MOVEBG", + "ACTOR_EN_DNO", + "ACTOR_EN_PR2", + "ACTOR_EN_PRZ", + "ACTOR_EN_JSO2", + "ACTOR_OBJ_ETCETERA", + "ACTOR_EN_EGOL", + "ACTOR_OBJ_MINE", + "ACTOR_OBJ_PURIFY", + "ACTOR_EN_TRU", + "ACTOR_EN_TRT", + "ACTOR_UNSET_189", + "ACTOR_UNSET_18A", + "ACTOR_EN_TEST5", + "ACTOR_EN_TEST6", + "ACTOR_EN_AZ", + "ACTOR_EN_ESTONE", + "ACTOR_BG_HAKUGIN_POST", + "ACTOR_DM_OPSTAGE", + "ACTOR_DM_STK", + "ACTOR_DM_CHAR00", + "ACTOR_DM_CHAR01", + "ACTOR_DM_CHAR02", + "ACTOR_DM_CHAR03", + "ACTOR_DM_CHAR04", + "ACTOR_DM_CHAR05", + "ACTOR_DM_CHAR06", + "ACTOR_DM_CHAR07", + "ACTOR_DM_CHAR08", + "ACTOR_DM_CHAR09", + "ACTOR_OBJ_TOKEIDAI", + "ACTOR_UNSET_19D", + "ACTOR_EN_MNK", + "ACTOR_EN_EGBLOCK", + "ACTOR_EN_GUARD_NUTS", + "ACTOR_BG_HAKUGIN_BOMBWALL", + "ACTOR_OBJ_TOKEI_TOBIRA", + "ACTOR_BG_HAKUGIN_ELVPOLE", + "ACTOR_EN_MA4", + "ACTOR_EN_TWIG", + "ACTOR_EN_PO_FUSEN", + "ACTOR_EN_DOOR_ETC", + "ACTOR_EN_BIGOKUTA", + "ACTOR_BG_ICEFLOE", + "ACTOR_OBJ_OCARINALIFT", + "ACTOR_EN_TIME_TAG", + "ACTOR_BG_OPEN_SHUTTER", + "ACTOR_BG_OPEN_SPOT", + "ACTOR_BG_FU_KAITEN", + "ACTOR_OBJ_AQUA", + "ACTOR_EN_ELFORG", + "ACTOR_EN_ELFBUB", + "ACTOR_UNSET_1B2", + "ACTOR_EN_FU_MATO", + "ACTOR_EN_FU_KAGO", + "ACTOR_EN_OSN", + "ACTOR_BG_CTOWER_GEAR", + "ACTOR_EN_TRT2", + "ACTOR_OBJ_TOKEI_STEP", + "ACTOR_BG_LOTUS", + "ACTOR_EN_KAME", + "ACTOR_OBJ_TAKARAYA_WALL", + "ACTOR_BG_FU_MIZU", + "ACTOR_EN_SELLNUTS", + "ACTOR_BG_DKJAIL_IVY", + "ACTOR_UNSET_1BF", + "ACTOR_OBJ_VISIBLOCK", + "ACTOR_EN_TAKARAYA", + "ACTOR_EN_TSN", + "ACTOR_EN_DS2N", + "ACTOR_EN_FSN", + "ACTOR_EN_SHN", + "ACTOR_UNSET_1C6", + "ACTOR_EN_STOP_HEISHI", + "ACTOR_OBJ_BIGICICLE", + "ACTOR_EN_LIFT_NUTS", + "ACTOR_EN_TK", + "ACTOR_UNSET_1CB", + "ACTOR_BG_MARKET_STEP", + "ACTOR_OBJ_LUPYGAMELIFT", + "ACTOR_EN_TEST7", + "ACTOR_OBJ_LIGHTBLOCK", + "ACTOR_MIR_RAY2", + "ACTOR_EN_WDHAND", + "ACTOR_EN_GAMELUPY", + "ACTOR_BG_DANPEI_MOVEBG", + "ACTOR_EN_SNOWWD", + "ACTOR_EN_PM", + "ACTOR_EN_GAKUFU", + "ACTOR_ELF_MSG4", + "ACTOR_ELF_MSG5", + "ACTOR_EN_COL_MAN", + "ACTOR_EN_TALK_GIBUD", + "ACTOR_EN_GIANT", + "ACTOR_OBJ_SNOWBALL", + "ACTOR_BOSS_HAKUGIN", + "ACTOR_EN_GB2", + "ACTOR_EN_ONPUMAN", + "ACTOR_BG_TOBIRA01", + "ACTOR_EN_TAG_OBJ", + "ACTOR_OBJ_DHOUSE", + "ACTOR_OBJ_HAKAISI", + "ACTOR_BG_HAKUGIN_SWITCH", + "ACTOR_UNSET_1E5", + "ACTOR_EN_SNOWMAN", + "ACTOR_TG_SW", + "ACTOR_EN_PO_SISTERS", + "ACTOR_EN_PP", + "ACTOR_EN_HAKUROCK", + "ACTOR_EN_HANABI", + "ACTOR_OBJ_DOWSING", + "ACTOR_OBJ_WIND", + "ACTOR_EN_RACEDOG", + "ACTOR_EN_KENDO_JS", + "ACTOR_BG_BOTIHASIRA", + "ACTOR_EN_FISH2", + "ACTOR_EN_PST", + "ACTOR_EN_POH", + "ACTOR_OBJ_SPIDERTENT", + "ACTOR_EN_ZORAEGG", + "ACTOR_EN_KBT", + "ACTOR_EN_GG", + "ACTOR_EN_MARUTA", + "ACTOR_OBJ_SNOWBALL2", + "ACTOR_EN_GG2", + "ACTOR_OBJ_GHAKA", + "ACTOR_EN_DNP", + "ACTOR_EN_DAI", + "ACTOR_BG_GORON_OYU", + "ACTOR_EN_KGY", + "ACTOR_EN_INVADEPOH", + "ACTOR_EN_GK", + "ACTOR_EN_AN", + "ACTOR_UNSET_203", + "ACTOR_EN_BEE", + "ACTOR_EN_OT", + "ACTOR_EN_DRAGON", + "ACTOR_OBJ_DORA", + "ACTOR_EN_BIGPO", + "ACTOR_OBJ_KENDO_KANBAN", + "ACTOR_OBJ_HARIKO", + "ACTOR_EN_STH", + "ACTOR_BG_SINKAI_KABE", + "ACTOR_BG_HAKA_CURTAIN", + "ACTOR_BG_KIN2_BOMBWALL", + "ACTOR_BG_KIN2_FENCE", + "ACTOR_BG_KIN2_PICTURE", + "ACTOR_BG_KIN2_SHELF", + "ACTOR_EN_RAIL_SKB", + "ACTOR_EN_JG", + "ACTOR_EN_TRU_MT", + "ACTOR_OBJ_UM", + "ACTOR_EN_NEO_REEBA", + "ACTOR_BG_MBAR_CHAIR", + "ACTOR_BG_IKANA_BLOCK", + "ACTOR_BG_IKANA_MIRROR", + "ACTOR_BG_IKANA_ROTARYROOM", + "ACTOR_BG_DBLUE_BALANCE", + "ACTOR_BG_DBLUE_WATERFALL", + "ACTOR_EN_KAIZOKU", + "ACTOR_EN_GE2", + "ACTOR_EN_MA_YTS", + "ACTOR_EN_MA_YTO", + "ACTOR_OBJ_TOKEI_TURRET", + "ACTOR_BG_DBLUE_ELEVATOR", + "ACTOR_OBJ_WARPSTONE", + "ACTOR_EN_ZOG", + "ACTOR_OBJ_ROTLIFT", + "ACTOR_OBJ_JG_GAKKI", + "ACTOR_BG_INIBS_MOVEBG", + "ACTOR_EN_ZOT", + "ACTOR_OBJ_TREE", + "ACTOR_OBJ_Y2LIFT", + "ACTOR_OBJ_Y2SHUTTER", + "ACTOR_OBJ_BOAT", + "ACTOR_OBJ_TARU", + "ACTOR_OBJ_HUNSUI", + "ACTOR_EN_JC_MATO", + "ACTOR_MIR_RAY3", + "ACTOR_EN_ZOB", + "ACTOR_ELF_MSG6", + "ACTOR_OBJ_NOZOKI", + "ACTOR_EN_TOTO", + "ACTOR_EN_RAILGIBUD", + "ACTOR_EN_BABA", + "ACTOR_EN_SUTTARI", + "ACTOR_EN_ZOD", + "ACTOR_EN_KUJIYA", + "ACTOR_EN_GEG", + "ACTOR_OBJ_KINOKO", + "ACTOR_OBJ_YASI", + "ACTOR_EN_TANRON1", + "ACTOR_EN_TANRON2", + "ACTOR_EN_TANRON3", + "ACTOR_OBJ_CHAN", + "ACTOR_EN_ZOS", + "ACTOR_EN_S_GORO", + "ACTOR_EN_NB", + "ACTOR_EN_JA", + "ACTOR_BG_F40_BLOCK", + "ACTOR_BG_F40_SWITCH", + "ACTOR_EN_PO_COMPOSER", + "ACTOR_EN_GURUGURU", + "ACTOR_OCEFF_WIPE5", + "ACTOR_EN_STONE_HEISHI", + "ACTOR_OCEFF_WIPE6", + "ACTOR_EN_SCOPENUTS", + "ACTOR_EN_SCOPECROW", + "ACTOR_OCEFF_WIPE7", + "ACTOR_EFF_KAMEJIMA_WAVE", + "ACTOR_EN_HG", + "ACTOR_EN_HGO", + "ACTOR_EN_ZOV", + "ACTOR_EN_AH", + "ACTOR_OBJ_HGDOOR", + "ACTOR_BG_IKANA_BOMBWALL", + "ACTOR_BG_IKANA_RAY", + "ACTOR_BG_IKANA_SHUTTER", + "ACTOR_BG_HAKA_BOMBWALL", + "ACTOR_BG_HAKA_TOMB", + "ACTOR_EN_SC_RUPPE", + "ACTOR_BG_IKNV_DOUKUTU", + "ACTOR_BG_IKNV_OBJ", + "ACTOR_EN_PAMERA", + "ACTOR_OBJ_HSSTUMP", + "ACTOR_EN_HIDDEN_NUTS", + "ACTOR_EN_ZOW", + "ACTOR_EN_TALK", + "ACTOR_EN_AL", + "ACTOR_EN_TAB", + "ACTOR_EN_NIMOTSU", + "ACTOR_EN_HIT_TAG", + "ACTOR_EN_RUPPECROW", + "ACTOR_EN_TANRON4", + "ACTOR_EN_TANRON5", + "ACTOR_EN_TANRON6", + "ACTOR_EN_DAIKU2", + "ACTOR_EN_MUTO", + "ACTOR_EN_BAISEN", + "ACTOR_EN_HEISHI", + "ACTOR_EN_DEMO_HEISHI", + "ACTOR_EN_DT", + "ACTOR_EN_CHA", + "ACTOR_OBJ_DINNER", + "ACTOR_EFF_LASTDAY", + "ACTOR_BG_IKANA_DHARMA", + "ACTOR_EN_AKINDONUTS", + "ACTOR_EFF_STK", + "ACTOR_EN_IG", + "ACTOR_EN_RG", + "ACTOR_EN_OSK", + "ACTOR_EN_STH2", + "ACTOR_EN_YB", + "ACTOR_EN_RZ", + "ACTOR_EN_SCOPECOIN", + "ACTOR_EN_BJT", + "ACTOR_EN_BOMJIMA", + "ACTOR_EN_BOMJIMB", + "ACTOR_EN_BOMBERS", + "ACTOR_EN_BOMBERS2", + "ACTOR_EN_BOMBAL", + "ACTOR_OBJ_MOON_STONE", + "ACTOR_OBJ_MU_PICT", + "ACTOR_BG_IKNINSIDE", + "ACTOR_EFF_ZORABAND", + "ACTOR_OBJ_KEPN_KOYA", + "ACTOR_OBJ_USIYANE", + "ACTOR_EN_NNH", + "ACTOR_OBJ_KZSAKU", + "ACTOR_OBJ_MILK_BIN", + "ACTOR_EN_KITAN", + "ACTOR_BG_ASTR_BOMBWALL", + "ACTOR_BG_IKNIN_SUSCEIL", + "ACTOR_EN_BSB", + "ACTOR_EN_RECEPGIRL", + "ACTOR_EN_THIEFBIRD", + "ACTOR_EN_JGAME_TSN", + "ACTOR_OBJ_JGAME_LIGHT", + "ACTOR_OBJ_YADO", + "ACTOR_DEMO_SYOTEN", + "ACTOR_DEMO_MOONEND", + "ACTOR_BG_LBFSHOT", + "ACTOR_BG_LAST_BWALL", + "ACTOR_EN_AND", + "ACTOR_EN_INVADEPOH_DEMO", + "ACTOR_OBJ_DANPEILIFT", + "ACTOR_EN_FALL2", + "ACTOR_DM_AL", + "ACTOR_DM_AN", + "ACTOR_DM_AH", + "ACTOR_DM_NB", + "ACTOR_EN_DRS", + "ACTOR_EN_ENDING_HERO", + "ACTOR_DM_BAL", + "ACTOR_EN_PAPER", + "ACTOR_EN_HINT_SKB", + "ACTOR_DM_TAG", + "ACTOR_EN_BH", + "ACTOR_EN_ENDING_HERO2", + "ACTOR_EN_ENDING_HERO3", + "ACTOR_EN_ENDING_HERO4", + "ACTOR_EN_ENDING_HERO5", + "ACTOR_EN_ENDING_HERO6", + "ACTOR_DM_GM", + "ACTOR_OBJ_SWPRIZE", + "ACTOR_EN_INVISIBLE_RUPPE", + "ACTOR_OBJ_ENDING", + "ACTOR_EN_RSN" +] + +object_enum = [ + "OBJECT_UNSET_0", + "GAMEPLAY_KEEP", + "GAMEPLAY_FIELD_KEEP", + "GAMEPLAY_DANGEON_KEEP", + "OBJECT_NB", + "OBJECT_OKUTA", + "OBJECT_CROW", + "OBJECT_AH", + "OBJECT_DY_OBJ", + "OBJECT_WALLMASTER", + "OBJECT_DODONGO", + "OBJECT_FIREFLY", + "OBJECT_BOX", + "OBJECT_AL", + "OBJECT_BUBBLE", + "OBJECT_NIW", + "OBJECT_LINK_BOY", + "OBJECT_LINK_CHILD", + "OBJECT_TITE", + "OBJECT_TAB", + "OBJECT_PH", + "OBJECT_AND", + "OBJECT_MSMO", + "OBJECT_DINOFOS", + "OBJECT_DRS", + "OBJECT_ZL1", + "OBJECT_AN4", + "OBJECT_UNSET_1B", + "OBJECT_TEST3", + "OBJECT_FAMOS", + "OBJECT_UNSET_1E", + "OBJECT_UNSET_1F", + "OBJECT_ST", + "OBJECT_UNSET_21", + "OBJECT_THIEFBIRD", + "OBJECT_UNSET_23", + "OBJECT_UNSET_24", + "OBJECT_UNSET_25", + "OBJECT_UNSET_26", + "OBJECT_UNSET_27", + "OBJECT_UNSET_28", + "OBJECT_UNSET_29", + "OBJECT_BOMBF", + "OBJECT_UNSET_2B", + "OBJECT_UNSET_2C", + "OBJECT_UNSET_2D", + "OBJECT_UNSET_2E", + "OBJECT_UNSET_2F", + "OBJECT_AM", + "OBJECT_DEKUBABA", + "OBJECT_UNSET_32", + "OBJECT_UNSET_33", + "OBJECT_UNSET_34", + "OBJECT_UNSET_35", + "OBJECT_UNSET_36", + "OBJECT_UNSET_37", + "OBJECT_UNSET_38", + "OBJECT_UNSET_39", + "OBJECT_UNSET_3A", + "OBJECT_UNSET_3B", + "OBJECT_UNSET_3C", + "OBJECT_UNSET_3D", + "OBJECT_WARP1", + "OBJECT_B_HEART", + "OBJECT_DEKUNUTS", + "OBJECT_UNSET_41", + "OBJECT_UNSET_42", + "OBJECT_UNSET_43", + "OBJECT_UNSET_44", + "OBJECT_UNSET_45", + "OBJECT_UNSET_46", + "OBJECT_UNSET_47", + "OBJECT_UNSET_48", + "OBJECT_UNSET_49", + "OBJECT_UNSET_4A", + "OBJECT_UNSET_4B", + "OBJECT_UNSET_4C", + "OBJECT_UNSET_4D", + "OBJECT_UNSET_4E", + "OBJECT_UNSET_4F", + "OBJECT_UNSET_50", + "OBJECT_BB", + "OBJECT_DEATH", + "OBJECT_UNSET_53", + "OBJECT_UNSET_54", + "OBJECT_UNSET_55", + "OBJECT_UNSET_56", + "OBJECT_UNSET_57", + "OBJECT_UNSET_58", + "OBJECT_UNSET_59", + "OBJECT_UNSET_5A", + "OBJECT_UNSET_5B", + "OBJECT_F40_OBJ", + "OBJECT_PO_COMPOSER", + "OBJECT_UNSET_5E", + "OBJECT_HATA", + "OBJECT_UNSET_60", + "OBJECT_WOOD02", + "OBJECT_UNSET_62", + "OBJECT_UNSET_63", + "OBJECT_TRAP", + "OBJECT_UNSET_65", + "OBJECT_UNSET_66", + "OBJECT_UNSET_67", + "OBJECT_UNSET_68", + "OBJECT_UNSET_69", + "OBJECT_VM", + "OBJECT_UNSET_6B", + "OBJECT_UNSET_6C", + "OBJECT_UNSET_6D", + "OBJECT_UNSET_6E", + "OBJECT_UNSET_6F", + "OBJECT_EFC_STAR_FIELD", + "OBJECT_UNSET_71", + "OBJECT_UNSET_72", + "OBJECT_UNSET_73", + "OBJECT_UNSET_74", + "OBJECT_RD", + "OBJECT_YUKIMURA_OBJ", + "OBJECT_HEAVY_OBJECT", + "OBJECT_UNSET_78", + "OBJECT_UNSET_79", + "OBJECT_UNSET_7A", + "OBJECT_UNSET_7B", + "OBJECT_UNSET_7C", + "OBJECT_HORSE_LINK_CHILD", + "OBJECT_UNSET_7E", + "OBJECT_UNSET_7F", + "OBJECT_SYOKUDAI", + "OBJECT_UNSET_81", + "OBJECT_UNSET_82", + "OBJECT_UNSET_83", + "OBJECT_EFC_TW", + "OBJECT_UNSET_85", + "OBJECT_GI_KEY", + "OBJECT_MIR_RAY", + "OBJECT_CTOWER_ROT", + "OBJECT_UNSET_89", + "OBJECT_BDOOR", + "OBJECT_UNSET_8B", + "OBJECT_UNSET_8C", + "OBJECT_UNSET_8D", + "OBJECT_SB", + "OBJECT_GI_MELODY", + "OBJECT_GI_HEART", + "OBJECT_GI_COMPASS", + "OBJECT_GI_BOSSKEY", + "OBJECT_UNSET_93", + "OBJECT_GI_NUTS", + "OBJECT_UNSET_95", + "OBJECT_GI_HEARTS", + "OBJECT_GI_ARROWCASE", + "OBJECT_GI_BOMBPOUCH", + "OBJECT_IN", + "OBJECT_UNSET_9A", + "OBJECT_UNSET_9B", + "OBJECT_UNSET_9C", + "OBJECT_OS_ANIME", + "OBJECT_GI_BOTTLE", + "OBJECT_GI_STICK", + "OBJECT_GI_MAP", + "OBJECT_OF1D_MAP", + "OBJECT_RU2", + "OBJECT_UNSET_A3", + "OBJECT_GI_MAGICPOT", + "OBJECT_GI_BOMB_1", + "OBJECT_UNSET_A6", + "OBJECT_MA2", + "OBJECT_GI_PURSE", + "OBJECT_UNSET_A9", + "OBJECT_UNSET_AA", + "OBJECT_RR", + "OBJECT_UNSET_AC", + "OBJECT_UNSET_AD", + "OBJECT_UNSET_AE", + "OBJECT_GI_ARROW", + "OBJECT_GI_BOMB_2", + "OBJECT_UNSET_B1", + "OBJECT_UNSET_B2", + "OBJECT_GI_SHIELD_2", + "OBJECT_GI_HOOKSHOT", + "OBJECT_GI_OCARINA", + "OBJECT_GI_MILK", + "OBJECT_MA1", + "OBJECT_UNSET_B8", + "OBJECT_UNSET_B9", + "OBJECT_UNSET_BA", + "OBJECT_NY", + "OBJECT_FR", + "OBJECT_UNSET_BD", + "OBJECT_UNSET_BE", + "OBJECT_GI_BOW", + "OBJECT_GI_GLASSES", + "OBJECT_GI_LIQUID", + "OBJECT_ANI", + "OBJECT_GI_SHIELD_3", + "OBJECT_UNSET_C4", + "OBJECT_UNSET_C5", + "OBJECT_GI_BEAN", + "OBJECT_GI_FISH", + "OBJECT_UNSET_C8", + "OBJECT_UNSET_C9", + "OBJECT_UNSET_CA", + "OBJECT_GI_LONGSWORD", + "OBJECT_UNSET_CC", + "OBJECT_UNSET_CD", + "OBJECT_UNSET_CE", + "OBJECT_UNSET_CF", + "OBJECT_ZO", + "OBJECT_UNSET_D1", + "OBJECT_UMAJUMP", + "OBJECT_UNSET_D3", + "OBJECT_UNSET_D4", + "OBJECT_MASTERGOLON", + "OBJECT_MASTERZOORA", + "OBJECT_AOB", + "OBJECT_IK", + "OBJECT_AHG", + "OBJECT_CNE", + "OBJECT_UNSET_DB", + "OBJECT_UNSET_DC", + "OBJECT_AN3", + "OBJECT_BJI", + "OBJECT_BBA", + "OBJECT_AN2", + "OBJECT_UNSET_E1", + "OBJECT_AN1", + "OBJECT_BOJ", + "OBJECT_FZ", + "OBJECT_BOB", + "OBJECT_GE1", + "OBJECT_YABUSAME_POINT", + "OBJECT_UNSET_E8", + "OBJECT_UNSET_E9", + "OBJECT_UNSET_EA", + "OBJECT_UNSET_EB", + "OBJECT_D_HSBLOCK", + "OBJECT_D_LIFT", + "OBJECT_MAMENOKI", + "OBJECT_GOROIWA", + "OBJECT_TORYO", + "OBJECT_DAIKU", + "OBJECT_NWC", + "OBJECT_GM", + "OBJECT_MS", + "OBJECT_HS", + "OBJECT_UNSET_F6", + "OBJECT_LIGHTSWITCH", + "OBJECT_KUSA", + "OBJECT_TSUBO", + "OBJECT_UNSET_FA", + "OBJECT_UNSET_FB", + "OBJECT_KANBAN", + "OBJECT_OWL", + "OBJECT_MK", + "OBJECT_FU", + "OBJECT_GI_KI_TAN_MASK", + "OBJECT_UNSET_101", + "OBJECT_GI_MASK18", + "OBJECT_GI_RABIT_MASK", + "OBJECT_GI_TRUTH_MASK", + "OBJECT_UNSET_105", + "OBJECT_STREAM", + "OBJECT_MM", + "OBJECT_UNSET_108", + "OBJECT_UNSET_109", + "OBJECT_UNSET_10A", + "OBJECT_UNSET_10B", + "OBJECT_UNSET_10C", + "OBJECT_UNSET_10D", + "OBJECT_UNSET_10E", + "OBJECT_JS", + "OBJECT_CS", + "OBJECT_UNSET_111", + "OBJECT_UNSET_112", + "OBJECT_GI_SOLDOUT", + "OBJECT_UNSET_114", + "OBJECT_MAG", + "OBJECT_UNSET_116", + "OBJECT_UNSET_117", + "OBJECT_UNSET_118", + "OBJECT_GI_GOLONMASK", + "OBJECT_GI_ZORAMASK", + "OBJECT_UNSET_11B", + "OBJECT_UNSET_11C", + "OBJECT_KA", + "OBJECT_UNSET_11E", + "OBJECT_ZG", + "OBJECT_UNSET_120", + "OBJECT_GI_M_ARROW", + "OBJECT_DS2", + "OBJECT_UNSET_123", + "OBJECT_FISH", + "OBJECT_GI_SUTARU", + "OBJECT_UNSET_126", + "OBJECT_SSH", + "OBJECT_BIGSLIME", + "OBJECT_BG", + "OBJECT_BOMBIWA", + "OBJECT_HINTNUTS", + "OBJECT_RS", + "OBJECT_UNSET_12D", + "OBJECT_GLA", + "OBJECT_UNSET_12F", + "OBJECT_GELDB", + "OBJECT_UNSET_131", + "OBJECT_DOG", + "OBJECT_KIBAKO2", + "OBJECT_DNS", + "OBJECT_DNK", + "OBJECT_UNSET_136", + "OBJECT_GI_INSECT", + "OBJECT_UNSET_138", + "OBJECT_GI_GHOST", + "OBJECT_GI_SOUL", + "OBJECT_UNSET_13B", + "OBJECT_UNSET_13C", + "OBJECT_UNSET_13D", + "OBJECT_UNSET_13E", + "OBJECT_GI_RUPY", + "OBJECT_MU", + "OBJECT_WF", + "OBJECT_SKB", + "OBJECT_GS", + "OBJECT_PS", + "OBJECT_OMOYA_OBJ", + "OBJECT_COW", + "OBJECT_UNSET_147", + "OBJECT_GI_SWORD_1", + "OBJECT_UNSET_149", + "OBJECT_UNSET_14A", + "OBJECT_ZL4", + "OBJECT_LINK_GORON", + "OBJECT_LINK_ZORA", + "OBJECT_GRASSHOPPER", + "OBJECT_BOYO", + "OBJECT_UNSET_150", + "OBJECT_UNSET_151", + "OBJECT_UNSET_152", + "OBJECT_FWALL", + "OBJECT_LINK_NUTS", + "OBJECT_JSO", + "OBJECT_KNIGHT", + "OBJECT_ICICLE", + "OBJECT_SPDWEB", + "OBJECT_UNSET_159", + "OBJECT_BOSS01", + "OBJECT_BOSS02", + "OBJECT_BOSS03", + "OBJECT_BOSS04", + "OBJECT_BOSS05", + "OBJECT_BOSS06", + "OBJECT_BOSS07", + "OBJECT_RAF", + "OBJECT_FUNEN", + "OBJECT_RAILLIFT", + "OBJECT_NUMA_OBJ", + "OBJECT_FLOWERPOT", + "OBJECT_SPINYROLL", + "OBJECT_ICE_BLOCK", + "OBJECT_UNSET_168", + "OBJECT_KEIKOKU_DEMO", + "OBJECT_SLIME", + "OBJECT_PR", + "OBJECT_F52_OBJ", + "OBJECT_F53_OBJ", + "OBJECT_UNSET_16E", + "OBJECT_KIBAKO", + "OBJECT_SEK", + "OBJECT_GMO", + "OBJECT_BAT", + "OBJECT_SEKIHIL", + "OBJECT_SEKIHIG", + "OBJECT_SEKIHIN", + "OBJECT_SEKIHIZ", + "OBJECT_UNSET_177", + "OBJECT_WIZ", + "OBJECT_LADDER", + "OBJECT_MKK", + "OBJECT_UNSET_17B", + "OBJECT_UNSET_17C", + "OBJECT_UNSET_17D", + "OBJECT_KEIKOKU_OBJ", + "OBJECT_SICHITAI_OBJ", + "OBJECT_DEKUCITY_ANA_OBJ", + "OBJECT_RAT", + "OBJECT_WATER_EFFECT", + "OBJECT_UNSET_183", + "OBJECT_DBLUE_OBJECT", + "OBJECT_BAL", + "OBJECT_WARP_UZU", + "OBJECT_DRIFTICE", + "OBJECT_FALL", + "OBJECT_HANAREYAMA_OBJ", + "OBJECT_CRACE_OBJECT", + "OBJECT_DNQ", + "OBJECT_OBJECT_UNSET_TOKEIDAI", + "OBJECT_EG", + "OBJECT_TRU", + "OBJECT_TRT", + "OBJECT_HAKUGIN_OBJ", + "OBJECT_HORSE_GAME_CHECK", + "OBJECT_STK", + "OBJECT_UNSET_193", + "OBJECT_UNSET_194", + "OBJECT_MNK", + "OBJECT_GI_BOTTLE_RED", + "OBJECT_TOKEI_TOBIRA", + "OBJECT_AZ", + "OBJECT_TWIG", + "OBJECT_DEKUCITY_OBJ", + "OBJECT_PO_FUSEN", + "OBJECT_RACETSUBO", + "OBJECT_HA", + "OBJECT_BIGOKUTA", + "OBJECT_OPEN_OBJ", + "OBJECT_FU_KAITEN", + "OBJECT_FU_MATO", + "OBJECT_MTORIDE", + "OBJECT_OSN", + "OBJECT_TOKEI_STEP", + "OBJECT_LOTUS", + "OBJECT_TL", + "OBJECT_DKJAIL_OBJ", + "OBJECT_VISIBLOCK", + "OBJECT_TSN", + "OBJECT_DS2N", + "OBJECT_FSN", + "OBJECT_SHN", + "OBJECT_BIGICICLE", + "OBJECT_GI_BOTTLE_15", + "OBJECT_TK", + "OBJECT_MARKET_OBJ", + "OBJECT_GI_RESERVE00", + "OBJECT_GI_RESERVE01", + "OBJECT_LIGHTBLOCK", + "OBJECT_TAKARAYA_OBJECTS", + "OBJECT_WDHAND", + "OBJECT_SDN", + "OBJECT_SNOWWD", + "OBJECT_GIANT", + "OBJECT_COMB", + "OBJECT_HANA", + "OBJECT_BOSS_HAKUGIN", + "OBJECT_MEGANEANA_OBJ", + "OBJECT_GI_NUTSMASK", + "OBJECT_STK2", + "OBJECT_SPOT11_OBJ", + "OBJECT_DANPEI_OBJECT", + "OBJECT_DHOUSE", + "OBJECT_HAKAISI", + "OBJECT_PO", + "OBJECT_SNOWMAN", + "OBJECT_PO_SISTERS", + "OBJECT_PP", + "OBJECT_GORONSWITCH", + "OBJECT_DELF", + "OBJECT_BOTIHASIRA", + "OBJECT_GI_BIGBOMB", + "OBJECT_PST", + "OBJECT_BSMASK", + "OBJECT_SPIDERTENT", + "OBJECT_ZORAEGG", + "OBJECT_KBT", + "OBJECT_GG", + "OBJECT_MARUTA", + "OBJECT_GHAKA", + "OBJECT_OYU", + "OBJECT_DNP", + "OBJECT_DAI", + "OBJECT_KGY", + "OBJECT_FB", + "OBJECT_TAISOU", + "OBJECT_MASK_BU_SAN", + "OBJECT_MASK_KI_TAN", + "OBJECT_MASK_RABIT", + "OBJECT_MASK_SKJ", + "OBJECT_MASK_BAKURETU", + "OBJECT_MASK_TRUTH", + "OBJECT_GK", + "OBJECT_HAKA_OBJ", + "OBJECT_MASK_GORON", + "OBJECT_MASK_ZORA", + "OBJECT_MASK_NUTS", + "OBJECT_MASK_BOY", + "OBJECT_DNT", + "OBJECT_YUKIYAMA", + "OBJECT_ICEFLOE", + "OBJECT_GI_GOLD_DUST", + "OBJECT_GI_BOTTLE_16", + "OBJECT_GI_BOTTLE_22", + "OBJECT_BEE", + "OBJECT_OT", + "OBJECT_UTUBO", + "OBJECT_DORA", + "OBJECT_GI_LOACH", + "OBJECT_GI_SEAHORSE", + "OBJECT_BIGPO", + "OBJECT_HARIKO", + "OBJECT_DNO", + "OBJECT_SINKAI_KABE", + "OBJECT_KIN2_OBJ", + "OBJECT_ISHI", + "OBJECT_HAKUGIN_DEMO", + "OBJECT_JG", + "OBJECT_GI_SWORD_2", + "OBJECT_GI_SWORD_3", + "OBJECT_GI_SWORD_4", + "OBJECT_UM", + "OBJECT_MASK_GIBUDO", + "OBJECT_MASK_JSON", + "OBJECT_MASK_KERFAY", + "OBJECT_MASK_BIGELF", + "OBJECT_RB", + "OBJECT_MBAR_OBJ", + "OBJECT_IKANA_OBJ", + "OBJECT_KZ", + "OBJECT_TOKEI_TURRET", + "OBJECT_ZOG", + "OBJECT_ROTLIFT", + "OBJECT_POSTHOUSE_OBJ", + "OBJECT_GI_MASK09", + "OBJECT_GI_MASK14", + "OBJECT_GI_MASK15", + "OBJECT_INIBS_OBJECT", + "OBJECT_TREE", + "OBJECT_KAIZOKU_OBJ", + "OBJECT_GI_RESERVE_B_00", + "OBJECT_GI_RESERVE_C_00", + "OBJECT_ZOB", + "OBJECT_MILKBAR", + "OBJECT_DMASK", + "OBJECT_MASK_KYOJIN", + "OBJECT_GI_RESERVE_C_01", + "OBJECT_ZOD", + "OBJECT_KUMO30", + "OBJECT_OBJECT_UNSET_YASI", + "OBJECT_MASK_ROMERNY", + "OBJECT_TANRON1", + "OBJECT_TANRON2", + "OBJECT_TANRON3", + "OBJECT_GI_MAGICMUSHROOM", + "OBJECT_OBJECT_UNSET_CHAN", + "OBJECT_GI_MASK10", + "OBJECT_ZOS", + "OBJECT_MASK_POSTHAT", + "OBJECT_F40_SWITCH", + "OBJECT_LODMOON", + "OBJECT_TRO", + "OBJECT_GI_MASK12", + "OBJECT_GI_MASK23", + "OBJECT_GI_BOTTLE_21", + "OBJECT_GI_CAMERA", + "OBJECT_KAMEJIMA", + "OBJECT_HARFGIBUD", + "OBJECT_ZOV", + "OBJECT_HGDOOR", + "OBJECT_UNSET_22D", + "OBJECT_UNSET_22E", + "OBJECT_UNSET_22F", + "OBJECT_DOR01", + "OBJECT_DOR02", + "OBJECT_DOR03", + "OBJECT_DOR04", + "OBJECT_LAST_OBJ", + "OBJECT_REDEAD_OBJ", + "OBJECT_IKNINSIDE_OBJ", + "OBJECT_IKNV_OBJ", + "OBJECT_PAMERA", + "OBJECT_HSSTUMP", + "OBJECT_ZM", + "OBJECT_BIG_FWALL", + "OBJECT_SECOM_OBJ", + "OBJECT_HUNSUI", + "OBJECT_UCH", + "OBJECT_TANRON4", + "OBJECT_TANRON5", + "OBJECT_DT", + "OBJECT_GI_MASK03", + "OBJECT_CHA", + "OBJECT_OBJECT_UNSET_DINNER", + "OBJECT_GI_RESERVE_B_01", + "OBJECT_LASTDAY", + "OBJECT_BAI", + "OBJECT_IN2", + "OBJECT_IKN_DEMO", + "OBJECT_YB", + "OBJECT_RZ", + "OBJECT_MASK_ZACHO", + "OBJECT_GI_FIELDMAP", + "OBJECT_MASK_STONE", + "OBJECT_BJT", + "OBJECT_TARU", + "OBJECT_MOONSTON", + "OBJECT_MASK_BREE", + "OBJECT_GI_SCHEDULE", + "OBJECT_GI_STONEMASK", + "OBJECT_ZORABAND", + "OBJECT_KEPN_KOYA", + "OBJECT_OBJECT_UNSET_USIYANE", + "OBJECT_GI_MASK05", + "OBJECT_GI_MASK11", + "OBJECT_GI_MASK20", + "OBJECT_NNH", + "OBJECT_MASK_GERO", + "OBJECT_MASK_YOFUKASI", + "OBJECT_MASK_MEOTO", + "OBJECT_MASK_DANCER", + "OBJECT_KZSAKU", + "OBJECT_OBJECT_UNSET_MILK_BIN", + "OBJECT_RANDOM_OBJ", + "OBJECT_KUJIYA", + "OBJECT_KITAN", + "OBJECT_GI_MASK06", + "OBJECT_GI_MASK16", + "OBJECT_ASTR_OBJ", + "OBJECT_BSB", + "OBJECT_FALL2", + "OBJECT_STH", + "OBJECT_GI_MSSA", + "OBJECT_SMTOWER", + "OBJECT_GI_MASK21", + "OBJECT_YADO_OBJ", + "OBJECT_SYOTEN", + "OBJECT_MOONEND", + "OBJECT_OB", + "OBJECT_GI_BOTTLE_04", + "OBJECT_OBJECT_UNSET_DANPEILIFT", + "OBJECT_WDOR01", + "OBJECT_WDOR02", + "OBJECT_WDOR03", + "OBJECT_STK3", + "OBJECT_KINSTA1_OBJ", + "OBJECT_KINSTA2_OBJ", + "OBJECT_BH", + "OBJECT_WDOR04", + "OBJECT_WDOR05", + "OBJECT_GI_MASK17", + "OBJECT_GI_MASK22", + "OBJECT_LBFSHOT", + "OBJECT_FUSEN", + "OBJECT_ENDING_OBJ", + "OBJECT_GI_MASK13" +] + +asm_files = [] + + +def read_file(name): + file_data=[] + + try: + with open(name, 'rb') as f: + file_data = f.read() + except IOError: + print('failed to read file ' + name) + return file_data + + +def read_uint32_be(file_data, offset): + return struct.unpack('>I', file_data[offset:offset+4])[0] + +def read_uint16_be(file_data, offset): + return struct.unpack('>H', file_data[offset:offset+2])[0] + +def read_uint8(file_data, offset): + return struct.unpack('B', file_data[offset:offset+1])[0] + +def read_actor_init(file_data, offset): + init = collections.namedtuple('ActorInit', + '''actor_id actor_type flags object_id instance_size init destroy update draw''') + return init._make(struct.unpack('>hBxIhxx5I', file_data[offset:offset+32])) + +def make_func_name(actor, offset, name): + if offset == 0: + return "NULL" + elif offset < 0x80800000: + return "func_{:08X}".format(offset) + else: + return actor + "_" + name + +for dirpath, dirnames, files in os.walk(os.path.abspath(os.curdir + "/asm/")): + asm_files = files + break + +for actor, overlay in zip(actor_names, overlay_names): + #print(actor + " " + overlay) + file_data = read_file("decomp/" + overlay) + folder_name = "overlays/actors/" + overlay + "/" + os.makedirs(folder_name, exist_ok=True) + + actor_code_file = "z_" + overlay[4:].lower() + ".c" + actor_header_file = "z_" + overlay[4:].lower() + ".h" + asm_file = [x for x in asm_files if (overlay + "_0x80") in x and "data" not in x][0] + + #print(overlay + " " + str(actor_code_file)) + + with open(folder_name + "/overlay.cfg", 'w') as f: + f.write(overlay + "\n") + f.write(actor_code_file + "\n") + + struct_name = overlay[4:].replace("_", "") + + #print(overlay + " " + struct_name) + + with open("asm/" + overlay + "_data.asm", "r") as f: + data = f.read() + init_data_re = re.search("/\* (\d*) .* \*/ \.word " + struct_name + "_Init", data) + offset = (int(init_data_re.group(1)) - 4) * 4 + actor_init = read_actor_init(file_data, offset) + + #print(overlay + " " + str(actor_init)) + + with open(folder_name + actor_header_file, 'w') as f: + header_guard = "Z_" + actor[6:] + "_H" + instance_size_extra = actor_init.instance_size - 0x144 + + f.write("#ifndef " + header_guard + "\n") + f.write("#define " + header_guard + "\n\n") + f.write("#include \n\n") + f.write("struct " + struct_name + ";\n\n") + + size_len_base16 = len("{:X}".format(actor_init.instance_size)) + f.write("typedef struct " + struct_name + " {\n") + f.write(" /* 0x{num:0{width}} */ Actor actor;\n".format(num = 0, width = size_len_base16)) + if instance_size_extra != 0: + f.write(" /* 0x{num:0{width}X} */ char unk_{num:0{width}X}[0x{extra:X}];\n".format(num = 0x144, width = size_len_base16, extra = instance_size_extra)) + f.write("} " + struct_name + "; // size = 0x{:X}\n\n".format(actor_init.instance_size)) + + f.write("extern const ActorInit " + (overlay[4:] + "_InitVars") + ";\n\n") + f.write("#endif // " + header_guard + "\n") + + with open(folder_name + actor_code_file, 'w') as f: + init_name = make_func_name(struct_name, actor_init.init, "Init") + destroy_name = make_func_name(struct_name, actor_init.destroy, "Destroy") + update_name = make_func_name(struct_name, actor_init.update, "Update") + draw_name = make_func_name(struct_name, actor_init.draw, "Draw") + + f.write("#include \"" + actor_header_file + "\"\n\n") + f.write("#define FLAGS 0x{:08X}\n\n".format(actor_init.flags)) + f.write("#define THIS ((" + struct_name + "*)thisx)\n\n") + + if actor_init.init >= 0x80800000: + f.write("void " + init_name + "(Actor* thisx, GlobalContext* globalCtx);\n") + if actor_init.destroy >= 0x80800000: + f.write("void " + destroy_name + "(Actor* thisx, GlobalContext* globalCtx);\n") + if actor_init.update >= 0x80800000: + f.write("void " + update_name + "(Actor* thisx, GlobalContext* globalCtx);\n") + if actor_init.draw >= 0x80800000: + f.write("void " + draw_name + "(Actor* thisx, GlobalContext* globalCtx);\n") + + f.write("\n") + f.write("/*\n") + f.write("const ActorInit " + (overlay[4:] + "_InitVars") + " = {\n") + f.write(" " + actor_enum[actor_init.actor_id] + ",\n") + f.write(" " + actor_type_enum[actor_init.actor_type] + ",\n") + f.write(" FLAGS,\n") + f.write(" " + object_enum[actor_init.object_id] + ",\n") + f.write(" sizeof(" + struct_name + "),\n") + f.write(" (ActorFunc)" + init_name + ",\n") + f.write(" (ActorFunc)" + destroy_name + ",\n") + f.write(" (ActorFunc)" + update_name + ",\n") + f.write(" (ActorFunc)" + draw_name + "\n") + f.write("};\n") + f.write("*/\n") + + func_names = [] + with open("asm/" + asm_file, "r") as asm: + lines = asm.readlines() + for line in lines: + if line.startswith("glabel") and not line.startswith("glabel .L"): + func_name = line.split()[1] + + assert(func_name != "") + + file_name = "asm/non_matchings/" + asm_file[:-4] + "/" + func_name + ".asm" + func_names.append(file_name) + + for name in func_names: + f.write("\nGLOBAL_ASM(\"{}\")\n".format(name))