From ab1701b57ad9beac0e43b46250e909665f658924 Mon Sep 17 00:00:00 2001 From: cadmic Date: Wed, 14 Aug 2024 01:42:22 -0700 Subject: [PATCH] Fix a few function names in disassembly (#2036) * Fix z_message.c function names in disassembly * Fix more functions --- tools/disasm/ntsc-1.2/functions.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/disasm/ntsc-1.2/functions.txt b/tools/disasm/ntsc-1.2/functions.txt index ed0019d32e..34f49890b1 100644 --- a/tools/disasm/ntsc-1.2/functions.txt +++ b/tools/disasm/ntsc-1.2/functions.txt @@ -372,7 +372,7 @@ Actor_WorldDistXYZToActor = 0x80021AEC; // type:func Actor_WorldDistXYZToPoint = 0x80021B18; // type:func Actor_WorldDistXZToActor = 0x80021B3C; // type:func Actor_WorldDistXZToPoint = 0x80021B68; // type:func -func_8002DBD0 = 0x80021B8C; // type:func +Actor_WorldToActorCoords = 0x80021B8C; // type:func Actor_HeightDiff = 0x80021C2C; // type:func Player_GetHeight = 0x80021C40; // type:func func_8002DCE4 = 0x80021CA0; // type:func @@ -1188,7 +1188,7 @@ Jpeg_Decode = 0x8005BBBC; // type:func KaleidoSetup_Update = 0x8005BEF0; // type:func KaleidoSetup_Init = 0x8005C15C; // type:func KaleidoSetup_Destroy = 0x8005C2D4; // type:func -Font_LoadKanji = 0x8005C320; // type:func +Font_LoadCharWide = 0x8005C320; // type:func Font_LoadChar = 0x8005C374; // type:func Font_LoadMessageBoxIcon = 0x8005C3C4; // type:func Font_LoadOrderedFont = 0x8005C408; // type:func @@ -3071,8 +3071,8 @@ Message_SetTextColor = 0x800D71D8; // type:func Message_DrawTextboxIcon = 0x800D748C; // type:func Message_DrawItemIcon = 0x800D7BD4; // type:func Message_HandleOcarina = 0x800D7F20; // type:func -Message_DrawTextJPN = 0x800D8130; // type:func -Message_DrawTextNES = 0x800D9524; // type:func +Message_DrawTextWide = 0x800D8130; // type:func +Message_DrawText = 0x800D9524; // type:func Message_LoadItemIcon = 0x800DA79C; // type:func Message_Decode = 0x800DA93C; // type:func Message_OpenText = 0x800DCE64; // type:func @@ -6888,11 +6888,11 @@ func_808AD3D4 = 0x8095B12C; // type:func func_808AD450 = 0x8095B1A8; // type:func BgHaka_Init = 0x8095B730; // type:func BgHaka_Destroy = 0x8095B7AC; // type:func -func_8087B758 = 0x8095B7E0; // type:func -func_8087B7E8 = 0x8095B870; // type:func -func_8087B938 = 0x8095B9C4; // type:func -func_8087BAAC = 0x8095BB3C; // type:func -func_8087BAE4 = 0x8095BB78; // type:func +BgHaka_CheckPlayerOnDirtPatch = 0x8095B7E0; // type:func +BgHaka_IdleClosed = 0x8095B870; // type:func +BgHaka_Pull = 0x8095B9C4; // type:func +BgHaka_IdleOpened = 0x8095BB3C; // type:func +BgHaka_IdleLockedClosed = 0x8095BB78; // type:func BgHaka_Update = 0x8095BBF0; // type:func BgHaka_Draw = 0x8095BC14; // type:func MagicWind_SetupAction = 0x8095BDF0; // type:func