update symbols to match with the bundled mm-decomp

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);

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);
             }

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;

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"
 

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);

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;