From 687e2851ab8ba2091e2641b361094ac5610bca0b Mon Sep 17 00:00:00 2001 From: AltoXorg <56553686+Alto1772@users.noreply.github.com> Date: Fri, 14 Jun 2024 18:22:39 +0800 Subject: [PATCH 1/4] update symbols to match with the bundled mm-decomp --- patches/autosaving.c | 8 +- patches/camera_patches.c | 8 +- patches/input.c | 8 +- patches/patches.h | 1 - patches/song_transform_tagging.c | 5 - patches/syms.ld | 1 + us.rev1.syms.toml | 846 +++++++++++++++---------------- 7 files changed, 435 insertions(+), 442 deletions(-) diff --git a/patches/autosaving.c b/patches/autosaving.c index 56da1a0..b05e507 100644 --- a/patches/autosaving.c +++ b/patches/autosaving.c @@ -443,7 +443,7 @@ void autosave_init() { } extern s32 gFlashSaveSizes[]; -extern u16 D_801C6A58[]; +extern u16 sOwlWarpEntrances[]; #define CHECK_NEWF(newf) \ ((newf)[0] != 'Z' || (newf)[1] != 'E' || (newf)[2] != 'L' || (newf)[3] != 'D' || (newf)[4] != 'A' || \ @@ -623,7 +623,7 @@ void Sram_OpenSave(FileSelectState* fileSelect, SramContext* sramCtx) { func_80147314(sramCtx, fileNum); } else { - gSaveContext.save.entrance = D_801C6A58[(void)0, gSaveContext.save.owlWarpId]; + gSaveContext.save.entrance = sOwlWarpEntrances[(void)0, gSaveContext.save.owlWarpId]; if ((gSaveContext.save.entrance == ENTRANCE(SOUTHERN_SWAMP_POISONED, 10)) && CHECK_WEEKEVENTREG(WEEKEVENTREG_CLEARED_WOODFALL_TEMPLE)) { gSaveContext.save.entrance = ENTRANCE(SOUTHERN_SWAMP_CLEARED, 10); @@ -655,7 +655,7 @@ void Sram_OpenSave(FileSelectState* fileSelect, SramContext* sramCtx) { autosave_init(); } -extern s32 Actor_ProcessTalkRequest(Actor* actor, GameState* gameState); +extern s32 Actor_TalkOfferAccepted(Actor* actor, GameState* gameState); // @recomp Reset the autosave timer when the moon crashes. void Sram_ResetSaveFromMoonCrash(SramContext* sramCtx) { @@ -728,7 +728,7 @@ void ObjWarpstone_Update(Actor* thisx, PlayState* play) { Message_CloseTextbox(play); } } - } else if (Actor_ProcessTalkRequest(&this->dyna.actor, &play->state)) { + } else if (Actor_TalkOfferAccepted(&this->dyna.actor, &play->state)) { this->isTalking = true; } else if (!this->actionFunc(this, play)) { Actor_OfferTalkNearColChkInfoCylinder(&this->dyna.actor, play); diff --git a/patches/camera_patches.c b/patches/camera_patches.c index 2dbffd2..82d5e64 100644 --- a/patches/camera_patches.c +++ b/patches/camera_patches.c @@ -1900,7 +1900,7 @@ void skip_analog_cam_once() { } extern void func_809ECD00(Boss04* this, PlayState* play); -extern s32 func_800B7298(struct PlayState* play, Actor* csActor, u8 csAction); +extern s32 Player_SetCsActionWithHaltedActors(struct PlayState* play, Actor* csActor, u8 csAction); extern u8 D_809EE4D0; // @recomp Patch the Wart boss fight in the Great Bay temple so that the fight starts if you look at it with the right stick analog camera, @@ -1947,7 +1947,7 @@ void func_809EC568(Boss04* this, PlayState* play) { this->subCamId = Play_CreateSubCamera(play); Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STATUS_WAIT); Play_ChangeCameraStatus(play, this->subCamId, CAM_STATUS_ACTIVE); - func_800B7298(play, &this->actor, PLAYER_CSACTION_WAIT); + Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_WAIT); player->actor.world.pos.x = this->unk_6E8; player->actor.world.pos.z = this->unk_6F0 + 410.0f; player->actor.shape.rot.y = 0x7FFF; @@ -1997,7 +1997,7 @@ void func_809EC568(Boss04* this, PlayState* play) { if (this->unk_704 == 45) { this->unk_708 = 1; this->unk_704 = 0; - func_800B7298(play, &this->actor, PLAYER_CSACTION_21); + Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_21); this->actor.gravity = 0.0f; break; } @@ -2075,7 +2075,7 @@ void func_809EC568(Boss04* this, PlayState* play) { func_80169AFC(play, this->subCamId, 0); this->subCamId = SUB_CAM_ID_DONE; Cutscene_StopManual(play, &play->csCtx); - func_800B7298(play, &this->actor, PLAYER_CSACTION_END); + Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_END); Play_DisableMotionBlur(); SET_EVENTINF(EVENTINF_60); } diff --git a/patches/input.c b/patches/input.c index 97adfc8..dd180a9 100644 --- a/patches/input.c +++ b/patches/input.c @@ -1,8 +1,6 @@ #include "patches.h" #include "input.h" #include "z64snap.h" -// Decomp rename, TODO update decomp and remove this -#define AudioVoice_GetWord func_801A5100 #include "z64voice.h" #include "audiothread_cmd.h" @@ -543,7 +541,7 @@ void Player_Action_86(Player *this, PlayState *play) { extern s16 sPictoState; extern s16 sPictoPhotoBeingTaken; extern void* gWorkBuffer; -u16 func_801A5100(void); +u16 AudioVoice_GetWord(void); // @recomp Patched to update status of extra buttons via set_extra_item_slot_status. void Interface_UpdateButtonsPart1(PlayState* play) { @@ -2600,7 +2598,7 @@ extern s32 Player_ActionChange_11(Player* this, PlayState* play); extern void func_8083A98C(Actor* thisx, PlayState* play2); extern void func_80836A98(Player* this, PlayerAnimationHeader* anim, PlayState* play); extern void func_80830B38(Player* this); -extern void Player_AnimationPlayLoop(PlayState* play, Player* this, PlayerAnimationHeader* anim); +extern void Player_Anim_PlayLoop(PlayState* play, Player* this, PlayerAnimationHeader* anim); extern s32 Player_UpdateUpperBody(Player* this, PlayState* play); extern void func_8082F164(Player* this, u16 button); extern s32 func_808401F4(PlayState* play, Player* this); @@ -2639,7 +2637,7 @@ void Player_Action_18(Player* this, PlayState* play) { if (PlayerAnimation_Update(play, &this->skelAnime)) { if (!Player_IsGoronOrDeku(this)) { - Player_AnimationPlayLoop(play, this, D_8085BE84_reloc[PLAYER_ANIMGROUP_defense_wait][this->modelAnimType]); + Player_Anim_PlayLoop(play, this, D_8085BE84_reloc[PLAYER_ANIMGROUP_defense_wait][this->modelAnimType]); } this->av2.actionVar2 = 1; diff --git a/patches/patches.h b/patches/patches.h index 9ad713b..26f769c 100644 --- a/patches/patches.h +++ b/patches/patches.h @@ -20,7 +20,6 @@ #define sinf __sinf_recomp #define cosf __cosf_recomp #define bzero bzero_recomp -#define gRandFloat sRandFloat #include "global.h" #include "rt64_extended_gbi.h" diff --git a/patches/song_transform_tagging.c b/patches/song_transform_tagging.c index 9c9bb8c..ea0c362 100644 --- a/patches/song_transform_tagging.c +++ b/patches/song_transform_tagging.c @@ -3,11 +3,6 @@ #include "overlays/actors/ovl_En_Test6/z_en_test6.h" #include "overlays/actors/ovl_En_Test7/z_en_test7.h" -// Decomp renames, TODO update decomp and remove these -#define gSoaringWarpCsWindCapsuleTexAnim gameplay_keep_Matanimheader_0815D0 -#define gSoaringWarpCsWindCapsuleDL gameplay_keep_DL_080FC8 -#define EnTest7_DrawFeathers func_80AF14FC - void EnTest7_DrawFeathers(PlayState* play2, OwlWarpFeather* feathers); s32 func_80AF31D0(PlayState* play, SkeletonInfo* skeletonInfo, s32 limbIndex, Gfx** dList, u8* flags, Actor* thisx, Vec3f* scale, Vec3s* rot, Vec3f* pos); diff --git a/patches/syms.ld b/patches/syms.ld index 3381c18..854db54 100644 --- a/patches/syms.ld +++ b/patches/syms.ld @@ -15,6 +15,7 @@ sHappyMaskSalesmanAnimationInfo = 0x80AD22C0; D_808890F0 = 0x808890F0; D_8088911C = 0x8088911C; D_809EE4D0 = 0x809EE4D0; +sOwlWarpEntrances = 0x801C6A58; /* Dummy addresses that get recompiled into function calls */ recomp_puts = 0x8F000000; diff --git a/us.rev1.syms.toml b/us.rev1.syms.toml index 2e40605..875cfae 100644 --- a/us.rev1.syms.toml +++ b/us.rev1.syms.toml @@ -19,7 +19,7 @@ size = 0x194A0 functions = [ { name = "__ull_div", vram = 0x800888A8, size = 0x3C }, { name = "__osPfsDeclearPage", vram = 0x8008BD24, size = 0x140 }, - { name = "__osStrcmp", vram = 0x800968B0, size = 0x34 }, + { name = "strcmp", vram = 0x800968B0, size = 0x34 }, { name = "Rand_ZeroOne_Variable", vram = 0x800870B8, size = 0x4C }, { name = "osVoiceMaskDictionary", vram = 0x80095600, size = 0x128 }, { name = "StackCheck_Cleanup", vram = 0x800853F8, size = 0x70 }, @@ -27,7 +27,7 @@ functions = [ { name = "Math_FCeilF", vram = 0x800867B4, size = 0x20 }, { name = "guNormalize", vram = 0x80091220, size = 0x60 }, { name = "__osViSwapContext", vram = 0x80091C10, size = 0x2F8 }, - { name = "SystemArena_Calloc", vram = 0x80086E78, size = 0x54 }, + { name = "calloc", vram = 0x80086E78, size = 0x54 }, { name = "__osPfsGetInitData", vram = 0x80092680, size = 0xAC }, { name = "guMtxL2F", vram = 0x8008D2E0, size = 0x70 }, { name = "Yaz0_FirstDMA", vram = 0x80080E30, size = 0xA0 }, @@ -87,11 +87,11 @@ functions = [ { name = "__osContGetInitData", vram = 0x80089CBC, size = 0xAC }, { name = "guRotate", vram = 0x80090634, size = 0x4C }, { name = "osMapTLBRdb", vram = 0x80093C00, size = 0x60 }, - { name = "Sleep_Sec", vram = 0x80087AC0, size = 0x40 }, + { name = "sleep", vram = 0x80087AC0, size = 0x40 }, { name = "FaultDrawer_SetOsSyncPrintfEnabled", vram = 0x80083EB0, size = 0x14 }, { name = "guOrthoF", vram = 0x800918A0, size = 0x154 }, { name = "SystemHeap_RunInits", vram = 0x80086588, size = 0x70 }, - { name = "__osMemset", vram = 0x80096880, size = 0x2C }, + { name = "memset", vram = 0x80096880, size = 0x2C }, { name = "__osPackReadData", vram = 0x8008A0A0, size = 0xC8 }, { name = "__osSpGetStatus", vram = 0x80095270, size = 0xC }, { name = "Fault_FillScreenRed", vram = 0x8008212C, size = 0x54 }, @@ -156,7 +156,7 @@ functions = [ { name = "GfxPrint_VPrintf", vram = 0x800860B8, size = 0x20 }, { name = "__osPopThread", vram = 0x8008928C, size = 0x10 }, { name = "lceilf", vram = 0x80086CC0, size = 0x10 }, - { name = "Sleep_Msec", vram = 0x80087A6C, size = 0x54 }, + { name = "msleep", vram = 0x80087A6C, size = 0x54 }, { name = "__osGetCause", vram = 0x80093D90, size = 0x10 }, { name = "osStartThread", vram = 0x800957B0, size = 0x150 }, { name = "__ll_rshift", vram = 0x80088AD4, size = 0x2C }, @@ -166,7 +166,7 @@ functions = [ { name = "Main_ClearMemory", vram = 0x80080150, size = 0x30 }, { name = "_Putfld", vram = 0x8008E698, size = 0x690 }, { name = "__ull_divremi", vram = 0x800889D8, size = 0x60 }, - { name = "__osStrcpy", vram = 0x800968F0, size = 0x34 }, + { name = "strcpy", vram = 0x800968F0, size = 0x34 }, { name = "__ll_lshift", vram = 0x800888E4, size = 0x2C }, { name = "osSyncPrintfThreadContext", vram = 0x800827BC, size = 0x2FC }, { name = "guPosition", vram = 0x80090058, size = 0x64 }, @@ -199,7 +199,7 @@ functions = [ { name = "__osMalloc", vram = 0x80087324, size = 0xE4 }, { name = "__ll_to_f", vram = 0x80095BEC, size = 0x18 }, { name = "PadUtils_GetCurY", vram = 0x800851E8, size = 0x8 }, - { name = "SystemArena_CheckArena", vram = 0x80086F04, size = 0x24 }, + { name = "CheckArena", vram = 0x80086F04, size = 0x24 }, { name = "osWritebackDCache", vram = 0x8008A5E0, size = 0x80 }, { name = "__osSiDeviceBusy", vram = 0x8008FA30, size = 0x24 }, { name = "GfxPrint_Init", vram = 0x80086010, size = 0x54 }, @@ -231,12 +231,12 @@ functions = [ { name = "__f_to_ull", vram = 0x80095B38, size = 0x9C }, { name = "Math_FTanF", vram = 0x80086760, size = 0x34 }, { name = "__ll_div", vram = 0x8008894C, size = 0x5C }, - { name = "proutSprintf", vram = 0x80087830, size = 0x24 }, + { name = "proutPrintf", vram = 0x80087830, size = 0x24 }, { name = "__ull_rshift", vram = 0x80088840, size = 0x2C }, { name = "osMotorInit", vram = 0x80089944, size = 0x15C }, - { name = "SystemArena_Cleanup", vram = 0x80086F58, size = 0x24 }, + { name = "MallocCleanup", vram = 0x80086F58, size = 0x24 }, { name = "osPfsReadWriteFile", vram = 0x8008B044, size = 0x378 }, - { name = "SystemArena_Free", vram = 0x80086E50, size = 0x28 }, + { name = "free", vram = 0x80086E50, size = 0x28 }, { name = "__osPfsGetStatus", vram = 0x8008B3C0, size = 0xD0 }, { name = "osGetThreadId", vram = 0x8008AF30, size = 0x18 }, { name = "_Ldtob", vram = 0x800942E0, size = 0x490 }, @@ -248,9 +248,9 @@ functions = [ { name = "osVoiceGetReadData", vram = 0x8008A170, size = 0x3C8 }, { name = "IrqMgr_HandlePreNMI", vram = 0x8008141C, size = 0x98 }, { name = "osVoiceStopReadData", vram = 0x800922C0, size = 0x120 }, - { name = "Sleep_Usec", vram = 0x80087A1C, size = 0x50 }, + { name = "usleep", vram = 0x80087A1C, size = 0x50 }, { name = "_Ldunscale", vram = 0x80094770, size = 0xB8 }, - { name = "Sleep_Cycles", vram = 0x80087960, size = 0x6C }, + { name = "csleep", vram = 0x80087960, size = 0x6C }, { name = "Fault_SetFrameBuffer", vram = 0x80083B70, size = 0x54 }, { name = "__osIdCheckSum", vram = 0x8008C7B4, size = 0xFC }, { name = "__osSiRawWriteIo", vram = 0x80095220, size = 0x48 }, @@ -307,7 +307,7 @@ functions = [ { name = "ArenaImpl_Lock", vram = 0x8008718C, size = 0x28 }, { name = "round", vram = 0x80086D6C, size = 0x20 }, { name = "FaultDrawer_SetInputCallback", vram = 0x800848A4, size = 0x14 }, - { name = "SystemArena_GetSizes", vram = 0x80086ECC, size = 0x38 }, + { name = "GetFreeArena", vram = 0x80086ECC, size = 0x38 }, { name = "bcopy", vram = 0x800912C0, size = 0x310 }, { name = "osRecvMesg", vram = 0x80087ED0, size = 0x138 }, { name = "CIC6105_AddRomInfoFaultPage", vram = 0x8008189C, size = 0x34 }, @@ -333,9 +333,9 @@ functions = [ { name = "Fault_FindFaultedThread", vram = 0x80082AB8, size = 0x88 }, { name = "IrqMgr_ThreadEntry", vram = 0x80081684, size = 0xD0 }, { name = "__osDisableInt", vram = 0x80091A60, size = 0x70 }, - { name = "SystemArena_Init", vram = 0x80086F28, size = 0x30 }, + { name = "MallocInit", vram = 0x80086F28, size = 0x30 }, { name = "__osInsertTimer", vram = 0x8008F644, size = 0x188 }, - { name = "SystemArena_MallocR", vram = 0x80086DF8, size = 0x28 }, + { name = "malloc_r", vram = 0x80086DF8, size = 0x28 }, { name = "__osCheckId", vram = 0x8008CF10, size = 0xD4 }, { name = "Math_FAtanTaylorF", vram = 0x80086880, size = 0x124 }, { name = "GfxPrint_PrintChar", vram = 0x80085D74, size = 0x1BC }, @@ -373,12 +373,12 @@ functions = [ { name = "osSyncPrintf", vram = 0x8008193C, size = 0x1C }, { name = "trunc", vram = 0x80086CEC, size = 0xC }, { name = "GfxPrint_Close", vram = 0x800860A0, size = 0x18 }, - { name = "SystemArena_IsInitialized", vram = 0x80086F7C, size = 0x24 }, + { name = "MallocIsInitialized", vram = 0x80086F7C, size = 0x24 }, { name = "PadUtils_ResetPressRel", vram = 0x80085158, size = 0xC }, { name = "Fault_AddAddrConvClient", vram = 0x80081BCC, size = 0xD8 }, { name = "PadUtils_GetCurButton", vram = 0x800851D0, size = 0x8 }, { name = "osEPiLinkHandle", vram = 0x8008AE20, size = 0x44 }, - { name = "__osMemcpy", vram = 0x80096930, size = 0x90 }, + { name = "memmove", vram = 0x80096930, size = 0x90 }, { name = "__osSpSetStatus", vram = 0x80095280, size = 0xC }, { name = "FaultDrawer_Init", vram = 0x800848B8, size = 0x80 }, { name = "FaultDrawer_SetCharPad", vram = 0x8008439C, size = 0x38 }, @@ -407,7 +407,7 @@ functions = [ { name = "osViSetEvent", vram = 0x800923E0, size = 0x5C }, { name = "Fault_DrawMemDump", vram = 0x80082DD8, size = 0x1F8 }, { name = "truncf", vram = 0x80086CE0, size = 0xC }, - { name = "SystemArena_Realloc", vram = 0x80086E20, size = 0x30 }, + { name = "realloc", vram = 0x80086E20, size = 0x30 }, { name = "__ull_to_d", vram = 0x80095C04, size = 0x34 }, { name = "GfxPrint_PrintCharImpl", vram = 0x80085A68, size = 0x30C }, { name = "Fault_Init", vram = 0x80083BC4, size = 0x134 }, @@ -417,7 +417,7 @@ functions = [ { name = "IrqMgr_HandleRetrace", vram = 0x800815CC, size = 0xB8 }, { name = "PadUtils_GetRelXImpl", vram = 0x800851FC, size = 0x8 }, { name = "GfxPrint_Setup", vram = 0x80085570, size = 0x44C }, - { name = "SystemArena_Malloc", vram = 0x80086DD0, size = 0x28 }, + { name = "malloc", vram = 0x80086DD0, size = 0x28 }, { name = "osPfsFindFile", vram = 0x8008D470, size = 0x1C4 }, { name = "ltrunc", vram = 0x80086D08, size = 0x10 }, { name = "osPiGetCmdQueue", vram = 0x80091F10, size = 0x28 }, @@ -455,7 +455,7 @@ functions = [ { name = "Idle_InitVideo", vram = 0x8008038C, size = 0x188 }, { name = "DmaMgr_Start", vram = 0x80080D0C, size = 0xF4 }, { name = "floor", vram = 0x80086C7C, size = 0xC }, - { name = "Sleep_Nsec", vram = 0x800879CC, size = 0x50 }, + { name = "nsleep", vram = 0x800879CC, size = 0x50 }, { name = "Overlay_AllocateAndLoad", vram = 0x800850C8, size = 0x5C }, { name = "osContStartReadData", vram = 0x80089F90, size = 0x84 }, { name = "DmaMgr_DmaRomToRam", vram = 0x80080790, size = 0x144 }, @@ -489,7 +489,7 @@ functions = [ { name = "GfxPrint_PrintString", vram = 0x80085F8C, size = 0x58 }, { name = "__osEnqueueAndYield", vram = 0x80089144, size = 0x100 }, { name = "osAfterPreNMI", vram = 0x8008D710, size = 0x20 }, - { name = "PrintUtils_VPrintf", vram = 0x80087900, size = 0x34 }, + { name = "vaprintf", vram = 0x80087900, size = 0x34 }, { name = "DmaMgr_FindDmaIndex", vram = 0x800809BC, size = 0x38 }, { name = "osVoiceStartReadData", vram = 0x80096410, size = 0xB8 }, { name = "osViExtendVStart", vram = 0x80087E00, size = 0xC }, @@ -499,7 +499,7 @@ functions = [ { name = "Fault_PadCallback", vram = 0x80081E68, size = 0x3C }, { name = "guMtxIdentF", vram = 0x8008B600, size = 0x50 }, { name = "func_800809F4", vram = 0x800809F4, size = 0x14 }, - { name = "PrintUtils_Printf", vram = 0x80087934, size = 0x2C }, + { name = "aprintf", vram = 0x80087934, size = 0x2C }, ] # Autogenerated from an ELF via N64Recomp @@ -749,7 +749,7 @@ functions = [ { name = "CollisionCheck_AC_QuadVsTris", vram = 0x800E54DC, size = 0x1DC }, { name = "func_8010956C", vram = 0x8010956C, size = 0x20 }, { name = "Math3D_TriChkLineSegParaYIntersect", vram = 0x8017C008, size = 0x174 }, - { name = "func_800BC154", vram = 0x800BC154, size = 0x34 }, + { name = "Actor_ChangeCategory", vram = 0x800BC154, size = 0x34 }, { name = "Animation_OnFrameImpl", vram = 0x80136990, size = 0xB8 }, { name = "DebugDisplay_Init", vram = 0x800E9470, size = 0x18 }, { name = "AudioScript_AudioListPushBack", vram = 0x80197E08, size = 0x40 }, @@ -890,7 +890,7 @@ functions = [ { name = "SysCfb_GetZBuffer", vram = 0x80178A14, size = 0x10 }, { name = "AudioPlayback_NoteInitForLayer", vram = 0x80196268, size = 0x180 }, { name = "Camera_UpdateHotRoom", vram = 0x800DE840, size = 0x50 }, - { name = "func_80122744", vram = 0x80122744, size = 0x1C }, + { name = "Player_InitOverrideInput", vram = 0x80122744, size = 0x1C }, { name = "TransitionTile_Update", vram = 0x801647AC, size = 0xC }, { name = "func_8012F73C", vram = 0x8012F73C, size = 0x60 }, { name = "PreRender_RestoreZBuffer", vram = 0x80170774, size = 0x24 }, @@ -983,7 +983,7 @@ functions = [ { name = "func_8016A02C", vram = 0x8016A02C, size = 0x80 }, { name = "AudioLoad_SetSeqLoadStatus", vram = 0x8018F3B8, size = 0x30 }, { name = "Matrix_SetTranslateRotateYXZ", vram = 0x80181650, size = 0x1AC }, - { name = "func_8016237C", vram = 0x8016237C, size = 0x68 }, + { name = "CutsceneCamera_Interp_None", vram = 0x8016237C, size = 0x68 }, { name = "CutsceneCmd_MotionBlur", vram = 0x800EBB68, size = 0x168 }, { name = "AudioThread_InitMesgQueues", vram = 0x801946E4, size = 0x20 }, { name = "AnimationContext_SetNextQueue", vram = 0x801358D4, size = 0x20 }, @@ -1106,7 +1106,7 @@ functions = [ { name = "func_800BDB6C", vram = 0x800BDB6C, size = 0xF0 }, { name = "BgCheck_SphVsStaticWall", vram = 0x800C12A4, size = 0x8C4 }, { name = "Quake_GetFreeIndex", vram = 0x8012A5D8, size = 0x60 }, - { name = "func_80161180", vram = 0x80161180, size = 0x1C }, + { name = "CutsceneCamera_Interp_Off", vram = 0x80161180, size = 0x1C }, { name = "DynaPolyActor_IsSwitchPressed", vram = 0x800CAFB8, size = 0x24 }, { name = "OLib_Vec3fAdd", vram = 0x8010CAA0, size = 0xC8 }, { name = "AudioSynth_Noop24", vram = 0x80188254, size = 0x8 }, @@ -1478,7 +1478,7 @@ functions = [ { name = "Actor_IsSmallChest", vram = 0x800BE63C, size = 0x44 }, { name = "Lights_GlowCheck", vram = 0x80102880, size = 0x1E4 }, { name = "CollisionCheck_SpawnShieldParticlesMetal", vram = 0x800E8668, size = 0x28 }, - { name = "func_801A50C0", vram = 0x801A50C0, size = 0x40 }, + { name = "AudioVoice_InitWordAlt", vram = 0x801A50C0, size = 0x40 }, { name = "BgCheck_EntityRaycastFloor2_1", vram = 0x800C4058, size = 0x5C }, { name = "Audio_PlayFanfareWithPlayerIOCustomPort", vram = 0x801A31EC, size = 0x4C }, { name = "Scene_CommandAnimatedMaterials", vram = 0x80130674, size = 0x30 }, @@ -1736,7 +1736,7 @@ functions = [ { name = "Actor_ChangeFocus", vram = 0x800B86C8, size = 0x40 }, { name = "Audio_PlaySfx_IfNotInCutscene", vram = 0x801A3FB4, size = 0x48 }, { name = "func_800B1598", vram = 0x800B1598, size = 0xC4 }, - { name = "func_801620CC", vram = 0x801620CC, size = 0x2B0 }, + { name = "CutsceneCamera_Interp_Geo", vram = 0x801620CC, size = 0x2B0 }, { name = "TransitionCircle_Update", vram = 0x80164BA0, size = 0x34 }, { name = "Player_UpdateBottleHeld", vram = 0x80123D50, size = 0x54 }, { name = "Environment_GetSandstormLerpScale", vram = 0x800FE798, size = 0x10 }, @@ -1844,7 +1844,7 @@ functions = [ { name = "Actor_GetArrowDmgFlags", vram = 0x800BC188, size = 0x2C }, { name = "Environment_InitGameOverLights", vram = 0x800FBDEC, size = 0x150 }, { name = "AudioThread_GetSeqPlayerIO", vram = 0x80193E44, size = 0x28 }, - { name = "func_80161C20", vram = 0x80161C20, size = 0x22C }, + { name = "CutsceneCamera_Interp_Linear", vram = 0x80161C20, size = 0x22C }, { name = "FireObj_DestroyLight", vram = 0x800F34C4, size = 0x28 }, { name = "Gfx_SetupDL49_Xlu", vram = 0x8012C924, size = 0x28 }, { name = "AudioScript_ScriptReadS16", vram = 0x80197F3C, size = 0x38 }, @@ -2236,7 +2236,7 @@ functions = [ { name = "Transition_Init", vram = 0x80163C90, size = 0xF0 }, { name = "Font_LoadCharNES", vram = 0x800F4F54, size = 0x6C }, { name = "func_80108A10", vram = 0x80108A10, size = 0x54 }, - { name = "func_801A5100", vram = 0x801A5100, size = 0xC }, + { name = "AudioVoice_GetWord", vram = 0x801A5100, size = 0xC }, { name = "AudioPlayback_InitSyntheticWave", vram = 0x80195D84, size = 0x58 }, { name = "Collider_ResetTrisAC", vram = 0x800E1B18, size = 0xA0 }, { name = "AudioScript_SeqLayerDisable", vram = 0x801979D8, size = 0x7C }, @@ -2341,10 +2341,10 @@ functions = [ { name = "BgCheck_EntityRaycastFloor2", vram = 0x800C4000, size = 0x58 }, { name = "func_80149048", vram = 0x80149048, size = 0x194 }, { name = "SkelAnime_InterpFrameTable", vram = 0x80135448, size = 0x480 }, - { name = "func_800B724C", vram = 0x800B724C, size = 0x4C }, + { name = "Player_SetCsAction", vram = 0x800B724C, size = 0x4C }, { name = "CutsceneManager_GetCutsceneEntryImpl", vram = 0x800F14F8, size = 0x4C }, { name = "Gfx_SetupDLAtPtr", vram = 0x8012BF98, size = 0x2C }, - { name = "func_800F6EA4", vram = 0x800F6EA4, size = 0x128 }, + { name = "Environment_LerpColor", vram = 0x800F6EA4, size = 0x128 }, { name = "CollisionPoly_GetVerticesByBgId", vram = 0x800C02C0, size = 0x80 }, { name = "Camera_Unique5", vram = 0x800D9A88, size = 0x5C }, { name = "Matrix_MtxFToNewMtx", vram = 0x80181A6C, size = 0x2C }, @@ -2531,7 +2531,7 @@ functions = [ { name = "GetItem_DrawWallet", vram = 0x800EFBFC, size = 0x148 }, { name = "AudioScript_SkipForwardSequence", vram = 0x8019AAF0, size = 0x50 }, { name = "func_8012EBF8", vram = 0x8012EBF8, size = 0x84 }, - { name = "Actor_ProcessTalkRequest", vram = 0x800B84D0, size = 0x30 }, + { name = "Actor_TalkOfferAccepted", vram = 0x800B84D0, size = 0x30 }, { name = "AudioSeq_ResetActiveSequencesAndVolume", vram = 0x801A9A74, size = 0x9C }, { name = "Collider_InitBump", vram = 0x800E0730, size = 0x30 }, { name = "CutsceneCmd_FadeOutSequence", vram = 0x800EAC94, size = 0x80 }, @@ -2590,7 +2590,7 @@ functions = [ { name = "Animation_GetLength", vram = 0x80134724, size = 0x24 }, { name = "func_800CBFA4", vram = 0x800CBFA4, size = 0x5C }, { name = "Camera_GetInputDirYaw", vram = 0x800DFC68, size = 0x28 }, - { name = "func_801A54C4", vram = 0x801A54C4, size = 0xC }, + { name = "AudioVoice_GetVoiceMaskPattern", vram = 0x801A54C4, size = 0xC }, { name = "func_80185F90", vram = 0x80185F90, size = 0x98 }, { name = "Schedule_CheckTimeRangeS", vram = 0x80132494, size = 0x224 }, { name = "PadMgr_LockPadData", vram = 0x8017509C, size = 0x30 }, @@ -2708,7 +2708,7 @@ functions = [ { name = "Interface_Init", vram = 0x80121FC4, size = 0x51C }, { name = "Math3D_ScaleAndAdd", vram = 0x80179DF0, size = 0x4C }, { name = "Environment_IsForcedSequenceDisabled", vram = 0x800FD768, size = 0x24 }, - { name = "Actor_MountHorse", vram = 0x800B71DC, size = 0x24 }, + { name = "Player_MountHorse", vram = 0x800B71DC, size = 0x24 }, { name = "GameState_DrawEnd", vram = 0x801736DC, size = 0x78 }, { name = "Sram_ResetSaveFromMoonCrash", vram = 0x80144A94, size = 0x3E4 }, { name = "Camera_SetUpdateRatesFastPitch", vram = 0x800CB544, size = 0x40 }, @@ -2725,7 +2725,7 @@ functions = [ { name = "AudioOcarina_MapSongFromPitchToButton", vram = 0x8019B074, size = 0xD0 }, { name = "SysCfb_GetZBufferPixel", vram = 0x80178A34, size = 0x60 }, { name = "EffectBlure_DrawSmooth", vram = 0x800AA190, size = 0x2D0 }, - { name = "Actor_SpawnHorse", vram = 0x800B722C, size = 0x20 }, + { name = "Player_SpawnHorse", vram = 0x800B722C, size = 0x20 }, { name = "GetItem_DrawRecoveryHeart", vram = 0x800EEE34, size = 0x118 }, { name = "Audio_StopSequenceAtPos", vram = 0x801A1A10, size = 0x7C }, { name = "Camera_RequestGiantsMaskSetting", vram = 0x800DE954, size = 0x5C }, @@ -2748,7 +2748,7 @@ functions = [ { name = "CutsceneFlags_Get", vram = 0x800F13E8, size = 0x70 }, { name = "func_80184728", vram = 0x80184728, size = 0x78 }, { name = "Camera_KeepOn4", vram = 0x800D73C8, size = 0xBDC }, - { name = "func_800B7298", vram = 0x800B7298, size = 0x48 }, + { name = "Player_SetCsActionWithHaltedActors", vram = 0x800B7298, size = 0x48 }, { name = "AudioSynth_InterL", vram = 0x801880C4, size = 0x24 }, { name = "Math3D_LineVsSph", vram = 0x8017DB2C, size = 0x208 }, { name = "Collider_InitAndSetCylinder", vram = 0x800E1374, size = 0x4C }, @@ -2764,7 +2764,7 @@ functions = [ { name = "Gfx_DrawTexRectIA8_DropShadowOffset", vram = 0x8010D480, size = 0x350 }, { name = "func_80150A84", vram = 0x80150A84, size = 0x284 }, { name = "func_801155B4", vram = 0x801155B4, size = 0x1B0 }, - { name = "func_800B6F20", vram = 0x800B6F20, size = 0xA8 }, + { name = "Actor_SetControlStickData", vram = 0x800B6F20, size = 0xA8 }, { name = "EffectSS_Delete", vram = 0x800B0210, size = 0x60 }, { name = "BgCheck_EntityCheckCeiling", vram = 0x800C4F84, size = 0x50 }, { name = "func_80105B34", vram = 0x80105B34, size = 0x10C }, @@ -2846,7 +2846,7 @@ functions = [ { name = "func_800B1280", vram = 0x800B1280, size = 0x70 }, { name = "ActorShadow_DrawCircle", vram = 0x800B3FC0, size = 0x64 }, { name = "AudioOcarina_UpdateCurOcarinaSong", vram = 0x8019B654, size = 0x60 }, - { name = "func_80163334", vram = 0x80163334, size = 0x32C }, + { name = "CutsceneCamera_Interp_Unused", vram = 0x80163334, size = 0x32C }, { name = "Player_UpdateBunnyEars", vram = 0x80124420, size = 0x1F8 }, { name = "VisMono_Draw", vram = 0x80141E60, size = 0x1EC }, { name = "EffectBlure_SetupSmooth", vram = 0x800A92FC, size = 0x34 }, @@ -2857,7 +2857,7 @@ functions = [ { name = "Actor_OtherIsTargeted", vram = 0x800BC5EC, size = 0x34 }, { name = "AudioHeap_AllocAttemptExternal", vram = 0x8018B578, size = 0x58 }, { name = "BgCheck_CheckStaticCeiling", vram = 0x800C1B68, size = 0x214 }, - { name = "func_801A53DC", vram = 0x801A53DC, size = 0xC }, + { name = "AudioVoice_GetVoiceDict", vram = 0x801A53DC, size = 0xC }, { name = "osFlashAllEraseThrough", vram = 0x80187018, size = 0x68 }, { name = "GameOver_Init", vram = 0x801AA610, size = 0x14 }, { name = "Audio_PlaySfx_AtFixedPos", vram = 0x801A4748, size = 0x54 }, @@ -2876,7 +2876,7 @@ functions = [ { name = "AudioOcarina_CheckSongsWithMusicStaff", vram = 0x8019B6B4, size = 0x590 }, { name = "Room_DrawImageMulti", vram = 0x8012E32C, size = 0x37C }, { name = "AudioScript_SetInstrument", vram = 0x80199198, size = 0xAC }, - { name = "func_801A5680", vram = 0x801A5680, size = 0x188 }, + { name = "AudioVoice_InitWordImpl", vram = 0x801A5680, size = 0x188 }, { name = "CutsceneHandler_StartScript", vram = 0x800EA2B8, size = 0x6C }, { name = "ShrinkWindow_Letterbox_SetSize", vram = 0x80160C28, size = 0x14 }, { name = "AudioPlayback_BuildSyntheticWave", vram = 0x80195C80, size = 0x104 }, @@ -3166,7 +3166,7 @@ functions = [ { name = "AudioScript_SequenceChannelProcessScript", vram = 0x80199268, size = 0xE54 }, { name = "func_80183DE0", vram = 0x80183DE0, size = 0x32C }, { name = "TransitionTile_InitGraphics", vram = 0x80163DC0, size = 0x3CC }, - { name = "func_801A54D0", vram = 0x801A54D0, size = 0x1B0 }, + { name = "AudioVoice_InitWordImplAlt", vram = 0x801A54D0, size = 0x1B0 }, { name = "DynaPoly_DisableCollision", vram = 0x800C62BC, size = 0x58 }, { name = "Actor_HeightDiff", vram = 0x800B6F0C, size = 0x14 }, { name = "Sched_FaultClient", vram = 0x80177084, size = 0xD8 }, @@ -3347,7 +3347,7 @@ functions = [ { name = "Audio_StartSceneSequence", vram = 0x801A2670, size = 0x108 }, { name = "Message_SpawnSongEffect", vram = 0x80152EC0, size = 0xF8 }, { name = "Math_Vec3f_StepTo", vram = 0x80100448, size = 0xB4 }, - { name = "func_801A4FD8", vram = 0x801A4FD8, size = 0xA8 }, + { name = "AudioVoice_ResetWord", vram = 0x801A4FD8, size = 0xA8 }, { name = "AudioOcarina_TerminaWallGenerateNotes", vram = 0x8019D26C, size = 0x21C }, { name = "CollisionCheck_SpawnShieldParticles", vram = 0x800E85D4, size = 0x94 }, { name = "Interface_PostmanTimerCallback", vram = 0x8010E968, size = 0x88 }, @@ -3508,8 +3508,8 @@ functions = [ { name = "Audio_SetSequenceProperties", vram = 0x801A0E44, size = 0x44C }, { name = "Player_HasMirrorShieldEquipped", vram = 0x8012405C, size = 0x2C }, { name = "Camera_Unique8", vram = 0x800DA50C, size = 0x20 }, - { name = "func_8016253C", vram = 0x8016253C, size = 0x480 }, - { name = "func_800FEAF4", vram = 0x800FEAF4, size = 0x19C }, + { name = "CutsceneCamera_Interp_MultiPointQuadratic", vram = 0x8016253C, size = 0x480 }, + { name = "Environment_NewDay", vram = 0x800FEAF4, size = 0x19C }, { name = "Player_InBlockingCsMode", vram = 0x80123358, size = 0x8C }, { name = "Environment_LerpAmbientColor", vram = 0x800FD59C, size = 0x44 }, { name = "LightContext_NewLights", vram = 0x80102580, size = 0x38 }, @@ -3601,7 +3601,7 @@ functions = [ { name = "AudioHeap_ChangeStorage", vram = 0x8018DF24, size = 0xBC }, { name = "EffectSsBlast_Spawn", vram = 0x800B19E0, size = 0x90 }, { name = "Flags_SetEventChkInf", vram = 0x800E8EE0, size = 0xC }, - { name = "func_801A5118", vram = 0x801A5118, size = 0xD8 }, + { name = "AudioVoice_Update", vram = 0x801A5118, size = 0xD8 }, { name = "Actor_InitPlayerImpact", vram = 0x800B6468, size = 0xC }, { name = "func_8017C1F0", vram = 0x8017C1F0, size = 0x2A4 }, { name = "ZeldaArena_Init", vram = 0x80102DBC, size = 0x30 }, @@ -3610,7 +3610,7 @@ functions = [ { name = "DynaPoly_UpdateBgActorTransforms", vram = 0x800C765C, size = 0x90 }, { name = "Matrix_MultVec3f", vram = 0x80181A98, size = 0xB8 }, { name = "func_80162FF8", vram = 0x80162FF8, size = 0x1E4 }, - { name = "func_801623E4", vram = 0x801623E4, size = 0x108 }, + { name = "CutsceneCamera_Interp_Set", vram = 0x801623E4, size = 0x108 }, { name = "Math3D_XZInSphere", vram = 0x8017F9C0, size = 0x74 }, { name = "ShrinkWindow_Pillarbox_SetSize", vram = 0x80160C78, size = 0x14 }, { name = "Actor_WorldDistXZToActor", vram = 0x800B6E1C, size = 0x2C }, @@ -3711,7 +3711,7 @@ functions = [ { name = "AudioLoad_RelocateFontAndPreloadSamples", vram = 0x80191D94, size = 0x3F8 }, { name = "AudioSynth_SaveSubReverbSamples", vram = 0x80188FBC, size = 0xA8 }, { name = "func_80185460", vram = 0x80185460, size = 0x200 }, - { name = "func_801A5080", vram = 0x801A5080, size = 0x40 }, + { name = "AudioVoice_InitWord", vram = 0x801A5080, size = 0x40 }, { name = "PlayerAnimation_Change", vram = 0x80136414, size = 0x178 }, { name = "SubS_ConstructPlane", vram = 0x8013E4B0, size = 0x11C }, { name = "PreNMI_Stop", vram = 0x80129EF0, size = 0x14 }, @@ -3756,7 +3756,7 @@ functions = [ { name = "Collider_ResetTrisElementOC", vram = 0x800E16AC, size = 0x24 }, { name = "Audio_SetAmbienceRandomBend", vram = 0x801A4B80, size = 0xB0 }, { name = "AudioEffects_InitAdsr", vram = 0x80197164, size = 0x24 }, - { name = "func_801A4EB0", vram = 0x801A4EB0, size = 0x8 }, + { name = "AudioVoice_Noop", vram = 0x801A4EB0, size = 0x8 }, { name = "AudioSfx_ComputeReverb", vram = 0x8019E324, size = 0x18C }, { name = "Actor_SetMovementScale", vram = 0x800B6988, size = 0x24 }, { name = "Gfx_SetupDL65_NoCD", vram = 0x8012C7FC, size = 0x44 }, @@ -3781,7 +3781,7 @@ functions = [ { name = "Skybox_Init", vram = 0x801434E4, size = 0xBC }, { name = "Sched_NotifyDone", vram = 0x8017691C, size = 0x6C }, { name = "BgCheck_SetContextFlags", vram = 0x800C3C00, size = 0x14 }, - { name = "func_80161E4C", vram = 0x80161E4C, size = 0x280 }, + { name = "CutsceneCamera_Interp_Scale", vram = 0x80161E4C, size = 0x280 }, { name = "Actor_TrackPlayer", vram = 0x800E9250, size = 0x10C }, { name = "func_80179B94", vram = 0x80179B94, size = 0x1E0 }, { name = "CollisionCheck_AT", vram = 0x800E6654, size = 0xD0 }, @@ -3862,7 +3862,7 @@ functions = [ { name = "BgCheck_UnsetContextFlags", vram = 0x800C3C14, size = 0x18 }, { name = "Item_CanDropBigFairy", vram = 0x800A81A4, size = 0x44 }, { name = "IChain_Apply_Vec3f", vram = 0x800FFC50, size = 0x2C }, - { name = "func_80122760", vram = 0x80122760, size = 0x108 }, + { name = "Player_UpdateOverrideInput", vram = 0x80122760, size = 0x108 }, { name = "osFlashChange", vram = 0x80186B38, size = 0x40 }, { name = "Camera_Unique3", vram = 0x800D99D0, size = 0x5C }, { name = "Schedule_ReturnValueS", vram = 0x80132A18, size = 0x24 }, @@ -3911,7 +3911,7 @@ functions = [ { name = "View_ApplyOrtho", vram = 0x8013FA1C, size = 0x1AC }, { name = "VisMono_DesaturateTLUT", vram = 0x80141924, size = 0x310 }, { name = "func_801240DC", vram = 0x801240DC, size = 0x34 }, - { name = "Actor_SetCameraHorseSetting", vram = 0x800B7170, size = 0x6C }, + { name = "Player_SetCameraHorseSetting", vram = 0x800B7170, size = 0x6C }, { name = "Player_GetExplosiveHeld", vram = 0x80124258, size = 0x20 }, { name = "Collider_InitTris", vram = 0x800E16D0, size = 0x2C }, { name = "CollisionPoly_CheckYIntersectApprox2", vram = 0x800C0668, size = 0x40 }, @@ -3967,7 +3967,7 @@ functions = [ { name = "ZeldaArena_Cleanup", vram = 0x80102DEC, size = 0x24 }, { name = "Item_Give", vram = 0x80112E80, size = 0x154C }, { name = "func_801251C4", vram = 0x801251C4, size = 0x154 }, - { name = "func_80162A50", vram = 0x80162A50, size = 0x5A8 }, + { name = "CutsceneCamera_Interp_MultiPointCubic", vram = 0x80162A50, size = 0x5A8 }, { name = "Camera_GetFocalActorPos", vram = 0x800CBAD4, size = 0x84 }, { name = "func_8010AA54", vram = 0x8010AA54, size = 0xDC }, { name = "AudioHeap_InitSessionPool", vram = 0x8018B95C, size = 0x84 }, @@ -8272,8 +8272,8 @@ relocs = [ ] functions = [ - { name = "func_808387A0", vram = 0x808387A0, size = 0x90 }, - { name = "func_8082E514", vram = 0x8082E514, size = 0x48 }, + { name = "Player_StartCsAction", vram = 0x808387A0, size = 0x90 }, + { name = "Player_Anim_PlayLoopMorph", vram = 0x8082E514, size = 0x48 }, { name = "func_808401F4", vram = 0x808401F4, size = 0x57C }, { name = "Player_AnimSfx_PlayFloorWalk", vram = 0x8082E12C, size = 0x5C }, { name = "func_8085AD5C", vram = 0x8085AD5C, size = 0x44 }, @@ -8304,7 +8304,7 @@ functions = [ { name = "Player_RequestQuake", vram = 0x80836EA0, size = 0x70 }, { name = "Player_Cutscene_SetPosAndYawToStart", vram = 0x8085AB58, size = 0x50 }, { name = "func_8083E234", vram = 0x8083E234, size = 0x58 }, - { name = "func_8082E5EC", vram = 0x8082E5EC, size = 0x48 }, + { name = "Player_Anim_PlayOnceFreezeAdjusted", vram = 0x8082E5EC, size = 0x48 }, { name = "func_80855218", vram = 0x80855218, size = 0x1DC }, { name = "func_808379C0", vram = 0x808379C0, size = 0x1A0 }, { name = "Player_InitMode_1", vram = 0x80841408, size = 0xD8 }, @@ -8330,7 +8330,7 @@ functions = [ { name = "func_80836A5C", vram = 0x80836A5C, size = 0x3C }, { name = "Player_UpperAction_10", vram = 0x808490B4, size = 0x100 }, { name = "func_8083AF30", vram = 0x8083AF30, size = 0x5C }, - { name = "Player_CsAnim_9", vram = 0x80858F3C, size = 0x20 }, + { name = "Player_CsAnim_PlayOnce", vram = 0x80858F3C, size = 0x20 }, { name = "Player_CsAction_16", vram = 0x80859CA0, size = 0x40 }, { name = "func_808409A8", vram = 0x808409A8, size = 0x88 }, { name = "func_8083133C", vram = 0x8083133C, size = 0x6C }, @@ -8338,7 +8338,7 @@ functions = [ { name = "Player_CsAction_TranslateReverse", vram = 0x8085A04C, size = 0xD4 }, { name = "func_808306F8", vram = 0x808306F8, size = 0x1E4 }, { name = "Player_CsAction_46", vram = 0x8085AA84, size = 0x48 }, - { name = "Player_CsAnim_11", vram = 0x80858FBC, size = 0x2C }, + { name = "Player_CsAnim_Update", vram = 0x80858FBC, size = 0x2C }, { name = "Player_InitItemAction_DoNothing", vram = 0x8082F594, size = 0x10 }, { name = "func_808550D0", vram = 0x808550D0, size = 0x148 }, { name = "func_808369F4", vram = 0x808369F4, size = 0x68 }, @@ -8372,12 +8372,12 @@ functions = [ { name = "Player_GrabPlayer", vram = 0x8085B1F0, size = 0x9C }, { name = "Player_CsAction_25", vram = 0x8085A120, size = 0x24 }, { name = "func_80847BF0", vram = 0x80847BF0, size = 0x23C }, - { name = "Player_CsAnim_7", vram = 0x80858EFC, size = 0x20 }, + { name = "Player_CsAnim_ReplacePlayLoopNormalAdjusted", vram = 0x80858EFC, size = 0x20 }, { name = "func_80839978", vram = 0x80839978, size = 0x98 }, { name = "Player_ActionChange_1", vram = 0x808365DC, size = 0x2AC }, { name = "func_80841744", vram = 0x80841744, size = 0xE8 }, { name = "func_80835428", vram = 0x80835428, size = 0x7C }, - { name = "Player_CsAnim_13", vram = 0x808591BC, size = 0x54 }, + { name = "Player_CsAnim_PlayLoopNormalAdjustedOnceFinished", vram = 0x808591BC, size = 0x54 }, { name = "func_808313F0", vram = 0x808313F0, size = 0x64 }, { name = "func_808425B4", vram = 0x808425B4, size = 0x13C }, { name = "func_8083F57C", vram = 0x8083F57C, size = 0x2AC }, @@ -8398,8 +8398,8 @@ functions = [ { name = "func_808442D8", vram = 0x808442D8, size = 0x2EC }, { name = "func_8083DCC4", vram = 0x8083DCC4, size = 0x58 }, { name = "func_808479F4", vram = 0x808479F4, size = 0x5C }, - { name = "func_8082E67C", vram = 0x8082E67C, size = 0x54 }, - { name = "func_8082E438", vram = 0x8082E438, size = 0x6C }, + { name = "Player_Anim_PlayLoopOnceFinished", vram = 0x8082E67C, size = 0x54 }, + { name = "Player_Anim_PlayOnceMorph", vram = 0x8082E438, size = 0x6C }, { name = "func_8082ECE0", vram = 0x8082ECE0, size = 0x40 }, { name = "func_808530E0", vram = 0x808530E0, size = 0xB4 }, { name = "func_80840DEC", vram = 0x80840DEC, size = 0x38 }, @@ -8412,12 +8412,12 @@ functions = [ { name = "Player_AnimSfx_PlayFloorByAge", vram = 0x8082E0F4, size = 0x38 }, { name = "Player_SetDoAction", vram = 0x808426F0, size = 0x9F0 }, { name = "func_80836DC0", vram = 0x80836DC0, size = 0xE0 }, - { name = "Player_CsAnim_15", vram = 0x80858F7C, size = 0x20 }, - { name = "Player_AnimationPlayLoop", vram = 0x8082DB3C, size = 0x24 }, + { name = "Player_CsAnim_PlayOnceAdjusted", vram = 0x80858F7C, size = 0x20 }, + { name = "Player_Anim_PlayLoop", vram = 0x8082DB3C, size = 0x24 }, { name = "Player_CsAction_31", vram = 0x8085A330, size = 0x34 }, { name = "func_808430E0", vram = 0x808430E0, size = 0x98 }, { name = "Player_CsAction_7", vram = 0x80859990, size = 0x4C }, - { name = "func_8082E5A8", vram = 0x8082E5A8, size = 0x44 }, + { name = "Player_Anim_PlayOnceFreeze", vram = 0x8082E5A8, size = 0x44 }, { name = "Player_Action_90", vram = 0x80855B9C, size = 0x8C }, { name = "Player_Action_57", vram = 0x808513EC, size = 0x19C }, { name = "func_8083784C", vram = 0x8083784C, size = 0xB0 }, @@ -8427,13 +8427,13 @@ functions = [ { name = "func_80831010", vram = 0x80831010, size = 0x84 }, { name = "func_8083E758", vram = 0x8083E758, size = 0xA0 }, { name = "func_8083B73C", vram = 0x8083B73C, size = 0x5C }, - { name = "Player_CsAnim_18", vram = 0x80859210, size = 0x38 }, + { name = "Player_CsAnim_PlayAnimSfx", vram = 0x80859210, size = 0x38 }, { name = "func_80856000", vram = 0x80856000, size = 0x74 }, { name = "Player_Draw", vram = 0x80846528, size = 0xBAC }, { name = "func_80832754", vram = 0x80832754, size = 0x134 }, { name = "Player_ItemIsInUse", vram = 0x8082FC78, size = 0x4C }, { name = "func_80836D8C", vram = 0x80836D8C, size = 0x34 }, - { name = "func_80858D48", vram = 0x80858D48, size = 0x6C }, + { name = "Player_CsAnimHelper_PlayLoopSlowMorphAdjustedReset", vram = 0x80858D48, size = 0x6C }, { name = "func_80836C70", vram = 0x80836C70, size = 0x11C }, { name = "Player_InitItemAction_5", vram = 0x8082F8A0, size = 0x1C }, { name = "func_80842510", vram = 0x80842510, size = 0xA4 }, @@ -8444,11 +8444,11 @@ functions = [ { name = "func_80830F9C", vram = 0x80830F9C, size = 0x38 }, { name = "func_80847880", vram = 0x80847880, size = 0x114 }, { name = "func_80836A98", vram = 0x80836A98, size = 0x40 }, - { name = "Player_CsAnim_3", vram = 0x80858E40, size = 0x20 }, + { name = "Player_CsAnim_PlayOnceSlowMorphAdjustedReset", vram = 0x80858E40, size = 0x20 }, { name = "func_808373F8", vram = 0x808373F8, size = 0x338 }, { name = "Player_Action_70", vram = 0x80853850, size = 0x20C }, { name = "Player_Action_33", vram = 0x8084D4EC, size = 0x284 }, - { name = "func_8082E820", vram = 0x8082E820, size = 0x100 }, + { name = "Player_AnimReplace_SetupLedgeClimb", vram = 0x8082E820, size = 0x100 }, { name = "func_80831124", vram = 0x80831124, size = 0x70 }, { name = "Player_GetFloorSfx", vram = 0x8082E078, size = 0x1C }, { name = "Player_DestroyHookshot", vram = 0x808317C4, size = 0x50 }, @@ -8480,7 +8480,7 @@ functions = [ { name = "Player_ItemToItemAction", vram = 0x8082F524, size = 0x70 }, { name = "func_8082DC64", vram = 0x8082DC64, size = 0x3C }, { name = "Player_CsAction_2", vram = 0x808595B8, size = 0xD4 }, - { name = "func_8082E634", vram = 0x8082E634, size = 0x48 }, + { name = "Player_Anim_PlayLoopSlowMorph", vram = 0x8082E634, size = 0x48 }, { name = "func_80838A20", vram = 0x80838A20, size = 0x70 }, { name = "func_8085687C", vram = 0x8085687C, size = 0xC }, { name = "func_80848640", vram = 0x80848640, size = 0x140 }, @@ -8489,9 +8489,9 @@ functions = [ { name = "func_80833998", vram = 0x80833998, size = 0x1C }, { name = "func_80839F98", vram = 0x80839F98, size = 0xB4 }, { name = "func_8082EF54", vram = 0x8082EF54, size = 0x48 }, - { name = "Player_CsAnim_1", vram = 0x80858DB4, size = 0x28 }, + { name = "Player_CsAnim_StopHorizontalMovement", vram = 0x80858DB4, size = 0x28 }, { name = "Player_ActionChange_3", vram = 0x8083CCB4, size = 0x2B4 }, - { name = "func_80858FE8", vram = 0x80858FE8, size = 0x40 }, + { name = "Player_CsAnimHelper_PlayAnimSfxLostHorse", vram = 0x80858FE8, size = 0x40 }, { name = "Player_Action_35", vram = 0x8084D820, size = 0x814 }, { name = "Player_Action_72", vram = 0x80853CC0, size = 0xA8 }, { name = "func_808334D4", vram = 0x808334D4, size = 0xDC }, @@ -8501,7 +8501,7 @@ functions = [ { name = "Player_Action_22", vram = 0x8084BE40, size = 0xE8 }, { name = "func_8083E8E0", vram = 0x8083E8E0, size = 0x78 }, { name = "func_8083692C", vram = 0x8083692C, size = 0x5C }, - { name = "func_8082DC28", vram = 0x8082DC28, size = 0x10 }, + { name = "Player_Anim_ResetModelRotY", vram = 0x8082DC28, size = 0x10 }, { name = "Player_OverrideBlureColors", vram = 0x8082F938, size = 0x124 }, { name = "Player_UpdateCamAndSeqModes", vram = 0x80843EC0, size = 0x418 }, { name = "Player_Action_16", vram = 0x8084B3B8, size = 0xF0 }, @@ -8511,7 +8511,7 @@ functions = [ { name = "Player_Action_81", vram = 0x80854614, size = 0xBC }, { name = "func_80836F10", vram = 0x80836F10, size = 0x1C4 }, { name = "Player_Action_46", vram = 0x8084EE50, size = 0x14C }, - { name = "func_8082E4A4", vram = 0x8082E4A4, size = 0x70 }, + { name = "Player_Anim_PlayOnceMorphAdjusted", vram = 0x8082E4A4, size = 0x70 }, { name = "func_8083DEE4", vram = 0x8083DEE4, size = 0x54 }, { name = "func_80847F1C", vram = 0x80847F1C, size = 0xDC }, { name = "Player_ActionChange_2", vram = 0x8083D23C, size = 0x4A0 }, @@ -8546,7 +8546,7 @@ functions = [ { name = "Player_CsAction_1", vram = 0x808594D0, size = 0xE8 }, { name = "func_8085B930", vram = 0x8085B930, size = 0xB8 }, { name = "func_80830FD4", vram = 0x80830FD4, size = 0x3C }, - { name = "func_8082E55C", vram = 0x8082E55C, size = 0x4C }, + { name = "Player_Anim_PlayLoopMorphAdjusted", vram = 0x8082E55C, size = 0x4C }, { name = "Player_Action_18", vram = 0x8084B5C0, size = 0x4E4 }, { name = "Player_Action_55", vram = 0x80850B18, size = 0x90 }, { name = "func_8085B74C", vram = 0x8085B74C, size = 0xD4 }, @@ -8580,7 +8580,7 @@ functions = [ { name = "Player_Action_31", vram = 0x8084CE84, size = 0x308 }, { name = "func_8083EA44", vram = 0x8083EA44, size = 0x18C }, { name = "Player_CsAction_42", vram = 0x8085A8C4, size = 0x7C }, - { name = "Player_AnimationPlayOnceReverse", vram = 0x8082DBC0, size = 0x68 }, + { name = "Player_Anim_PlayOnceAdjustedReverse", vram = 0x8082DBC0, size = 0x68 }, { name = "func_808388B8", vram = 0x808388B8, size = 0x104 }, { name = "Player_Action_26", vram = 0x8084C6EC, size = 0x260 }, { name = "Player_Action_61", vram = 0x80851B58, size = 0x7C }, @@ -8591,19 +8591,19 @@ functions = [ { name = "func_808333CC", vram = 0x808333CC, size = 0x108 }, { name = "Player_ChooseIdleAnim", vram = 0x8083EBD0, size = 0x290 }, { name = "func_80851EC8", vram = 0x80851EC8, size = 0x50 }, - { name = "func_8082EA80", vram = 0x8082EA80, size = 0x48 }, + { name = "Player_AnimReplace_PlayLoopSetSpeed", vram = 0x8082EA80, size = 0x48 }, { name = "func_80847A94", vram = 0x80847A94, size = 0x15C }, - { name = "Player_CsAnim_2", vram = 0x80858DDC, size = 0x20 }, + { name = "Player_CsAnim_PlayOnceMorphReset", vram = 0x80858DDC, size = 0x20 }, { name = "Player_ActionChange_6", vram = 0x8083A114, size = 0x160 }, { name = "func_80831944", vram = 0x80831944, size = 0x4C }, { name = "func_8083A878", vram = 0x8083A878, size = 0x114 }, - { name = "func_8082EA38", vram = 0x8082EA38, size = 0x28 }, + { name = "Player_AnimReplace_PlayOnceAdjusted", vram = 0x8082EA38, size = 0x28 }, { name = "func_80832578", vram = 0x80832578, size = 0xE8 }, - { name = "Player_CsAnim_10", vram = 0x80858F5C, size = 0x20 }, + { name = "Player_CsAnim_PlayLoop", vram = 0x80858F5C, size = 0x20 }, { name = "func_80833728", vram = 0x80833728, size = 0x34 }, { name = "func_8083B8D0", vram = 0x8083B8D0, size = 0x60 }, - { name = "func_8082E9C8", vram = 0x8082E9C8, size = 0x48 }, - { name = "Player_Action_97", vram = 0x8085B08C, size = 0xA8 }, + { name = "Player_AnimReplace_PlayOnceSetSpeed", vram = 0x8082E9C8, size = 0x48 }, + { name = "Player_Action_CsAction", vram = 0x8085B08C, size = 0xA8 }, { name = "func_8083ADF0", vram = 0x8083ADF0, size = 0x48 }, { name = "func_80837BF8", vram = 0x80837BF8, size = 0x28 }, { name = "Player_StopHorizontalMovement", vram = 0x8082DABC, size = 0x18 }, @@ -8645,14 +8645,14 @@ functions = [ { name = "func_808482E0", vram = 0x808482E0, size = 0x1EC }, { name = "Player_CsAction_45", vram = 0x8085AA60, size = 0x24 }, { name = "func_808389BC", vram = 0x808389BC, size = 0x64 }, - { name = "Player_CsAnim_12", vram = 0x80859028, size = 0x140 }, - { name = "func_8082EC9C", vram = 0x8082EC9C, size = 0x30 }, + { name = "Player_CsAnim_PlayLoopAdjustedSlowMorphAnimSfxReset", vram = 0x80859028, size = 0x140 }, + { name = "Player_Anim_PlayOnceWaterAdjustment", vram = 0x8082EC9C, size = 0x30 }, { name = "Player_CsAction_34", vram = 0x8085A4A4, size = 0x8C }, { name = "Player_InflictDamage", vram = 0x8085B3E0, size = 0x80 }, { name = "func_80837730", vram = 0x80837730, size = 0x11C }, { name = "func_80847994", vram = 0x80847994, size = 0x60 }, { name = "Player_StartFishing", vram = 0x8085B134, size = 0x3C }, - { name = "func_8082EA10", vram = 0x8082EA10, size = 0x28 }, + { name = "Player_AnimReplace_PlayOnce", vram = 0x8082EA10, size = 0x28 }, { name = "func_8083FE38", vram = 0x8083FE38, size = 0x58 }, { name = "func_8083FFEC", vram = 0x8083FFEC, size = 0xA8 }, { name = "func_8082DE14", vram = 0x8082DE14, size = 0x3C }, @@ -8677,17 +8677,17 @@ functions = [ { name = "func_808341F4", vram = 0x808341F4, size = 0x2CC }, { name = "func_80851F18", vram = 0x80851F18, size = 0x2C8 }, { name = "Player_InitMode_3", vram = 0x808414E0, size = 0x48 }, - { name = "func_80858CC8", vram = 0x80858CC8, size = 0x80 }, + { name = "Player_CsAnimHelper_PlayOnceSlowMorphAdjustedReset", vram = 0x80858CC8, size = 0x80 }, { name = "func_80831F34", vram = 0x80831F34, size = 0x15C }, { name = "func_8082DF2C", vram = 0x8082DF2C, size = 0x1C }, - { name = "func_8082EAC8", vram = 0x8082EAC8, size = 0x28 }, + { name = "Player_AnimReplace_PlayLoop", vram = 0x8082EAC8, size = 0x28 }, { name = "func_808339B4", vram = 0x808339B4, size = 0x20 }, { name = "func_808411D4", vram = 0x808411D4, size = 0xCC }, { name = "func_80854EFC", vram = 0x80854EFC, size = 0x1D4 }, { name = "func_8083F828", vram = 0x8083F828, size = 0x80 }, { name = "func_8082DE88", vram = 0x8082DE88, size = 0xA4 }, { name = "func_80847FF8", vram = 0x80847FF8, size = 0x50 }, - { name = "Player_CsAnim_14", vram = 0x80858DFC, size = 0x44 }, + { name = "Player_CsAnim_PlayOnceFreezeReset", vram = 0x80858DFC, size = 0x44 }, { name = "func_8083CBC4", vram = 0x8083CBC4, size = 0xF0 }, { name = "func_8083A844", vram = 0x8083A844, size = 0x34 }, { name = "func_8083C6E8", vram = 0x8083C6E8, size = 0x174 }, @@ -8722,7 +8722,7 @@ functions = [ { name = "Player_Action_10", vram = 0x8084AB4C, size = 0x138 }, { name = "func_80832888", vram = 0x80832888, size = 0x424 }, { name = "func_808400CC", vram = 0x808400CC, size = 0x128 }, - { name = "func_8082E794", vram = 0x8082E794, size = 0x8C }, + { name = "Player_Anim_ResetMove", vram = 0x8082E794, size = 0x8C }, { name = "Player_CsAction_26", vram = 0x8085A144, size = 0x58 }, { name = "Player_Action_40", vram = 0x8084E4E4, size = 0xA8 }, { name = "Player_CsAction_11", vram = 0x80859AD0, size = 0x28 }, @@ -8734,7 +8734,7 @@ functions = [ { name = "func_8082FC60", vram = 0x8082FC60, size = 0x18 }, { name = "func_808305BC", vram = 0x808305BC, size = 0x13C }, { name = "func_80840E5C", vram = 0x80840E5C, size = 0x64 }, - { name = "Player_CsAnim_16", vram = 0x80858F9C, size = 0x20 }, + { name = "Player_CsAnim_PlayLoopAdjusted", vram = 0x80858F9C, size = 0x20 }, { name = "func_80851C40", vram = 0x80851C40, size = 0xF0 }, { name = "func_8083DF38", vram = 0x8083DF38, size = 0x8C }, { name = "func_80839ED0", vram = 0x80839ED0, size = 0xC8 }, @@ -8748,7 +8748,7 @@ functions = [ { name = "Player_UpperAction_6", vram = 0x80848B6C, size = 0x88 }, { name = "func_8082DAD4", vram = 0x8082DAD4, size = 0x28 }, { name = "func_8082EFE4", vram = 0x8082EFE4, size = 0x48 }, - { name = "Player_CsAnim_5", vram = 0x80858E80, size = 0x20 }, + { name = "Player_CsAnim_ReplacePlayOnceNormalAdjusted", vram = 0x80858E80, size = 0x20 }, { name = "func_8082FA5C", vram = 0x8082FA5C, size = 0x10C }, { name = "func_80832660", vram = 0x80832660, size = 0xF4 }, { name = "func_80833AA0", vram = 0x80833AA0, size = 0x78 }, @@ -8769,12 +8769,12 @@ functions = [ { name = "Player_Action_71", vram = 0x80853A5C, size = 0x264 }, { name = "Player_Action_34", vram = 0x8084D770, size = 0xB0 }, { name = "func_80856074", vram = 0x80856074, size = 0x9C }, - { name = "func_8085B28C", vram = 0x8085B28C, size = 0xF8 }, + { name = "Player_TryCsAction", vram = 0x8085B28C, size = 0xF8 }, { name = "func_80836AD8", vram = 0x80836AD8, size = 0x64 }, { name = "Player_Action_7", vram = 0x8084A794, size = 0xF0 }, { name = "Player_Action_21", vram = 0x8084BC64, size = 0x1DC }, { name = "Player_ProcessItemButtons", vram = 0x8082FE0C, size = 0x4C0 }, - { name = "func_8082E784", vram = 0x8082E784, size = 0x10 }, + { name = "Player_Anim_ZeroModelYaw", vram = 0x8082E784, size = 0x10 }, { name = "Player_CsAction_4", vram = 0x80859708, size = 0x84 }, { name = "Player_InitMode_Telescope", vram = 0x8083AD04, size = 0x88 }, { name = "Player_Action_19", vram = 0x8084BAA4, size = 0x14C }, @@ -8792,11 +8792,11 @@ functions = [ { name = "Player_ActionChange_5", vram = 0x8083DFC4, size = 0x188 }, { name = "func_808335F4", vram = 0x808335F4, size = 0x134 }, { name = "Player_CsAction_40", vram = 0x8085A768, size = 0x58 }, - { name = "Player_CsAnim_17", vram = 0x80859168, size = 0x54 }, + { name = "Player_CsAnim_PlayLoopAdjustedOnceFinished", vram = 0x80859168, size = 0x54 }, { name = "func_808370D4", vram = 0x808370D4, size = 0x60 }, { name = "func_8082F164", vram = 0x8082F164, size = 0x48 }, - { name = "Player_AnimationPlayOnce", vram = 0x8082DB18, size = 0x24 }, - { name = "func_80858C84", vram = 0x80858C84, size = 0x44 }, + { name = "Player_Anim_PlayOnce", vram = 0x8082DB18, size = 0x24 }, + { name = "Player_CsAnimHelper_PlayOnceMorphReset", vram = 0x80858C84, size = 0x44 }, { name = "func_8082EEE0", vram = 0x8082EEE0, size = 0x40 }, { name = "func_8085B384", vram = 0x8085B384, size = 0x5C }, { name = "func_80837CEC", vram = 0x80837CEC, size = 0x100 }, @@ -8805,7 +8805,7 @@ functions = [ { name = "func_8082E00C", vram = 0x8082E00C, size = 0x6C }, { name = "func_8083A04C", vram = 0x8083A04C, size = 0x80 }, { name = "Player_UpperAction_13", vram = 0x808492C4, size = 0x78 }, - { name = "Player_CsAnim_8", vram = 0x80858F1C, size = 0x20 }, + { name = "Player_CsAnim_ReplacePlayLoop", vram = 0x80858F1C, size = 0x20 }, { name = "func_80848094", vram = 0x80848094, size = 0x138 }, { name = "Player_Action_36", vram = 0x8084E034, size = 0x228 }, { name = "func_808340D4", vram = 0x808340D4, size = 0x30 }, @@ -8813,7 +8813,7 @@ functions = [ { name = "func_80830CE8", vram = 0x80830CE8, size = 0x58 }, { name = "func_808481CC", vram = 0x808481CC, size = 0x84 }, { name = "Player_Action_23", vram = 0x8084BF28, size = 0xB4 }, - { name = "func_8082EA60", vram = 0x8082EA60, size = 0x20 }, + { name = "Player_AnimReplace_PlayOnceNormalAdjusted", vram = 0x8082EA60, size = 0x20 }, { name = "func_80857A44", vram = 0x80857A44, size = 0xA8 }, { name = "func_8082DAFC", vram = 0x8082DAFC, size = 0x1C }, { name = "func_8083FD80", vram = 0x8083FD80, size = 0xB8 }, @@ -8826,9 +8826,9 @@ functions = [ { name = "Player_Action_43", vram = 0x8084E724, size = 0x25C }, { name = "Player_Update", vram = 0x808460B8, size = 0x308 }, { name = "func_80846460", vram = 0x80846460, size = 0xC8 }, - { name = "func_8082EB18", vram = 0x8082EB18, size = 0x20 }, + { name = "Player_AnimReplace_PlayLoopNormalAdjusted", vram = 0x8082EB18, size = 0x20 }, { name = "func_80839A84", vram = 0x80839A84, size = 0x94 }, - { name = "Player_CsAnim_19", vram = 0x80858EC0, size = 0x3C }, + { name = "Player_CsAnim_ReplacePlayOnceAdjustedReverse", vram = 0x80858EC0, size = 0x3C }, { name = "func_80832558", vram = 0x80832558, size = 0x20 }, { name = "func_808353DC", vram = 0x808353DC, size = 0x4C }, { name = "Player_StartChangingHeldItem", vram = 0x808302CC, size = 0x1F0 }, @@ -8836,10 +8836,10 @@ functions = [ { name = "func_8084FD7C", vram = 0x8084FD7C, size = 0xCC }, { name = "func_80840F90", vram = 0x80840F90, size = 0x244 }, { name = "func_80836988", vram = 0x80836988, size = 0x6C }, - { name = "func_8082E920", vram = 0x8082E920, size = 0xA8 }, + { name = "Player_AnimReplace_Setup", vram = 0x8082E920, size = 0xA8 }, { name = "Player_AnimSfx_PlayFloorLand", vram = 0x8082E1BC, size = 0x34 }, { name = "func_8083F27C", vram = 0x8083F27C, size = 0xDC }, - { name = "Player_CsAnim_6", vram = 0x80858EA0, size = 0x20 }, + { name = "Player_CsAnim_ReplacePlayOnce", vram = 0x80858EA0, size = 0x20 }, { name = "func_8083A794", vram = 0x8083A794, size = 0xB0 }, { name = "func_808484F0", vram = 0x808484F0, size = 0x80 }, { name = "Player_StopCutscene", vram = 0x80838760, size = 0x40 }, @@ -8848,7 +8848,7 @@ functions = [ { name = "func_8083B030", vram = 0x8083B030, size = 0x60 }, { name = "func_80837BD0", vram = 0x80837BD0, size = 0x28 }, { name = "Player_WaitToFinishItemChange", vram = 0x80830D40, size = 0xB0 }, - { name = "func_8082DB90", vram = 0x8082DB90, size = 0x30 }, + { name = "Player_Anim_PlayOnceAdjusted", vram = 0x8082DB90, size = 0x30 }, { name = "Player_Action_25", vram = 0x8084C16C, size = 0x580 }, { name = "Player_Action_60", vram = 0x808519FC, size = 0x15C }, { name = "func_80839CD8", vram = 0x80839CD8, size = 0x164 }, @@ -8858,7 +8858,7 @@ functions = [ { name = "Player_Action_52", vram = 0x8084FE7C, size = 0x754 }, { name = "func_8083B3B4", vram = 0x8083B3B4, size = 0x388 }, { name = "func_80839E3C", vram = 0x80839E3C, size = 0x38 }, - { name = "func_8082E6F8", vram = 0x8082E6F8, size = 0x8C }, + { name = "Player_Anim_ResetPrevTranslRotFormScale", vram = 0x8082E6F8, size = 0x8C }, { name = "Player_ActionChange_14", vram = 0x8083A0CC, size = 0x48 }, { name = "Player_InitMode_B", vram = 0x8083AD8C, size = 0x2C }, { name = "Player_Action_80", vram = 0x80854430, size = 0x1E4 }, @@ -8878,7 +8878,7 @@ functions = [ { name = "func_8083E514", vram = 0x8083E514, size = 0x244 }, { name = "Player_UpperAction_1", vram = 0x808487B8, size = 0x50 }, { name = "func_8083D860", vram = 0x8083D860, size = 0x464 }, - { name = "Player_CsAnim_4", vram = 0x80858E60, size = 0x20 }, + { name = "Player_CsAnim_PlayLoopSlowMorphAdjustedReset", vram = 0x80858E60, size = 0x20 }, { name = "Player_ActionChange_0", vram = 0x80839518, size = 0xD8 }, { name = "Player_Action_32", vram = 0x8084D18C, size = 0x360 }, { name = "func_80837DEC", vram = 0x80837DEC, size = 0x3B4 }, @@ -8893,10 +8893,10 @@ functions = [ { name = "Player_InitItemAction_2", vram = 0x8082F5C0, size = 0x3C }, { name = "func_80830B88", vram = 0x80830B88, size = 0x160 }, { name = "Player_CsAction_38", vram = 0x8085A6C0, size = 0x50 }, - { name = "func_8082DB60", vram = 0x8082DB60, size = 0x30 }, + { name = "Player_Anim_PlayLoopAdjusted", vram = 0x8082DB60, size = 0x30 }, { name = "func_808521E0", vram = 0x808521E0, size = 0xB0 }, { name = "func_80840094", vram = 0x80840094, size = 0x38 }, - { name = "func_8082EAF0", vram = 0x8082EAF0, size = 0x28 }, + { name = "Player_AnimReplace_PlayLoopAdjusted", vram = 0x8082EAF0, size = 0x28 }, { name = "Player_Action_17", vram = 0x8084B4A8, size = 0x118 }, { name = "Player_Action_54", vram = 0x808508C8, size = 0x250 }, { name = "Player_InitMode_D", vram = 0x8083ADB8, size = 0x38 }, @@ -8912,7 +8912,7 @@ functions = [ { name = "func_8083A548", vram = 0x8083A548, size = 0x38 }, { name = "Player_Action_0", vram = 0x808496AC, size = 0xF4 }, { name = "func_80851EAC", vram = 0x80851EAC, size = 0x1C }, - { name = "func_8082E6D0", vram = 0x8082E6D0, size = 0x28 }, + { name = "Player_Anim_ResetPrevTranslRot", vram = 0x8082E6D0, size = 0x28 }, { name = "func_8083B23C", vram = 0x8083B23C, size = 0x60 }, ] @@ -12198,7 +12198,7 @@ functions = [ { name = "func_8089B8B0", vram = 0x8089B8B0, size = 0xDC }, { name = "func_8089AD70", vram = 0x8089AD70, size = 0x90 }, { name = "func_8089B72C", vram = 0x8089B72C, size = 0x84 }, - { name = "func_8089DC84", vram = 0x8089DC84, size = 0x2D0 }, + { name = "EnDinofos_PostLimbDraw", vram = 0x8089DC84, size = 0x2D0 }, { name = "func_8089B288", vram = 0x8089B288, size = 0x98 }, { name = "func_8089D11C", vram = 0x8089D11C, size = 0xC4 }, { name = "func_8089CB10", vram = 0x8089CB10, size = 0xDC }, @@ -12214,7 +12214,7 @@ functions = [ { name = "func_8089C44C", vram = 0x8089C44C, size = 0xAC }, { name = "func_8089C690", vram = 0x8089C690, size = 0x94 }, { name = "func_8089C0DC", vram = 0x8089C0DC, size = 0x88 }, - { name = "func_8089DC4C", vram = 0x8089DC4C, size = 0x38 }, + { name = "EnDinofos_OverrideLimbDraw", vram = 0x8089DC4C, size = 0x38 }, { name = "EnDinofos_Init", vram = 0x8089A6E0, size = 0x1D0 }, { name = "func_8089C7B8", vram = 0x8089C7B8, size = 0xC4 }, { name = "func_8089AC70", vram = 0x8089AC70, size = 0x7C }, @@ -21802,46 +21802,46 @@ relocs = [ ] functions = [ - { name = "func_8092EDD8", vram = 0x8092EDD8, size = 0x30 }, - { name = "func_8092EDC0", vram = 0x8092EDC0, size = 0x18 }, - { name = "func_8092EE08", vram = 0x8092EE08, size = 0x14 }, - { name = "func_8092EE1C", vram = 0x8092EE1C, size = 0x4C }, + { name = "EnHonotrap_EyeAttack", vram = 0x8092EDD8, size = 0x30 }, + { name = "EnHonotrap_SetupEyeAttack", vram = 0x8092EDC0, size = 0x18 }, + { name = "EnHonotrap_SetupEyeClose", vram = 0x8092EE08, size = 0x14 }, + { name = "EnHonotrap_EyeClose", vram = 0x8092EE1C, size = 0x4C }, { name = "EnHonotrap_Update", vram = 0x8092FD6C, size = 0xD8 }, - { name = "func_8092F0B8", vram = 0x8092F0B8, size = 0x40 }, - { name = "func_8092E638", vram = 0x8092E638, size = 0x208 }, - { name = "func_8092EE68", vram = 0x8092EE68, size = 0x28 }, - { name = "func_8092EC9C", vram = 0x8092EC9C, size = 0x54 }, - { name = "func_8092F878", vram = 0x8092F878, size = 0x4F4 }, - { name = "func_80930030", vram = 0x80930030, size = 0x160 }, - { name = "func_8092EF3C", vram = 0x8092EF3C, size = 0x5C }, - { name = "func_8092F208", vram = 0x8092F208, size = 0x144 }, - { name = "func_8092EBC0", vram = 0x8092EBC0, size = 0x1C }, - { name = "func_8092F1A0", vram = 0x8092F1A0, size = 0x68 }, - { name = "func_8092F074", vram = 0x8092F074, size = 0x30 }, - { name = "func_8092F3D8", vram = 0x8092F3D8, size = 0x1D4 }, - { name = "func_8092E840", vram = 0x8092E840, size = 0x148 }, - { name = "func_8092F0A4", vram = 0x8092F0A4, size = 0x14 }, - { name = "func_8092F0F8", vram = 0x8092F0F8, size = 0x14 }, - { name = "func_8092ECF0", vram = 0x8092ECF0, size = 0xD0 }, - { name = "func_8092E5A4", vram = 0x8092E5A4, size = 0x94 }, - { name = "func_8092F7BC", vram = 0x8092F7BC, size = 0x98 }, - { name = "func_8092FEFC", vram = 0x8092FEFC, size = 0x74 }, + { name = "EnHonotrap_EyeClose2", vram = 0x8092F0B8, size = 0x40 }, + { name = "EnHonotrap_InitEye", vram = 0x8092E638, size = 0x208 }, + { name = "EnHonotrap_SetupEyeIdle2", vram = 0x8092EE68, size = 0x28 }, + { name = "EnHonotrap_SetupEyeOpen", vram = 0x8092EC9C, size = 0x54 }, + { name = "EnHonotrap_FlameGroup", vram = 0x8092F878, size = 0x4F4 }, + { name = "EnHonotrap_DrawFlame", vram = 0x80930030, size = 0x160 }, + { name = "EnHonotrap_SetupEyeOpen2", vram = 0x8092EF3C, size = 0x5C }, + { name = "EnHonotrap_FlameDrop", vram = 0x8092F208, size = 0x144 }, + { name = "EnHonotrap_SetupEyeIdle", vram = 0x8092EBC0, size = 0x1C }, + { name = "EnHonotrap_SetupFlameDrop", vram = 0x8092F1A0, size = 0x68 }, + { name = "EnHonotrap_EyeAttack2", vram = 0x8092F074, size = 0x30 }, + { name = "EnHonotrap_FlameMove", vram = 0x8092F3D8, size = 0x1D4 }, + { name = "EnHonotrap_InitFlame", vram = 0x8092E840, size = 0x148 }, + { name = "EnHonotrap_SetupEyeClose2", vram = 0x8092F0A4, size = 0x14 }, + { name = "EnHonotrap_SetupFlameGrow", vram = 0x8092F0F8, size = 0x14 }, + { name = "EnHonotrap_EyeOpen", vram = 0x8092ECF0, size = 0xD0 }, + { name = "EnHonotrap_GetNormal", vram = 0x8092E5A4, size = 0x94 }, + { name = "EnHonotrap_FlameVanish", vram = 0x8092F7BC, size = 0x98 }, + { name = "EnHonotrap_UpdateFlameGroup", vram = 0x8092FEFC, size = 0x74 }, { name = "EnHonotrap_Init", vram = 0x8092EA98, size = 0xD4 }, - { name = "func_8092E988", vram = 0x8092E988, size = 0x110 }, - { name = "func_8092F854", vram = 0x8092F854, size = 0x24 }, - { name = "func_8092EF98", vram = 0x8092EF98, size = 0xC4 }, - { name = "func_8092F34C", vram = 0x8092F34C, size = 0x8C }, + { name = "EnHonotrap_InitFlameGroup", vram = 0x8092E988, size = 0x110 }, + { name = "EnHonotrap_SetupFlameGroup", vram = 0x8092F854, size = 0x24 }, + { name = "EnHonotrap_EyeOpen2", vram = 0x8092EF98, size = 0xC4 }, + { name = "EnHonotrap_SetupFlameMove", vram = 0x8092F34C, size = 0x8C }, { name = "EnHonotrap_Destroy", vram = 0x8092EB6C, size = 0x54 }, - { name = "func_8092EBDC", vram = 0x8092EBDC, size = 0xC0 }, - { name = "func_80930190", vram = 0x80930190, size = 0x260 }, - { name = "func_8092F10C", vram = 0x8092F10C, size = 0x94 }, - { name = "func_8092E510", vram = 0x8092E510, size = 0x94 }, - { name = "func_8092F05C", vram = 0x8092F05C, size = 0x18 }, - { name = "func_8092F7A8", vram = 0x8092F7A8, size = 0x14 }, - { name = "func_8092EE90", vram = 0x8092EE90, size = 0xAC }, - { name = "func_8092F5AC", vram = 0x8092F5AC, size = 0x40 }, - { name = "func_8092F5EC", vram = 0x8092F5EC, size = 0x1BC }, - { name = "func_8092FE44", vram = 0x8092FE44, size = 0xB8 }, + { name = "EnHonotrap_EyeIdle", vram = 0x8092EBDC, size = 0xC0 }, + { name = "EnHonotrap_DrawFlameGroup", vram = 0x80930190, size = 0x260 }, + { name = "EnHonotrap_FlameGrow", vram = 0x8092F10C, size = 0x94 }, + { name = "EnHonotrap_FlameCollisionCheck", vram = 0x8092E510, size = 0x94 }, + { name = "EnHonotrap_SetupEyeAttack2", vram = 0x8092F05C, size = 0x18 }, + { name = "EnHonotrap_SetupFlameVanish", vram = 0x8092F7A8, size = 0x14 }, + { name = "EnHonotrap_EyeIdle2", vram = 0x8092EE90, size = 0xAC }, + { name = "EnHonotrap_SetupFlameChase", vram = 0x8092F5AC, size = 0x40 }, + { name = "EnHonotrap_FlameChase", vram = 0x8092F5EC, size = 0x1BC }, + { name = "EnHonotrap_UpdateFlame", vram = 0x8092FE44, size = 0xB8 }, { name = "EnHonotrap_Draw", vram = 0x8092FF70, size = 0xC0 }, ] @@ -24241,7 +24241,7 @@ functions = [ { name = "EnMk_OverrideLimbDraw", vram = 0x8095A150, size = 0x48 }, { name = "func_80959774", vram = 0x80959774, size = 0xD0 }, { name = "func_80959E18", vram = 0x80959E18, size = 0x210 }, - { name = "func_809592E0", vram = 0x809592E0, size = 0xB0 }, + { name = "EnMk_ChangeAnim", vram = 0x809592E0, size = 0xB0 }, { name = "EnMk_PostLimbDraw", vram = 0x8095A198, size = 0x40 }, { name = "func_80959524", vram = 0x80959524, size = 0x28 }, { name = "func_809596A0", vram = 0x809596A0, size = 0xD4 }, @@ -24919,7 +24919,7 @@ functions = [ { name = "func_80961E88", vram = 0x80961E88, size = 0x40 }, { name = "func_80962D60", vram = 0x80962D60, size = 0x15C }, { name = "func_80963FF8", vram = 0x80963FF8, size = 0x3C }, - { name = "func_80963810", vram = 0x80963810, size = 0xE8 }, + { name = "EnFu_MovePlayerToPos", vram = 0x80963810, size = 0xE8 }, { name = "func_80961F00", vram = 0x80961F00, size = 0x38 }, { name = "func_809647EC", vram = 0x809647EC, size = 0x164 }, { name = "func_80962588", vram = 0x80962588, size = 0xD8 }, @@ -25299,7 +25299,7 @@ functions = [ { name = "func_80969688", vram = 0x80969688, size = 0x64 }, { name = "func_80969530", vram = 0x80969530, size = 0xCC }, { name = "func_80969AA0", vram = 0x80969AA0, size = 0xBC }, - { name = "func_8096A9F4", vram = 0x8096A9F4, size = 0x12C }, + { name = "EnJs_PostLimbDraw", vram = 0x8096A9F4, size = 0x12C }, { name = "func_8096A6F4", vram = 0x8096A6F4, size = 0x1B0 }, { name = "EnJs_Draw", vram = 0x8096AB20, size = 0x58 }, { name = "func_809694E8", vram = 0x809694E8, size = 0x48 }, @@ -29954,9 +29954,9 @@ functions = [ { name = "EnJso_PostLimbDraw", vram = 0x809B0820, size = 0x350 }, { name = "EnJso_UpdateDamage", vram = 0x809B0034, size = 0x298 }, { name = "EnJso_Draw", vram = 0x809B0BB0, size = 0x38C }, - { name = "EnJso_HandleIntroCutscene", vram = 0x809ADCB8, size = 0xA9C }, + { name = "EnJso_IntroCutscene", vram = 0x809ADCB8, size = 0xA9C }, { name = "EnJso_KnockedBack", vram = 0x809AF3C0, size = 0x3C }, - { name = "EnJso_SetupHandleIntroCutscene", vram = 0x809ADC7C, size = 0x3C }, + { name = "EnJso_SetupIntroCutscene", vram = 0x809ADC7C, size = 0x3C }, { name = "EnJso_OverrideLimbDraw", vram = 0x809B0734, size = 0xEC }, { name = "EnJso_TellHint", vram = 0x809AFC10, size = 0x228 }, { name = "EnJso_SetupJumpBack", vram = 0x809AF76C, size = 0x88 }, @@ -33468,48 +33468,48 @@ relocs = [ ] functions = [ - { name = "func_809EF9BC", vram = 0x809EF9BC, size = 0xF8 }, - { name = "func_809F02D0", vram = 0x809F02D0, size = 0xA4 }, - { name = "func_809EFE50", vram = 0x809EFE50, size = 0x1C4 }, - { name = "func_809EECBC", vram = 0x809EECBC, size = 0x114 }, - { name = "func_809F1284", vram = 0x809F1284, size = 0x1C }, + { name = "Boss05_LilyPad_Idle", vram = 0x809EF9BC, size = 0xF8 }, + { name = "Boss05_WalkingHead_SetupWalk", vram = 0x809F02D0, size = 0xA4 }, + { name = "Boss05_WalkingHead_UpdateDamage", vram = 0x809EFE50, size = 0x1C4 }, + { name = "Boss05_LilyPadWithHead_UpdateDamage", vram = 0x809EECBC, size = 0x114 }, + { name = "Boss05_Head_OverrideLimbDraw", vram = 0x809F1284, size = 0x1C }, { name = "Boss05_Init", vram = 0x809EE6F8, size = 0x578 }, - { name = "func_809F0A0C", vram = 0x809F0A0C, size = 0x58 }, - { name = "func_809F00CC", vram = 0x809F00CC, size = 0x40 }, - { name = "func_809F135C", vram = 0x809F135C, size = 0xA8 }, - { name = "func_809F1464", vram = 0x809F1464, size = 0x48 }, - { name = "func_809F14AC", vram = 0x809F14AC, size = 0xA4 }, - { name = "func_809F0650", vram = 0x809F0650, size = 0x68 }, - { name = "func_809F0244", vram = 0x809F0244, size = 0x8C }, - { name = "func_809EFAB4", vram = 0x809EFAB4, size = 0x39C }, - { name = "func_809F01CC", vram = 0x809F01CC, size = 0x78 }, - { name = "func_809EEDE8", vram = 0x809EEDE8, size = 0xBD4 }, - { name = "func_809F0374", vram = 0x809F0374, size = 0x100 }, - { name = "func_809EE668", vram = 0x809EE668, size = 0x90 }, - { name = "func_809F0B0C", vram = 0x809F0B0C, size = 0x1C0 }, - { name = "func_809F0708", vram = 0x809F0708, size = 0x78 }, - { name = "func_809F0538", vram = 0x809F0538, size = 0x58 }, - { name = "func_809F1404", vram = 0x809F1404, size = 0x2C }, - { name = "func_809EE4E0", vram = 0x809EE4E0, size = 0x188 }, - { name = "func_809F0780", vram = 0x809F0780, size = 0x28C }, - { name = "func_809F12A0", vram = 0x809F12A0, size = 0xBC }, - { name = "func_809F1430", vram = 0x809F1430, size = 0x34 }, - { name = "func_809F010C", vram = 0x809F010C, size = 0xC0 }, - { name = "func_809F0A64", vram = 0x809F0A64, size = 0x58 }, + { name = "Boss05_WalkingHead_SetupStunned", vram = 0x809F0A0C, size = 0x58 }, + { name = "Boss05_WalkingHead_SetupTransform", vram = 0x809F00CC, size = 0x40 }, + { name = "Boss05_Head_TransformLimbDraw", vram = 0x809F135C, size = 0xA8 }, + { name = "Boss05_FallingHeadLilyPad_TransformLimbDraw", vram = 0x809F1464, size = 0x48 }, + { name = "Boss05_Fragment_OverrideLimbDraw", vram = 0x809F14AC, size = 0xA4 }, + { name = "Boss05_WalkingHead_SetupAttack", vram = 0x809F0650, size = 0x68 }, + { name = "Boss05_WalkingHead_Idle", vram = 0x809F0244, size = 0x8C }, + { name = "Boss05_FallingHead_Fall", vram = 0x809EFAB4, size = 0x39C }, + { name = "Boss05_WalkingHead_SetupIdle", vram = 0x809F01CC, size = 0x78 }, + { name = "Boss05_LilyPadWithHead_Move", vram = 0x809EEDE8, size = 0xBD4 }, + { name = "Boss05_WalkingHead_Walk", vram = 0x809F0374, size = 0x100 }, + { name = "Boss05_SetColliderSphere", vram = 0x809EE668, size = 0x90 }, + { name = "Boss05_Fragment_Move", vram = 0x809F0B0C, size = 0x1C0 }, + { name = "Boss05_WalkingHead_SetupDamaged", vram = 0x809F0708, size = 0x78 }, + { name = "Boss05_WalkingHead_SetupCharge", vram = 0x809F0538, size = 0x58 }, + { name = "Boss05_LilyPad_OverrideLimbDraw", vram = 0x809F1404, size = 0x2C }, + { name = "Boss05_WalkingHead_Thaw", vram = 0x809EE4E0, size = 0x188 }, + { name = "Boss05_WalkingHead_Damaged", vram = 0x809F0780, size = 0x28C }, + { name = "Boss05_Head_PostLimbDraw", vram = 0x809F12A0, size = 0xBC }, + { name = "Boss05_FallingHeadLilyPad_OverrideLimbDraw", vram = 0x809F1430, size = 0x34 }, + { name = "Boss05_WalkingHead_Transform", vram = 0x809F010C, size = 0xC0 }, + { name = "Boss05_WalkingHead_SetupFreeze", vram = 0x809F0A64, size = 0x58 }, { name = "Boss05_Draw", vram = 0x809F159C, size = 0x484 }, - { name = "func_809F04C0", vram = 0x809F04C0, size = 0x78 }, + { name = "Boss05_WalkingHead_SpottedPlayer", vram = 0x809F04C0, size = 0x78 }, { name = "Boss05_Destroy", vram = 0x809EEC70, size = 0x4C }, - { name = "func_809F0590", vram = 0x809F0590, size = 0xC0 }, - { name = "func_809F0474", vram = 0x809F0474, size = 0x4C }, + { name = "Boss05_WalkingHead_Charge", vram = 0x809F0590, size = 0xC0 }, + { name = "Boss05_WalkingHead_SetupSpottedPlayer", vram = 0x809F0474, size = 0x4C }, { name = "Boss05_Update", vram = 0x809F0CCC, size = 0x384 }, - { name = "func_809F0ABC", vram = 0x809F0ABC, size = 0x50 }, - { name = "func_809F1050", vram = 0x809F1050, size = 0x120 }, - { name = "func_809F1550", vram = 0x809F1550, size = 0x4C }, - { name = "func_809F0014", vram = 0x809F0014, size = 0x44 }, - { name = "func_809EEDD0", vram = 0x809EEDD0, size = 0x18 }, - { name = "func_809F1170", vram = 0x809F1170, size = 0x114 }, - { name = "func_809F0058", vram = 0x809F0058, size = 0x74 }, - { name = "func_809F06B8", vram = 0x809F06B8, size = 0x50 }, + { name = "Boss05_WalkingHead_Stunned", vram = 0x809F0ABC, size = 0x50 }, + { name = "Boss05_LilyPadWithHead_OverrideLimbDraw", vram = 0x809F1050, size = 0x120 }, + { name = "Boss05_Fragment_PostLimbDraw", vram = 0x809F1550, size = 0x4C }, + { name = "Boss05_WalkingHead_IsLookingAtPlayer", vram = 0x809F0014, size = 0x44 }, + { name = "Boss05_LilyPadWithHead_SetupMove", vram = 0x809EEDD0, size = 0x18 }, + { name = "Boss05_LilyPad_PostLimbDraw", vram = 0x809F1170, size = 0x114 }, + { name = "Boss05_WalkingHead_TrySpottingPlayer", vram = 0x809F0058, size = 0x74 }, + { name = "Boss05_WalkingHead_Attack", vram = 0x809F06B8, size = 0x50 }, ] # Autogenerated from an ELF via N64Recomp @@ -37427,7 +37427,7 @@ functions = [ { name = "func_80A33098", vram = 0x80A33098, size = 0x12C }, { name = "func_80A32B20", vram = 0x80A32B20, size = 0x1BC }, { name = "EnPr_OverrideLimbDraw", vram = 0x80A3357C, size = 0x38 }, - { name = "func_80A3242C", vram = 0x80A3242C, size = 0xB4 }, + { name = "EnPr_ChangeAnim", vram = 0x80A3242C, size = 0xB4 }, { name = "func_80A32CDC", vram = 0x80A32CDC, size = 0x4C }, { name = "func_80A32AF8", vram = 0x80A32AF8, size = 0x28 }, { name = "func_80A3289C", vram = 0x80A3289C, size = 0xC0 }, @@ -37858,13 +37858,13 @@ relocs = [ functions = [ { name = "EnRu_ChangeAnim", vram = 0x80A389A0, size = 0xC8 }, - { name = "EnRu_OverrideLimbdraw", vram = 0x80A38FB4, size = 0x144 }, + { name = "EnRu_OverrideLimbDraw", vram = 0x80A38FB4, size = 0x144 }, { name = "EnRu_PlayWalkingSound", vram = 0x80A38A68, size = 0x114 }, { name = "EnRu_Init", vram = 0x80A38E04, size = 0x10C }, { name = "EnRu_UpdateEyes", vram = 0x80A38B7C, size = 0x74 }, { name = "EnRu_Update", vram = 0x80A38F3C, size = 0x78 }, { name = "EnRu_UpdateModel", vram = 0x80A38C70, size = 0x184 }, - { name = "EnRu_PostLimbdraw", vram = 0x80A390F8, size = 0x10C }, + { name = "EnRu_PostLimbDraw", vram = 0x80A390F8, size = 0x10C }, { name = "EnRu_Draw", vram = 0x80A39204, size = 0x220 }, { name = "EnRu_UpdateCollider", vram = 0x80A38BF0, size = 0x80 }, { name = "EnRu_Destroy", vram = 0x80A38F10, size = 0x2C }, @@ -38533,18 +38533,18 @@ relocs = [ ] functions = [ - { name = "func_80A41FA4", vram = 0x80A41FA4, size = 0x1F4 }, - { name = "func_80A42AB8", vram = 0x80A42AB8, size = 0x468 }, - { name = "func_80A42198", vram = 0x80A42198, size = 0x44C }, - { name = "func_80A4323C", vram = 0x80A4323C, size = 0x38 }, - { name = "func_80A42F20", vram = 0x80A42F20, size = 0x1A8 }, - { name = "func_80A41D70", vram = 0x80A41D70, size = 0x234 }, - { name = "func_80A425E4", vram = 0x80A425E4, size = 0x204 }, + { name = "EnTest4_HandleDayNightSwap", vram = 0x80A41FA4, size = 0x1F4 }, + { name = "EnTest4_HandleEvents", vram = 0x80A42AB8, size = 0x468 }, + { name = "EnTest4_GetBellTimeOnDay3", vram = 0x80A42198, size = 0x44C }, + { name = "EnTest4_SetSkyboxNumStars", vram = 0x80A4323C, size = 0x38 }, + { name = "EnTest4_HandleCutscene", vram = 0x80A42F20, size = 0x1A8 }, + { name = "EnTest4_HandleDayNightSwapFromInit", vram = 0x80A41D70, size = 0x234 }, + { name = "EnTest4_GetBellTimeAndShrinkScreenBeforeDay3", vram = 0x80A425E4, size = 0x204 }, { name = "EnTest4_Init", vram = 0x80A427E8, size = 0x2C0 }, { name = "EnTest4_Destroy", vram = 0x80A42AA8, size = 0x10 }, { name = "EnTest4_Update", vram = 0x80A43274, size = 0xAC }, - { name = "func_80A431C8", vram = 0x80A431C8, size = 0x74 }, - { name = "func_80A430C8", vram = 0x80A430C8, size = 0x100 }, + { name = "EnTest4_UpdateWeatherRainy", vram = 0x80A431C8, size = 0x74 }, + { name = "EnTest4_UpdateWeatherClear", vram = 0x80A430C8, size = 0x100 }, ] # Autogenerated from an ELF via N64Recomp @@ -39435,19 +39435,19 @@ relocs = [ ] functions = [ - { name = "func_80A51AA4", vram = 0x80A51AA4, size = 0x214 }, + { name = "EnDnk_PostLimbDraw2", vram = 0x80A51AA4, size = 0x214 }, { name = "EnDnk_Destroy", vram = 0x80A519A8, size = 0x2C }, - { name = "func_80A51DA4", vram = 0x80A51DA4, size = 0x21C }, + { name = "EnDnk_PostLimbDraw1", vram = 0x80A51DA4, size = 0x21C }, { name = "func_80A51CB8", vram = 0x80A51CB8, size = 0xC0 }, { name = "EnDnk_HandleCutscene", vram = 0x80A51890, size = 0x4C }, { name = "func_80A52134", vram = 0x80A52134, size = 0x64 }, - { name = "func_80A51D78", vram = 0x80A51D78, size = 0x2C }, + { name = "EnDnk_OverrideLimbDraw1", vram = 0x80A51D78, size = 0x2C }, { name = "EnDnk_ChangeAnim", vram = 0x80A514F0, size = 0xD4 }, { name = "EnDnk_Update", vram = 0x80A519D4, size = 0xA4 }, { name = "func_80A51FC0", vram = 0x80A51FC0, size = 0x58 }, { name = "func_80A52074", vram = 0x80A52074, size = 0xC0 }, { name = "func_80A51648", vram = 0x80A51648, size = 0x248 }, - { name = "func_80A51A78", vram = 0x80A51A78, size = 0x2C }, + { name = "EnDnk_OverrideLimbDraw2", vram = 0x80A51A78, size = 0x2C }, { name = "EnDnk_Init", vram = 0x80A518EC, size = 0xBC }, { name = "func_80A52018", vram = 0x80A52018, size = 0x5C }, { name = "func_80A515C4", vram = 0x80A515C4, size = 0x84 }, @@ -41756,13 +41756,13 @@ functions = [ { name = "func_80A74888", vram = 0x80A74888, size = 0x60 }, { name = "func_80A74E90", vram = 0x80A74E90, size = 0x324 }, { name = "func_80A751B4", vram = 0x80A751B4, size = 0x15C }, - { name = "func_80A75950", vram = 0x80A75950, size = 0x88 }, + { name = "EnPr2_PostLimbDrawOpa", vram = 0x80A75950, size = 0x88 }, { name = "EnPr2_Destroy", vram = 0x80A7422C, size = 0x70 }, - { name = "func_80A74510", vram = 0x80A74510, size = 0xB4 }, + { name = "EnPr2_ChangeAnim", vram = 0x80A74510, size = 0xB4 }, { name = "func_80A755D8", vram = 0x80A755D8, size = 0xD0 }, { name = "EnPr2_Init", vram = 0x80A73FA0, size = 0x28C }, - { name = "func_80A759D8", vram = 0x80A759D8, size = 0x68 }, - { name = "func_80A758E8", vram = 0x80A758E8, size = 0x68 }, + { name = "EnPr2_OverrideLimbDraw", vram = 0x80A759D8, size = 0x68 }, + { name = "EnPr2_OverrideLimbDrawOpa", vram = 0x80A758E8, size = 0x68 }, { name = "func_80A74DEC", vram = 0x80A74DEC, size = 0xA4 }, { name = "EnPr2_Update", vram = 0x80A756A8, size = 0x240 }, { name = "EnPr2_Draw", vram = 0x80A75A40, size = 0x17C }, @@ -41831,10 +41831,10 @@ relocs = [ functions = [ { name = "func_80A76388", vram = 0x80A76388, size = 0x60 }, - { name = "func_80A76F70", vram = 0x80A76F70, size = 0x5C }, + { name = "EnPrz_OverrideLimbDraw", vram = 0x80A76F70, size = 0x5C }, { name = "func_80A767A8", vram = 0x80A767A8, size = 0x274 }, { name = "func_80A762C0", vram = 0x80A762C0, size = 0xC8 }, - { name = "func_80A76FCC", vram = 0x80A76FCC, size = 0x74 }, + { name = "EnPrz_PostLimbDraw", vram = 0x80A76FCC, size = 0x74 }, { name = "func_80A75FA4", vram = 0x80A75FA4, size = 0xCC }, { name = "EnPrz_Update", vram = 0x80A76D48, size = 0x228 }, { name = "func_80A76070", vram = 0x80A76070, size = 0x250 }, @@ -41847,7 +41847,7 @@ functions = [ { name = "func_80A76604", vram = 0x80A76604, size = 0x30 }, { name = "func_80A76A1C", vram = 0x80A76A1C, size = 0xF8 }, { name = "EnPrz_Destroy", vram = 0x80A75F08, size = 0x10 }, - { name = "func_80A75F18", vram = 0x80A75F18, size = 0x8C }, + { name = "EnPrz_ChangeAnim", vram = 0x80A75F18, size = 0x8C }, ] # Autogenerated from an ELF via N64Recomp @@ -42037,51 +42037,51 @@ relocs = [ ] functions = [ - { name = "func_80A78E8C", vram = 0x80A78E8C, size = 0x78 }, - { name = "func_80A7998C", vram = 0x80A7998C, size = 0xF8 }, - { name = "func_80A79038", vram = 0x80A79038, size = 0xAC }, - { name = "func_80A7A124", vram = 0x80A7A124, size = 0x1C8 }, - { name = "func_80A78F80", vram = 0x80A78F80, size = 0xB8 }, - { name = "func_80A7A360", vram = 0x80A7A360, size = 0x2BC }, - { name = "func_80A79364", vram = 0x80A79364, size = 0xEC }, - { name = "func_80A78588", vram = 0x80A78588, size = 0x5C }, - { name = "func_80A79300", vram = 0x80A79300, size = 0x64 }, - { name = "func_80A78868", vram = 0x80A78868, size = 0x208 }, - { name = "func_80A778F8", vram = 0x80A778F8, size = 0xC90 }, - { name = "func_80A77880", vram = 0x80A77880, size = 0x58 }, - { name = "func_80A79450", vram = 0x80A79450, size = 0x78 }, - { name = "func_80A794C8", vram = 0x80A794C8, size = 0x5C }, - { name = "func_80A7A2EC", vram = 0x80A7A2EC, size = 0x74 }, - { name = "func_80A79524", vram = 0x80A79524, size = 0xDC }, - { name = "func_80A778D8", vram = 0x80A778D8, size = 0x20 }, - { name = "func_80A776E0", vram = 0x80A776E0, size = 0xB0 }, - { name = "func_80A78F04", vram = 0x80A78F04, size = 0x7C }, - { name = "func_80A78B04", vram = 0x80A78B04, size = 0x6C }, - { name = "func_80A77790", vram = 0x80A77790, size = 0xF0 }, - { name = "func_80A78ACC", vram = 0x80A78ACC, size = 0x38 }, - { name = "func_80A79BA0", vram = 0x80A79BA0, size = 0x530 }, - { name = "func_80A78C7C", vram = 0x80A78C7C, size = 0x210 }, - { name = "func_80A787FC", vram = 0x80A787FC, size = 0x6C }, - { name = "func_80A7980C", vram = 0x80A7980C, size = 0x58 }, + { name = "EnJso2_SetupTeleport", vram = 0x80A78E8C, size = 0x78 }, + { name = "EnJso2_SetupDead", vram = 0x80A7998C, size = 0xF8 }, + { name = "EnJso2_FallFromTeleport", vram = 0x80A79038, size = 0xAC }, + { name = "EnJso2_BlowUp", vram = 0x80A7A124, size = 0x1C8 }, + { name = "EnJso2_SetupFallFromTeleport", vram = 0x80A78F80, size = 0xB8 }, + { name = "EnJso2_UpdateDamage", vram = 0x80A7A360, size = 0x2BC }, + { name = "EnJso2_SpinAttack", vram = 0x80A79364, size = 0xEC }, + { name = "EnJso2_SetupAppear", vram = 0x80A78588, size = 0x5C }, + { name = "EnJso2_SetupSpinAttack", vram = 0x80A79300, size = 0x64 }, + { name = "EnJso2_CirclePlayer", vram = 0x80A78868, size = 0x208 }, + { name = "EnJso2_IntroCutscene", vram = 0x80A778F8, size = 0xC90 }, + { name = "EnJso2_ShouldAdvanceMessage", vram = 0x80A77880, size = 0x58 }, + { name = "EnJso2_SetupWaitAfterSlash", vram = 0x80A79450, size = 0x78 }, + { name = "EnJso2_WaitAfterSlash", vram = 0x80A794C8, size = 0x5C }, + { name = "EnJso2_FadeAway", vram = 0x80A7A2EC, size = 0x74 }, + { name = "EnJso2_SetupStunned", vram = 0x80A79524, size = 0xDC }, + { name = "EnJso2_SetupIntroCutscene", vram = 0x80A778D8, size = 0x20 }, + { name = "EnJso2_ChangeAnim", vram = 0x80A776E0, size = 0xB0 }, + { name = "EnJso2_Teleport", vram = 0x80A78F04, size = 0x7C }, + { name = "EnJso2_SetupSpinBeforeAttack", vram = 0x80A78B04, size = 0x6C }, + { name = "EnJso2_UpdateSubCam", vram = 0x80A77790, size = 0xF0 }, + { name = "EnJso2_Guard", vram = 0x80A78ACC, size = 0x38 }, + { name = "EnJso2_DeathCutscene", vram = 0x80A79BA0, size = 0x530 }, + { name = "EnJso2_DashAttack", vram = 0x80A78C7C, size = 0x210 }, + { name = "EnJso2_SetupCirclePlayer", vram = 0x80A787FC, size = 0x6C }, + { name = "EnJso2_Damaged", vram = 0x80A7980C, size = 0x58 }, { name = "EnJso2_Destroy", vram = 0x80A77664, size = 0x7C }, - { name = "func_80A7AA9C", vram = 0x80A7AA9C, size = 0x50C }, - { name = "func_80A78C08", vram = 0x80A78C08, size = 0x74 }, - { name = "func_80A79B60", vram = 0x80A79B60, size = 0x40 }, - { name = "func_80A798C8", vram = 0x80A798C8, size = 0xC4 }, - { name = "func_80A78B70", vram = 0x80A78B70, size = 0x98 }, - { name = "func_80A790E4", vram = 0x80A790E4, size = 0xB8 }, - { name = "func_80A78A70", vram = 0x80A78A70, size = 0x5C }, - { name = "func_80A7A0D0", vram = 0x80A7A0D0, size = 0x54 }, - { name = "func_80A785E4", vram = 0x80A785E4, size = 0x218 }, - { name = "func_80A79600", vram = 0x80A79600, size = 0xBC }, + { name = "EnJso2_PostLimbDraw", vram = 0x80A7AA9C, size = 0x50C }, + { name = "EnJso2_SetupDashAttack", vram = 0x80A78C08, size = 0x74 }, + { name = "EnJso2_SetupDeathCutscene", vram = 0x80A79B60, size = 0x40 }, + { name = "EnJso2_JumpBack", vram = 0x80A798C8, size = 0xC4 }, + { name = "EnJso2_SpinBeforeAttack", vram = 0x80A78B70, size = 0x98 }, + { name = "EnJso2_SetupSlash", vram = 0x80A790E4, size = 0xB8 }, + { name = "EnJso2_SetupGuard", vram = 0x80A78A70, size = 0x5C }, + { name = "EnJso2_SetupBlowUp", vram = 0x80A7A0D0, size = 0x54 }, + { name = "EnJso2_Appear", vram = 0x80A785E4, size = 0x218 }, + { name = "EnJso2_Stunned", vram = 0x80A79600, size = 0xBC }, { name = "EnJso2_Draw", vram = 0x80A7AFA8, size = 0x548 }, - { name = "func_80A796BC", vram = 0x80A796BC, size = 0x150 }, - { name = "func_80A7919C", vram = 0x80A7919C, size = 0x164 }, + { name = "EnJso2_SetupDamaged", vram = 0x80A796BC, size = 0x150 }, + { name = "EnJso2_Slash", vram = 0x80A7919C, size = 0x164 }, { name = "EnJso2_Update", vram = 0x80A7A61C, size = 0x42C }, - { name = "func_80A79864", vram = 0x80A79864, size = 0x64 }, + { name = "EnJso2_SetupJumpBack", vram = 0x80A79864, size = 0x64 }, { name = "EnJso2_Init", vram = 0x80A773C0, size = 0x2A4 }, - { name = "func_80A79A84", vram = 0x80A79A84, size = 0xDC }, - { name = "func_80A7AA48", vram = 0x80A7AA48, size = 0x54 }, + { name = "EnJso2_Dead", vram = 0x80A79A84, size = 0xDC }, + { name = "EnJso2_OverrideLimbDraw", vram = 0x80A7AA48, size = 0x54 }, ] # Autogenerated from an ELF via N64Recomp @@ -43498,7 +43498,7 @@ functions = [ { name = "func_80A94A30", vram = 0x80A94A30, size = 0x34 }, { name = "func_80A97C0C", vram = 0x80A97C0C, size = 0x18 }, { name = "func_80A95CEC", vram = 0x80A95CEC, size = 0xB4 }, - { name = "func_80A98E48", vram = 0x80A98E48, size = 0xB4 }, + { name = "EnAz_PostLimbDraw", vram = 0x80A98E48, size = 0xB4 }, { name = "EnAz_Init", vram = 0x80A94C2C, size = 0x838 }, { name = "func_80A97E48", vram = 0x80A97E48, size = 0x64 }, { name = "func_80A94B20", vram = 0x80A94B20, size = 0x78 }, @@ -43531,7 +43531,7 @@ functions = [ { name = "func_80A95C5C", vram = 0x80A95C5C, size = 0x90 }, { name = "func_80A979DC", vram = 0x80A979DC, size = 0x18 }, { name = "func_80A95534", vram = 0x80A95534, size = 0x128 }, - { name = "func_80A98DA4", vram = 0x80A98DA4, size = 0xA4 }, + { name = "EnAz_OverrideLimbDraw", vram = 0x80A98DA4, size = 0xA4 }, ] # Autogenerated from an ELF via N64Recomp @@ -44046,12 +44046,12 @@ functions = [ { name = "DmStk_ClockTower_DoNothing", vram = 0x80AA16F4, size = 0x10 }, { name = "DmStk_PlaySfxForPlayingWithFairiesCutscene", vram = 0x80AA066C, size = 0xB0 }, { name = "DmStk_ClockTower_WaitForIntroCutsceneVersion2ToEnd", vram = 0x80AA19EC, size = 0x64 }, - { name = "DmStk_OverrideLimbDraw", vram = 0x80AA2B14, size = 0xAC }, + { name = "DmStk_OverrideLimbDrawOpa", vram = 0x80AA2B14, size = 0xAC }, { name = "DmStk_PlaySfxForTitleCutscene", vram = 0x80AA00CC, size = 0x34 }, { name = "DmStk_UpdateCollision", vram = 0x80AA26CC, size = 0x54 }, { name = "DmStk_PlaySfxForIntroCutsceneFirstPart", vram = 0x80A9FED8, size = 0x1F4 }, { name = "DmStk_PlaySfxForDroppingOcarinaCutscene", vram = 0x80AA05F0, size = 0x44 }, - { name = "DmStk_PostLimbDraw2", vram = 0x80AA2BC0, size = 0x7E4 }, + { name = "DmStk_PostLimbDraw", vram = 0x80AA2BC0, size = 0x7E4 }, { name = "DmStk_PlaySfxForEndingCutsceneFirstPart", vram = 0x80AA071C, size = 0x50 }, { name = "DmStk_PlaySfxForIntroCutsceneSecondPart", vram = 0x80AA0100, size = 0x58 }, { name = "DmStk_PlaySfxForClockTowerIntroCutsceneVersion2", vram = 0x80AA09DC, size = 0x12C }, @@ -44070,7 +44070,7 @@ functions = [ { name = "DmStk_ClockTower_Idle", vram = 0x80AA27EC, size = 0x98 }, { name = "DmStk_HandleCutscene", vram = 0x80AA1D1C, size = 0x9B0 }, { name = "DmStk_PlaySfxForCutsceneAfterPlayingOathToOrder", vram = 0x80AA0B08, size = 0x2A0 }, - { name = "DmStk_PostLimbDraw", vram = 0x80AA33A4, size = 0x28 }, + { name = "DmStk_PostLimbDrawOpa", vram = 0x80AA33A4, size = 0x28 }, { name = "DmStk_LoadObjectForAnimation", vram = 0x80A9FDB0, size = 0x8C }, { name = "DmStk_ChangeAnim", vram = 0x80A9FE3C, size = 0x9C }, { name = "DmStk_ClockTower_DeflectHit", vram = 0x80AA1B9C, size = 0xC8 }, @@ -47153,7 +47153,7 @@ functions = [ { name = "EnOsn_OverrideLimbDraw", vram = 0x80AD1DA8, size = 0x80 }, { name = "EnOsn_LookFromMask", vram = 0x80AD0A24, size = 0x8C }, { name = "EnOsn_GetInitialMaskText", vram = 0x80AD0B38, size = 0x2D8 }, - { name = "EnOsn_HandleCsAction", vram = 0x80AD16A8, size = 0x2F8 }, + { name = "EnOsn_HandleCutscene", vram = 0x80AD16A8, size = 0x2F8 }, { name = "EnOsn_Init", vram = 0x80AD1A5C, size = 0x22C }, { name = "EnOsn_Destroy", vram = 0x80AD1C88, size = 0x40 }, { name = "EnOsn_FadeOut", vram = 0x80AD0AB0, size = 0x88 }, @@ -47284,7 +47284,7 @@ functions = [ { name = "EnTrt2_OverrideLimbDraw", vram = 0x80AD54C8, size = 0xBC }, { name = "func_80AD341C", vram = 0x80AD341C, size = 0x80 }, { name = "func_80AD4298", vram = 0x80AD4298, size = 0x84 }, - { name = "func_80AD475C", vram = 0x80AD475C, size = 0x19C }, + { name = "EnTrt2_HasReachedPoint", vram = 0x80AD475C, size = 0x19C }, { name = "func_80AD431C", vram = 0x80AD431C, size = 0x30 }, { name = "func_80AD3C94", vram = 0x80AD3C94, size = 0x58 }, { name = "func_80AD5234", vram = 0x80AD5234, size = 0x160 }, @@ -48016,7 +48016,7 @@ functions = [ { name = "EnSellnuts_OverrideLimbDraw", vram = 0x80ADD4E0, size = 0x2D4 }, { name = "func_80ADCD3C", vram = 0x80ADCD3C, size = 0x110 }, { name = "func_80ADCA64", vram = 0x80ADCA64, size = 0x1A0 }, - { name = "func_80ADCE4C", vram = 0x80ADCE4C, size = 0x19C }, + { name = "EnSellnuts_HasReachedPoint", vram = 0x80ADCE4C, size = 0x19C }, { name = "EnSellnuts_PostLimbDraw", vram = 0x80ADD7B4, size = 0x18 }, { name = "func_80ADB4F4", vram = 0x80ADB4F4, size = 0x50 }, { name = "func_80ADBD64", vram = 0x80ADBD64, size = 0x11C }, @@ -48929,7 +48929,7 @@ functions = [ { name = "EnLiftNuts_GetNumDaysWon", vram = 0x80AE9B8C, size = 0x40 }, { name = "EnLiftNuts_HandleConversation5", vram = 0x80AEA910, size = 0x2E0 }, { name = "EnLiftNuts_RiseUp", vram = 0x80AEA128, size = 0x78 }, - { name = "EnLiftNuts_SetupMovePlayer", vram = 0x80AEAF8C, size = 0x14 }, + { name = "EnLiftNuts_SetupMovePlayerToActor", vram = 0x80AEAF8C, size = 0x14 }, { name = "EnLiftNuts_UpdateCollision", vram = 0x80AEBB30, size = 0x44 }, { name = "EnLiftNuts_IdleHidden", vram = 0x80AE9F70, size = 0x58 }, { name = "EnLiftNuts_PostLimbDraw", vram = 0x80AEBC90, size = 0x40 }, @@ -48943,7 +48943,7 @@ functions = [ { name = "EnLiftNuts_Idle", vram = 0x80AEA1A0, size = 0x604 }, { name = "EnLiftNuts_HandleConversation", vram = 0x80AEACF8, size = 0x1B4 }, { name = "EnLiftNuts_SetupIdleHidden", vram = 0x80AE9F28, size = 0x48 }, - { name = "EnLiftNuts_MovePlayer", vram = 0x80AEAFA0, size = 0x174 }, + { name = "EnLiftNuts_MovePlayerToActor", vram = 0x80AEAFA0, size = 0x174 }, { name = "EnLiftNuts_EndGame", vram = 0x80AEB428, size = 0x15C }, { name = "EnLiftNuts_Draw", vram = 0x80AEBCD0, size = 0x60 }, { name = "EnLiftNuts_SetupEndGame", vram = 0x80AEB3E0, size = 0x48 }, @@ -49435,44 +49435,44 @@ relocs = [ ] functions = [ - { name = "func_80AF19A8", vram = 0x80AF19A8, size = 0x84 }, - { name = "func_80AF2938", vram = 0x80AF2938, size = 0x88 }, + { name = "EnTest7_StartWarpCs", vram = 0x80AF19A8, size = 0x84 }, + { name = "EnTest7_SetupArriveCs", vram = 0x80AF2938, size = 0x88 }, { name = "EnTest7_Destroy", vram = 0x80AF1960, size = 0x48 }, { name = "EnTest7_Init", vram = 0x80AF175C, size = 0x204 }, - { name = "func_80AF118C", vram = 0x80AF118C, size = 0x370 }, - { name = "func_80AF21E8", vram = 0x80AF21E8, size = 0x130 }, - { name = "func_80AF2EC8", vram = 0x80AF2EC8, size = 0xD0 }, - { name = "func_80AF10D8", vram = 0x80AF10D8, size = 0xB4 }, + { name = "EnTest7_UpdateFeathers", vram = 0x80AF118C, size = 0x370 }, + { name = "EnTest7_WarpCsPart6", vram = 0x80AF21E8, size = 0x130 }, + { name = "EnTest7_StartArriveCsSkip", vram = 0x80AF2EC8, size = 0xD0 }, + { name = "EnTest7_UpdateFeatherType2", vram = 0x80AF10D8, size = 0xB4 }, { name = "EnTest7_Draw", vram = 0x80AF3248, size = 0x1A0 }, - { name = "func_80AF2F98", vram = 0x80AF2F98, size = 0x15C }, - { name = "func_80AF0C30", vram = 0x80AF0C30, size = 0xAC }, - { name = "func_80AF1B68", vram = 0x80AF1B68, size = 0x138 }, - { name = "func_80AF2350", vram = 0x80AF2350, size = 0x188 }, - { name = "func_80AF2BAC", vram = 0x80AF2BAC, size = 0x9C }, - { name = "func_80AF2318", vram = 0x80AF2318, size = 0x38 }, - { name = "func_80AF2C48", vram = 0x80AF2C48, size = 0x16C }, - { name = "func_80AF1CA0", vram = 0x80AF1CA0, size = 0x1A4 }, - { name = "func_80AF2854", vram = 0x80AF2854, size = 0xE4 }, - { name = "func_80AF2AE8", vram = 0x80AF2AE8, size = 0xC4 }, + { name = "EnTest7_ArriveCsPart2", vram = 0x80AF2F98, size = 0x15C }, + { name = "EnTest7_AddAndChooseFeather", vram = 0x80AF0C30, size = 0xAC }, + { name = "EnTest7_UpdateGrowingWindCapsule", vram = 0x80AF1B68, size = 0x138 }, + { name = "EnTest7_WarpCsWarp", vram = 0x80AF2350, size = 0x188 }, + { name = "EnTest7_UpdateSubCamArrivalCs2", vram = 0x80AF2BAC, size = 0x9C }, + { name = "EnTest7_WarpCsWait", vram = 0x80AF2318, size = 0x38 }, + { name = "EnTest7_ArriveCsPart1", vram = 0x80AF2C48, size = 0x16C }, + { name = "EnTest7_WarpCsPart2", vram = 0x80AF1CA0, size = 0x1A4 }, + { name = "EnTest7_PlayerAndSubCamAction", vram = 0x80AF2854, size = 0xE4 }, + { name = "EnTest7_StartArriveCs", vram = 0x80AF2AE8, size = 0xC4 }, { name = "EnTest7_Update", vram = 0x80AF3144, size = 0x8C }, - { name = "func_80AF2DB4", vram = 0x80AF2DB4, size = 0x114 }, - { name = "func_80AF0CDC", vram = 0x80AF0CDC, size = 0x3FC }, - { name = "func_80AF24D8", vram = 0x80AF24D8, size = 0x17C }, - { name = "func_80AF14FC", vram = 0x80AF14FC, size = 0x234 }, - { name = "func_80AF29C0", vram = 0x80AF29C0, size = 0x128 }, - { name = "func_80AF2654", vram = 0x80AF2654, size = 0x1B4 }, - { name = "func_80AF0838", vram = 0x80AF0838, size = 0x14C }, - { name = "func_80AF0984", vram = 0x80AF0984, size = 0x2AC }, - { name = "func_80AF082C", vram = 0x80AF082C, size = 0xC }, - { name = "func_80AF1730", vram = 0x80AF1730, size = 0x2C }, - { name = "func_80AF1A2C", vram = 0x80AF1A2C, size = 0x13C }, - { name = "func_80AF1E44", vram = 0x80AF1E44, size = 0x104 }, + { name = "EnTest7_UpdateSubCamArrivalCs3", vram = 0x80AF2DB4, size = 0x114 }, + { name = "EnTest7_UpdateFeatherType1", vram = 0x80AF0CDC, size = 0x3FC }, + { name = "EnTest7_UpdateSubCamWarpCs2", vram = 0x80AF24D8, size = 0x17C }, + { name = "EnTest7_DrawFeathers", vram = 0x80AF14FC, size = 0x234 }, + { name = "EnTest7_UpdateSubCamArrivalCs1", vram = 0x80AF29C0, size = 0x128 }, + { name = "EnTest7_UpdateSubCamWarpCs1", vram = 0x80AF2654, size = 0x1B4 }, + { name = "EnTest7_InitFeathers", vram = 0x80AF0838, size = 0x14C }, + { name = "EnTest7_AddFeather", vram = 0x80AF0984, size = 0x2AC }, + { name = "EnTest7_SetupAction", vram = 0x80AF082C, size = 0xC }, + { name = "EnTest7_InitWindCapsule", vram = 0x80AF1730, size = 0x2C }, + { name = "EnTest7_WarpCsPart1", vram = 0x80AF1A2C, size = 0x13C }, + { name = "EnTest7_WarpCsPart3", vram = 0x80AF1E44, size = 0x104 }, { name = "func_80AF31D0", vram = 0x80AF31D0, size = 0x78 }, - { name = "EnTest7_SetupAction", vram = 0x80AF0820, size = 0xC }, - { name = "func_80AF1F48", vram = 0x80AF1F48, size = 0xE8 }, - { name = "func_80AF30F4", vram = 0x80AF30F4, size = 0x50 }, - { name = "func_80AF2030", vram = 0x80AF2030, size = 0x1B8 }, - { name = "func_80AF2808", vram = 0x80AF2808, size = 0x4C }, + { name = "EnTest7_SetupPlayerCamFunc", vram = 0x80AF0820, size = 0xC }, + { name = "EnTest7_WarpCsPart4", vram = 0x80AF1F48, size = 0xE8 }, + { name = "EnTest7_ArriveCsPart3", vram = 0x80AF30F4, size = 0x50 }, + { name = "EnTest7_WarpCsPart5", vram = 0x80AF2030, size = 0x1B8 }, + { name = "EnTest7_SpinAndSquishPlayer", vram = 0x80AF2808, size = 0x4C }, ] # Autogenerated from an ELF via N64Recomp @@ -52153,7 +52153,7 @@ functions = [ { name = "EnPp_SetupRoar", vram = 0x80B1F244, size = 0x58 }, { name = "EnPp_Update", vram = 0x80B20B40, size = 0x32C }, { name = "EnPp_Bounced", vram = 0x80B1F188, size = 0xBC }, - { name = "EnPp_BodyPart_Move", vram = 0x80B203BC, size = 0x2AC }, + { name = "EnPp_Fragment_Move", vram = 0x80B203BC, size = 0x2AC }, { name = "EnPp_Mask_Detach", vram = 0x80B20030, size = 0x288 }, { name = "EnPp_SetupDamaged", vram = 0x80B1F770, size = 0x1D0 }, { name = "EnPp_Mask_SetupDetach", vram = 0x80B1FF20, size = 0x110 }, @@ -52161,7 +52161,7 @@ functions = [ { name = "EnPp_Attack", vram = 0x80B1F048, size = 0x5C }, { name = "EnPp_PointlessPosCheck", vram = 0x80B1E29C, size = 0x138 }, { name = "EnPp_PlaySfxForAnimation", vram = 0x80B1E680, size = 0xF8 }, - { name = "EnPp_BodyPart_SetupMove", vram = 0x80B202B8, size = 0x104 }, + { name = "EnPp_Fragment_SetupMove", vram = 0x80B202B8, size = 0x104 }, { name = "EnPp_SetupDead", vram = 0x80B1FAD0, size = 0x1AC }, { name = "EnPp_UpdateDamage", vram = 0x80B20668, size = 0x4D8 }, { name = "EnPp_SetupIdle", vram = 0x80B1E958, size = 0x18 }, @@ -52587,7 +52587,7 @@ functions = [ { name = "func_80B26758", vram = 0x80B26758, size = 0x24C }, { name = "func_80B26AFC", vram = 0x80B26AFC, size = 0xFC }, { name = "func_80B274BC", vram = 0x80B274BC, size = 0x208 }, - { name = "func_80B278C4", vram = 0x80B278C4, size = 0xE8 }, + { name = "EnKendoJs_MovePlayerToPos", vram = 0x80B278C4, size = 0xE8 }, { name = "func_80B27774", vram = 0x80B27774, size = 0xC8 }, { name = "func_80B273D0", vram = 0x80B273D0, size = 0x3C }, { name = "func_80B276D8", vram = 0x80B276D8, size = 0x88 }, @@ -53951,21 +53951,21 @@ relocs = [ functions = [ { name = "EnGg2_Init", vram = 0x80B3B958, size = 0x288 }, - { name = "func_80B3B648", vram = 0x80B3B648, size = 0x19C }, + { name = "EnGg2_HasReachedPoint", vram = 0x80B3B648, size = 0x19C }, { name = "EnGg2_Draw", vram = 0x80B3BE00, size = 0xD8 }, { name = "func_80B3B5D4", vram = 0x80B3B5D4, size = 0x74 }, { name = "func_80B3B120", vram = 0x80B3B120, size = 0xFC }, { name = "EnGg2_Update", vram = 0x80B3BBF0, size = 0x154 }, { name = "func_80B3B8A4", vram = 0x80B3B8A4, size = 0xB4 }, { name = "func_80B3AFB0", vram = 0x80B3AFB0, size = 0xAC }, - { name = "func_80B3BD44", vram = 0x80B3BD44, size = 0x7C }, + { name = "EnGg2_OverrideLimbDraw", vram = 0x80B3BD44, size = 0x7C }, { name = "func_80B3B0A0", vram = 0x80B3B0A0, size = 0x80 }, { name = "func_80B3B294", vram = 0x80B3B294, size = 0x21C }, { name = "func_80B3B4B0", vram = 0x80B3B4B0, size = 0x124 }, { name = "func_80B3ADD8", vram = 0x80B3ADD8, size = 0x88 }, { name = "func_80B3AC94", vram = 0x80B3AC94, size = 0x144 }, { name = "func_80B3B05C", vram = 0x80B3B05C, size = 0x44 }, - { name = "func_80B3BDC0", vram = 0x80B3BDC0, size = 0x40 }, + { name = "EnGg2_PostLimbDraw", vram = 0x80B3BDC0, size = 0x40 }, { name = "func_80B3B21C", vram = 0x80B3B21C, size = 0x78 }, { name = "EnGg2_Destroy", vram = 0x80B3BBE0, size = 0x10 }, { name = "func_80B3AC50", vram = 0x80B3AC50, size = 0x44 }, @@ -55652,7 +55652,7 @@ relocs = [ functions = [ { name = "func_80B51760", vram = 0x80B51760, size = 0x210 }, - { name = "func_80B50C78", vram = 0x80B50C78, size = 0x19C }, + { name = "EnGk_HasReachedPoint", vram = 0x80B50C78, size = 0x19C }, { name = "EnGk_OverrideLimbDraw", vram = 0x80B52AD4, size = 0x1C }, { name = "func_80B51FD0", vram = 0x80B51FD0, size = 0x5C }, { name = "func_80B51B40", vram = 0x80B51B40, size = 0x25C }, @@ -55909,67 +55909,67 @@ relocs = [ ] functions = [ - { name = "func_80B580C0", vram = 0x80B580C0, size = 0x110 }, + { name = "EnAn_Draw", vram = 0x80B580C0, size = 0x110 }, { name = "EnAn_Update", vram = 0x80B57D9C, size = 0x14C }, - { name = "func_80B57A44", vram = 0x80B57A44, size = 0x104 }, + { name = "EnAn_Talk", vram = 0x80B57A44, size = 0x104 }, { name = "EnAn_Init", vram = 0x80B57C9C, size = 0xD4 }, - { name = "func_80B56D28", vram = 0x80B56D28, size = 0x11C }, - { name = "func_80B578F8", vram = 0x80B578F8, size = 0x14C }, - { name = "func_80B577F0", vram = 0x80B577F0, size = 0x108 }, - { name = "func_80B55180", vram = 0x80B55180, size = 0x164 }, - { name = "func_80B53B3C", vram = 0x80B53B3C, size = 0x6C }, - { name = "func_80B552E4", vram = 0x80B552E4, size = 0xC8 }, - { name = "func_80B553AC", vram = 0x80B553AC, size = 0x13C }, - { name = "func_80B54BC4", vram = 0x80B54BC4, size = 0x98 }, - { name = "func_80B575BC", vram = 0x80B575BC, size = 0xB8 }, - { name = "func_80B547C8", vram = 0x80B547C8, size = 0x164 }, - { name = "func_80B54C5C", vram = 0x80B54C5C, size = 0xBC }, - { name = "func_80B54DF4", vram = 0x80B54DF4, size = 0x38C }, - { name = "func_80B539CC", vram = 0x80B539CC, size = 0xB0 }, - { name = "func_80B556F8", vram = 0x80B556F8, size = 0xB4 }, - { name = "func_80B557AC", vram = 0x80B557AC, size = 0xB4 }, - { name = "func_80B53ED4", vram = 0x80B53ED4, size = 0xB0 }, - { name = "func_80B57B48", vram = 0x80B57B48, size = 0x154 }, - { name = "func_80B54750", vram = 0x80B54750, size = 0x78 }, + { name = "EnAn_ProcessScheduleOutput", vram = 0x80B56D28, size = 0x11C }, + { name = "EnAn_FollowSchedule", vram = 0x80B578F8, size = 0x14C }, + { name = "EnAn_FinishInit", vram = 0x80B577F0, size = 0x108 }, + { name = "EnAn_CheckTalk", vram = 0x80B55180, size = 0x164 }, + { name = "EnAn_FindDoor", vram = 0x80B53B3C, size = 0x6C }, + { name = "EnAn_IsCouplesMaskCsPlaying", vram = 0x80B552E4, size = 0xC8 }, + { name = "EnAn_UpdateHeadRot", vram = 0x80B553AC, size = 0x13C }, + { name = "EnAn_MsgEvent_MidnightMeeting", vram = 0x80B54BC4, size = 0x98 }, + { name = "EnAn_HandleSch_WaitingForKafei", vram = 0x80B575BC, size = 0xB8 }, + { name = "EnAn_MsgEvent_ReceiveLetterFromPostman", vram = 0x80B547C8, size = 0x164 }, + { name = "EnAn_MsgEvent_Cooking", vram = 0x80B54C5C, size = 0xBC }, + { name = "EnAn_GetMsgEventScript", vram = 0x80B54DF4, size = 0x38C }, + { name = "EnAn_FindActor", vram = 0x80B539CC, size = 0xB0 }, + { name = "EnAn_DialogueFunc_80B556F8", vram = 0x80B556F8, size = 0xB4 }, + { name = "EnAn_DialogueFunc_80B557AC", vram = 0x80B557AC, size = 0xB4 }, + { name = "EnAn_UpdateCollider", vram = 0x80B53ED4, size = 0xB0 }, + { name = "EnAn_HandleCouplesMaskCutscene", vram = 0x80B57B48, size = 0x154 }, + { name = "EnAn_GetChildCsId", vram = 0x80B54750, size = 0x78 }, { name = "func_80B53A7C", vram = 0x80B53A7C, size = 0xC0 }, - { name = "func_80B56B00", vram = 0x80B56B00, size = 0xC0 }, - { name = "func_80B54124", vram = 0x80B54124, size = 0x554 }, - { name = "func_80B56E44", vram = 0x80B56E44, size = 0x70 }, - { name = "func_80B561A4", vram = 0x80B561A4, size = 0x274 }, - { name = "func_80B56744", vram = 0x80B56744, size = 0x13C }, - { name = "func_80B57EE8", vram = 0x80B57EE8, size = 0xDC }, - { name = "func_80B573F4", vram = 0x80B573F4, size = 0x1C8 }, + { name = "EnAn_ProcessSchedule_Ranch", vram = 0x80B56B00, size = 0xC0 }, + { name = "EnAn_DrawAccessory", vram = 0x80B54124, size = 0x554 }, + { name = "EnAn_HandleSch_InteractActor", vram = 0x80B56E44, size = 0x70 }, + { name = "EnAn_ProcessSchedule_Door", vram = 0x80B561A4, size = 0x274 }, + { name = "EnAn_ProcessSchedule_Sweeping", vram = 0x80B56744, size = 0x13C }, + { name = "EnAn_PostLimbDraw", vram = 0x80B57EE8, size = 0xDC }, + { name = "EnAn_HandleSch_LaundryPool", vram = 0x80B573F4, size = 0x1C8 }, { name = "func_80B55D98", vram = 0x80B55D98, size = 0x134 }, - { name = "func_80B55ECC", vram = 0x80B55ECC, size = 0xC0 }, - { name = "func_80B54D18", vram = 0x80B54D18, size = 0xDC }, - { name = "func_80B56094", vram = 0x80B56094, size = 0x88 }, - { name = "func_80B572D4", vram = 0x80B572D4, size = 0x120 }, - { name = "func_80B53F84", vram = 0x80B53F84, size = 0x1A0 }, - { name = "func_80B57FC4", vram = 0x80B57FC4, size = 0xFC }, - { name = "func_80B57674", vram = 0x80B57674, size = 0xA4 }, - { name = "func_80B5611C", vram = 0x80B5611C, size = 0x88 }, - { name = "func_80B55D20", vram = 0x80B55D20, size = 0x78 }, - { name = "func_80B53840", vram = 0x80B53840, size = 0x18C }, - { name = "func_80B5702C", vram = 0x80B5702C, size = 0x2A8 }, - { name = "func_80B555C8", vram = 0x80B555C8, size = 0x130 }, - { name = "func_80B5492C", vram = 0x80B5492C, size = 0x168 }, - { name = "func_80B5600C", vram = 0x80B5600C, size = 0x88 }, - { name = "func_80B57718", vram = 0x80B57718, size = 0xD8 }, + { name = "EnAn_IsFacingAndNearPlayer", vram = 0x80B55ECC, size = 0xC0 }, + { name = "EnAn_MsgEvent_LaundryPool", vram = 0x80B54D18, size = 0xDC }, + { name = "EnAn_ProcessSchedule_AttendGoron", vram = 0x80B56094, size = 0x88 }, + { name = "EnAn_HandleSch_80B572D4", vram = 0x80B572D4, size = 0x120 }, + { name = "EnAn_UpdateFace", vram = 0x80B53F84, size = 0x1A0 }, + { name = "EnAn_TransformLimbDraw", vram = 0x80B57FC4, size = 0xFC }, + { name = "EnAn_HandleSch_WithKafei", vram = 0x80B57674, size = 0xA4 }, + { name = "EnAn_ProcessSchedule_GiveLunchToGranny", vram = 0x80B5611C, size = 0x88 }, + { name = "EnAn_FindLookAtActor", vram = 0x80B55D20, size = 0x78 }, + { name = "EnAn_InitObjectSlots", vram = 0x80B53840, size = 0x18C }, + { name = "EnAn_HandleSch_FollowTimePath", vram = 0x80B5702C, size = 0x2A8 }, + { name = "EnAn_ChooseAnimAfterTalking", vram = 0x80B555C8, size = 0x130 }, + { name = "EnAn_MsgEvent_AttendGoron", vram = 0x80B5492C, size = 0x168 }, + { name = "EnAn_ProcessSchedule_ReceiveLetterFromPostman", vram = 0x80B5600C, size = 0x88 }, + { name = "EnAn_HandleSchedule", vram = 0x80B57718, size = 0xD8 }, { name = "EnAn_Destroy", vram = 0x80B57D70, size = 0x2C }, - { name = "func_80B56EB4", vram = 0x80B56EB4, size = 0x178 }, - { name = "func_80B55860", vram = 0x80B55860, size = 0xB4 }, - { name = "func_80B54678", vram = 0x80B54678, size = 0x7C }, - { name = "func_80B56418", vram = 0x80B56418, size = 0x32C }, - { name = "func_80B55914", vram = 0x80B55914, size = 0x40C }, - { name = "func_80B554E8", vram = 0x80B554E8, size = 0xE0 }, - { name = "func_80B53BA8", vram = 0x80B53BA8, size = 0x140 }, - { name = "func_80B56CAC", vram = 0x80B56CAC, size = 0x7C }, - { name = "func_80B54A94", vram = 0x80B54A94, size = 0x130 }, + { name = "EnAn_HandleSch_Door", vram = 0x80B56EB4, size = 0x178 }, + { name = "EnAn_DialogueFunc_80B55860", vram = 0x80B55860, size = 0xB4 }, + { name = "EnAn_ChangeCutscene", vram = 0x80B54678, size = 0x7C }, + { name = "EnAn_ProcessSchedule_Walking", vram = 0x80B56418, size = 0x32C }, + { name = "EnAn_HandleDialogue", vram = 0x80B55914, size = 0x40C }, + { name = "EnAn_UpdateAttention", vram = 0x80B554E8, size = 0xE0 }, + { name = "EnAn_UpdateSkelAnime", vram = 0x80B53BA8, size = 0x140 }, + { name = "EnAn_ProcessSchedule_WithKafei", vram = 0x80B56CAC, size = 0x7C }, + { name = "EnAn_MsgEvent_GiveLunchToGranny", vram = 0x80B54A94, size = 0x130 }, { name = "func_80B55F8C", vram = 0x80B55F8C, size = 0x80 }, - { name = "func_80B546F4", vram = 0x80B546F4, size = 0x5C }, - { name = "func_80B53CE8", vram = 0x80B53CE8, size = 0x1EC }, - { name = "func_80B56880", vram = 0x80B56880, size = 0x280 }, - { name = "func_80B56BC0", vram = 0x80B56BC0, size = 0xEC }, + { name = "EnAn_GetCsId", vram = 0x80B546F4, size = 0x5C }, + { name = "EnAn_ChangeAnim", vram = 0x80B53CE8, size = 0x1EC }, + { name = "EnAn_ProcessSchedule_80B56880", vram = 0x80B56880, size = 0x280 }, + { name = "EnAn_ProcessSchedule_StaffRoom", vram = 0x80B56BC0, size = 0xEC }, ] # Autogenerated from an ELF via N64Recomp @@ -56211,7 +56211,7 @@ functions = [ { name = "EnOt_Init", vram = 0x80B5B3E4, size = 0x680 }, { name = "EnOt_ActorPathing_UpdateActorInfo", vram = 0x80B5D470, size = 0x1D8 }, { name = "func_80B5CB0C", vram = 0x80B5CB0C, size = 0x94 }, - { name = "func_80B5BB38", vram = 0x80B5BB38, size = 0x270 }, + { name = "EnOt_LerpColor", vram = 0x80B5BB38, size = 0x270 }, { name = "func_80B5CD40", vram = 0x80B5CD40, size = 0x12C }, { name = "func_80B5C684", vram = 0x80B5C684, size = 0x58 }, { name = "func_80B5BF60", vram = 0x80B5BF60, size = 0x58 }, @@ -57689,7 +57689,7 @@ functions = [ { name = "EnJg_GetNextTextId", vram = 0x80B74E5C, size = 0x244 }, { name = "EnJg_Init", vram = 0x80B753A0, size = 0x1C4 }, { name = "EnJg_LullabyIntroCutsceneAction", vram = 0x80B74BC8, size = 0x294 }, - { name = "EnJg_ReachedPoint", vram = 0x80B73C58, size = 0x19C }, + { name = "EnJg_HasReachedPoint", vram = 0x80B73C58, size = 0x19C }, { name = "EnJg_CheckIfTalkingToPlayerAndHandleFreezeTimer", vram = 0x80B751F8, size = 0x1A8 }, { name = "EnJg_GoronShrineTalk", vram = 0x80B74134, size = 0xC4 }, { name = "EnJg_GetWalkingYRotation", vram = 0x80B73B98, size = 0xC0 }, @@ -57773,7 +57773,7 @@ functions = [ { name = "func_80B76440", vram = 0x80B76440, size = 0x100 }, { name = "EnTruMt_Update", vram = 0x80B76E48, size = 0x8C }, { name = "func_80B76924", vram = 0x80B76924, size = 0x5C }, - { name = "func_80B76600", vram = 0x80B76600, size = 0x19C }, + { name = "EnTruMt_HasReachedPoint", vram = 0x80B76600, size = 0x19C }, { name = "func_80B768F0", vram = 0x80B768F0, size = 0x34 }, { name = "EnTruMt_OverrideLimbDraw", vram = 0x80B77008, size = 0x70 }, ] @@ -59391,11 +59391,11 @@ functions = [ { name = "func_80B93EA0", vram = 0x80B93EA0, size = 0x500 }, { name = "func_80B943C0", vram = 0x80B943C0, size = 0x2C }, { name = "func_80B93D2C", vram = 0x80B93D2C, size = 0xBC }, - { name = "func_80B95598", vram = 0x80B95598, size = 0xD0 }, + { name = "EnZog_PostLimbDraw", vram = 0x80B95598, size = 0xD0 }, { name = "func_80B948A8", vram = 0x80B948A8, size = 0x158 }, { name = "func_80B9461C", vram = 0x80B9461C, size = 0x98 }, { name = "func_80B9451C", vram = 0x80B9451C, size = 0x100 }, - { name = "EnZog_PostLimbDraw", vram = 0x80B954C4, size = 0xD4 }, + { name = "EnZog_PostLimbDrawOpa", vram = 0x80B954C4, size = 0xD4 }, { name = "func_80B94E34", vram = 0x80B94E34, size = 0x2F4 }, { name = "func_80B946FC", vram = 0x80B946FC, size = 0x1AC }, { name = "func_80B943EC", vram = 0x80B943EC, size = 0x84 }, @@ -60128,12 +60128,12 @@ functions = [ { name = "func_80BA0CF4", vram = 0x80BA0CF4, size = 0x70 }, { name = "func_80B9FDDC", vram = 0x80B9FDDC, size = 0x40 }, { name = "func_80B9FC0C", vram = 0x80B9FC0C, size = 0x64 }, - { name = "func_80BA0F64", vram = 0x80BA0F64, size = 0x48 }, + { name = "EnZob_OverrideLimbDraw", vram = 0x80BA0F64, size = 0x48 }, { name = "func_80B9FF20", vram = 0x80B9FF20, size = 0x60 }, { name = "func_80B9FC70", vram = 0x80B9FC70, size = 0x30 }, { name = "EnZob_Draw", vram = 0x80BA0FEC, size = 0xC4 }, { name = "func_80BA0318", vram = 0x80BA0318, size = 0x5C }, - { name = "func_80BA0FAC", vram = 0x80BA0FAC, size = 0x40 }, + { name = "EnZob_PostLimbDraw", vram = 0x80BA0FAC, size = 0x40 }, { name = "EnZob_Destroy", vram = 0x80B9F7B8, size = 0x2C }, { name = "func_80BA0374", vram = 0x80BA0374, size = 0x29C }, { name = "func_80BA0BB4", vram = 0x80BA0BB4, size = 0x60 }, @@ -60988,7 +60988,7 @@ functions = [ { name = "func_80BABDD8", vram = 0x80BABDD8, size = 0x18C }, { name = "func_80BAAB78", vram = 0x80BAAB78, size = 0x3A4 }, { name = "func_80BAD7F8", vram = 0x80BAD7F8, size = 0x210 }, - { name = "func_80BAB8F4", vram = 0x80BAB8F4, size = 0x19C }, + { name = "EnSuttari_HasReachedPointReverse", vram = 0x80BAB8F4, size = 0x19C }, { name = "func_80BABFD4", vram = 0x80BABFD4, size = 0x24C }, { name = "EnSuttari_TransformLimbDraw", vram = 0x80BAE524, size = 0x14 }, { name = "func_80BABF64", vram = 0x80BABF64, size = 0x70 }, @@ -61027,7 +61027,7 @@ functions = [ { name = "func_80BAAF1C", vram = 0x80BAAF1C, size = 0xC0 }, { name = "EnSuttari_UpdateCollider", vram = 0x80BAA6D0, size = 0x178 }, { name = "func_80BAD004", vram = 0x80BAD004, size = 0x12C }, - { name = "func_80BAB758", vram = 0x80BAB758, size = 0x19C }, + { name = "EnSuttari_HasReachedPointForward", vram = 0x80BAB758, size = 0x19C }, { name = "func_80BABC48", vram = 0x80BABC48, size = 0x190 }, { name = "func_80BACE4C", vram = 0x80BACE4C, size = 0x94 }, { name = "func_80BAC220", vram = 0x80BAC220, size = 0xDC }, @@ -61806,7 +61806,7 @@ relocs = [ functions = [ { name = "func_80BBB574", vram = 0x80BBB574, size = 0x1A4 }, { name = "EnZos_ChangeAnim", vram = 0x80BBAE84, size = 0xD8 }, - { name = "func_80BBC4E4", vram = 0x80BBC4E4, size = 0x1C }, + { name = "EnZos_OverrideLimbDraw", vram = 0x80BBC4E4, size = 0x1C }, { name = "EnZos_Init", vram = 0x80BBACA0, size = 0x1C0 }, { name = "func_80BBAF5C", vram = 0x80BBAF5C, size = 0xA0 }, { name = "func_80BBC070", vram = 0x80BBC070, size = 0xDC }, @@ -61823,7 +61823,7 @@ functions = [ { name = "func_80BBBB84", vram = 0x80BBBB84, size = 0x138 }, { name = "func_80BBC24C", vram = 0x80BBC24C, size = 0x4C }, { name = "func_80BBBCBC", vram = 0x80BBBCBC, size = 0xA0 }, - { name = "func_80BBC500", vram = 0x80BBC500, size = 0x40 }, + { name = "EnZos_PostLimbDraw", vram = 0x80BBC500, size = 0x40 }, { name = "func_80BBBDE0", vram = 0x80BBBDE0, size = 0x1DC }, { name = "func_80BBB414", vram = 0x80BBB414, size = 0xB8 }, { name = "EnZos_Destroy", vram = 0x80BBAE60, size = 0x24 }, @@ -62447,39 +62447,39 @@ relocs = [ ] functions = [ - { name = "func_80BC5780", vram = 0x80BC5780, size = 0x68 }, - { name = "func_80BC53A0", vram = 0x80BC53A0, size = 0x10 }, - { name = "func_80BC55E0", vram = 0x80BC55E0, size = 0x4C }, - { name = "func_80BC617C", vram = 0x80BC617C, size = 0x54 }, - { name = "func_80BC552C", vram = 0x80BC552C, size = 0x44 }, - { name = "func_80BC5898", vram = 0x80BC5898, size = 0x48 }, - { name = "func_80BC5CC8", vram = 0x80BC5CC8, size = 0x6C }, + { name = "EnPoComposer_LowerArms", vram = 0x80BC5780, size = 0x68 }, + { name = "EnPoComposer_StartedCutscene", vram = 0x80BC53A0, size = 0x10 }, + { name = "EnPoComposer_Appear", vram = 0x80BC55E0, size = 0x4C }, + { name = "EnPoComposer_PostLimbDraw", vram = 0x80BC617C, size = 0x54 }, + { name = "EnPoComposer_SetupIdleStill", vram = 0x80BC552C, size = 0x44 }, + { name = "EnPoComposer_SetupRoll", vram = 0x80BC5898, size = 0x48 }, + { name = "EnPoComposer_StepLightAlpha", vram = 0x80BC5CC8, size = 0x6C }, { name = "EnPoComposer_Update", vram = 0x80BC6048, size = 0x74 }, - { name = "func_80BC60BC", vram = 0x80BC60BC, size = 0xC0 }, - { name = "func_80BC59EC", vram = 0x80BC59EC, size = 0x2DC }, - { name = "func_80BC5570", vram = 0x80BC5570, size = 0x10 }, - { name = "func_80BC5DEC", vram = 0x80BC5DEC, size = 0x1FC }, - { name = "func_80BC5680", vram = 0x80BC5680, size = 0x50 }, - { name = "func_80BC562C", vram = 0x80BC562C, size = 0x44 }, + { name = "EnPoComposer_OverrideLimbDraw", vram = 0x80BC60BC, size = 0xC0 }, + { name = "EnPoComposer_UpdateAction", vram = 0x80BC59EC, size = 0x2DC }, + { name = "EnPoComposer_IdleStill", vram = 0x80BC5570, size = 0x10 }, + { name = "EnPoComposer_UpdateEnvColor", vram = 0x80BC5DEC, size = 0x1FC }, + { name = "EnPoComposer_SetupRaiseArms", vram = 0x80BC5680, size = 0x50 }, + { name = "EnPoComposer_SetupIdle", vram = 0x80BC562C, size = 0x44 }, { name = "EnPoComposer_Draw", vram = 0x80BC61D0, size = 0x590 }, - { name = "func_80BC59BC", vram = 0x80BC59BC, size = 0x30 }, - { name = "func_80BC56D0", vram = 0x80BC56D0, size = 0x68 }, - { name = "func_80BC5670", vram = 0x80BC5670, size = 0x10 }, + { name = "EnPoComposer_SharpCutsceneDone", vram = 0x80BC59BC, size = 0x30 }, + { name = "EnPoComposer_RaiseArms", vram = 0x80BC56D0, size = 0x68 }, + { name = "EnPoComposer_Idle", vram = 0x80BC5670, size = 0x10 }, { name = "EnPoComposer_Destroy", vram = 0x80BC51F8, size = 0x58 }, - { name = "func_80BC5404", vram = 0x80BC5404, size = 0x128 }, - { name = "func_80BC53B0", vram = 0x80BC53B0, size = 0x54 }, - { name = "func_80BC5FE8", vram = 0x80BC5FE8, size = 0x60 }, - { name = "func_80BC58E0", vram = 0x80BC58E0, size = 0xDC }, - { name = "func_80BC5250", vram = 0x80BC5250, size = 0x44 }, - { name = "func_80BC52F0", vram = 0x80BC52F0, size = 0x9C }, - { name = "func_80BC5830", vram = 0x80BC5830, size = 0x68 }, - { name = "func_80BC538C", vram = 0x80BC538C, size = 0x14 }, - { name = "func_80BC5738", vram = 0x80BC5738, size = 0x48 }, - { name = "func_80BC5580", vram = 0x80BC5580, size = 0x60 }, - { name = "func_80BC5D34", vram = 0x80BC5D34, size = 0xB8 }, - { name = "func_80BC57E8", vram = 0x80BC57E8, size = 0x48 }, - { name = "func_80BC5294", vram = 0x80BC5294, size = 0x40 }, - { name = "func_80BC52D4", vram = 0x80BC52D4, size = 0x1C }, + { name = "EnPoComposer_PlayCurse", vram = 0x80BC5404, size = 0x128 }, + { name = "EnPoComposer_SetupPlayCurse", vram = 0x80BC53B0, size = 0x54 }, + { name = "EnPoComposer_UpdateCollision", vram = 0x80BC5FE8, size = 0x60 }, + { name = "EnPoComposer_Roll", vram = 0x80BC58E0, size = 0xDC }, + { name = "EnPoComposer_SetupAwaitPlayer", vram = 0x80BC5250, size = 0x44 }, + { name = "EnPoComposer_StartCutscene", vram = 0x80BC52F0, size = 0x9C }, + { name = "EnPoComposer_CutscenePlayCurse", vram = 0x80BC5830, size = 0x68 }, + { name = "EnPoComposer_SetupStartedCutscene", vram = 0x80BC538C, size = 0x14 }, + { name = "EnPoComposer_SetupLowerArms", vram = 0x80BC5738, size = 0x48 }, + { name = "EnPoComposer_SetupAppear", vram = 0x80BC5580, size = 0x60 }, + { name = "EnPoComposer_StepLightColor", vram = 0x80BC5D34, size = 0xB8 }, + { name = "EnPoComposer_SetupCutscenePlayCurse", vram = 0x80BC57E8, size = 0x48 }, + { name = "EnPoComposer_AwaitPlayer", vram = 0x80BC5294, size = 0x40 }, + { name = "EnPoComposer_SetupStartCutscene", vram = 0x80BC52D4, size = 0x1C }, { name = "EnPoComposer_Init", vram = 0x80BC4F30, size = 0x2C8 }, ] @@ -62857,7 +62857,7 @@ functions = [ { name = "func_80BCC288", vram = 0x80BCC288, size = 0x24 }, { name = "func_80BCBC60", vram = 0x80BCBC60, size = 0xC8 }, { name = "func_80BCAD64", vram = 0x80BCAD64, size = 0x114 }, - { name = "func_80BCC2AC", vram = 0x80BCC2AC, size = 0x19C }, + { name = "EnScopenuts_HasReachedPoint", vram = 0x80BCC2AC, size = 0x19C }, { name = "func_80BCABF0", vram = 0x80BCABF0, size = 0x50 }, { name = "func_80BCBF0C", vram = 0x80BCBF0C, size = 0xF0 }, { name = "func_80BCB980", vram = 0x80BCB980, size = 0x80 }, @@ -62913,7 +62913,7 @@ functions = [ { name = "func_80BCD4D0", vram = 0x80BCD4D0, size = 0xC0 }, { name = "EnScopecrow_Destroy", vram = 0x80BCDA8C, size = 0x2C }, { name = "func_80BCD2BC", vram = 0x80BCD2BC, size = 0x78 }, - { name = "func_80BCD334", vram = 0x80BCD334, size = 0x19C }, + { name = "EnScopecrow_HasReachedPoint", vram = 0x80BCD334, size = 0x19C }, { name = "func_80BCD590", vram = 0x80BCD590, size = 0xB0 }, { name = "EnScopecrow_Draw", vram = 0x80BCDB00, size = 0x50 }, { name = "func_80BCD000", vram = 0x80BCD000, size = 0x9C }, @@ -63114,8 +63114,8 @@ functions = [ { name = "EnHg_PlayCutscene", vram = 0x80BCF8A0, size = 0x9C }, { name = "EnHg_SetupWait", vram = 0x80BCF354, size = 0x44 }, { name = "EnHg_ReactToHit", vram = 0x80BCF6D0, size = 0x40 }, - { name = "EnHg_SetupCsAction", vram = 0x80BCF93C, size = 0x20 }, - { name = "EnHg_HandleCsAction", vram = 0x80BCF95C, size = 0x2B0 }, + { name = "EnHg_SetupHandleCutscene", vram = 0x80BCF93C, size = 0x20 }, + { name = "EnHg_HandleCutscene", vram = 0x80BCF95C, size = 0x2B0 }, { name = "EnHg_WaitForPlayerAction", vram = 0x80BCFC0C, size = 0x1B8 }, { name = "EnHg_Destroy", vram = 0x80BCF328, size = 0x2C }, { name = "EnHg_PostLimbDraw", vram = 0x80BCFE70, size = 0x54 }, @@ -63199,7 +63199,7 @@ functions = [ { name = "EnHgo_Draw", vram = 0x80BD0D7C, size = 0xFC }, { name = "EnHgo_UpdateModel", vram = 0x80BD0B8C, size = 0xA4 }, { name = "EnHgo_Talk", vram = 0x80BD04E0, size = 0x16C }, - { name = "EnHgo_HandleCsAction", vram = 0x80BD0898, size = 0x2F4 }, + { name = "EnHgo_HandleCutscene", vram = 0x80BD0898, size = 0x2F4 }, { name = "EnHgo_Destroy", vram = 0x80BD03C0, size = 0x2C }, { name = "EnHgo_SetupDialogueHandler", vram = 0x80BD064C, size = 0x14 }, { name = "EnHgo_SetupInitCollision", vram = 0x80BD0420, size = 0x14 }, @@ -63422,7 +63422,7 @@ relocs = [ ] functions = [ - { name = "ObjHgdoor_HandleCsAction", vram = 0x80BD4358, size = 0x108 }, + { name = "ObjHgdoor_HandleCutscene", vram = 0x80BD4358, size = 0x108 }, { name = "ObjHgdoor_Draw", vram = 0x80BD4570, size = 0x100 }, { name = "ObjHgdoor_SetupCutscene", vram = 0x80BD42AC, size = 0x14 }, { name = "ObjHgdoor_Rotate", vram = 0x80BD44D0, size = 0x30 }, @@ -63436,7 +63436,7 @@ functions = [ { name = "ObjHgdoor_Update", vram = 0x80BD4540, size = 0x30 }, { name = "ObjHgdoor_SetupStopCs", vram = 0x80BD4460, size = 0x18 }, { name = "ObjHgdoor_Idle", vram = 0x80BD41FC, size = 0xB0 }, - { name = "ObjHgdoor_SetupCsAction", vram = 0x80BD433C, size = 0x1C }, + { name = "ObjHgdoor_SetupHandleCutscene", vram = 0x80BD433C, size = 0x1C }, { name = "ObjHgdoor_SetupIdle", vram = 0x80BD41E8, size = 0x14 }, ] @@ -64202,7 +64202,7 @@ relocs = [ ] functions = [ - { name = "func_80BDDAA0", vram = 0x80BDDAA0, size = 0x40 }, + { name = "EnZow_PostLimbDrawOpa", vram = 0x80BDDAA0, size = 0x40 }, { name = "func_80BDC6F8", vram = 0x80BDC6F8, size = 0x138 }, { name = "func_80BDDA7C", vram = 0x80BDDA7C, size = 0x24 }, { name = "func_80BDC270", vram = 0x80BDC270, size = 0x68 }, @@ -64218,7 +64218,7 @@ functions = [ { name = "func_80BDC830", vram = 0x80BDC830, size = 0x1AC }, { name = "func_80BDD6BC", vram = 0x80BDD6BC, size = 0xE0 }, { name = "func_80BDD490", vram = 0x80BDD490, size = 0xE0 }, - { name = "func_80BDDAE0", vram = 0x80BDDAE0, size = 0x24 }, + { name = "EnZow_PostLimbDraw", vram = 0x80BDDAE0, size = 0x24 }, { name = "func_80BDC3C0", vram = 0x80BDC3C0, size = 0x14C }, { name = "EnZow_Destroy", vram = 0x80BDD020, size = 0x2C }, { name = "func_80BDCB84", vram = 0x80BDCB84, size = 0x1B4 }, @@ -64560,7 +64560,7 @@ relocs = [ functions = [ { name = "EnRuppecrow_CheckPlayedMatchingSong", vram = 0x80BE2D4C, size = 0xCC }, - { name = "EnRuppecrow_ReachedPointClockwise", vram = 0x80BE2330, size = 0x19C }, + { name = "EnRuppecrow_HasReachedPointClockwise", vram = 0x80BE2330, size = 0x19C }, { name = "EnRuppecrow_UpdatePosition", vram = 0x80BE2B80, size = 0x1CC }, { name = "EnRuppecrow_FlyToDespawn", vram = 0x80BE348C, size = 0x118 }, { name = "EnRuppecrow_UpdateCollision", vram = 0x80BE2260, size = 0xD0 }, @@ -64571,7 +64571,7 @@ functions = [ { name = "EnRuppecrow_UpdateSpeed", vram = 0x80BE2E18, size = 0x154 }, { name = "EnRuppecrow_Draw", vram = 0x80BE393C, size = 0x50 }, { name = "EnRuppecrow_ShatterIce", vram = 0x80BE2728, size = 0x6C }, - { name = "EnRuppecrow_ReachedPointCounterClockwise", vram = 0x80BE24CC, size = 0x19C }, + { name = "EnRuppecrow_HasReachedPointCounterClockwise", vram = 0x80BE24CC, size = 0x19C }, { name = "EnRuppecrow_HandleDeath", vram = 0x80BE2F6C, size = 0x188 }, { name = "EnRuppecrow_Init", vram = 0x80BE3754, size = 0x140 }, { name = "EnRuppecrow_HandleSongCutscene", vram = 0x80BE32DC, size = 0x78 }, @@ -65460,7 +65460,7 @@ functions = [ { name = "func_80BEE070", vram = 0x80BEE070, size = 0x204 }, { name = "EnAkindonuts_PostLimbDraw", vram = 0x80BF0178, size = 0x18 }, { name = "func_80BECBE0", vram = 0x80BECBE0, size = 0x9C }, - { name = "func_80BECD10", vram = 0x80BECD10, size = 0x19C }, + { name = "EnAkindonuts_HasReachedPoint", vram = 0x80BECD10, size = 0x19C }, { name = "func_80BED034", vram = 0x80BED034, size = 0x5C }, { name = "func_80BECF6C", vram = 0x80BECF6C, size = 0x50 }, { name = "func_80BEDDAC", vram = 0x80BEDDAC, size = 0x2C4 }, @@ -65707,18 +65707,18 @@ functions = [ { name = "func_80BF4560", vram = 0x80BF4560, size = 0x54 }, { name = "func_80BF4934", vram = 0x80BF4934, size = 0x30 }, { name = "func_80BF4DA8", vram = 0x80BF4DA8, size = 0x114 }, - { name = "func_80BF5588", vram = 0x80BF5588, size = 0xE8 }, + { name = "EnRg_OverrideLimbDraw", vram = 0x80BF5588, size = 0xE8 }, { name = "func_80BF3DA0", vram = 0x80BF3DA0, size = 0x24 }, { name = "func_80BF4964", vram = 0x80BF4964, size = 0x154 }, { name = "EnRg_Draw", vram = 0x80BF5670, size = 0xD0 }, - { name = "func_80BF409C", vram = 0x80BF409C, size = 0x58 }, - { name = "func_80BF3FF8", vram = 0x80BF3FF8, size = 0x2C }, + { name = "EnRg_ChangeAnim", vram = 0x80BF409C, size = 0x58 }, + { name = "EnRg_UpdateSkelAnime", vram = 0x80BF3FF8, size = 0x2C }, { name = "func_80BF47AC", vram = 0x80BF47AC, size = 0x188 }, { name = "func_80BF42BC", vram = 0x80BF42BC, size = 0x140 }, { name = "func_80BF43FC", vram = 0x80BF43FC, size = 0x164 }, { name = "EnRg_Update", vram = 0x80BF5390, size = 0xEC }, { name = "func_80BF3ED4", vram = 0x80BF3ED4, size = 0x40 }, - { name = "func_80BF4D64", vram = 0x80BF4D64, size = 0x44 }, + { name = "EnRg_IsInFinishLine", vram = 0x80BF4D64, size = 0x44 }, { name = "func_80BF4FC4", vram = 0x80BF4FC4, size = 0x1C4 }, { name = "func_80BF3C64", vram = 0x80BF3C64, size = 0x13C }, { name = "func_80BF4024", vram = 0x80BF4024, size = 0x78 }, @@ -65860,11 +65860,11 @@ functions = [ { name = "func_80BF6478", vram = 0x80BF6478, size = 0xF4 }, { name = "func_80BF67A8", vram = 0x80BF67A8, size = 0x138 }, { name = "EnOsk_Init", vram = 0x80BF5C20, size = 0x1D0 }, - { name = "func_80BF5E68", vram = 0x80BF5E68, size = 0x54 }, + { name = "EnOsk_ChangeAnimOnce", vram = 0x80BF5E68, size = 0x54 }, { name = "func_80BF6314", vram = 0x80BF6314, size = 0x164 }, { name = "EnOsk_Draw", vram = 0x80BF6C94, size = 0x2E8 }, { name = "func_80BF6A20", vram = 0x80BF6A20, size = 0x210 }, - { name = "func_80BF6C54", vram = 0x80BF6C54, size = 0x40 }, + { name = "EnOsk_PostLimbDraw", vram = 0x80BF6C54, size = 0x40 }, { name = "func_80BF5F60", vram = 0x80BF5F60, size = 0x10 }, { name = "func_80BF5EBC", vram = 0x80BF5EBC, size = 0xA4 }, { name = "func_80BF5F70", vram = 0x80BF5F70, size = 0x12C }, @@ -65874,7 +65874,7 @@ functions = [ { name = "func_80BF656C", vram = 0x80BF656C, size = 0x23C }, { name = "EnOsk_Update", vram = 0x80BF6C30, size = 0x24 }, { name = "func_80BF61EC", vram = 0x80BF61EC, size = 0x128 }, - { name = "func_80BF5E00", vram = 0x80BF5E00, size = 0x68 }, + { name = "EnOsk_ChangeAnimLoop", vram = 0x80BF5E00, size = 0x68 }, ] # Autogenerated from an ELF via N64Recomp @@ -66099,7 +66099,7 @@ functions = [ { name = "EnRz_Destroy", vram = 0x80BFBE44, size = 0x2C }, { name = "func_80BFC2F4", vram = 0x80BFC2F4, size = 0x78 }, { name = "EnRz_PostLimbDraw", vram = 0x80BFCAD0, size = 0x6C }, - { name = "func_80BFB9E4", vram = 0x80BFB9E4, size = 0x38 }, + { name = "EnRz_ChangeAnimLoopMorph", vram = 0x80BFB9E4, size = 0x38 }, { name = "func_80BFC078", vram = 0x80BFC078, size = 0x124 }, { name = "func_80BFBFAC", vram = 0x80BFBFAC, size = 0xAC }, { name = "func_80BFBCEC", vram = 0x80BFBCEC, size = 0x68 }, @@ -66111,7 +66111,7 @@ functions = [ { name = "EnRz_StopToThink", vram = 0x80BFC8AC, size = 0x4C }, { name = "func_80BFC674", vram = 0x80BFC674, size = 0xB4 }, { name = "func_80BFC270", vram = 0x80BFC270, size = 0x84 }, - { name = "func_80BFBA1C", vram = 0x80BFBA1C, size = 0x34 }, + { name = "EnRz_ChangeAnimLoop", vram = 0x80BFBA1C, size = 0x34 }, { name = "EnRz_CanTalk", vram = 0x80BFBC78, size = 0x74 }, { name = "func_80BFC36C", vram = 0x80BFC36C, size = 0x8C }, { name = "EnRz_SetupPath", vram = 0x80BFBA50, size = 0xF4 }, @@ -66589,7 +66589,7 @@ relocs = [ functions = [ { name = "func_80C050B8", vram = 0x80C050B8, size = 0x154 }, - { name = "func_80C056D4", vram = 0x80C056D4, size = 0x84 }, + { name = "EnBombers2_OverrideLimbDraw", vram = 0x80C056D4, size = 0x84 }, { name = "EnBombers2_Init", vram = 0x80C04930, size = 0x150 }, { name = "func_80C04D8C", vram = 0x80C04D8C, size = 0x32C }, { name = "EnBombers2_Destroy", vram = 0x80C04A80, size = 0x2C }, @@ -68982,6 +68982,6 @@ functions = [ { name = "EnRsn_Draw", vram = 0x80C25F4C, size = 0x98 }, { name = "EnRsn_PostLimbDraw", vram = 0x80C25EF0, size = 0x5C }, { name = "EnRsn_Destroy", vram = 0x80C25E14, size = 0x24 }, - { name = "func_80C25D84", vram = 0x80C25D84, size = 0x10 }, + { name = "EnRsn_DoNothing", vram = 0x80C25D84, size = 0x10 }, ] From c7ae9c650bad98fd06946b5ff2717c8f38c82b66 Mon Sep 17 00:00:00 2001 From: AltoXorg <56553686+Alto1772@users.noreply.github.com> Date: Sat, 22 Jun 2024 19:41:42 +0800 Subject: [PATCH 2/4] update to MM commit 45ae63ccc --- lib/mm-decomp | 2 +- patches/autosaving.c | 3 +- patches/billboard_tagging.c | 3 + patches/camera_patches.c | 2 +- .../dummy_headers/assets/text/message_data.h | 1 + .../assets/text/staff_message_data.h | 1 + patches/effect_patches.c | 7 +- patches/fixes.c | 2 +- patches/input_latency.c | 49 +- patches/options.c | 6 +- patches/quicksave_patches.c | 4 +- patches/required_patches.c | 4 +- patches/sky_transform_tagging.c | 6 +- patches/specific_actor_transform_tagging.c | 26 +- patches/ui_transform_tagging.c | 6 +- us.rev1.syms.toml | 468 +++++++++--------- us.rev1.toml | 4 +- 17 files changed, 302 insertions(+), 292 deletions(-) create mode 100644 patches/dummy_headers/assets/text/message_data.h create mode 100644 patches/dummy_headers/assets/text/staff_message_data.h diff --git a/lib/mm-decomp b/lib/mm-decomp index 5607eec..45ae63c 160000 --- a/lib/mm-decomp +++ b/lib/mm-decomp @@ -1 +1 @@ -Subproject commit 5607eec18bae68e4cd38ef6d1fa69d7f1d84bfc8 +Subproject commit 45ae63ccc550ea29f475669a87f7f8ac681a6b29 diff --git a/patches/autosaving.c b/patches/autosaving.c index b05e507..519f30e 100644 --- a/patches/autosaving.c +++ b/patches/autosaving.c @@ -1,5 +1,6 @@ #include "patches.h" #include "play_patches.h" +#include "z64cutscene.h" #include "z64save.h" #include "z64horse.h" #include "overlays/gamestates/ovl_file_choose/z_file_select.h" @@ -462,7 +463,7 @@ typedef struct { } CutsceneManager; // size = 0x18 extern CutsceneManager sCutsceneMgr; -extern ActorCutscene* sSceneCutsceneList; +extern CutsceneEntry* sSceneCutsceneList; extern s16 sSceneCutsceneCount; bool skip_entry_cutscene = false; diff --git a/patches/billboard_tagging.c b/patches/billboard_tagging.c index 303a5a1..91c8fb4 100644 --- a/patches/billboard_tagging.c +++ b/patches/billboard_tagging.c @@ -30,6 +30,9 @@ // Matrix_RotateAxisF in NEW // Matrix_RotateAxisS in NEW +extern MtxF* sCurrentMatrix; +extern MtxF* sMatrixStack; + #define MATRIX_STACK_SIZE 20 MtxF* play_billboard_matrix; diff --git a/patches/camera_patches.c b/patches/camera_patches.c index 82d5e64..5b88dc8 100644 --- a/patches/camera_patches.c +++ b/patches/camera_patches.c @@ -2077,7 +2077,7 @@ void func_809EC568(Boss04* this, PlayState* play) { Cutscene_StopManual(play, &play->csCtx); Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_END); Play_DisableMotionBlur(); - SET_EVENTINF(EVENTINF_60); + SET_EVENTINF(EVENTINF_INTRO_CS_WATCHED_WART); } break; } diff --git a/patches/dummy_headers/assets/text/message_data.h b/patches/dummy_headers/assets/text/message_data.h new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/patches/dummy_headers/assets/text/message_data.h @@ -0,0 +1 @@ + diff --git a/patches/dummy_headers/assets/text/staff_message_data.h b/patches/dummy_headers/assets/text/staff_message_data.h new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/patches/dummy_headers/assets/text/staff_message_data.h @@ -0,0 +1 @@ + diff --git a/patches/effect_patches.c b/patches/effect_patches.c index ed064b3..3cadf6e 100644 --- a/patches/effect_patches.c +++ b/patches/effect_patches.c @@ -2,6 +2,7 @@ #include "graphics.h" #include "sys_cfb.h" #include "z64view.h" +#include "z64circle_tex.h" #include "transform_ids.h" extern TransitionOverlay gTransitionOverlayTable[]; @@ -85,7 +86,7 @@ void Play_DrawMotionBlur(PlayState* this) { OPEN_DISPS(gfxCtx); gfxHead = POLY_OPA_DISP; - gfx = Graph_GfxPlusOne(gfxHead); + gfx = Gfx_Open(gfxHead); gSPDisplayList(OVERLAY_DISP++, gfx); @@ -122,7 +123,7 @@ void Play_DrawMotionBlur(PlayState* this) { gSPEndDisplayList(gfx++); - Graph_BranchDlist(gfxHead, gfx); + Gfx_Close(gfxHead, gfx); POLY_OPA_DISP = gfx; @@ -144,7 +145,7 @@ void Actor_DrawLensOverlay(Gfx** gfxP, s32 lensMaskSize) { // @recomp Patched to use ortho tris for interpolation and to prevent the telescope and lens effects from getting stretched wide. -void TransitionCircle_LoadAndSetTexture(Gfx** gfxp, TexturePtr texture, s32 fmt, s32 arg3, s32 masks, s32 maskt, +void TransitionCircle_LoadAndSetTexture(Gfx** gfxp, void const* texture, s32 fmt, s32 arg3, s32 masks, s32 maskt, f32 arg6) { Gfx* gfx = *gfxp; s32 xh = gCfbWidth; diff --git a/patches/fixes.c b/patches/fixes.c index f46bb86..e01f8d6 100644 --- a/patches/fixes.c +++ b/patches/fixes.c @@ -95,7 +95,7 @@ s16 KaleidoScope_SetPageVertices(PlayState* play, Vtx* vtx, s16 vtxPage, s16 num vtx[k + 1].v.ob[0] = vtx[k + 3].v.ob[0] = vtx[k + 0].v.ob[0] + quadsWidth[i]; - if (!IS_PAUSE_STATE_GAMEOVER) { + if (!IS_PAUSE_STATE_GAMEOVER(pauseCtx)) { vtx[k + 0].v.ob[1] = vtx[k + 1].v.ob[1] = quadsY[i] + pauseCtx->offsetY; } else if (gameOverCtx->state == GAMEOVER_INACTIVE) { vtx[k + 0].v.ob[1] = vtx[k + 1].v.ob[1] = quadsY[i] + pauseCtx->offsetY; diff --git a/patches/input_latency.c b/patches/input_latency.c index 2e04c52..dbbbdc3 100644 --- a/patches/input_latency.c +++ b/patches/input_latency.c @@ -5,10 +5,9 @@ #include "audiomgr.h" #include "z64speed_meter.h" #include "z64vimode.h" -#include "z64viscvg.h" -#include "z64vismono.h" -#include "z64viszbuf.h" +#include "z64vis.h" #include "input.h" +#include "scheduler.h" void recomp_set_current_frame_poll_id(); void PadMgr_HandleRetrace(void); @@ -169,7 +168,7 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx, GameState* gameState) { // osSyncPrintf("GRAPH SP TIMEOUT\n"); // if (retryCount >= 0) { // retryCount--; -// Sched_SendGfxCancelMsg(&gSchedContext); +// Sched_SendGfxCancelMsg(&gScheduler); // goto retry; // } else { // // graph.c: No more! die! @@ -185,20 +184,20 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx, GameState* gameState) { task->type = M_GFXTASK; task->flags = OS_SC_DRAM_DLIST; - task->ucodeBoot = SysUcode_GetUCodeBoot(); - task->ucodeBootSize = SysUcode_GetUCodeBootSize(); + task->ucode_boot = SysUcode_GetUCodeBoot(); + task->ucode_boot_size = SysUcode_GetUCodeBootSize(); task->ucode = SysUcode_GetUCode(); - task->ucodeData = SysUcode_GetUCodeData(); - task->ucodeSize = SP_UCODE_SIZE; - task->ucodeDataSize = SP_UCODE_DATA_SIZE; - task->dramStack = (u64*)gGfxSPTaskStack; - task->dramStackSize = sizeof(gGfxSPTaskStack); - task->outputBuff = gGfxSPTaskOutputBufferPtr; - task->outputBuffSize = gGfxSPTaskOutputBufferEnd; - task->dataPtr = (u64*)gGfxMasterDL; - task->dataSize = 0; - task->yieldDataPtr = (u64*)gGfxSPTaskYieldBuffer; - task->yieldDataSize = sizeof(gGfxSPTaskYieldBuffer); + task->ucode_data = SysUcode_GetUCodeData(); + task->ucode_size = SP_UCODE_SIZE; + task->ucode_data_size = SP_UCODE_DATA_SIZE; + task->dram_stack = (u64*)gGfxSPTaskStack; + task->dram_stack_size = sizeof(gGfxSPTaskStack); + task->output_buff = gGfxSPTaskOutputBufferPtr; + task->output_buff_size = gGfxSPTaskOutputBufferEnd; + task->data_ptr = (u64*)gGfxMasterDL; + task->data_size = 0; + task->yield_data_ptr = (u64*)gGfxSPTaskYieldBuffer; + task->yield_data_size = sizeof(gGfxSPTaskYieldBuffer); scTask->next = NULL; scTask->flags = OS_SC_RCP_MASK | OS_SC_SWAPBUFFER | OS_SC_LAST_TASK; @@ -217,13 +216,13 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx, GameState* gameState) { cfb = &sGraphCfbInfos[cfbIdx]; cfbIdx = (cfbIdx + 1) % ARRAY_COUNT(sGraphCfbInfos); - cfb->fb1 = gfxCtx->curFrameBuffer; + cfb->framebuffer = gfxCtx->curFrameBuffer; cfb->swapBuffer = gfxCtx->curFrameBuffer; if (gfxCtx->updateViMode) { gfxCtx->updateViMode = false; cfb->viMode = gfxCtx->viMode; - cfb->features = gfxCtx->viConfigFeatures; + cfb->viFeatures = gfxCtx->viConfigFeatures; cfb->xScale = gfxCtx->xScale; cfb->yScale = gfxCtx->yScale; } else { @@ -238,9 +237,9 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx, GameState* gameState) { osRecvMesg(&gfxCtx->queue, NULL, OS_MESG_NOBLOCK); } - gfxCtx->schedMsgQ = &gSchedContext.cmdQ; - osSendMesg(&gSchedContext.cmdQ, scTask, OS_MESG_BLOCK); - Sched_SendEntryMsg(&gSchedContext); + gfxCtx->schedMsgQ = &gScheduler.cmdQueue; + osSendMesg(&gScheduler.cmdQueue, scTask, OS_MESG_BLOCK); + Sched_SendNotifyMsg(&gScheduler); // @recomp Immediately wait on the task to complete to minimize latency for the next one. osRecvMesg(&gfxCtx->queue, &msg, OS_MESG_BLOCK); @@ -248,7 +247,7 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx, GameState* gameState) { // @recomp Wait on the VI framebuffer to change if this task has a framebuffer swap. if (scTask->flags & OS_SC_SWAPBUFFER) { int viCounter = 0; - while (osViGetCurrentFramebuffer() != cfb->fb1) { + while (osViGetCurrentFramebuffer() != cfb->framebuffer) { osRecvMesg(&vi_queue, NULL, OS_MESG_BLOCK); viCounter++; } @@ -267,7 +266,7 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx, GameState* gameState) { extern SpeedMeter sGameSpeedMeter; extern VisCvg sGameVisCvg; -extern VisZbuf sGameVisZbuf; +extern VisZBuf sGameVisZBuf; extern VisMono sGameVisMono; extern ViMode sGameViMode; @@ -285,7 +284,7 @@ void GameState_Destroy(GameState* gameState) { Rumble_Destroy(); SpeedMeter_Destroy(&sGameSpeedMeter); VisCvg_Destroy(&sGameVisCvg); - VisZbuf_Destroy(&sGameVisZbuf); + VisZBuf_Destroy(&sGameVisZBuf); VisMono_Destroy(&sGameVisMono); ViMode_Destroy(&sGameViMode); THA_Destroy(&gameState->tha); diff --git a/patches/options.c b/patches/options.c index 4273df6..f4f695c 100644 --- a/patches/options.c +++ b/patches/options.c @@ -128,15 +128,15 @@ void FileSelect_Init(GameState* thisx) { size = SEGMENT_ROM_SIZE(title_static); this->staticSegment = THA_AllocTailAlign16(&this->state.tha, size); - DmaMgr_SendRequest0(this->staticSegment, SEGMENT_ROM_START(title_static), size); + DmaMgr_RequestSync(this->staticSegment, SEGMENT_ROM_START(title_static), size); size = SEGMENT_ROM_SIZE(parameter_static); this->parameterSegment = THA_AllocTailAlign16(&this->state.tha, size); - DmaMgr_SendRequest0(this->parameterSegment, SEGMENT_ROM_START(parameter_static), size); + DmaMgr_RequestSync(this->parameterSegment, SEGMENT_ROM_START(parameter_static), size); size = gObjectTable[OBJECT_MAG].vromEnd - gObjectTable[OBJECT_MAG].vromStart; this->titleSegment = THA_AllocTailAlign16(&this->state.tha, size); - DmaMgr_SendRequest0(this->titleSegment, gObjectTable[OBJECT_MAG].vromStart, size); + DmaMgr_RequestSync(this->titleSegment, gObjectTable[OBJECT_MAG].vromStart, size); Audio_SetSpec(0xA); // Setting ioData to 1 and writing it to ioPort 7 will skip the harp intro diff --git a/patches/quicksave_patches.c b/patches/quicksave_patches.c index 227accf..a89f560 100644 --- a/patches/quicksave_patches.c +++ b/patches/quicksave_patches.c @@ -208,7 +208,7 @@ void DmaMgr_ThreadEntry(void* a0) { } } -extern SchedContext gSchedContext; +extern Scheduler gScheduler; void handle_quicksave_actions_main() { recomp_handle_quicksave_actions_main(&quicksave_enter_mq, &quicksave_exit_mq); @@ -226,7 +226,7 @@ void wake_threads_for_quicksave_action() { // Wake up the DmaMgr thread osSendMesg(&sDmaMgrMsgQueue, (OSMesg)RECOMP_DMAMGR_QUICKSAVE_MESSAGE, OS_MESG_BLOCK); // Wake up the Sched thread - osSendMesg(&gSchedContext.interruptQ, (OSMesg)RECOMP_QUICKSAVE_ACTION, OS_MESG_BLOCK); + osSendMesg(&gScheduler.interruptQ, (OSMesg)RECOMP_QUICKSAVE_ACTION, OS_MESG_BLOCK); } #endif diff --git a/patches/required_patches.c b/patches/required_patches.c index e491a61..6320e95 100644 --- a/patches/required_patches.c +++ b/patches/required_patches.c @@ -22,7 +22,7 @@ void Main_Init(void) { // @recomp Load the code segment in the recomp runtime. recomp_load_overlays(SEGMENT_ROM_START(code), SEGMENT_START(code), SEGMENT_ROM_END(code) - SEGMENT_ROM_START(code)); - DmaMgr_SendRequestImpl(&dmaReq, SEGMENT_START(code), SEGMENT_ROM_START(code), + DmaMgr_RequestAsync(&dmaReq, SEGMENT_START(code), SEGMENT_ROM_START(code), SEGMENT_ROM_END(code) - SEGMENT_ROM_START(code), 0, &mq, NULL); Main_InitScreen(); Main_InitMemory(); @@ -50,7 +50,7 @@ size_t Overlay_Load(uintptr_t vromStart, uintptr_t vromEnd, void* ramStart, void if (gOverlayLogSeverity >= 3) {} end = (uintptr_t)allocatedRamAddr + size; - DmaMgr_SendRequest0(allocatedRamAddr, vromStart, size); + DmaMgr_RequestSync(allocatedRamAddr, vromStart, size); ovlRelocs = (OverlayRelocationSection*)(end - ((s32*)end)[-1]); diff --git a/patches/sky_transform_tagging.c b/patches/sky_transform_tagging.c index 9503a62..04ebe02 100644 --- a/patches/sky_transform_tagging.c +++ b/patches/sky_transform_tagging.c @@ -10,7 +10,7 @@ void Skybox_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyboxId Gfx_SetupDL40_Opa(gfxCtx); - gSPSegment(POLY_OPA_DISP++, 0x0B, skyboxCtx->paletteStaticSegment); + gSPSegment(POLY_OPA_DISP++, 0x0B, skyboxCtx->palette); gSPTexture(POLY_OPA_DISP++, 0x8000, 0x8000, 0, G_TX_RENDERTILE, G_ON); sSkyboxDrawMatrix = GRAPH_ALLOC(gfxCtx, sizeof(Mtx)); @@ -40,7 +40,7 @@ void Skybox_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyboxId gDPSetColorDither(POLY_OPA_DISP++, G_CD_MAGICSQ); gDPSetTextureFilter(POLY_OPA_DISP++, G_TF_BILERP); - gDPLoadTLUT_pal256(POLY_OPA_DISP++, skyboxCtx->paletteStaticSegment); + gDPLoadTLUT_pal256(POLY_OPA_DISP++, skyboxCtx->palette); gDPSetTextureLUT(POLY_OPA_DISP++, G_TT_RGBA16); gDPSetTextureConvert(POLY_OPA_DISP++, G_TC_FILT); gDPSetCombineLERP(POLY_OPA_DISP++, TEXEL1, TEXEL0, PRIMITIVE_ALPHA, TEXEL0, TEXEL1, TEXEL0, PRIMITIVE, TEXEL0, @@ -66,6 +66,8 @@ void Skybox_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyboxId CLOSE_DISPS(gfxCtx); } +void MtxConv_F2L(Mtx* mtx, MtxF* mf); + // @recomp Draw stars with billboarding to allow for interpolation instead of rects. void Environment_DrawSkyboxStarBillboard(GraphicsContext* gfxCtx, MtxF* billboard_mtx, Gfx** gfxp, f32 x, f32 y, f32 z, s32 width, s32 height) { static Vtx star_verts[] = { diff --git a/patches/specific_actor_transform_tagging.c b/patches/specific_actor_transform_tagging.c index 3c4341a..fd9ab51 100644 --- a/patches/specific_actor_transform_tagging.c +++ b/patches/specific_actor_transform_tagging.c @@ -651,20 +651,20 @@ extern Gfx gGohtStalactiteModelDL[]; // @recomp Tag Goht's rocks. void func_80B0C398(BossHakugin* this, PlayState* play) { - BossHakuginEffect* effect; + GohtRockEffect* effect; s32 i; OPEN_DISPS(play->state.gfxCtx); gSPDisplayList(POLY_OPA_DISP++, gGohtRockMaterialDL); - for (i = 0; i < ARRAY_COUNT(this->unk_9F8); i++) { - effect = &this->unk_9F8[i]; - if ((effect->unk_18 >= 0) && (effect->unk_1A == 0)) { - Matrix_SetTranslateRotateYXZ(effect->unk_0.x, effect->unk_0.y, effect->unk_0.z, &effect->unk_1C); - Matrix_Scale(effect->unk_24, effect->unk_24, effect->unk_24, MTXMODE_APPLY); + for (i = 0; i < ARRAY_COUNT(this->rockEffects); i++) { + effect = &this->rockEffects[i]; + if ((effect->timer >= 0) && (effect->type == GOHT_ROCK_EFFECT_TYPE_BOULDER)) { + Matrix_SetTranslateRotateYXZ(effect->pos.x, effect->pos.y, effect->pos.z, &effect->rot); + Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY); // @recomp Tag the transform. - gEXMatrixGroupDecomposedVerts(POLY_OPA_DISP++, GOHT_ROCKS_TRANSFORM_ID_START + i + 0 * ARRAY_COUNT(this->unk_9F8), G_EX_PUSH, G_MTX_MODELVIEW, G_EX_EDIT_NONE); + gEXMatrixGroupDecomposedVerts(POLY_OPA_DISP++, GOHT_ROCKS_TRANSFORM_ID_START + i + 0 * ARRAY_COUNT(this->rockEffects), G_EX_PUSH, G_MTX_MODELVIEW, G_EX_EDIT_NONE); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gGohtRockModelDL); @@ -675,14 +675,14 @@ void func_80B0C398(BossHakugin* this, PlayState* play) { } gSPDisplayList(POLY_OPA_DISP++, gGohtStalactiteMaterialDL); - for (i = 0; i < ARRAY_COUNT(this->unk_9F8); i++) { - effect = &this->unk_9F8[i]; - if ((effect->unk_18 >= 0) && (effect->unk_1A == 1)) { - Matrix_SetTranslateRotateYXZ(effect->unk_0.x, effect->unk_0.y, effect->unk_0.z, &effect->unk_1C); - Matrix_Scale(effect->unk_24, effect->unk_24, effect->unk_24, MTXMODE_APPLY); + for (i = 0; i < ARRAY_COUNT(this->rockEffects); i++) { + effect = &this->rockEffects[i]; + if ((effect->timer >= 0) && (effect->type == GOHT_ROCK_EFFECT_TYPE_STALACTITE)) { + Matrix_SetTranslateRotateYXZ(effect->pos.x, effect->pos.y, effect->pos.z, &effect->rot); + Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY); // @recomp Tag the transform. - gEXMatrixGroupDecomposedVerts(POLY_OPA_DISP++, GOHT_ROCKS_TRANSFORM_ID_START + i + 1 * ARRAY_COUNT(this->unk_9F8), G_EX_PUSH, G_MTX_MODELVIEW, G_EX_EDIT_NONE); + gEXMatrixGroupDecomposedVerts(POLY_OPA_DISP++, GOHT_ROCKS_TRANSFORM_ID_START + i + 1 * ARRAY_COUNT(this->rockEffects), G_EX_PUSH, G_MTX_MODELVIEW, G_EX_EDIT_NONE); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gGohtStalactiteModelDL); diff --git a/patches/ui_transform_tagging.c b/patches/ui_transform_tagging.c index e8a457d..8d02158 100644 --- a/patches/ui_transform_tagging.c +++ b/patches/ui_transform_tagging.c @@ -83,7 +83,7 @@ void KaleidoScope_Draw(PlayState* play) { KaleidoScope_SetView(pauseCtx, pauseCtx->eye.x, pauseCtx->eye.y, pauseCtx->eye.z); Gfx_SetupDL42_Opa(play->state.gfxCtx); - if (!IS_PAUSE_STATE_OWL_WARP) { + if (!IS_PAUSE_STATE_OWL_WARP(pauseCtx)) { // Draw Default or Game Over Menus // @recomp Record the current pageIndex, then change it to a dummy value for the KaleidoScope_SetVertices. u16 saved_page_index = pauseCtx->pageIndex; @@ -99,7 +99,7 @@ void KaleidoScope_Draw(PlayState* play) { KaleidoScope_SetView(pauseCtx, 0.0f, 0.0f, 64.0f); - if (!IS_PAUSE_STATE_GAMEOVER) { + if (!IS_PAUSE_STATE_GAMEOVER(pauseCtx)) { KaleidoScope_DrawInfoPanel(play); } @@ -622,7 +622,7 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx); - if (!IS_PAUSE_STATE_GAMEOVER) { + if (!IS_PAUSE_STATE_GAMEOVER(pauseCtx)) { if (pauseCtx->state != PAUSE_STATE_SAVEPROMPT) { stepR = diff --git a/us.rev1.syms.toml b/us.rev1.syms.toml index 875cfae..5a9f463 100644 --- a/us.rev1.syms.toml +++ b/us.rev1.syms.toml @@ -36,13 +36,13 @@ functions = [ { name = "guOrtho", vram = 0x800919F4, size = 0x64 }, { name = "osSpTaskLoad", vram = 0x8008868C, size = 0x168 }, { name = "ltruncf", vram = 0x80086CF8, size = 0x10 }, - { name = "DmaMgr_SendRequestImpl", vram = 0x80080C04, size = 0x8C }, + { name = "DmaMgr_RequestAsync", vram = 0x80080C04, size = 0x8C }, { name = "Fault_DrawCornerRec", vram = 0x80082180, size = 0x54 }, { name = "FaultDrawer_FillScreen", vram = 0x800844D8, size = 0x90 }, { name = "IrqMgr_RemoveClient", vram = 0x800812DC, size = 0x8C }, { name = "bzero", vram = 0x80089630, size = 0xA0 }, { name = "nearbyintf", vram = 0x80086D18, size = 0xC }, - { name = "func_80085150", vram = 0x80085150, size = 0x8 }, + { name = "PadUtils_Destroy", vram = 0x80085150, size = 0x8 }, { name = "Fault_HangupFaultClient", vram = 0x80083CF8, size = 0xFC }, { name = "__osPiCreateAccessQueue", vram = 0x8008C190, size = 0x50 }, { name = "__osVoiceSetADConverter", vram = 0x80090900, size = 0x1E4 }, @@ -71,7 +71,7 @@ functions = [ { name = "Yaz0_NextDMA", vram = 0x80080ED0, size = 0x120 }, { name = "__osCheckArena", vram = 0x800877C4, size = 0x68 }, { name = "guPositionF", vram = 0x8008FEB0, size = 0x1A8 }, - { name = "IrqMgr_SendMesgForClient", vram = 0x80081368, size = 0x50 }, + { name = "IrqMgr_SendMesgToClients", vram = 0x80081368, size = 0x50 }, { name = "Fault_ConvertAddress", vram = 0x80081D9C, size = 0x90 }, { name = "CIC6105_Noop2", vram = 0x80081828, size = 0x8 }, { name = "__d_to_ll", vram = 0x80095A60, size = 0x1C }, @@ -113,7 +113,7 @@ functions = [ { name = "osSpTaskStartGo", vram = 0x800887F4, size = 0x40 }, { name = "Fault_DisplayFrameBuffer", vram = 0x800834CC, size = 0xC0 }, { name = "__osGetCompare", vram = 0x80091290, size = 0x10 }, - { name = "IrqMgr_CheckStack", vram = 0x800814B4, size = 0x20 }, + { name = "IrqMgr_CheckStacks", vram = 0x800814B4, size = 0x20 }, { name = "Math_FTruncF", vram = 0x800867F4, size = 0x20 }, { name = "osPfsChecker", vram = 0x800931F0, size = 0x538 }, { name = "Math_FFloorF", vram = 0x80086794, size = 0x20 }, @@ -174,7 +174,7 @@ functions = [ { name = "Fault_RemoveAddrConvClient", vram = 0x80081CA4, size = 0xF8 }, { name = "osContGetQuery", vram = 0x8008D7AC, size = 0x24 }, { name = "Fault_SleepImpl", vram = 0x80081980, size = 0x70 }, - { name = "Fault_SetOptionsFromController3", vram = 0x80083670, size = 0x174 }, + { name = "Fault_SetOptions", vram = 0x80083670, size = 0x174 }, { name = "osSpTaskYielded", vram = 0x800902A0, size = 0x60 }, { name = "osViSetSpecialFeatures", vram = 0x80092100, size = 0x15C }, { name = "osViSetXScale", vram = 0x80095950, size = 0x10C }, @@ -257,7 +257,7 @@ functions = [ { name = "osCreateMesgQueue", vram = 0x8008F240, size = 0x2C }, { name = "PadUtils_CheckReleased", vram = 0x800851B4, size = 0x1C }, { name = "send_mesg", vram = 0x8008905C, size = 0xB4 }, - { name = "_MakeMotorData", vram = 0x80089838, size = 0x10C }, + { name = "__osMakeMotorData", vram = 0x80089838, size = 0x10C }, { name = "Main_InitFramebuffer", vram = 0x80080180, size = 0x1C }, { name = "__ull_to_f", vram = 0x80095C38, size = 0x30 }, { name = "__osPfsCheckRamArea", vram = 0x800930E8, size = 0x104 }, @@ -328,8 +328,8 @@ functions = [ { name = "strchr", vram = 0x8008F1A0, size = 0x40 }, { name = "__osPiRelAccess", vram = 0x8008C224, size = 0x2C }, { name = "RcpUtils_Reset", vram = 0x80084968, size = 0x38 }, - { name = "Fault_PrintFPCR", vram = 0x80082330, size = 0xA4 }, - { name = "DmaMgr_SendRequest0", vram = 0x80080C90, size = 0x7C }, + { name = "Fault_PrintFPCSR", vram = 0x80082330, size = 0xA4 }, + { name = "DmaMgr_RequestSync", vram = 0x80080C90, size = 0x7C }, { name = "Fault_FindFaultedThread", vram = 0x80082AB8, size = 0x88 }, { name = "IrqMgr_ThreadEntry", vram = 0x80081684, size = 0xD0 }, { name = "__osDisableInt", vram = 0x80091A60, size = 0x70 }, @@ -344,7 +344,7 @@ functions = [ { name = "Rand_Next_Variable", vram = 0x80087090, size = 0x28 }, { name = "floorf", vram = 0x80086C70, size = 0xC }, { name = "ceil", vram = 0x80086CB4, size = 0xC }, - { name = "IrqMgr_JamMesgForClient", vram = 0x800813B8, size = 0x64 }, + { name = "IrqMgr_JamMesgToClients", vram = 0x800813B8, size = 0x64 }, { name = "Main_InitMemory", vram = 0x800801EC, size = 0x64 }, { name = "Fault_ProcessClients", vram = 0x8008358C, size = 0xE4 }, { name = "__osSiRawReadIo", vram = 0x8008AEE0, size = 0x4C }, @@ -390,7 +390,7 @@ functions = [ { name = "__osSiGetAccess", vram = 0x80089AF0, size = 0x44 }, { name = "__osExceptionPreamble", vram = 0x80088B00, size = 0x10 }, { name = "Fault_FillScreenBlack", vram = 0x800820D8, size = 0x54 }, - { name = "DmaMgr_DmaHandler", vram = 0x800808D4, size = 0x20 }, + { name = "DmaMgr_AudioDmaHandler", vram = 0x800808D4, size = 0x20 }, { name = "osViGetCurrentFramebuffer", vram = 0x800964D0, size = 0x3C }, { name = "__ll_mul", vram = 0x800889A8, size = 0x30 }, { name = "osViSetMode", vram = 0x8008B650, size = 0x58 }, @@ -448,12 +448,12 @@ functions = [ { name = "ArenaImpl_LockInit", vram = 0x80087160, size = 0x2C }, { name = "__ll_mod", vram = 0x80088A38, size = 0x9C }, { name = "PadUtils_GetCurX", vram = 0x800851E0, size = 0x8 }, - { name = "DmaMgr_ProcessMsg", vram = 0x80080A08, size = 0x17C }, + { name = "DmaMgr_ProcessRequest", vram = 0x80080A08, size = 0x17C }, { name = "coss", vram = 0x80092260, size = 0x30 }, { name = "Main_ThreadEntry", vram = 0x80080300, size = 0x8C }, { name = "__osMallocR", vram = 0x80087408, size = 0xE4 }, { name = "Idle_InitVideo", vram = 0x8008038C, size = 0x188 }, - { name = "DmaMgr_Start", vram = 0x80080D0C, size = 0xF4 }, + { name = "DmaMgr_Init", vram = 0x80080D0C, size = 0xF4 }, { name = "floor", vram = 0x80086C7C, size = 0xC }, { name = "nsleep", vram = 0x800879CC, size = 0x50 }, { name = "Overlay_AllocateAndLoad", vram = 0x800850C8, size = 0x5C }, @@ -688,14 +688,14 @@ functions = [ { name = "Lights_New", vram = 0x80102834, size = 0x4C }, { name = "View_UpdateViewingMatrix", vram = 0x80140024, size = 0xA8 }, { name = "SubS_AngleDiffLessEqual", vram = 0x8013D5E8, size = 0x60 }, - { name = "func_8014CCB4", vram = 0x8014CCB4, size = 0x13C }, + { name = "Message_LoadRupeesJPN", vram = 0x8014CCB4, size = 0x13C }, { name = "func_8010AD24", vram = 0x8010AD24, size = 0xB0 }, { name = "AudioThread_ScheduleProcessCmds", vram = 0x80193900, size = 0x90 }, { name = "Matrix_MtxFCopy", vram = 0x80181CDC, size = 0x88 }, { name = "ListAlloc_Init", vram = 0x80174AA0, size = 0x14 }, { name = "Scene_CommandSkyboxDisables", vram = 0x8012FFF0, size = 0x28 }, { name = "func_80184C48", vram = 0x80184C48, size = 0x458 }, - { name = "Sched_RetraceUpdateFramebuffer", vram = 0x80176314, size = 0x50 }, + { name = "Sched_SwapFramebuffer", vram = 0x80176314, size = 0x50 }, { name = "SkinMatrix_SetScaleRotateYRPTranslate", vram = 0x80139894, size = 0x84 }, { name = "AudioSynth_Noop13", vram = 0x801880BC, size = 0x8 }, { name = "CollisionCheck_AC_TrisVsJntSph", vram = 0x800E494C, size = 0x1BC }, @@ -728,7 +728,7 @@ functions = [ { name = "EnItem00_DrawHeartContainer", vram = 0x800A74D8, size = 0xE0 }, { name = "CutsceneCamera_Init", vram = 0x8016119C, size = 0x90 }, { name = "AudioSfx_SetBankLerp", vram = 0x801A7794, size = 0x94 }, - { name = "AudioPlayback_InitNoteLists", vram = 0x80195DEC, size = 0x50 }, + { name = "AudioList_InitNoteLists", vram = 0x80195DEC, size = 0x50 }, { name = "func_800B2364", vram = 0x800B2364, size = 0x74 }, { name = "func_800FEAB0", vram = 0x800FEAB0, size = 0x10 }, { name = "Camera_Stub800DE0E0", vram = 0x800DE0E0, size = 0xC }, @@ -752,7 +752,7 @@ functions = [ { name = "Actor_ChangeCategory", vram = 0x800BC154, size = 0x34 }, { name = "Animation_OnFrameImpl", vram = 0x80136990, size = 0xB8 }, { name = "DebugDisplay_Init", vram = 0x800E9470, size = 0x18 }, - { name = "AudioScript_AudioListPushBack", vram = 0x80197E08, size = 0x40 }, + { name = "AudioList_PushBack", vram = 0x80197E08, size = 0x40 }, { name = "CollisionCheck_OC_SphereVsJntSph", vram = 0x800E7130, size = 0x2C }, { name = "Scene_CommandSpawnList", vram = 0x8012F79C, size = 0x170 }, { name = "AudioLoad_SyncInitSeqPlayer", vram = 0x8018FAD0, size = 0x50 }, @@ -922,7 +922,7 @@ functions = [ { name = "CutsceneCmd_SetTime", vram = 0x800EB1DC, size = 0x188 }, { name = "View_ApplyPerspectiveToOverlay", vram = 0x8013FD74, size = 0x2B0 }, { name = "func_800B8D50", vram = 0x800B8D50, size = 0x48 }, - { name = "Sched_TaskUpdateFramebuffer", vram = 0x801768E0, size = 0x3C }, + { name = "Sched_SetNextFramebufferFromTask", vram = 0x801768E0, size = 0x3C }, { name = "CollisionCheck_SetInfo", vram = 0x800E7530, size = 0x2C }, { name = "Sram_SetFlashPagesOwlSave", vram = 0x80147138, size = 0x18 }, { name = "Collider_SetJntSphToActor", vram = 0x800E0CA8, size = 0xDC }, @@ -1125,7 +1125,7 @@ functions = [ { name = "func_801845A4", vram = 0x801845A4, size = 0x24 }, { name = "Environment_EnableUnderwaterLights", vram = 0x800F6834, size = 0x118 }, { name = "LifeMeter_UpdateColors", vram = 0x8010069C, size = 0x3E4 }, - { name = "Setup_SetRegs", vram = 0x80173130, size = 0x1AC }, + { name = "Setup_InitRegs", vram = 0x80173130, size = 0x1AC }, { name = "func_8017D7C0", vram = 0x8017D7C0, size = 0x54 }, { name = "Schedule_CheckMiscS", vram = 0x8013296C, size = 0xAC }, { name = "Message_ShouldAdvanceSilent", vram = 0x80147734, size = 0x80 }, @@ -1217,7 +1217,7 @@ functions = [ { name = "Gfx_DrawTexQuadIA8", vram = 0x8010DC58, size = 0x1E0 }, { name = "Player_GetExchangeItemAction", vram = 0x800B8708, size = 0x10 }, { name = "Jpeg_ScheduleDecoderTask", vram = 0x800F42A0, size = 0x11C }, - { name = "AudioPlayback_NotePoolClear", vram = 0x80195EE0, size = 0x160 }, + { name = "AudioList_ClearNotePool", vram = 0x80195EE0, size = 0x160 }, { name = "Camera_GetPitchAdjFromFloorHeightDiffs", vram = 0x800CC9C0, size = 0x32C }, { name = "osFlashGetAddr", vram = 0x80186A70, size = 0x48 }, { name = "Audio_SetSeqTempoAndFreq", vram = 0x801A29D4, size = 0x1E4 }, @@ -1397,7 +1397,7 @@ functions = [ { name = "Camera_CalcAtForEnemyLockOn", vram = 0x800CE2B8, size = 0x328 }, { name = "TransitionOverlay_Free", vram = 0x8016537C, size = 0xBC }, { name = "Scene_CommandLightList", vram = 0x8012FDA4, size = 0x88 }, - { name = "AudioPlayback_AudioListPushFront", vram = 0x8019617C, size = 0x40 }, + { name = "AudioList_PushFront", vram = 0x8019617C, size = 0x40 }, { name = "osFlashInit", vram = 0x80186B78, size = 0x134 }, { name = "AudioSeq_QueueSeqCmd", vram = 0x801A89A8, size = 0x28 }, { name = "Scene_CommandEchoSetting", vram = 0x8013043C, size = 0x18 }, @@ -1504,7 +1504,7 @@ functions = [ { name = "Gfx_SetupDL51_Opa", vram = 0x8012C0D0, size = 0x28 }, { name = "func_800FE5D0", vram = 0x800FE5D0, size = 0x40 }, { name = "EffectSsHitmark_SpawnFixedScale", vram = 0x800B2684, size = 0x24 }, - { name = "Graph_BranchDlist", vram = 0x80174A4C, size = 0x18 }, + { name = "Gfx_Close", vram = 0x80174A4C, size = 0x18 }, { name = "SpeedMeter_InitImpl", vram = 0x80177390, size = 0x10 }, { name = "func_80170200", vram = 0x80170200, size = 0x3C }, { name = "Play_DecompressI5ToI8", vram = 0x80166644, size = 0x270 }, @@ -1606,7 +1606,7 @@ functions = [ { name = "WaterBox_GetBgCamSetting", vram = 0x800CA648, size = 0x70 }, { name = "Message_DrawSceneTitleCard", vram = 0x80153EF0, size = 0x2E4 }, { name = "func_80109B38", vram = 0x80109B38, size = 0x68 }, - { name = "func_80143148", vram = 0x80143148, size = 0xA0 }, + { name = "Skybox_Calculate128", vram = 0x80143148, size = 0xA0 }, { name = "Audio_ClearSariaBgm2", vram = 0x801A2460, size = 0xC }, { name = "func_801382C4", vram = 0x801382C4, size = 0x3C }, { name = "Collider_ResetLineOC", vram = 0x800E2434, size = 0x1C }, @@ -1754,7 +1754,7 @@ functions = [ { name = "TransitionTile_Destroy", vram = 0x8016424C, size = 0x8C }, { name = "func_801045AC", vram = 0x801045AC, size = 0x53C }, { name = "PlayerAnimation_Loop", vram = 0x80136288, size = 0x94 }, - { name = "Sched_HandleReset", vram = 0x80176364, size = 0xC }, + { name = "Sched_HandlePreNMI", vram = 0x80176364, size = 0xC }, { name = "Inventory_DeleteEquipment", vram = 0x8012ED78, size = 0x70 }, { name = "AudioSfx_SetProperties", vram = 0x8019EB2C, size = 0x4F8 }, { name = "func_800BE504", vram = 0x800BE504, size = 0x64 }, @@ -1838,7 +1838,7 @@ functions = [ { name = "Health_ChangeBy", vram = 0x80115908, size = 0xB8 }, { name = "PadMgr_ThreadEntry", vram = 0x80176010, size = 0x184 }, { name = "Environment_UpdatePostmanEvents", vram = 0x800F8A9C, size = 0x238 }, - { name = "Message_SetupLoadItemIcon", vram = 0x8014CFDC, size = 0x328 }, + { name = "Message_DecodeHeader", vram = 0x8014CFDC, size = 0x328 }, { name = "AnimatedMat_TexScroll", vram = 0x80130834, size = 0x6C }, { name = "CollisionCheck_SetATvsAC", vram = 0x800E3324, size = 0x2A4 }, { name = "Actor_GetArrowDmgFlags", vram = 0x800BC188, size = 0x2C }, @@ -1906,7 +1906,7 @@ functions = [ { name = "SkelAnime_DrawTransformFlexOpa", vram = 0x801343C0, size = 0x240 }, { name = "Message_GetTimerDigits", vram = 0x8014CDF0, size = 0x1EC }, { name = "CollisionCheck_GreenBlood", vram = 0x800E2D88, size = 0x16C }, - { name = "func_80142440", vram = 0x80142440, size = 0xD08 }, + { name = "Skybox_CalculateFace128", vram = 0x80142440, size = 0xD08 }, { name = "BgCheck_CheckDynaCeiling", vram = 0x800C8A60, size = 0x170 }, { name = "func_80106D08", vram = 0x80106D08, size = 0x54 }, { name = "Math_Vec3f_Diff", vram = 0x800FF5F4, size = 0x38 }, @@ -1993,7 +1993,7 @@ functions = [ { name = "Gfx_SetupDL53_Opa", vram = 0x8012C120, size = 0x28 }, { name = "Play_DrawMotionBlur", vram = 0x80165460, size = 0x1A8 }, { name = "Scene_CommandCollisionHeader", vram = 0x8012F984, size = 0xA0 }, - { name = "MsgEvent_SendNullTask", vram = 0x8010C1B0, size = 0x74 }, + { name = "Sched_FlushTaskQueue", vram = 0x8010C1B0, size = 0x74 }, { name = "Gfx_SetupDL25_Opa", vram = 0x8012C28C, size = 0x28 }, { name = "AnimatedMat_DrawAlphaOpa", vram = 0x8013182C, size = 0x38 }, { name = "func_80109428", vram = 0x80109428, size = 0x78 }, @@ -2109,7 +2109,7 @@ functions = [ { name = "Skin_DrawLimb", vram = 0x80137F58, size = 0xF8 }, { name = "Camera_Demo6", vram = 0x800DC718, size = 0x20 }, { name = "AudioMgr_ThreadEntry", vram = 0x80172ED0, size = 0x178 }, - { name = "Graph_GfxPlusOne", vram = 0x80174A40, size = 0xC }, + { name = "Gfx_Open", vram = 0x80174A40, size = 0xC }, { name = "Actor_Draw", vram = 0x800B9A04, size = 0x318 }, { name = "func_80152CAC", vram = 0x80152CAC, size = 0x214 }, { name = "EffectSsKakera_Spawn", vram = 0x800B2810, size = 0xB8 }, @@ -2444,7 +2444,7 @@ functions = [ { name = "func_80184914", vram = 0x80184914, size = 0x8C }, { name = "Matrix_Init", vram = 0x80180160, size = 0x3C }, { name = "Graph_SetNextGfxPool", vram = 0x80173DCC, size = 0x1CC }, - { name = "AudioPlayback_AudioListRemove", vram = 0x801961BC, size = 0x2C }, + { name = "AudioList_Remove", vram = 0x801961BC, size = 0x2C }, { name = "AudioHeap_SearchPermanentCache", vram = 0x8018D57C, size = 0x58 }, { name = "func_8010AF6C", vram = 0x8010AF6C, size = 0x28 }, { name = "func_80127438", vram = 0x80127438, size = 0x50 }, @@ -2518,7 +2518,7 @@ functions = [ { name = "Collider_SetQuadDim", vram = 0x800E1D90, size = 0x88 }, { name = "Environment_IsTimeStopped", vram = 0x800FE4A8, size = 0x10 }, { name = "SubS_TimePathing_Update", vram = 0x8013B6B0, size = 0x1C8 }, - { name = "func_80143324", vram = 0x80143324, size = 0x1C0 }, + { name = "Skybox_Reload", vram = 0x80143324, size = 0x1C0 }, { name = "Math3D_LineVsCube", vram = 0x8017AD38, size = 0x954 }, { name = "Math_Vec3s_DiffToVec3f", vram = 0x800FF62C, size = 0x5C }, { name = "PlayerCall_Draw", vram = 0x80160BC0, size = 0x40 }, @@ -2591,7 +2591,7 @@ functions = [ { name = "func_800CBFA4", vram = 0x800CBFA4, size = 0x5C }, { name = "Camera_GetInputDirYaw", vram = 0x800DFC68, size = 0x28 }, { name = "AudioVoice_GetVoiceMaskPattern", vram = 0x801A54C4, size = 0xC }, - { name = "func_80185F90", vram = 0x80185F90, size = 0x98 }, + { name = "Kanji_OffsetFromShiftJIS", vram = 0x80185F90, size = 0x98 }, { name = "Schedule_CheckTimeRangeS", vram = 0x80132494, size = 0x224 }, { name = "PadMgr_LockPadData", vram = 0x8017509C, size = 0x30 }, { name = "func_800CBAAC", vram = 0x800CBAAC, size = 0x28 }, @@ -2629,7 +2629,7 @@ functions = [ { name = "func_80107B78", vram = 0x80107B78, size = 0x5AC }, { name = "func_800B10C0", vram = 0x800B10C0, size = 0x70 }, { name = "SubS_DrawTransformFlexLimb", vram = 0x8013A860, size = 0x2A0 }, - { name = "AudioPlayback_NotePoolFill", vram = 0x80196040, size = 0x13C }, + { name = "AudioList_FillNotePool", vram = 0x80196040, size = 0x13C }, { name = "func_8010B22C", vram = 0x8010B22C, size = 0x58 }, { name = "func_8010534C", vram = 0x8010534C, size = 0x150 }, { name = "SurfaceType_GetFloorEffect", vram = 0x800C9C74, size = 0x28 }, @@ -2664,7 +2664,7 @@ functions = [ { name = "SubS_OfferTalkExchangeFacing", vram = 0x8013E8F8, size = 0x58 }, { name = "PreRender_SaveZBuffer", vram = 0x8017057C, size = 0x38 }, { name = "func_800F8970", vram = 0x800F8970, size = 0x12C }, - { name = "AudioPlayback_InitNoteList", vram = 0x80195DDC, size = 0x10 }, + { name = "AudioList_InitNoteList", vram = 0x80195DDC, size = 0x10 }, { name = "EffectSsIcePiece_Spawn", vram = 0x800B28C8, size = 0x68 }, { name = "Collider_DestroyJntSph", vram = 0x800E0C18, size = 0x90 }, { name = "Actor_PlaySfx_FlaggedCentered3", vram = 0x800B8FE8, size = 0x28 }, @@ -2789,7 +2789,7 @@ functions = [ { name = "Actor_TrackNone", vram = 0x800E8F08, size = 0x9C }, { name = "Message_StartTextbox", vram = 0x801518B0, size = 0x88 }, { name = "GameAlloc_Free", vram = 0x80173C7C, size = 0x4C }, - { name = "D_80186028", vram = 0x80186028, size = 0xA48 }, + { name = "sNonKanjiIndices", vram = 0x80186028, size = 0xA48 }, { name = "func_8010A85C", vram = 0x8010A85C, size = 0x48 }, { name = "Camera_GetInputDir", vram = 0x800DFC1C, size = 0x24 }, { name = "CollisionCheck_RedBlood", vram = 0x800E2F30, size = 0x24 }, @@ -3033,7 +3033,7 @@ functions = [ { name = "OLib_Vec3fDistOutDiff", vram = 0x8010C274, size = 0x5C }, { name = "TitleCard_Update", vram = 0x800B5E68, size = 0xBC }, { name = "Matrix_RotateZF", vram = 0x80180E90, size = 0x1AC }, - { name = "Sched_SwapFramebuffer", vram = 0x80176280, size = 0x94 }, + { name = "Sched_SwapFramebufferImpl", vram = 0x80176280, size = 0x94 }, { name = "DynaPolyActor_UnsetAllInteractFlags", vram = 0x800CAE7C, size = 0xC }, { name = "GameState_Noop", vram = 0x80173534, size = 0xC }, { name = "Collider_ResetOCInfo", vram = 0x800E0944, size = 0x18 }, @@ -3172,7 +3172,7 @@ functions = [ { name = "Sched_FaultClient", vram = 0x80177084, size = 0xD8 }, { name = "Play_GetCameraUID", vram = 0x80169BC4, size = 0x34 }, { name = "CollisionCheck_BlueBlood", vram = 0x800E2C1C, size = 0x16C }, - { name = "AudioPlayback_FindNodeWithPrioLessThan", vram = 0x801961E8, size = 0x80 }, + { name = "AudioList_FindNodeWithPrioLessThan", vram = 0x801961E8, size = 0x80 }, { name = "func_8017D1AC", vram = 0x8017D1AC, size = 0x74 }, { name = "Math3D_Parallel", vram = 0x80179E88, size = 0x24 }, { name = "func_800BD9E0", vram = 0x800BD9E0, size = 0xC0 }, @@ -3302,7 +3302,7 @@ functions = [ { name = "KaleidoScopeCall_LoadPlayer", vram = 0x801639A0, size = 0x4C }, { name = "GameState_IsRunning", vram = 0x80173B18, size = 0xC }, { name = "Actor_OffsetOfPointInActorCoords", vram = 0x800B6E6C, size = 0xA0 }, - { name = "Sched_HandleEntry", vram = 0x80176B34, size = 0xF0 }, + { name = "Sched_HandleNotify", vram = 0x80176B34, size = 0xF0 }, { name = "EffectSsKirakira_SpawnSmall", vram = 0x800B16B8, size = 0x3C }, { name = "AudioSfx_RestoreBgmVolume", vram = 0x801A5C8C, size = 0x70 }, { name = "Actor_DrawLensOverlay", vram = 0x800B9E84, size = 0x70 }, @@ -3541,7 +3541,7 @@ functions = [ { name = "Collider_UpdateSpheresElement", vram = 0x800E8160, size = 0xDC }, { name = "Map_IsInDungeonArea", vram = 0x8010A164, size = 0x30 }, { name = "Audio_PlaySfx_AtPosWithSyncedFreqAndVolume", vram = 0x8019F780, size = 0x58 }, - { name = "VisZbuf_Draw", vram = 0x80142100, size = 0x338 }, + { name = "VisZBuf_Draw", vram = 0x80142100, size = 0x338 }, { name = "func_8010ADD4", vram = 0x8010ADD4, size = 0x74 }, { name = "func_8010BF24", vram = 0x8010BF24, size = 0x34 }, { name = "Sram_OpenSave", vram = 0x80144E78, size = 0x5F4 }, @@ -3685,7 +3685,7 @@ functions = [ { name = "GameAlloc_Cleanup", vram = 0x80173CC8, size = 0x50 }, { name = "Camera_Normal2", vram = 0x800D0874, size = 0x20 }, { name = "SurfaceType_GetSceneExitIndex", vram = 0x800C99AC, size = 0x28 }, - { name = "Sched_TaskCheckFramebuffers", vram = 0x80176748, size = 0x70 }, + { name = "Sched_TaskFramebuffersValid", vram = 0x80176748, size = 0x70 }, { name = "EffectSsGSpk_SpawnNoAccel", vram = 0x800B1BDC, size = 0x94 }, { name = "SubS_IsObjectLoaded", vram = 0x8013D8DC, size = 0x48 }, { name = "AudioHeap_AllocSampleCache", vram = 0x8018D658, size = 0x70 }, @@ -3779,7 +3779,7 @@ functions = [ { name = "CutsceneCmd_ModifySequence", vram = 0x800EADB0, size = 0x11C }, { name = "SpeedMeter_DrawAllocEntry", vram = 0x80177AC8, size = 0x390 }, { name = "Skybox_Init", vram = 0x801434E4, size = 0xBC }, - { name = "Sched_NotifyDone", vram = 0x8017691C, size = 0x6C }, + { name = "Sched_TaskComplete", vram = 0x8017691C, size = 0x6C }, { name = "BgCheck_SetContextFlags", vram = 0x800C3C00, size = 0x14 }, { name = "CutsceneCamera_Interp_Scale", vram = 0x80161E4C, size = 0x280 }, { name = "Actor_TrackPlayer", vram = 0x800E9250, size = 0x10C }, @@ -3835,7 +3835,7 @@ functions = [ { name = "func_801242B4", vram = 0x801242B4, size = 0x28 }, { name = "EffectSsDtBubble_SpawnCustomColor", vram = 0x800B210C, size = 0x90 }, { name = "func_801234D4", vram = 0x801234D4, size = 0xBC }, - { name = "AudioScript_AudioListPopBack", vram = 0x80197E48, size = 0x40 }, + { name = "AudioList_PopBack", vram = 0x80197E48, size = 0x40 }, { name = "DynaPolyActor_SetActorOnTop", vram = 0x800CAE88, size = 0x14 }, { name = "Collider_SetSphere", vram = 0x800E21F4, size = 0x68 }, { name = "Quake_CallbackType6", vram = 0x8012A3B4, size = 0x84 }, @@ -3886,7 +3886,7 @@ functions = [ { name = "Cutscene_InitContext", vram = 0x800EA060, size = 0x74 }, { name = "func_8010565C", vram = 0x8010565C, size = 0x1BC }, { name = "Message_DisplayOcarinaStaff", vram = 0x80152434, size = 0x30 }, - { name = "VisZbuf_Init", vram = 0x801420C0, size = 0x34 }, + { name = "VisZBuf_Init", vram = 0x801420C0, size = 0x34 }, { name = "SysFlashrom_WriteDataSync", vram = 0x80185F64, size = 0x28 }, { name = "Cutscene_StopManual", vram = 0x800EA0EC, size = 0x24 }, { name = "AudioScript_InitSequencePlayerChannels", vram = 0x8019AC10, size = 0xDC }, @@ -3894,7 +3894,7 @@ functions = [ { name = "EnHy_UpdateCollider", vram = 0x800F10AC, size = 0x80 }, { name = "Sched_SendAudioCancelMsg", vram = 0x8017703C, size = 0x24 }, { name = "CollisionCheck_RedBloodUnused", vram = 0x800E2F54, size = 0x24 }, - { name = "Sched_HandleStop", vram = 0x80176370, size = 0x24 }, + { name = "Sched_HandleNMI", vram = 0x80176370, size = 0x24 }, { name = "JpegUtils_ParseHuffmanCodesLengths", vram = 0x801A9B78, size = 0x84 }, { name = "LifeMeter_Init", vram = 0x801005C0, size = 0xDC }, { name = "AudioSynth_LoadResampledReverbSamples", vram = 0x80188698, size = 0x1A4 }, @@ -3943,10 +3943,10 @@ functions = [ { name = "AudioHeap_ResetLoadStatus", vram = 0x8018B250, size = 0xC8 }, { name = "Lib_MemSet", vram = 0x800FECC0, size = 0x84 }, { name = "Snap_CheckFlag", vram = 0x8013A4C4, size = 0x40 }, - { name = "Sched_SendEntryMsg", vram = 0x80177018, size = 0x24 }, + { name = "Sched_SendNotifyMsg", vram = 0x80177018, size = 0x24 }, { name = "AudioSynth_Noop12", vram = 0x801880B4, size = 0x8 }, { name = "SkelCurve_Init", vram = 0x800F2650, size = 0x70 }, - { name = "AudioPlayback_InitNoteFreeList", vram = 0x80195E3C, size = 0xA4 }, + { name = "AudioList_InitNoteFreeList", vram = 0x80195E3C, size = 0xA4 }, { name = "Inventory_IncrementSkullTokenCount", vram = 0x8012F1BC, size = 0x70 }, { name = "SkinMatrix_MtxFToMtx", vram = 0x80139A00, size = 0x218 }, { name = "AudioHeap_ReleaseNotesForFont", vram = 0x8018B3FC, size = 0x78 }, @@ -4014,7 +4014,7 @@ functions = [ { name = "AudioLoad_InitSlowLoads", vram = 0x80190F50, size = 0x14 }, { name = "CutsceneManager_GetAdditionalCsId", vram = 0x800F20B8, size = 0x40 }, { name = "func_800CC260", vram = 0x800CC260, size = 0x228 }, - { name = "VisZbuf_Destroy", vram = 0x801420F4, size = 0xC }, + { name = "VisZBuf_Destroy", vram = 0x801420F4, size = 0xC }, { name = "Play_ClearCamera", vram = 0x80169600, size = 0x68 }, { name = "Camera_CalcAtForFriendlyLockOn", vram = 0x800CDE6C, size = 0x44C }, { name = "Gfx_SetupDL52_Xlu", vram = 0x8012C0F8, size = 0x28 }, @@ -4092,7 +4092,7 @@ functions = [ { name = "DynaPoly_AllocVtxList", vram = 0x800C5F44, size = 0x48 }, { name = "Collider_SetTrisVertices", vram = 0x800E7ECC, size = 0xC0 }, { name = "Audio_PlaySfx_2", vram = 0x8019F128, size = 0x48 }, - { name = "Graph_DlistAlloc", vram = 0x80174A64, size = 0x34 }, + { name = "Gfx_Alloc", vram = 0x80174A64, size = 0x34 }, { name = "Interface_SetOrthoView", vram = 0x801170B8, size = 0x48 }, { name = "Gfx_DrawTexRectI8", vram = 0x8010D7D0, size = 0x224 }, { name = "AudioSfx_ComputeCombFilter", vram = 0x8019EA40, size = 0xEC }, @@ -23789,7 +23789,7 @@ functions = [ { name = "func_8094FE10", vram = 0x8094FE10, size = 0xF4 }, { name = "EnGm_OverrideLimbDraw", vram = 0x809513AC, size = 0x110 }, { name = "EnGm_Destroy", vram = 0x80951224, size = 0x40 }, - { name = "func_8094DEE0", vram = 0x8094DEE0, size = 0xB0 }, + { name = "EnGm_FindActor", vram = 0x8094DEE0, size = 0xB0 }, { name = "func_8094EFC4", vram = 0x8094EFC4, size = 0xB0 }, { name = "func_8094EDBC", vram = 0x8094EDBC, size = 0xC8 }, { name = "func_8094FAC4", vram = 0x8094FAC4, size = 0x200 }, @@ -24778,19 +24778,19 @@ relocs = [ functions = [ { name = "func_809613B0", vram = 0x809613B0, size = 0x14 }, - { name = "func_8096104C", vram = 0x8096104C, size = 0x170 }, - { name = "func_8096147C", vram = 0x8096147C, size = 0x14 }, - { name = "func_80960F0C", vram = 0x80960F0C, size = 0x10C }, - { name = "func_80960E0C", vram = 0x80960E0C, size = 0x100 }, - { name = "func_809611BC", vram = 0x809611BC, size = 0x100 }, - { name = "func_809613E8", vram = 0x809613E8, size = 0x14 }, + { name = "ObjMure2_SpawnChildren", vram = 0x8096104C, size = 0x170 }, + { name = "ObjMure2_SetupWaitForPlayerOutOfRange", vram = 0x8096147C, size = 0x14 }, + { name = "ObjMure2_GetRocksSpawnPos", vram = 0x80960F0C, size = 0x10C }, + { name = "ObjMure2_GetBushScatteredPos", vram = 0x80960E0C, size = 0x100 }, + { name = "ObjMure2_KillChildren", vram = 0x809611BC, size = 0x100 }, + { name = "ObjMure2_SetupWaitForPlayerInRange", vram = 0x809613E8, size = 0x14 }, { name = "ObjMure2_Init", vram = 0x80961350, size = 0x60 }, - { name = "func_809612BC", vram = 0x809612BC, size = 0x94 }, - { name = "func_809613FC", vram = 0x809613FC, size = 0x80 }, + { name = "ObjMure2_ClearChildrenList", vram = 0x809612BC, size = 0x94 }, + { name = "ObjMure2_WaitForPlayerInRange", vram = 0x809613FC, size = 0x80 }, { name = "func_809613C4", vram = 0x809613C4, size = 0x24 }, - { name = "func_80961490", vram = 0x80961490, size = 0x90 }, - { name = "func_80961018", vram = 0x80961018, size = 0x34 }, - { name = "func_80960CF0", vram = 0x80960CF0, size = 0x11C }, + { name = "ObjMure2_WaitForPlayerOutOfRange", vram = 0x80961490, size = 0x90 }, + { name = "ObjMure2_GetChildParams", vram = 0x80961018, size = 0x34 }, + { name = "ObjMure2_GetBushCircleSpawnPos", vram = 0x80960CF0, size = 0x11C }, { name = "ObjMure2_Update", vram = 0x80961520, size = 0x50 }, ] @@ -42472,53 +42472,53 @@ relocs = [ ] functions = [ - { name = "func_80A8146C", vram = 0x80A8146C, size = 0xD8 }, - { name = "func_80A81640", vram = 0x80A81640, size = 0xC }, - { name = "func_80A8131C", vram = 0x80A8131C, size = 0x68 }, - { name = "func_80A83214", vram = 0x80A83214, size = 0x44 }, - { name = "func_80A828A8", vram = 0x80A828A8, size = 0x380 }, - { name = "func_80A832BC", vram = 0x80A832BC, size = 0x14 }, - { name = "func_80A83E7C", vram = 0x80A83E7C, size = 0x24 }, - { name = "func_80A83B14", vram = 0x80A83B14, size = 0x14 }, - { name = "func_80A81FFC", vram = 0x80A81FFC, size = 0x8AC }, - { name = "func_80A8164C", vram = 0x80A8164C, size = 0x38 }, - { name = "func_80A811D0", vram = 0x80A811D0, size = 0x3C }, - { name = "func_80A82FA8", vram = 0x80A82FA8, size = 0x20 }, - { name = "func_80A81A00", vram = 0x80A81A00, size = 0xA4 }, - { name = "func_80A82FC8", vram = 0x80A82FC8, size = 0x24C }, - { name = "func_80A83D00", vram = 0x80A83D00, size = 0x8C }, - { name = "func_80A81B14", vram = 0x80A81B14, size = 0x68 }, - { name = "func_80A83A88", vram = 0x80A83A88, size = 0x8C }, - { name = "func_80A82C28", vram = 0x80A82C28, size = 0x34 }, + { name = "ObjMine_Air_CheckAC", vram = 0x80A8146C, size = 0xD8 }, + { name = "ObjMine_AirWater_Noop", vram = 0x80A81640, size = 0xC }, + { name = "ObjMine_Path_SpawnBomb", vram = 0x80A8131C, size = 0x68 }, + { name = "ObjMine_SetupExplode", vram = 0x80A83214, size = 0x44 }, + { name = "ObjMine_Water_UpdateLinks", vram = 0x80A828A8, size = 0x380 }, + { name = "ObjMine_Air_SetupChained", vram = 0x80A832BC, size = 0x14 }, + { name = "ObjMine_AirWater_Update", vram = 0x80A83E7C, size = 0x24 }, + { name = "ObjMine_Water_SetupChained", vram = 0x80A83B14, size = 0x14 }, + { name = "ObjMine_Water_ApplyForces", vram = 0x80A81FFC, size = 0x8AC }, + { name = "ObjMine_ReplaceTranslation", vram = 0x80A8164C, size = 0x38 }, + { name = "ObjMine_Path_MoveToWaypoint", vram = 0x80A811D0, size = 0x3C }, + { name = "ObjMine_Path_SetupMove", vram = 0x80A82FA8, size = 0x20 }, + { name = "ObjMine_Air_SetBasis", vram = 0x80A81A00, size = 0xA4 }, + { name = "ObjMine_Path_Move", vram = 0x80A82FC8, size = 0x24C }, + { name = "ObjMine_Water_Stationary", vram = 0x80A83D00, size = 0x8C }, + { name = "ObjMine_Air_SetChainXZ", vram = 0x80A81B14, size = 0x68 }, + { name = "ObjMine_Air_Stationary", vram = 0x80A83A88, size = 0x8C }, + { name = "ObjMine_Water_UpdateChain", vram = 0x80A82C28, size = 0x34 }, { name = "ObjMine_Destroy", vram = 0x80A82F58, size = 0x2C }, - { name = "func_80A81E7C", vram = 0x80A81E7C, size = 0x180 }, - { name = "func_80A8140C", vram = 0x80A8140C, size = 0x60 }, - { name = "func_80A84088", vram = 0x80A84088, size = 0x2B0 }, - { name = "func_80A81B7C", vram = 0x80A81B7C, size = 0x1F4 }, - { name = "func_80A81D70", vram = 0x80A81D70, size = 0x7C }, - { name = "func_80A832D0", vram = 0x80A832D0, size = 0x7A4 }, - { name = "func_80A81714", vram = 0x80A81714, size = 0x104 }, - { name = "func_80A81AA4", vram = 0x80A81AA4, size = 0x70 }, - { name = "func_80A8120C", vram = 0x80A8120C, size = 0x7C }, - { name = "func_80A81818", vram = 0x80A81818, size = 0x50 }, - { name = "func_80A81684", vram = 0x80A81684, size = 0x90 }, - { name = "func_80A81868", vram = 0x80A81868, size = 0x13C }, - { name = "func_80A81DEC", vram = 0x80A81DEC, size = 0x90 }, + { name = "ObjMine_Water_WallCheck", vram = 0x80A81E7C, size = 0x180 }, + { name = "ObjMine_AirWater_CheckOC", vram = 0x80A8140C, size = 0x60 }, + { name = "ObjMine_Air_Draw", vram = 0x80A84088, size = 0x2B0 }, + { name = "ObjMine_Water_InitChain", vram = 0x80A81B7C, size = 0x1F4 }, + { name = "ObjMine_Water_InitCollider", vram = 0x80A81D70, size = 0x7C }, + { name = "ObjMine_Air_Chained", vram = 0x80A832D0, size = 0x7A4 }, + { name = "ObjMine_StepUntilParallel", vram = 0x80A81714, size = 0x104 }, + { name = "ObjMine_Air_SetWorld", vram = 0x80A81AA4, size = 0x70 }, + { name = "ObjMine_GetUnitVec3f", vram = 0x80A8120C, size = 0x7C }, + { name = "ObjMine_UpdateCollider", vram = 0x80A81818, size = 0x50 }, + { name = "ObjMine_SetRotation", vram = 0x80A81684, size = 0x90 }, + { name = "ObjMine_Air_InitChain", vram = 0x80A81868, size = 0x13C }, + { name = "ObjMine_Water_SetWorld", vram = 0x80A81DEC, size = 0x90 }, { name = "ObjMine_Init", vram = 0x80A82C5C, size = 0x2FC }, - { name = "func_80A81544", vram = 0x80A81544, size = 0xFC }, - { name = "ObjMine_Update", vram = 0x80A83D8C, size = 0xF0 }, - { name = "func_80A83FBC", vram = 0x80A83FBC, size = 0xCC }, - { name = "ObjMine_Draw", vram = 0x80A83EA0, size = 0x11C }, - { name = "func_80A82F84", vram = 0x80A82F84, size = 0x14 }, - { name = "func_80A81288", vram = 0x80A81288, size = 0x94 }, - { name = "func_80A83CEC", vram = 0x80A83CEC, size = 0x14 }, - { name = "func_80A84338", vram = 0x80A84338, size = 0x218 }, - { name = "func_80A83A74", vram = 0x80A83A74, size = 0x14 }, - { name = "func_80A82F98", vram = 0x80A82F98, size = 0x10 }, - { name = "func_80A81384", vram = 0x80A81384, size = 0x88 }, - { name = "func_80A819A4", vram = 0x80A819A4, size = 0x5C }, - { name = "func_80A83B28", vram = 0x80A83B28, size = 0x1C4 }, - { name = "func_80A83258", vram = 0x80A83258, size = 0x64 }, + { name = "ObjMine_Water_CheckAC", vram = 0x80A81544, size = 0xFC }, + { name = "ObjMine_Path_Update", vram = 0x80A83D8C, size = 0xF0 }, + { name = "ObjMine_DrawExplosion", vram = 0x80A83FBC, size = 0xCC }, + { name = "ObjMine_Path_Draw", vram = 0x80A83EA0, size = 0x11C }, + { name = "ObjMine_Path_SetupStationary", vram = 0x80A82F84, size = 0x14 }, + { name = "ObjMine_GetUnitVec3fNorm", vram = 0x80A81288, size = 0x94 }, + { name = "ObjMine_Water_SetupStationary", vram = 0x80A83CEC, size = 0x14 }, + { name = "ObjMine_Water_Draw", vram = 0x80A84338, size = 0x218 }, + { name = "ObjMine_Air_SetupStationary", vram = 0x80A83A74, size = 0x14 }, + { name = "ObjMine_Path_Stationary", vram = 0x80A82F98, size = 0x10 }, + { name = "ObjMine_AirWater_SpawnBomb", vram = 0x80A81384, size = 0x88 }, + { name = "ObjMine_Air_InitCollider", vram = 0x80A819A4, size = 0x5C }, + { name = "ObjMine_Water_Chained", vram = 0x80A83B28, size = 0x1C4 }, + { name = "ObjMine_Explode", vram = 0x80A83258, size = 0x64 }, ] # Autogenerated from an ELF via N64Recomp @@ -48598,13 +48598,13 @@ functions = [ { name = "func_80AE68F0", vram = 0x80AE68F0, size = 0xF8 }, { name = "func_80AE626C", vram = 0x80AE626C, size = 0x13C }, { name = "EnShn_PostLimbDraw", vram = 0x80AE6D40, size = 0x50 }, - { name = "func_80AE615C", vram = 0x80AE615C, size = 0x64 }, + { name = "EnShn_ChangeAnim", vram = 0x80AE615C, size = 0x64 }, { name = "EnShn_Init", vram = 0x80AE6B30, size = 0x11C }, { name = "EnShn_TransformLimbDraw", vram = 0x80AE6D90, size = 0xFC }, { name = "EnShn_OverrideLimbDraw", vram = 0x80AE6CF0, size = 0x50 }, { name = "func_80AE63A8", vram = 0x80AE63A8, size = 0xE0 }, { name = "func_80AE69E8", vram = 0x80AE69E8, size = 0x7C }, - { name = "func_80AE6130", vram = 0x80AE6130, size = 0x2C }, + { name = "EnShn_UpdateSkelAnime", vram = 0x80AE6130, size = 0x2C }, ] # Autogenerated from an ELF via N64Recomp @@ -48927,7 +48927,7 @@ functions = [ { name = "EnLiftNuts_RunGame", vram = 0x80AEB294, size = 0x14C }, { name = "EnLiftNuts_StartGameImmediately", vram = 0x80AEB230, size = 0x50 }, { name = "EnLiftNuts_GetNumDaysWon", vram = 0x80AE9B8C, size = 0x40 }, - { name = "EnLiftNuts_HandleConversation5", vram = 0x80AEA910, size = 0x2E0 }, + { name = "EnLiftNuts_HandleConversationEvent", vram = 0x80AEA910, size = 0x2E0 }, { name = "EnLiftNuts_RiseUp", vram = 0x80AEA128, size = 0x78 }, { name = "EnLiftNuts_SetupMovePlayerToActor", vram = 0x80AEAF8C, size = 0x14 }, { name = "EnLiftNuts_UpdateCollision", vram = 0x80AEBB30, size = 0x44 }, @@ -49946,7 +49946,7 @@ functions = [ { name = "func_80AF8040", vram = 0x80AF8040, size = 0xB4 }, { name = "func_80AF9008", vram = 0x80AF9008, size = 0x1E0 }, { name = "func_80AFA4D0", vram = 0x80AFA4D0, size = 0x12C }, - { name = "func_80AF7CB0", vram = 0x80AF7CB0, size = 0xB0 }, + { name = "EnPm_FindActor", vram = 0x80AF7CB0, size = 0xB0 }, { name = "func_80AF8D84", vram = 0x80AF8D84, size = 0x50 }, { name = "func_80AF992C", vram = 0x80AF992C, size = 0xE0 }, { name = "func_80AF91E8", vram = 0x80AF91E8, size = 0x2C4 }, @@ -50963,85 +50963,85 @@ relocs = [ ] functions = [ - { name = "func_80B09EDC", vram = 0x80B09EDC, size = 0xA0 }, - { name = "func_80B0D750", vram = 0x80B0D750, size = 0x27C }, - { name = "func_80B0E548", vram = 0x80B0E548, size = 0x5C }, - { name = "func_80B0D9CC", vram = 0x80B0D9CC, size = 0x5DC }, - { name = "func_80B06C08", vram = 0x80B06C08, size = 0x130 }, - { name = "func_80B0B660", vram = 0x80B0B660, size = 0x480 }, - { name = "func_80B0E5A4", vram = 0x80B0E5A4, size = 0x13C }, - { name = "func_80B0A8C4", vram = 0x80B0A8C4, size = 0x36C }, - { name = "func_80B07700", vram = 0x80B07700, size = 0x21C }, - { name = "func_80B0C7B0", vram = 0x80B0C7B0, size = 0x340 }, - { name = "func_80B0573C", vram = 0x80B0573C, size = 0x68 }, - { name = "func_80B0AC30", vram = 0x80B0AC30, size = 0x1CC }, - { name = "func_80B09E20", vram = 0x80B09E20, size = 0x64 }, - { name = "func_80B07BFC", vram = 0x80B07BFC, size = 0x1A8 }, - { name = "func_80B0C000", vram = 0x80B0C000, size = 0x1BC }, - { name = "func_80B0863C", vram = 0x80B0863C, size = 0x20C }, - { name = "func_80B07DA4", vram = 0x80B07DA4, size = 0x148 }, - { name = "func_80B05D4C", vram = 0x80B05D4C, size = 0x194 }, - { name = "func_80B0A2A4", vram = 0x80B0A2A4, size = 0x348 }, - { name = "func_80B09E84", vram = 0x80B09E84, size = 0x58 }, - { name = "func_80B09840", vram = 0x80B09840, size = 0x7C }, - { name = "func_80B0A87C", vram = 0x80B0A87C, size = 0x48 }, - { name = "func_80B0ADFC", vram = 0x80B0ADFC, size = 0x43C }, - { name = "func_80B05B04", vram = 0x80B05B04, size = 0x1B8 }, - { name = "func_80B058C0", vram = 0x80B058C0, size = 0x1A4 }, - { name = "func_80B093C0", vram = 0x80B093C0, size = 0x120 }, - { name = "func_80B057A4", vram = 0x80B057A4, size = 0x11C }, - { name = "func_80B09A94", vram = 0x80B09A94, size = 0x1E4 }, - { name = "func_80B05EE0", vram = 0x80B05EE0, size = 0x19C }, - { name = "func_80B08550", vram = 0x80B08550, size = 0xEC }, - { name = "func_80B0DFA8", vram = 0x80B0DFA8, size = 0x5A0 }, - { name = "func_80B0813C", vram = 0x80B0813C, size = 0x120 }, - { name = "func_80B0825C", vram = 0x80B0825C, size = 0x50 }, - { name = "func_80B082AC", vram = 0x80B082AC, size = 0x2A4 }, - { name = "func_80B094E0", vram = 0x80B094E0, size = 0x360 }, - { name = "func_80B0C570", vram = 0x80B0C570, size = 0x240 }, - { name = "func_80B09F7C", vram = 0x80B09F7C, size = 0x328 }, - { name = "func_80B07450", vram = 0x80B07450, size = 0x2B0 }, - { name = "func_80B0D69C", vram = 0x80B0D69C, size = 0xB4 }, - { name = "func_80B07B88", vram = 0x80B07B88, size = 0x74 }, - { name = "func_80B0607C", vram = 0x80B0607C, size = 0x4DC }, + { name = "BossHakugin_CutsceneStart", vram = 0x80B09EDC, size = 0xA0 }, + { name = "BossHakugin_DrawShadowTex", vram = 0x80B0D750, size = 0x27C }, + { name = "BossHakugin_UpdateStationaryCrushingRocks", vram = 0x80B0E548, size = 0x5C }, + { name = "BossHakugin_SpawnCrushingRocks", vram = 0x80B0D9CC, size = 0x5DC }, + { name = "BossHakugin_SpawnStalactite", vram = 0x80B06C08, size = 0x130 }, + { name = "BossHakugin_UpdateElectricBalls", vram = 0x80B0B660, size = 0x480 }, + { name = "BossHakugin_DrawCrushingRocks", vram = 0x80B0E5A4, size = 0x13C }, + { name = "BossHakugin_DeathCutsceneCrushedByRocks", vram = 0x80B0A8C4, size = 0x36C }, + { name = "BossHakugin_SpawnSteam", vram = 0x80B07700, size = 0x21C }, + { name = "BossHakugin_DrawChargingLightning", vram = 0x80B0C7B0, size = 0x340 }, + { name = "BossHakugin_Vec3fNormalize", vram = 0x80B0573C, size = 0x68 }, + { name = "BossHakugin_CheckForBodyColliderHit", vram = 0x80B0AC30, size = 0x1CC }, + { name = "BossHakugin_ShootLightning", vram = 0x80B09E20, size = 0x64 }, + { name = "BossHakugin_UpdateDrawDmgEffect", vram = 0x80B07BFC, size = 0x1A8 }, + { name = "BossHakugin_OverrideLimbDraw", vram = 0x80B0C000, size = 0x1BC }, + { name = "BossHakugin_IntroCutsceneWakeUp", vram = 0x80B0863C, size = 0x20C }, + { name = "BossHakugin_UpdateSubCam", vram = 0x80B07DA4, size = 0x148 }, + { name = "BossHakugin_UpdateLight", vram = 0x80B05D4C, size = 0x194 }, + { name = "BossHakugin_DeathCutsceneRun", vram = 0x80B0A2A4, size = 0x348 }, + { name = "BossHakugin_SetupCutsceneStart", vram = 0x80B09E84, size = 0x58 }, + { name = "BossHakugin_SetupThrow", vram = 0x80B09840, size = 0x7C }, + { name = "BossHakugin_SetupDeathCutsceneCrushedByRocks", vram = 0x80B0A87C, size = 0x48 }, + { name = "BossHakugin_UpdateDamage", vram = 0x80B0ADFC, size = 0x43C }, + { name = "BossHakugin_SpawnIceSparkle", vram = 0x80B05B04, size = 0x1B8 }, + { name = "BossHakugin_SpawnLargeStalactiteWalls", vram = 0x80B058C0, size = 0x1A4 }, + { name = "BossHakugin_SetupDowned", vram = 0x80B093C0, size = 0x120 }, + { name = "BossHakugin_StepVector", vram = 0x80B057A4, size = 0x11C }, + { name = "BossHakugin_SetupWait", vram = 0x80B09A94, size = 0x1E4 }, + { name = "BossHakugin_SpawnBlueWarpAndHeartContainer", vram = 0x80B05EE0, size = 0x19C }, + { name = "BossHakugin_SetupIntroCutsceneWakeUp", vram = 0x80B08550, size = 0xEC }, + { name = "BossHakugin_UpdateCrushingRocksCollision", vram = 0x80B0DFA8, size = 0x5A0 }, + { name = "BossHakugin_FrozenBeforeFight", vram = 0x80B0813C, size = 0x120 }, + { name = "BossHakugin_SetupIntroCutsceneThaw", vram = 0x80B0825C, size = 0x50 }, + { name = "BossHakugin_IntroCutsceneThaw", vram = 0x80B082AC, size = 0x2A4 }, + { name = "BossHakugin_Downed", vram = 0x80B094E0, size = 0x360 }, + { name = "BossHakugin_DrawMalfunctionEffects", vram = 0x80B0C570, size = 0x240 }, + { name = "BossHakugin_SetupDeathCutsceneRun", vram = 0x80B09F7C, size = 0x328 }, + { name = "BossHakugin_RunUpdateCommon", vram = 0x80B07450, size = 0x2B0 }, + { name = "BossHakugin_GenShadowTex", vram = 0x80B0D69C, size = 0xB4 }, + { name = "BossHakugin_Thaw", vram = 0x80B07B88, size = 0x74 }, + { name = "BossHakugin_UpdateBaseRot", vram = 0x80B0607C, size = 0x4DC }, { name = "BossHakugin_Update", vram = 0x80B0BAE0, size = 0x520 }, - { name = "func_80B06D38", vram = 0x80B06D38, size = 0x210 }, - { name = "func_80B05A64", vram = 0x80B05A64, size = 0xA0 }, - { name = "func_80B0C398", vram = 0x80B0C398, size = 0x1D8 }, - { name = "func_80B0791C", vram = 0x80B0791C, size = 0x26C }, - { name = "func_80B0728C", vram = 0x80B0728C, size = 0x1C4 }, - { name = "func_80B0B548", vram = 0x80B0B548, size = 0x118 }, - { name = "func_80B06F48", vram = 0x80B06F48, size = 0x344 }, - { name = "func_80B09DFC", vram = 0x80B09DFC, size = 0x24 }, - { name = "func_80B0CCD8", vram = 0x80B0CCD8, size = 0x24C }, - { name = "func_80B0A5EC", vram = 0x80B0A5EC, size = 0x4C }, - { name = "func_80B05CBC", vram = 0x80B05CBC, size = 0x90 }, - { name = "func_80B09178", vram = 0x80B09178, size = 0x60 }, - { name = "func_80B0CAF0", vram = 0x80B0CAF0, size = 0x1E8 }, + { name = "BossHakugin_SpawnBomb", vram = 0x80B06D38, size = 0x210 }, + { name = "BossHakugin_RequestQuakeAndRumble", vram = 0x80B05A64, size = 0xA0 }, + { name = "BossHakugin_DrawRockEffects", vram = 0x80B0C398, size = 0x1D8 }, + { name = "BossHakugin_ShouldWait", vram = 0x80B0791C, size = 0x26C }, + { name = "BossHakugin_ChargeUpAttack", vram = 0x80B0728C, size = 0x1C4 }, + { name = "BossHakugin_UpdateLightningSegments", vram = 0x80B0B548, size = 0x118 }, + { name = "BossHakugin_AddMalfunctionEffects", vram = 0x80B06F48, size = 0x344 }, + { name = "BossHakugin_SetupShootLightning", vram = 0x80B09DFC, size = 0x24 }, + { name = "BossHakugin_DrawElectricBalls", vram = 0x80B0CCD8, size = 0x24C }, + { name = "BossHakugin_SetupDeathCutsceneSwerveIntoWall", vram = 0x80B0A5EC, size = 0x4C }, + { name = "BossHakugin_ApplyGoronSpikeBoost", vram = 0x80B05CBC, size = 0x90 }, + { name = "BossHakugin_SetupCharge", vram = 0x80B09178, size = 0x60 }, + { name = "BossHakugin_DrawLightningSegments", vram = 0x80B0CAF0, size = 0x1E8 }, { name = "BossHakugin_Init", vram = 0x80B05290, size = 0x400 }, - { name = "func_80B08124", vram = 0x80B08124, size = 0x18 }, - { name = "func_80B0D2B8", vram = 0x80B0D2B8, size = 0x3E4 }, - { name = "func_80B08CB8", vram = 0x80B08CB8, size = 0x4C0 }, - { name = "func_80B0B3F4", vram = 0x80B0B3F4, size = 0x154 }, - { name = "func_80B091D8", vram = 0x80B091D8, size = 0x1E8 }, - { name = "func_80B08018", vram = 0x80B08018, size = 0x10C }, - { name = "func_80B0CF24", vram = 0x80B0CF24, size = 0x1B0 }, + { name = "BossHakugin_SetupFrozenBeforeFight", vram = 0x80B08124, size = 0x18 }, + { name = "BossHakugin_FillShadowTex", vram = 0x80B0D2B8, size = 0x3E4 }, + { name = "BossHakugin_Run", vram = 0x80B08CB8, size = 0x4C0 }, + { name = "BossHakugin_UpdateMalfunctionEffects", vram = 0x80B0B3F4, size = 0x154 }, + { name = "BossHakugin_Charge", vram = 0x80B091D8, size = 0x1E8 }, + { name = "BossHakugin_EntranceCutscene", vram = 0x80B08018, size = 0x10C }, + { name = "BossHakugin_DrawIce", vram = 0x80B0CF24, size = 0x1B0 }, { name = "BossHakugin_Destroy", vram = 0x80B05690, size = 0xAC }, - { name = "func_80B08C1C", vram = 0x80B08C1C, size = 0x9C }, - { name = "func_80B0696C", vram = 0x80B0696C, size = 0x1B4 }, - { name = "func_80B098BC", vram = 0x80B098BC, size = 0x1D8 }, + { name = "BossHakugin_SetupRun", vram = 0x80B08C1C, size = 0x9C }, + { name = "BossHakugin_SpawnGravel", vram = 0x80B0696C, size = 0x1B4 }, + { name = "BossHakugin_Throw", vram = 0x80B098BC, size = 0x1D8 }, { name = "BossHakugin_Draw", vram = 0x80B0D0D4, size = 0x1E4 }, - { name = "func_80B06B20", vram = 0x80B06B20, size = 0xE8 }, - { name = "func_80B08848", vram = 0x80B08848, size = 0x118 }, - { name = "func_80B06558", vram = 0x80B06558, size = 0xA8 }, - { name = "func_80B0A638", vram = 0x80B0A638, size = 0x244 }, - { name = "func_80B08960", vram = 0x80B08960, size = 0x2BC }, - { name = "func_80B06600", vram = 0x80B06600, size = 0x36C }, - { name = "func_80B0B238", vram = 0x80B0B238, size = 0x114 }, - { name = "func_80B0C1BC", vram = 0x80B0C1BC, size = 0x1DC }, - { name = "func_80B0B34C", vram = 0x80B0B34C, size = 0xA8 }, - { name = "func_80B07EEC", vram = 0x80B07EEC, size = 0x12C }, - { name = "func_80B09C78", vram = 0x80B09C78, size = 0x184 }, + { name = "BossHakugin_SpawnBoulder", vram = 0x80B06B20, size = 0xE8 }, + { name = "BossHakugin_SetupIntroCutsceneRun", vram = 0x80B08848, size = 0x118 }, + { name = "BossHakugin_SetLightningSegmentColliderVertices", vram = 0x80B06558, size = 0xA8 }, + { name = "BossHakugin_DeathCutsceneSwerveIntoWall", vram = 0x80B0A638, size = 0x244 }, + { name = "BossHakugin_IntroCutsceneRun", vram = 0x80B08960, size = 0x2BC }, + { name = "BossHakugin_AddLightningSegments", vram = 0x80B06600, size = 0x36C }, + { name = "BossHakugin_UpdateRockEffects", vram = 0x80B0B238, size = 0x114 }, + { name = "BossHakugin_PostLimbDraw", vram = 0x80B0C1BC, size = 0x1DC }, + { name = "BossHakugin_UpdateFallingCrushingRocks", vram = 0x80B0B34C, size = 0xA8 }, + { name = "BossHakugin_SetupEntranceCutscene", vram = 0x80B07EEC, size = 0x12C }, + { name = "BossHakugin_Wait", vram = 0x80B09C78, size = 0x184 }, ] # Autogenerated from an ELF via N64Recomp @@ -52237,23 +52237,23 @@ relocs = [ ] functions = [ - { name = "func_80B22500", vram = 0x80B22500, size = 0x1AC }, - { name = "func_80B22750", vram = 0x80B22750, size = 0x3C }, + { name = "EnHakurock_Stalactite_StuckInGround", vram = 0x80B22500, size = 0x1AC }, + { name = "EnHakurock_LargeStalactite_Wait", vram = 0x80B22750, size = 0x3C }, { name = "EnHakurock_Update", vram = 0x80B2278C, size = 0x168 }, { name = "EnHakurock_Destroy", vram = 0x80B21BB4, size = 0x2C }, - { name = "func_80B226AC", vram = 0x80B226AC, size = 0xA4 }, - { name = "func_80B2242C", vram = 0x80B2242C, size = 0x94 }, - { name = "func_80B21EA4", vram = 0x80B21EA4, size = 0x158 }, - { name = "func_80B21BE0", vram = 0x80B21BE0, size = 0x2C4 }, - { name = "func_80B22040", vram = 0x80B22040, size = 0x68 }, + { name = "EnHakurock_LargeStalactite_SetupWait", vram = 0x80B226AC, size = 0xA4 }, + { name = "EnHakurock_Stalactite_Fall", vram = 0x80B2242C, size = 0x94 }, + { name = "EnHakurock_SpawnEffect", vram = 0x80B21EA4, size = 0x158 }, + { name = "EnHakurock_AddRockEffect", vram = 0x80B21BE0, size = 0x2C4 }, + { name = "EnHakurock_WaitForSignal", vram = 0x80B22040, size = 0x68 }, { name = "EnHakurock_Init", vram = 0x80B21B00, size = 0xB4 }, - { name = "func_80B220A8", vram = 0x80B220A8, size = 0x140 }, - { name = "func_80B21FFC", vram = 0x80B21FFC, size = 0x44 }, - { name = "EnHakurock_Draw", vram = 0x80B229A4, size = 0xBC }, - { name = "func_80B228F4", vram = 0x80B228F4, size = 0xB0 }, - { name = "func_80B222AC", vram = 0x80B222AC, size = 0x180 }, - { name = "func_80B221E8", vram = 0x80B221E8, size = 0xC4 }, - { name = "func_80B224C0", vram = 0x80B224C0, size = 0x40 }, + { name = "EnHakurock_Boulder_SetupMove", vram = 0x80B220A8, size = 0x140 }, + { name = "EnHakurock_SetupWaitForSignal", vram = 0x80B21FFC, size = 0x44 }, + { name = "EnHakurock_DrawStalactite", vram = 0x80B229A4, size = 0xBC }, + { name = "EnHakurock_DrawBoulder", vram = 0x80B228F4, size = 0xB0 }, + { name = "EnHakurock_Stalactite_SetupFall", vram = 0x80B222AC, size = 0x180 }, + { name = "EnHakurock_Boulder_Move", vram = 0x80B221E8, size = 0xC4 }, + { name = "EnHakurock_Stalactite_SetupStuckInGround", vram = 0x80B224C0, size = 0x40 }, ] # Autogenerated from an ELF via N64Recomp @@ -63391,7 +63391,7 @@ functions = [ { name = "func_80BD2BA4", vram = 0x80BD2BA4, size = 0x44 }, { name = "func_80BD35BC", vram = 0x80BD35BC, size = 0x9C }, { name = "func_80BD3484", vram = 0x80BD3484, size = 0xC4 }, - { name = "func_80BD2A30", vram = 0x80BD2A30, size = 0xB0 }, + { name = "EnAh_FindActor", vram = 0x80BD2A30, size = 0xB0 }, { name = "func_80BD3768", vram = 0x80BD3768, size = 0xEC }, { name = "func_80BD2FD0", vram = 0x80BD2FD0, size = 0xF0 }, { name = "func_80BD3118", vram = 0x80BD3118, size = 0x80 }, @@ -64359,7 +64359,7 @@ functions = [ { name = "func_80BDF244", vram = 0x80BDF244, size = 0xC4 }, { name = "EnAl_PostLimbDraw", vram = 0x80BDF950, size = 0xE4 }, { name = "func_80BDF390", vram = 0x80BDF390, size = 0x84 }, - { name = "func_80BDE1A0", vram = 0x80BDE1A0, size = 0xB0 }, + { name = "EnAl_FindActor", vram = 0x80BDE1A0, size = 0xB0 }, { name = "EnAl_Update", vram = 0x80BDF86C, size = 0xA8 }, { name = "func_80BDE484", vram = 0x80BDE484, size = 0x5C }, { name = "func_80BDF6C4", vram = 0x80BDF6C4, size = 0x98 }, @@ -64432,7 +64432,7 @@ relocs = [ functions = [ { name = "func_80BE0D60", vram = 0x80BE0D60, size = 0xA4 }, - { name = "func_80BE04E0", vram = 0x80BE04E0, size = 0xB0 }, + { name = "EnTab_FindActor", vram = 0x80BE04E0, size = 0xB0 }, { name = "func_80BE127C", vram = 0x80BE127C, size = 0xCC }, { name = "EnTab_Destroy", vram = 0x80BE1524, size = 0x2C }, { name = "func_80BE0778", vram = 0x80BE0778, size = 0x28 }, @@ -65048,26 +65048,26 @@ relocs = [ functions = [ { name = "EnDt_Init", vram = 0x80BE9B20, size = 0x128 }, - { name = "func_80BEABF8", vram = 0x80BEABF8, size = 0x8C }, - { name = "func_80BEADD4", vram = 0x80BEADD4, size = 0xC0 }, - { name = "func_80BE9D9C", vram = 0x80BE9D9C, size = 0x5C }, - { name = "func_80BEA254", vram = 0x80BEA254, size = 0x140 }, - { name = "func_80BEA394", vram = 0x80BEA394, size = 0x55C }, - { name = "func_80BEA8F0", vram = 0x80BEA8F0, size = 0x208 }, - { name = "func_80BEAB44", vram = 0x80BEAB44, size = 0xB4 }, - { name = "func_80BE9DF8", vram = 0x80BE9DF8, size = 0x9C }, + { name = "EnDt_TriggerMeetingNotebookEvent", vram = 0x80BEABF8, size = 0x8C }, + { name = "EnDt_TriggerFinalNightTalkEvent", vram = 0x80BEADD4, size = 0xC0 }, + { name = "EnDt_UpdateAppearance", vram = 0x80BE9D9C, size = 0x5C }, + { name = "EnDt_SetupMeetingCutscene", vram = 0x80BEA254, size = 0x140 }, + { name = "EnDt_UpdateMeetingCutscene", vram = 0x80BEA394, size = 0x55C }, + { name = "EnDt_FinishMeetingCutscene", vram = 0x80BEA8F0, size = 0x208 }, + { name = "EnDt_TriggerMeetingRewardEvent", vram = 0x80BEAB44, size = 0xB4 }, + { name = "EnDt_UpdateCutsceneFocusTarget", vram = 0x80BE9DF8, size = 0x9C }, { name = "EnDt_Destroy", vram = 0x80BE9C48, size = 0x2C }, - { name = "func_80BEB06C", vram = 0x80BEB06C, size = 0x3C }, - { name = "func_80BE9CE8", vram = 0x80BE9CE8, size = 0xB4 }, + { name = "EnDt_OverrideLimbDraw", vram = 0x80BEB06C, size = 0x3C }, + { name = "EnDt_ChangeAnim", vram = 0x80BE9CE8, size = 0xB4 }, { name = "EnDt_Update", vram = 0x80BEAE94, size = 0x1D8 }, - { name = "func_80BEA088", vram = 0x80BEA088, size = 0x1CC }, - { name = "func_80BE9EF8", vram = 0x80BE9EF8, size = 0x190 }, - { name = "func_80BE9C74", vram = 0x80BE9C74, size = 0x74 }, - { name = "func_80BEADB8", vram = 0x80BEADB8, size = 0x1C }, - { name = "func_80BE9E94", vram = 0x80BE9E94, size = 0x64 }, - { name = "func_80BEAC84", vram = 0x80BEAC84, size = 0xA8 }, - { name = "func_80BEAD2C", vram = 0x80BEAD2C, size = 0x8C }, - { name = "func_80BEAAF8", vram = 0x80BEAAF8, size = 0x4C }, + { name = "EnDt_OfferRegularTalk", vram = 0x80BEA088, size = 0x1CC }, + { name = "EnDt_SetupRegularState", vram = 0x80BE9EF8, size = 0x190 }, + { name = "EnDt_UpdateHeadRotate", vram = 0x80BE9C74, size = 0x74 }, + { name = "EnDt_StartFinalNightTalk", vram = 0x80BEADB8, size = 0x1C }, + { name = "EnDt_SetupCutsceneNpcs", vram = 0x80BE9E94, size = 0x64 }, + { name = "EnDt_SetupFinalNightState", vram = 0x80BEAC84, size = 0xA8 }, + { name = "EnDt_OfferFinalNightTalk", vram = 0x80BEAD2C, size = 0x8C }, + { name = "EnDt_OfferMeetingReward", vram = 0x80BEAAF8, size = 0x4C }, { name = "EnDt_Draw", vram = 0x80BEB0A8, size = 0x108 }, ] @@ -65585,7 +65585,7 @@ functions = [ { name = "func_80BF1AE0", vram = 0x80BF1AE0, size = 0x60 }, { name = "func_80BF1744", vram = 0x80BF1744, size = 0x78 }, { name = "func_80BF13E4", vram = 0x80BF13E4, size = 0x88 }, - { name = "func_80BF1150", vram = 0x80BF1150, size = 0xB0 }, + { name = "EnIg_FindActor", vram = 0x80BF1150, size = 0xB0 }, { name = "func_80BF146C", vram = 0x80BF146C, size = 0x44 }, { name = "EnIg_UpdateSkelAnime", vram = 0x80BF1258, size = 0x2C }, { name = "EnIg_Update", vram = 0x80BF2E04, size = 0xD8 }, @@ -66965,23 +66965,23 @@ relocs = [ ] functions = [ - { name = "func_80C09418", vram = 0x80C09418, size = 0x90 }, + { name = "EnKitan_GetQuestionMessageId", vram = 0x80C09418, size = 0x90 }, { name = "EnKitan_Update", vram = 0x80C09BC8, size = 0xAC }, - { name = "func_80C095C8", vram = 0x80C095C8, size = 0x80 }, - { name = "func_80C09708", vram = 0x80C09708, size = 0x288 }, - { name = "func_80C09C90", vram = 0x80C09C90, size = 0x40 }, - { name = "func_80C09AA4", vram = 0x80C09AA4, size = 0xAC }, - { name = "func_80C09648", vram = 0x80C09648, size = 0xC0 }, - { name = "func_80C09990", vram = 0x80C09990, size = 0x114 }, - { name = "func_80C09518", vram = 0x80C09518, size = 0xB0 }, - { name = "func_80C09CD0", vram = 0x80C09CD0, size = 0x60 }, - { name = "func_80C09390", vram = 0x80C09390, size = 0x88 }, - { name = "func_80C09C74", vram = 0x80C09C74, size = 0x1C }, + { name = "EnKitan_WaitForPrizeTextboxClosed", vram = 0x80C095C8, size = 0x80 }, + { name = "EnKitan_Talk", vram = 0x80C09708, size = 0x288 }, + { name = "EnKitan_PostLimbDraw", vram = 0x80C09C90, size = 0x40 }, + { name = "EnKitan_Appear", vram = 0x80C09AA4, size = 0xAC }, + { name = "EnKitan_OfferPrize", vram = 0x80C09648, size = 0xC0 }, + { name = "EnKitan_WaitForPlayer", vram = 0x80C09990, size = 0x114 }, + { name = "EnKitan_TalkAfterGivingPrize", vram = 0x80C09518, size = 0xB0 }, + { name = "EnKitan_Draw", vram = 0x80C09CD0, size = 0x60 }, + { name = "EnKitan_CanTalk", vram = 0x80C09390, size = 0x88 }, + { name = "EnKitan_OverrideLimbDraw", vram = 0x80C09C74, size = 0x1C }, { name = "EnKitan_Init", vram = 0x80C090D0, size = 0x140 }, - { name = "func_80C0923C", vram = 0x80C0923C, size = 0x154 }, - { name = "func_80C09B50", vram = 0x80C09B50, size = 0x78 }, + { name = "EnKitan_SpawnEffects", vram = 0x80C0923C, size = 0x154 }, + { name = "EnKitan_WaitToAppear", vram = 0x80C09B50, size = 0x78 }, { name = "EnKitan_Destroy", vram = 0x80C09210, size = 0x2C }, - { name = "func_80C094A8", vram = 0x80C094A8, size = 0x70 }, + { name = "EnKitan_Leave", vram = 0x80C094A8, size = 0x70 }, ] # Autogenerated from an ELF via N64Recomp @@ -68238,7 +68238,7 @@ functions = [ { name = "DmAh_HandleCutscene", vram = 0x80C1D7FC, size = 0x130 }, { name = "DmAh_PostLimbDraw", vram = 0x80C1DAD4, size = 0x50 }, { name = "DmAh_ChangeAnim", vram = 0x80C1D410, size = 0x48 }, - { name = "func_80C1D78C", vram = 0x80C1D78C, size = 0x70 }, + { name = "DmAh_FindAnjuActor", vram = 0x80C1D78C, size = 0x70 }, ] # Autogenerated from an ELF via N64Recomp @@ -68639,7 +68639,7 @@ relocs = [ functions = [ { name = "func_80C229AC", vram = 0x80C229AC, size = 0x40 }, - { name = "func_80C22350", vram = 0x80C22350, size = 0xB0 }, + { name = "DmTag_FindActor", vram = 0x80C22350, size = 0xB0 }, { name = "DmTag_Destroy", vram = 0x80C22B30, size = 0x10 }, { name = "DmTag_DoNothing", vram = 0x80C229EC, size = 0x10 }, { name = "func_80C229FC", vram = 0x80C229FC, size = 0x44 }, diff --git a/us.rev1.toml b/us.rev1.toml index f3bc8b0..eff0e77 100644 --- a/us.rev1.toml +++ b/us.rev1.toml @@ -19,7 +19,9 @@ stubs = [ ignored = [ # Not actually a function - "D_80186028" + "sNonKanjiIndices", + # Was originally named _MakeMotorData + "__osMakeMotorData" ] # Single-instruction patches From fa919b16b7831b73b1f27458fb1c53c2be0458c2 Mon Sep 17 00:00:00 2001 From: AltoXorg <56553686+Alto1772@users.noreply.github.com> Date: Sat, 22 Jun 2024 22:04:30 +0800 Subject: [PATCH 3/4] also update patched function names --- patches/debug_patches.c | 2 +- .../object_boss_hakugin/object_boss_hakugin.h | 143 ++++++++++++++++++ patches/quicksave_patches.c | 10 +- patches/save_patches.c | 2 +- patches/specific_actor_transform_tagging.c | 12 +- 5 files changed, 154 insertions(+), 15 deletions(-) create mode 100644 patches/dummy_headers/objects/object_boss_hakugin/object_boss_hakugin.h diff --git a/patches/debug_patches.c b/patches/debug_patches.c index ee65fa3..fdb341c 100644 --- a/patches/debug_patches.c +++ b/patches/debug_patches.c @@ -36,7 +36,7 @@ void do_warp(PlayState* play, u16 entrance){ // req.dramAddr = text_buffer; // req.size = play->msgCtx.font.messageEnd; // recomp_printf("dma from vrom 0x%08X to vram 0x%08x of 0x%04X bytes\n", req.vromAddr, req.dramAddr, req.size); - // DmaMgr_ProcessMsg(&req); + // DmaMgr_ProcessRequest(&req); // if (text_buffer[2] != (char)0xFE) { // recomp_printf("Invalid text\n"); diff --git a/patches/dummy_headers/objects/object_boss_hakugin/object_boss_hakugin.h b/patches/dummy_headers/objects/object_boss_hakugin/object_boss_hakugin.h new file mode 100644 index 0000000..4462798 --- /dev/null +++ b/patches/dummy_headers/objects/object_boss_hakugin/object_boss_hakugin.h @@ -0,0 +1,143 @@ +// Required to include MM decomp headers without having built the repo + +#ifndef OBJECT_BOSS_HAKUGIN_H +#define OBJECT_BOSS_HAKUGIN_H 1 + +typedef enum GohtLimb { + /* 0x00 */ GOHT_LIMB_NONE, + /* 0x01 */ GOHT_LIMB_ROOT, + /* 0x02 */ GOHT_LIMB_PELVIS, + /* 0x03 */ GOHT_LIMB_THORAX_ROOT, + /* 0x04 */ GOHT_LIMB_THORAX_WRAPPER, + /* 0x05 */ GOHT_LIMB_FRONT_RIGHT_LEG_ROOT, + /* 0x06 */ GOHT_LIMB_FRONT_RIGHT_UPPER_LEG, + /* 0x07 */ GOHT_LIMB_FRONT_RIGHT_LOWER_LEG_ROOT, + /* 0x08 */ GOHT_LIMB_FRONT_RIGHT_LOWER_LEG, + /* 0x09 */ GOHT_LIMB_FRONT_RIGHT_HOOF, + /* 0x0A */ GOHT_LIMB_FRONT_LEFT_LEG_ROOT, + /* 0x0B */ GOHT_LIMB_FRONT_LEFT_UPPER_LEG, + /* 0x0C */ GOHT_LIMB_FRONT_LEFT_LOWER_LEG_ROOT, + /* 0x0D */ GOHT_LIMB_FRONT_LEFT_LOWER_LEG, + /* 0x0E */ GOHT_LIMB_FRONT_LEFT_HOOF, + /* 0x0F */ GOHT_LIMB_THORAX, + /* 0x10 */ GOHT_LIMB_HEAD, + /* 0x11 */ GOHT_LIMB_JAW_ROOT, + /* 0x12 */ GOHT_LIMB_JAW, + /* 0x13 */ GOHT_LIMB_BACK_RIGHT_LEG_ROOT, + /* 0x14 */ GOHT_LIMB_BACK_RIGHT_LEG_WRAPPER, + /* 0x15 */ GOHT_LIMB_BACK_RIGHT_THIGH, + /* 0x16 */ GOHT_LIMB_BACK_RIGHT_SHIN, + /* 0x17 */ GOHT_LIMB_BACK_RIGHT_PASTERN_ROOT, + /* 0x18 */ GOHT_LIMB_BACK_RIGHT_PASTERN, + /* 0x19 */ GOHT_LIMB_BACK_RIGHT_HOOF, + /* 0x1A */ GOHT_LIMB_BACK_LEFT_LEG_ROOT, + /* 0x1B */ GOHT_LIMB_BACK_LEFT_LEG_WRAPPER, + /* 0x1C */ GOHT_LIMB_BACK_LEFT_THIGH, + /* 0x1D */ GOHT_LIMB_BACK_LEFT_SHIN, + /* 0x1E */ GOHT_LIMB_BACK_LEFT_PASTERN_ROOT, + /* 0x1F */ GOHT_LIMB_BACK_LEFT_PASTERN, + /* 0x20 */ GOHT_LIMB_BACK_LEFT_HOOF, + /* 0x21 */ GOHT_LIMB_MAX +} GohtLimb; + +extern s16 sGohtThawAndBreakWallAnimFrameData[]; +extern JointIndex sGohtThawAndBreakWallAnimJointIndices[]; +extern AnimationHeader gGohtThawAndBreakWallAnim; +extern s16 sGohtWritheOnSideAnimFrameData[]; +extern JointIndex sGohtWritheOnSideAnimJointIndices[]; +extern AnimationHeader gGohtWritheOnSideAnim; +extern s16 sGohtTwitchOnSideAnimFrameData[]; +extern JointIndex sGohtTwitchOnSideAnimJointIndices[]; +extern AnimationHeader gGohtTwitchOnSideAnim; +extern s16 sGohtFallOnSideAnimFrameData[]; +extern JointIndex sGohtFallOnSideAnimJointIndices[]; +extern AnimationHeader gGohtFallOnSideAnim; +extern s16 sGohtStationaryAnimFrameData[]; +extern JointIndex sGohtStationaryAnimJointIndices[]; +extern AnimationHeader gGohtStationaryAnim; +extern Vtx object_boss_hakuginVtx_0031B0[]; +extern Gfx gGohtPelvisDL[]; +extern Gfx gGohtBackLeftHoofDL[]; +extern Gfx gGohtBackLeftPasternDL[]; +extern Gfx gGohtBackLeftShinDL[]; +extern Gfx gGohtBackLeftThighDL[]; +extern Gfx gGohtBackRightHoofDL[]; +extern Gfx gGohtBackRightPasternDL[]; +extern Gfx gGohtBackRightShinDL[]; +extern Gfx gGohtBackRightThighDL[]; +extern Gfx gGohtHeadDL[]; +extern Gfx gGohtJawDL[]; +extern Gfx gGohtThoraxDL[]; +extern Gfx gGohtFrontLeftHoofDL[]; +extern Gfx gGohtFrontLeftLowerLegDL[]; +extern Gfx gGohtFrontLeftUpperLegDL[]; +extern Gfx gGohtFrontRightHoofDL[]; +extern Gfx gGohtFrontRightLowerLegDL[]; +extern Gfx gGohtFrontRightUpperLegDL[]; +extern u64 gGohtMachineryTex[]; +extern u64 gGohtMetalPlateWithCirclePatternTex[]; +extern u64 gGohtMetalPlateWithMulticoloredPatternTex[]; +extern u64 gGohtEyeTex[]; +extern u64 gGohtFaceAndKneePatternTex[]; +extern u64 gGohtHornTex[]; +extern Vtx object_boss_hakuginVtx_0102D8[]; +extern Gfx gGohtRockMaterialDL[]; +extern Gfx gGohtRockModelDL[]; +extern u64 gGohtRockTex[]; +extern Vtx object_boss_hakuginVtx_010F80[]; +extern Gfx gGohtStalactiteMaterialDL[]; +extern Gfx gGohtStalactiteModelDL[]; +extern Vtx object_boss_hakuginVtx_0111C8[]; +extern Gfx gGohtLightningMaterialDL[]; +extern Gfx gGohtLightningModelDL[]; +extern u64 gGohtLightningTex[]; +extern u8 gGohtUnusedZeroesBlob[]; +extern u64 gGohtLightOrbTex[]; +extern Vtx object_boss_hakuginVtx_012E90[]; +extern Gfx gGohtLightOrbMaterialDL[]; +extern Gfx gGohtLightOrbModelDL[]; +extern StandardLimb gGohtRootLimb; +extern StandardLimb gGohtPelvisLimb; +extern StandardLimb gGohtThoraxRootLimb; +extern StandardLimb gGohtThoraxWrapperLimb; +extern StandardLimb gGohtFrontRightLegRootLimb; +extern StandardLimb gGohtFrontRightUpperLegLimb; +extern StandardLimb gGohtFrontRightLowerLegRootLimb; +extern StandardLimb gGohtFrontRightLowerLegLimb; +extern StandardLimb gGohtFrontRightHoofLimb; +extern StandardLimb gGohtFrontLeftLegRootLimb; +extern StandardLimb gGohtFrontLeftUpperLegLimb; +extern StandardLimb gGohtFrontLeftLowerLegRootLimb; +extern StandardLimb gGohtFrontLeftLowerLegLimb; +extern StandardLimb gGohtFrontLeftHoofLimb; +extern StandardLimb gGohtThoraxLimb; +extern StandardLimb gGohtHeadLimb; +extern StandardLimb gGohtJawRootLimb; +extern StandardLimb gGohtJawLimb; +extern StandardLimb gGohtBackRightLegRootLimb; +extern StandardLimb gGohtBackRightLegWrapperLimb; +extern StandardLimb gGohtBackRightThighLimb; +extern StandardLimb gGohtBackRightShinLimb; +extern StandardLimb gGohtBackRightPasternRootLimb; +extern StandardLimb gGohtBackRightPasternLimb; +extern StandardLimb gGohtBackRightHoofLimb; +extern StandardLimb gGohtBackLeftLegRootLimb; +extern StandardLimb gGohtBackLeftLegWrapperLimb; +extern StandardLimb gGohtBackLeftThighLimb; +extern StandardLimb gGohtBackLeftShinLimb; +extern StandardLimb gGohtBackLeftPasternRootLimb; +extern StandardLimb gGohtBackLeftPasternLimb; +extern StandardLimb gGohtBackLeftHoofLimb; +extern void* gGohtSkelLimbs[]; +extern FlexSkeletonHeader gGohtSkel; +extern s16 sGohtFallDownAnimFrameData[]; +extern JointIndex sGohtFallDownAnimJointIndices[]; +extern AnimationHeader gGohtFallDownAnim; +extern s16 sGohtRunAnimFrameData[]; +extern JointIndex sGohtRunAnimJointIndices[]; +extern AnimationHeader gGohtRunAnim; +extern s16 sGohtGetUpFromSideAnimFrameData[]; +extern JointIndex sGohtGetUpFromSideAnimJointIndices[]; +extern AnimationHeader gGohtGetUpFromSideAnim; +extern u64 gGohtTitleCardTex[]; +#endif diff --git a/patches/quicksave_patches.c b/patches/quicksave_patches.c index a89f560..cabc713 100644 --- a/patches/quicksave_patches.c +++ b/patches/quicksave_patches.c @@ -140,8 +140,8 @@ void Sched_ThreadEntry(void* arg) { Sched_HandleGfxCancel(sched); continue; - case ENTRY_MSG: - Sched_HandleEntry(sched); + case NOTIFY_MSG: + Sched_HandleNotify(sched); continue; case RSP_DONE_MSG: @@ -164,11 +164,11 @@ void Sched_ThreadEntry(void* arg) { continue; case OS_SC_PRE_NMI_MSG: - Sched_HandleReset(sched); + Sched_HandlePreNMI(sched); continue; case OS_SC_NMI_MSG: - Sched_HandleStop(sched); + Sched_HandleNMI(sched); continue; } } @@ -201,7 +201,7 @@ void DmaMgr_ThreadEntry(void* a0) { req = (DmaRequest*)msg; - DmaMgr_ProcessMsg(req); + DmaMgr_ProcessRequest(req); if (req->notifyQueue) { osSendMesg(req->notifyQueue, req->notifyMsg, OS_MESG_NOBLOCK); } diff --git a/patches/save_patches.c b/patches/save_patches.c index 229fed2..d50598b 100644 --- a/patches/save_patches.c +++ b/patches/save_patches.c @@ -5,7 +5,7 @@ extern OSMesgQueue sFlashromMesgQueue; s32 SysFlashrom_IsInit(void); -void Sleep_Msec(u32 ms); +void msleep(u32 ms); // @recomp Patched to not wait a hardcoded amount of time for the save to complete. void Sram_UpdateWriteToFlashDefault(SramContext* sramCtx) { diff --git a/patches/specific_actor_transform_tagging.c b/patches/specific_actor_transform_tagging.c index fd9ab51..5cede3d 100644 --- a/patches/specific_actor_transform_tagging.c +++ b/patches/specific_actor_transform_tagging.c @@ -12,10 +12,6 @@ #include "overlays/actors/ovl_En_Twig/z_en_twig.h" #include "overlays/actors/ovl_En_Honotrap/z_en_honotrap.h" -// Decomp renames, TODO update decomp and remove these -#define EnHonotrap_FlameGroup func_8092F878 -#define EnHonotrap_DrawFlameGroup func_80930190 - extern EnTanron2* D_80BB8458[82]; extern Boss04* D_80BB8450; extern f32 D_80BB8454; @@ -650,7 +646,7 @@ extern Gfx gGohtStalactiteMaterialDL[]; extern Gfx gGohtStalactiteModelDL[]; // @recomp Tag Goht's rocks. -void func_80B0C398(BossHakugin* this, PlayState* play) { +void BossHakugin_DrawRockEffects(BossHakugin* this, PlayState* play) { GohtRockEffect* effect; s32 i; @@ -727,7 +723,7 @@ typedef enum { /* 25 */ OSN_ANIM_MAX } OsnAnimation; -void EnOsn_HandleCsAction(EnOsn* this, PlayState* play); +void EnOsn_HandleCutscene(EnOsn* this, PlayState* play); void EnOsn_Idle(EnOsn* this, PlayState* play); // @recomp Patched to skip interpolation when the Happy Mask Salesman changes animations. @@ -742,7 +738,7 @@ void EnOsn_ChooseAction(EnOsn* this, PlayState* play) { Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, OSN_ANIM_IDLE); if (!isSwitchFlagSet) { // @recomp No need to relocate as this function is replaced, so the patch compilation will pick the new address. - this->actionFunc = EnOsn_HandleCsAction; + this->actionFunc = EnOsn_HandleCutscene; } else { // @recomp Manual relocation, TODO remove when automated by the recompiler. this->actionFunc = (EnOsnActionFunc)actor_relocate(&this->actor, EnOsn_Idle); @@ -757,7 +753,7 @@ void EnOsn_LookFromMask(EnOsn* this); void EnOsn_FadeOut(EnOsn* this); // @recomp Patched to skip interpolation when the Happy Mask Salesman changes animations. -void EnOsn_HandleCsAction(EnOsn* this, PlayState* play) { +void EnOsn_HandleCutscene(EnOsn* this, PlayState* play) { u8 pad; s32 cueChannel; From 7d079b6d45de1ba0584300a174872a4a4e6c8156 Mon Sep 17 00:00:00 2001 From: AltoXorg <56553686+Alto1772@users.noreply.github.com> Date: Sat, 22 Jun 2024 22:20:54 +0800 Subject: [PATCH 4/4] upd building docs --- BUILDING.md | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index b622ab9..b140280 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -5,7 +5,7 @@ This guide will help you build the project on your local machine. The process will require you to provide two items: - A decompressed ROM of the US version of the game. -- An elf file created from [this commit](https://github.com/zeldaret/mm/tree/23beee0717364de43ca9a82957cc910cf818de90) of the Majora's Mask decompilation. +- An elf file created from [this commit](https://github.com/zeldaret/mm/tree/45ae63ccc550ea29f475669a87f7f8ac681a6b29) of the Majora's Mask decompilation. These steps cover: acquiring these, running the required processes and finally building the project. @@ -41,16 +41,7 @@ choco install make ``` ## 3. Creating the ELF file & decompressed ROM -You will need to build [this commit](https://github.com/zeldaret/mm/tree/23beee0717364de43ca9a82957cc910cf818de90) of the Majora's Mask decompilation. Follow their build instructions to generate the ELF file and decompressed ROM. However, while building you may get the following build error: -```bash -RuntimeError: 'jr' instruction does not have an 'jump label' field -``` - -To fix this you will have to modify the problematic file `tools/disasm/disasm.py` at line 1115. This issue is due to a bug in this specific commit of the decomp project and will be resolved once Zelda64Recomp is updated to a more recent commit. To fix it, replace the line: -```diff -- elif insn.isJump(): -+ elif insn.isJumpWithAddress(): -``` +You will need to build [this commit](https://github.com/zeldaret/mm/tree/45ae63ccc550ea29f475669a87f7f8ac681a6b29) of the Majora's Mask decompilation. For convenience you may also use `lib/mm-decomp` subfolder in this repository. Follow their build instructions to generate the ELF file and decompressed ROM. Upon successful build it will generate the two required files. Copy them to the root of the Zelda64Recomp repository: - `mm.us.rev1.rom_uncompressed.elf`