Skip to content

Commit 37cccb3

Browse files
committed
tools: update objdiff with encounter/objdiff#278
Fixes issue with symbol suffix changes
1 parent af4adac commit 37cccb3

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

configs/USA/sym.bodyprog.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ Screen_DisplayEnvXySet = 0x80032524; // type:func
250250
Screen_FadeDrawModeSet = 0x800325A4; // type:func
251251
Screen_FadeInProgressGet = 0x800325F8; // type:func
252252
Screen_FadeUpdate = 0x8003260C; // type:func
253-
Screen_BlackBorderDraw.60 = 0x8003289C; // filename:Screen_BlackBorderDraw type:func The generated result of the compilation adds .60 at name end for some reason.
253+
Screen_BlackBorderDraw.0 = 0x8003289C; // filename:Screen_BlackBorderDraw type:func Compiler adds suffix to end of nested func names.
254254
Screen_CutsceneCameraStateUpdate = 0x80032904; // type:func
255255
Screen_VSyncCallback = 0x80032B80; // type:func
256256

@@ -320,8 +320,8 @@ Savegame_MapRoomIdxSet = 0x80036420; // type:func
320320
Gfx_MapMsg_Draw = 0x800365B8; // type:func
321321
Gfx_MapMsg_SelectionUpdate = 0x80036B5C; // type:func
322322
Chara_PositionUpdateFromParams = 0x800371E8; // type:func
323-
func_800382B0.164 = 0x800382B0; // filename:func_800382B0 type:func The generated result of the compilation adds suffix to end for some reason.
324-
func_800382EC.167 = 0x800382EC; // filename:func_800382EC type:func The generated result of the compilation adds suffix to end for some reason.
323+
func_800382B0.0 = 0x800382B0; // filename:func_800382B0 type:func - Compiler adds suffix to end of nested func names.
324+
func_800382EC.0 = 0x800382EC; // filename:func_800382EC type:func - Compiler adds suffix to end of nested func names.
325325
Math_Distance2dCheck = 0x80038A6C; // type:func
326326
Camera_Distance2dGet = 0x80038B44; // type:func
327327
GameState_InGame_Update = 0x80038BD4; // type:func
@@ -623,7 +623,7 @@ Player_AnimUpdate = 0x80071968; // type:func
623623
Player_LogicUpdate = 0x80071CE8; // type:func
624624
Player_UpperBodyStateUpdate = 0x80073FC0; // type:func
625625
Player_UpperBodyUpdate = 0x80074254; // type:func
626-
Player_CombatAnimUpdate.76 = 0x80074350; // filename:Player_CombatAnimUpdate type:func - Generated compilation result adds .76 at name end for some reason.
626+
Player_CombatAnimUpdate.0 = 0x80074350; // filename:Player_CombatAnimUpdate type:func - Compiler adds suffix to end of nested func names.
627627
Player_UpperBodyMainUpdate = 0x80075504; // type:func
628628
Player_CombatStateUpdate = 0x800771BC; // type:func
629629
Player_StepWallStop_MovementCancel = 0x80077BB8; // type:func

tools/objdiff/objdiff

3.25 MB
Binary file not shown.

tools/objdiff/source.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Built from https://github.com/encounter/objdiff/commit/0a85f540f2d784c4be5513926740d0c5b7b17638
2+
With GCC suffix changes from https://github.com/encounter/objdiff/pull/278

0 commit comments

Comments
 (0)