diff options
| author | rozlette <uberpanzermensch@gmail.com> | 2019-11-14 00:52:31 -0600 |
|---|---|---|
| committer | rozlette <uberpanzermensch@gmail.com> | 2019-11-14 00:52:31 -0600 |
| commit | a09a799eef76b00a58e74209fb968d425d50447f (patch) | |
| tree | 990564d7d0e38aa6a049841b8b93f26cf07e41b3 | |
| parent | b1938991fa755ca1b75134c0a5c50d649faf1370 (diff) | |
Rename tons of structs because we aren't using the z_ prefix anymore ;_;
| -rw-r--r-- | include/functions.h | 224 | ||||
| -rw-r--r-- | include/structs.h | 738 | ||||
| -rw-r--r-- | include/variables.h | 30 | ||||
| -rw-r--r-- | src/actors/ovl_Bg_Fu_Kaiten_0x80ACB400/ovl_Bg_Fu_Kaiten_0x80ACB400.c | 28 | ||||
| -rw-r--r-- | src/actors/ovl_Bg_Ikana_Ray_0x80BD53C0/ovl_Bg_Ikana_Ray_0x80BD53C0.c | 38 | ||||
| -rw-r--r-- | src/boot/boot_0x80080180.c | 2 | ||||
| -rw-r--r-- | src/boot/boot_0x80085320.c | 12 | ||||
| -rw-r--r-- | src/boot_O2_g3/z_std_dma.c | 20 | ||||
| -rw-r--r-- | src/code/code_0x800A5AC0.c | 22 | ||||
| -rw-r--r-- | src/code/code_0x800BF9A0.c | 4 | ||||
| -rw-r--r-- | src/code/z_actor.c | 2 | ||||
| -rw-r--r-- | src/code/z_effect_soft_sprite.c | 42 | ||||
| -rw-r--r-- | src/code/z_lib.c | 80 | ||||
| -rw-r--r-- | tables/functions.py | 224 | ||||
| -rw-r--r-- | tables/variables.py | 30 |
15 files changed, 748 insertions, 748 deletions
diff --git a/include/functions.h b/include/functions.h index 57b1e08c1..15170fe60 100644 --- a/include/functions.h +++ b/include/functions.h @@ -23,13 +23,13 @@ UNK_RET func_800805E0(UNK_TYPE); // func_800805E0 UNK_RET func_80080748(void); // func_80080748 s32 Dmamgr_DoDmaTransfer(void*, void*, s32); // func_80080790 void Dmamgr_osEPiStartDmaWrapper(OSPiHandle* pihandle, OSIoMesg* mb, s32 direction); // func_800808D4 -z_DmadataEntry* Dmamgr_FindDmaEntry(u32); // func_800808F4 +DmadataEntry* Dmamgr_FindDmaEntry(u32); // func_800808F4 s32 Dmamgr_TranslateVromToRom(u32); // func_80080950 s32 Dmamgr_FindDmaIndex(u32); // func_800809BC UNK_TYPE* func_800809F4(u32); // func_800809F4 -void Dmamgr_HandleRequest(z_DmaRequest*); // func_80080A08 +void Dmamgr_HandleRequest(DmaRequest*); // func_80080A08 void Dmamgr_ThreadEntry(void*); // func_80080B84 -s32 Dmamgr_SendRequest(z_DmaRequest*, UNK_FUN_ARG, UNK_PTR, UNK_TYPE, UNK_TYPE, OSMesgQueue*, UNK_TYPE); // func_80080C04 +s32 Dmamgr_SendRequest(DmaRequest*, UNK_FUN_ARG, UNK_PTR, UNK_TYPE, UNK_TYPE, OSMesgQueue*, UNK_TYPE); // func_80080C04 s32 Dmamgr_SendRequestAndWait(UNK_TYPE, UNK_PTR, UNK_TYPE); // func_80080C90 void Dmamgr_Start(void); // func_80080D0C void Dmamgr_Stop(void); // func_80080E00 @@ -48,7 +48,7 @@ UNK_RET Irqmgr_HandlePrenmi3(UNK_ARGS); // func_80081550 UNK_RET Irqmgr_CheckThreadStatus(UNK_ARGS); // func_800815A8 UNK_RET Irqmgr_HandleFrame(UNK_ARGS); // func_800815CC UNK_RET Irqmgr_ThreadEntry(UNK_ARGS); // func_80081684 -UNK_RET Irqmgr_Start(UNK_PTR, z_ThreadInfo*, UNK_TYPE, UNK_TYPE); // func_80081754 +UNK_RET Irqmgr_Start(UNK_PTR, ThreadInfo*, UNK_TYPE, UNK_TYPE); // func_80081754 void nop_80081820(void); // func_80081820 void nop_80081828(void); // func_80081828 void func_80081830(void); // func_80081830 @@ -141,11 +141,11 @@ UNK_RET func_80085204(UNK_ARGS); // func_80085204 UNK_RET func_8008520C(UNK_ARGS); // func_8008520C UNK_RET func_8008522C(UNK_ARGS); // func_8008522C UNK_RET func_8008524C(UNK_ARGS); // func_8008524C -void thread_info_init(z_ThreadInfo*, UNK_PTR, UNK_PTR, UNK_TYPE, UNK_TYPE, UNK_PTR); // func_80085320 -UNK_RET func_800853F8(z_ThreadInfo*); // func_800853F8 -UNK_TYPE get_thread_stack_status(z_ThreadInfo*); // func_80085468 +void thread_info_init(ThreadInfo*, UNK_PTR, UNK_PTR, UNK_TYPE, UNK_TYPE, UNK_PTR); // func_80085320 +UNK_RET func_800853F8(ThreadInfo*); // func_800853F8 +UNK_TYPE get_thread_stack_status(ThreadInfo*); // func_80085468 UNK_TYPE check_all_thread_status(UNK_ARGS); // func_800854E0 -UNK_RET check_thread_status(z_ThreadInfo*); // func_80085538 +UNK_RET check_thread_status(ThreadInfo*); // func_80085538 UNK_RET func_80085570(UNK_ARGS); // func_80085570 UNK_RET func_800859BC(UNK_ARGS); // func_800859BC UNK_RET func_80085A08(UNK_ARGS); // func_80085A08 @@ -495,25 +495,25 @@ UNK_RET func_80096880(UNK_ARGS); // func_80096880 u32 func_800968B0(const u8*, const u8*); // func_800968B0 UNK_RET func_80096930(UNK_ARGS); // func_80096930 UNK_RET EnAObj_Init(void*, UNK_TYPE); // func_800A5AC0 -UNK_RET EnAObj_Fini(z_ActorEnAObj*, z_GlobalContext*); // func_800A5B6C -UNK_RET EnAObj_Update1(z_ActorEnAObj*, UNK_TYPE); // func_800A5B98 -UNK_RET EnAObj_Update2(z_ActorEnAObj*); // func_800A5C28 -UNK_RET EnAObj_Main(z_ActorEnAObj*, UNK_TYPE); // func_800A5C60 -UNK_RET EnAObj_Draw(z_ActorEnAObj*, UNK_TYPE); // func_800A5CB8 +UNK_RET EnAObj_Fini(ActorEnAObj*, GlobalContext*); // func_800A5B6C +UNK_RET EnAObj_Update1(ActorEnAObj*, UNK_TYPE); // func_800A5B98 +UNK_RET EnAObj_Update2(ActorEnAObj*); // func_800A5C28 +UNK_RET EnAObj_Main(ActorEnAObj*, UNK_TYPE); // func_800A5C60 +UNK_RET EnAObj_Draw(ActorEnAObj*, UNK_TYPE); // func_800A5CB8 UNK_RET EnItem00_UpdateForNewObjectId(UNK_ARGS); // func_800A5D00 UNK_RET EnItem00_Init(UNK_ARGS); // func_800A5D70 UNK_RET EnItem00_Fini(UNK_ARGS); // func_800A637C -UNK_RET func_800A63A8(z_Actor* a0, z_GlobalContext* a1); // func_800A63A8 -UNK_RET func_800A640C(z_Actor* a0, z_GlobalContext* a1); // func_800A640C -UNK_RET func_800A6650(z_Actor* a0, z_GlobalContext* a1); // func_800A6650 +UNK_RET func_800A63A8(Actor* a0, GlobalContext* a1); // func_800A63A8 +UNK_RET func_800A640C(Actor* a0, GlobalContext* a1); // func_800A640C +UNK_RET func_800A6650(Actor* a0, GlobalContext* a1); // func_800A6650 UNK_RET func_800A6780(UNK_ARGS); // func_800A6780 -UNK_RET EnItem00_Update(z_Actor* a0, z_GlobalContext* a1); // func_800A6A40 +UNK_RET EnItem00_Update(Actor* a0, GlobalContext* a1); // func_800A6A40 UNK_RET EnItem00_Main(UNK_ARGS); // func_800A6B98 UNK_RET EnItem00_Draw(UNK_ARGS); // func_800A7128 -UNK_RET EnItem00_DrawRupee(z_Actor* a0, z_GlobalContext* a1); // func_800A72AC -UNK_RET EnItem00_DrawSprite(z_Actor* a0, z_GlobalContext* a1); // func_800A73A0 -UNK_RET EnItem00_DrawHeartContainer(z_Actor* a0, z_GlobalContext* a1); // func_800A74D8 -UNK_RET EnItem00_DrawHeartPiece(z_Actor* a0, z_GlobalContext* a1); // func_800A75B8 +UNK_RET EnItem00_DrawRupee(Actor* a0, GlobalContext* a1); // func_800A72AC +UNK_RET EnItem00_DrawSprite(Actor* a0, GlobalContext* a1); // func_800A73A0 +UNK_RET EnItem00_DrawHeartContainer(Actor* a0, GlobalContext* a1); // func_800A74D8 +UNK_RET EnItem00_DrawHeartPiece(Actor* a0, GlobalContext* a1); // func_800A75B8 s16 func_800A7650(s16); // func_800A7650 UNK_RET func_800A7730(UNK_ARGS); // func_800A7730 UNK_RET func_800A7AD4(UNK_ARGS); // func_800A7AD4 @@ -571,18 +571,18 @@ UNK_RET func_800AFB24(UNK_ARGS); // func_800AFB24 UNK_RET func_800AFC60(UNK_ARGS); // func_800AFC60 UNK_RET func_800AFDCC(UNK_ARGS); // func_800AFDCC UNK_RET func_800AFF24(UNK_ARGS); // func_800AFF24 -void EffectSS_Init(z_GlobalContext* ctxt, s32 numEntries); // func_800B0050 -void EffectSS_Clear(z_GlobalContext* ctxt); // func_800B0140 -z_LoadedParticleEntry* EffectSS_GetTable(void); // func_800B0200 -void EffectSS_Delete(z_LoadedParticleEntry* a0); // func_800B0210 -void EffectSS_ResetLoadedParticleEntry(z_LoadedParticleEntry* particle); // func_800B0270 +void EffectSS_Init(GlobalContext* ctxt, s32 numEntries); // func_800B0050 +void EffectSS_Clear(GlobalContext* ctxt); // func_800B0140 +LoadedParticleEntry* EffectSS_GetTable(void); // func_800B0200 +void EffectSS_Delete(LoadedParticleEntry* a0); // func_800B0210 +void EffectSS_ResetLoadedParticleEntry(LoadedParticleEntry* particle); // func_800B0270 s32 EffectSS_FindFreeSpace(u32 priority, u32* tableEntry); // func_800B0304 -void EffectSS_Copy(z_GlobalContext* ctxt, z_LoadedParticleEntry* a1); // func_800B043C -void EffectSS_LoadParticle(z_GlobalContext* ctxt, u32 type, u32 priority, void* initData); // func_800B04D4 -void EffectSS_UpdateParticle(z_GlobalContext* ctxt, u32 index); // func_800B067C -void EffectSS_UpdateAllParticles(z_GlobalContext* ctxt); // func_800B071C -void EffectSS_DrawParticle(z_GlobalContext* ctxt, s32 index); // func_800B07D8 -void EffectSS_DrawAllParticles(z_GlobalContext* ctxt); // func_800B081C +void EffectSS_Copy(GlobalContext* ctxt, LoadedParticleEntry* a1); // func_800B043C +void EffectSS_LoadParticle(GlobalContext* ctxt, u32 type, u32 priority, void* initData); // func_800B04D4 +void EffectSS_UpdateParticle(GlobalContext* ctxt, u32 index); // func_800B067C +void EffectSS_UpdateAllParticles(GlobalContext* ctxt); // func_800B071C +void EffectSS_DrawParticle(GlobalContext* ctxt, s32 index); // func_800B07D8 +void EffectSS_DrawAllParticles(GlobalContext* ctxt); // func_800B081C s16 func_800B096C(s16 a0, s16 a1, s32 a2); // func_800B096C s16 func_800B09D0(s16 a0, s16 a1, f32 a2); // func_800B09D0 u8 func_800B0A24(u8 a0, u8 a1, f32 a2); // func_800B0A24 @@ -607,7 +607,7 @@ UNK_RET func_800B13D8(UNK_ARGS); // func_800B13D8 UNK_RET func_800B14D4(UNK_ARGS); // func_800B14D4 UNK_RET func_800B1598(UNK_ARGS); // func_800B1598 UNK_RET func_800B165C(UNK_ARGS); // func_800B165C -UNK_RET func_800B16B8(z_GlobalContext*, z_Vector3f*, UNK_PTR, UNK_PTR, UNK_PTR, UNK_PTR); // func_800B16B8 +UNK_RET func_800B16B8(GlobalContext*, Vector3f*, UNK_PTR, UNK_PTR, UNK_PTR, UNK_PTR); // func_800B16B8 UNK_RET EffectSS_LoadSparkle(UNK_ARGS); // func_800B16F4 UNK_RET func_800B1830(UNK_ARGS); // func_800B1830 UNK_RET EffectSS_LoadBomb2(UNK_ARGS); // func_800B1908 @@ -685,7 +685,7 @@ UNK_RET func_800B5040(UNK_ARGS); // func_800B5040 UNK_RET func_800B51A4(UNK_ARGS); // func_800B51A4 UNK_RET func_800B5208(UNK_ARGS); // func_800B5208 UNK_RET func_800B5814(UNK_ARGS); // func_800B5814 -UNK_TYPE func_800B5BB0(z_GlobalContext*, UNK_TYPE); // func_800B5BB0 +UNK_TYPE func_800B5BB0(GlobalContext*, UNK_TYPE); // func_800B5BB0 UNK_RET func_800B5BF4(UNK_ARGS); // func_800B5BF4 UNK_RET func_800B5C34(UNK_ARGS); // func_800B5C34 UNK_RET func_800B5C78(UNK_ARGS); // func_800B5C78 @@ -698,8 +698,8 @@ UNK_RET func_800B5CF8(UNK_ARGS); // func_800B5CF8 UNK_RET Actor_GetRoomCleared(UNK_ARGS); // func_800B5D18 UNK_RET Actor_SetRoomCleared(UNK_ARGS); // func_800B5D30 UNK_RET Actor_UnsetRoomCleared(UNK_ARGS); // func_800B5D4C -UNK_TYPE Actor_GetCollectibleFlag(z_GlobalContext*, s16); // func_800B5D6C -UNK_RET Actor_SetCollectibleFlag(z_GlobalContext*, s16); // func_800B5DB0 +UNK_TYPE Actor_GetCollectibleFlag(GlobalContext*, s16); // func_800B5D6C +UNK_RET Actor_SetCollectibleFlag(GlobalContext*, s16); // func_800B5DB0 UNK_RET func_800B5DF0(UNK_ARGS); // func_800B5DF0 UNK_RET func_800B5E0C(UNK_ARGS); // func_800B5E0C UNK_RET Actor_Nop800B5E50(UNK_ARGS); // func_800B5E50 @@ -714,19 +714,19 @@ UNK_RET func_800B64FC(UNK_ARGS); // func_800B64FC UNK_RET func_800B6584(UNK_ARGS); // func_800B6584 UNK_RET func_800B6608(UNK_ARGS); // func_800B6608 UNK_RET func_800B6680(UNK_ARGS); // func_800B6680 -UNK_RET Actor_MarkForDeath(z_Actor*); // func_800B670C +UNK_RET Actor_MarkForDeath(Actor*); // func_800B670C UNK_RET func_800B672C(UNK_ARGS); // func_800B672C -UNK_RET func_800B675C(z_ActorEnAObj*, UNK_TYPE); // func_800B675C +UNK_RET func_800B675C(ActorEnAObj*, UNK_TYPE); // func_800B675C UNK_RET func_800B67A0(UNK_ARGS); // func_800B67A0 UNK_RET func_800B67C0(UNK_ARGS); // func_800B67C0 -UNK_RET Actor_SetScale(z_Actor*, f32); // func_800B67E0 -UNK_RET Actor_SetObjectSegment(z_GlobalContext*, z_Actor*); // func_800B67FC +UNK_RET Actor_SetScale(Actor*, f32); // func_800B67E0 +UNK_RET Actor_SetObjectSegment(GlobalContext*, Actor*); // func_800B67FC UNK_RET Actor_InitToDefaultValues(UNK_ARGS); // func_800B6834 UNK_RET Actor_FiniActor(UNK_ARGS); // func_800B6948 UNK_RET Actor_SetMovementScale(UNK_ARGS); // func_800B6988 UNK_RET Actor_ApplyMovement(UNK_ARGS); // func_800B69AC UNK_RET Actor_SetVelocityYRotationAndGravity(UNK_ARGS); // func_800B6A10 -UNK_RET Actor_SetVelocityAndMoveYRotationAndGravity(z_Actor*); // func_800B6A88 +UNK_RET Actor_SetVelocityAndMoveYRotationAndGravity(Actor*); // func_800B6A88 UNK_RET Actor_SetVelocityXYRotation(UNK_ARGS); // func_800B6AB4 UNK_RET Actor_SetVelocityAndMoveXYRotation(UNK_ARGS); // func_800B6B24 UNK_RET Actor_SetVelocityXYRotationReverse(UNK_ARGS); // func_800B6B50 @@ -768,24 +768,24 @@ UNK_RET func_800B750C(UNK_ARGS); // func_800B750C UNK_RET func_800B75A0(UNK_ARGS); // func_800B75A0 UNK_RET func_800B761C(UNK_ARGS); // func_800B761C UNK_RET func_800B7678(UNK_ARGS); // func_800B7678 -UNK_RET func_800B78B8(z_GlobalContext*, z_Actor*, f32, f32, f32, UNK_TYPE); // func_800B78B8 +UNK_RET func_800B78B8(GlobalContext*, Actor*, f32, f32, f32, UNK_TYPE); // func_800B78B8 UNK_RET func_800B7E04(UNK_ARGS); // func_800B7E04 UNK_RET func_800B7FE0(UNK_ARGS); // func_800B7FE0 UNK_RET func_800B8018(UNK_ARGS); // func_800B8018 -UNK_RET func_800B8050(z_Actor*, z_GlobalContext*, UNK_TYPE); // func_800B8050 -UNK_RET func_800B8118(z_Actor*, z_GlobalContext*, UNK_TYPE); // func_800B8118 +UNK_RET func_800B8050(Actor*, GlobalContext*, UNK_TYPE); // func_800B8050 +UNK_RET func_800B8118(Actor*, GlobalContext*, UNK_TYPE); // func_800B8118 UNK_RET func_800B81E0(UNK_ARGS); // func_800B81E0 UNK_RET func_800B8214(UNK_ARGS); // func_800B8214 UNK_RET func_800B8248(UNK_ARGS); // func_800B8248 UNK_RET func_800B82EC(UNK_ARGS); // func_800B82EC UNK_RET func_800B83BC(UNK_ARGS); // func_800B83BC UNK_RET func_800B83F8(UNK_ARGS); // func_800B83F8 -UNK_TYPE func_800B84D0(z_ActorEnAObj*, UNK_TYPE); // func_800B84D0 +UNK_TYPE func_800B84D0(ActorEnAObj*, UNK_TYPE); // func_800B84D0 UNK_RET func_800B8500(UNK_ARGS); // func_800B8500 UNK_RET func_800B85E0(UNK_ARGS); // func_800B85E0 UNK_RET func_800B8614(UNK_ARGS); // func_800B8614 -UNK_RET func_800B863C(z_ActorEnAObj*, UNK_TYPE); // func_800B863C -UNK_TYPE func_800B867C(z_ActorEnAObj*); // func_800B867C +UNK_RET func_800B863C(ActorEnAObj*, UNK_TYPE); // func_800B863C +UNK_TYPE func_800B867C(ActorEnAObj*); // func_800B867C UNK_RET func_800B86C8(UNK_ARGS); // func_800B86C8 UNK_RET func_800B8708(UNK_ARGS); // func_800B8708 UNK_RET func_800B8718(UNK_ARGS); // func_800B8718 @@ -795,8 +795,8 @@ UNK_RET func_800B882C(UNK_ARGS); // func_800B882C UNK_RET func_800B886C(UNK_ARGS); // func_800B886C UNK_RET func_800B8898(UNK_ARGS); // func_800B8898 UNK_RET func_800B8934(UNK_ARGS); // func_800B8934 -UNK_TYPE Actor_HasParent(z_Actor*, z_GlobalContext*); // func_800B89F8 -UNK_RET func_800B8A1C(z_Actor*, z_GlobalContext*, UNK_TYPE, f32, f32); // func_800B8A1C +UNK_TYPE Actor_HasParent(Actor*, GlobalContext*); // func_800B89F8 +UNK_RET func_800B8A1C(Actor*, GlobalContext*, UNK_TYPE, f32, f32); // func_800B8A1C UNK_RET func_800B8B84(UNK_ARGS); // func_800B8B84 UNK_RET func_800B8BB0(UNK_ARGS); // func_800B8BB0 UNK_RET func_800B8BD0(UNK_ARGS); // func_800B8BD0 @@ -845,7 +845,7 @@ UNK_RET Actor_InsertIntoTypeList(UNK_ARGS); // func_800BAAB4 UNK_RET Actor_RemoveFromTypeList(UNK_ARGS); // func_800BAB24 UNK_RET Actor_FreeOverlay(UNK_ARGS); // func_800BABFC UNK_RET Actor_SpawnNoParentDefaultUnk38Unk20(UNK_ARGS); // func_800BAC60 -z_Actor* Actor_LoadOverlay(UNK_PTR, z_GlobalContext*, UNK_TYPE, f32, f32, f32, UNK_TYPE, UNK_TYPE, UNK_TYPE, UNK_TYPE); // func_800BACD4 +Actor* Actor_LoadOverlay(UNK_PTR, GlobalContext*, UNK_TYPE, f32, f32, f32, UNK_TYPE, UNK_TYPE, UNK_TYPE, UNK_TYPE); // func_800BACD4 UNK_RET Actor_Spawn(UNK_ARGS); // func_800BAE14 UNK_RET Actor_SpawnDefaultUnk38(UNK_ARGS); // func_800BB0C0 UNK_RET Actor_SpawnTransitionActors(UNK_ARGS); // func_800BB140 @@ -890,8 +890,8 @@ UNK_RET func_800BDB6C(UNK_ARGS); // func_800BDB6C UNK_RET func_800BDC5C(UNK_ARGS); // func_800BDC5C UNK_RET func_800BDCF4(UNK_ARGS); // func_800BDCF4 UNK_RET func_800BDFB0(UNK_ARGS); // func_800BDFB0 -UNK_RET func_800BDFC0(UNK_TYPE, UNK_TYPE, UNK_TYPE, z_ActorEnAObj*); // func_800BDFC0 -void func_800BE03C(z_GlobalContext*, UNK_TYPE); // func_800BE03C +UNK_RET func_800BDFC0(UNK_TYPE, UNK_TYPE, UNK_TYPE, ActorEnAObj*); // func_800BDFC0 +void func_800BE03C(GlobalContext*, UNK_TYPE); // func_800BE03C UNK_RET func_800BE0B8(UNK_ARGS); // func_800BE0B8 UNK_RET func_800BE184(UNK_ARGS); // func_800BE184 UNK_RET func_800BE22C(UNK_ARGS); // func_800BE22C @@ -1023,7 +1023,7 @@ UNK_RET func_800C5FD8(UNK_ARGS); // func_800C5FD8 UNK_TYPE func_800C6024(UNK_TYPE); // func_800C6024 UNK_RET func_800C6044(UNK_ARGS); // func_800C6044 UNK_RET func_800C6098(UNK_ARGS); // func_800C6098 -UNK_TYPE func_800C6188(z_GlobalContext*, UNK_PTR, z_Actor*, UNK_TYPE); // func_800C6188 +UNK_TYPE func_800C6188(GlobalContext*, UNK_PTR, Actor*, UNK_TYPE); // func_800C6188 UNK_TYPE func_800C6248(UNK_TYPE, UNK_TYPE); // func_800C6248 UNK_RET func_800C62BC(UNK_ARGS); // func_800C62BC UNK_RET func_800C6314(UNK_ARGS); // func_800C6314 @@ -1031,7 +1031,7 @@ UNK_RET func_800C636C(UNK_ARGS); // func_800C636C UNK_RET func_800C63C4(UNK_ARGS); // func_800C63C4 UNK_RET func_800C641C(UNK_ARGS); // func_800C641C UNK_RET func_800C6474(UNK_ARGS); // func_800C6474 -UNK_RET func_800C64CC(z_GlobalContext*, UNK_PTR, UNK_TYPE); // func_800C64CC +UNK_RET func_800C64CC(GlobalContext*, UNK_PTR, UNK_TYPE); // func_800C64CC UNK_RET func_800C6554(UNK_ARGS); // func_800C6554 UNK_RET func_800C656C(UNK_ARGS); // func_800C656C UNK_RET func_800C6838(UNK_ARGS); // func_800C6838 @@ -1105,7 +1105,7 @@ UNK_RET func_800CAAD0(UNK_TYPE, UNK_TYPE, UNK_TYPE); // func_800CAAD0 UNK_RET func_800CAC0C(UNK_TYPE, UNK_TYPE, UNK_TYPE); // func_800CAC0C UNK_RET func_800CACA0(UNK_TYPE, UNK_TYPE, UNK_TYPE); // func_800CACA0 UNK_TYPE func_800CAD2C(UNK_TYPE, UNK_TYPE, UNK_TYPE); // func_800CAD2C -UNK_RET func_800CAE10(z_Actor*, UNK_TYPE); // func_800CAE10 +UNK_RET func_800CAE10(Actor*, UNK_TYPE); // func_800CAE10 UNK_RET func_800CAE34(UNK_ARGS); // func_800CAE34 UNK_RET func_800CAE7C(UNK_ARGS); // func_800CAE7C UNK_RET func_800CAE88(UNK_TYPE); // func_800CAE88 @@ -1355,12 +1355,12 @@ UNK_RET func_800E1080(UNK_ARGS); // func_800E1080 UNK_RET Collision_InitCylinderParamsDefault(UNK_ARGS); // func_800E110C UNK_RET Collision_FiniCylinderParams(UNK_ARGS); // func_800E1148 UNK_RET Collision_InitCylinderParamsWithData(UNK_ARGS); // func_800E115C -void Collision_InitCylinderDefault(z_GlobalContext*, UNK_PTR); // func_800E119C -void Collision_FiniCylinder(z_GlobalContext*, UNK_PTR); // func_800E11EC +void Collision_InitCylinderDefault(GlobalContext*, UNK_PTR); // func_800E119C +void Collision_FiniCylinder(GlobalContext*, UNK_PTR); // func_800E11EC UNK_RET func_800E123C(UNK_ARGS); // func_800E123C UNK_RET func_800E12A4(UNK_ARGS); // func_800E12A4 -void Collision_InitCylinderWithData(z_GlobalContext*, UNK_PTR, z_Actor*, UNK_PTR); // func_800E130C -UNK_RET Collision_InitCylinder(UNK_TYPE, UNK_PTR, z_Actor*, UNK_PTR); // func_800E1374 +void Collision_InitCylinderWithData(GlobalContext*, UNK_PTR, Actor*, UNK_PTR); // func_800E130C +UNK_RET Collision_InitCylinder(UNK_TYPE, UNK_PTR, Actor*, UNK_PTR); // func_800E1374 UNK_RET func_800E13C0(UNK_ARGS); // func_800E13C0 UNK_RET func_800E1400(UNK_ARGS); // func_800E1400 UNK_RET func_800E1440(UNK_ARGS); // func_800E1440 @@ -1413,9 +1413,9 @@ UNK_RET Collision_Fini(UNK_ARGS); // func_800E2470 UNK_RET Collision_Reset(UNK_ARGS); // func_800E2480 UNK_RET Collision_EnableEditMode(UNK_ARGS); // func_800E2528 UNK_RET Collision_EnableAppendMode(UNK_ARGS); // func_800E2540 -void Collision_AddAT(z_GlobalContext*, UNK_PTR, UNK_PTR); // func_800E2558 +void Collision_AddAT(GlobalContext*, UNK_PTR, UNK_PTR); // func_800E2558 UNK_RET Collision_AddIndexAT(UNK_ARGS); // func_800E2634 -UNK_RET Collision_AddAC(z_GlobalContext*, UNK_PTR, UNK_PTR); // func_800E2740 +UNK_RET Collision_AddAC(GlobalContext*, UNK_PTR, UNK_PTR); // func_800E2740 UNK_RET collision_AddIndexAC(UNK_ARGS); // func_800E281C UNK_RET Collision_AddOT(UNK_TYPE, UNK_TYPE, UNK_PTR); // func_800E2928 UNK_RET Collision_AddIndexOT(UNK_ARGS); // func_800E2A04 @@ -1502,7 +1502,7 @@ UNK_RET func_800E7BCC(UNK_ARGS); // func_800E7BCC UNK_RET func_800E7C64(UNK_ARGS); // func_800E7C64 UNK_RET func_800E7DA8(UNK_ARGS); // func_800E7DA8 UNK_RET func_800E7DCC(UNK_ARGS); // func_800E7DCC -void Collision_CylinderMoveToActor(z_Actor*, UNK_PTR); // func_800E7DF8 +void Collision_CylinderMoveToActor(Actor*, UNK_PTR); // func_800E7DF8 UNK_RET Collision_CylinderSetLoc(UNK_ARGS); // func_800E7E3C UNK_RET Collision_QuadSetCoords(UNK_ARGS); // func_800E7E5C UNK_RET Collision_TriGroupSetCoordsAtIndex(UNK_ARGS); // func_800E7ECC @@ -1518,7 +1518,7 @@ UNK_RET func_800E8690(UNK_ARGS); // func_800E8690 UNK_RET func_800E86C0(UNK_ARGS); // func_800E86C0 UNK_RET func_800E86E0(UNK_ARGS); // func_800E86E0 UNK_RET func_800E8784(UNK_ARGS); // func_800E8784 -void func_800E8EA0(z_GlobalContext* a0, z_Actor* a1, u16 a2); // func_800E8EA0 +void func_800E8EA0(GlobalContext* a0, Actor* a1, u16 a2); // func_800E8EA0 UNK_TYPE func_800E8ED0(UNK_TYPE a0); // func_800E8ED0 void func_800E8EE0(UNK_TYPE a0); // func_800E8EE0 UNK_TYPE func_800E8EEC(UNK_TYPE a0); // func_800E8EEC @@ -1591,7 +1591,7 @@ UNK_RET func_800EE1D8(UNK_ARGS); // func_800EE1D8 UNK_RET func_800EE200(UNK_ARGS); // func_800EE200 UNK_RET func_800EE29C(UNK_ARGS); // func_800EE29C UNK_RET func_800EE2F4(UNK_ARGS); // func_800EE2F4 -UNK_RET func_800EE320(z_GlobalContext*, UNK_TYPE); // func_800EE320 +UNK_RET func_800EE320(GlobalContext*, UNK_TYPE); // func_800EE320 UNK_RET func_800EE364(UNK_ARGS); // func_800EE364 UNK_RET func_800EE400(UNK_ARGS); // func_800EE400 UNK_RET func_800EE5FC(UNK_ARGS); // func_800EE5FC @@ -1622,7 +1622,7 @@ UNK_RET func_800F01C8(UNK_ARGS); // func_800F01C8 UNK_RET func_800F0390(UNK_ARGS); // func_800F0390 UNK_RET func_800F03C0(UNK_ARGS); // func_800F03C0 UNK_RET func_800F048C(UNK_ARGS); // func_800F048C -UNK_RET func_800F0568(z_GlobalContext*, z_Vector3f*, UNK_TYPE, UNK_TYPE); // func_800F0568 +UNK_RET func_800F0568(GlobalContext*, Vector3f*, UNK_TYPE, UNK_TYPE); // func_800F0568 UNK_RET func_800F0590(UNK_ARGS); // func_800F0590 UNK_RET func_800F05C0(UNK_ARGS); // func_800F05C0 UNK_RET func_800F07C0(UNK_ARGS); // func_800F07C0 @@ -1814,39 +1814,39 @@ UNK_RET func_800FF2F8(UNK_ARGS); // func_800FF2F8 UNK_RET func_800FF3A0(UNK_ARGS); // func_800FF3A0 s16 Lib_rand_s(s16 a0, s16 a1); // func_800FF450 s16 Lib_randStride_s(s16 a0, s16 a1, s16 a2); // func_800FF4A4 -UNK_RET Lib_CopyVec3f(z_Vector3f* dst, z_Vector3f* src); // func_800FF50C -UNK_RET Lib_CopyVec3s(z_Vector3s* dst, z_Vector3s* src); // func_800FF52C -UNK_RET Lib_ToVec3f(z_Vector3f* dst, z_Vector3s* src); // func_800FF54C -UNK_RET Lib_ToVec3s(z_Vector3s* dst, z_Vector3f* src); // func_800FF584 -UNK_RET Lib_AddVec3f(z_Vector3f* a0, z_Vector3f* a1, z_Vector3f* a2); // func_800FF5BC -UNK_RET Lib_SubVec3f(z_Vector3f* a0, z_Vector3f* a1, z_Vector3f* a2); // func_800FF5F4 -UNK_RET Lib_SubVec3sToVec3f(z_Vector3f* a0, z_Vector3s* a1, z_Vector3s* a2); // func_800FF62C -UNK_RET Lib_ScaleInPlaceVec3f(z_Vector3f* a0, f32 a1); // func_800FF688 -UNK_RET Lib_ScaleVec3f(z_Vector3f* a0, f32 a1, z_Vector3f* a2); // func_800FF6C4 -UNK_RET Lib_LerpVec3f(z_Vector3f* a0, z_Vector3f* a1, f32 a2, z_Vector3f* a3); // func_800FF6F8 -UNK_RET Lib_AddScaledVec3f(z_Vector3f* a0, z_Vector3f* a1, f32 a2, z_Vector3f* a3); // func_800FF750 -UNK_RET Lib_ModifyRandScaled(z_Vector3f* a0, f32 a1, z_Vector3f* a2); // func_800FF79C -UNK_RET Lib_ScaledNormalizedDifferenceVec3f(z_Vector3f* a0, z_Vector3f* a1, f32 a2, z_Vector3f* a3); // func_800FF810 -f32 Lib_DistanceVec3f(z_Vector3f* a0, z_Vector3f* a1); // func_800FF884 -f32 Lib_DistanceAndDifferenceVec3f(z_Vector3f* a0, z_Vector3f* a1, z_Vector3f* a2); // func_800FF8D4 -f32 Lib_DistanceXZVec3f(z_Vector3f* a0, z_Vector3f* a1); // func_800FF92C -f32 Lib_DistanceAndDifferenceXZVec3f(z_Vector3f* a0, z_Vector3f* a1, f32* a2, f32* a3); // func_800FF960 -UNK_RET Lib_PushAwayXZVec3f(z_Vector3f* a0, z_Vector3f* a1, f32 a2); // func_800FF9A4 -f32 Lib_DistanceYVec3f(z_Vector3f* a0, z_Vector3f* a1); // func_800FFA4C -UNK_TYPE Lib_YawVec3f(z_Vector3f* a0, z_Vector3f* a1); // func_800FFA60 -UNK_TYPE Lib_PitchVec3f(z_Vector3f* a0, z_Vector3f* a1); // func_800FFA94 -void Lib_ApplyActorInitVars(z_Actor*, z_ActorInitVar*); // func_800FFADC -UNK_RET Lib_ApplyActorInitVarByte1(u8* a0, z_ActorInitVar* a1); // func_800FFB54 -UNK_RET Lib_ApplyActorInitVarByte2(u8* a0, z_ActorInitVar* a1); // func_800FFB70 -UNK_RET Lib_ApplyActorInitVarShort1(u8* a0, z_ActorInitVar* a1); // func_800FFB8C -UNK_RET Lib_ApplyActorInitVarShort2(u8* a0, z_ActorInitVar* a1); // func_800FFBA8 -UNK_RET Lib_ApplyActorInitVarWord1(u8* a0, z_ActorInitVar* a1); // func_800FFBC4 -UNK_RET Lib_ApplyActorInitVarWord2(u8* a0, z_ActorInitVar* a1); // func_800FFBE0 -UNK_RET Lib_ApplyActorInitVarFloat(u8* a0, z_ActorInitVar* a1); // func_800FFBFC -UNK_RET Lib_ApplyActorInitVarFloat1000th(u8* a0, z_ActorInitVar* a1); // func_800FFC20 -UNK_RET Lib_ApplyActorInitVarVector3f(u8* a0, z_ActorInitVar* a1); // func_800FFC50 -UNK_RET Lib_ApplyActorInitVarVector3f1000th(u8* a0, z_ActorInitVar* a1); // func_800FFC7C -UNK_RET Lib_ApplyActorInitVarVector3s(u8* a0, z_ActorInitVar* a1); // func_800FFCB4 +UNK_RET Lib_CopyVec3f(Vector3f* dst, Vector3f* src); // func_800FF50C +UNK_RET Lib_CopyVec3s(Vector3s* dst, Vector3s* src); // func_800FF52C +UNK_RET Lib_ToVec3f(Vector3f* dst, Vector3s* src); // func_800FF54C +UNK_RET Lib_ToVec3s(Vector3s* dst, Vector3f* src); // func_800FF584 +UNK_RET Lib_AddVec3f(Vector3f* a0, Vector3f* a1, Vector3f* a2); // func_800FF5BC +UNK_RET Lib_SubVec3f(Vector3f* a0, Vector3f* a1, Vector3f* a2); // func_800FF5F4 +UNK_RET Lib_SubVec3sToVec3f(Vector3f* a0, Vector3s* a1, Vector3s* a2); // func_800FF62C +UNK_RET Lib_ScaleInPlaceVec3f(Vector3f* a0, f32 a1); // func_800FF688 +UNK_RET Lib_ScaleVec3f(Vector3f* a0, f32 a1, Vector3f* a2); // func_800FF6C4 +UNK_RET Lib_LerpVec3f(Vector3f* a0, Vector3f* a1, f32 a2, Vector3f* a3); // func_800FF6F8 +UNK_RET Lib_AddScaledVec3f(Vector3f* a0, Vector3f* a1, f32 a2, Vector3f* a3); // func_800FF750 +UNK_RET Lib_ModifyRandScaled(Vector3f* a0, f32 a1, Vector3f* a2); // func_800FF79C +UNK_RET Lib_ScaledNormalizedDifferenceVec3f(Vector3f* a0, Vector3f* a1, f32 a2, Vector3f* a3); // func_800FF810 +f32 Lib_DistanceVec3f(Vector3f* a0, Vector3f* a1); // func_800FF884 +f32 Lib_DistanceAndDifferenceVec3f(Vector3f* a0, Vector3f* a1, Vector3f* a2); // func_800FF8D4 +f32 Lib_DistanceXZVec3f(Vector3f* a0, Vector3f* a1); // func_800FF92C +f32 Lib_DistanceAndDifferenceXZVec3f(Vector3f* a0, Vector3f* a1, f32* a2, f32* a3); // func_800FF960 +UNK_RET Lib_PushAwayXZVec3f(Vector3f* a0, Vector3f* a1, f32 a2); // func_800FF9A4 +f32 Lib_DistanceYVec3f(Vector3f* a0, Vector3f* a1); // func_800FFA4C +UNK_TYPE Lib_YawVec3f(Vector3f* a0, Vector3f* a1); // func_800FFA60 +UNK_TYPE Lib_PitchVec3f(Vector3f* a0, Vector3f* a1); // func_800FFA94 +void Lib_ApplyActorInitVars(Actor*, ActorInitVar*); // func_800FFADC +UNK_RET Lib_ApplyActorInitVarByte1(u8* a0, ActorInitVar* a1); // func_800FFB54 +UNK_RET Lib_ApplyActorInitVarByte2(u8* a0, ActorInitVar* a1); // func_800FFB70 +UNK_RET Lib_ApplyActorInitVarShort1(u8* a0, ActorInitVar* a1); // func_800FFB8C +UNK_RET Lib_ApplyActorInitVarShort2(u8* a0, ActorInitVar* a1); // func_800FFBA8 +UNK_RET Lib_ApplyActorInitVarWord1(u8* a0, ActorInitVar* a1); // func_800FFBC4 +UNK_RET Lib_ApplyActorInitVarWord2(u8* a0, ActorInitVar* a1); // func_800FFBE0 +UNK_RET Lib_ApplyActorInitVarFloat(u8* a0, ActorInitVar* a1); // func_800FFBFC +UNK_RET Lib_ApplyActorInitVarFloat1000th(u8* a0, ActorInitVar* a1); // func_800FFC20 +UNK_RET Lib_ApplyActorInitVarVector3f(u8* a0, ActorInitVar* a1); // func_800FFC50 +UNK_RET Lib_ApplyActorInitVarVector3f1000th(u8* a0, ActorInitVar* a1); // func_800FFC7C +UNK_RET Lib_ApplyActorInitVarVector3s(u8* a0, ActorInitVar* a1); // func_800FFCB4 f32 func_800FFCD8(f32*, f32, f32, f32, f32); // func_800FFCD8 UNK_RET Lib_ScaleMax_f(f32* a0, f32 a1, f32 a2, f32 a3); // func_800FFDF8 UNK_RET Lib_Scale_f(f32* a0, f32 a1, f32 a2); // func_800FFE68 @@ -1856,9 +1856,9 @@ UNK_RET Lib_CopyColor(u8* a0, u8* a1); // func_8010007C UNK_RET func_801000A4(u16 a0); // func_801000A4 UNK_RET func_801000CC(u16 a0); // func_801000CC UNK_RET func_801000F4(UNK_TYPE a0, u16 a1); // func_801000F4 -UNK_RET Lib_TranslateAndRotateYVec3f(z_Vector3f* a0, s16 a1, z_Vector3f* a2, z_Vector3f* a3); // func_8010011C +UNK_RET Lib_TranslateAndRotateYVec3f(Vector3f* a0, s16 a1, Vector3f* a2, Vector3f* a3); // func_8010011C UNK_RET Lib_LerpRGB(u8* a0, u8* a1, f32 a2, u8* a3); // func_801001B8 -f32 Lib_PushAwayVec3f(z_Vector3f* a0, z_Vector3f* a1, f32 a2); // func_80100448 +f32 Lib_PushAwayVec3f(Vector3f* a0, Vector3f* a1, f32 a2); // func_80100448 UNK_RET Lib_Nop801004FC(void); // func_801004FC UNK_TYPE Lib_PtrSegToPhys(u32 a0); // func_80100504 UNK_TYPE Lib_PtrSegToPhysNull(u32 a0); // func_8010053C @@ -1879,18 +1879,18 @@ UNK_RET Lights_SetPositionalLightColorAndRadius(UNK_ARGS); // func_80101AC8 UNK_RET Lights_SetPositionalLightPosition(UNK_ARGS); // func_80101AFC UNK_RET Lights_InitDirectional(UNK_ARGS); // func_80101B34 UNK_RET Lights_MapperInit(UNK_ARGS); // func_80101B8C -UNK_RET Lights_UploadLights(UNK_TYPE, z_GraphicsContext*); // func_80101BC8 +UNK_RET Lights_UploadLights(UNK_TYPE, GraphicsContext*); // func_80101BC8 UNK_RET Lights_MapperGetNextFreeSlot(UNK_ARGS); // func_80101D0C UNK_RET Lights_MapPositionalWithReference(UNK_ARGS); // func_80101D3C UNK_RET Lights_MapPositional(UNK_ARGS); // func_801020A0 UNK_RET Lights_MapDirectional(UNK_ARGS); // func_80102284 -UNK_RET Lights_MapLights(UNK_TYPE, z_Light*, UNK_TYPE, z_GlobalContext*); // func_801022F0 +UNK_RET Lights_MapLights(UNK_TYPE, z_Light*, UNK_TYPE, GlobalContext*); // func_801022F0 UNK_RET Lights_FindFreeSlot(UNK_ARGS); // func_801023D8 UNK_RET Lights_Free(UNK_ARGS); // func_80102464 UNK_RET Lights_Init(UNK_ARGS); // func_801024AC UNK_RET Lights_SetAmbientColor(UNK_ARGS); // func_80102518 UNK_RET func_80102544(UNK_ARGS); // func_80102544 -UNK_TYPE Lights_CreateMapper(z_LightingContext*, z_GraphicsContext*); // func_80102580 +UNK_TYPE Lights_CreateMapper(LightingContext*, GraphicsContext*); // func_80102580 UNK_RET Lights_ClearHead(UNK_ARGS); // func_801025B8 UNK_RET Lights_RemoveAll(UNK_ARGS); // func_801025C8 UNK_RET Lights_Insert(UNK_ARGS); // func_80102624 @@ -2119,7 +2119,7 @@ UNK_RET func_80112AFC(UNK_ARGS); // func_80112AFC UNK_RET func_80112B40(UNK_ARGS); // func_80112B40 UNK_RET func_80112BE4(UNK_ARGS); // func_80112BE4 UNK_RET func_80112C0C(UNK_ARGS); // func_80112C0C -UNK_RET func_80112E80(z_GlobalContext*, UNK_TYPE); // func_80112E80 +UNK_RET func_80112E80(GlobalContext*, UNK_TYPE); // func_80112E80 UNK_RET func_801143CC(UNK_ARGS); // func_801143CC UNK_RET func_80114978(UNK_ARGS); // func_80114978 UNK_RET func_801149A0(UNK_ARGS); // func_801149A0 @@ -2137,7 +2137,7 @@ UNK_RET func_8011552C(UNK_ARGS); // func_8011552C UNK_RET func_801155B4(UNK_ARGS); // func_801155B4 UNK_RET func_80115764(UNK_ARGS); // func_80115764 UNK_RET func_80115844(UNK_ARGS); // func_80115844 -UNK_RET func_80115908(z_GlobalContext*, UNK_TYPE); // func_80115908 +UNK_RET func_80115908(GlobalContext*, UNK_TYPE); // func_80115908 UNK_RET func_801159EC(UNK_ARGS); // func_801159EC UNK_RET func_80115A14(UNK_ARGS); // func_80115A14 UNK_RET func_80115D14(UNK_ARGS); // func_80115D14 @@ -2331,9 +2331,9 @@ UNK_RET func_8012C1EC(UNK_ARGS); // func_8012C1EC UNK_RET func_8012C214(UNK_ARGS); // func_8012C214 UNK_RET func_8012C240(UNK_ARGS); // func_8012C240 UNK_RET func_8012C268(UNK_ARGS); // func_8012C268 -UNK_RET func_8012C28C(z_GraphicsContext*); // func_8012C28C +UNK_RET func_8012C28C(GraphicsContext*); // func_8012C28C UNK_RET func_8012C2B4(UNK_ARGS); // func_8012C2B4 -UNK_RET func_8012C2DC(z_GraphicsContext*); // func_8012C2DC +UNK_RET func_8012C2DC(GraphicsContext*); // func_8012C2DC UNK_RET func_8012C304(UNK_ARGS); // func_8012C304 UNK_RET func_8012C3A4(UNK_ARGS); // func_8012C3A4 UNK_RET func_8012C3CC(UNK_ARGS); // func_8012C3CC @@ -2452,7 +2452,7 @@ UNK_RET func_8013115C(UNK_ARGS); // func_8013115C UNK_RET func_801311B4(UNK_ARGS); // func_801311B4 UNK_RET func_80131580(UNK_ARGS); // func_80131580 UNK_RET func_80131690(UNK_ARGS); // func_80131690 -void func_80131758(z_GlobalContext*, UNK_TYPE); // func_80131758 +void func_80131758(GlobalContext*, UNK_TYPE); // func_80131758 UNK_RET func_8013178C(UNK_ARGS); // func_8013178C UNK_RET func_801317C0(UNK_ARGS); // func_801317C0 UNK_RET func_801317F4(UNK_ARGS); // func_801317F4 @@ -2961,7 +2961,7 @@ UNK_RET func_80165E1C(UNK_ARGS); // func_80165E1C UNK_RET func_80165E7C(UNK_ARGS); // func_80165E7C UNK_RET func_80165EC0(UNK_ARGS); // func_80165EC0 UNK_RET func_80166060(UNK_ARGS); // func_80166060 -u32* func_801660B8(z_GlobalContext*, u32*, UNK_TYPE); // func_801660B8 +u32* func_801660B8(GlobalContext*, u32*, UNK_TYPE); // func_801660B8 UNK_RET Main_Fini(UNK_ARGS); // func_8016613C UNK_RET func_801663C4(UNK_ARGS); // func_801663C4 UNK_RET func_80166644(UNK_ARGS); // func_80166644 @@ -3007,7 +3007,7 @@ UNK_RET func_80169EFC(UNK_ARGS); // func_80169EFC UNK_RET func_80169F78(UNK_ARGS); // func_80169F78 UNK_RET func_80169FDC(UNK_ARGS); // func_80169FDC UNK_RET func_80169FFC(UNK_ARGS); // func_80169FFC -s32 func_8016A01C(z_GlobalContext*); // func_8016A01C +s32 func_8016A01C(GlobalContext*); // func_8016A01C UNK_RET func_8016A02C(UNK_ARGS); // func_8016A02C UNK_RET func_8016A0AC(UNK_ARGS); // func_8016A0AC UNK_RET func_8016A168(UNK_ARGS); // func_8016A168 @@ -3252,7 +3252,7 @@ UNK_RET Math3D_XZLength(UNK_ARGS); // func_8017A610 UNK_RET Math3D_XZDistanceSquared(UNK_ARGS); // func_8017A634 UNK_RET Math3D_XZDistance(UNK_ARGS); // func_8017A678 UNK_RET Math3D_LengthSquared(UNK_ARGS); // func_8017A6A8 -f32 Math3D_Length(z_Vector3f*); // func_8017A6D4 +f32 Math3D_Length(Vector3f*); // func_8017A6D4 UNK_RET Math3D_DistanceSquared(UNK_ARGS); // func_8017A6F8 UNK_RET Math3D_Distance(UNK_ARGS); // func_8017A720 UNK_RET Math3D_DistanceS(UNK_ARGS); // func_8017A740 @@ -3351,7 +3351,7 @@ UNK_RET SysMatrix_RotateAndTranslateState(UNK_ARGS); // func_801812FC UNK_RET SysMatrix_SetStateRotationAndTranslation(UNK_ARGS); // func_80181650 UNK_RET SysMatrix_ToRSPMatrix(UNK_ARGS); // func_801817FC UNK_RET SysMatrix_GetStateAsRSPMatrix(UNK_ARGS); // func_80181A18 -UNK_TYPE SysMatrix_AppendStateToPolyOpaDisp(z_GraphicsContext*); // func_80181A40 +UNK_TYPE SysMatrix_AppendStateToPolyOpaDisp(GraphicsContext*); // func_80181A40 UNK_RET SysMatrix_AppendToPolyOpaDisp(UNK_ARGS); // func_80181A6C UNK_RET SysMatrix_MultiplyVector3fByState(UNK_ARGS); // func_80181A98 UNK_RET SysMatrix_GetStateTranslation(UNK_ARGS); // func_80181B50 diff --git a/include/structs.h b/include/structs.h index 9fcc6a1ff..b5acf163a 100644 --- a/include/structs.h +++ b/include/structs.h @@ -154,7 +154,7 @@ typedef struct { typedef struct { /* 0x00 */ u8 unk0[32]; -} z_ActorDamageChart; +} ActorDamageChart; typedef struct { /* 0x00 */ s32 unk0; @@ -175,20 +175,20 @@ typedef struct { /* 0x36 */ s16 unk36; /* 0x38 */ s16 unk38; /* 0x3A */ s16 unk3A; -} z_ActorEnTest20C; +} ActorEnTest20C; typedef struct { /* 0x0 */ u32 cont : 1; /* 0x0 */ u32 type : 4; /* 0x0 */ u32 offset : 11; /* 0x2 */ s32 value : 16; -} z_ActorInitVar; +} ActorInitVar; typedef struct { /* 0x0 */ u32 unk0; /* 0x4 */ u8 unk4; /* 0x5 */ u8 unk5; -} z_ColBumpInit; +} ColBumpInit; typedef struct { /* 0x0 */ u8 unk0; @@ -197,26 +197,26 @@ typedef struct { /* 0x3 */ u8 unk3; /* 0x4 */ u8 unk4; /* 0x5 */ u8 type; -} z_ColCommonInit; +} ColCommonInit; typedef struct { /* 0x0 */ u32 collidesWith; /* 0x4 */ u8 unk4; /* 0x5 */ u8 unk5; -} z_ColTouch; +} ColTouch; typedef struct { /* 0x0 */ u32 unk0; /* 0x4 */ u8 unk4; /* 0x5 */ u8 unk5; -} z_ColTouchInit; +} ColTouchInit; typedef struct { /* 0x0 */ u8 red; /* 0x1 */ u8 green; /* 0x2 */ u8 blue; /* 0x3 */ u8 alpha; -} z_Color; +} Color; typedef struct { /* 0x00 */ u8 cutsceneCount; @@ -228,19 +228,19 @@ typedef struct { /* 0x10 */ u16 currentFrame; /* 0x12 */ UNK_TYPE1 pad12[22]; /* 0x28 */ UNK_TYPE4 unk28[10]; -} z_CutsceneContext; +} CutsceneContext; typedef struct { /* 0x0 */ u32 data; /* 0x4 */ UNK_TYPE1 pad4[4]; -} z_CutsceneEntry; +} CutsceneEntry; typedef struct { /* 0x0 */ u32 size; /* 0x4 */ void* unk4; /* 0x8 */ Gfx* append; /* 0xC */ void* appendEnd; -} z_DisplayList; +} DisplayList; typedef struct { /* 0x00 */ u32 vromStart; @@ -250,14 +250,14 @@ typedef struct { /* 0x14 */ UNK_TYPE4 unk14; /* 0x18 */ OSMesgQueue* callback; /* 0x1C */ void* callbackMesg; -} z_DmaRequest; +} DmaRequest; typedef struct { /* 0x0 */ u32 vromStart; /* 0x4 */ u32 vromEnd; /* 0x8 */ u32 romStart; /* 0xC */ u32 romEnd; -} z_DmadataEntry; +} DmadataEntry; typedef struct { /* 0x0 */ s16 x; @@ -270,7 +270,7 @@ typedef struct { /* 0xD */ s8 g; /* 0xE */ s8 b; /* 0xF */ s8 a; -} z_F3DVertexColor; +} F3DVertexColor; typedef struct { /* 0x0 */ s16 x; @@ -283,14 +283,14 @@ typedef struct { /* 0xD */ s8 normalY; /* 0xE */ s8 normalZ; /* 0xF */ s8 a; -} z_F3DVertexNormal; +} F3DVertexNormal; typedef struct { /* 0x0 */ UNK_TYPE4 size; /* 0x4 */ void* heapStart; /* 0x8 */ void* heapAppendStart; /* 0xC */ void* heapAppendEnd; -} z_GameStateHeap; +} GameStateHeap; typedef struct { /* 0x00 */ u32 ramLocation; @@ -305,12 +305,12 @@ typedef struct { /* 0x24 */ UNK_TYPE4 unk24; /* 0x28 */ UNK_TYPE4 unk28; /* 0x2C */ u32 size; -} z_GameStateMetaInfo; +} GameStateMetaInfo; typedef struct { /* 0x00 */ s32 unk0; /* 0x04 */ UNK_TYPE1 pad4[64]; -} z_GlobalContext17d98; +} GlobalContext17d98; typedef struct { /* 0x000 */ UNK_TYPE1 pad0[104]; @@ -346,13 +346,13 @@ typedef struct { /* 0x156 */ UNK_TYPE1 pad156[16]; /* 0x166 */ s16 unk166; /* 0x168 */ UNK_TYPE1 pad168[16]; -} z_GlobalContext220; +} GlobalContext220; // Font textures are loaded into here typedef struct { /* 0x0000 */ u8 unk0[128][120][2]; /* 0x7800 */ u8 unk7800[128][93]; -} z_GlobalContext4A70; +} GlobalContext4A70; typedef struct { /* 0x000 */ Gfx* polyOpaBuffer; @@ -365,15 +365,15 @@ typedef struct { /* 0x05C */ OSMesgQueue unk5C; /* 0x074 */ UNK_TYPE1 pad74[300]; /* 0x1A0 */ Gfx* unk1A0; -/* 0x1A4 */ z_DisplayList unk1A4; +/* 0x1A4 */ DisplayList unk1A4; /* 0x1B4 */ Gfx* unk1B4; -/* 0x1B8 */ z_DisplayList unk1B8; +/* 0x1B8 */ DisplayList unk1B8; /* 0x1C8 */ UNK_TYPE1 pad1C8[172]; /* 0x274 */ OSViMode* unk274; /* 0x278 */ UNK_TYPE1 pad278[32]; -/* 0x298 */ z_DisplayList overlay; -/* 0x2A8 */ z_DisplayList polyOpa; -/* 0x2B8 */ z_DisplayList polyXlu; +/* 0x298 */ DisplayList overlay; +/* 0x2A8 */ DisplayList polyOpa; +/* 0x2B8 */ DisplayList polyXlu; /* 0x2C8 */ s32 displaylistCounter; /* 0x2CC */ void* framebuffer; /* 0x2D0 */ UNK_TYPE1 pad2D0[11]; @@ -382,26 +382,26 @@ typedef struct { /* 0x2E4 */ f32 unk2E4; /* 0x2E8 */ f32 unk2E8; /* 0x2EC */ UNK_TYPE1 pad2EC[4]; -} z_GraphicsContext; +} GraphicsContext; typedef struct { /* 0x0 */ u16 buttons; /* 0x2 */ s8 xAxis; /* 0x3 */ s8 yAxis; /* 0x4 */ s16 unk4; -} z_InputInfo; +} InputInfo; typedef struct { -/* 0x00 */ z_InputInfo current; -/* 0x06 */ z_InputInfo last; -/* 0x0C */ z_InputInfo pressEdge; -/* 0x12 */ z_InputInfo releaseEdge; -} z_InputStruct; +/* 0x00 */ InputInfo current; +/* 0x06 */ InputInfo last; +/* 0x0C */ InputInfo pressEdge; +/* 0x12 */ InputInfo releaseEdge; +} InputStruct; typedef struct { /* 0x0 */ u8 type; /* 0x2 */ u16 params[6]; -} z_LightInfo; +} LightInfo; typedef struct { /* 0x0 */ s8 dirX; @@ -411,7 +411,7 @@ typedef struct { /* 0x4 */ u8 green; /* 0x5 */ u8 blue; /* 0x6 */ u16 pad[3]; -} z_LightInfoDirectionalParams; +} LightInfoDirectionalParams; typedef struct { /* 0x0 */ s16 posX; @@ -422,7 +422,7 @@ typedef struct { /* 0x8 */ u8 blue; /* 0x9 */ u8 unk9; // func_80102880 sets this only for type 2, func_80102A64 draws something if this is set /* 0xA */ s16 radius; -} z_LightInfoPositionalParams; +} LightInfoPositionalParams; typedef struct { /* 0x00 */ u8 enablePosLights; @@ -430,7 +430,7 @@ typedef struct { /* 0x02 */ UNK_TYPE1 pad2[6]; /* 0x08 */ Ambient ambient; /* 0x10 */ Light lights[7]; -} z_LightMapper; +} LightMapper; typedef struct { /* 0x00 */ f32 x[4]; @@ -442,7 +442,7 @@ typedef struct { typedef struct { /* 0x0 */ u32 vromStart; /* 0x4 */ u32 vromEnd; -} z_ObjectFileTableEntry; +} ObjectFileTableEntry; typedef struct { /* 0x00 */ u32 textSize; @@ -450,60 +450,60 @@ typedef struct { /* 0x08 */ u32 rodataSize; /* 0x0C */ u32 bssSize; /* 0x10 */ u32 amountOfRelocations; -} z_OverlayBlockSizes; +} OverlayBlockSizes; typedef struct { /* 0x0 */ u8 red; /* 0x1 */ u8 green; /* 0x2 */ u8 blue; -} z_RGB; +} RGB; typedef struct { /* 0x00 */ s16 intPart[16]; /* 0x20 */ u16 fracPart[16]; -} z_RSPMatrix; +} RSPMatrix; typedef struct { /* 0x0 */ u32 vromStart; /* 0x4 */ u32 vromEnd; -} z_RoomFileLocation; +} RoomFileLocation; typedef struct { /* 0x00 */ u8 zelda[6]; // Will always be "ZELDA3" for a valid save /* 0x06 */ UNK_TYPE1 pad6[34]; -} z_SaveContext_struct1; +} SaveContext_struct1; typedef struct { /* 0x00 */ UNK_TYPE1 pad0[34]; -} z_SaveContext_struct2; +} SaveContext_struct2; typedef struct { /* 0x00 */ UNK_TYPE1 pad0[136]; -} z_SaveContext_struct3; +} SaveContext_struct3; typedef struct { /* 0x0 */ UNK_TYPE1 pad0[16]; -} z_SceneActorInit; +} SceneActorInit; typedef struct { /* 0x0 */ u8 command; /* 0x1 */ u8 unk1; /* 0x2 */ UNK_TYPE1 pad2[2]; /* 0x4 */ u32 unk4; -} z_SceneHeaderEntry; +} SceneHeaderEntry; typedef struct { /* 0x00 */ s16 scenes[27]; -} z_SceneIdList; +} SceneIdList; typedef struct { /* 0x00 */ s16 id; // Negative ids mean that the object is unloaded /* 0x02 */ UNK_TYPE1 pad2[2]; /* 0x04 */ void* vramAddr; -/* 0x08 */ z_DmaRequest unk8; +/* 0x08 */ DmaRequest unk8; /* 0x28 */ OSMesgQueue unk28; /* 0x40 */ UNK_TYPE1 pad40[4]; -} z_SceneObject; +} SceneObject; typedef struct { /* 0x0 */ u32 romStart; @@ -513,7 +513,7 @@ typedef struct { /* 0xC */ UNK_TYPE1 padC[1]; /* 0xD */ u8 unkD; /* 0xE */ UNK_TYPE1 padE[2]; -} z_SceneTableEntry; +} SceneTableEntry; typedef struct { /* 0x0000 */ u8 unk0; @@ -533,7 +533,7 @@ typedef struct { /* 0x0A7A */ s16 unkA7A; /* 0x0A7C */ s16 unkA7C; /* 0x0A7E */ UNK_TYPE1 padA7E[2902]; -} z_StaticContext; +} StaticContext; typedef struct { /* 0x0 */ s8 unk0; @@ -546,31 +546,31 @@ typedef struct { /* 0xA */ s16 z; /* 0xC */ s16 yRot; /* 0xE */ u16 variable; -} z_TransitionActorInit; +} TransitionActorInit; typedef struct { /* 0x0 */ f32 x; /* 0x4 */ f32 y; /* 0x8 */ f32 z; -} z_Vector3f; +} Vector3f; typedef struct { /* 0x0 */ s16 x; /* 0x2 */ s16 y; /* 0x4 */ s16 z; -} z_Vector3s; +} Vector3s; typedef struct { /* 0x000 */ u32 magic; // always 0x56494557, "VIEW" -/* 0x004 */ z_GraphicsContext* graphics; +/* 0x004 */ GraphicsContext* graphics; /* 0x008 */ UNK_TYPE1 pad8[16]; /* 0x018 */ f32 unk18; /* 0x01C */ f32 unk1C; /* 0x020 */ f32 unk20; /* 0x024 */ f32 unk24; -/* 0x028 */ z_Vector3f unk28; -/* 0x034 */ z_Vector3f unk34; -/* 0x040 */ z_Vector3f unk40; +/* 0x028 */ Vector3f unk28; +/* 0x034 */ Vector3f unk34; +/* 0x040 */ Vector3f unk40; /* 0x04C */ UNK_TYPE1 pad4C[220]; /* 0x128 */ f32 unk128; /* 0x12C */ f32 unk12C; @@ -586,7 +586,7 @@ typedef struct { /* 0x154 */ f32 unk154; /* 0x158 */ f32 unk158; /* 0x15C */ UNK_TYPE1 pad15C[12]; -} z_View; +} View; typedef struct { /* 0x00 */ void* bufferEnd; @@ -594,125 +594,125 @@ typedef struct { /* 0x08 */ u32 amountLeftToRead; /* 0x0C */ u32 loadNextChunkBoundary; /* 0x10 */ u32 destBufferEnd; -} z_Yaz0DecompState; +} Yaz0DecompState; -typedef void(*light_map_directional_func)(z_LightMapper* mapper, void* params, z_Vector3f* pos); +typedef void(*light_map_directional_func)(LightMapper* mapper, void* params, Vector3f* pos); -typedef void(*light_map_positional_func)(z_LightMapper* mapper, void* params); +typedef void(*light_map_positional_func)(LightMapper* mapper, void* params); typedef struct { -/* 0x00 */ z_Vector3f unk0; -/* 0x0C */ z_Vector3f unkC; +/* 0x00 */ Vector3f unk0; +/* 0x0C */ Vector3f unkC; /* 0x18 */ s16 unk18; /* 0x1A */ s16 unk1A; } s80874650; // Related to collision? typedef struct { -/* 0x00 */ z_ActorDamageChart* damageChart; -/* 0x04 */ z_Vector3f displacement; +/* 0x00 */ ActorDamageChart* damageChart; +/* 0x04 */ Vector3f displacement; /* 0x10 */ s16 unk10; /* 0x12 */ s16 unk12; /* 0x14 */ s16 unk14; /* 0x16 */ u8 unk16; /* 0x17 */ u8 unk17; -} z_ActorA0; +} ActorA0; typedef struct { -/* 0x00 */ z_Vector3s rotation; +/* 0x00 */ Vector3s rotation; /* 0x08 */ f32 yDisplacement; -/* 0x0C */ func_ptr postDrawFunc; // TODO params (z_Actor*, UNK*, z_GlobalContext*) +/* 0x0C */ func_ptr postDrawFunc; // TODO params (Actor*, UNK*, GlobalContext*) /* 0x10 */ f32 unk10; /* 0x14 */ s8 unk14; -} z_ActorBC; +} ActorBC; typedef struct { /* 0x00 */ u8 unk0; -/* 0x04 */ z_ColTouchInit unk4; -/* 0x0C */ z_ColBumpInit unkC; +/* 0x04 */ ColTouchInit unk4; +/* 0x0C */ ColBumpInit unkC; /* 0x14 */ u8 unk14; /* 0x15 */ u8 unk15; /* 0x16 */ u8 unk16; -} z_ColBodyInfoInit; +} ColBodyInfoInit; typedef struct { /* 0x0 */ u32 collidesWith; /* 0x4 */ u8 unk4; /* 0x5 */ u8 unk5; -/* 0x6 */ z_Vector3s unk6; -} z_ColBump; +/* 0x6 */ Vector3s unk6; +} ColBump; typedef struct { /* 0x0 */ s16 radius; /* 0x2 */ s16 height; /* 0x4 */ s16 yOffset; -/* 0x6 */ z_Vector3s loc; -} z_ColCylinderParams; +/* 0x6 */ Vector3s loc; +} ColCylinderParams; typedef struct { -/* 0x00 */ z_Vector3f pointA; -/* 0x0C */ z_Vector3f pointB; -/* 0x18 */ z_Vector3f pointC; -/* 0x24 */ z_Vector3f pointD; -/* 0x30 */ z_Vector3s unk30; -/* 0x36 */ z_Vector3s unk36; +/* 0x00 */ Vector3f pointA; +/* 0x0C */ Vector3f pointB; +/* 0x18 */ Vector3f pointC; +/* 0x24 */ Vector3f pointD; +/* 0x30 */ Vector3s unk30; +/* 0x36 */ Vector3s unk36; /* 0x3C */ f32 unk3C; -} z_ColQuadParams; +} ColQuadParams; typedef struct { -/* 0x0 */ z_Vector3s loc; +/* 0x0 */ Vector3s loc; /* 0x6 */ s16 radius; -} z_ColSphereCollisionInfo; +} ColSphereCollisionInfo; typedef struct { -/* 0x00 */ z_Vector3s unk0; +/* 0x00 */ Vector3s unk0; /* 0x06 */ s16 unk6; -/* 0x08 */ z_ColSphereCollisionInfo colInfo; +/* 0x08 */ ColSphereCollisionInfo colInfo; /* 0x10 */ f32 unk10; /* 0x14 */ u8 unk14; /* 0x15 */ UNK_TYPE1 pad15[3]; -} z_ColSphereParams; +} ColSphereParams; typedef struct { /* 0x0 */ u8 unk0; -/* 0x1 */ z_ColSphereCollisionInfo unk1; +/* 0x1 */ ColSphereCollisionInfo unk1; /* 0xA */ s16 unkA; -} z_ColSphereParamsInit; +} ColSphereParamsInit; typedef struct { -/* 0x00 */ z_Vector3f pointA; -/* 0x0C */ z_Vector3f pointB; -/* 0x18 */ z_Vector3f pointC; -/* 0x24 */ z_Vector3f unitNormal; +/* 0x00 */ Vector3f pointA; +/* 0x0C */ Vector3f pointB; +/* 0x18 */ Vector3f pointC; +/* 0x24 */ Vector3f unitNormal; /* 0x30 */ f32 unk30; -} z_ColTriParams; +} ColTriParams; typedef struct { -/* 0x00 */ z_Vector3f unk0; -/* 0x0C */ z_Vector3f unkC; -/* 0x18 */ z_Vector3f unk18; -} z_ColTriParamsInit; +/* 0x00 */ Vector3f unk0; +/* 0x0C */ Vector3f unkC; +/* 0x18 */ Vector3f unk18; +} ColTriParamsInit; typedef struct { -/* 0x00 */ z_Vector3f position; -/* 0x0C */ z_Vector3f velocity; -/* 0x18 */ z_Vector3f acceleration; -/* 0x24 */ z_Color color1; -/* 0x28 */ z_Color color2; +/* 0x00 */ Vector3f position; +/* 0x0C */ Vector3f velocity; +/* 0x18 */ Vector3f acceleration; +/* 0x24 */ Color color1; +/* 0x28 */ Color color2; /* 0x2C */ s16 scale; /* 0x2E */ s16 scaleChangePerFrame; /* 0x30 */ s16 life; /* 0x32 */ u16 flags; // bit0: ? bit1: ? bit2: randomize colors /* 0x34 */ u8 type; // type0: start small, get big, fade away type1: start big, fade away -} z_EffectDustInit; +} EffectDustInit; typedef union { -/* 0x0 */ z_F3DVertexColor color; -/* 0x0 */ z_F3DVertexNormal normal; -} z_F3DVertex; +/* 0x0 */ F3DVertexColor color; +/* 0x0 */ F3DVertexNormal normal; +} F3DVertex; typedef struct { -/* 0x000 */ z_View unk0; +/* 0x000 */ View unk0; /* 0x168 */ UNK_TYPE1 pad168[194]; /* 0x22A */ s16 unk22A; /* 0x22C */ s16 unk22C; @@ -739,42 +739,42 @@ typedef struct { /* 0x256 */ UNK_TYPE1 pad256[26]; /* 0x270 */ s16 unk270; /* 0x272 */ UNK_TYPE1 pad272[214]; -} z_GlobalContext169E8; +} GlobalContext169E8; typedef struct { -/* 0x00000 */ z_View unk0; -/* 0x00168 */ z_GlobalContext4A70 unk168; +/* 0x00000 */ View unk0; +/* 0x00168 */ GlobalContext4A70 unk168; /* 0x0A7E8 */ UNK_TYPE1 padA7E8[30960]; -} z_GlobalContext4908; +} GlobalContext4908; typedef struct { /* 0x0 */ u8 type; -/* 0x2 */ z_LightInfoDirectionalParams params; -} z_LightInfoDirectional; +/* 0x2 */ LightInfoDirectionalParams params; +} LightInfoDirectional; typedef struct { /* 0x0 */ u8 type; -/* 0x2 */ z_LightInfoPositionalParams params; -} z_LightInfoPositional; +/* 0x2 */ LightInfoPositionalParams params; +} LightInfoPositional; typedef struct { -/* 0x00 */ z_Vector3f a; -/* 0x0C */ z_Vector3f b; -} z_LineSegment; +/* 0x00 */ Vector3f a; +/* 0x0C */ Vector3f b; +} LineSegment; typedef struct { /* 0x0000 */ UNK_TYPE1 pad0[12]; /* 0x000C */ u16 time; /* 0x000E */ UNK_TYPE1 padE[22]; -/* 0x0024 */ z_SaveContext_struct1 unk24; -/* 0x004C */ z_SaveContext_struct2 unk4C; +/* 0x0024 */ SaveContext_struct1 unk24; +/* 0x004C */ SaveContext_struct2 unk4C; /* 0x006E */ UNK_TYPE1 pad6E[2]; -/* 0x0070 */ z_SaveContext_struct3 unk70; +/* 0x0070 */ SaveContext_struct3 unk70; /* 0x00F8 */ UNK_TYPE1 padF8[3684]; /* 0x0F5C */ u32 mapsVisited; /* 0x0F60 */ UNK_TYPE1 padF60[170]; /* 0x100A */ u16 checksum; -} z_SaveContext; +} SaveContext; typedef struct { /* 0x000 */ void* objectVramStart; @@ -783,43 +783,43 @@ typedef struct { /* 0x009 */ u8 unk9; /* 0x00A */ u8 unkA; /* 0x00B */ u8 keepObjectId; -/* 0x00C */ z_SceneObject objects[35]; -} z_SceneContext; +/* 0x00C */ SceneObject objects[35]; +} SceneContext; typedef struct { -/* 0x00 */ z_ColCommonInit base; -/* 0x08 */ z_ColBodyInfoInit body; -/* 0x20 */ z_ColCylinderParams info; -} z_ColCylinderInit; +/* 0x00 */ ColCommonInit base; +/* 0x08 */ ColBodyInfoInit body; +/* 0x20 */ ColCylinderParams info; +} ColCylinderInit; typedef struct { -/* 0x00 */ z_ColCommonInit base; -/* 0x08 */ z_ColBodyInfoInit body; -/* 0x20 */ z_ColQuadParams params; -} z_ColQuadInit; +/* 0x00 */ ColCommonInit base; +/* 0x08 */ ColBodyInfoInit body; +/* 0x20 */ ColQuadParams params; +} ColQuadInit; typedef struct { -/* 0x00 */ z_ColBodyInfoInit body; -/* 0x18 */ z_ColSphereParamsInit params; -} z_ColSphereGroupElementInit; +/* 0x00 */ ColBodyInfoInit body; +/* 0x18 */ ColSphereParamsInit params; +} ColSphereGroupElementInit; typedef struct { -/* 0x0 */ z_ColCommonInit base; +/* 0x0 */ ColCommonInit base; /* 0x6 */ UNK_TYPE1 pad6[2]; /* 0x8 */ u32 count; -/* 0xC */ z_ColSphereGroupElementInit* init; -} z_ColSphereGroupInit; +/* 0xC */ ColSphereGroupElementInit* init; +} ColSphereGroupInit; typedef struct { -/* 0x00 */ z_ColCommonInit base; -/* 0x08 */ z_ColBodyInfoInit body; -/* 0x20 */ z_ColSphereParamsInit info; -} z_ColSphereInit; +/* 0x00 */ ColCommonInit base; +/* 0x08 */ ColBodyInfoInit body; +/* 0x20 */ ColSphereParamsInit info; +} ColSphereInit; typedef struct { -/* 0x00 */ z_ColBodyInfoInit body; -/* 0x18 */ z_ColTriParamsInit params; -} z_ColTriInit; +/* 0x00 */ ColBodyInfoInit body; +/* 0x18 */ ColTriParamsInit params; +} ColTriInit; typedef struct { /* 0x00 */ UNK_TYPE1 pad0[4]; @@ -837,13 +837,13 @@ typedef struct { /* 0x22 */ u16 unk22; /* 0x24 */ u16 unk24; /* 0x26 */ UNK_TYPE1 pad26[2]; -/* 0x28 */ z_LightInfoDirectional unk28; -/* 0x36 */ z_LightInfoDirectional unk36; +/* 0x28 */ LightInfoDirectional unk28; +/* 0x36 */ LightInfoDirectional unk36; /* 0x44 */ UNK_TYPE1 pad44[72]; -/* 0x8C */ z_Vector3s unk8C; -/* 0x92 */ z_Vector3s unk92; -/* 0x98 */ z_Vector3s unk98; -/* 0x9E */ z_Vector3s unk9E; +/* 0x8C */ Vector3s unk8C; +/* 0x92 */ Vector3s unk92; +/* 0x98 */ Vector3s unk98; +/* 0x9E */ Vector3s unk9E; /* 0xA4 */ s16 unkA4; /* 0xA6 */ s16 unkA6; /* 0xA8 */ UNK_TYPE1 padA8[12]; @@ -855,37 +855,37 @@ typedef struct { /* 0xC1 */ u8 unkC1; /* 0xC2 */ u8 unkC2; /* 0xC3 */ UNK_TYPE1 padC3[1]; -/* 0xC4 */ z_RGB unkC4; +/* 0xC4 */ RGB unkC4; /* 0xC7 */ s8 unkC7; /* 0xC8 */ s8 unkC8; /* 0xC9 */ s8 unkC9; -/* 0xCA */ z_RGB unkCA; +/* 0xCA */ RGB unkCA; /* 0xCD */ s8 unkCD; /* 0xCE */ s8 unkCE; /* 0xCF */ s8 unkCF; -/* 0xD0 */ z_RGB unkD0; -/* 0xD3 */ z_RGB unkD3; +/* 0xD0 */ RGB unkD0; +/* 0xD3 */ RGB unkD3; /* 0xD6 */ s16 unkD6; /* 0xD8 */ s16 unkD8; /* 0xDA */ UNK_TYPE1 padDA[2]; /* 0xDC */ f32 unkDC; /* 0xE0 */ u8 unkE0; /* 0xE1 */ UNK_TYPE1 padE1[17]; -} z_KankyoContext; +} KankyoContext; typedef struct { -/* 0x0 */ z_ColCommonInit base; +/* 0x0 */ ColCommonInit base; /* 0x8 */ u32 count; -/* 0xC */ z_ColTriInit* elemInit; -} z_ColTriGroupInit; +/* 0xC */ ColTriInit* elemInit; +} ColTriGroupInit; -typedef struct z_ActorBgMbarChair z_ActorBgMbarChair; +typedef struct ActorBgMbarChair ActorBgMbarChair; -typedef struct z_ActorEnBji01 z_ActorEnBji01; +typedef struct ActorEnBji01 ActorEnBji01; -typedef struct z_ActorEnTest z_ActorEnTest; +typedef struct ActorEnTest ActorEnTest; -typedef struct z_ActorInitData z_ActorInitData; +typedef struct ActorInitData ActorInitData; typedef struct { /* 0x00 */ u32 vromStart; @@ -893,101 +893,101 @@ typedef struct { /* 0x08 */ u32 vramStart; /* 0x0C */ u32 vramEnd; /* 0x10 */ u32 ramAddr; -/* 0x14 */ z_ActorInitData* initValues; +/* 0x14 */ ActorInitData* initValues; /* 0x18 */ s8* name; /* 0x1C */ s16 flags; // bit 0: don't allocate memory, use actorContext->0x250? bit 1: Always keep loaded? /* 0x1E */ s8 clients; /* 0x1F */ UNK_TYPE1 pad1F[1]; -} z_ActorOverlayTableEntry; +} ActorOverlayTableEntry; -typedef struct z_ActorPlayer z_ActorPlayer; +typedef struct ActorPlayer ActorPlayer; -typedef struct z_ActorTypeList z_ActorTypeList; +typedef struct ActorTypeList ActorTypeList; -typedef struct z_ActorContext z_ActorContext; +typedef struct ActorContext ActorContext; -typedef struct z_ColCommon z_ColCommon; +typedef struct ColCommon ColCommon; typedef struct { /* 0x000 */ s16 ATgroupLength; /* 0x002 */ u16 flags; // bit 0: collision bodies can't be added or removed, only swapped out -/* 0x004 */ z_ColCommon* ATgroup[50]; +/* 0x004 */ ColCommon* ATgroup[50]; /* 0x0CC */ s32 ACgroupLength; -/* 0x0D0 */ z_ColCommon* ACgroup[60]; +/* 0x0D0 */ ColCommon* ACgroup[60]; /* 0x1C0 */ s32 OTgroupLength; -/* 0x1C4 */ z_ColCommon* OTgroup[50]; +/* 0x1C4 */ ColCommon* OTgroup[50]; /* 0x28C */ s32 group4Length; -/* 0x290 */ z_ColCommon* group4[3]; -} z_CollisionContext; +/* 0x290 */ ColCommon* group4[3]; +} CollisionContext; -typedef struct z_ColBodyInfo z_ColBodyInfo; +typedef struct ColBodyInfo ColBodyInfo; -struct z_ColBodyInfo { -/* 0x00 */ z_ColTouch toucher; -/* 0x08 */ z_ColBump bumper; +struct ColBodyInfo { +/* 0x00 */ ColTouch toucher; +/* 0x08 */ ColBump bumper; /* 0x14 */ u8 unk14; /* 0x15 */ u8 unk15; // bit 0: can be toucher in AT-AC collision /* 0x16 */ u8 unk16; // bit 0: can be bumper in AT-AC collision /* 0x17 */ u8 unk17; -/* 0x18 */ z_ColCommon* unk18; -/* 0x1C */ z_ColCommon* unk1C; -/* 0x20 */ z_ColBodyInfo* unk20; -/* 0x24 */ z_ColBodyInfo* unk24; +/* 0x18 */ ColCommon* unk18; +/* 0x1C */ ColCommon* unk1C; +/* 0x20 */ ColBodyInfo* unk20; +/* 0x24 */ ColBodyInfo* unk24; }; typedef struct { -/* 0x00 */ z_ColBodyInfo body; -/* 0x28 */ z_ColSphereParams params; -} z_ColSphereGroupElement; +/* 0x00 */ ColBodyInfo body; +/* 0x28 */ ColSphereParams params; +} ColSphereGroupElement; typedef struct { -/* 0x00 */ z_ColBodyInfo body; -/* 0x28 */ z_ColTriParams params; -} z_ColTri; +/* 0x00 */ ColBodyInfo body; +/* 0x28 */ ColTriParams params; +} ColTri; -typedef struct z_ColCylinder z_ColCylinder; +typedef struct ColCylinder ColCylinder; -typedef struct z_ColQuad z_ColQuad; +typedef struct ColQuad ColQuad; -typedef struct z_ColSphere z_ColSphere; +typedef struct ColSphere ColSphere; -typedef struct z_ColSphereGroup z_ColSphereGroup; +typedef struct ColSphereGroup ColSphereGroup; -typedef struct z_ColTriGroup z_ColTriGroup; +typedef struct ColTriGroup ColTriGroup; -typedef struct z_ActorEnBom z_ActorEnBom; +typedef struct ActorEnBom ActorEnBom; -typedef struct z_ActorEnFirefly z_ActorEnFirefly; +typedef struct ActorEnFirefly ActorEnFirefly; -typedef struct z_ActorObjBell z_ActorObjBell; +typedef struct ActorObjBell ActorObjBell; -typedef struct z_ContextCommon z_ContextCommon; +typedef struct ContextCommon ContextCommon; -typedef struct z_OpeningContext z_OpeningContext; +typedef struct OpeningContext OpeningContext; -typedef struct z_TitleContext z_TitleContext; +typedef struct TitleContext TitleContext; -typedef struct z_EffectTableInfo z_EffectTableInfo; +typedef struct EffectTableInfo EffectTableInfo; -typedef struct z_GameAllocNode z_GameAllocNode; +typedef struct GameAllocNode GameAllocNode; -struct z_GameAllocNode { -/* 0x00 */ z_GameAllocNode* unk0; -/* 0x04 */ z_GameAllocNode* unk4; +struct GameAllocNode { +/* 0x00 */ GameAllocNode* unk0; +/* 0x04 */ GameAllocNode* unk4; /* 0x08 */ u32 size; /* 0x0C */ UNK_TYPE1 padC[4]; -/* 0x10 */ z_GameAllocNode* unk10; +/* 0x10 */ GameAllocNode* unk10; }; -struct z_ContextCommon { -/* 0x00 */ z_GraphicsContext* graphicsContext; +struct ContextCommon { +/* 0x00 */ GraphicsContext* graphicsContext; /* 0x04 */ func_ptr update; /* 0x08 */ func_ptr fini; /* 0x0C */ func_ptr nextGameStateInit; /* 0x10 */ u32 nextGameStateSize; -/* 0x14 */ z_InputStruct controllers[4]; -/* 0x74 */ z_GameStateHeap heap; -/* 0x84 */ z_GameAllocNode gamealloc; +/* 0x14 */ InputStruct controllers[4]; +/* 0x74 */ GameStateHeap heap; +/* 0x84 */ GameAllocNode gamealloc; /* 0x98 */ UNK_TYPE1 pad98[3]; /* 0x9B */ u8 shouldContinue; // If 0, switch to next game state /* 0x9C */ s32 frameCount; @@ -996,16 +996,16 @@ struct z_ContextCommon { /* 0xA3 */ UNK_TYPE1 padA3[1]; }; -struct z_OpeningContext { -/* 0x000 */ z_ContextCommon common; +struct OpeningContext { +/* 0x000 */ ContextCommon common; /* 0x0A4 */ UNK_TYPE1 padA4[4]; -/* 0x0A8 */ z_View unkA8; +/* 0x0A8 */ View unkA8; }; -struct z_TitleContext { -/* 0x000 */ z_ContextCommon common; +struct TitleContext { +/* 0x000 */ ContextCommon common; /* 0x0A4 */ u8* nintendo_logo_data; -/* 0x0A8 */ z_View unkA8; +/* 0x0A8 */ View unkA8; /* 0x210 */ UNK_TYPE1 pad210[40]; /* 0x238 */ s16 unk238; /* 0x23A */ s16 logoCoverAlpha; @@ -1017,22 +1017,22 @@ struct z_TitleContext { /* 0x245 */ UNK_TYPE1 pad245[3]; }; -typedef struct z_GlobalContext z_GlobalContext; +typedef struct GlobalContext GlobalContext; -typedef void(*collision_func)(z_GlobalContext*, z_CollisionContext*, z_ColCommon*, z_ColCommon*); +typedef void(*collision_func)(GlobalContext*, CollisionContext*, ColCommon*, ColCommon*); -typedef void(*cutscene_update_func)(z_GlobalContext* ctxt, z_CutsceneContext* cCtxt); +typedef void(*cutscene_update_func)(GlobalContext* ctxt, CutsceneContext* cCtxt); -typedef void(*global_context_func)(z_GlobalContext*); +typedef void(*global_context_func)(GlobalContext*); -typedef void(*scene_header_func)(z_GlobalContext* ctxt, z_SceneHeaderEntry* entry); +typedef void(*scene_header_func)(GlobalContext* ctxt, SceneHeaderEntry* entry); -typedef struct z_Heap z_Heap; +typedef struct Heap Heap; -typedef struct z_HeapNode z_HeapNode; +typedef struct HeapNode HeapNode; -struct z_Heap { -/* 0x00 */ z_HeapNode* head; +struct Heap { +/* 0x00 */ HeapNode* head; /* 0x04 */ u32 base; /* 0x08 */ OSMesgQueue lock; /* 0x20 */ UNK_TYPE1 pad20[1]; @@ -1040,22 +1040,22 @@ struct z_Heap { /* 0x22 */ UNK_TYPE1 pad22[2]; }; -struct z_HeapNode { +struct HeapNode { /* 0x0 */ s16 magic; // Should always be 0x7373 /* 0x2 */ s16 free; /* 0x4 */ u32 size; -/* 0x8 */ z_HeapNode* next; -/* 0xC */ z_HeapNode* prev; +/* 0x8 */ HeapNode* next; +/* 0xC */ HeapNode* prev; }; -typedef struct z_Irqmgr z_Irqmgr; +typedef struct Irqmgr Irqmgr; -typedef struct z_AudioThreadStruct z_AudioThreadStruct; +typedef struct AudioThreadStruct AudioThreadStruct; typedef struct z_Light z_Light; struct z_Light { -/* 0x0 */ z_LightInfo* info; +/* 0x0 */ LightInfo* info; /* 0x4 */ z_Light* prev; /* 0x8 */ z_Light* next; }; @@ -1068,30 +1068,30 @@ typedef struct { /* 0x7 */ UNK_TYPE1 pad7[3]; /* 0xA */ s16 unkA; /* 0xC */ s16 unkC; -} z_LightingContext; +} LightingContext; typedef struct { /* 0x000 */ int numOccupied; /* 0x004 */ int nextFree; /* 0x008 */ z_Light lights[32]; -} z_LightsList; +} LightsList; -typedef struct z_LoadedParticleEntry z_LoadedParticleEntry; +typedef struct LoadedParticleEntry LoadedParticleEntry; -typedef void(*effect_func)(z_GlobalContext* ctxt, u32 index, z_LoadedParticleEntry* particle); +typedef void(*effect_func)(GlobalContext* ctxt, u32 index, LoadedParticleEntry* particle); -typedef void(*effect_init_func)(z_GlobalContext* ctxt, u32 index, z_LoadedParticleEntry* particle, void* init); +typedef void(*effect_init_func)(GlobalContext* ctxt, u32 index, LoadedParticleEntry* particle, void* init); -struct z_EffectTableInfo { -/* 0x0 */ z_LoadedParticleEntry* data_table; // Name from debug assert +struct EffectTableInfo { +/* 0x0 */ LoadedParticleEntry* data_table; // Name from debug assert /* 0x4 */ s32 searchIndex; /* 0x8 */ s32 size; }; -struct z_LoadedParticleEntry { -/* 0x00 */ z_Vector3f position; -/* 0x0C */ z_Vector3f velocity; -/* 0x18 */ z_Vector3f acceleration; +struct LoadedParticleEntry { +/* 0x00 */ Vector3f position; +/* 0x0C */ Vector3f velocity; +/* 0x18 */ Vector3f acceleration; /* 0x24 */ effect_func update; /* 0x28 */ global_context_func draw; /* 0x2C */ f32 unk2C; @@ -1109,7 +1109,7 @@ struct z_LoadedParticleEntry { typedef struct { /* 0x0 */ UNK_TYPE4 unk0; /* 0x4 */ effect_init_func init; -} z_ParticleOverlayInfo; +} ParticleOverlayInfo; typedef struct { /* 0x00 */ u32 vromStart; @@ -1117,13 +1117,13 @@ typedef struct { /* 0x08 */ u32 vramStart; /* 0x0C */ u32 vramEnd; /* 0x10 */ u32 loadedRamAddr; -/* 0x14 */ z_ParticleOverlayInfo* overlayInfo; +/* 0x14 */ ParticleOverlayInfo* overlayInfo; /* 0x18 */ u32 unk18; // Always 0x01000000? -} z_ParticleOverlayTableEntry; +} ParticleOverlayTableEntry; -typedef struct z_OSMesgQueueListNode z_OSMesgQueueListNode; +typedef struct OSMesgQueueListNode OSMesgQueueListNode; -struct z_Irqmgr { +struct Irqmgr { /* 0x000 */ s16 verticalRetraceMesg; /* 0x002 */ UNK_TYPE1 pad2[30]; /* 0x020 */ s16 prenmi1Msg; @@ -1133,7 +1133,7 @@ struct z_Irqmgr { /* 0x060 */ OSMesgQueue irqQueue; /* 0x078 */ UNK_TYPE4 irqBuffer[8]; /* 0x098 */ OSThread thread; -/* 0x248 */ z_OSMesgQueueListNode* callbacks; +/* 0x248 */ OSMesgQueueListNode* callbacks; /* 0x24C */ s8 prenmiStage; /* 0x24D */ UNK_TYPE1 pad24D[3]; /* 0x250 */ OSTime lastPrenmiTime; @@ -1141,8 +1141,8 @@ struct z_Irqmgr { /* 0x278 */ OSTime lastFrameTime; }; -struct z_OSMesgQueueListNode { -/* 0x0 */ z_OSMesgQueueListNode* next; +struct OSMesgQueueListNode { +/* 0x0 */ OSMesgQueueListNode* next; /* 0x4 */ OSMesgQueue* queue; }; @@ -1156,8 +1156,8 @@ typedef struct { /* 0x04C */ OSMesgQueue siEventCallbackQueue; /* 0x064 */ OSMesgQueue unk64; /* 0x07C */ OSMesgQueue irqmgrCallbackQueue; -/* 0x094 */ z_OSMesgQueueListNode irqmgrCallbackQueueNode; -/* 0x09C */ z_Irqmgr* irqmgr; +/* 0x094 */ OSMesgQueueListNode irqmgrCallbackQueueNode; +/* 0x09C */ Irqmgr* irqmgr; /* 0x0A0 */ OSThread thread; /* 0x250 */ UNK_TYPE1 pad250[96]; /* 0x2B0 */ OSContPad controllerState1[4]; @@ -1167,7 +1167,7 @@ typedef struct { /* 0x47D */ u8 unk47D; /* 0x47E */ u8 unk47E; /* 0x47F */ UNK_TYPE1 pad47F[1]; -} z_PadmgrThreadStruct; +} PadmgrThreadStruct; typedef struct { /* 0x000 */ OSMesgQueue unk0; @@ -1187,12 +1187,12 @@ typedef struct { /* 0x324 */ UNK_TYPE4 unk324; /* 0x328 */ UNK_TYPE1 pad328[7]; /* 0x32F */ s8 unk32F; -/* 0x330 */ z_OSMesgQueueListNode unk330; -} z_SchedThreadStruct; +/* 0x330 */ OSMesgQueueListNode unk330; +} SchedThreadStruct; -struct z_AudioThreadStruct { -/* 0x000 */ z_Irqmgr* irqmgr; -/* 0x004 */ z_SchedThreadStruct* unk4; +struct AudioThreadStruct { +/* 0x000 */ Irqmgr* irqmgr; +/* 0x004 */ SchedThreadStruct* unk4; /* 0x008 */ UNK_TYPE1 pad8[88]; /* 0x060 */ UNK_TYPE4 unk60; /* 0x064 */ OSMesgQueue unk64; @@ -1205,11 +1205,11 @@ struct z_AudioThreadStruct { /* 0x130 */ OSThread unk130; }; -typedef struct z_ThreadInfo z_ThreadInfo; +typedef struct ThreadInfo ThreadInfo; -struct z_ThreadInfo { -/* 0x00 */ z_ThreadInfo* next; -/* 0x04 */ z_ThreadInfo* prev; +struct ThreadInfo { +/* 0x00 */ ThreadInfo* next; +/* 0x04 */ ThreadInfo* prev; /* 0x08 */ s32* stackBegin; /* 0x0C */ s32* stackEnd; /* 0x10 */ s32 initStackValue; @@ -1217,39 +1217,39 @@ struct z_ThreadInfo { /* 0x18 */ s8* name; }; -typedef struct z_Actor z_Actor; +typedef struct Actor Actor; -typedef void(*actor_func)(z_Actor* this, z_GlobalContext* ctxt); +typedef void(*actor_func)(Actor* this, GlobalContext* ctxt); -typedef void(*actor_init_var_func)(z_Actor*, z_ActorInitVar*); +typedef void(*actor_init_var_func)(Actor*, ActorInitVar*); -struct z_Actor { +struct Actor { /* 0x000 */ s16 id; /* 0x002 */ UNK_TYPE1 type; /* 0x003 */ s8 room; /* 0x004 */ UNK_TYPE4 flags; // bit 22: disable positional lights if bit 28 is not set; bit 28: enable positional lights on actor -/* 0x008 */ z_Vector3f initPos; -/* 0x014 */ z_Vector3s initRot; +/* 0x008 */ Vector3f initPos; +/* 0x014 */ Vector3s initRot; /* 0x01A */ UNK_TYPE1 pad1A[2]; /* 0x01C */ s16 variable; /* 0x01E */ s8 objectIndex; /* 0x01F */ UNK_TYPE1 pad1F[1]; /* 0x020 */ s16 unk20; /* 0x022 */ UNK_TYPE1 pad22[2]; -/* 0x024 */ z_Vector3f pos; -/* 0x030 */ z_Vector3s speedRot; +/* 0x024 */ Vector3f pos; +/* 0x030 */ Vector3s speedRot; /* 0x036 */ UNK_TYPE1 pad36[2]; /* 0x038 */ s8 unk38; /* 0x039 */ u8 unk39; /* 0x03A */ UNK_TYPE1 pad3A[2]; -/* 0x03C */ z_Vector3f unk3C; -/* 0x048 */ z_Vector3s unk48; +/* 0x03C */ Vector3f unk3C; +/* 0x048 */ Vector3s unk48; /* 0x04E */ UNK_TYPE1 pad4E[2]; /* 0x050 */ u16 unk50; /* 0x052 */ UNK_TYPE1 pad52[2]; /* 0x054 */ f32 unk54; -/* 0x058 */ z_Vector3f scale; -/* 0x064 */ z_Vector3f velocity; +/* 0x058 */ Vector3f scale; +/* 0x064 */ Vector3f velocity; /* 0x070 */ f32 speed; /* 0x074 */ f32 gravity; /* 0x078 */ f32 minYVelocity; @@ -1261,18 +1261,18 @@ struct z_Actor { /* 0x094 */ UNK_TYPE1 pad94[4]; /* 0x098 */ f32 unk98; /* 0x09C */ f32 unk9C; -/* 0x0A0 */ z_ActorA0 unkA0; +/* 0x0A0 */ ActorA0 unkA0; /* 0x0B8 */ UNK_TYPE1 padB8[1]; /* 0x0B9 */ u8 unkB9; /* 0x0BA */ UNK_TYPE1 padBA[2]; -/* 0x0BC */ z_ActorBC unkBC; +/* 0x0BC */ ActorBC unkBC; /* 0x0D4 */ UNK_TYPE1 padD4[24]; -/* 0x0EC */ z_Vector3f unkEC; +/* 0x0EC */ Vector3f unkEC; /* 0x0F8 */ f32 unkF8; /* 0x0FC */ f32 unkFC; /* 0x100 */ f32 unk100; /* 0x104 */ f32 unk104; -/* 0x108 */ z_Vector3f unk108; +/* 0x108 */ Vector3f unk108; /* 0x114 */ u8 unk114; /* 0x115 */ UNK_TYPE1 pad115[1]; /* 0x116 */ s16 textId; @@ -1282,36 +1282,36 @@ struct z_Actor { /* 0x11D */ u8 unk11D; /* 0x11E */ UNK_TYPE1 pad11E[1]; /* 0x11F */ u8 naviMsgId; -/* 0x120 */ z_Actor* parent; -/* 0x124 */ z_Actor* child; -/* 0x128 */ z_Actor* prev; -/* 0x12C */ z_Actor* next; +/* 0x120 */ Actor* parent; +/* 0x124 */ Actor* child; +/* 0x128 */ Actor* prev; +/* 0x12C */ Actor* next; /* 0x130 */ actor_func init; /* 0x134 */ actor_func fini; /* 0x138 */ actor_func main; /* 0x13C */ actor_func draw; -/* 0x140 */ z_ActorOverlayTableEntry* tableEntry; +/* 0x140 */ ActorOverlayTableEntry* tableEntry; }; typedef struct { -/* 0x000 */ z_Actor base; +/* 0x000 */ Actor base; /* 0x144 */ UNK_TYPE1 pad144[100]; /* 0x1A8 */ u32 displayListAddr; /* 0x1AC */ actor_func updateFunc; -} z_ActorBgIknvObj; +} ActorBgIknvObj; -struct z_ActorBgMbarChair { -/* 0x000 */ z_Actor base; +struct ActorBgMbarChair { +/* 0x000 */ Actor base; /* 0x144 */ UNK_TYPE1 pad144[24]; }; -struct z_ActorEnBji01 { -/* 0x000 */ z_Actor base; +struct ActorEnBji01 { +/* 0x000 */ Actor base; /* 0x144 */ UNK_TYPE1 pad144[368]; }; -struct z_ActorEnTest { -/* 0x000 */ z_Actor base; +struct ActorEnTest { +/* 0x000 */ Actor base; /* 0x144 */ UNK_TYPE1 pad144[16]; /* 0x154 */ f32 unk154; /* 0x158 */ UNK_TYPE1 pad158[176]; @@ -1319,10 +1319,10 @@ struct z_ActorEnTest { /* 0x209 */ UNK_TYPE1 pad209[1]; /* 0x20A */ u8 unk20A; /* 0x20B */ UNK_TYPE1 pad20B[1]; -/* 0x20C */ z_ActorEnTest20C unk20C[20]; +/* 0x20C */ ActorEnTest20C unk20C[20]; }; -struct z_ActorInitData { +struct ActorInitData { /* 0x00 */ s16 id; /* 0x02 */ u8 type; /* 0x03 */ UNK_TYPE1 pad3[1]; @@ -1336,22 +1336,22 @@ struct z_ActorInitData { /* 0x1C */ actor_func draw; }; -struct z_ActorPlayer { -/* 0x000 */ z_Actor base; +struct ActorPlayer { +/* 0x000 */ Actor base; /* 0x144 */ UNK_TYPE1 pad144[3124]; }; -struct z_ActorTypeList { +struct ActorTypeList { /* 0x0 */ s32 length; -/* 0x4 */ z_Actor* head; +/* 0x4 */ Actor* head; /* 0x8 */ UNK_TYPE1 pad8[4]; }; -struct z_ColCommon { -/* 0x00 */ z_Actor* actor; -/* 0x04 */ z_Actor* unk4; -/* 0x08 */ z_Actor* unk8; -/* 0x0C */ z_Actor* unkC; +struct ColCommon { +/* 0x00 */ Actor* actor; +/* 0x04 */ Actor* unk4; +/* 0x08 */ Actor* unk8; +/* 0x0C */ Actor* unkC; /* 0x10 */ u8 unk10; /* 0x11 */ u8 unk11; /* 0x12 */ u8 unk12; @@ -1361,41 +1361,41 @@ struct z_ColCommon { /* 0x16 */ UNK_TYPE1 pad16[2]; }; -struct z_ColCylinder { -/* 0x00 */ z_ColCommon base; -/* 0x18 */ z_ColBodyInfo body; -/* 0x40 */ z_ColCylinderParams params; +struct ColCylinder { +/* 0x00 */ ColCommon base; +/* 0x18 */ ColBodyInfo body; +/* 0x40 */ ColCylinderParams params; }; -struct z_ColQuad { -/* 0x00 */ z_ColCommon base; -/* 0x18 */ z_ColBodyInfo body; -/* 0x40 */ z_ColQuadParams params; +struct ColQuad { +/* 0x00 */ ColCommon base; +/* 0x18 */ ColBodyInfo body; +/* 0x40 */ ColQuadParams params; }; -struct z_ColSphere { -/* 0x00 */ z_ColCommon base; -/* 0x18 */ z_ColBodyInfo body; -/* 0x40 */ z_ColSphereParams params; +struct ColSphere { +/* 0x00 */ ColCommon base; +/* 0x18 */ ColBodyInfo body; +/* 0x40 */ ColSphereParams params; }; -struct z_ColSphereGroup { -/* 0x00 */ z_ColCommon base; +struct ColSphereGroup { +/* 0x00 */ ColCommon base; /* 0x18 */ u32 count; -/* 0x1C */ z_ColSphereGroupElement* spheres; +/* 0x1C */ ColSphereGroupElement* spheres; }; -struct z_ColTriGroup { -/* 0x00 */ z_ColCommon base; +struct ColTriGroup { +/* 0x00 */ ColCommon base; /* 0x18 */ u32 count; -/* 0x1C */ z_ColTri* tris; +/* 0x1C */ ColTri* tris; }; typedef struct { -/* 0x000 */ z_Actor base; -/* 0x144 */ z_ColQuad unk144; -/* 0x1C4 */ z_ColQuad unk1C4; -/* 0x244 */ z_Vector3f unk244; +/* 0x000 */ Actor base; +/* 0x144 */ ColQuad unk144; +/* 0x1C4 */ ColQuad unk1C4; +/* 0x244 */ Vector3f unk244; /* 0x250 */ f32 unk250; /* 0x254 */ f32 unk254; /* 0x258 */ actor_func update; @@ -1403,9 +1403,9 @@ typedef struct { /* 0x25E */ u16 unk25E; /* 0x260 */ u8 unk260; /* 0x261 */ UNK_TYPE1 pad261[3]; -} z_ActorArrowFire; +} ActorArrowFire; -struct z_ActorContext { +struct ActorContext { /* 0x000 */ UNK_TYPE1 pad0[2]; /* 0x002 */ u8 unk2; /* 0x003 */ UNK_TYPE1 pad3[1]; @@ -1414,13 +1414,13 @@ struct z_ActorContext { /* 0x00C */ s16 unkC; /* 0x00E */ u8 totalLoadedActors; /* 0x00F */ u8 unkF; -/* 0x010 */ z_ActorTypeList actorTypeLists[12]; -/* 0x0A0 */ z_Actor* unkA0; +/* 0x010 */ ActorTypeList actorTypeLists[12]; +/* 0x0A0 */ Actor* unkA0; /* 0x0A4 */ UNK_TYPE1 padA4[180]; -/* 0x158 */ z_Actor* unk158; +/* 0x158 */ Actor* unk158; /* 0x15C */ UNK_TYPE1 pad15C[80]; -/* 0x1AC */ z_Actor* unk1AC; -/* 0x1B0 */ z_Actor* unk1B0; +/* 0x1AC */ Actor* unk1AC; +/* 0x1B0 */ Actor* unk1B0; /* 0x1B4 */ UNK_TYPE1 pad1B4[24]; /* 0x1CC */ u32 unk1CC; /* 0x1D0 */ u32 clearedRooms; @@ -1433,17 +1433,17 @@ struct z_ActorContext { }; typedef struct { -/* 0x000 */ z_Actor base; +/* 0x000 */ Actor base; /* 0x144 */ actor_func update; -/* 0x148 */ z_ColCylinder collision; +/* 0x148 */ ColCylinder collision; /* 0x194 */ UNK_TYPE1 pad194[20]; -} z_ActorEnAObj; +} ActorEnAObj; -struct z_ActorEnBom { -/* 0x000 */ z_Actor base; -/* 0x144 */ z_ColCylinder unk144; -/* 0x190 */ z_ColSphereGroup unk190; -/* 0x1B0 */ z_ColSphereGroupElement unk1B0[1]; +struct ActorEnBom { +/* 0x000 */ Actor base; +/* 0x144 */ ColCylinder unk144; +/* 0x190 */ ColSphereGroup unk190; +/* 0x1B0 */ ColSphereGroupElement unk1B0[1]; /* 0x1F0 */ s16 unk1F0; /* 0x1F2 */ UNK_TYPE1 pad1F2[6]; /* 0x1F8 */ u8 unk1F8; @@ -1454,8 +1454,8 @@ struct z_ActorEnBom { /* 0x200 */ func_ptr unk200; }; -struct z_ActorEnFirefly { -/* 0x000 */ z_Actor base; +struct ActorEnFirefly { +/* 0x000 */ Actor base; /* 0x144 */ UNK_TYPE1 pad144[28]; /* 0x160 */ f32 unk160; /* 0x164 */ UNK_TYPE1 pad164[36]; @@ -1471,11 +1471,11 @@ struct z_ActorEnFirefly { /* 0x2EC */ f32 unk2EC; /* 0x2F0 */ f32 unk2F0; /* 0x2F4 */ UNK_TYPE1 pad2F4[40]; -/* 0x31C */ z_ColSphere collision; +/* 0x31C */ ColSphere collision; }; typedef struct { -/* 0x000 */ z_Actor base; +/* 0x000 */ Actor base; /* 0x144 */ actor_func update; /* 0x148 */ s16 unk148; /* 0x14A */ UNK_TYPE1 pad14A[2]; @@ -1484,15 +1484,15 @@ typedef struct { /* 0x150 */ s16 unk150; /* 0x152 */ s16 unk152; /* 0x154 */ f32 unk154; -/* 0x158 */ z_ColCylinder collision; +/* 0x158 */ ColCylinder collision; /* 0x1A4 */ UNK_TYPE1 pad1A4[4]; -} z_ActorEnItem00; +} ActorEnItem00; -struct z_ActorObjBell { -/* 0x000 */ z_Actor base; +struct ActorObjBell { +/* 0x000 */ Actor base; /* 0x144 */ UNK_TYPE1 pad144[24]; -/* 0x15C */ z_ColSphere unk15C; -/* 0x1B4 */ z_ColSphere unk1B4; +/* 0x15C */ ColSphere unk15C; +/* 0x1B4 */ ColSphere unk1B4; /* 0x20C */ UNK_TYPE1 pad20C[2]; /* 0x20E */ s16 unk20E; /* 0x210 */ UNK_TYPE1 pad210[4]; @@ -1500,35 +1500,35 @@ struct z_ActorObjBell { /* 0x216 */ UNK_TYPE1 pad216[18]; }; -struct z_GlobalContext { -/* 0x00000 */ z_ContextCommon commonVars; +struct GlobalContext { +/* 0x00000 */ ContextCommon commonVars; /* 0x000A4 */ s16 currentScene; /* 0x000A6 */ u8 unkA6; /* 0x000A7 */ UNK_TYPE1 padA7[9]; /* 0x000B0 */ void* currentSceneVram; /* 0x000B4 */ UNK_TYPE1 padB4[4]; -/* 0x000B8 */ z_View unkB8; -/* 0x00220 */ z_GlobalContext220 unk220[4]; +/* 0x000B8 */ View unkB8; +/* 0x00220 */ GlobalContext220 unk220[4]; /* 0x00800 */ UNK_TYPE1 pad800[24]; -/* 0x00818 */ z_LightingContext lightsContext; +/* 0x00818 */ LightingContext lightsContext; /* 0x00826 */ UNK_TYPE1 pad826[2]; /* 0x00828 */ u32 unk828; /* 0x0082C */ UNK_TYPE1 pad82C[5236]; -/* 0x01CA0 */ z_ActorContext actorContext; -/* 0x01F24 */ z_CutsceneContext cutsceneContext; -/* 0x01F74 */ z_CutsceneEntry* cutsceneList; +/* 0x01CA0 */ ActorContext actorContext; +/* 0x01F24 */ CutsceneContext cutsceneContext; +/* 0x01F74 */ CutsceneEntry* cutsceneList; /* 0x01F78 */ UNK_TYPE1 pad1F78[10640]; -/* 0x04908 */ z_GlobalContext4908 unk4908; +/* 0x04908 */ GlobalContext4908 unk4908; /* 0x169E0 */ UNK_TYPE1 pad169E0[8]; -/* 0x169E8 */ z_GlobalContext169E8 unk169E8; +/* 0x169E8 */ GlobalContext169E8 unk169E8; /* 0x16D30 */ UNK_TYPE1 pad16D30[492]; /* 0x16F1C */ u16 unk16F1C; /* 0x16F1E */ UNK_TYPE1 pad16F1E[226]; /* 0x17000 */ u16 unk17000; /* 0x17002 */ UNK_TYPE1 pad17002[2]; -/* 0x17004 */ z_KankyoContext kankyoContext; +/* 0x17004 */ KankyoContext kankyoContext; /* 0x170F6 */ UNK_TYPE1 pad170F6[3218]; -/* 0x17D88 */ z_SceneContext sceneContext; +/* 0x17D88 */ SceneContext sceneContext; /* 0x186E0 */ s8 currentRoom; /* 0x186E1 */ UNK_TYPE1 pad186E1[5]; /* 0x186E6 */ u8 enablePosLights; @@ -1537,16 +1537,16 @@ struct z_GlobalContext { /* 0x186EC */ UNK_TYPE1 pad186EC[116]; /* 0x18760 */ u8 transitionActorCount; /* 0x18761 */ UNK_TYPE1 pad18761[3]; -/* 0x18764 */ z_TransitionActorInit* transitionActorList; +/* 0x18764 */ TransitionActorInit* transitionActorList; /* 0x18768 */ UNK_TYPE1 pad18768[72]; /* 0x187B0 */ z_Matrix unk187B0; /* 0x187F0 */ UNK_TYPE1 pad187F0[86]; /* 0x18846 */ u16 sceneNumActorsToLoad; /* 0x18848 */ u8 numRooms; /* 0x18849 */ UNK_TYPE1 pad18849[3]; -/* 0x1884C */ z_RoomFileLocation* roomAddrs; +/* 0x1884C */ RoomFileLocation* roomAddrs; /* 0x18850 */ UNK_TYPE1 pad18850[4]; -/* 0x18854 */ z_SceneActorInit* sceneActorList; +/* 0x18854 */ SceneActorInit* sceneActorList; /* 0x18858 */ UNK_TYPE1 pad18858[4]; /* 0x1885C */ u8* entranceList; /* 0x18860 */ void* exitList; @@ -1556,9 +1556,9 @@ struct z_GlobalContext { /* 0x18870 */ UNK_TYPE1 pad18870[4]; /* 0x18874 */ u8 unk18874; /* 0x18875 */ UNK_TYPE1 pad18875[15]; -/* 0x18884 */ z_CollisionContext collisionContext; +/* 0x18884 */ CollisionContext collisionContext; /* 0x18B20 */ UNK_TYPE1 pad18B20[820]; -/* 0x18E54 */ z_SceneTableEntry* currentSceneTableEntry; +/* 0x18E54 */ SceneTableEntry* currentSceneTableEntry; /* 0x18E58 */ UNK_TYPE1 pad18E58[1024]; }; diff --git a/include/variables.h b/include/variables.h index eeb6199d6..481fd85ee 100644 --- a/include/variables.h +++ b/include/variables.h @@ -558,8 +558,8 @@ extern UNK_TYPE* D_80096B60; // D_80096B60 //extern UNK_TYPE D_80096BE4; //extern UNK_TYPE D_80096C20; //extern UNK_TYPE D_80096C30; -extern z_ThreadInfo* g_s80085320_ListHead; // D_80096C40 -extern z_ThreadInfo* g_s80085320_ListTail; // D_80096C44 +extern ThreadInfo* g_s80085320_ListHead; // D_80096C40 +extern ThreadInfo* g_s80085320_ListTail; // D_80096C44 //extern UNK_TYPE D_80096C50; //extern UNK_TYPE D_80096CD0; //extern UNK_TYPE D_80096CF0; @@ -790,22 +790,22 @@ extern float __libm_qnan_f; // D_80099450 //extern UNK_TYPE D_800994C8; extern UNK_TYPE D_800994D0; // D_800994D0 extern UNK_TYPE D_800994DC; // D_800994DC -extern z_ThreadInfo D_80099500; // D_80099500 +extern ThreadInfo D_80099500; // D_80099500 extern OSThread D_80099520; // D_80099520 extern UNK_TYPE D_800996D0; // D_800996D0 -extern z_ThreadInfo D_80099AD0; // D_80099AD0 +extern ThreadInfo D_80099AD0; // D_80099AD0 extern UNK_TYPE D_80099AF0; // D_80099AF0 extern UNK_TYPE D_80099EF0; // D_80099EF0 extern UNK_TYPE D_8009A170; // D_8009A170 -extern z_ThreadInfo D_8009A670; // D_8009A670 +extern ThreadInfo D_8009A670; // D_8009A670 extern UNK_TYPE D_8009A690; // D_8009A690 extern UNK_TYPE D_8009A840; // D_8009A840 -extern z_ThreadInfo D_8009B140; // D_8009B140 +extern ThreadInfo D_8009B140; // D_8009B140 extern UNK_TYPE D_8009B160; // D_8009B160 extern UNK_TYPE D_8009B228; // D_8009B228 extern u32* D_8009B240; // D_8009B240 extern u8 D_8009B290; // D_8009B290 -extern z_ThreadInfo D_8009B2A0; // D_8009B2A0 +extern ThreadInfo D_8009B2A0; // D_8009B2A0 extern u16 D_8009B2BC; // D_8009B2BC extern OSMesgQueue D_8009B2C0; // D_8009B2C0 extern UNK_TYPE D_8009B2D8; // D_8009B2D8 @@ -883,7 +883,7 @@ extern UNK_TYPE D_8009E624; // D_8009E624 //extern UNK_TYPE D_8009F870; //extern UNK_TYPE D_8009F888; //extern UNK_TYPE D_8009F8A0; -extern z_DmadataEntry dmadata[]; // D_8009F8B0 +extern DmadataEntry dmadata[]; // D_8009F8B0 //extern UNK_TYPE D_800A0004; //extern UNK_TYPE D_80186028; //extern UNK_TYPE D_801AAAB0; @@ -923,7 +923,7 @@ extern u8 D_801AE214[]; // D_801AE214 //extern UNK_TYPE D_801AE34C; //extern UNK_TYPE D_801AE374; //extern UNK_TYPE D_801AE388; -extern z_EffectTableInfo EffectSS2Info; // D_801AE3A0 +extern EffectTableInfo EffectSS2Info; // D_801AE3A0 //extern UNK_TYPE D_801AE3A4; //extern UNK_TYPE D_801AE3B0; //extern UNK_TYPE D_801AE3B4; @@ -949,7 +949,7 @@ extern z_EffectTableInfo EffectSS2Info; // D_801AE3A0 //extern UNK_TYPE D_801AE489; //extern UNK_TYPE D_801AE48C; //extern UNK_TYPE D_801AE490; -extern z_ParticleOverlayTableEntry particleOverlayTable[]; // D_801AE4A0 +extern ParticleOverlayTableEntry particleOverlayTable[]; // D_801AE4A0 //extern UNK_TYPE D_801AE4B0; //extern UNK_TYPE D_801AE4BC; //extern UNK_TYPE D_801AE8F0; @@ -979,7 +979,7 @@ extern z_ParticleOverlayTableEntry particleOverlayTable[]; // D_801AE4A0 //extern UNK_TYPE D_801AEFB8; //extern UNK_TYPE D_801AEFBC; //extern UNK_TYPE D_801AEFC0; -extern z_ActorOverlayTableEntry D_801AEFD0; // D_801AEFD0 +extern ActorOverlayTableEntry D_801AEFD0; // D_801AEFD0 //extern UNK_TYPE D_801AEFE0; //extern UNK_TYPE D_801AEFE4; //extern UNK_TYPE D_801AEFEE; @@ -4693,7 +4693,7 @@ extern u8 D_801EF677; // D_801EF677 //extern UNK_TYPE D_801F3F3A; //extern UNK_TYPE D_801F3F3B; //extern UNK_TYPE D_801F3F3C; -extern z_StaticContext* staticContext; // D_801F3F60 +extern StaticContext* staticContext; // D_801F3F60 //extern UNK_TYPE D_801F3F70; //extern UNK_TYPE D_801F3F80; //extern UNK_TYPE D_801F3F83; @@ -16024,9 +16024,9 @@ extern f32 D_80ACB650; // D_80ACB650 //extern UNK_TYPE D_80BD52F4; //extern UNK_TYPE D_80BD52F8; //extern UNK_TYPE D_80BD52FC; -extern z_ActorInitData bgIkanaRayInitVar; // D_80BD55D0 +extern ActorInitData bgIkanaRayInitVar; // D_80BD55D0 extern UNK_TYPE D_80BD55F0; // D_80BD55F0 -extern z_ActorInitVar bgIkanaRayCompInit[]; // D_80BD561C +extern ActorInitVar bgIkanaRayCompInit[]; // D_80BD561C extern UNK_TYPE D_80BD562C; // D_80BD562C //extern UNK_TYPE D_80BD5CF0; //extern UNK_TYPE D_80BD5D10; @@ -16838,6 +16838,6 @@ extern UNK_PTR D_800980D0_; extern UNK_TYPE D_80099AD0_; extern UNK_TYPE D_8009A670_; extern UNK_TYPE D_8009B140_; -extern (*D_801BE960[12])(u8*, z_ActorInitVar*); +extern (*D_801BE960[12])(u8*, ActorInitVar*); #endif diff --git a/src/actors/ovl_Bg_Fu_Kaiten_0x80ACB400/ovl_Bg_Fu_Kaiten_0x80ACB400.c b/src/actors/ovl_Bg_Fu_Kaiten_0x80ACB400/ovl_Bg_Fu_Kaiten_0x80ACB400.c index 4be0b8857..1af337254 100644 --- a/src/actors/ovl_Bg_Fu_Kaiten_0x80ACB400/ovl_Bg_Fu_Kaiten_0x80ACB400.c +++ b/src/actors/ovl_Bg_Fu_Kaiten_0x80ACB400/ovl_Bg_Fu_Kaiten_0x80ACB400.c @@ -2,7 +2,7 @@ #include <global.h> typedef struct z_ActorBgFuKaiten_s { - /* 0x000 */ z_Actor baseActor; + /* 0x000 */ Actor baseActor; /* 0x144 */ UNK_TYPE unk144; /* 0x148 */ u8 pad0[0x18]; /* 0x160 */ f32 unk160; @@ -13,14 +13,14 @@ typedef struct z_ActorBgFuKaiten_s { /* 0x16E */ u8 pad1[0x2]; } z_ActorBgFuKaiten; -void z_bg_fu_kaiten_init(z_ActorBgFuKaiten* this, z_GlobalContext* ctxt); -void z_bg_fu_kaiten_fini(z_ActorBgFuKaiten* this, z_GlobalContext* ctxt); +void z_bg_fu_kaiten_init(z_ActorBgFuKaiten* this, GlobalContext* ctxt); +void z_bg_fu_kaiten_fini(z_ActorBgFuKaiten* this, GlobalContext* ctxt); UNK_RET func_80ACB4B4(z_ActorBgFuKaiten* this); UNK_RET func_80ACB50C(z_ActorBgFuKaiten* this); -void z_bg_fu_kaiten_main(z_ActorBgFuKaiten* this, z_GlobalContext* ctxt); -void func_80ACB5A0(z_ActorBgFuKaiten* this, z_GlobalContext* ctxt); +void z_bg_fu_kaiten_main(z_ActorBgFuKaiten* this, GlobalContext* ctxt); +void func_80ACB5A0(z_ActorBgFuKaiten* this, GlobalContext* ctxt); -z_ActorInitData bgBgFuKaitenInitVar = { +ActorInitData bgBgFuKaitenInitVar = { 0x01AE, 1, 0, @@ -61,15 +61,15 @@ glabel D_80ACB654 /* 000167 0x80ACB69C */ .word 0x00000040 ) -void z_bg_fu_kaiten_init(z_ActorBgFuKaiten* this, z_GlobalContext* ctxt) { +void z_bg_fu_kaiten_init(z_ActorBgFuKaiten* this, GlobalContext* ctxt) { UNK_TYPE pad0; UNK_TYPE pad1; UNK_TYPE sp24 = 0; - func_800B67E0((z_Actor*)this, 1.0); - func_800CAE10((z_Actor*)this, 3); + func_800B67E0((Actor*)this, 1.0); + func_800CAE10((Actor*)this, 3); func_800C9564((UNK_TYPE)&D_06002D30, &sp24); // XXX: D_06002D30 is probably a constant - this->unk144 = func_800C6188(ctxt, &ctxt->unk880, (z_Actor*)this, sp24); + this->unk144 = func_800C6188(ctxt, &ctxt->unk880, (Actor*)this, sp24); this->unk164 = 0.0; this->unk168 = 0; @@ -77,7 +77,7 @@ void z_bg_fu_kaiten_init(z_ActorBgFuKaiten* this, z_GlobalContext* ctxt) { this->unk16C = 0; } -void z_bg_fu_kaiten_fini(z_ActorBgFuKaiten* this, z_GlobalContext* ctxt) { +void z_bg_fu_kaiten_fini(z_ActorBgFuKaiten* this, GlobalContext* ctxt) { func_800C64CC(ctxt, &ctxt->unk880, this->unk144); } @@ -99,15 +99,15 @@ UNK_RET func_80ACB50C(z_ActorBgFuKaiten* this) { this->baseActor.unk24.y -= this->unk164 * func_800FED44(this->unk16C); } -void z_bg_fu_kaiten_main(z_ActorBgFuKaiten* this, z_GlobalContext* ctxt) { +void z_bg_fu_kaiten_main(z_ActorBgFuKaiten* this, GlobalContext* ctxt) { func_80ACB4B4(this); func_80ACB50C(this); } #ifdef NON_MATCHING -void func_80ACB5A0(z_ActorBgFuKaiten* this, z_GlobalContext* ctxt) { - z_GraphicsContext* sp24 = ctxt->unk0; +void func_80ACB5A0(z_ActorBgFuKaiten* this, GlobalContext* ctxt) { + GraphicsContext* sp24 = ctxt->unk0; UNK_TYPE pad; // XXX: register allocation is wrong here diff --git a/src/actors/ovl_Bg_Ikana_Ray_0x80BD53C0/ovl_Bg_Ikana_Ray_0x80BD53C0.c b/src/actors/ovl_Bg_Ikana_Ray_0x80BD53C0/ovl_Bg_Ikana_Ray_0x80BD53C0.c index 67cd7f022..0fd1095fa 100644 --- a/src/actors/ovl_Bg_Ikana_Ray_0x80BD53C0/ovl_Bg_Ikana_Ray_0x80BD53C0.c +++ b/src/actors/ovl_Bg_Ikana_Ray_0x80BD53C0/ovl_Bg_Ikana_Ray_0x80BD53C0.c @@ -2,23 +2,23 @@ #include <global.h> typedef struct z_ActorBgIkanaRay_s { - /* 0x000 */ z_Actor baseActor; + /* 0x000 */ Actor baseActor; /* 0x144 */ UNK_TYPE unk144; /* 0x148 */ u8 pad5[0x48]; /* 0x190 */ UNK_TYPE unk190; - /* 0x194 */ void(*unk404)(struct z_ActorBgIkanaRay_s*, z_GlobalContext*); + /* 0x194 */ void(*unk404)(struct z_ActorBgIkanaRay_s*, GlobalContext*); } z_ActorBgIkanaRay; -void z_bg_ikana_ray_init(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt); -void z_bg_ikana_ray_fini(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt); -void z_bg_ikana_ray_main(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt); -void z_bg_ikana_ray_draw(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt); +void z_bg_ikana_ray_init(z_ActorBgIkanaRay* this, GlobalContext* ctxt); +void z_bg_ikana_ray_fini(z_ActorBgIkanaRay* this, GlobalContext* ctxt); +void z_bg_ikana_ray_main(z_ActorBgIkanaRay* this, GlobalContext* ctxt); +void z_bg_ikana_ray_draw(z_ActorBgIkanaRay* this, GlobalContext* ctxt); void func_80BD5498(z_ActorBgIkanaRay* this); -void func_80BD54BC(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt); +void func_80BD54BC(z_ActorBgIkanaRay* this, GlobalContext* ctxt); void func_80BD5500(z_ActorBgIkanaRay* this); -void func_80BD5530(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt); +void func_80BD5530(z_ActorBgIkanaRay* this, GlobalContext* ctxt); -z_ActorInitData bgIkanaRayInitVar = { +ActorInitData bgIkanaRayInitVar = { 0x0256, 6, 0, @@ -48,7 +48,7 @@ glabel D_80BD55F0 ) // TODO macro -z_ActorInitVar bgIkanaRayCompInit[] = { +ActorInitVar bgIkanaRayCompInit[] = { {1, 6, 0x0FC, 4000}, {1, 6, 0x100, 1000}, {1, 6, 0x104, 1000}, @@ -84,14 +84,14 @@ glabel D_80BD562C /* 000177 0x80BD5684 */ .word 0x8200001C ) -void z_bg_ikana_ray_init(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt) { +void z_bg_ikana_ray_init(z_ActorBgIkanaRay* this, GlobalContext* ctxt) { UNK_TYPE* sp24 = &this->unk144; u32 pad; - func_800FFADC((z_Actor*)this, bgIkanaRayCompInit); + func_800FFADC((Actor*)this, bgIkanaRayCompInit); func_800E119C(ctxt, sp24); - func_800E130C(ctxt, sp24, (z_Actor*)this, &D_80BD55F0); - func_800E7DF8((z_Actor*)this, &this->unk144); + func_800E130C(ctxt, sp24, (Actor*)this, &D_80BD55F0); + func_800E7DF8((Actor*)this, &this->unk144); this->unk190 = func_80100504((UNK_TYPE)&D_06001228); // XXX: D_06001228 is probably a constant if (func_800B5BB0(ctxt, this->baseActor.unk1C & 0x7F) != 0) { @@ -101,7 +101,7 @@ void z_bg_ikana_ray_init(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt) { } } -void z_bg_ikana_ray_fini(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt) { +void z_bg_ikana_ray_fini(z_ActorBgIkanaRay* this, GlobalContext* ctxt) { UNK_TYPE* a1 = &this->unk144; func_800E11EC(ctxt, a1); } @@ -112,7 +112,7 @@ void func_80BD5498(z_ActorBgIkanaRay* this) { this->unk404 = func_80BD54BC; } -void func_80BD54BC(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt) { +void func_80BD54BC(z_ActorBgIkanaRay* this, GlobalContext* ctxt) { if (func_800B5BB0(ctxt, this->baseActor.unk1C & 0x7F) != 0) { func_80BD5500(this); } @@ -124,15 +124,15 @@ void func_80BD5500(z_ActorBgIkanaRay* this) { this->unk404 = func_80BD5530; } -void func_80BD5530(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt) { +void func_80BD5530(z_ActorBgIkanaRay* this, GlobalContext* ctxt) { func_800E2558(ctxt, &ctxt->unk18884, &this->unk144); } -void z_bg_ikana_ray_main(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt) { +void z_bg_ikana_ray_main(z_ActorBgIkanaRay* this, GlobalContext* ctxt) { this->unk404(this, ctxt); } -void z_bg_ikana_ray_draw(z_ActorBgIkanaRay* this, z_GlobalContext* ctxt) { +void z_bg_ikana_ray_draw(z_ActorBgIkanaRay* this, GlobalContext* ctxt) { func_80131758(ctxt, this->unk190); func_800BE03C(ctxt, (UNK_TYPE)&D_06001100); // XXX: D_06001100 is probably a constant } diff --git a/src/boot/boot_0x80080180.c b/src/boot/boot_0x80080180.c index acf8ede50..44beb638d 100644 --- a/src/boot/boot_0x80080180.c +++ b/src/boot/boot_0x80080180.c @@ -43,7 +43,7 @@ UNK_RET func_80080250(void) { sp28 = *v0; *v0 = 0; - func_80080C04((z_DmaRequest*)&sp48, (UNK_FUN_ARG)func_800A5AC0, v1, (u32)t7 - (u32)v1, 0, &sp30, 0); + func_80080C04((DmaRequest*)&sp48, (UNK_FUN_ARG)func_800A5AC0, v1, (u32)t7 - (u32)v1, 0, &sp30, 0); func_8008019C(); func_800801EC(); osRecvMesg(&sp30, 0, 1); diff --git a/src/boot/boot_0x80085320.c b/src/boot/boot_0x80085320.c index 0bc8a1066..834d5c648 100644 --- a/src/boot/boot_0x80085320.c +++ b/src/boot/boot_0x80085320.c @@ -1,9 +1,9 @@ #include <ultra64.h> #include <global.h> -void func_80085320(z_ThreadInfo* a0, UNK_PTR a1, UNK_PTR a2, UNK_TYPE a3, UNK_TYPE sp10, UNK_PTR sp14) { +void func_80085320(ThreadInfo* a0, UNK_PTR a1, UNK_PTR a2, UNK_TYPE a3, UNK_TYPE sp10, UNK_PTR sp14) { UNK_TYPE* i; - z_ThreadInfo* v0; + ThreadInfo* v0; if (a0 == NULL) { g_s80085320_ListHead = NULL; @@ -42,7 +42,7 @@ void func_80085320(z_ThreadInfo* a0, UNK_PTR a1, UNK_PTR a2, UNK_TYPE a3, UNK_TY } } -UNK_RET func_800853F8(z_ThreadInfo* a0) { +UNK_RET func_800853F8(ThreadInfo* a0) { if (a0->prev == NULL) { if (g_s80085320_ListHead == a0) { g_s80085320_ListHead = a0->next; @@ -58,7 +58,7 @@ UNK_RET func_800853F8(z_ThreadInfo* a0) { } } -UNK_TYPE func_80085468(z_ThreadInfo* a0) { +UNK_TYPE func_80085468(ThreadInfo* a0) { UNK_TYPE* v1 = a0->unk8; UNK_TYPE* a1 = a0->unkC; UNK_TYPE* v0 = v1; @@ -83,7 +83,7 @@ UNK_TYPE func_80085468(z_ThreadInfo* a0) { } UNK_TYPE func_800854E0(UNK_ARGS) { - z_ThreadInfo* s0 = g_s80085320_ListHead; + ThreadInfo* s0 = g_s80085320_ListHead; UNK_TYPE ret = 0; while (s0 != NULL) { if (func_80085468(s0) != 0) { @@ -95,7 +95,7 @@ UNK_TYPE func_800854E0(UNK_ARGS) { return ret; } -UNK_RET func_80085538(z_ThreadInfo* a0) { +UNK_RET func_80085538(ThreadInfo* a0) { if (a0 == NULL) { func_800854E0(); } else { diff --git a/src/boot_O2_g3/z_std_dma.c b/src/boot_O2_g3/z_std_dma.c index f7a598de3..2230d489a 100644 --- a/src/boot_O2_g3/z_std_dma.c +++ b/src/boot_O2_g3/z_std_dma.c @@ -48,8 +48,8 @@ void Dmamgr_osEPiStartDmaWrapper(OSPiHandle* pihandle, OSIoMesg* mb, s32 directi osEPiStartDma(pihandle, mb, direction); } -z_DmadataEntry* Dmamgr_FindDmaEntry(u32 a0) { - z_DmadataEntry* curr; +DmadataEntry* Dmamgr_FindDmaEntry(u32 a0) { + DmadataEntry* curr; for (curr = dmadata; curr->vromEnd != 0; curr++) { if (a0 < curr->vromStart) continue; @@ -62,7 +62,7 @@ z_DmadataEntry* Dmamgr_FindDmaEntry(u32 a0) { } s32 Dmamgr_TranslateVromToRom(u32 a0) { - z_DmadataEntry* v0 = Dmamgr_FindDmaEntry(a0); + DmadataEntry* v0 = Dmamgr_FindDmaEntry(a0); if (v0 != NULL) { if (v0->romEnd == 0) { @@ -80,7 +80,7 @@ s32 Dmamgr_TranslateVromToRom(u32 a0) { } s32 Dmamgr_FindDmaIndex(u32 a0) { - z_DmadataEntry* v0 = Dmamgr_FindDmaEntry(a0); + DmadataEntry* v0 = Dmamgr_FindDmaEntry(a0); if (v0 != NULL) { return v0 - dmadata; @@ -95,7 +95,7 @@ UNK_TYPE* func_800809F4(u32 a0) { #ifdef NONMATCHING -void Dmamgr_HandleRequest(z_DmaRequest* a0) { +void Dmamgr_HandleRequest(DmaRequest* a0) { UNK_TYPE sp34; UNK_TYPE sp30; UNK_TYPE sp2C; @@ -149,9 +149,9 @@ GLOBAL_ASM("./asm/nonmatching/z_std_dma/Dmamgr_HandleRequest.asm") #ifdef NONMATCHING void Dmamgr_ThreadEntry(void* a0) { - z_DmaRequest* sp34; + DmaRequest* sp34; UNK_TYPE pad; - z_DmaRequest* s0; + DmaRequest* s0; for (;;) { osRecvMesg(&D_8009B2C0, (OSMesg)&sp34, 1); @@ -172,7 +172,7 @@ GLOBAL_ASM("./asm/nonmatching/z_std_dma/Dmamgr_ThreadEntry.asm") #ifdef NONMATCHING -s32 Dmamgr_SendRequest(z_DmaRequest* a0, UNK_FUN_PTR(a1), UNK_PTR a2, UNK_TYPE a3, UNK_TYPE sp30, OSMesgQueue* sp34, UNK_TYPE sp38) { +s32 Dmamgr_SendRequest(DmaRequest* a0, UNK_FUN_PTR(a1), UNK_PTR a2, UNK_TYPE a3, UNK_TYPE sp30, OSMesgQueue* sp34, UNK_TYPE sp38) { // TODO this isn't correct, it uses a lui, addiu to get the address of D_80096B60, then loads it, // meaning that this is likely just "if (*D_80096B60 >= 2)". However, I can not get it to not // produce the usual lui, lw combo to load from an address :/ @@ -199,7 +199,7 @@ GLOBAL_ASM("./asm/nonmatching/z_std_dma/Dmamgr_SendRequest.asm") #endif s32 Dmamgr_SendRequestAndWait(UNK_TYPE a0, UNK_PTR a1, UNK_TYPE a2) { - z_DmaRequest sp48; + DmaRequest sp48; OSMesgQueue sp30; OSMesg sp2C; s32 ret; @@ -220,7 +220,7 @@ s32 Dmamgr_SendRequestAndWait(UNK_TYPE a0, UNK_PTR a1, UNK_TYPE a2) { #ifdef NONMATCHING void Dmamgr_Start() { - z_DmadataEntry* v0; + DmadataEntry* v0; u32 v1; // TODO register load ordering is wrong Dmamgr_DoDmaTransfer(&dmadataRomStart, dmadata, (u8*)&dmadataRomEnd - (u8*)&dmadataRomStart); diff --git a/src/code/code_0x800A5AC0.c b/src/code/code_0x800A5AC0.c index 534bec030..9d393fbeb 100644 --- a/src/code/code_0x800A5AC0.c +++ b/src/code/code_0x800A5AC0.c @@ -6,23 +6,23 @@ // This file is most likely En_A_Obj UNK_RET EnAObj_Init(void* a0, UNK_TYPE a1) { - z_ActorEnAObj* s0 = (z_ActorEnAObj*)a0; + ActorEnAObj* s0 = (ActorEnAObj*)a0; s0->base.textId = ((s0->base.variable >> 8) & 0xFF) | 0x300; s0->base.variable = (s0->base.variable & 0xFF) - 9; - Lib_ApplyActorInitVars((z_Actor*)s0, (z_ActorInitVar*)&D_801ADEAC); + Lib_ApplyActorInitVars((Actor*)s0, (ActorInitVar*)&D_801ADEAC); func_800B3BA4(&s0->base.unkBC, 0, (UNK_PTR)&func_800B3FC0, 12); - Collision_InitCylinder(a1, &s0->collision, (z_Actor*)s0, &D_801ADE80); - Collision_CylinderMoveToActor((z_Actor*)s0, &s0->collision); + Collision_InitCylinder(a1, &s0->collision, (Actor*)s0, &D_801ADE80); + Collision_CylinderMoveToActor((Actor*)s0, &s0->collision); s0->base.unkA0.unk16 = 255; s0->update = (actor_func)EnAObj_Update1; } -UNK_RET EnAObj_Fini(z_ActorEnAObj* a0, z_GlobalContext* a1) { - z_ColCylinder* a2 = &a0->collision; +UNK_RET EnAObj_Fini(ActorEnAObj* a0, GlobalContext* a1) { + ColCylinder* a2 = &a0->collision; Collision_FiniCylinder(a1, a2); } -UNK_RET EnAObj_Update1(z_ActorEnAObj* a0, UNK_TYPE a1) { +UNK_RET EnAObj_Update1(ActorEnAObj* a0, UNK_TYPE a1) { s16 v0; s32 v1; if (func_800B84D0(a0, a1) != 0) { @@ -36,18 +36,18 @@ UNK_RET EnAObj_Update1(z_ActorEnAObj* a0, UNK_TYPE a1) { } } -UNK_RET EnAObj_Update2(z_ActorEnAObj* a0) { +UNK_RET EnAObj_Update2(ActorEnAObj* a0) { if (func_800B867C(a0) != 0) { a0->update = (actor_func)EnAObj_Update1; } } -UNK_RET EnAObj_Main(z_ActorEnAObj* a0, UNK_TYPE a1) { - (a0->update)((z_Actor*)a0, (z_GlobalContext*)a1); +UNK_RET EnAObj_Main(ActorEnAObj* a0, UNK_TYPE a1) { + (a0->update)((Actor*)a0, (GlobalContext*)a1); func_800B675C(a0, 0x42340000); Collision_AddOT(a1, a1 + 0x18884, &a0->collision); } -UNK_RET EnAObj_Draw(z_ActorEnAObj* a0, UNK_TYPE a1) { +UNK_RET EnAObj_Draw(ActorEnAObj* a0, UNK_TYPE a1) { func_800BDFC0(a1, D_801ADEB0[a0->base.variable], a1, a0); } diff --git a/src/code/code_0x800BF9A0.c b/src/code/code_0x800BF9A0.c index f0ee6166f..a252fb962 100644 --- a/src/code/code_0x800BF9A0.c +++ b/src/code/code_0x800BF9A0.c @@ -3,7 +3,7 @@ UNK_RET func_800BF9A0(UNK_TYPE a0, UNK_TYPE a1) { s32 i; - z_ActorOverlayTableEntry* s0; + ActorOverlayTableEntry* s0; UNK_TYPE v1; func_8008439C(-2, 0); @@ -19,7 +19,7 @@ UNK_RET func_800BF9A0(UNK_TYPE a0, UNK_TYPE a1) { UNK_TYPE func_800BFA78(UNK_TYPE a0, UNK_TYPE a1) { s32 i; - z_ActorOverlayTableEntry* v0 = &D_801AEFD0; + ActorOverlayTableEntry* v0 = &D_801AEFD0; UNK_TYPE t1; UNK_TYPE a2; UNK_TYPE a0_2 = a0; diff --git a/src/code/z_actor.c b/src/code/z_actor.c index c75d5d09d..18b608a9c 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -259,7 +259,7 @@ GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8898.asm") GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8934.asm") -UNK_TYPE Actor_HasParent(z_Actor* actor, z_GlobalContext* ctxt) { +UNK_TYPE Actor_HasParent(Actor* actor, GlobalContext* ctxt) { if (actor->parent != NULL) { return 1; } else { diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c index bb1451982..80b4f7bf7 100644 --- a/src/code/z_effect_soft_sprite.c +++ b/src/code/z_effect_soft_sprite.c @@ -1,12 +1,12 @@ #include <ultra64.h> #include <global.h> -void EffectSS_Init(z_GlobalContext* ctxt, s32 numEntries) { +void EffectSS_Init(GlobalContext* ctxt, s32 numEntries) { u32 i; - z_LoadedParticleEntry* iter; - z_ParticleOverlayTableEntry* iter2; + LoadedParticleEntry* iter; + ParticleOverlayTableEntry* iter2; - EffectSS2Info.data_table = (z_LoadedParticleEntry*)GameStateHeap_AllocFromEnd(&ctxt->commonVars.heap, numEntries * sizeof(z_LoadedParticleEntry)); + EffectSS2Info.data_table = (LoadedParticleEntry*)GameStateHeap_AllocFromEnd(&ctxt->commonVars.heap, numEntries * sizeof(LoadedParticleEntry)); EffectSS2Info.searchIndex = 0; EffectSS2Info.size = numEntries; @@ -19,10 +19,10 @@ void EffectSS_Init(z_GlobalContext* ctxt, s32 numEntries) { } } -void EffectSS_Clear(z_GlobalContext* ctxt) { +void EffectSS_Clear(GlobalContext* ctxt) { u32 i; - z_LoadedParticleEntry* iter; - z_ParticleOverlayTableEntry* iter2; + LoadedParticleEntry* iter; + ParticleOverlayTableEntry* iter2; void* addr; EffectSS2Info.data_table = NULL; @@ -44,11 +44,11 @@ void EffectSS_Clear(z_GlobalContext* ctxt) { } } -z_LoadedParticleEntry* EffectSS_GetTable() { +LoadedParticleEntry* EffectSS_GetTable() { return EffectSS2Info.data_table; } -void EffectSS_Delete(z_LoadedParticleEntry* a0) { +void EffectSS_Delete(LoadedParticleEntry* a0) { if (a0->flags & 0x2) { func_801A72CC((UNK_PTR)&a0->position); } @@ -60,7 +60,7 @@ void EffectSS_Delete(z_LoadedParticleEntry* a0) { EffectSS_ResetLoadedParticleEntry(a0); } -void EffectSS_ResetLoadedParticleEntry(z_LoadedParticleEntry* particle) { +void EffectSS_ResetLoadedParticleEntry(LoadedParticleEntry* particle) { u32 i; particle->type = 0x27; @@ -152,7 +152,7 @@ GLOBAL_ASM("./asm/nonmatching/z_effect_soft_sprite/EffectSS_FindFreeSpace.asm") #endif -void EffectSS_Copy(z_GlobalContext* ctxt, z_LoadedParticleEntry* a1) { +void EffectSS_Copy(GlobalContext* ctxt, LoadedParticleEntry* a1) { u32 index; if (func_8016A01C(ctxt) != 1) { if (EffectSS_FindFreeSpace(a1->priority, &index) == 0) { @@ -164,12 +164,12 @@ void EffectSS_Copy(z_GlobalContext* ctxt, z_LoadedParticleEntry* a1) { #ifdef NONMATCHING -void EffectSS_LoadParticle(z_GlobalContext* ctxt, u32 type, u32 priority, void* initData) { +void EffectSS_LoadParticle(GlobalContext* ctxt, u32 type, u32 priority, void* initData) { u32 index; u32 initRet; u32 overlaySize; - z_ParticleOverlayInfo* overlayInfo; - z_ParticleOverlayTableEntry* entry = &particleOverlayTable[type]; + ParticleOverlayInfo* overlayInfo; + ParticleOverlayTableEntry* entry = &particleOverlayTable[type]; if (EffectSS_FindFreeSpace(priority, &index) != 0) { return; @@ -193,7 +193,7 @@ void EffectSS_LoadParticle(z_GlobalContext* ctxt, u32 type, u32 priority, void* // XXX this should use a0, but it doesn't if (entry->overlayInfo != NULL) { - overlayInfo = (z_ParticleOverlayInfo*)(-(entry->vramStart - entry->loadedRamAddr) + (u32)entry->overlayInfo); + overlayInfo = (ParticleOverlayInfo*)(-(entry->vramStart - entry->loadedRamAddr) + (u32)entry->overlayInfo); } else { overlayInfo = NULL; } @@ -222,8 +222,8 @@ GLOBAL_ASM("./asm/nonmatching/z_effect_soft_sprite/EffectSS_LoadParticle.asm") // XXX regalloc is wrong #ifdef NONMATCHING -void EffectSS_UpdateParticle(z_GlobalContext* ctxt, u32 index) { - z_LoadedParticleEntry* particle = &EffectSS2Info.data_table[index]; +void EffectSS_UpdateParticle(GlobalContext* ctxt, u32 index) { + LoadedParticleEntry* particle = &EffectSS2Info.data_table[index]; if (particle->update != NULL) { particle->velocity.x += particle->acceleration.x; @@ -244,7 +244,7 @@ GLOBAL_ASM("./asm/nonmatching/z_effect_soft_sprite/EffectSS_UpdateParticle.asm") #endif -void EffectSS_UpdateAllParticles(z_GlobalContext* ctxt) { +void EffectSS_UpdateAllParticles(GlobalContext* ctxt) { s32 i; for (i = 0; i < EffectSS2Info.size; i++) { @@ -265,8 +265,8 @@ void EffectSS_UpdateAllParticles(z_GlobalContext* ctxt) { // XXX regalloc is wrong #ifdef NONMATCHING -void EffectSS_DrawParticle(z_GlobalContext* ctxt, s32 index) { - z_LoadedParticleEntry* entry = &EffectSS2Info.data_table[index]; +void EffectSS_DrawParticle(GlobalContext* ctxt, s32 index) { + LoadedParticleEntry* entry = &EffectSS2Info.data_table[index]; if (entry->draw != 0) { (*entry->draw)(ctxt); } @@ -278,7 +278,7 @@ GLOBAL_ASM("./asm/nonmatching/z_effect_soft_sprite/EffectSS_DrawParticle.asm") #endif -void EffectSS_DrawAllParticles(z_GlobalContext* ctxt) { +void EffectSS_DrawAllParticles(GlobalContext* ctxt) { UNK_TYPE s0; s32 i; diff --git a/src/code/z_lib.c b/src/code/z_lib.c index 2648097ad..8ae55a51a 100644 --- a/src/code/z_lib.c +++ b/src/code/z_lib.c @@ -255,7 +255,7 @@ s16 Lib_randStride_s(s16 a0, s16 a1, s16 a2) { return (s16)(randZeroOne() * a2) * a1 + a0; } -UNK_RET Lib_CopyVec3f(z_Vector3f* dst, z_Vector3f* src) { +UNK_RET Lib_CopyVec3f(Vector3f* dst, Vector3f* src) { f32 x = src->x; f32 y = src->y; f32 z = src->z; @@ -265,7 +265,7 @@ UNK_RET Lib_CopyVec3f(z_Vector3f* dst, z_Vector3f* src) { dst->z = z; } -UNK_RET Lib_CopyVec3s(z_Vector3s* dst, z_Vector3s* src) { +UNK_RET Lib_CopyVec3s(Vector3s* dst, Vector3s* src) { s16 x = src->x; s16 y = src->y; s16 z = src->z; @@ -275,7 +275,7 @@ UNK_RET Lib_CopyVec3s(z_Vector3s* dst, z_Vector3s* src) { dst->z = z; } -UNK_RET Lib_ToVec3f(z_Vector3f* dst, z_Vector3s* src) { +UNK_RET Lib_ToVec3f(Vector3f* dst, Vector3s* src) { f32 x = src->x; f32 y = src->y; f32 z = src->z; @@ -285,7 +285,7 @@ UNK_RET Lib_ToVec3f(z_Vector3f* dst, z_Vector3s* src) { dst->z = z; } -UNK_RET Lib_ToVec3s(z_Vector3s* dst, z_Vector3f* src) { +UNK_RET Lib_ToVec3s(Vector3s* dst, Vector3f* src) { f32 x = src->x; f32 y = src->y; f32 z = src->z; @@ -295,55 +295,55 @@ UNK_RET Lib_ToVec3s(z_Vector3s* dst, z_Vector3f* src) { dst->z = z; } -UNK_RET Lib_AddVec3f(z_Vector3f* a0, z_Vector3f* a1, z_Vector3f* a2) { +UNK_RET Lib_AddVec3f(Vector3f* a0, Vector3f* a1, Vector3f* a2) { a2->x = a0->x + a1->x; a2->y = a0->y + a1->y; a2->z = a0->z + a1->z; } -UNK_RET Lib_SubVec3f(z_Vector3f* a0, z_Vector3f* a1, z_Vector3f* a2) { +UNK_RET Lib_SubVec3f(Vector3f* a0, Vector3f* a1, Vector3f* a2) { a2->x = a0->x - a1->x; a2->y = a0->y - a1->y; a2->z = a0->z - a1->z; } -UNK_RET Lib_SubVec3sToVec3f(z_Vector3f* a0, z_Vector3s* a1, z_Vector3s* a2) { +UNK_RET Lib_SubVec3sToVec3f(Vector3f* a0, Vector3s* a1, Vector3s* a2) { a0->x = a1->x - a2->x; a0->y = a1->y - a2->y; a0->z = a1->z - a2->z; } -UNK_RET Lib_ScaleInPlaceVec3f(z_Vector3f* a0, f32 a1) { +UNK_RET Lib_ScaleInPlaceVec3f(Vector3f* a0, f32 a1) { a0->x *= a1; a0->y *= a1; a0->z *= a1; } -UNK_RET Lib_ScaleVec3f(z_Vector3f* a0, f32 a1, z_Vector3f* a2) { +UNK_RET Lib_ScaleVec3f(Vector3f* a0, f32 a1, Vector3f* a2) { a2->x = a0->x * a1; a2->y = a0->y * a1; a2->z = a0->z * a1; } -UNK_RET Lib_LerpVec3f(z_Vector3f* a0, z_Vector3f* a1, f32 a2, z_Vector3f* a3) { +UNK_RET Lib_LerpVec3f(Vector3f* a0, Vector3f* a1, f32 a2, Vector3f* a3) { a3->x = (a1->x - a0->x) * a2 + a0->x; a3->y = (a1->y - a0->y) * a2 + a0->y; a3->z = (a1->z - a0->z) * a2 + a0->z; } -UNK_RET Lib_AddScaledVec3f(z_Vector3f* a0, z_Vector3f* a1, f32 a2, z_Vector3f* a3) { +UNK_RET Lib_AddScaledVec3f(Vector3f* a0, Vector3f* a1, f32 a2, Vector3f* a3) { a3->x = a1->x * a2 + a0->x; a3->y = a1->y * a2 + a0->y; a3->z = a1->z * a2 + a0->z; } -UNK_RET Lib_ModifyRandScaled(z_Vector3f* a0, f32 a1, z_Vector3f* a2) { +UNK_RET Lib_ModifyRandScaled(Vector3f* a0, f32 a1, Vector3f* a2) { a2->x = randPlusMinusPoint5Scaled(a1) + a0->x; a2->y = randPlusMinusPoint5Scaled(a1) + a0->y; a2->z = randPlusMinusPoint5Scaled(a1) + a0->z; } -void Lib_ScaledNormalizedDifferenceVec3f(z_Vector3f* a0, z_Vector3f* a1, f32 a2, z_Vector3f* a3) { +void Lib_ScaledNormalizedDifferenceVec3f(Vector3f* a0, Vector3f* a1, f32 a2, Vector3f* a3) { f32 f0 = Lib_DistanceAndDifferenceVec3f(a0, a1, a3); f32 f2; @@ -358,24 +358,24 @@ void Lib_ScaledNormalizedDifferenceVec3f(z_Vector3f* a0, z_Vector3f* a1, f32 a2, a3->z *= f2; } -f32 Lib_DistanceVec3f(z_Vector3f* a0, z_Vector3f* a1) { - z_Vector3f sp1C; +f32 Lib_DistanceVec3f(Vector3f* a0, Vector3f* a1) { + Vector3f sp1C; Lib_SubVec3f(a1, a0, &sp1C); return sqrtf((sp1C.x * sp1C.x) + (sp1C.y * sp1C.y) + (sp1C.z * sp1C.z)); } -f32 Lib_DistanceAndDifferenceVec3f(z_Vector3f* a0, z_Vector3f* a1, z_Vector3f* a2) { +f32 Lib_DistanceAndDifferenceVec3f(Vector3f* a0, Vector3f* a1, Vector3f* a2) { Lib_SubVec3f(a1, a0, a2); return sqrtf((a2->x * a2->x) + (a2->y * a2->y) + (a2->z * a2->z)); } -f32 Lib_DistanceXZVec3f(z_Vector3f* a0, z_Vector3f* a1) { +f32 Lib_DistanceXZVec3f(Vector3f* a0, Vector3f* a1) { f32 dx = a1->x - a0->x; f32 dz = a1->z - a0->z; return sqrtf((dx * dx) + (dz * dz)); } -f32 Lib_DistanceAndDifferenceXZVec3f(z_Vector3f* a0, z_Vector3f* a1, f32* a2, f32* a3) { +f32 Lib_DistanceAndDifferenceXZVec3f(Vector3f* a0, Vector3f* a1, f32* a2, f32* a3) { *a2 = a1->x - a0->x; *a3 = a1->z - a0->z; return sqrtf((*a2 * *a2) + (*a3 * *a3)); @@ -383,7 +383,7 @@ f32 Lib_DistanceAndDifferenceXZVec3f(z_Vector3f* a0, z_Vector3f* a1, f32* a2, f3 #ifdef NONMATCHING -UNK_RET Lib_PushAwayXZVec3f(z_Vector3f* a0, z_Vector3f* a1, f32 a2) { +UNK_RET Lib_PushAwayXZVec3f(Vector3f* a0, Vector3f* a1, f32 a2) { f32 sp24; f32 sp20; f32 f0 = Lib_DistanceAndDifferenceXZVec3f(a1, a0, &sp24, &sp20); @@ -405,60 +405,60 @@ GLOBAL_ASM("./asm/nonmatching/z_lib/Lib_PushAwayXZVec3f.asm") #endif -f32 Lib_DistanceYVec3f(z_Vector3f* a0, z_Vector3f* a1) { +f32 Lib_DistanceYVec3f(Vector3f* a0, Vector3f* a1) { return a1->y - a0->y; } -UNK_TYPE Lib_YawVec3f(z_Vector3f* a0, z_Vector3f* a1) { +UNK_TYPE Lib_YawVec3f(Vector3f* a0, Vector3f* a1) { f32 f14 = a1->x - a0->x; f32 f12 = a1->z - a0->z; return atans_flip(f12, f14); } -UNK_TYPE Lib_PitchVec3f(z_Vector3f* a0, z_Vector3f* a1) { +UNK_TYPE Lib_PitchVec3f(Vector3f* a0, Vector3f* a1) { return atans_flip(Lib_DistanceXZVec3f(a0, a1), a0->y - a1->y); } -void Lib_ApplyActorInitVars(z_Actor* a0, z_ActorInitVar* a1) { +void Lib_ApplyActorInitVars(Actor* a0, ActorInitVar* a1) { do { D_801BE960[a1->type]((u8*)a0, a1); } while ((a1++)->cont); } -UNK_RET Lib_ApplyActorInitVarByte1(u8* a0, z_ActorInitVar* a1) { +UNK_RET Lib_ApplyActorInitVarByte1(u8* a0, ActorInitVar* a1) { *(u8*)(a0 + a1->offset) = (u8)(a1->value); } -UNK_RET Lib_ApplyActorInitVarByte2(u8* a0, z_ActorInitVar* a1) { +UNK_RET Lib_ApplyActorInitVarByte2(u8* a0, ActorInitVar* a1) { *(u8*)(a0 + a1->offset) = (u8)(a1->value); } -UNK_RET Lib_ApplyActorInitVarShort1(u8* a0, z_ActorInitVar* a1) { +UNK_RET Lib_ApplyActorInitVarShort1(u8* a0, ActorInitVar* a1) { *(u16*)(a0 + a1->offset) = (u16)(a1->value); } -UNK_RET Lib_ApplyActorInitVarShort2(u8* a0, z_ActorInitVar* a1) { +UNK_RET Lib_ApplyActorInitVarShort2(u8* a0, ActorInitVar* a1) { *(u16*)(a0 + a1->offset) = (u16)(a1->value); } -UNK_RET Lib_ApplyActorInitVarWord1(u8* a0, z_ActorInitVar* a1) { +UNK_RET Lib_ApplyActorInitVarWord1(u8* a0, ActorInitVar* a1) { *(u32*)(a0 + a1->offset) = (u32)(a1->value); } -UNK_RET Lib_ApplyActorInitVarWord2(u8* a0, z_ActorInitVar* a1) { +UNK_RET Lib_ApplyActorInitVarWord2(u8* a0, ActorInitVar* a1) { *(u32*)(a0 + a1->offset) = (u32)(a1->value); } -UNK_RET Lib_ApplyActorInitVarFloat(u8* a0, z_ActorInitVar* a1) { +UNK_RET Lib_ApplyActorInitVarFloat(u8* a0, ActorInitVar* a1) { *(f32*)(a0 + a1->offset) = (f32)(a1->value); } -UNK_RET Lib_ApplyActorInitVarFloat1000th(u8* a0, z_ActorInitVar* a1) { +UNK_RET Lib_ApplyActorInitVarFloat1000th(u8* a0, ActorInitVar* a1) { *(f32*)(a0 + a1->offset) = (f32)(a1->value) / 1000; } -UNK_RET Lib_ApplyActorInitVarVector3f(u8* a0, z_ActorInitVar* a1) { - z_Vector3f* v0 = (z_Vector3f*)(a0 + a1->offset); +UNK_RET Lib_ApplyActorInitVarVector3f(u8* a0, ActorInitVar* a1) { + Vector3f* v0 = (Vector3f*)(a0 + a1->offset); f32 f0 = (f32)(a1->value); v0->z = f0; @@ -466,8 +466,8 @@ UNK_RET Lib_ApplyActorInitVarVector3f(u8* a0, z_ActorInitVar* a1) { v0->x = f0; } -UNK_RET Lib_ApplyActorInitVarVector3f1000th(u8* a0, z_ActorInitVar* a1) { - z_Vector3f* v0 = (z_Vector3f*)(a0 + a1->offset); +UNK_RET Lib_ApplyActorInitVarVector3f1000th(u8* a0, ActorInitVar* a1) { + Vector3f* v0 = (Vector3f*)(a0 + a1->offset); f32 f0 = (f32)(a1->value) / 1000; v0->z = f0; @@ -475,8 +475,8 @@ UNK_RET Lib_ApplyActorInitVarVector3f1000th(u8* a0, z_ActorInitVar* a1) { v0->x = f0; } -UNK_RET Lib_ApplyActorInitVarVector3s(u8* a0, z_ActorInitVar* a1) { - z_Vector3s* v0 = (z_Vector3s*)(a0 + a1->offset); +UNK_RET Lib_ApplyActorInitVarVector3s(u8* a0, ActorInitVar* a1) { + Vector3s* v0 = (Vector3s*)(a0 + a1->offset); s16 v1 = (s16)(a1->value); v0->z = v1; @@ -600,7 +600,7 @@ UNK_RET func_801000F4(UNK_TYPE a0, u16 a1) { func_8019F1C0(a0, a1); } -void Lib_TranslateAndRotateYVec3f(z_Vector3f* a0, s16 a1, z_Vector3f* a2, z_Vector3f* a3) { +void Lib_TranslateAndRotateYVec3f(Vector3f* a0, s16 a1, Vector3f* a2, Vector3f* a3) { f32 sp1C; f32 f0; @@ -626,8 +626,8 @@ GLOBAL_ASM("./asm/nonmatching/z_lib/Lib_LerpRGB.asm") #endif -f32 Lib_PushAwayVec3f(z_Vector3f* a0, z_Vector3f* a1, f32 a2) { - z_Vector3f sp24; +f32 Lib_PushAwayVec3f(Vector3f* a0, Vector3f* a1, f32 a2) { + Vector3f sp24; f32 f2; f32 f0; diff --git a/tables/functions.py b/tables/functions.py index 4f372e3f1..ed4afd7e4 100644 --- a/tables/functions.py +++ b/tables/functions.py @@ -13,13 +13,13 @@ 0x80080748:("func_80080748","UNK_RET","void"),
0x80080790:("Dmamgr_DoDmaTransfer","s32","void*, void*, s32"),
0x800808D4:("Dmamgr_osEPiStartDmaWrapper","void","OSPiHandle* pihandle, OSIoMesg* mb, s32 direction"),
- 0x800808F4:("Dmamgr_FindDmaEntry","z_DmadataEntry*","u32"),
+ 0x800808F4:("Dmamgr_FindDmaEntry","DmadataEntry*","u32"),
0x80080950:("Dmamgr_TranslateVromToRom","s32","u32"),
0x800809BC:("Dmamgr_FindDmaIndex","s32","u32"),
0x800809F4:("func_800809F4","UNK_TYPE*","u32"),
- 0x80080A08:("Dmamgr_HandleRequest","void","z_DmaRequest*"),
+ 0x80080A08:("Dmamgr_HandleRequest","void","DmaRequest*"),
0x80080B84:("Dmamgr_ThreadEntry","void","void*"),
- 0x80080C04:("Dmamgr_SendRequest","s32","z_DmaRequest*, UNK_FUN_ARG, UNK_PTR, UNK_TYPE, UNK_TYPE, OSMesgQueue*, UNK_TYPE"),
+ 0x80080C04:("Dmamgr_SendRequest","s32","DmaRequest*, UNK_FUN_ARG, UNK_PTR, UNK_TYPE, UNK_TYPE, OSMesgQueue*, UNK_TYPE"),
0x80080C90:("Dmamgr_SendRequestAndWait","s32","UNK_TYPE, UNK_PTR, UNK_TYPE"),
0x80080D0C:("Dmamgr_Start","void","void"),
0x80080E00:("Dmamgr_Stop","void","void"),
@@ -38,7 +38,7 @@ 0x800815A8:("Irqmgr_CheckThreadStatus","UNK_RET","UNK_ARGS"),
0x800815CC:("Irqmgr_HandleFrame","UNK_RET","UNK_ARGS"),
0x80081684:("Irqmgr_ThreadEntry","UNK_RET","UNK_ARGS"),
- 0x80081754:("Irqmgr_Start","UNK_RET","UNK_PTR, z_ThreadInfo*, UNK_TYPE, UNK_TYPE"),
+ 0x80081754:("Irqmgr_Start","UNK_RET","UNK_PTR, ThreadInfo*, UNK_TYPE, UNK_TYPE"),
0x80081820:("nop_80081820","void","void"),
0x80081828:("nop_80081828","void","void"),
0x80081830:("func_80081830","void","void"),
@@ -131,11 +131,11 @@ 0x8008520C:("func_8008520C","UNK_RET","UNK_ARGS"),
0x8008522C:("func_8008522C","UNK_RET","UNK_ARGS"),
0x8008524C:("func_8008524C","UNK_RET","UNK_ARGS"),
- 0x80085320:("thread_info_init","void","z_ThreadInfo*, UNK_PTR, UNK_PTR, UNK_TYPE, UNK_TYPE, UNK_PTR"),
- 0x800853F8:("func_800853F8","UNK_RET","z_ThreadInfo*"),
- 0x80085468:("get_thread_stack_status","UNK_TYPE","z_ThreadInfo*"),
+ 0x80085320:("thread_info_init","void","ThreadInfo*, UNK_PTR, UNK_PTR, UNK_TYPE, UNK_TYPE, UNK_PTR"),
+ 0x800853F8:("func_800853F8","UNK_RET","ThreadInfo*"),
+ 0x80085468:("get_thread_stack_status","UNK_TYPE","ThreadInfo*"),
0x800854E0:("check_all_thread_status","UNK_TYPE","UNK_ARGS"),
- 0x80085538:("check_thread_status","UNK_RET","z_ThreadInfo*"),
+ 0x80085538:("check_thread_status","UNK_RET","ThreadInfo*"),
0x80085570:("func_80085570","UNK_RET","UNK_ARGS"),
0x800859BC:("func_800859BC","UNK_RET","UNK_ARGS"),
0x80085A08:("func_80085A08","UNK_RET","UNK_ARGS"),
@@ -485,25 +485,25 @@ 0x800968B0:("func_800968B0","u32","const u8*, const u8*"),
0x80096930:("func_80096930","UNK_RET","UNK_ARGS"),
0x800A5AC0:("EnAObj_Init","UNK_RET","void*, UNK_TYPE"),
- 0x800A5B6C:("EnAObj_Fini","UNK_RET","z_ActorEnAObj*, z_GlobalContext*"),
- 0x800A5B98:("EnAObj_Update1","UNK_RET","z_ActorEnAObj*, UNK_TYPE"),
- 0x800A5C28:("EnAObj_Update2","UNK_RET","z_ActorEnAObj*"),
- 0x800A5C60:("EnAObj_Main","UNK_RET","z_ActorEnAObj*, UNK_TYPE"),
- 0x800A5CB8:("EnAObj_Draw","UNK_RET","z_ActorEnAObj*, UNK_TYPE"),
+ 0x800A5B6C:("EnAObj_Fini","UNK_RET","ActorEnAObj*, GlobalContext*"),
+ 0x800A5B98:("EnAObj_Update1","UNK_RET","ActorEnAObj*, UNK_TYPE"),
+ 0x800A5C28:("EnAObj_Update2","UNK_RET","ActorEnAObj*"),
+ 0x800A5C60:("EnAObj_Main","UNK_RET","ActorEnAObj*, UNK_TYPE"),
+ 0x800A5CB8:("EnAObj_Draw","UNK_RET","ActorEnAObj*, UNK_TYPE"),
0x800A5D00:("EnItem00_UpdateForNewObjectId","UNK_RET","UNK_ARGS"),
0x800A5D70:("EnItem00_Init","UNK_RET","UNK_ARGS"),
0x800A637C:("EnItem00_Fini","UNK_RET","UNK_ARGS"),
- 0x800A63A8:("func_800A63A8","UNK_RET","z_Actor* a0, z_GlobalContext* a1"),
- 0x800A640C:("func_800A640C","UNK_RET","z_Actor* a0, z_GlobalContext* a1"),
- 0x800A6650:("func_800A6650","UNK_RET","z_Actor* a0, z_GlobalContext* a1"),
+ 0x800A63A8:("func_800A63A8","UNK_RET","Actor* a0, GlobalContext* a1"),
+ 0x800A640C:("func_800A640C","UNK_RET","Actor* a0, GlobalContext* a1"),
+ 0x800A6650:("func_800A6650","UNK_RET","Actor* a0, GlobalContext* a1"),
0x800A6780:("func_800A6780","UNK_RET","UNK_ARGS"),
- 0x800A6A40:("EnItem00_Update","UNK_RET","z_Actor* a0, z_GlobalContext* a1"),
+ 0x800A6A40:("EnItem00_Update","UNK_RET","Actor* a0, GlobalContext* a1"),
0x800A6B98:("EnItem00_Main","UNK_RET","UNK_ARGS"),
0x800A7128:("EnItem00_Draw","UNK_RET","UNK_ARGS"),
- 0x800A72AC:("EnItem00_DrawRupee","UNK_RET","z_Actor* a0, z_GlobalContext* a1"),
- 0x800A73A0:("EnItem00_DrawSprite","UNK_RET","z_Actor* a0, z_GlobalContext* a1"),
- 0x800A74D8:("EnItem00_DrawHeartContainer","UNK_RET","z_Actor* a0, z_GlobalContext* a1"),
- 0x800A75B8:("EnItem00_DrawHeartPiece","UNK_RET","z_Actor* a0, z_GlobalContext* a1"),
+ 0x800A72AC:("EnItem00_DrawRupee","UNK_RET","Actor* a0, GlobalContext* a1"),
+ 0x800A73A0:("EnItem00_DrawSprite","UNK_RET","Actor* a0, GlobalContext* a1"),
+ 0x800A74D8:("EnItem00_DrawHeartContainer","UNK_RET","Actor* a0, GlobalContext* a1"),
+ 0x800A75B8:("EnItem00_DrawHeartPiece","UNK_RET","Actor* a0, GlobalContext* a1"),
0x800A7650:("func_800A7650","s16","s16"),
0x800A7730:("func_800A7730","UNK_RET","UNK_ARGS"),
0x800A7AD4:("func_800A7AD4","UNK_RET","UNK_ARGS"),
@@ -561,18 +561,18 @@ 0x800AFC60:("func_800AFC60","UNK_RET","UNK_ARGS"),
0x800AFDCC:("func_800AFDCC","UNK_RET","UNK_ARGS"),
0x800AFF24:("func_800AFF24","UNK_RET","UNK_ARGS"),
- 0x800B0050:("EffectSS_Init","void","z_GlobalContext* ctxt, s32 numEntries"),
- 0x800B0140:("EffectSS_Clear","void","z_GlobalContext* ctxt"),
- 0x800B0200:("EffectSS_GetTable","z_LoadedParticleEntry*","void"),
- 0x800B0210:("EffectSS_Delete","void","z_LoadedParticleEntry* a0"),
- 0x800B0270:("EffectSS_ResetLoadedParticleEntry","void","z_LoadedParticleEntry* particle"),
+ 0x800B0050:("EffectSS_Init","void","GlobalContext* ctxt, s32 numEntries"),
+ 0x800B0140:("EffectSS_Clear","void","GlobalContext* ctxt"),
+ 0x800B0200:("EffectSS_GetTable","LoadedParticleEntry*","void"),
+ 0x800B0210:("EffectSS_Delete","void","LoadedParticleEntry* a0"),
+ 0x800B0270:("EffectSS_ResetLoadedParticleEntry","void","LoadedParticleEntry* particle"),
0x800B0304:("EffectSS_FindFreeSpace","s32","u32 priority, u32* tableEntry"),
- 0x800B043C:("EffectSS_Copy","void","z_GlobalContext* ctxt, z_LoadedParticleEntry* a1"),
- 0x800B04D4:("EffectSS_LoadParticle","void","z_GlobalContext* ctxt, u32 type, u32 priority, void* initData"),
- 0x800B067C:("EffectSS_UpdateParticle","void","z_GlobalContext* ctxt, u32 index"),
- 0x800B071C:("EffectSS_UpdateAllParticles","void","z_GlobalContext* ctxt"),
- 0x800B07D8:("EffectSS_DrawParticle","void","z_GlobalContext* ctxt, s32 index"),
- 0x800B081C:("EffectSS_DrawAllParticles","void","z_GlobalContext* ctxt"),
+ 0x800B043C:("EffectSS_Copy","void","GlobalContext* ctxt, LoadedParticleEntry* a1"),
+ 0x800B04D4:("EffectSS_LoadParticle","void","GlobalContext* ctxt, u32 type, u32 priority, void* initData"),
+ 0x800B067C:("EffectSS_UpdateParticle","void","GlobalContext* ctxt, u32 index"),
+ 0x800B071C:("EffectSS_UpdateAllParticles","void","GlobalContext* ctxt"),
+ 0x800B07D8:("EffectSS_DrawParticle","void","GlobalContext* ctxt, s32 index"),
+ 0x800B081C:("EffectSS_DrawAllParticles","void","GlobalContext* ctxt"),
0x800B096C:("func_800B096C","s16","s16 a0, s16 a1, s32 a2"),
0x800B09D0:("func_800B09D0","s16","s16 a0, s16 a1, f32 a2"),
0x800B0A24:("func_800B0A24","u8","u8 a0, u8 a1, f32 a2"),
@@ -597,7 +597,7 @@ 0x800B14D4:("func_800B14D4","UNK_RET","UNK_ARGS"),
0x800B1598:("func_800B1598","UNK_RET","UNK_ARGS"),
0x800B165C:("func_800B165C","UNK_RET","UNK_ARGS"),
- 0x800B16B8:("func_800B16B8","UNK_RET","z_GlobalContext*, z_Vector3f*, UNK_PTR, UNK_PTR, UNK_PTR, UNK_PTR"),
+ 0x800B16B8:("func_800B16B8","UNK_RET","GlobalContext*, Vector3f*, UNK_PTR, UNK_PTR, UNK_PTR, UNK_PTR"),
0x800B16F4:("EffectSS_LoadSparkle","UNK_RET","UNK_ARGS"),
0x800B1830:("func_800B1830","UNK_RET","UNK_ARGS"),
0x800B1908:("EffectSS_LoadBomb2","UNK_RET","UNK_ARGS"),
@@ -675,7 +675,7 @@ 0x800B51A4:("func_800B51A4","UNK_RET","UNK_ARGS"),
0x800B5208:("func_800B5208","UNK_RET","UNK_ARGS"),
0x800B5814:("func_800B5814","UNK_RET","UNK_ARGS"),
- 0x800B5BB0:("func_800B5BB0","UNK_TYPE","z_GlobalContext*, UNK_TYPE"),
+ 0x800B5BB0:("func_800B5BB0","UNK_TYPE","GlobalContext*, UNK_TYPE"),
0x800B5BF4:("func_800B5BF4","UNK_RET","UNK_ARGS"),
0x800B5C34:("func_800B5C34","UNK_RET","UNK_ARGS"),
0x800B5C78:("func_800B5C78","UNK_RET","UNK_ARGS"),
@@ -688,8 +688,8 @@ 0x800B5D18:("Actor_GetRoomCleared","UNK_RET","UNK_ARGS"),
0x800B5D30:("Actor_SetRoomCleared","UNK_RET","UNK_ARGS"),
0x800B5D4C:("Actor_UnsetRoomCleared","UNK_RET","UNK_ARGS"),
- 0x800B5D6C:("Actor_GetCollectibleFlag","UNK_TYPE","z_GlobalContext*, s16"),
- 0x800B5DB0:("Actor_SetCollectibleFlag","UNK_RET","z_GlobalContext*, s16"),
+ 0x800B5D6C:("Actor_GetCollectibleFlag","UNK_TYPE","GlobalContext*, s16"),
+ 0x800B5DB0:("Actor_SetCollectibleFlag","UNK_RET","GlobalContext*, s16"),
0x800B5DF0:("func_800B5DF0","UNK_RET","UNK_ARGS"),
0x800B5E0C:("func_800B5E0C","UNK_RET","UNK_ARGS"),
0x800B5E50:("Actor_Nop800B5E50","UNK_RET","UNK_ARGS"),
@@ -704,19 +704,19 @@ 0x800B6584:("func_800B6584","UNK_RET","UNK_ARGS"),
0x800B6608:("func_800B6608","UNK_RET","UNK_ARGS"),
0x800B6680:("func_800B6680","UNK_RET","UNK_ARGS"),
- 0x800B670C:("Actor_MarkForDeath","UNK_RET","z_Actor*"),
+ 0x800B670C:("Actor_MarkForDeath","UNK_RET","Actor*"),
0x800B672C:("func_800B672C","UNK_RET","UNK_ARGS"),
- 0x800B675C:("func_800B675C","UNK_RET","z_ActorEnAObj*, UNK_TYPE"),
+ 0x800B675C:("func_800B675C","UNK_RET","ActorEnAObj*, UNK_TYPE"),
0x800B67A0:("func_800B67A0","UNK_RET","UNK_ARGS"),
0x800B67C0:("func_800B67C0","UNK_RET","UNK_ARGS"),
- 0x800B67E0:("Actor_SetScale","UNK_RET","z_Actor*, f32"),
- 0x800B67FC:("Actor_SetObjectSegment","UNK_RET","z_GlobalContext*, z_Actor*"),
+ 0x800B67E0:("Actor_SetScale","UNK_RET","Actor*, f32"),
+ 0x800B67FC:("Actor_SetObjectSegment","UNK_RET","GlobalContext*, Actor*"),
0x800B6834:("Actor_InitToDefaultValues","UNK_RET","UNK_ARGS"),
0x800B6948:("Actor_FiniActor","UNK_RET","UNK_ARGS"),
0x800B6988:("Actor_SetMovementScale","UNK_RET","UNK_ARGS"),
0x800B69AC:("Actor_ApplyMovement","UNK_RET","UNK_ARGS"),
0x800B6A10:("Actor_SetVelocityYRotationAndGravity","UNK_RET","UNK_ARGS"),
- 0x800B6A88:("Actor_SetVelocityAndMoveYRotationAndGravity","UNK_RET","z_Actor*"),
+ 0x800B6A88:("Actor_SetVelocityAndMoveYRotationAndGravity","UNK_RET","Actor*"),
0x800B6AB4:("Actor_SetVelocityXYRotation","UNK_RET","UNK_ARGS"),
0x800B6B24:("Actor_SetVelocityAndMoveXYRotation","UNK_RET","UNK_ARGS"),
0x800B6B50:("Actor_SetVelocityXYRotationReverse","UNK_RET","UNK_ARGS"),
@@ -758,24 +758,24 @@ 0x800B75A0:("func_800B75A0","UNK_RET","UNK_ARGS"),
0x800B761C:("func_800B761C","UNK_RET","UNK_ARGS"),
0x800B7678:("func_800B7678","UNK_RET","UNK_ARGS"),
- 0x800B78B8:("func_800B78B8","UNK_RET","z_GlobalContext*, z_Actor*, f32, f32, f32, UNK_TYPE"),
+ 0x800B78B8:("func_800B78B8","UNK_RET","GlobalContext*, Actor*, f32, f32, f32, UNK_TYPE"),
0x800B7E04:("func_800B7E04","UNK_RET","UNK_ARGS"),
0x800B7FE0:("func_800B7FE0","UNK_RET","UNK_ARGS"),
0x800B8018:("func_800B8018","UNK_RET","UNK_ARGS"),
- 0x800B8050:("func_800B8050","UNK_RET","z_Actor*, z_GlobalContext*, UNK_TYPE"),
- 0x800B8118:("func_800B8118","UNK_RET","z_Actor*, z_GlobalContext*, UNK_TYPE"),
+ 0x800B8050:("func_800B8050","UNK_RET","Actor*, GlobalContext*, UNK_TYPE"),
+ 0x800B8118:("func_800B8118","UNK_RET","Actor*, GlobalContext*, UNK_TYPE"),
0x800B81E0:("func_800B81E0","UNK_RET","UNK_ARGS"),
0x800B8214:("func_800B8214","UNK_RET","UNK_ARGS"),
0x800B8248:("func_800B8248","UNK_RET","UNK_ARGS"),
0x800B82EC:("func_800B82EC","UNK_RET","UNK_ARGS"),
0x800B83BC:("func_800B83BC","UNK_RET","UNK_ARGS"),
0x800B83F8:("func_800B83F8","UNK_RET","UNK_ARGS"),
- 0x800B84D0:("func_800B84D0","UNK_TYPE","z_ActorEnAObj*, UNK_TYPE"),
+ 0x800B84D0:("func_800B84D0","UNK_TYPE","ActorEnAObj*, UNK_TYPE"),
0x800B8500:("func_800B8500","UNK_RET","UNK_ARGS"),
0x800B85E0:("func_800B85E0","UNK_RET","UNK_ARGS"),
0x800B8614:("func_800B8614","UNK_RET","UNK_ARGS"),
- 0x800B863C:("func_800B863C","UNK_RET","z_ActorEnAObj*, UNK_TYPE"),
- 0x800B867C:("func_800B867C","UNK_TYPE","z_ActorEnAObj*"),
+ 0x800B863C:("func_800B863C","UNK_RET","ActorEnAObj*, UNK_TYPE"),
+ 0x800B867C:("func_800B867C","UNK_TYPE","ActorEnAObj*"),
0x800B86C8:("func_800B86C8","UNK_RET","UNK_ARGS"),
0x800B8708:("func_800B8708","UNK_RET","UNK_ARGS"),
0x800B8718:("func_800B8718","UNK_RET","UNK_ARGS"),
@@ -785,8 +785,8 @@ 0x800B886C:("func_800B886C","UNK_RET","UNK_ARGS"),
0x800B8898:("func_800B8898","UNK_RET","UNK_ARGS"),
0x800B8934:("func_800B8934","UNK_RET","UNK_ARGS"),
- 0x800B89F8:("Actor_HasParent","UNK_TYPE","z_Actor*, z_GlobalContext*"),
- 0x800B8A1C:("func_800B8A1C","UNK_RET","z_Actor*, z_GlobalContext*, UNK_TYPE, f32, f32"),
+ 0x800B89F8:("Actor_HasParent","UNK_TYPE","Actor*, GlobalContext*"),
+ 0x800B8A1C:("func_800B8A1C","UNK_RET","Actor*, GlobalContext*, UNK_TYPE, f32, f32"),
0x800B8B84:("func_800B8B84","UNK_RET","UNK_ARGS"),
0x800B8BB0:("func_800B8BB0","UNK_RET","UNK_ARGS"),
0x800B8BD0:("func_800B8BD0","UNK_RET","UNK_ARGS"),
@@ -835,7 +835,7 @@ 0x800BAB24:("Actor_RemoveFromTypeList","UNK_RET","UNK_ARGS"),
0x800BABFC:("Actor_FreeOverlay","UNK_RET","UNK_ARGS"),
0x800BAC60:("Actor_SpawnNoParentDefaultUnk38Unk20","UNK_RET","UNK_ARGS"),
- 0x800BACD4:("Actor_LoadOverlay","z_Actor*","UNK_PTR, z_GlobalContext*, UNK_TYPE, f32, f32, f32, UNK_TYPE, UNK_TYPE, UNK_TYPE, UNK_TYPE"),
+ 0x800BACD4:("Actor_LoadOverlay","Actor*","UNK_PTR, GlobalContext*, UNK_TYPE, f32, f32, f32, UNK_TYPE, UNK_TYPE, UNK_TYPE, UNK_TYPE"),
0x800BAE14:("Actor_Spawn","UNK_RET","UNK_ARGS"),
0x800BB0C0:("Actor_SpawnDefaultUnk38","UNK_RET","UNK_ARGS"),
0x800BB140:("Actor_SpawnTransitionActors","UNK_RET","UNK_ARGS"),
@@ -880,8 +880,8 @@ 0x800BDC5C:("func_800BDC5C","UNK_RET","UNK_ARGS"),
0x800BDCF4:("func_800BDCF4","UNK_RET","UNK_ARGS"),
0x800BDFB0:("func_800BDFB0","UNK_RET","UNK_ARGS"),
- 0x800BDFC0:("func_800BDFC0","UNK_RET","UNK_TYPE, UNK_TYPE, UNK_TYPE, z_ActorEnAObj*"),
- 0x800BE03C:("func_800BE03C","void","z_GlobalContext*, UNK_TYPE"),
+ 0x800BDFC0:("func_800BDFC0","UNK_RET","UNK_TYPE, UNK_TYPE, UNK_TYPE, ActorEnAObj*"),
+ 0x800BE03C:("func_800BE03C","void","GlobalContext*, UNK_TYPE"),
0x800BE0B8:("func_800BE0B8","UNK_RET","UNK_ARGS"),
0x800BE184:("func_800BE184","UNK_RET","UNK_ARGS"),
0x800BE22C:("func_800BE22C","UNK_RET","UNK_ARGS"),
@@ -1013,7 +1013,7 @@ 0x800C6024:("func_800C6024","UNK_TYPE","UNK_TYPE"),
0x800C6044:("func_800C6044","UNK_RET","UNK_ARGS"),
0x800C6098:("func_800C6098","UNK_RET","UNK_ARGS"),
- 0x800C6188:("func_800C6188","UNK_TYPE","z_GlobalContext*, UNK_PTR, z_Actor*, UNK_TYPE"),
+ 0x800C6188:("func_800C6188","UNK_TYPE","GlobalContext*, UNK_PTR, Actor*, UNK_TYPE"),
0x800C6248:("func_800C6248","UNK_TYPE","UNK_TYPE, UNK_TYPE"),
0x800C62BC:("func_800C62BC","UNK_RET","UNK_ARGS"),
0x800C6314:("func_800C6314","UNK_RET","UNK_ARGS"),
@@ -1021,7 +1021,7 @@ 0x800C63C4:("func_800C63C4","UNK_RET","UNK_ARGS"),
0x800C641C:("func_800C641C","UNK_RET","UNK_ARGS"),
0x800C6474:("func_800C6474","UNK_RET","UNK_ARGS"),
- 0x800C64CC:("func_800C64CC","UNK_RET","z_GlobalContext*, UNK_PTR, UNK_TYPE"),
+ 0x800C64CC:("func_800C64CC","UNK_RET","GlobalContext*, UNK_PTR, UNK_TYPE"),
0x800C6554:("func_800C6554","UNK_RET","UNK_ARGS"),
0x800C656C:("func_800C656C","UNK_RET","UNK_ARGS"),
0x800C6838:("func_800C6838","UNK_RET","UNK_ARGS"),
@@ -1095,7 +1095,7 @@ 0x800CAC0C:("func_800CAC0C","UNK_RET","UNK_TYPE, UNK_TYPE, UNK_TYPE"),
0x800CACA0:("func_800CACA0","UNK_RET","UNK_TYPE, UNK_TYPE, UNK_TYPE"),
0x800CAD2C:("func_800CAD2C","UNK_TYPE","UNK_TYPE, UNK_TYPE, UNK_TYPE"),
- 0x800CAE10:("func_800CAE10","UNK_RET","z_Actor*, UNK_TYPE"),
+ 0x800CAE10:("func_800CAE10","UNK_RET","Actor*, UNK_TYPE"),
0x800CAE34:("func_800CAE34","UNK_RET","UNK_ARGS"),
0x800CAE7C:("func_800CAE7C","UNK_RET","UNK_ARGS"),
0x800CAE88:("func_800CAE88","UNK_RET","UNK_TYPE"),
@@ -1345,12 +1345,12 @@ 0x800E110C:("Collision_InitCylinderParamsDefault","UNK_RET","UNK_ARGS"),
0x800E1148:("Collision_FiniCylinderParams","UNK_RET","UNK_ARGS"),
0x800E115C:("Collision_InitCylinderParamsWithData","UNK_RET","UNK_ARGS"),
- 0x800E119C:("Collision_InitCylinderDefault","void","z_GlobalContext*, UNK_PTR"),
- 0x800E11EC:("Collision_FiniCylinder","void","z_GlobalContext*, UNK_PTR"),
+ 0x800E119C:("Collision_InitCylinderDefault","void","GlobalContext*, UNK_PTR"),
+ 0x800E11EC:("Collision_FiniCylinder","void","GlobalContext*, UNK_PTR"),
0x800E123C:("func_800E123C","UNK_RET","UNK_ARGS"),
0x800E12A4:("func_800E12A4","UNK_RET","UNK_ARGS"),
- 0x800E130C:("Collision_InitCylinderWithData","void","z_GlobalContext*, UNK_PTR, z_Actor*, UNK_PTR"),
- 0x800E1374:("Collision_InitCylinder","UNK_RET","UNK_TYPE, UNK_PTR, z_Actor*, UNK_PTR"),
+ 0x800E130C:("Collision_InitCylinderWithData","void","GlobalContext*, UNK_PTR, Actor*, UNK_PTR"),
+ 0x800E1374:("Collision_InitCylinder","UNK_RET","UNK_TYPE, UNK_PTR, Actor*, UNK_PTR"),
0x800E13C0:("func_800E13C0","UNK_RET","UNK_ARGS"),
0x800E1400:("func_800E1400","UNK_RET","UNK_ARGS"),
0x800E1440:("func_800E1440","UNK_RET","UNK_ARGS"),
@@ -1403,9 +1403,9 @@ 0x800E2480:("Collision_Reset","UNK_RET","UNK_ARGS"),
0x800E2528:("Collision_EnableEditMode","UNK_RET","UNK_ARGS"),
0x800E2540:("Collision_EnableAppendMode","UNK_RET","UNK_ARGS"),
- 0x800E2558:("Collision_AddAT","void","z_GlobalContext*, UNK_PTR, UNK_PTR"),
+ 0x800E2558:("Collision_AddAT","void","GlobalContext*, UNK_PTR, UNK_PTR"),
0x800E2634:("Collision_AddIndexAT","UNK_RET","UNK_ARGS"),
- 0x800E2740:("Collision_AddAC","UNK_RET","z_GlobalContext*, UNK_PTR, UNK_PTR"),
+ 0x800E2740:("Collision_AddAC","UNK_RET","GlobalContext*, UNK_PTR, UNK_PTR"),
0x800E281C:("collision_AddIndexAC","UNK_RET","UNK_ARGS"),
0x800E2928:("Collision_AddOT","UNK_RET","UNK_TYPE, UNK_TYPE, UNK_PTR"),
0x800E2A04:("Collision_AddIndexOT","UNK_RET","UNK_ARGS"),
@@ -1492,7 +1492,7 @@ 0x800E7C64:("func_800E7C64","UNK_RET","UNK_ARGS"),
0x800E7DA8:("func_800E7DA8","UNK_RET","UNK_ARGS"),
0x800E7DCC:("func_800E7DCC","UNK_RET","UNK_ARGS"),
- 0x800E7DF8:("Collision_CylinderMoveToActor","void","z_Actor*, UNK_PTR"),
+ 0x800E7DF8:("Collision_CylinderMoveToActor","void","Actor*, UNK_PTR"),
0x800E7E3C:("Collision_CylinderSetLoc","UNK_RET","UNK_ARGS"),
0x800E7E5C:("Collision_QuadSetCoords","UNK_RET","UNK_ARGS"),
0x800E7ECC:("Collision_TriGroupSetCoordsAtIndex","UNK_RET","UNK_ARGS"),
@@ -1508,7 +1508,7 @@ 0x800E86C0:("func_800E86C0","UNK_RET","UNK_ARGS"),
0x800E86E0:("func_800E86E0","UNK_RET","UNK_ARGS"),
0x800E8784:("func_800E8784","UNK_RET","UNK_ARGS"),
- 0x800E8EA0:("func_800E8EA0","void","z_GlobalContext* a0, z_Actor* a1, u16 a2"),
+ 0x800E8EA0:("func_800E8EA0","void","GlobalContext* a0, Actor* a1, u16 a2"),
0x800E8ED0:("func_800E8ED0","UNK_TYPE","UNK_TYPE a0"),
0x800E8EE0:("func_800E8EE0","void","UNK_TYPE a0"),
0x800E8EEC:("func_800E8EEC","UNK_TYPE","UNK_TYPE a0"),
@@ -1581,7 +1581,7 @@ 0x800EE200:("func_800EE200","UNK_RET","UNK_ARGS"),
0x800EE29C:("func_800EE29C","UNK_RET","UNK_ARGS"),
0x800EE2F4:("func_800EE2F4","UNK_RET","UNK_ARGS"),
- 0x800EE320:("func_800EE320","UNK_RET","z_GlobalContext*, UNK_TYPE"),
+ 0x800EE320:("func_800EE320","UNK_RET","GlobalContext*, UNK_TYPE"),
0x800EE364:("func_800EE364","UNK_RET","UNK_ARGS"),
0x800EE400:("func_800EE400","UNK_RET","UNK_ARGS"),
0x800EE5FC:("func_800EE5FC","UNK_RET","UNK_ARGS"),
@@ -1612,7 +1612,7 @@ 0x800F0390:("func_800F0390","UNK_RET","UNK_ARGS"),
0x800F03C0:("func_800F03C0","UNK_RET","UNK_ARGS"),
0x800F048C:("func_800F048C","UNK_RET","UNK_ARGS"),
- 0x800F0568:("func_800F0568","UNK_RET","z_GlobalContext*, z_Vector3f*, UNK_TYPE, UNK_TYPE"),
+ 0x800F0568:("func_800F0568","UNK_RET","GlobalContext*, Vector3f*, UNK_TYPE, UNK_TYPE"),
0x800F0590:("func_800F0590","UNK_RET","UNK_ARGS"),
0x800F05C0:("func_800F05C0","UNK_RET","UNK_ARGS"),
0x800F07C0:("func_800F07C0","UNK_RET","UNK_ARGS"),
@@ -1804,39 +1804,39 @@ 0x800FF3A0:("func_800FF3A0","UNK_RET","UNK_ARGS"),
0x800FF450:("Lib_rand_s","s16","s16 a0, s16 a1"),
0x800FF4A4:("Lib_randStride_s","s16","s16 a0, s16 a1, s16 a2"),
- 0x800FF50C:("Lib_CopyVec3f","UNK_RET","z_Vector3f* dst, z_Vector3f* src"),
- 0x800FF52C:("Lib_CopyVec3s","UNK_RET","z_Vector3s* dst, z_Vector3s* src"),
- 0x800FF54C:("Lib_ToVec3f","UNK_RET","z_Vector3f* dst, z_Vector3s* src"),
- 0x800FF584:("Lib_ToVec3s","UNK_RET","z_Vector3s* dst, z_Vector3f* src"),
- 0x800FF5BC:("Lib_AddVec3f","UNK_RET","z_Vector3f* a0, z_Vector3f* a1, z_Vector3f* a2"),
- 0x800FF5F4:("Lib_SubVec3f","UNK_RET","z_Vector3f* a0, z_Vector3f* a1, z_Vector3f* a2"),
- 0x800FF62C:("Lib_SubVec3sToVec3f","UNK_RET","z_Vector3f* a0, z_Vector3s* a1, z_Vector3s* a2"),
- 0x800FF688:("Lib_ScaleInPlaceVec3f","UNK_RET","z_Vector3f* a0, f32 a1"),
- 0x800FF6C4:("Lib_ScaleVec3f","UNK_RET","z_Vector3f* a0, f32 a1, z_Vector3f* a2"),
- 0x800FF6F8:("Lib_LerpVec3f","UNK_RET","z_Vector3f* a0, z_Vector3f* a1, f32 a2, z_Vector3f* a3"),
- 0x800FF750:("Lib_AddScaledVec3f","UNK_RET","z_Vector3f* a0, z_Vector3f* a1, f32 a2, z_Vector3f* a3"),
- 0x800FF79C:("Lib_ModifyRandScaled","UNK_RET","z_Vector3f* a0, f32 a1, z_Vector3f* a2"),
- 0x800FF810:("Lib_ScaledNormalizedDifferenceVec3f","UNK_RET","z_Vector3f* a0, z_Vector3f* a1, f32 a2, z_Vector3f* a3"),
- 0x800FF884:("Lib_DistanceVec3f","f32","z_Vector3f* a0, z_Vector3f* a1"),
- 0x800FF8D4:("Lib_DistanceAndDifferenceVec3f","f32","z_Vector3f* a0, z_Vector3f* a1, z_Vector3f* a2"),
- 0x800FF92C:("Lib_DistanceXZVec3f","f32","z_Vector3f* a0, z_Vector3f* a1"),
- 0x800FF960:("Lib_DistanceAndDifferenceXZVec3f","f32","z_Vector3f* a0, z_Vector3f* a1, f32* a2, f32* a3"),
- 0x800FF9A4:("Lib_PushAwayXZVec3f","UNK_RET","z_Vector3f* a0, z_Vector3f* a1, f32 a2"),
- 0x800FFA4C:("Lib_DistanceYVec3f","f32","z_Vector3f* a0, z_Vector3f* a1"),
- 0x800FFA60:("Lib_YawVec3f","UNK_TYPE","z_Vector3f* a0, z_Vector3f* a1"),
- 0x800FFA94:("Lib_PitchVec3f","UNK_TYPE","z_Vector3f* a0, z_Vector3f* a1"),
- 0x800FFADC:("Lib_ApplyActorInitVars","void","z_Actor*, z_ActorInitVar*"),
- 0x800FFB54:("Lib_ApplyActorInitVarByte1","UNK_RET","u8* a0, z_ActorInitVar* a1"),
- 0x800FFB70:("Lib_ApplyActorInitVarByte2","UNK_RET","u8* a0, z_ActorInitVar* a1"),
- 0x800FFB8C:("Lib_ApplyActorInitVarShort1","UNK_RET","u8* a0, z_ActorInitVar* a1"),
- 0x800FFBA8:("Lib_ApplyActorInitVarShort2","UNK_RET","u8* a0, z_ActorInitVar* a1"),
- 0x800FFBC4:("Lib_ApplyActorInitVarWord1","UNK_RET","u8* a0, z_ActorInitVar* a1"),
- 0x800FFBE0:("Lib_ApplyActorInitVarWord2","UNK_RET","u8* a0, z_ActorInitVar* a1"),
- 0x800FFBFC:("Lib_ApplyActorInitVarFloat","UNK_RET","u8* a0, z_ActorInitVar* a1"),
- 0x800FFC20:("Lib_ApplyActorInitVarFloat1000th","UNK_RET","u8* a0, z_ActorInitVar* a1"),
- 0x800FFC50:("Lib_ApplyActorInitVarVector3f","UNK_RET","u8* a0, z_ActorInitVar* a1"),
- 0x800FFC7C:("Lib_ApplyActorInitVarVector3f1000th","UNK_RET","u8* a0, z_ActorInitVar* a1"),
- 0x800FFCB4:("Lib_ApplyActorInitVarVector3s","UNK_RET","u8* a0, z_ActorInitVar* a1"),
+ 0x800FF50C:("Lib_CopyVec3f","UNK_RET","Vector3f* dst, Vector3f* src"),
+ 0x800FF52C:("Lib_CopyVec3s","UNK_RET","Vector3s* dst, Vector3s* src"),
+ 0x800FF54C:("Lib_ToVec3f","UNK_RET","Vector3f* dst, Vector3s* src"),
+ 0x800FF584:("Lib_ToVec3s","UNK_RET","Vector3s* dst, Vector3f* src"),
+ 0x800FF5BC:("Lib_AddVec3f","UNK_RET","Vector3f* a0, Vector3f* a1, Vector3f* a2"),
+ 0x800FF5F4:("Lib_SubVec3f","UNK_RET","Vector3f* a0, Vector3f* a1, Vector3f* a2"),
+ 0x800FF62C:("Lib_SubVec3sToVec3f","UNK_RET","Vector3f* a0, Vector3s* a1, Vector3s* a2"),
+ 0x800FF688:("Lib_ScaleInPlaceVec3f","UNK_RET","Vector3f* a0, f32 a1"),
+ 0x800FF6C4:("Lib_ScaleVec3f","UNK_RET","Vector3f* a0, f32 a1, Vector3f* a2"),
+ 0x800FF6F8:("Lib_LerpVec3f","UNK_RET","Vector3f* a0, Vector3f* a1, f32 a2, Vector3f* a3"),
+ 0x800FF750:("Lib_AddScaledVec3f","UNK_RET","Vector3f* a0, Vector3f* a1, f32 a2, Vector3f* a3"),
+ 0x800FF79C:("Lib_ModifyRandScaled","UNK_RET","Vector3f* a0, f32 a1, Vector3f* a2"),
+ 0x800FF810:("Lib_ScaledNormalizedDifferenceVec3f","UNK_RET","Vector3f* a0, Vector3f* a1, f32 a2, Vector3f* a3"),
+ 0x800FF884:("Lib_DistanceVec3f","f32","Vector3f* a0, Vector3f* a1"),
+ 0x800FF8D4:("Lib_DistanceAndDifferenceVec3f","f32","Vector3f* a0, Vector3f* a1, Vector3f* a2"),
+ 0x800FF92C:("Lib_DistanceXZVec3f","f32","Vector3f* a0, Vector3f* a1"),
+ 0x800FF960:("Lib_DistanceAndDifferenceXZVec3f","f32","Vector3f* a0, Vector3f* a1, f32* a2, f32* a3"),
+ 0x800FF9A4:("Lib_PushAwayXZVec3f","UNK_RET","Vector3f* a0, Vector3f* a1, f32 a2"),
+ 0x800FFA4C:("Lib_DistanceYVec3f","f32","Vector3f* a0, Vector3f* a1"),
+ 0x800FFA60:("Lib_YawVec3f","UNK_TYPE","Vector3f* a0, Vector3f* a1"),
+ 0x800FFA94:("Lib_PitchVec3f","UNK_TYPE","Vector3f* a0, Vector3f* a1"),
+ 0x800FFADC:("Lib_ApplyActorInitVars","void","Actor*, ActorInitVar*"),
+ 0x800FFB54:("Lib_ApplyActorInitVarByte1","UNK_RET","u8* a0, ActorInitVar* a1"),
+ 0x800FFB70:("Lib_ApplyActorInitVarByte2","UNK_RET","u8* a0, ActorInitVar* a1"),
+ 0x800FFB8C:("Lib_ApplyActorInitVarShort1","UNK_RET","u8* a0, ActorInitVar* a1"),
+ 0x800FFBA8:("Lib_ApplyActorInitVarShort2","UNK_RET","u8* a0, ActorInitVar* a1"),
+ 0x800FFBC4:("Lib_ApplyActorInitVarWord1","UNK_RET","u8* a0, ActorInitVar* a1"),
+ 0x800FFBE0:("Lib_ApplyActorInitVarWord2","UNK_RET","u8* a0, ActorInitVar* a1"),
+ 0x800FFBFC:("Lib_ApplyActorInitVarFloat","UNK_RET","u8* a0, ActorInitVar* a1"),
+ 0x800FFC20:("Lib_ApplyActorInitVarFloat1000th","UNK_RET","u8* a0, ActorInitVar* a1"),
+ 0x800FFC50:("Lib_ApplyActorInitVarVector3f","UNK_RET","u8* a0, ActorInitVar* a1"),
+ 0x800FFC7C:("Lib_ApplyActorInitVarVector3f1000th","UNK_RET","u8* a0, ActorInitVar* a1"),
+ 0x800FFCB4:("Lib_ApplyActorInitVarVector3s","UNK_RET","u8* a0, ActorInitVar* a1"),
0x800FFCD8:("func_800FFCD8","f32","f32*, f32, f32, f32, f32"),
0x800FFDF8:("Lib_ScaleMax_f","UNK_RET","f32* a0, f32 a1, f32 a2, f32 a3"),
0x800FFE68:("Lib_Scale_f","UNK_RET","f32* a0, f32 a1, f32 a2"),
@@ -1846,9 +1846,9 @@ 0x801000A4:("func_801000A4","UNK_RET","u16 a0"),
0x801000CC:("func_801000CC","UNK_RET","u16 a0"),
0x801000F4:("func_801000F4","UNK_RET","UNK_TYPE a0, u16 a1"),
- 0x8010011C:("Lib_TranslateAndRotateYVec3f","UNK_RET","z_Vector3f* a0, s16 a1, z_Vector3f* a2, z_Vector3f* a3"),
+ 0x8010011C:("Lib_TranslateAndRotateYVec3f","UNK_RET","Vector3f* a0, s16 a1, Vector3f* a2, Vector3f* a3"),
0x801001B8:("Lib_LerpRGB","UNK_RET","u8* a0, u8* a1, f32 a2, u8* a3"),
- 0x80100448:("Lib_PushAwayVec3f","f32","z_Vector3f* a0, z_Vector3f* a1, f32 a2"),
+ 0x80100448:("Lib_PushAwayVec3f","f32","Vector3f* a0, Vector3f* a1, f32 a2"),
0x801004FC:("Lib_Nop801004FC","UNK_RET","void"),
0x80100504:("Lib_PtrSegToPhys","UNK_TYPE","u32 a0"),
0x8010053C:("Lib_PtrSegToPhysNull","UNK_TYPE","u32 a0"),
@@ -1869,18 +1869,18 @@ 0x80101AFC:("Lights_SetPositionalLightPosition","UNK_RET","UNK_ARGS"),
0x80101B34:("Lights_InitDirectional","UNK_RET","UNK_ARGS"),
0x80101B8C:("Lights_MapperInit","UNK_RET","UNK_ARGS"),
- 0x80101BC8:("Lights_UploadLights","UNK_RET","UNK_TYPE, z_GraphicsContext*"),
+ 0x80101BC8:("Lights_UploadLights","UNK_RET","UNK_TYPE, GraphicsContext*"),
0x80101D0C:("Lights_MapperGetNextFreeSlot","UNK_RET","UNK_ARGS"),
0x80101D3C:("Lights_MapPositionalWithReference","UNK_RET","UNK_ARGS"),
0x801020A0:("Lights_MapPositional","UNK_RET","UNK_ARGS"),
0x80102284:("Lights_MapDirectional","UNK_RET","UNK_ARGS"),
- 0x801022F0:("Lights_MapLights","UNK_RET","UNK_TYPE, z_Light*, UNK_TYPE, z_GlobalContext*"),
+ 0x801022F0:("Lights_MapLights","UNK_RET","UNK_TYPE, z_Light*, UNK_TYPE, GlobalContext*"),
0x801023D8:("Lights_FindFreeSlot","UNK_RET","UNK_ARGS"),
0x80102464:("Lights_Free","UNK_RET","UNK_ARGS"),
0x801024AC:("Lights_Init","UNK_RET","UNK_ARGS"),
0x80102518:("Lights_SetAmbientColor","UNK_RET","UNK_ARGS"),
0x80102544:("func_80102544","UNK_RET","UNK_ARGS"),
- 0x80102580:("Lights_CreateMapper","UNK_TYPE","z_LightingContext*, z_GraphicsContext*"),
+ 0x80102580:("Lights_CreateMapper","UNK_TYPE","LightingContext*, GraphicsContext*"),
0x801025B8:("Lights_ClearHead","UNK_RET","UNK_ARGS"),
0x801025C8:("Lights_RemoveAll","UNK_RET","UNK_ARGS"),
0x80102624:("Lights_Insert","UNK_RET","UNK_ARGS"),
@@ -2109,7 +2109,7 @@ 0x80112B40:("func_80112B40","UNK_RET","UNK_ARGS"),
0x80112BE4:("func_80112BE4","UNK_RET","UNK_ARGS"),
0x80112C0C:("func_80112C0C","UNK_RET","UNK_ARGS"),
- 0x80112E80:("func_80112E80","UNK_RET","z_GlobalContext*, UNK_TYPE"),
+ 0x80112E80:("func_80112E80","UNK_RET","GlobalContext*, UNK_TYPE"),
0x801143CC:("func_801143CC","UNK_RET","UNK_ARGS"),
0x80114978:("func_80114978","UNK_RET","UNK_ARGS"),
0x801149A0:("func_801149A0","UNK_RET","UNK_ARGS"),
@@ -2127,7 +2127,7 @@ 0x801155B4:("func_801155B4","UNK_RET","UNK_ARGS"),
0x80115764:("func_80115764","UNK_RET","UNK_ARGS"),
0x80115844:("func_80115844","UNK_RET","UNK_ARGS"),
- 0x80115908:("func_80115908","UNK_RET","z_GlobalContext*, UNK_TYPE"),
+ 0x80115908:("func_80115908","UNK_RET","GlobalContext*, UNK_TYPE"),
0x801159EC:("func_801159EC","UNK_RET","UNK_ARGS"),
0x80115A14:("func_80115A14","UNK_RET","UNK_ARGS"),
0x80115D14:("func_80115D14","UNK_RET","UNK_ARGS"),
@@ -2321,9 +2321,9 @@ 0x8012C214:("func_8012C214","UNK_RET","UNK_ARGS"),
0x8012C240:("func_8012C240","UNK_RET","UNK_ARGS"),
0x8012C268:("func_8012C268","UNK_RET","UNK_ARGS"),
- 0x8012C28C:("func_8012C28C","UNK_RET","z_GraphicsContext*"),
+ 0x8012C28C:("func_8012C28C","UNK_RET","GraphicsContext*"),
0x8012C2B4:("func_8012C2B4","UNK_RET","UNK_ARGS"),
- 0x8012C2DC:("func_8012C2DC","UNK_RET","z_GraphicsContext*"),
+ 0x8012C2DC:("func_8012C2DC","UNK_RET","GraphicsContext*"),
0x8012C304:("func_8012C304","UNK_RET","UNK_ARGS"),
0x8012C3A4:("func_8012C3A4","UNK_RET","UNK_ARGS"),
0x8012C3CC:("func_8012C3CC","UNK_RET","UNK_ARGS"),
@@ -2442,7 +2442,7 @@ 0x801311B4:("func_801311B4","UNK_RET","UNK_ARGS"),
0x80131580:("func_80131580","UNK_RET","UNK_ARGS"),
0x80131690:("func_80131690","UNK_RET","UNK_ARGS"),
- 0x80131758:("func_80131758","void","z_GlobalContext*, UNK_TYPE"),
+ 0x80131758:("func_80131758","void","GlobalContext*, UNK_TYPE"),
0x8013178C:("func_8013178C","UNK_RET","UNK_ARGS"),
0x801317C0:("func_801317C0","UNK_RET","UNK_ARGS"),
0x801317F4:("func_801317F4","UNK_RET","UNK_ARGS"),
@@ -2951,7 +2951,7 @@ 0x80165E7C:("func_80165E7C","UNK_RET","UNK_ARGS"),
0x80165EC0:("func_80165EC0","UNK_RET","UNK_ARGS"),
0x80166060:("func_80166060","UNK_RET","UNK_ARGS"),
- 0x801660B8:("func_801660B8","u32*","z_GlobalContext*, u32*, UNK_TYPE"),
+ 0x801660B8:("func_801660B8","u32*","GlobalContext*, u32*, UNK_TYPE"),
0x8016613C:("Main_Fini","UNK_RET","UNK_ARGS"),
0x801663C4:("func_801663C4","UNK_RET","UNK_ARGS"),
0x80166644:("func_80166644","UNK_RET","UNK_ARGS"),
@@ -2997,7 +2997,7 @@ 0x80169F78:("func_80169F78","UNK_RET","UNK_ARGS"),
0x80169FDC:("func_80169FDC","UNK_RET","UNK_ARGS"),
0x80169FFC:("func_80169FFC","UNK_RET","UNK_ARGS"),
- 0x8016A01C:("func_8016A01C","s32","z_GlobalContext*"),
+ 0x8016A01C:("func_8016A01C","s32","GlobalContext*"),
0x8016A02C:("func_8016A02C","UNK_RET","UNK_ARGS"),
0x8016A0AC:("func_8016A0AC","UNK_RET","UNK_ARGS"),
0x8016A168:("func_8016A168","UNK_RET","UNK_ARGS"),
@@ -3242,7 +3242,7 @@ 0x8017A634:("Math3D_XZDistanceSquared","UNK_RET","UNK_ARGS"),
0x8017A678:("Math3D_XZDistance","UNK_RET","UNK_ARGS"),
0x8017A6A8:("Math3D_LengthSquared","UNK_RET","UNK_ARGS"),
- 0x8017A6D4:("Math3D_Length","f32","z_Vector3f*"),
+ 0x8017A6D4:("Math3D_Length","f32","Vector3f*"),
0x8017A6F8:("Math3D_DistanceSquared","UNK_RET","UNK_ARGS"),
0x8017A720:("Math3D_Distance","UNK_RET","UNK_ARGS"),
0x8017A740:("Math3D_DistanceS","UNK_RET","UNK_ARGS"),
@@ -3341,7 +3341,7 @@ 0x80181650:("SysMatrix_SetStateRotationAndTranslation","UNK_RET","UNK_ARGS"),
0x801817FC:("SysMatrix_ToRSPMatrix","UNK_RET","UNK_ARGS"),
0x80181A18:("SysMatrix_GetStateAsRSPMatrix","UNK_RET","UNK_ARGS"),
- 0x80181A40:("SysMatrix_AppendStateToPolyOpaDisp","UNK_TYPE","z_GraphicsContext*"),
+ 0x80181A40:("SysMatrix_AppendStateToPolyOpaDisp","UNK_TYPE","GraphicsContext*"),
0x80181A6C:("SysMatrix_AppendToPolyOpaDisp","UNK_RET","UNK_ARGS"),
0x80181A98:("SysMatrix_MultiplyVector3fByState","UNK_RET","UNK_ARGS"),
0x80181B50:("SysMatrix_GetStateTranslation","UNK_RET","UNK_ARGS"),
diff --git a/tables/variables.py b/tables/variables.py index be68f7fa8..689219366 100644 --- a/tables/variables.py +++ b/tables/variables.py @@ -29,8 +29,8 @@ 0x80096B40:("","OSPiHandle*",False),
0x80096B50:("","UNK_TYPE",False),
0x80096B60:("","UNK_TYPE*",False),
- 0x80096C40:("g_s80085320_ListHead","z_ThreadInfo*",False), # TODO rename?
- 0x80096C44:("g_s80085320_ListTail","z_ThreadInfo*",False), # TODO rename?
+ 0x80096C40:("g_s80085320_ListHead","ThreadInfo*",False), # TODO rename?
+ 0x80096C44:("g_s80085320_ListTail","ThreadInfo*",False), # TODO rename?
0x80097590:("","UNK_TYPE",False),
0x80097E10:("__osThreadTail","OSThread*",False),
0x80097E18:("__osRunQueue","OSThread*",False),
@@ -82,24 +82,24 @@ 0x80099450:("__libm_qnan_f", "float",False),
0x800994D0:("","UNK_TYPE",False),
0x800994DC:("","UNK_TYPE",False),
- 0x80099500:("","z_ThreadInfo",False),
+ 0x80099500:("","ThreadInfo",False),
0x80099520:("","OSThread",False),
0x800996D0:("","UNK_TYPE",False),
0x800975E0:("sintable","short",True),
# 0x80097DDE:("sintable","short",True), # NOTE this is just the end of sintable
- 0x80099AD0:("","z_ThreadInfo",False),
+ 0x80099AD0:("","ThreadInfo",False),
0x80099AF0:("","UNK_TYPE",False),
0x80099EF0:("","UNK_TYPE",False),
0x8009A170:("","UNK_TYPE",False),
- 0x8009A670:("","z_ThreadInfo",False),
+ 0x8009A670:("","ThreadInfo",False),
0x8009A690:("","UNK_TYPE",False),
0x8009A840:("","UNK_TYPE",False),
- 0x8009B140:("","z_ThreadInfo",False),
+ 0x8009B140:("","ThreadInfo",False),
0x8009B160:("","UNK_TYPE",False),
0x8009B228:("","UNK_TYPE",False),
0x8009B240:("","u32*",False),
0x8009B290:("","u8",False),
- 0x8009B2A0:("","z_ThreadInfo",False),
+ 0x8009B2A0:("","ThreadInfo",False),
0x8009B2BC:("","u16",False), # Count of entries in dmadata
0x8009B2C0:("","OSMesgQueue",False),
0x8009B2D8:("","UNK_TYPE",False),
@@ -135,7 +135,7 @@ 0x8009E5C0:("__osTimerCounter","UNK_TYPE",False),
0x8009E610:("","OSPiHandle",False),
0x8009E624:("","UNK_TYPE",False),
- 0x8009F8B0:("dmadata","z_DmadataEntry",True), # RAM copy of dmadata
+ 0x8009F8B0:("dmadata","DmadataEntry",True), # RAM copy of dmadata
0x801ADE80:("","UNK_TYPE",False),
0x801ADEAC:("","UNK_TYPE",False),
0x801ADEB0:("D_801ADEB0","int",True), # TODO better array representation
@@ -151,9 +151,9 @@ 0x801AE084:("D_801AE084","u8",True),
0x801AE194:("D_801AE194","s32",True), # length 32
0x801AE214:("D_801AE214","u8",True), # length 32
- 0x801AE3A0:("EffectSS2Info","z_EffectTableInfo",False),
- 0x801AE4A0:("particleOverlayTable","z_ParticleOverlayTableEntry",True), # length 0x28
- 0x801AEFD0:("","z_ActorOverlayTableEntry",False),
+ 0x801AE3A0:("EffectSS2Info","EffectTableInfo",False),
+ 0x801AE4A0:("particleOverlayTable","ParticleOverlayTableEntry",True), # length 0x28
+ 0x801AEFD0:("","ActorOverlayTableEntry",False),
0x801B4610:("","UNK_TYPE",False),
0x801B9F20:("","s800E03A0",False), # actually an array of size 23?
0x801BDB30:("","u8",True),
@@ -198,7 +198,7 @@ 0x801ED940:("","UNK_TYPE",False),
0x801EF670:("D_801EF670","u8",False), # save info/link struct?
0x801EF677:("D_801EF677","u8",False), # part of save info/link struct?
- 0x801F3F60:("staticContext","z_StaticContext*",False),
+ 0x801F3F60:("staticContext","StaticContext*",False),
0x801F8160:("D_801F8160","OSMesgQueue",False),
0x801F8178:("D_801F8178","OSMesg",True),
0x801F8180:("D_801F8180","UNK_TYPE",True),
@@ -209,10 +209,10 @@ # En_Test
0x808637D0:("","f32",False),
- 0x80ACB650:("bgBgFuKaitenInitVar","z_ActorInitData",False),
+ 0x80ACB650:("bgBgFuKaitenInitVar","ActorInitData",False),
0x80ACB650:("","f32",False),
- 0x80BD55D0:("bgIkanaRayInitVar","z_ActorInitData",False),
+ 0x80BD55D0:("bgIkanaRayInitVar","ActorInitData",False),
0x80BD55F0:("","UNK_TYPE",False),
- 0x80BD561C:("bgIkanaRayCompInit","z_ActorInitVar",True),
+ 0x80BD561C:("bgIkanaRayCompInit","ActorInitVar",True),
0x80BD562C:("","UNK_TYPE",False)
}
|