From 5a8d59fbc663792ab87a10ef16e47323f3128fa8 Mon Sep 17 00:00:00 2001 From: marius david Date: Sun, 10 Sep 2023 21:43:08 +0200 Subject: [PATCH] decompile FatalError --- asm/include/main_02000C6C.inc | 15 ++- asm/include/main_0200C4CC.inc | 2 +- asm/include/overlay_01.inc | 2 +- asm/include/overlay_03.inc | 2 +- asm/include/overlay_06.inc | 2 +- asm/include/overlay_08.inc | 2 +- asm/include/overlay_10.inc | 2 +- asm/include/overlay_11.inc | 2 +- asm/include/overlay_14.inc | 2 +- asm/include/overlay_15.inc | 2 +- asm/include/overlay_21.inc | 2 +- asm/include/overlay_22.inc | 2 +- asm/include/overlay_23.inc | 2 +- asm/include/overlay_26.inc | 2 +- asm/include/overlay_27.inc | 2 +- asm/include/overlay_29.inc | 4 +- asm/include/overlay_29_022DC240.inc | 2 +- asm/include/overlay_29_02308FE0.inc | 2 +- asm/include/overlay_29_023350FC.inc | 2 +- asm/include/overlay_29_023498A0.inc | 2 +- asm/include/overlay_31.inc | 2 +- asm/main_02000C6C.s | 83 ++++--------- asm/main_0200C4CC.s | 144 +++++++++++------------ asm/overlay_01.s | 42 +++---- asm/overlay_03.s | 6 +- asm/overlay_06.s | 16 +-- asm/overlay_08.s | 8 +- asm/overlay_10.s | 16 +-- asm/overlay_11.s | 122 +++++++++---------- asm/overlay_14.s | 6 +- asm/overlay_15.s | 28 ++--- asm/overlay_21.s | 54 ++++----- asm/overlay_22.s | 174 ++++++++++++++-------------- asm/overlay_23.s | 148 +++++++++++------------ asm/overlay_26.s | 6 +- asm/overlay_27.s | 82 ++++++------- asm/overlay_29_022DC240.s | 4 +- asm/overlay_29_02308FE0.s | 6 +- asm/overlay_29_023350FC.s | 2 +- asm/overlay_29_023498A0.s | 4 +- asm/overlay_31.s | 2 +- include/ansi_params.h | 18 +++ include/main_debug.h | 16 +++ include/stdarg.h | 25 ++++ main.lsf | 1 + src/main_debug.c | 31 +++++ src/main_pack.c | 4 +- 47 files changed, 585 insertions(+), 520 deletions(-) create mode 100644 include/ansi_params.h create mode 100644 include/main_debug.h create mode 100644 include/stdarg.h create mode 100644 src/main_debug.c diff --git a/asm/include/main_02000C6C.inc b/asm/include/main_02000C6C.inc index 15b64e15..6a04cd4c 100644 --- a/asm/include/main_02000C6C.inc +++ b/asm/include/main_02000C6C.inc @@ -1,4 +1,17 @@ #pragma once +.public ClearIrqFlag +.public DEBUG_IS_INITIALIZED +.public DecompressAtFromMemoryPointer +.public FatalError +.public FileInit +.public MainLoop +.public STRING_DEBUG_EMPTY +.public STRING_DEBUG_FORMAT_LINE_FILE +.public STRING_DEBUG_NO_PROG_POS +.public STRING_DEBUG_SPACED_PRINT +.public WaitForInterrupt +.public _0200A314 +.public _0200A344 .public __addsf3 .public __divsi3 .public __floatsisf @@ -328,4 +341,4 @@ .public STRING_DEBUG_FORMAT_LINE_FILE .public STRING_DEBUG_NO_PROG_POS .public STRING_DEBUG_SPACED_PRINT -.public DEBUG_IS_INITIALIZED +.public DEBUG_IS_INITIALIZED \ No newline at end of file diff --git a/asm/include/main_0200C4CC.inc b/asm/include/main_0200C4CC.inc index b9285019..b83b7ebf 100644 --- a/asm/include/main_0200C4CC.inc +++ b/asm/include/main_0200C4CC.inc @@ -9,7 +9,7 @@ .public DataTransferInit .public DataTransferStop .public DebugPrint -.public DebugPrint0__0200C1FC +.public DebugPrint0 .public ExplorersOfSkyMain .public FatalError .public FileClose diff --git a/asm/include/overlay_01.inc b/asm/include/overlay_01.inc index 5a973e94..824d29c9 100644 --- a/asm/include/overlay_01.inc +++ b/asm/include/overlay_01.inc @@ -1,5 +1,5 @@ #pragma once -.public DebugPrint0__0200C1FC +.public DebugPrint0 .public ov00_022EF548 .public GetNbPokemonBattled .public sub_0204AE60 diff --git a/asm/include/overlay_03.inc b/asm/include/overlay_03.inc index 07f2f5d3..99c3e6eb 100644 --- a/asm/include/overlay_03.inc +++ b/asm/include/overlay_03.inc @@ -21,7 +21,7 @@ .public ov01_0233580C .public sub_020433C0 .public MemFree -.public DebugPrint0__0200C1FC +.public DebugPrint0 .public sub_02046BB4 .public sub_02010154 .public ov01_023375B0 diff --git a/asm/include/overlay_06.inc b/asm/include/overlay_06.inc index 91845007..f4267864 100644 --- a/asm/include/overlay_06.inc +++ b/asm/include/overlay_06.inc @@ -55,7 +55,7 @@ .public DungeonRequestsDoneWrapper .public ov01_02338E48 .public sub_02003BFC -.public DebugPrint0__0200C1FC +.public DebugPrint0 .public sub_0204DD80 .public ov01_02338A24 .public ov00_022BCBAC diff --git a/asm/include/overlay_08.inc b/asm/include/overlay_08.inc index 3ab2c140..acc394c0 100644 --- a/asm/include/overlay_08.inc +++ b/asm/include/overlay_08.inc @@ -26,7 +26,7 @@ .public ov00_022BF640 .public ov01_0232C0CC .public ov00_022C4C08 -.public DebugPrint0__0200C1FC +.public DebugPrint0 .public ov01_0232C10C .public sub_0207BA08 .public ov00_022C6EFC diff --git a/asm/include/overlay_10.inc b/asm/include/overlay_10.inc index d7430828..df0350ee 100644 --- a/asm/include/overlay_10.inc +++ b/asm/include/overlay_10.inc @@ -150,7 +150,7 @@ .public sub_02027AF0 .public sub_0204F050 .public sub_02027648 -.public DebugPrint0__0200C1FC +.public DebugPrint0 .public MultiplyByFixedPoint .public InitEventFlagScriptVars .public sub_02048BFC diff --git a/asm/include/overlay_11.inc b/asm/include/overlay_11.inc index 97a23d33..bdda774a 100644 --- a/asm/include/overlay_11.inc +++ b/asm/include/overlay_11.inc @@ -430,7 +430,7 @@ .public sub_02017FB0 .public sub_02075EC8 .public sub_0200A184 -.public DebugPrint0__0200C1FC +.public DebugPrint0 .public sub_02046BA0 .public ov10_022C328C .public sub_02055CCC diff --git a/asm/include/overlay_14.inc b/asm/include/overlay_14.inc index 29697f7f..cb9a2c6e 100644 --- a/asm/include/overlay_14.inc +++ b/asm/include/overlay_14.inc @@ -65,5 +65,5 @@ .public SetSentryDutyGamePoints .public StringFromMessageId .public HidePortraitBox -.public DebugPrint0__0200C1FC +.public DebugPrint0 .public SetPortraitOffset diff --git a/asm/include/overlay_15.inc b/asm/include/overlay_15.inc index f5bb8372..a9fcd3da 100644 --- a/asm/include/overlay_15.inc +++ b/asm/include/overlay_15.inc @@ -32,7 +32,7 @@ .public CreateNormalMenu .public sub_0203088C .public CreatePortraitBox -.public DebugPrint0__0200C1FC +.public DebugPrint0 .public GetNormalMenuResult .public sub_02010758 .public IsDBoxActive diff --git a/asm/include/overlay_21.inc b/asm/include/overlay_21.inc index 1164c619..23311796 100644 --- a/asm/include/overlay_21.inc +++ b/asm/include/overlay_21.inc @@ -27,7 +27,7 @@ .public sub_02013150 .public GetTeamMember .public sub_02027B1C -.public DebugPrint0__0200C1FC +.public DebugPrint0 .public sub_0203FA64 .public MemFree .public sub_0203F150 diff --git a/asm/include/overlay_22.inc b/asm/include/overlay_22.inc index b0e28518..8e122e80 100644 --- a/asm/include/overlay_22.inc +++ b/asm/include/overlay_22.inc @@ -37,7 +37,7 @@ .public GetActualBuyPrice .public sub_02017CCC .public sub_0202C7D0 -.public DebugPrint0__0200C1FC +.public DebugPrint0 .public ShowMessageInDBox .public strcat .public sub_02042BBC diff --git a/asm/include/overlay_23.inc b/asm/include/overlay_23.inc index 879440e8..cd354ae7 100644 --- a/asm/include/overlay_23.inc +++ b/asm/include/overlay_23.inc @@ -45,7 +45,7 @@ .public sub_02043380 .public CreateNormalMenu .public RemoveItemNoHole -.public DebugPrint0__0200C1FC +.public DebugPrint0 .public sub_02043568 .public sub_020582E0 .public InitPortraitBoxWithMonsterId diff --git a/asm/include/overlay_26.inc b/asm/include/overlay_26.inc index 5357637f..463b7f94 100644 --- a/asm/include/overlay_26.inc +++ b/asm/include/overlay_26.inc @@ -53,7 +53,7 @@ .public ShowMessageInDBox .public sub_0205B77C .public CreatePortraitBox -.public DebugPrint0__0200C1FC +.public DebugPrint0 .public sub_02065974 .public IncrementNbDungeonsCleared .public ov10_022BD718 diff --git a/asm/include/overlay_27.inc b/asm/include/overlay_27.inc index 3f1a6c1c..aa0ed0ec 100644 --- a/asm/include/overlay_27.inc +++ b/asm/include/overlay_27.inc @@ -24,7 +24,7 @@ .public sub_0200FD78 .public sub_02042258 .public sub_0202836C -.public DebugPrint0__0200C1FC +.public DebugPrint0 .public CreateDBox .public sub_0202F2C4 .public FreeNormalMenu diff --git a/asm/include/overlay_29.inc b/asm/include/overlay_29.inc index 0c4622e6..712108f6 100644 --- a/asm/include/overlay_29.inc +++ b/asm/include/overlay_29.inc @@ -263,7 +263,7 @@ .public GetMoveMaxGinsengBoost .public SetPokemonJoined .public ov31_023860A4 -.public DebugPrint0__0200C1FC +.public DebugPrint0 .public sub_0204AF20 .public SetMonsterFlag2 .public ReplaceWanFromBinFile @@ -646,7 +646,7 @@ .public GetVictoriesOnOneFloor .public GetRegenSpeed .public ov30_02382874 -.public DebugPrint0__0200C1FC +.public DebugPrint0 .public GetSpriteIndex__020526EC .public GetSpriteIndex__02052708 .public LightningRodStormDrainCheck diff --git a/asm/include/overlay_29_022DC240.inc b/asm/include/overlay_29_022DC240.inc index 0fd8f37a..992f1a77 100644 --- a/asm/include/overlay_29_022DC240.inc +++ b/asm/include/overlay_29_022DC240.inc @@ -1,6 +1,6 @@ #pragma once .public ov29_02305814 -.public DebugPrint0__0200C1FC +.public DebugPrint0 .public ov29_022EA428 .public sub_01FF8C60 .public GetDungeonRngPreseed diff --git a/asm/include/overlay_29_02308FE0.inc b/asm/include/overlay_29_02308FE0.inc index c4b6363e..8d307221 100644 --- a/asm/include/overlay_29_02308FE0.inc +++ b/asm/include/overlay_29_02308FE0.inc @@ -8,7 +8,7 @@ .public CanEnemyEvolve .public CeilFixedPoint .public ClampedLn -.public DebugPrint0__0200C1FC +.public DebugPrint0 .public DivideFixedPoint64 .public __divsi3 .public DungeonRandInt diff --git a/asm/include/overlay_29_023350FC.inc b/asm/include/overlay_29_023350FC.inc index 10d93358..e281abb0 100644 --- a/asm/include/overlay_29_023350FC.inc +++ b/asm/include/overlay_29_023350FC.inc @@ -4,7 +4,7 @@ .public CalcStatusDuration .public CeilFixedPoint .public Conversion2IsActive -.public DebugPrint0__0200C1FC +.public DebugPrint0 .public __divsi3 .public DungeonGoesUp .public EntityIsValid__023350D8 diff --git a/asm/include/overlay_29_023498A0.inc b/asm/include/overlay_29_023498A0.inc index 60925b31..6322eedd 100644 --- a/asm/include/overlay_29_023498A0.inc +++ b/asm/include/overlay_29_023498A0.inc @@ -2,7 +2,7 @@ .public AdvanceFrame .public CreateDBox .public CreatePortraitBox -.public DebugPrint0__0200C1FC +.public DebugPrint0 .public DungeonAlloc .public DungeonFree .public DungeonRandInt diff --git a/asm/include/overlay_31.inc b/asm/include/overlay_31.inc index 46495fe7..9adab408 100644 --- a/asm/include/overlay_31.inc +++ b/asm/include/overlay_31.inc @@ -22,7 +22,7 @@ .public ov10_022BCE58 .public sub_020265A8 .public ov29_022E87DC -.public DebugPrint0__0200C1FC +.public DebugPrint0 .public FreeDBox .public sub_02028284 .public ov29_022EBA70 diff --git a/asm/main_02000C6C.s b/asm/main_02000C6C.s index 789ace93..79d18fec 100644 --- a/asm/main_02000C6C.s +++ b/asm/main_02000C6C.s @@ -26,7 +26,7 @@ NitroMain: ; 0x02000C6C mov r2, r4 mov r1, r0 ldr r0, _02000DD4 ; =_02092448 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 bl sub_0207A524 mov r4, r0 @@ -113,7 +113,7 @@ InitMemAllocTable: ; 0x02000DE0 mov r2, r1 str r1, [sp] str r3, [sp, #4] - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr ip, _02000E60 ; =_020B3380 mov lr, #0 ldr r0, _02000E64 ; =_020B3384 @@ -1910,7 +1910,7 @@ sub_02002448: ; 0x02002448 mov r1, r4 bic r2, r2, #0x10000 str r2, [r3] - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, r4 bl sub_0207B930 bl sub_02079C14 @@ -3287,7 +3287,7 @@ TaskProcBoot: ; 0x02003328 ldr r1, _020035E0 ; =_020AEF7C ldr r0, _02003604 ; =_020924D8 strb sl, [r1, #5] - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r8, #1 ldr r4, _020035E0 ; =_020AEF7C mov r6, sl @@ -3944,7 +3944,7 @@ sub_02003BFC: ; 0x02003BFC cmp r0, #0 bne _02003C54 ldr r0, _02003CB8 ; =_020924E8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _02003CBC ; =_0229B21C ldrh r0, [r0, #2] bl sub_02017DF4 @@ -3962,7 +3962,7 @@ _02003C5C: cmp r0, #0 beq _02003CAC ldr r0, _02003CC0 ; =_020924F8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl sub_02017DB4 ldr r1, _02003CBC ; =_0229B21C strh r0, [r1, #2] @@ -3999,7 +3999,7 @@ SoundResume: ; 0x02003CC4 cmp r0, #0 beq _02003D18 ldr r0, _02003D24 ; =_020924E8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _02003D28 ; =_0229B21C ldrh r0, [r0, #2] bl sub_02017DF4 @@ -4030,7 +4030,7 @@ CardPullOutWithStatus: ; 0x02003D2C ldmeqia sp!, {r4, pc} ldr r0, _02003D6C ; =_02092508 mov r1, r4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 cmp r4, #0 beq _02003D5C bl sub_020081DC @@ -4047,7 +4047,7 @@ _02003D6C: .word _02092508 CardPullOut: ; 0x02003D70 stmdb sp!, {r3, lr} ldr r0, _02003D8C ; =_0209251C - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _02003D90 ; =_020AEF7C mov r1, #1 strb r1, [r0, #0xd] @@ -4061,7 +4061,7 @@ _02003D90: .word _020AEF7C CardBackupError: ; 0x02003D94 stmdb sp!, {r3, lr} ldr r0, _02003DB0 ; =_0209252C - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _02003DB4 ; =_020AEF7C mov r1, #1 strb r1, [r0, #0xc] @@ -4110,7 +4110,7 @@ _02003E28: bl sub_020184A8 ldr r0, _02003EC8 ; =_02092540 mov r1, r4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 cmp r4, #2 bne _02003E9C mov r0, #1 @@ -7774,7 +7774,7 @@ sub_02006EF8: ; 0x02006EF8 ldr r0, _02006F38 ; =_0209278C add r2, sp, #0 mov r1, r4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 add sp, sp, #0x3c ldmia sp!, {r3, r4, pc} .align 2, 0 @@ -7875,7 +7875,7 @@ _02007060: ldr r0, _02007080 ; =_020927BC ldr r1, _02007074 ; =_020AF2B8 ldr r2, _02007078 ; =_020AF2C4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _02007074: .word _020AF2B8 @@ -9434,10 +9434,10 @@ _02008388: bl sub_02007380 bl sub_02007384 ldr r0, _02008434 ; =_0209297C - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl sub_020073D8 ldr r0, _02008438 ; =_0209299C - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0200843C ; =_020AF3D0 ldr r1, _02008440 ; =0x0000070D ldr r0, [r0, #8] @@ -10271,7 +10271,7 @@ sub_02008ED0: ; 0x02008ED0 ldmeqia sp!, {r4, pc} ldr r0, _02008F34 ; =_02092AB8 mov r2, r4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 cmp r4, #0 beq _02008F0C cmp r4, #0xff @@ -14287,8 +14287,8 @@ _0200C1BC: _0200C1C4: .word STRING_DEBUG_SPACED_PRINT arm_func_end DebugPrintTrace - arm_func_start DebugPrint0__0200C1C8 -DebugPrint0__0200C1C8: ; 0x0200C1C8 + arm_func_start DebugDisplay +DebugDisplay: ; 0x0200C1C8 stmdb sp!, {r0, r1, r2, r3} stmdb sp!, {r3, lr} sub sp, sp, #0x100 @@ -14302,10 +14302,10 @@ DebugPrint0__0200C1C8: ; 0x0200C1C8 ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr - arm_func_end DebugPrint0__0200C1C8 + arm_func_end DebugDisplay - arm_func_start DebugPrint0__0200C1FC -DebugPrint0__0200C1FC: ; 0x0200C1FC + arm_func_start DebugPrint0 +DebugPrint0: ; 0x0200C1FC stmdb sp!, {r0, r1, r2, r3} stmdb sp!, {r3, lr} sub sp, sp, #0x100 @@ -14319,7 +14319,7 @@ DebugPrint0__0200C1FC: ; 0x0200C1FC ldmia sp!, {r3, lr} add sp, sp, #0x10 bx lr - arm_func_end DebugPrint0__0200C1FC + arm_func_end DebugPrint0 arm_func_start sub_0200C230 sub_0200C230: ; 0x0200C230 @@ -14363,42 +14363,3 @@ sub_0200C254: ; 0x0200C254 sub_0200C258: ; 0x0200C258 bx lr arm_func_end sub_0200C258 - - arm_func_start FatalError -FatalError: ; 0x0200C25C - stmdb sp!, {r0, r1, r2, r3} - stmdb sp!, {r3, lr} - sub sp, sp, #0x100 - mov r1, r0 - ldr r0, _0200C2CC ; =STRING_DEBUG_FATAL - bl DebugPrintTrace - ldr r1, [sp, #0x10c] - add r0, sp, #0 - cmp r1, #0 - beq _0200C2A4 - add r2, sp, #0x10c - bic r2, r2, #3 - add r2, r2, #4 - bl vsprintf - ldr r1, _0200C2D0 ; =STRING_DEBUG_NEWLINE - add r0, sp, #0 - bl strcat - b _0200C2AC -_0200C2A4: - ldr r1, _0200C2D4 ; =STRING_DEBUG_LOG_NULL - bl strcpy -_0200C2AC: - ldr r0, _0200C2D8 ; =STRING_DEBUG_STRING_NEWLINE - add r1, sp, #0 - bl DebugPrint0__0200C1C8 - bl WaitForever - add sp, sp, #0x100 - ldmia sp!, {r3, lr} - add sp, sp, #0x10 - bx lr - .align 2, 0 -_0200C2CC: .word STRING_DEBUG_FATAL -_0200C2D0: .word STRING_DEBUG_NEWLINE -_0200C2D4: .word STRING_DEBUG_LOG_NULL -_0200C2D8: .word STRING_DEBUG_STRING_NEWLINE - arm_func_end FatalError diff --git a/asm/main_0200C4CC.s b/asm/main_0200C4CC.s index f229ecd8..31d154f2 100644 --- a/asm/main_0200C4CC.s +++ b/asm/main_0200C4CC.s @@ -8215,7 +8215,7 @@ _02012BD0: blt _02012BD0 ldr r0, _020130A0 ; =_02098CCC mov r6, r5 - bl DebugPrint0__0200C1FC + bl DebugPrint0 add r0, sp, #0x24 bl GetPartyMembers str r0, [sp, #0xc] @@ -8265,7 +8265,7 @@ _02012C78: mov r3, r8 mov sb, r8 str r2, [sp] - bl DebugPrint0__0200C1FC + bl DebugPrint0 add r0, r4, #0x12c add r0, r0, #0x800 str r0, [sp, #0x14] @@ -8509,7 +8509,7 @@ _02012FE8: bne _02013008 ldr r0, _020130B4 ; =_02098D48 mov r1, r8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _02013014 _02013008: add sl, sl, #1 @@ -15815,7 +15815,7 @@ InitSoundSystem: ; 0x02018C28 ldr r2, _02018E54 ; =_022A4E58 ldr r0, _02018E58 ; =_020993B4 str r1, [r2, #0x80] - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r1, _02018E5C ; =_020993D0 add r0, sp, #8 bl sub_02019314 @@ -15825,7 +15825,7 @@ InitSoundSystem: ; 0x02018C28 ldr r0, _02018E54 ; =_022A4E58 str r1, [r0, #0x7c] ldr r0, _02018E60 ; =_020993E8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r1, _02018E64 ; =_02099404 add r0, sp, #0 bl sub_02019314 @@ -15837,7 +15837,7 @@ InitSoundSystem: ; 0x02018C28 ldr r2, _02018E54 ; =_022A4E58 ldr r0, _02018E68 ; =_02099418 str r1, [r2, #0x8c] - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r1, _02018E6C ; =_02099434 add r0, sp, #0 bl sub_02019314 @@ -15847,7 +15847,7 @@ InitSoundSystem: ; 0x02018C28 ldr r2, _02018E54 ; =_022A4E58 ldr r0, _02018E70 ; =_02099448 str r1, [r2, #0x88] - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _02018E54 ; =_022A4E58 mov r2, #0 str r2, [r0, #0xc4] @@ -16888,7 +16888,7 @@ _02019B78: ldr r1, [r0, #0x18] ldr r2, [r0, #0x1c] ldr r0, _02019C48 ; =_02099594 - bl DebugPrint0__0200C1FC + bl DebugPrint0 cmp r4, #0 beq _02019BE4 ldr r0, _02019C44 ; =_022A4E58 @@ -19750,7 +19750,7 @@ sub_0201C108: ; 0x0201C108 cmp r0, #0 bne _0201C124 ldr r0, _0201C134 ; =_020996E0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 _0201C124: ldrh r0, [r4, #2] orr r0, r0, #0x8000 @@ -52974,7 +52974,7 @@ sub_02037778: ; 0x02037778 cmp r2, r1 beq _020377B0 ldr r0, _02037C2C ; =_0209B48C - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _02037C28 ; =_020AFDF0 ldr r3, [r0] ldr r1, [r3, #4] @@ -55705,7 +55705,7 @@ _02039CA8: mov r3, r4 str r6, [sp] ldr r1, [r1, #4] - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0203A4D4 ; =_020AFE5C ldr r1, [r0, #4] cmp r1, r5 @@ -73624,7 +73624,7 @@ sub_02048B74: ; 0x02048B74 ldr r0, _02048BAC ; =_0209CD4C ldr r1, [r1, #4] mov r2, #0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r3, #0 ldr r1, _02048BA8 ; =_020AFF38 ldr r0, _02048BB0 ; =_022AAE70 @@ -73683,7 +73683,7 @@ sub_02048C0C: ; 0x02048C0C ldr r1, [r1, #4] ldr r0, _02048C38 ; =_0209CD4C mov r2, r4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _02048C34 ; =_020AFF38 str r4, [r0, #4] ldmia sp!, {r4, pc} @@ -73972,7 +73972,7 @@ NoteSaveBase: ; 0x02048F84 mov r2, r0 ldr r0, _0204921C ; =_0209CD6C mov r1, sb - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 bl SetNotifyNote bl GetTime @@ -74062,7 +74062,7 @@ _0204900C: mov r2, r1 ldr r0, _0204923C ; =_0209CD84 mov r1, r3 - bl DebugPrint0__0200C1FC + bl DebugPrint0 cmp sb, #2 moveq r5, #0 beq _0204912C @@ -74120,7 +74120,7 @@ _020491C4: mov r2, r1 ldr r0, _02049244 ; =_0209CD94 mov r1, r3 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, r4 bl MemFree cmp r5, #0 @@ -74261,7 +74261,7 @@ NoteLoadBase: ; 0x02049370 bl sub_02048BFC mov r1, r0 ldr r0, _02049600 ; =_0209CDA4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 bl SetNotifyNote mov r0, #0 @@ -74308,7 +74308,7 @@ _0204943C: bne _020494A0 ldr r1, [r4, #0x2c] ldr r0, _0204960C ; =_0209CDB8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, [r4, #0x2c] bl sub_02048C0C ldr r0, [r4, #0x28] @@ -76458,14 +76458,14 @@ _0204B024: .word _020AFF70 arm_func_start sub_0204B028 sub_0204B028: ; 0x0204B028 ldr r1, _0204B040 ; =_0209DF70 - ldr ip, _0204B044 ; =DebugPrint0__0200C1FC + ldr ip, _0204B044 ; =DebugPrint0 ldr r0, _0204B048 ; =_0209CF0C ldrsh r1, [r1, #0x24] mov r2, #0x400 bx ip .align 2, 0 _0204B040: .word _0209DF70 -_0204B044: .word DebugPrint0__0200C1FC +_0204B044: .word DebugPrint0 _0204B048: .word _0209CF0C arm_func_end sub_0204B028 @@ -77692,7 +77692,7 @@ sub_0204BFC0: ; 0x0204BFC0 sub r4, r0, #2 ldr r0, _0204C1E0 ; =_0209CF64 mov r1, r4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, r4, lsl #0x10 mov r2, r0, lsr #0x10 mov r0, #0 @@ -77834,7 +77834,7 @@ EventFlagBackup: ; 0x0204C1E4 sub r4, r0, #2 ldr r0, _0204C404 ; =_0209CF84 mov r1, r4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 mov r1, #0x1c bl LoadScriptVariableValue @@ -78614,7 +78614,7 @@ sub_0204CBE8: ; 0x0204CBE8 sub r4, r0, #2 ldr r0, _0204CCB4 ; =_0209DFC8 mov r1, r4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, r4, lsl #0x10 mov r2, r0, lsr #0x10 mov r0, #0 @@ -78672,7 +78672,7 @@ ScenarioFlagBackup: ; 0x0204CCB8 sub r4, r0, #2 ldr r0, _0204CD84 ; =_0209DFE8 mov r1, r4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 mov r2, r0 mov r1, #2 @@ -80048,7 +80048,7 @@ _0204DDD4: ldrb r2, [sp, #0x54] ldr r0, _0204DE78 ; =_0209E264 mov r1, r5 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, [sp, #0x54] cmp r0, r5 movne r0, #0 @@ -80103,7 +80103,7 @@ _0204DE98: str r1, [sp, #0x54] ldrb r2, [sp, #0x54] ldr r0, _0204DF4C ; =_0209E264 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldrb r0, [sp, #0x54] add r1, sp, #0x58 mov r2, #0x11 @@ -87178,7 +87178,7 @@ _02053598: add r0, r3, r2 bl GetInfoMoveGround ldr r0, _02053624 ; =_020A32D4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldmia sp!, {r3, r4, r5, pc} _02053604: add r2, r5, #0x22 @@ -88674,7 +88674,7 @@ _0205493C: bl MemAlloc str r0, [sb, #4] ldr r0, _02054A58 ; =_020A32F8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r8, #0 mov sl, r8 mov r7, #1 @@ -88719,7 +88719,7 @@ _0205498C: ldr r0, _02054A5C ; =_020A3330 mov r1, r8 add r3, sp, #0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 add r0, r8, #1 mov r0, r0, lsl #0x10 cmp r6, r0, asr #16 @@ -90222,7 +90222,7 @@ _02055CAC: _02055CB0: ldr r0, _02055CC8 ; =_020A3350 mov r1, r7 - bl DebugPrint0__0200C1FC + bl DebugPrint0 add sp, sp, #0x58 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -91922,7 +91922,7 @@ _020571B0: mov r0, fp mov r1, r8 mov r2, sl - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, [r5] mov r1, sl, lsl #1 add r0, r0, r8, lsl #3 @@ -91963,7 +91963,7 @@ _0205724C: mov r1, sb mov r3, r2, lsl #1 ldrsh r3, [r7, r3] - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldrsh r0, [r8, #8] mov r1, r0, lsl #1 ldrsh r1, [r7, r1] @@ -92178,7 +92178,7 @@ _02057514: ldr r0, _020577B8 ; =_020A33D4 ldr r2, [sp, #0xc] mov r1, r5 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0x1a0 ldr r1, _020577B4 ; =_020B0A48 mov r7, #0 @@ -92362,7 +92362,7 @@ sub_020577BC: ; 0x020577BC sub sp, sp, #0x4c mov sl, r0 ldr r0, _02057A24 ; =_020A340C - bl DebugPrint0__0200C1FC + bl DebugPrint0 cmp sl, #0xff beq _02057904 mov r0, sl @@ -92442,10 +92442,10 @@ _020578E0: ldr r3, [r1, #0x870] mov r1, sb ldrsh r2, [r3, r2] - bl DebugPrint0__0200C1FC + bl DebugPrint0 _02057904: ldr r0, _02057A34 ; =_020A344C - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, sl bl GetMaxMembersAllowed mov r8, #0 @@ -98519,7 +98519,7 @@ IsMissionValid: ; 0x0205CA40 cmp r1, #0xe beq _0205CA6C ldr r0, _0205CF10 ; =_020A3728 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, pc} _0205CA6C: @@ -98530,7 +98530,7 @@ _0205CA6C: cmp r0, #0 bne _0205CA94 ldr r0, _0205CF14 ; =_020A373C - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, pc} _0205CA94: @@ -98624,7 +98624,7 @@ _0205CBC0: cmp r0, #0 bne _0205CBD8 ldr r0, _0205CF18 ; =_020A3764 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, pc} _0205CBD8: @@ -98659,7 +98659,7 @@ _0205CBD8: cmpne r1, r2 beq _0205CC60 ldr r0, _0205CF1C ; =_020A377C - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, pc} _0205CC60: @@ -98686,7 +98686,7 @@ _0205CCA4: cmp r1, #0 beq _0205CCC0 ldr r0, _0205CF20 ; =_020A37A0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, pc} _0205CCC0: @@ -98701,14 +98701,14 @@ _0205CCC0: cmp r1, #7 bne _0205CCF8 ldr r0, _0205CF24 ; =_020A37D0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, pc} _0205CCF8: cmp r1, #8 blo _0205CD10 ldr r0, _0205CF24 ; =_020A37D0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, pc} _0205CD10: @@ -98728,7 +98728,7 @@ _0205CD38: cmp r1, #0 bne _0205CD54 ldr r0, _0205CF28 ; =_020A37E8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, pc} _0205CD54: @@ -98738,7 +98738,7 @@ _0205CD54: bne _0205CD78 ldrsh r1, [r4, #0x18] ldr r0, _0205CF28 ; =_020A37E8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, pc} _0205CD78: @@ -98748,7 +98748,7 @@ _0205CD78: bne _0205CE24 ldrsh r1, [r4, #0x18] ldr r0, _0205CF2C ; =_020A3808 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, pc} _0205CD9C: @@ -98756,7 +98756,7 @@ _0205CD9C: cmp r1, #0 bne _0205CDB8 ldr r0, _0205CF30 ; =_020A3830 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, pc} _0205CDB8: @@ -98764,7 +98764,7 @@ _0205CDB8: cmp r1, r0 blt _0205CDD4 ldr r0, _0205CF38 ; =_020A3854 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, pc} _0205CDD4: @@ -98774,7 +98774,7 @@ _0205CDD4: beq _0205CDF8 ldrsh r1, [r4, #0x18] ldr r0, _0205CF3C ; =_020A387C - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, pc} _0205CDF8: @@ -98795,7 +98795,7 @@ _0205CE24: cmp r1, #2 blo _0205CE40 ldr r0, _0205CF40 ; =_020A38B4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, pc} _0205CE40: @@ -98806,7 +98806,7 @@ _0205CE40: blo _0205CE68 ldr r0, _0205CF44 ; =_020A38D0 mov r1, r2 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, pc} _0205CE68: @@ -98817,7 +98817,7 @@ _0205CE68: cmp r0, r1 blt _0205CE90 ldr r0, _0205CF48 ; =_020A38F0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, pc} _0205CE90: @@ -98826,7 +98826,7 @@ _0205CE90: beq _0205CEB0 ldrsh r1, [r4, #0x1c] ldr r0, _0205CF4C ; =_020A3918 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, pc} _0205CEB0: @@ -98837,7 +98837,7 @@ _0205CEB0: beq _0205CED8 ldr r0, _0205CF50 ; =_020A3954 mov r1, r5 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, pc} _0205CED8: @@ -98850,7 +98850,7 @@ _0205CED8: bne _0205CF08 ldrsh r1, [r4, #0x1c] ldr r0, _0205CF54 ; =_020A3984 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, pc} _0205CF08: @@ -98895,7 +98895,7 @@ sub_0205CF58: ; 0x0205CF58 beq _0205CFA4 ldrb r1, [r5] ldr r0, _0205CFFC ; =_020A39C0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, pc} _0205CFA4: @@ -98908,7 +98908,7 @@ _0205CFA4: ble _0205CFD4 ldr r0, _0205D000 ; =_020A39D4 mov r1, r4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, pc} _0205CFD4: @@ -98917,7 +98917,7 @@ _0205CFD4: cmp r0, #0 beq _0205CFF4 ldr r0, _0205D004 ; =_020A39F0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, pc} _0205CFF4: @@ -98939,7 +98939,7 @@ sub_0205D008: ; 0x0205D008 cmp r5, #0 bne _0205D034 ldr r0, _0205D104 ; =_020A3A08 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r4, r5, r6, pc} _0205D034: @@ -98947,7 +98947,7 @@ _0205D034: cmp r5, r0 blt _0205D050 ldr r0, _0205D10C ; =_020A3A24 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r4, r5, r6, pc} _0205D050: @@ -98957,7 +98957,7 @@ _0205D050: beq _0205D074 ldr r0, _0205D110 ; =_020A3A44 mov r1, r5 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r4, r5, r6, pc} _0205D074: @@ -98967,7 +98967,7 @@ _0205D074: beq _0205D098 ldr r0, _0205D114 ; =_020A3A6C mov r1, r5 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r4, r5, r6, pc} _0205D098: @@ -98994,7 +98994,7 @@ _0205D0C4: bne _0205D0FC ldr r0, _0205D118 ; =_020A3AA0 mov r1, r5 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r4, r5, r6, pc} _0205D0FC: @@ -99017,7 +99017,7 @@ sub_0205D11C: ; 0x0205D11C bne _0205D140 ldr r0, _0205D1E8 ; =_020A3AD4 mov r1, r4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, pc} _0205D140: @@ -99027,7 +99027,7 @@ _0205D140: beq _0205D164 ldr r0, _0205D1E8 ; =_020A3AD4 mov r1, r4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, pc} _0205D164: @@ -99037,7 +99037,7 @@ _0205D164: bne _0205D188 ldr r0, _0205D1E8 ; =_020A3AD4 mov r1, r4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, pc} _0205D188: @@ -99052,7 +99052,7 @@ _0205D188: beq _0205D1C0 ldr r0, _0205D1EC ; =_020A3AF4 mov r1, r4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, pc} _0205D1C0: @@ -99063,7 +99063,7 @@ _0205D1C0: ldmneia sp!, {r3, r4, r5, pc} ldr r0, _0205D1F0 ; =_020A3B18 mov r1, r4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 @@ -108236,13 +108236,13 @@ _0206499C: ldr r1, [r4, #0x44] ldr r2, [r4, #0x48] ldr r0, _020649EC ; =_020A46B0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _020649DC _020649CC: bl MemFree ldr r0, _020649F0 ; =_020A46D0 mov r1, r4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 _020649DC: mov r0, r4 mov r1, #0x60 @@ -110065,7 +110065,7 @@ _02066134: bl GetSpecialEpisodeType mov r1, r0 ldr r0, _02066378 ; =_020A9208 - bl DebugPrint0__0200C1FC + bl DebugPrint0 sub r0, sb, #4 cmp r0, #9 addls pc, pc, r0, lsl #2 @@ -116703,7 +116703,7 @@ sub_0206BB94: ; 0x0206BB94 cmp r1, #0 bne _0206BBBC ldr r0, _0206BBDC ; =_020A9F98 - bl DebugPrint0__0200C1FC + bl DebugPrint0 _0206BBBC: ldrsh r0, [r4] bl sub_0201F2AC diff --git a/asm/overlay_01.s b/asm/overlay_01.s index 72059d11..eaa04076 100644 --- a/asm/overlay_01.s +++ b/asm/overlay_01.s @@ -4329,7 +4329,7 @@ _0232CCA0: ldr r1, [sp, #0x20] ldr r0, _0232CEA0 ; =0x0233AF14 ldr r2, [sp, #0x1c] - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _0232CCDC _0232CCC8: add sb, sb, #1 @@ -4371,7 +4371,7 @@ _0232CD20: ldr r1, [r6, #0x18] ldr r2, [r6, #0x14] ldr r0, _0232CEA4 ; =0x0233AF3C - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr sb, [sp, #0x124] add r3, sp, #0x24 ldr r2, [r6, #0x14] @@ -11020,7 +11020,7 @@ _023326EC: ldrb r1, [r3, #0x61c] ldrb r2, [r3, #0x61d] ldrb r3, [r3, #0x61e] - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _023329C8 ; =0x0233C184 mov r3, #0 mvn r2, #1 @@ -17163,44 +17163,44 @@ _023379F8: ldmia sp!, {r3, r4, r5, r6, r7, pc} _02337A00: ldr r0, _02337AE4 ; =0x0233BD34 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r7, _02337AE8 ; =0x000036DA b _02337AC4 _02337A10: ldr r0, _02337AEC ; =0x0233BD48 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, r7 ldmia sp!, {r3, r4, r5, r6, r7, pc} _02337A20: ldr r0, _02337AF0 ; =0x0233BD5C - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r7, _02337AF4 ; =0x000036DB b _02337AC4 _02337A30: ldr r0, _02337AF8 ; =0x0233BD70 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r7, _02337AFC ; =0x000036E2 b _02337AC4 _02337A40: ldr r0, _02337B00 ; =0x0233BD90 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r7, _02337B04 ; =0x000036DC b _02337AC4 _02337A50: ldr r0, _02337B08 ; =0x0233BDAC - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r7, _02337B0C ; =0x000036E3 b _02337AC4 _02337A60: ldr r0, _02337B10 ; =0x0233BDC8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 cmp r5, #0 ldrne r7, _02337B14 ; =0x000036DD ldreq r7, _02337B18 ; =0x000036DE b _02337AC4 _02337A78: ldr r0, _02337B1C ; =0x0233BDDC - bl DebugPrint0__0200C1FC + bl DebugPrint0 cmp r5, #0 beq _02337AA0 cmp r4, #2 @@ -17214,12 +17214,12 @@ _02337AA0: b _02337AC4 _02337AA8: ldr r0, _02337B2C ; =0x0233BDF4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r7, _02337B30 ; =0x000036E4 b _02337AC4 _02337AB8: ldr r0, _02337B34 ; =0x0233BE0C - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r7, _02337B38 ; =0x000036E5 _02337AC4: cmp r7, #0 @@ -17969,7 +17969,7 @@ _023384B8: b _02338574 _023384D4: ldr r0, _0233885C ; =0x0233BE24 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #8 str r0, [sb, #0x2c] b _02338574 @@ -17995,7 +17995,7 @@ _0233851C: b _02338574 _02338528: ldr r0, _02338860 ; =0x0233BE48 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov01_0232C008 cmp r0, #0xa beq _02338548 @@ -20067,13 +20067,13 @@ ov01_0233A05C: ; 0x0233A05C bl ov00_022BD968 ldr r0, _0233A120 ; =0x0233C01C mov r1, r7 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0233A124 ; =0x0233C030 mov r1, r6 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0233A128 ; =0x0233C03C mov r1, r4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr ip, [sp, #0x18] mov r0, r7 mov r1, r6 @@ -20213,7 +20213,7 @@ _0233A238: mov r2, r0 ldr r0, _0233A310 ; =0x0233C050 mov r1, r4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #4 b _0233A300 _0233A2B8: @@ -20231,7 +20231,7 @@ _0233A2B8: cmp r0, #0 bgt _0233A2FC ldr r0, _0233A314 ; =0x0233C068 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #5 b _0233A300 _0233A2FC: @@ -20948,7 +20948,7 @@ _0233ACA0: _0233ACA8: ldr r0, _0233ADE8 ; =0x0233C088 mov r1, r5 - bl DebugPrint0__0200C1FC + bl DebugPrint0 cmp r4, #0 ldrne r0, _0233ADDC ; =0x00003781 ldmneia sp!, {r3, r4, r5, pc} diff --git a/asm/overlay_03.s b/asm/overlay_03.s index 92282aa8..3f661291 100644 --- a/asm/overlay_03.s +++ b/asm/overlay_03.s @@ -2372,7 +2372,7 @@ _0233EA70: mov r7, #0xb _0233EA74: ldr r0, _0233EE5C ; =0x02346A64 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r5, _0233EE60 ; =0x02346A68 ldr r4, _0233EE08 ; =0x02346BC0 mov r6, #0 @@ -2381,12 +2381,12 @@ _0233EA88: mov r0, r5 add r1, r1, r6 ldrb r1, [r1, #0x10c] - bl DebugPrint0__0200C1FC + bl DebugPrint0 add r6, r6, #1 cmp r6, #0x36 blt _0233EA88 ldr r0, _0233EE5C ; =0x02346A64 - bl DebugPrint0__0200C1FC + bl DebugPrint0 cmp r7, #0xa addls pc, pc, r7, lsl #2 b _0233F2C4 diff --git a/asm/overlay_06.s b/asm/overlay_06.s index ef6bd2bc..d20c39b1 100644 --- a/asm/overlay_06.s +++ b/asm/overlay_06.s @@ -536,7 +536,7 @@ _0233D0D8: movlt r4, #0 _0233D110: ldr r0, _0233D4DC ; =0x0233EDCC - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r6, _0233D4E0 ; =0x0233EDD0 ldr r5, _0233D4CC ; =0x0233EEC4 mov r7, #0 @@ -545,12 +545,12 @@ _0233D124: mov r0, r6 add r1, r1, r7 ldrb r1, [r1, #0x44] - bl DebugPrint0__0200C1FC + bl DebugPrint0 add r7, r7, #1 cmp r7, #0x22 blt _0233D124 ldr r0, _0233D4DC ; =0x0233EDCC - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0233D4CC ; =0x0233EEC4 cmp r4, #7 ldr r1, [r0] @@ -1618,7 +1618,7 @@ _0233DFF0: cmp r0, fp beq _0233E018 ldr r0, _0233E904 ; =0x0233EDD4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _0233E0F0 _0233E018: ldr r1, [r7, #4] @@ -1626,7 +1626,7 @@ _0233E018: cmp r1, r0 beq _0233E034 ldr r0, _0233E90C ; =0x0233EDFC - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _0233E0F0 _0233E034: bl GetLanguageType @@ -1634,7 +1634,7 @@ _0233E034: cmp r1, r0 beq _0233E050 ldr r0, _0233E910 ; =0x0233EE24 - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _0233E0F0 _0233E050: add r0, r7, #0x20 @@ -1646,7 +1646,7 @@ _0233E050: cmp r1, r2 beq _0233E07C ldr r0, _0233E914 ; =0x0233EE4C - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _0233E0F0 _0233E07C: ldr r2, [sp, #8] @@ -1671,7 +1671,7 @@ _0233E07C: cmp r0, #0 bne _0233E0EC ldr r0, _0233E918 ; =0x0233EE84 - bl DebugPrint0__0200C1FC + bl DebugPrint0 strb r6, [r7] strb r5, [r7, #4] strb r6, [r7, #5] diff --git a/asm/overlay_08.s b/asm/overlay_08.s index 796d3109..9c8405fd 100644 --- a/asm/overlay_08.s +++ b/asm/overlay_08.s @@ -804,7 +804,7 @@ _0233D4A0: cmp r0, #1 bne _0233D4D0 ldr r0, _0233D5A8 ; =0x0233EA70 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, [r4, #4] ldrb r0, [r0, #0xd14] cmp r0, #0 @@ -848,12 +848,12 @@ _0233D514: ; jump table b _0233D568 ; case 9 _0233D53C: ldr r0, _0233D5AC ; =0x0233EA94 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov08_0233E1D8 b _0233D574 _0233D54C: ldr r0, _0233D5B0 ; =0x0233EAA4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov08_0233E16C b _0233D574 _0233D55C: @@ -2356,7 +2356,7 @@ ov08_0233E844: ; 0x0233E844 mov r5, r0 ldr r0, _0233E870 ; =0x0233EBFC mov r4, r1 - bl DebugPrint0__0200C1FC + bl DebugPrint0 cmp r4, #0xb str r4, [r5] cmpne r4, #0xe diff --git a/asm/overlay_10.s b/asm/overlay_10.s index 535eaac1..2e78a64b 100644 --- a/asm/overlay_10.s +++ b/asm/overlay_10.s @@ -1455,13 +1455,13 @@ _022BDD38: cmp r1, #0 bne _022BDD6C ldr r0, _022BDE48 ; =0x022C79D8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _022BDE34 _022BDD6C: sub r1, r1, #1 ldr r0, _022BDE4C ; =0x022C7A18 str r1, [r6, #4] - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, [r6, #4] cmp r0, #0 mvneq r0, #0 @@ -1482,13 +1482,13 @@ _022BDD90: cmp r1, #0 bne _022BDDD0 ldr r0, _022BDE48 ; =0x022C79D8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _022BDE34 _022BDDD0: sub r1, r1, #1 ldr r0, _022BDE4C ; =0x022C7A18 str r1, [r6, #4] - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, [r6, #4] cmp r0, #0 mvneq r0, #0 @@ -7506,7 +7506,7 @@ _022C2D1C: ldrsb r1, [sp, #0xfd] ldrsh r2, [sp, #0xf2] ldr r0, _022C3124 ; =0x022DC094 - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _022C2EF0 _022C2D74: cmp r5, #0 @@ -7701,7 +7701,7 @@ _022C3014: beq _022C304C ldrsb r1, [sp, #0xfe] ldr r0, _022C3130 ; =0x022DC0B8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0xe bl LoadOverlay add r0, sp, #0xf0 @@ -7714,7 +7714,7 @@ _022C3014: _022C304C: ldr r1, [sp, #0x1a0] ldr r0, _022C3134 ; =0x022DC0D4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r1, [sp, #0x1a0] cmp r1, #3 moveq r6, #1 @@ -8406,7 +8406,7 @@ ov10_022C3938: ; 0x022C3938 str fp, [sp] str r7, [sp, #4] str r5, [sp, #8] - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldrb r0, [sp, #0x5c] cmp r0, #1 bls _022C3A64 diff --git a/asm/overlay_11.s b/asm/overlay_11.s index 808c921b..d16b9b8f 100644 --- a/asm/overlay_11.s +++ b/asm/overlay_11.s @@ -11944,7 +11944,7 @@ _022E652C: ldrb r1, [sp, #0x11] ldr r2, [sp, #0x3c] ldr r0, _022E68D4 ; =0x0231993C - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r8, #0 ldr r0, [sp, #0x3c] add sb, sp, #0x34 @@ -11982,7 +11982,7 @@ _022E657C: ldr r1, [sp, #0x3c] ldrb r2, [sl, #4] ldrb r3, [sl, #1] - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldrb r0, [sp, #0x34] cmp r0, #0 beq _022E6630 @@ -12012,7 +12012,7 @@ _022E6644: str r1, [r0] ldr r0, _022E68DC ; =0x023199B4 str r1, [r4] - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl sub_0205F504 mov r1, #0 mov r2, r1 @@ -12043,7 +12043,7 @@ _022E6678: ldrb r2, [sp, #0x24] ldrsh r3, [sp, #0x26] ldr r1, [sp, #0x2c] - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldrb r0, [sp, #0x24] cmp r0, #0 beq _022E66F8 @@ -13005,7 +13005,7 @@ _022E737C: ldrsb r1, [sp, #2] ldr r0, _022E7ACC ; =0x02319A68 mov r2, r4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 cmp r4, #0 movgt r0, r4 bgt _022E7AC0 @@ -13888,7 +13888,7 @@ ov11_022E7F34: ; 0x022E7F34 bl ov11_022E46E8 ldr r1, [sp, #4] ldr r0, _022E7F78 ; =0x02319AD0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r2, [sp] ldr r0, _022E7F7C ; =0x02324CA4 str r2, [r0] @@ -14581,7 +14581,7 @@ GroundMainLoop: ; 0x022E8774 mov r2, r0 ldr r0, _022E91EC ; =0x023209B0 mov r1, r4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl sub_02028E2C mov r0, #0 mov r1, #0xb0000 @@ -14704,7 +14704,7 @@ _022E8960: cmpne r0, #2 beq _022E8990 ldr r0, _022E9204 ; =0x023209CC - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _022E8FDC _022E8990: bl sub_02034D0C @@ -14737,7 +14737,7 @@ _022E89A8: ; jump table b _022E8CCC ; case 20 _022E89FC: ldr r0, _022E9208 ; =0x023209EC - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 mov r1, #0x5c bl ZinitScriptVariable @@ -14769,7 +14769,7 @@ _022E8A3C: ldr r0, _022E920C ; =0x02320A08 mov r1, r5 mov r2, r4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 cmp r5, #2 ldreq r0, _022E9210 ; =0x0000029D streqh r0, [sp, #2] @@ -14801,7 +14801,7 @@ _022E8AE4: mov r1, #0x2b bl SaveScriptVariableValue ldr r0, _022E9208 ; =0x023209EC - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 mov r1, #0x5c bl ZinitScriptVariable @@ -14820,7 +14820,7 @@ _022E8AE4: ldr r0, _022E9224 ; =0x02320A28 mov r1, r4 mov r2, r5 - bl DebugPrint0__0200C1FC + bl DebugPrint0 cmp r4, #2 cmpne r4, #3 beq _022E8B94 @@ -14881,7 +14881,7 @@ _022E8BEC: b _022E8CD4 _022E8C20: ldr r0, _022E9208 ; =0x023209EC - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 mov r1, #0x5c bl ZinitScriptVariable @@ -14946,7 +14946,7 @@ _022E8CD4: ldr r1, _022E91E8 ; =0x02324FA0 ldr r0, _022E9234 ; =0x02320A44 ldr r1, [r1, #0x14] - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _022E91E8 ; =0x02324FA0 ldr r1, [r0, #0x14] cmp r1, #1 @@ -15198,12 +15198,12 @@ _022E9090: cmp r0, #7 bne _022E90C0 ldr r0, _022E923C ; =0x02320A60 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0xd b _022E91E0 _022E90C0: ldr r0, _022E9240 ; =0x02320A70 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0xc b _022E91E0 _022E90D0: @@ -15236,7 +15236,7 @@ _022E90E4: mov r1, r5 mov r2, r4 ldr r0, _022E9244 ; =0x02320A7C - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #4 b _022E91E0 _022E914C: @@ -15246,7 +15246,7 @@ _022E914C: mov r2, r0 ldr r0, _022E9248 ; =0x02320A94 mov r1, r4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #5 b _022E91E0 _022E9170: @@ -15259,7 +15259,7 @@ _022E9170: cmp r1, #5 bne _022E91A0 ldr r0, _022E924C ; =0x02320AAC - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #9 b _022E91E0 _022E91A0: @@ -15269,17 +15269,17 @@ _022E91A0: cmp r0, #0 beq _022E91C4 ldr r0, _022E924C ; =0x02320AAC - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #9 b _022E91E0 _022E91C4: ldr r0, _022E9250 ; =0x02320AB8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0xb b _022E91E0 _022E91D4: ldr r0, _022E9254 ; =0x02320AC8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0xa _022E91E0: add sp, sp, #0x34 @@ -15453,7 +15453,7 @@ _022E9410: .word 0x02324CB0 GroundMainReturnDungeon: ; 0x022E9414 stmdb sp!, {r3, lr} ldr r0, _022E9434 ; =0x023209EC - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 mov r1, #0x5c bl ZinitScriptVariable @@ -15469,7 +15469,7 @@ GroundMainNextDay: ; 0x022E9438 bl GetGameMode mov r4, r0 ldr r0, _022E94C8 ; =0x02320AD4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 cmp r4, #3 bne _022E9468 mov r0, #0 @@ -15493,7 +15493,7 @@ _022E9468: _022E9498: ldr r0, _022E94CC ; =0x02320AEC mov r1, r4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, r4 bl GetKecleonItems1 mov r0, r4 @@ -26608,7 +26608,7 @@ ov11_022F294C: ; 0x022F294C ldr r0, _022F2AA4 ; =0x02321278 mov r1, #0xd80 strh r3, [r2, #2] - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov11_022F2F1C ldr r0, _022F2AA0 ; =0x02324CD0 mov r1, #1 @@ -27938,7 +27938,7 @@ _022F3BEC: cmp r0, #0 bne _022F3C10 ldr r0, _022F3E64 ; =0x02321340 - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _022F3DE0 _022F3C10: ldr r0, _022F3E48 ; =0x02324CE0 @@ -35006,7 +35006,7 @@ ov11_022F9AD4: ; 0x022F9AD4 cmp r0, #3 bne _022F9B8C ldr r0, _022F9F58 ; =0x02321C54 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #1 b _022F9F4C _022F9B8C: @@ -35080,7 +35080,7 @@ _022F9C54: _022F9C94: ldr r0, _022F9F68 ; =0x02321C68 mov r1, r7 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 b _022F9F4C _022F9CA8: @@ -35094,7 +35094,7 @@ _022F9CA8: bne _022F9CDC ldr r0, _022F9F6C ; =0x02321C88 mov r1, r7 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #1 b _022F9F4C _022F9CDC: @@ -35123,7 +35123,7 @@ _022F9D28: beq _022F9D44 ldr r0, _022F9F70 ; =0x02321CA0 mov r1, r7 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 b _022F9F4C _022F9D44: @@ -35150,7 +35150,7 @@ _022F9D50: _022F9D90: ldr r0, _022F9F74 ; =0x02321CBC mov r1, r7 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 b _022F9F4C _022F9DA4: @@ -35164,7 +35164,7 @@ _022F9DA4: bne _022F9DD8 ldr r0, _022F9F78 ; =0x02321CDC mov r1, r7 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #1 b _022F9F4C _022F9DD8: @@ -35193,7 +35193,7 @@ _022F9E24: bne _022F9E40 ldr r0, _022F9F7C ; =0x02321CF4 mov r1, r7 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 b _022F9F4C _022F9E40: @@ -35222,7 +35222,7 @@ _022F9E54: _022F9E94: ldr r0, _022F9F80 ; =0x02321D10 mov r1, r8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 b _022F9F4C _022F9EA8: @@ -35236,7 +35236,7 @@ _022F9EA8: bne _022F9EDC ldr r0, _022F9F84 ; =0x02321D30 mov r1, r8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #1 b _022F9F4C _022F9EDC: @@ -35244,7 +35244,7 @@ _022F9EDC: bne _022F9EF8 ldr r0, _022F9F88 ; =0x02321D48 mov r1, r8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 b _022F9F4C _022F9EF8: @@ -35268,7 +35268,7 @@ _022F9F34: blt _022F9E54 ldr r0, _022F9F8C ; =0x02321D6C mov r1, r8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, #0 _022F9F4C: add sp, sp, #0x34 @@ -35698,7 +35698,7 @@ _022FA4C8: cmp r0, #3 bne _022FA55C ldr r0, _022FA9CC ; =0x02321C54 - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _022FA93C _022FA55C: ldr r1, [r4, #0xc] @@ -35772,7 +35772,7 @@ _022FA628: _022FA668: ldr r0, _022FA9DC ; =0x02321C68 mov r1, r6 - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _022FA93C _022FA678: mov r0, r4 @@ -35784,7 +35784,7 @@ _022FA678: bne _022FA6A4 ldr r0, _022FA9E0 ; =0x02321C88 mov r1, r6 - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _022FA93C _022FA6A4: ldr r3, [sp, #0x10] @@ -35812,7 +35812,7 @@ _022FA6F0: beq _022FA708 ldr r0, _022FA9E4 ; =0x02321CA0 mov r1, r6 - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _022FA93C _022FA708: mov sl, #0x100 @@ -35838,7 +35838,7 @@ _022FA714: _022FA754: ldr r0, _022FA9E8 ; =0x02321CBC mov r1, r6 - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _022FA93C _022FA764: mov r0, r4 @@ -35850,7 +35850,7 @@ _022FA764: bne _022FA790 ldr r0, _022FA9EC ; =0x02321CDC mov r1, r6 - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _022FA93C _022FA790: ldr r3, [sp, #0x10] @@ -35878,7 +35878,7 @@ _022FA7DC: bne _022FA7F4 ldr r0, _022FA9F0 ; =0x02321CF4 mov r1, r6 - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _022FA93C _022FA7F4: mov sl, #0 @@ -35906,7 +35906,7 @@ _022FA808: _022FA848: ldr r0, _022FA9F4 ; =0x02321D10 mov r1, sl - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _022FA93C _022FA858: mov r0, r4 @@ -35918,14 +35918,14 @@ _022FA858: bne _022FA884 ldr r0, _022FA9F8 ; =0x02321D30 mov r1, sl - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _022FA93C _022FA884: cmp r0, #6 bne _022FA89C ldr r0, _022FA9FC ; =0x02321D48 mov r1, sl - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _022FA93C _022FA89C: ldr r2, [sp, #0x10] @@ -35948,7 +35948,7 @@ _022FA8D8: blt _022FA808 ldr r0, _022FAA00 ; =0x02321D6C mov r1, sl - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _022FA93C _022FA8F0: bl KeyWaitInit @@ -46576,7 +46576,7 @@ _0230367C: b _0230371C _023036A4: ldr r0, _02303738 ; =0x023227E8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _02303724 ; =0x02324D54 mov r1, #2 ldr r0, [r0] @@ -46584,11 +46584,11 @@ _023036A4: b _0230371C _023036C0: ldr r0, _0230373C ; =0x02322808 - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _0230371C _023036CC: ldr r0, _02303740 ; =0x02322828 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _02303724 ; =0x02324D54 mov r1, #2 ldr r0, [r0] @@ -46596,15 +46596,15 @@ _023036CC: b _0230371C _023036E8: ldr r0, _02303744 ; =0x02322850 - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _0230371C _023036F4: ldr r0, _02303748 ; =0x0232287C - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _0230371C _02303700: ldr r0, _0230374C ; =0x02322894 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _02303724 ; =0x02324D54 mov r1, #1 ldr r0, [r0] @@ -46705,7 +46705,7 @@ _02303830: b _023038D0 _02303858: ldr r0, _023038EC ; =0x023227E8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _023038D8 ; =0x02324D54 mov r1, #2 ldr r0, [r0] @@ -46713,11 +46713,11 @@ _02303858: b _023038D0 _02303874: ldr r0, _023038F0 ; =0x02322808 - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _023038D0 _02303880: ldr r0, _023038F4 ; =0x02322828 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _023038D8 ; =0x02324D54 mov r1, #2 ldr r0, [r0] @@ -46725,15 +46725,15 @@ _02303880: b _023038D0 _0230389C: ldr r0, _023038F8 ; =0x02322850 - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _023038D0 _023038A8: ldr r0, _023038FC ; =0x0232287C - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _023038D0 _023038B4: ldr r0, _02303900 ; =0x02322894 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _023038D8 ; =0x02324D54 mov r1, #1 ldr r0, [r0] diff --git a/asm/overlay_14.s b/asm/overlay_14.s index b72fe4e1..1f3d2c93 100644 --- a/asm/overlay_14.s +++ b/asm/overlay_14.s @@ -2730,19 +2730,19 @@ _0238C72C: cmp sb, #4 blt _0238C670 ldr r0, _0238CA68 ; =0x0238DB2C - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r1, _0238CA54 ; =ov14_0238DB80 ldr r0, _0238CA6C ; =0x0238DB44 ldr r1, [r1] add r1, r1, #0x3000 ldr r1, [r1, #0x880] - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r1, _0238CA54 ; =ov14_0238DB80 ldr r0, _0238CA70 ; =0x0238DB58 ldr r1, [r1] add r1, r1, #0x3000 ldr r1, [r1, #0x87c] - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238CA54 ; =ov14_0238DB80 ldr r2, _0238CA74 ; =0x880A0000 ldr r3, [r0] diff --git a/asm/overlay_15.s b/asm/overlay_15.s index 02e22c9b..b2debb66 100644 --- a/asm/overlay_15.s +++ b/asm/overlay_15.s @@ -243,7 +243,7 @@ ov15_0238A468: ; 0x0238A468 b _0238A4D4 _0238A488: ldr r0, _0238A4E4 ; =0x0238B0CC - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238A4DC ; =ov15_0238B180 ldr r0, [r0] ldrsb r0, [r0, #0x80] @@ -319,7 +319,7 @@ _0238A56C: ldr r0, _0238AD18 ; =0x0238B0D4 and r1, r1, #0x1f strb r1, [r3, #0x68] - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238AD10 ; =ov15_0238B180 ldr r0, [r0] ldrsb r0, [r0, #0x68] @@ -373,7 +373,7 @@ _0238A634: ldrsb r0, [r0, #0x80] bl ShowDBox ldr r0, _0238AD2C ; =0x0238B0E0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r1, #4 ldr r0, _0238AD30 ; =0x0238B0AC str r1, [sp] @@ -387,7 +387,7 @@ _0238A634: b _0238AD08 _0238A68C: ldr r0, _0238AD3C ; =0x0238B0E8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238AD10 ; =ov15_0238B180 ldr r0, [r0] ldrsb r0, [r0, #0x83] @@ -421,7 +421,7 @@ _0238A708: ldr r0, _0238AD3C ; =0x0238B0E8 mov r1, #6 str r1, [r3, #8] - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238AD10 ; =ov15_0238B180 ldr r0, [r0] ldrsb r0, [r0, #0x83] @@ -462,7 +462,7 @@ _0238A790: b _0238AD08 _0238A7AC: ldr r0, _0238AD4C ; =0x0238B0F4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238AD10 ; =ov15_0238B180 mov r2, #1 ldr r1, [r0] @@ -492,7 +492,7 @@ _0238A7AC: b _0238AD08 _0238A820: ldr r0, _0238AD3C ; =0x0238B0E8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238AD10 ; =ov15_0238B180 ldr r0, [r0] ldrsb r0, [r0, #0x83] @@ -591,7 +591,7 @@ _0238A95C: str ip, [r3, #0x74] ldr r1, [r1] str r2, [r1, #0x78] - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238AD24 ; =0x0238B08C ldr r1, _0238AD28 ; =ov15_0238ADC4 bl sub_0202F8C4 @@ -652,7 +652,7 @@ _0238AA08: b _0238AD08 _0238AA88: ldr r0, _0238AD3C ; =0x0238B0E8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238AD10 ; =ov15_0238B180 ldr r0, [r0] ldrsb r0, [r0, #0x83] @@ -755,7 +755,7 @@ _0238ABD4: str ip, [r3, #0x74] ldr r1, [r1] str r2, [r1, #0x78] - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238AD24 ; =0x0238B08C ldr r1, _0238AD28 ; =ov15_0238ADC4 bl sub_0202F8C4 @@ -956,7 +956,7 @@ ov15_0238AE98: ; 0x0238AE98 cmp r1, r0 beq _0238AEC4 ldr r0, _0238AF44 ; =0x0238B11C - bl DebugPrint0__0200C1FC + bl DebugPrint0 _0238AEC4: ldr r1, _0238AF40 ; =ov15_0238B180 mvn r0, #1 @@ -965,7 +965,7 @@ _0238AEC4: cmp r1, r0 beq _0238AEE4 ldr r0, _0238AF48 ; =0x0238B12C - bl DebugPrint0__0200C1FC + bl DebugPrint0 _0238AEE4: ldr r1, _0238AF40 ; =ov15_0238B180 mvn r0, #1 @@ -974,7 +974,7 @@ _0238AEE4: cmp r1, r0 beq _0238AF04 ldr r0, _0238AF4C ; =0x0238B13C - bl DebugPrint0__0200C1FC + bl DebugPrint0 _0238AF04: ldr r1, _0238AF40 ; =ov15_0238B180 mvn r0, #1 @@ -983,7 +983,7 @@ _0238AF04: cmp r1, r0 beq _0238AF24 ldr r0, _0238AF50 ; =0x0238B150 - bl DebugPrint0__0200C1FC + bl DebugPrint0 _0238AF24: ldr r0, _0238AF40 ; =ov15_0238B180 ldr r0, [r0] diff --git a/asm/overlay_21.s b/asm/overlay_21.s index 87abe8d9..5afff828 100644 --- a/asm/overlay_21.s +++ b/asm/overlay_21.s @@ -85,7 +85,7 @@ _0238A168: ; jump table b _0238B7B8 ; case 66 _0238A274: ldr r0, _0238B090 ; =0x0238CBB8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, r4 ldr r1, [r0] mov r2, #0x96 @@ -132,7 +132,7 @@ _0238A274: b _0238B7B8 _0238A32C: ldr r0, _0238B0A0 ; =0x0238CBD4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B0A4 ; =0x0238CA28 ldr r1, _0238B0A8 ; =ov21_0238C9A4 bl sub_0202F8C4 @@ -152,7 +152,7 @@ _0238A32C: b _0238B7B8 _0238A378: ldr r0, _0238B0B8 ; =0x0238CBF8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov21_0238C920 mov r0, r4 ldr r1, [r0] @@ -223,7 +223,7 @@ ov21_0238A468: ; 0x0238A468 b _0238B7B8 _0238A478: ldr r0, _0238B0C8 ; =0x0238CC18 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov21_0238C920 mov r0, r4 ldr r1, [r0] @@ -253,7 +253,7 @@ _0238A478: b _0238B7B8 _0238A4EC: ldr r0, _0238B0C8 ; =0x0238CC18 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, r4 ldr r2, [r0] mov r4, #2 @@ -267,7 +267,7 @@ _0238A4EC: b _0238B7B8 _0238A520: ldr r0, _0238B0C8 ; =0x0238CC18 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov21_0238C920 mov r0, r4 ldr r1, [r0] @@ -297,7 +297,7 @@ _0238A520: b _0238B7B8 _0238A594: ldr r0, _0238B0D8 ; =0x0238CC3C - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov21_0238C920 mov r0, r4 ldr r1, [r0] @@ -352,7 +352,7 @@ _0238A5FC: b _0238B7B8 _0238A668: ldr r0, _0238B0E0 ; =0x0238CC5C - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov21_0238C920 mov r0, r4 ldr r1, [r0] @@ -382,7 +382,7 @@ _0238A668: b _0238B7B8 _0238A6DC: ldr r0, _0238B0E8 ; =0x0238CC7C - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov21_0238C920 mov r0, r4 ldr r1, [r0] @@ -412,7 +412,7 @@ _0238A6DC: b _0238B7B8 _0238A750: ldr r0, _0238B0EC ; =0x0238CC9C - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov21_0238C920 mov r0, r4 ldr r1, [r0] @@ -445,7 +445,7 @@ _0238A750: b _0238B7B8 _0238A7D0: ldr r0, _0238B0F4 ; =0x0238CCC0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov21_0238C920 mov r0, r4 ldr r1, [r0] @@ -475,12 +475,12 @@ _0238A7D0: b _0238B7B8 _0238A844: ldr r0, _0238B0F8 ; =0x0238CCE4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov11_022DC504 b _0238B7B8 _0238A854: ldr r0, _0238B0FC ; =0x0238CD00 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov21_0238C920 mov r0, r4 ldr r1, [r0] @@ -513,7 +513,7 @@ _0238A854: b _0238B7B8 _0238A8D4: ldr r0, _0238B100 ; =0x0238CD24 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, r4 ldr r1, [r0] mov r2, #0xd @@ -545,7 +545,7 @@ _0238A8D4: b _0238B7B8 _0238A950: ldr r0, _0238B108 ; =0x0238CD44 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, r4 ldr r0, [r0] ldrsb r0, [r0, #0x80] @@ -561,7 +561,7 @@ _0238A950: b _0238B7B8 _0238A98C: ldr r0, _0238B10C ; =0x0238CD68 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov11_0230C910 mov r0, #0 mov r1, r0 @@ -569,7 +569,7 @@ _0238A98C: b _0238B7B8 _0238A9A8: ldr r0, _0238B110 ; =0x0238CD8C - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, r4 ldr r0, [r0] ldrsb r0, [r0, #0x80] @@ -586,7 +586,7 @@ _0238A9A8: b _0238B7B8 _0238A9E8: ldr r0, _0238B114 ; =0x0238CDB4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r4, #3 ldr r0, _0238B118 ; =0x0238CB78 ldr r1, _0238B11C ; =0x00400013 @@ -600,7 +600,7 @@ _0238A9E8: b _0238B7B8 _0238AA1C: ldr r0, _0238B124 ; =0x0238CDDC - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, r4 ldr r5, [r0] ldr r2, _0238B128 ; =0x0238CE00 @@ -642,7 +642,7 @@ _0238AA1C: b _0238B7B8 _0238AAC0: ldr r0, _0238B13C ; =0x0238CE0C - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, r4 ldr r1, [r0] mov r3, #0x96 @@ -716,7 +716,7 @@ _0238ABC0: b _0238B7B8 _0238ABDC: ldr r0, _0238B148 ; =0x0238CE34 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r1, r4 ldr r2, [r1] mov r3, #0x96 @@ -740,7 +740,7 @@ _0238ABDC: b _0238B7B8 _0238AC38: ldr r0, _0238B150 ; =0x0238CE4C - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, r4 ldr r1, [r0] mov r3, #6 @@ -758,7 +758,7 @@ _0238AC38: b _0238B7B8 _0238AC7C: ldr r0, _0238B154 ; =0x0238CE78 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, r4 ldr r1, [r0] mov r3, #7 @@ -776,7 +776,7 @@ _0238AC7C: b _0238B7B8 _0238ACC0: ldr r0, _0238B158 ; =0x0238CEA4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, r4 ldr r1, [r0] mov r3, #8 @@ -930,7 +930,7 @@ _0238AE94: b _0238B7B8 _0238AEF4: ldr r0, _0238B164 ; =0x0238CED0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, r4 mov r2, #0x13 ldr r1, [r0] @@ -954,7 +954,7 @@ _0238AEF4: b _0238B7B8 _0238AF50: ldr r0, _0238B16C ; =0x0238CEF8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mvn r0, #0x95 bl AddMoneyCarried ldr r1, [r4] @@ -2017,7 +2017,7 @@ _0238BE84: ; jump table b _0238BED8 ; case 8 _0238BEA8: ldr r0, _0238C8E4 ; =0x0238CF1C - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov21_0238C920 bl ov11_0230B694 cmp r0, #0 diff --git a/asm/overlay_22.s b/asm/overlay_22.s index e0173903..d4033bfa 100644 --- a/asm/overlay_22.s +++ b/asm/overlay_22.s @@ -1077,7 +1077,7 @@ _0238AE00: ; jump table b _0238AFA4 ; case 48 _0238AEC4: ldr r0, _0238BD64 ; =0x0238E9D0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238BD60 ; =0x0238EC70 mov r1, #1 ldr r0, [r0] @@ -1099,7 +1099,7 @@ _0238AEC4: b _0238C16C _0238AF18: ldr r0, _0238BD70 ; =0x0238E9D8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl sub_02042AF8 bl ov22_0238E7E4 ldr r0, _0238BD60 ; =0x0238EC70 @@ -1122,7 +1122,7 @@ _0238AF18: b _0238C16C _0238AF70: ldr r0, _0238BD7C ; =0x0238E9E4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r4, #5 ldr r0, _0238BD80 ; =0x0238E980 ldr r1, _0238BD84 ; =0x00300013 @@ -1140,7 +1140,7 @@ _0238AFA4: b _0238C16C _0238AFB0: ldr r0, _0238BD8C ; =0x0238E9F4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r0, _0238BD60 ; =0x0238EC70 mov r2, #1 @@ -1161,7 +1161,7 @@ _0238AFB0: b _0238C16C _0238B000: ldr r0, _0238BD98 ; =0x0238EA04 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r0, _0238BD60 ; =0x0238EC70 mov r2, #4 @@ -1182,7 +1182,7 @@ _0238B000: b _0238C16C _0238B050: ldr r0, _0238BDA0 ; =0x0238EA10 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r0, _0238BD60 ; =0x0238EC70 mov r2, #1 @@ -1203,7 +1203,7 @@ _0238B050: b _0238C16C _0238B0A0: ldr r0, _0238BDA8 ; =0x0238EA1C - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r0, _0238BD60 ; =0x0238EC70 mov r2, #0x11 @@ -1224,7 +1224,7 @@ _0238B0A0: b _0238C16C _0238B0F0: ldr r0, _0238BDB0 ; =0x0238EA28 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r1, _0238BD60 ; =0x0238EC70 mov r0, #1 @@ -1244,7 +1244,7 @@ _0238B0F0: b _0238C16C _0238B13C: ldr r0, _0238BDB8 ; =0x0238EA34 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r1, _0238BD60 ; =0x0238EC70 mov r0, #1 @@ -1264,7 +1264,7 @@ _0238B13C: b _0238C16C _0238B188: ldr r0, _0238BDC0 ; =0x0238EA40 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r1, _0238BD60 ; =0x0238EC70 mov r0, #1 @@ -1284,7 +1284,7 @@ _0238B188: b _0238C16C _0238B1D4: ldr r0, _0238BDC8 ; =0x0238EA4C - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r1, _0238BD60 ; =0x0238EC70 mov r0, #1 @@ -1304,7 +1304,7 @@ _0238B1D4: b _0238C16C _0238B220: ldr r0, _0238BDD0 ; =0x0238EA58 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r1, _0238BD60 ; =0x0238EC70 mov r0, #1 @@ -1324,7 +1324,7 @@ _0238B220: b _0238C16C _0238B26C: ldr r0, _0238BDD8 ; =0x0238EA64 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r0, _0238BD60 ; =0x0238EC70 mov r2, #1 @@ -1345,7 +1345,7 @@ _0238B26C: b _0238C16C _0238B2BC: ldr r0, _0238BDE0 ; =0x0238EA70 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r0, _0238BD60 ; =0x0238EC70 mov r2, #0x11 @@ -1366,7 +1366,7 @@ _0238B2BC: b _0238C16C _0238B30C: ldr r0, _0238BDE8 ; =0x0238EA7C - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r1, _0238BD60 ; =0x0238EC70 mov r2, #0x1d @@ -1393,7 +1393,7 @@ _0238B30C: b _0238C16C _0238B374: ldr r0, _0238BDF0 ; =0x0238EA88 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r0, _0238BD60 ; =0x0238EC70 mov r2, #0x1d @@ -1423,7 +1423,7 @@ _0238B3D8: b _0238C16C _0238B3E0: ldr r0, _0238BDF4 ; =0x0238EA94 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r0, _0238BD60 ; =0x0238EC70 mov r3, #0x13 @@ -1447,7 +1447,7 @@ _0238B3E0: b _0238C16C _0238B43C: ldr r0, _0238BDFC ; =0x0238EAA8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238BD60 ; =0x0238EC70 mov r3, #0x14 ldr r1, [r0] @@ -1471,7 +1471,7 @@ _0238B43C: b _0238C16C _0238B498: ldr r0, _0238BE04 ; =0x0238EAB8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238BD60 ; =0x0238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] @@ -1504,7 +1504,7 @@ _0238B4F0: b _0238C16C _0238B510: ldr r0, _0238BE08 ; =0x0238EAC8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238BD60 ; =0x0238EC70 ldr r2, _0238BD74 ; =0x0000017F ldr r1, [r0] @@ -1540,7 +1540,7 @@ _0238B574: b _0238C16C _0238B594: ldr r0, _0238BE0C ; =0x0238EAD8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238BD60 ; =0x0238EC70 ldr r3, _0238BE10 ; =0x0238E8A0 ldr r0, [r0] @@ -1559,7 +1559,7 @@ _0238B594: b _0238C16C _0238B5DC: ldr r0, _0238BE1C ; =0x0238EAE8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238BD60 ; =0x0238EC70 ldr r2, _0238BE20 ; =0x0238E85C ldr r1, [r0] @@ -1603,7 +1603,7 @@ _0238B680: ldrsh r1, [r2, #0x30] ldrh r2, [r2, #0x2e] ldr r0, _0238BE28 ; =0x0238EAF8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238BD60 ; =0x0238EC70 ldr r0, [r0] add r0, r0, #0x50 @@ -1652,7 +1652,7 @@ _0238B680: b _0238C16C _0238B748: ldr r0, _0238BE40 ; =0x0238EB20 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238D528 cmp r0, #0 bne _0238B790 @@ -1693,7 +1693,7 @@ _0238B7A0: b _0238C16C _0238B7D8: ldr r0, _0238BE48 ; =0x0238EB30 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r0, _0238BD60 ; =0x0238EC70 mov r3, #0x1f @@ -1717,7 +1717,7 @@ _0238B7D8: b _0238C16C _0238B834: ldr r0, _0238BE50 ; =0x0238EB40 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238BD60 ; =0x0238EC70 mov r3, #0x20 ldr r1, [r0] @@ -1741,7 +1741,7 @@ _0238B834: b _0238C16C _0238B890: ldr r0, _0238BE58 ; =0x0238EB50 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238BD60 ; =0x0238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] @@ -1766,7 +1766,7 @@ _0238B890: b _0238C16C _0238B8F0: ldr r0, _0238BE5C ; =0x0238EB60 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238BD60 ; =0x0238EC70 ldr r2, _0238BD74 ; =0x0000017F ldr r1, [r0] @@ -1793,7 +1793,7 @@ _0238B8F0: b _0238C16C _0238B958: ldr r0, _0238BE60 ; =0x0238EB70 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r4, #3 ldr r0, _0238BE14 ; =0x0238E990 ldr r3, _0238BE64 ; =0x0238E880 @@ -1807,7 +1807,7 @@ _0238B958: b _0238C16C _0238B98C: ldr r0, _0238BE68 ; =0x0238EB80 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238BD60 ; =0x0238EC70 ldr r2, _0238BE20 ; =0x0238E85C ldr r1, [r0] @@ -1842,7 +1842,7 @@ _0238B98C: b _0238C16C _0238BA14: ldr r0, _0238BE70 ; =0x0238EB90 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r4, #2 ldr r0, _0238BE74 ; =0x0238E9A0 ldr r1, _0238BD84 ; =0x00300013 @@ -1856,7 +1856,7 @@ _0238BA14: b _0238C16C _0238BA48: ldr r0, _0238BE7C ; =0x0238EBA4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r4, #2 ldr r0, _0238BE74 ; =0x0238E9A0 ldr r1, _0238BD84 ; =0x00300013 @@ -1870,7 +1870,7 @@ _0238BA48: b _0238C16C _0238BA7C: ldr r0, _0238BE80 ; =0x0238EBB8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238BD60 ; =0x0238EC70 ldr r0, [r0] add r0, r0, #0x50 @@ -1926,7 +1926,7 @@ _0238BA7C: b _0238C16C _0238BB58: ldr r0, _0238BE84 ; =0x0238EBC8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl GetNbItemsInBag cmp r0, #0 beq _0238BB7C @@ -1962,7 +1962,7 @@ _0238BBA0: b _0238C16C _0238BBD8: ldr r0, _0238BE90 ; =0x0238EBD8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r1, _0238BD60 ; =0x0238EC70 mov r0, #0 @@ -1989,7 +1989,7 @@ _0238BBD8: b _0238C16C _0238BC40: ldr r0, _0238BE98 ; =0x0238EBE4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r0, _0238BD60 ; =0x0238EC70 ldr r0, [r0] @@ -2148,7 +2148,7 @@ _0238BE9C: .word 0x0238E8FC _0238BEA0: .word 0x0238EBF0 _0238BEA4: ldr r0, _0238BEA0 ; =0x0238EBF0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r8, _0238BD60 ; =0x0238EC70 mov r6, #0 @@ -2219,7 +2219,7 @@ _0238BF48: b _0238C16C _0238BFB4: ldr r0, _0238C174 ; =0x0238EC00 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r4, #2 ldr r0, _0238BE74 ; =0x0238E9A0 ldr r1, _0238BD84 ; =0x00300013 @@ -2233,7 +2233,7 @@ _0238BFB4: b _0238C16C _0238BFE8: ldr r0, _0238C178 ; =0x0238EC10 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238BD60 ; =0x0238EC70 mov r2, #1 ldr r1, [r0] @@ -2254,7 +2254,7 @@ _0238BFE8: b _0238C16C _0238C038: ldr r0, _0238C174 ; =0x0238EC00 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r4, #2 ldr r0, _0238BE74 ; =0x0238E9A0 ldr r1, _0238BD84 ; =0x00300013 @@ -2268,7 +2268,7 @@ _0238C038: b _0238C16C _0238C06C: ldr r0, _0238C174 ; =0x0238EC00 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r4, #2 ldr r0, _0238BE74 ; =0x0238E9A0 ldr r1, _0238BD84 ; =0x00300013 @@ -2282,7 +2282,7 @@ _0238C06C: b _0238C16C _0238C0A0: ldr r0, _0238C17C ; =0x0238EC24 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238BD60 ; =0x0238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] @@ -2311,7 +2311,7 @@ _0238C0A0: b _0238C16C _0238C110: ldr r0, _0238C180 ; =0x0238EC38 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238BD60 ; =0x0238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] @@ -2405,7 +2405,7 @@ _0238C1A4: ; jump table b _0238C348 ; case 48 _0238C268: ldr r0, _0238D108 ; =0x0238E9D0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238D104 ; =0x0238EC70 mov r1, #1 ldr r0, [r0] @@ -2427,7 +2427,7 @@ _0238C268: b _0238D510 _0238C2BC: ldr r0, _0238D114 ; =0x0238E9D8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl sub_02042AF8 bl ov22_0238E7E4 ldr r0, _0238D104 ; =0x0238EC70 @@ -2450,7 +2450,7 @@ _0238C2BC: b _0238D510 _0238C314: ldr r0, _0238D120 ; =0x0238E9E4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r4, #5 ldr r0, _0238D124 ; =0x0238E980 ldr r1, _0238D128 ; =0x00300013 @@ -2468,7 +2468,7 @@ _0238C348: b _0238D510 _0238C354: ldr r0, _0238D130 ; =0x0238E9F4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r0, _0238D104 ; =0x0238EC70 mov r2, #1 @@ -2489,7 +2489,7 @@ _0238C354: b _0238D510 _0238C3A4: ldr r0, _0238D13C ; =0x0238EA04 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r0, _0238D104 ; =0x0238EC70 mov r2, #4 @@ -2510,7 +2510,7 @@ _0238C3A4: b _0238D510 _0238C3F4: ldr r0, _0238D144 ; =0x0238EA10 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r0, _0238D104 ; =0x0238EC70 mov r2, #1 @@ -2531,7 +2531,7 @@ _0238C3F4: b _0238D510 _0238C444: ldr r0, _0238D14C ; =0x0238EA1C - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r0, _0238D104 ; =0x0238EC70 mov r2, #0x11 @@ -2552,7 +2552,7 @@ _0238C444: b _0238D510 _0238C494: ldr r0, _0238D154 ; =0x0238EA28 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r1, _0238D104 ; =0x0238EC70 mov r0, #1 @@ -2572,7 +2572,7 @@ _0238C494: b _0238D510 _0238C4E0: ldr r0, _0238D15C ; =0x0238EA34 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r1, _0238D104 ; =0x0238EC70 mov r0, #1 @@ -2592,7 +2592,7 @@ _0238C4E0: b _0238D510 _0238C52C: ldr r0, _0238D164 ; =0x0238EA40 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r1, _0238D104 ; =0x0238EC70 mov r0, #1 @@ -2612,7 +2612,7 @@ _0238C52C: b _0238D510 _0238C578: ldr r0, _0238D16C ; =0x0238EA4C - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r1, _0238D104 ; =0x0238EC70 mov r0, #1 @@ -2632,7 +2632,7 @@ _0238C578: b _0238D510 _0238C5C4: ldr r0, _0238D174 ; =0x0238EA58 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r1, _0238D104 ; =0x0238EC70 mov r0, #1 @@ -2652,7 +2652,7 @@ _0238C5C4: b _0238D510 _0238C610: ldr r0, _0238D17C ; =0x0238EA64 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r0, _0238D104 ; =0x0238EC70 mov r2, #1 @@ -2673,7 +2673,7 @@ _0238C610: b _0238D510 _0238C660: ldr r0, _0238D184 ; =0x0238EA70 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r0, _0238D104 ; =0x0238EC70 mov r2, #0x11 @@ -2694,7 +2694,7 @@ _0238C660: b _0238D510 _0238C6B0: ldr r0, _0238D18C ; =0x0238EA7C - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r1, _0238D104 ; =0x0238EC70 mov r2, #0x1d @@ -2721,7 +2721,7 @@ _0238C6B0: b _0238D510 _0238C718: ldr r0, _0238D194 ; =0x0238EA88 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r0, _0238D104 ; =0x0238EC70 mov r2, #0x1d @@ -2751,7 +2751,7 @@ _0238C77C: b _0238D510 _0238C784: ldr r0, _0238D198 ; =0x0238EA94 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r0, _0238D104 ; =0x0238EC70 mov r3, #0x13 @@ -2775,7 +2775,7 @@ _0238C784: b _0238D510 _0238C7E0: ldr r0, _0238D1A0 ; =0x0238EAA8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238D104 ; =0x0238EC70 mov r3, #0x14 ldr r1, [r0] @@ -2799,7 +2799,7 @@ _0238C7E0: b _0238D510 _0238C83C: ldr r0, _0238D1A8 ; =0x0238EAB8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238D104 ; =0x0238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] @@ -2832,7 +2832,7 @@ _0238C894: b _0238D510 _0238C8B4: ldr r0, _0238D1AC ; =0x0238EAC8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238D104 ; =0x0238EC70 ldr r2, _0238D118 ; =0x0000017F ldr r1, [r0] @@ -2868,7 +2868,7 @@ _0238C918: b _0238D510 _0238C938: ldr r0, _0238D1B0 ; =0x0238EAD8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238D104 ; =0x0238EC70 ldr r3, _0238D1B4 ; =0x0238E8A0 ldr r0, [r0] @@ -2887,7 +2887,7 @@ _0238C938: b _0238D510 _0238C980: ldr r0, _0238D1C0 ; =0x0238EAE8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238D104 ; =0x0238EC70 ldr r2, _0238D1C4 ; =0x0238E85C ldr r1, [r0] @@ -2931,7 +2931,7 @@ _0238CA24: ldrsh r1, [r2, #0x30] ldrh r2, [r2, #0x2e] ldr r0, _0238D1CC ; =0x0238EAF8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238D104 ; =0x0238EC70 ldr r0, [r0] add r0, r0, #0x50 @@ -2980,7 +2980,7 @@ _0238CA24: b _0238D510 _0238CAEC: ldr r0, _0238D1E4 ; =0x0238EB20 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238D528 cmp r0, #0 bne _0238CB34 @@ -3021,7 +3021,7 @@ _0238CB44: b _0238D510 _0238CB7C: ldr r0, _0238D1EC ; =0x0238EB30 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r0, _0238D104 ; =0x0238EC70 mov r3, #0x1f @@ -3045,7 +3045,7 @@ _0238CB7C: b _0238D510 _0238CBD8: ldr r0, _0238D1F4 ; =0x0238EB40 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238D104 ; =0x0238EC70 mov r3, #0x20 ldr r1, [r0] @@ -3069,7 +3069,7 @@ _0238CBD8: b _0238D510 _0238CC34: ldr r0, _0238D1FC ; =0x0238EB50 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238D104 ; =0x0238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] @@ -3095,7 +3095,7 @@ _0238CC34: arm_func_end ov22_0238C184 ov22_0238CC94: ldr r0, _0238D200 ; =0x0238EB60 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238D104 ; =0x0238EC70 ldr r2, _0238D118 ; =0x0000017F ldr r1, [r0] @@ -3137,7 +3137,7 @@ ov22_0238CCF0: ; 0x0238CCF0 b _0238D510 _0238CCFC: ldr r0, _0238D204 ; =0x0238EB70 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r4, #3 ldr r0, _0238D1B8 ; =0x0238E990 ldr r3, _0238D208 ; =0x0238E880 @@ -3151,7 +3151,7 @@ _0238CCFC: b _0238D510 _0238CD30: ldr r0, _0238D20C ; =0x0238EB80 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238D104 ; =0x0238EC70 ldr r2, _0238D1C4 ; =0x0238E85C ldr r1, [r0] @@ -3186,7 +3186,7 @@ _0238CD30: b _0238D510 _0238CDB8: ldr r0, _0238D214 ; =0x0238EB90 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r4, #2 ldr r0, _0238D218 ; =0x0238E9A0 ldr r1, _0238D128 ; =0x00300013 @@ -3200,7 +3200,7 @@ _0238CDB8: b _0238D510 _0238CDEC: ldr r0, _0238D220 ; =0x0238EBA4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r4, #2 ldr r0, _0238D218 ; =0x0238E9A0 ldr r1, _0238D128 ; =0x00300013 @@ -3214,7 +3214,7 @@ _0238CDEC: b _0238D510 _0238CE20: ldr r0, _0238D224 ; =0x0238EBB8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238D104 ; =0x0238EC70 ldr r0, [r0] add r0, r0, #0x50 @@ -3270,7 +3270,7 @@ _0238CE20: b _0238D510 _0238CEFC: ldr r0, _0238D228 ; =0x0238EBC8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl GetNbItemsInBag cmp r0, #0 beq _0238CF20 @@ -3306,7 +3306,7 @@ _0238CF44: b _0238D510 _0238CF7C: ldr r0, _0238D234 ; =0x0238EBD8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r1, _0238D104 ; =0x0238EC70 mov r0, #0 @@ -3333,7 +3333,7 @@ _0238CF7C: b _0238D510 _0238CFE4: ldr r0, _0238D23C ; =0x0238EBE4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r0, _0238D104 ; =0x0238EC70 ldr r0, [r0] @@ -3492,7 +3492,7 @@ _0238D240: .word 0x0238E8FC _0238D244: .word 0x0238EBF0 _0238D248: ldr r0, _0238D244 ; =0x0238EBF0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov22_0238E7E4 ldr r8, _0238D104 ; =0x0238EC70 mov r6, #0 @@ -3563,7 +3563,7 @@ _0238D2EC: b _0238D510 _0238D358: ldr r0, _0238D518 ; =0x0238EC00 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r4, #2 ldr r0, _0238D218 ; =0x0238E9A0 ldr r1, _0238D128 ; =0x00300013 @@ -3577,7 +3577,7 @@ _0238D358: b _0238D510 _0238D38C: ldr r0, _0238D51C ; =0x0238EC10 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238D104 ; =0x0238EC70 mov r2, #1 ldr r1, [r0] @@ -3598,7 +3598,7 @@ _0238D38C: b _0238D510 _0238D3DC: ldr r0, _0238D518 ; =0x0238EC00 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r4, #2 ldr r0, _0238D218 ; =0x0238E9A0 ldr r1, _0238D128 ; =0x00300013 @@ -3612,7 +3612,7 @@ _0238D3DC: b _0238D510 _0238D410: ldr r0, _0238D518 ; =0x0238EC00 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r4, #2 ldr r0, _0238D218 ; =0x0238E9A0 ldr r1, _0238D128 ; =0x00300013 @@ -3626,7 +3626,7 @@ _0238D410: b _0238D510 _0238D444: ldr r0, _0238D520 ; =0x0238EC24 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238D104 ; =0x0238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] @@ -3655,7 +3655,7 @@ _0238D444: b _0238D510 _0238D4B4: ldr r0, _0238D524 ; =0x0238EC38 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238D104 ; =0x0238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] @@ -4948,7 +4948,7 @@ _0238E6BC: b _0238E734 _0238E6CC: ldr r0, _0238E7A4 ; =0x0238EC4C - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238E794 ; =0x0238EC70 ldr r0, [r0] ldr r0, [r0, #0x14] diff --git a/asm/overlay_23.s b/asm/overlay_23.s index 3a0ec473..61f38e93 100644 --- a/asm/overlay_23.s +++ b/asm/overlay_23.s @@ -97,7 +97,7 @@ _0238A218: b _0238B230 _0238A2A0: ldr r0, _0238B0E4 ; =0x0238D448 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r3, [r0] add r1, r3, #0x90 @@ -171,7 +171,7 @@ _0238A38C: b _0238B230 _0238A3B8: ldr r0, _0238B0FC ; =0x0238D468 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl sub_02042AF8 bl sub_020434D4 bl ov23_0238D098 @@ -191,7 +191,7 @@ _0238A3B8: b _0238B230 _0238A404: ldr r0, _0238B100 ; =0x0238D484 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov23_0238D098 ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r2, #1 @@ -212,7 +212,7 @@ _0238A404: b _0238B230 _0238A454: ldr r0, _0238B108 ; =0x0238D4A4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov23_0238D098 ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r3, #4 @@ -233,7 +233,7 @@ _0238A454: b _0238B230 _0238A4A4: ldr r0, _0238B110 ; =0x0238D4C0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov23_0238D098 ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r2, #1 @@ -254,7 +254,7 @@ _0238A4A4: b _0238B230 _0238A4F4: ldr r0, _0238B114 ; =0x0238D4DC - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov23_0238D098 ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r3, #1 @@ -275,7 +275,7 @@ _0238A4F4: b _0238B230 _0238A544: ldr r0, _0238B11C ; =0x0238D4F8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov23_0238D098 ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r2, #1 @@ -296,7 +296,7 @@ _0238A544: b _0238B230 _0238A594: ldr r0, _0238B120 ; =0x0238D51C - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov23_0238D098 ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r3, #1 @@ -317,7 +317,7 @@ _0238A594: b _0238B230 _0238A5E4: ldr r0, _0238B128 ; =0x0238D540 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov23_0238D098 ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r3, #1 @@ -338,7 +338,7 @@ _0238A5E4: b _0238B230 _0238A634: ldr r0, _0238B12C ; =0x0238D55C - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov23_0238D098 ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r3, #0xf @@ -368,7 +368,7 @@ _0238A634: b _0238B230 _0238A6A8: ldr r0, _0238B134 ; =0x0238D578 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov23_0238D098 ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r2, #0xf @@ -389,11 +389,11 @@ _0238A6A8: b _0238B230 _0238A6F8: ldr r0, _0238B138 ; =0x0238D594 - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _0238B230 _0238A704: ldr r0, _0238B13C ; =0x0238D5AC - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl sub_02042730 bl ov23_0238D098 ldr r0, _0238B0DC ; =ov23_0238D8A0 @@ -415,7 +415,7 @@ _0238A704: b _0238B230 _0238A758: ldr r0, _0238B140 ; =0x0238D5CC - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r3, #0xf ldr r1, [r0] @@ -435,7 +435,7 @@ _0238A758: b _0238B230 _0238A7A4: ldr r0, _0238B144 ; =0x0238D5E8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] @@ -459,7 +459,7 @@ _0238A7A4: b _0238B230 _0238A800: ldr r0, _0238B148 ; =0x0238D608 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] @@ -483,7 +483,7 @@ _0238A800: b _0238B230 _0238A85C: ldr r0, _0238B14C ; =0x0238D628 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r1, [r0] add r0, r1, #0x90 @@ -526,7 +526,7 @@ _0238A8B8: b _0238B230 _0238A8FC: ldr r0, _0238B158 ; =0x0238D64C - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B15C ; =0x0238D2EC mov r4, #3 str r0, [sp, #0x19c] @@ -542,13 +542,13 @@ _0238A8FC: b _0238B230 _0238A938: ldr r0, _0238B160 ; =0x0238D670 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r1, _0238B0DC ; =ov23_0238D8A0 ldr r0, _0238B164 ; =0x0238D68C ldr r2, [r1] ldrsh r1, [r2, #0x1c] ldrh r2, [r2, #0x1a] - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B0DC ; =ov23_0238D8A0 mov lr, #0 ldr ip, [r0] @@ -600,7 +600,7 @@ _0238A938: b _0238B230 _0238AA1C: ldr r0, _0238B17C ; =0x0238D6A8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r2, [r0] ldr r1, [r2] @@ -643,7 +643,7 @@ _0238AA54: b _0238B230 _0238AAC0: ldr r0, _0238B180 ; =0x0238D6CC - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r2, [r0] ldr r1, [r2] @@ -686,7 +686,7 @@ _0238AAF8: b _0238B230 _0238AB64: ldr r0, _0238B188 ; =0x0238D6F0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov ip, #2 ldr r0, _0238B18C ; =0x0238D418 ldr r1, _0238B0F4 ; =0x00300013 @@ -700,7 +700,7 @@ _0238AB64: b _0238B230 _0238AB98: ldr r0, _0238B194 ; =0x0238D708 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov ip, #2 ldr r0, _0238B18C ; =0x0238D418 ldr r1, _0238B0F4 ; =0x00300013 @@ -714,7 +714,7 @@ _0238AB98: b _0238B230 _0238ABCC: ldr r0, _0238B198 ; =0x0238D71C - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov11_022DC504 bl GetNbItemsInBag cmp r0, #0 @@ -757,7 +757,7 @@ _0238AC28: b _0238B230 _0238AC68: ldr r0, _0238B19C ; =0x0238D73C - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl sub_02043218 bl ov23_0238D098 ldr r0, _0238B0DC ; =ov23_0238D8A0 @@ -779,7 +779,7 @@ _0238AC68: b _0238B230 _0238ACBC: ldr r0, _0238B1A0 ; =0x0238D75C - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov23_0238D098 ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r2, #0x19 @@ -800,7 +800,7 @@ _0238ACBC: b _0238B230 _0238AD0C: ldr r0, _0238B1A4 ; =0x0238D77C - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B0DC ; =ov23_0238D8A0 mov r2, #0x2b ldr r1, [r0] @@ -828,7 +828,7 @@ _0238AD54: b _0238B230 _0238AD74: ldr r0, _0238B1A8 ; =0x0238D79C - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] @@ -851,7 +851,7 @@ _0238AD74: b _0238B230 _0238ADCC: ldr r0, _0238B1AC ; =0x0238D7BC - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov ip, #3 ldr r0, _0238B150 ; =0x0238D408 ldr r3, _0238B1B0 ; =0x0238D314 @@ -865,7 +865,7 @@ _0238ADCC: b _0238B230 _0238AE00: ldr r0, _0238B1AC ; =0x0238D7BC - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B1B4 ; =0x0238D2E8 mov ip, #3 str r0, [sp, #0x284] @@ -881,7 +881,7 @@ _0238AE00: b _0238B230 _0238AE3C: ldr r0, _0238B1B8 ; =0x0238D7E0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r2, _0238B168 ; =0x0238D69C ldr lr, [r0] @@ -926,7 +926,7 @@ _0238AE3C: b _0238B230 _0238AEEC: ldr r0, _0238B1BC ; =0x0238D7FC - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r2, [r0] ldr r1, [r2] @@ -970,7 +970,7 @@ _0238AF24: b _0238B230 _0238AF94: ldr r0, _0238B1C4 ; =0x0238D81C - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov ip, #2 ldr r0, _0238B18C ; =0x0238D418 ldr r1, _0238B0F4 ; =0x00300013 @@ -984,7 +984,7 @@ _0238AF94: b _0238B230 _0238AFC8: ldr r0, _0238B1C8 ; =0x0238D834 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B0DC ; =ov23_0238D8A0 ldr r2, [r0] ldr r1, [r2] @@ -1027,7 +1027,7 @@ _0238B000: b _0238B230 _0238B06C: ldr r0, _0238B1CC ; =0x0238D854 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov ip, #2 ldr r0, _0238B18C ; =0x0238D418 ldr r1, _0238B0F4 ; =0x00300013 @@ -1041,7 +1041,7 @@ _0238B06C: b _0238B230 _0238B0A0: ldr r0, _0238B1D0 ; =0x0238D868 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov11_022DC504 mov r0, #1 bl sub_02043320 @@ -1241,7 +1241,7 @@ _0238B308: b _0238C320 _0238B390: ldr r0, _0238C1D4 ; =0x0238D448 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r3, [r0] add r1, r3, #0x90 @@ -1315,7 +1315,7 @@ _0238B47C: b _0238C320 _0238B4A8: ldr r0, _0238C1EC ; =0x0238D468 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl sub_02042AF8 bl sub_020434D4 bl ov23_0238D098 @@ -1335,7 +1335,7 @@ _0238B4A8: b _0238C320 _0238B4F4: ldr r0, _0238C1F0 ; =0x0238D484 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov23_0238D098 ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r2, #1 @@ -1356,7 +1356,7 @@ _0238B4F4: b _0238C320 _0238B544: ldr r0, _0238C1F8 ; =0x0238D4A4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov23_0238D098 ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r3, #4 @@ -1377,7 +1377,7 @@ _0238B544: b _0238C320 _0238B594: ldr r0, _0238C200 ; =0x0238D4C0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov23_0238D098 ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r2, #1 @@ -1398,7 +1398,7 @@ _0238B594: b _0238C320 _0238B5E4: ldr r0, _0238C204 ; =0x0238D4DC - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov23_0238D098 ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r3, #1 @@ -1419,7 +1419,7 @@ _0238B5E4: b _0238C320 _0238B634: ldr r0, _0238C20C ; =0x0238D4F8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov23_0238D098 ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r2, #1 @@ -1440,7 +1440,7 @@ _0238B634: b _0238C320 _0238B684: ldr r0, _0238C210 ; =0x0238D51C - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov23_0238D098 ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r3, #1 @@ -1461,7 +1461,7 @@ _0238B684: b _0238C320 _0238B6D4: ldr r0, _0238C218 ; =0x0238D540 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov23_0238D098 ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r3, #1 @@ -1482,7 +1482,7 @@ _0238B6D4: b _0238C320 _0238B724: ldr r0, _0238C21C ; =0x0238D55C - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov23_0238D098 ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r3, #0xf @@ -1512,7 +1512,7 @@ _0238B724: b _0238C320 _0238B798: ldr r0, _0238C224 ; =0x0238D578 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov23_0238D098 ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r2, #0xf @@ -1533,11 +1533,11 @@ _0238B798: b _0238C320 _0238B7E8: ldr r0, _0238C228 ; =0x0238D594 - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _0238C320 _0238B7F4: ldr r0, _0238C22C ; =0x0238D5AC - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl sub_02042730 bl ov23_0238D098 ldr r0, _0238C1CC ; =ov23_0238D8A0 @@ -1559,7 +1559,7 @@ _0238B7F4: b _0238C320 _0238B848: ldr r0, _0238C230 ; =0x0238D5CC - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r3, #0xf ldr r1, [r0] @@ -1579,7 +1579,7 @@ _0238B848: b _0238C320 _0238B894: ldr r0, _0238C234 ; =0x0238D5E8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] @@ -1603,7 +1603,7 @@ _0238B894: b _0238C320 _0238B8F0: ldr r0, _0238C238 ; =0x0238D608 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] @@ -1627,7 +1627,7 @@ _0238B8F0: b _0238C320 _0238B94C: ldr r0, _0238C23C ; =0x0238D628 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r1, [r0] add r0, r1, #0x90 @@ -1670,7 +1670,7 @@ _0238B9A8: b _0238C320 _0238B9EC: ldr r0, _0238C248 ; =0x0238D64C - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238C24C ; =0x0238D2EC mov r4, #3 str r0, [sp, #0x1a4] @@ -1686,13 +1686,13 @@ _0238B9EC: b _0238C320 _0238BA28: ldr r0, _0238C250 ; =0x0238D670 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r1, _0238C1CC ; =ov23_0238D8A0 ldr r0, _0238C254 ; =0x0238D68C ldr r2, [r1] ldrsh r1, [r2, #0x1c] ldrh r2, [r2, #0x1a] - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238C1CC ; =ov23_0238D8A0 mov lr, #0 ldr ip, [r0] @@ -1744,7 +1744,7 @@ _0238BA28: b _0238C320 _0238BB0C: ldr r0, _0238C26C ; =0x0238D6A8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r2, [r0] ldr r1, [r2] @@ -1787,7 +1787,7 @@ _0238BB44: b _0238C320 _0238BBB0: ldr r0, _0238C270 ; =0x0238D6CC - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r2, [r0] ldr r1, [r2] @@ -1830,7 +1830,7 @@ _0238BBE8: b _0238C320 _0238BC54: ldr r0, _0238C278 ; =0x0238D6F0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov ip, #2 ldr r0, _0238C27C ; =0x0238D418 ldr r1, _0238C1E4 ; =0x00300013 @@ -1844,7 +1844,7 @@ _0238BC54: b _0238C320 _0238BC88: ldr r0, _0238C284 ; =0x0238D708 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov ip, #2 ldr r0, _0238C27C ; =0x0238D418 ldr r1, _0238C1E4 ; =0x00300013 @@ -1858,7 +1858,7 @@ _0238BC88: b _0238C320 _0238BCBC: ldr r0, _0238C288 ; =0x0238D71C - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov11_022DC504 bl GetNbItemsInBag cmp r0, #0 @@ -1901,7 +1901,7 @@ _0238BD18: b _0238C320 _0238BD58: ldr r0, _0238C28C ; =0x0238D73C - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl sub_02043218 bl ov23_0238D098 ldr r0, _0238C1CC ; =ov23_0238D8A0 @@ -1923,7 +1923,7 @@ _0238BD58: b _0238C320 _0238BDAC: ldr r0, _0238C290 ; =0x0238D75C - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov23_0238D098 ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r2, #0x19 @@ -1944,7 +1944,7 @@ _0238BDAC: b _0238C320 _0238BDFC: ldr r0, _0238C294 ; =0x0238D77C - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238C1CC ; =ov23_0238D8A0 mov r2, #0x2b ldr r1, [r0] @@ -1972,7 +1972,7 @@ _0238BE44: b _0238C320 _0238BE64: ldr r0, _0238C298 ; =0x0238D79C - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] @@ -1995,7 +1995,7 @@ _0238BE64: b _0238C320 _0238BEBC: ldr r0, _0238C29C ; =0x0238D7BC - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov ip, #3 ldr r0, _0238C240 ; =0x0238D408 ldr r3, _0238C2A0 ; =0x0238D314 @@ -2009,7 +2009,7 @@ _0238BEBC: b _0238C320 _0238BEF0: ldr r0, _0238C29C ; =0x0238D7BC - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238C2A4 ; =0x0238D2E8 mov ip, #3 str r0, [sp, #0xbc] @@ -2025,7 +2025,7 @@ _0238BEF0: b _0238C320 _0238BF2C: ldr r0, _0238C2A8 ; =0x0238D7E0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r2, _0238C258 ; =0x0238D69C ldr lr, [r0] @@ -2070,7 +2070,7 @@ _0238BF2C: b _0238C320 _0238BFDC: ldr r0, _0238C2AC ; =0x0238D7FC - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r2, [r0] ldr r1, [r2] @@ -2114,7 +2114,7 @@ _0238C014: b _0238C320 _0238C084: ldr r0, _0238C2B4 ; =0x0238D81C - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov ip, #2 ldr r0, _0238C27C ; =0x0238D418 ldr r1, _0238C1E4 ; =0x00300013 @@ -2128,7 +2128,7 @@ _0238C084: b _0238C320 _0238C0B8: ldr r0, _0238C2B8 ; =0x0238D834 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238C1CC ; =ov23_0238D8A0 ldr r2, [r0] ldr r1, [r2] @@ -2171,7 +2171,7 @@ _0238C0F0: b _0238C320 _0238C15C: ldr r0, _0238C2BC ; =0x0238D854 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov ip, #2 ldr r0, _0238C27C ; =0x0238D418 ldr r1, _0238C1E4 ; =0x00300013 @@ -2185,7 +2185,7 @@ _0238C15C: b _0238C320 _0238C190: ldr r0, _0238C2C0 ; =0x0238D868 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov11_022DC504 mov r0, #1 bl sub_02043320 diff --git a/asm/overlay_26.s b/asm/overlay_26.s index eab4214a..a0a2ff75 100644 --- a/asm/overlay_26.s +++ b/asm/overlay_26.s @@ -760,7 +760,7 @@ _0238AB34: cmp r0, #1 bhi _0238AB70 ldr r0, _0238AC08 ; =0x0238AEAC - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl IncrementNbAdventures bl IncrementNbDungeonsCleared b _0238AB98 @@ -769,13 +769,13 @@ _0238AB70: cmp r0, #1 bhi _0238AB90 ldr r0, _0238AC0C ; =0x0238AEE4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl IncrementNbAdventures bl IncrementNbFainted b _0238AB98 _0238AB90: ldr r0, _0238AC10 ; =0x0238AF18 - bl DebugPrint0__0200C1FC + bl DebugPrint0 _0238AB98: mov r0, r4 bl sub_020587E0 diff --git a/asm/overlay_27.s b/asm/overlay_27.s index a89a84a8..8616e084 100644 --- a/asm/overlay_27.s +++ b/asm/overlay_27.s @@ -705,7 +705,7 @@ _0238AA78: b _0238BA74 _0238AAE0: ldr r0, _0238B928 ; =0x0238CA8C - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r1, _0238B920 ; =0x0238CE84 mov r3, #0 ldr r4, [r1] @@ -738,7 +738,7 @@ _0238AAE0: b _0238BA74 _0238AB60: ldr r0, _0238B934 ; =0x0238CAA4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl sub_02042AF8 bl sub_020434D4 bl ov27_0238C900 @@ -758,7 +758,7 @@ _0238AB60: b _0238BA74 _0238ABAC: ldr r0, _0238B938 ; =0x0238CAB8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov27_0238C900 ldr r0, _0238B920 ; =0x0238CE84 mov r3, #1 @@ -779,7 +779,7 @@ _0238ABAC: b _0238BA74 _0238ABFC: ldr r0, _0238B93C ; =0x0238CAD0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov27_0238C900 ldr r0, _0238B920 ; =0x0238CE84 mov r3, #4 @@ -800,7 +800,7 @@ _0238ABFC: b _0238BA74 _0238AC4C: ldr r0, _0238B944 ; =0x0238CAE4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov27_0238C900 ldr r0, _0238B920 ; =0x0238CE84 mov r2, #1 @@ -821,7 +821,7 @@ _0238AC4C: b _0238BA74 _0238AC9C: ldr r0, _0238B948 ; =0x0238CAFC - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov27_0238C900 ldr r0, _0238B920 ; =0x0238CE84 mov r3, #1 @@ -842,7 +842,7 @@ _0238AC9C: b _0238BA74 _0238ACEC: ldr r0, _0238B950 ; =0x0238CB14 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov27_0238C900 ldr r0, _0238B920 ; =0x0238CE84 mov r3, #1 @@ -863,7 +863,7 @@ _0238ACEC: b _0238BA74 _0238AD3C: ldr r0, _0238B958 ; =0x0238CB30 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov27_0238C900 ldr r0, _0238B920 ; =0x0238CE84 mov r3, #1 @@ -884,7 +884,7 @@ _0238AD3C: b _0238BA74 _0238AD8C: ldr r0, _0238B95C ; =0x0238CB4C - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov27_0238C900 ldr r0, _0238B920 ; =0x0238CE84 mov r3, #0xe @@ -918,7 +918,7 @@ ov27_0238ADFC: ; 0x0238ADFC b _0238BA74 _0238AE00: ldr r0, _0238B968 ; =0x0238CB64 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov27_0238C900 ldr r0, _0238B920 ; =0x0238CE84 mov r2, #0xe @@ -939,11 +939,11 @@ _0238AE00: b _0238BA74 _0238AE50: ldr r0, _0238B96C ; =0x0238CB7C - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _0238BA74 _0238AE5C: ldr r0, _0238B970 ; =0x0238CB8C - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov27_0238C900 ldr r0, _0238B920 ; =0x0238CE84 mov r3, #0xd @@ -964,7 +964,7 @@ _0238AE5C: b _0238BA74 _0238AEAC: ldr r0, _0238B974 ; =0x0238CBA4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B920 ; =0x0238CE84 mov r3, #0xe ldr r1, [r0] @@ -984,7 +984,7 @@ _0238AEAC: b _0238BA74 _0238AEF8: ldr r0, _0238B978 ; =0x0238CBBC - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B920 ; =0x0238CE84 ldr r0, [r0] ldrsb r0, [r0, #0x8d] @@ -1005,7 +1005,7 @@ _0238AEF8: b _0238BA74 _0238AF48: ldr r0, _0238B97C ; =0x0238CBD4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B920 ; =0x0238CE84 ldr r0, [r0] ldrsb r0, [r0, #0x8d] @@ -1025,7 +1025,7 @@ _0238AF48: b _0238BA74 _0238AF94: ldr r0, _0238B980 ; =0x0238CBF0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B920 ; =0x0238CE84 ldr r1, [r0] add r0, r1, #0x88 @@ -1058,7 +1058,7 @@ _0238AF94: b _0238BA74 _0238B014: ldr r0, _0238B98C ; =0x0238CC0C - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B990 ; =0x0238C94C mov r4, #3 str r0, [sp, #0x19c] @@ -1074,13 +1074,13 @@ _0238B014: b _0238BA74 _0238B050: ldr r0, _0238B994 ; =0x0238CC28 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r1, _0238B920 ; =0x0238CE84 ldr r0, _0238B998 ; =0x0238CC40 ldr r2, [r1] ldrsh r1, [r2, #0x14] ldrh r2, [r2, #0x12] - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B920 ; =0x0238CE84 mov lr, #0 ldr ip, [r0] @@ -1132,7 +1132,7 @@ _0238B050: b _0238BA74 _0238B134: ldr r0, _0238B9B0 ; =0x0238CC5C - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B920 ; =0x0238CE84 mov r3, #0 ldr r1, [r0] @@ -1164,7 +1164,7 @@ _0238B134: b _0238BA74 _0238B1B0: ldr r0, _0238B9B8 ; =0x0238CC78 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B920 ; =0x0238CE84 mov r3, #0 ldr r1, [r0] @@ -1196,7 +1196,7 @@ _0238B1B0: b _0238BA74 _0238B22C: ldr r0, _0238B9BC ; =0x0238CC94 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov ip, #2 ldr r0, _0238B9C0 ; =0x0238CA5C ldr r1, _0238B9C4 ; =0x00300013 @@ -1210,7 +1210,7 @@ _0238B22C: b _0238BA74 _0238B260: ldr r0, _0238B9CC ; =0x0238CCAC - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov ip, #2 ldr r0, _0238B9C0 ; =0x0238CA5C ldr r1, _0238B9C4 ; =0x00300013 @@ -1224,7 +1224,7 @@ _0238B260: b _0238BA74 _0238B294: ldr r0, _0238B9D0 ; =0x0238CCC0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov11_022DC504 bl GetNbItemsInBag cmp r0, #0 @@ -1272,7 +1272,7 @@ _0238B2E8: b _0238BA74 _0238B34C: ldr r0, _0238B9D4 ; =0x0238CCDC - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov11_022DC504 bl GetNbItemsInBag cmp r0, #0 @@ -1304,7 +1304,7 @@ _0238B37C: b _0238BA74 _0238B3C4: ldr r0, _0238B9D8 ; =0x0238CCF8 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl sub_02043218 bl ov27_0238C900 ldr r0, _0238B920 ; =0x0238CE84 @@ -1326,7 +1326,7 @@ _0238B3C4: b _0238BA74 _0238B418: ldr r0, _0238B9E0 ; =0x0238CD10 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov27_0238C900 ldr r0, _0238B920 ; =0x0238CE84 mov ip, #0x18 @@ -1347,7 +1347,7 @@ _0238B418: b _0238BA74 _0238B468: ldr r0, _0238B9E8 ; =0x0238CD28 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B920 ; =0x0238CE84 mov r2, #0x2d ldr r1, [r0] @@ -1371,7 +1371,7 @@ _0238B4A0: b _0238BA74 _0238B4C0: ldr r0, _0238B9EC ; =0x0238CD40 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B920 ; =0x0238CE84 ldr r0, [r0] ldrsb r0, [r0, #0x8d] @@ -1390,7 +1390,7 @@ _0238B4C0: b _0238BA74 _0238B508: ldr r0, _0238B9F0 ; =0x0238CD5C - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov ip, #3 ldr r0, _0238B988 ; =0x0238CA4C ldr r3, _0238B9F4 ; =0x0238C974 @@ -1404,7 +1404,7 @@ _0238B508: b _0238BA74 _0238B53C: ldr r0, _0238B9F0 ; =0x0238CD5C - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B9F8 ; =0x0238C948 mov ip, #3 str r0, [sp, #0x284] @@ -1420,7 +1420,7 @@ _0238B53C: b _0238BA74 _0238B578: ldr r0, _0238B9FC ; =0x0238CD78 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B920 ; =0x0238CE84 ldr r2, _0238B99C ; =0x0238CC50 ldr lr, [r0] @@ -1465,7 +1465,7 @@ _0238B578: b _0238BA74 _0238B628: ldr r0, _0238BA00 ; =0x0238CD90 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B920 ; =0x0238CE84 mov r3, #0 ldr r1, [r0] @@ -1498,7 +1498,7 @@ _0238B628: b _0238BA74 _0238B6A8: ldr r0, _0238BA04 ; =0x0238CDAC - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov ip, #2 ldr r0, _0238B9C0 ; =0x0238CA5C ldr r1, _0238B9C4 ; =0x00300013 @@ -1512,7 +1512,7 @@ _0238B6A8: b _0238BA74 _0238B6DC: ldr r0, _0238BA08 ; =0x0238CDC4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B920 ; =0x0238CE84 mov r3, #0 ldr r1, [r0] @@ -1544,7 +1544,7 @@ _0238B6DC: b _0238BA74 _0238B758: ldr r0, _0238BA10 ; =0x0238CDE0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov ip, #2 ldr r0, _0238B9C0 ; =0x0238CA5C ldr r1, _0238B9C4 ; =0x00300013 @@ -1558,7 +1558,7 @@ _0238B758: b _0238BA74 _0238B78C: ldr r0, _0238BA14 ; =0x0238CDF4 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov11_022DC504 mov r0, #1 bl sub_02043320 @@ -1596,7 +1596,7 @@ _0238B78C: b _0238BA74 _0238B820: ldr r0, _0238BA18 ; =0x0238CE10 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl ov11_022DC504 mov r0, #1 bl sub_02043320 @@ -1625,7 +1625,7 @@ _0238B820: b _0238BA74 _0238B890: ldr r0, _0238BA1C ; =0x0238CE2C - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B920 ; =0x0238CE84 mov r2, #0 ldr r1, [r0] @@ -1649,7 +1649,7 @@ _0238B890: b _0238BA74 _0238B8EC: ldr r0, _0238BA24 ; =0x0238CE44 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov ip, #2 ldr r0, _0238B9C0 ; =0x0238CA5C ldr r1, _0238B9C4 ; =0x00300013 @@ -1731,7 +1731,7 @@ _0238BA24: .word 0x0238CE44 _0238BA28: .word 0x0238CE58 _0238BA2C: ldr r0, _0238BA28 ; =0x0238CE58 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _0238B920 ; =0x0238CE84 mov r3, #3 ldr r1, [r0] diff --git a/asm/overlay_29_022DC240.s b/asm/overlay_29_022DC240.s index 9b4ea218..d3395a19 100644 --- a/asm/overlay_29_022DC240.s +++ b/asm/overlay_29_022DC240.s @@ -74,7 +74,7 @@ ov29_022DC314: ; 0x022DC314 mov r5, r0 ldr r0, _022DC338 ; =0x0234FD14 mov r4, r1 - bl DebugPrint0__0200C1FC + bl DebugPrint0 mov r0, r5 mov r1, r4 bl sub_02008BF4 @@ -3437,7 +3437,7 @@ _022DEF94: bl ov29_022DDE00 ldr r0, _022DFF3C ; =0x023510C8 mov r1, #0x3e0 - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r0, _022DFF40 ; =0x02353538 cmp r5, #0 str sb, [r0] diff --git a/asm/overlay_29_02308FE0.s b/asm/overlay_29_02308FE0.s index 49b2340d..6f6eaf93 100644 --- a/asm/overlay_29_02308FE0.s +++ b/asm/overlay_29_02308FE0.s @@ -4038,17 +4038,17 @@ _0230C940: bl FixedPoint64ToInt mov r1, r0 ldr r0, _0230C4A4 ; =0x02352984 - bl DebugPrint0__0200C1FC + bl DebugPrint0 add r0, sp, #0xa0 bl FixedPoint64ToInt mov r1, r0 ldr r0, _0230C4A8 ; =0x02352990 - bl DebugPrint0__0200C1FC + bl DebugPrint0 add r0, sp, #0x98 bl FixedPoint64ToInt mov r1, r0 ldr r0, _0230C4AC ; =0x0235299C - bl DebugPrint0__0200C1FC + bl DebugPrint0 ldr r1, _0230C4B0 ; =0x020A18F4 add r0, sp, #0x70 ldr r1, [r1] diff --git a/asm/overlay_29_023350FC.s b/asm/overlay_29_023350FC.s index e935e2b4..cd18643a 100644 --- a/asm/overlay_29_023350FC.s +++ b/asm/overlay_29_023350FC.s @@ -2096,7 +2096,7 @@ ov29_02336DB0: ; 0x02336DB0 tst r0, #0x200 beq _02336DE0 ldr r0, _02336F48 ; =0x02352F14 - bl DebugPrint0__0200C1FC + bl DebugPrint0 _02336DE0: ldrh r1, [r4] tst r1, #0x1000 diff --git a/asm/overlay_29_023498A0.s b/asm/overlay_29_023498A0.s index 765408dc..3ea46eb9 100644 --- a/asm/overlay_29_023498A0.s +++ b/asm/overlay_29_023498A0.s @@ -4507,14 +4507,14 @@ _0234D38C: sub r1, r1, #0xb orr r1, r1, #0x90000 str r1, [sp, #8] - bl DebugPrint0__0200C1FC + bl DebugPrint0 b _0234D3D0 _0234D3BC: bl ov29_02337EE8 mov r1, r0 ldr r0, _0234D45C ; =0x02353380 str r1, [sp, #8] - bl DebugPrint0__0200C1FC + bl DebugPrint0 _0234D3D0: ldrsh r0, [r4, #4] str r0, [sp, #0xc] diff --git a/asm/overlay_31.s b/asm/overlay_31.s index 568364b2..2ee2811d 100644 --- a/asm/overlay_31.s +++ b/asm/overlay_31.s @@ -1361,7 +1361,7 @@ _02383A1C: bl Arm9LoadUnkFieldNa0x2029EC8 mov r1, r0 ldr r0, _0238489C ; =0x02389F64 - bl DebugPrint0__0200C1FC + bl DebugPrint0 bl GetNbItemsInBag ldr r2, _02384898 ; =0x0238A26C cmp r6, #0 diff --git a/include/ansi_params.h b/include/ansi_params.h new file mode 100644 index 00000000..5eb1af87 --- /dev/null +++ b/include/ansi_params.h @@ -0,0 +1,18 @@ +#ifndef _MSL_MSLEXTERN_H +#define _MSL_MSLEXTERN_H + +// from the heartgold decomp + +#ifdef __cplusplus +#define _MSL_BEGIN_NAMESPACE_STD namespace std { +#define _MSL_BEGIN_EXTERN_C extern "C" { +#define _MSL_END_EXTERN_C } +#define _MSL_END_NAMESPACE_STD } +#else +#define _MSL_BEGIN_NAMESPACE_STD +#define _MSL_BEGIN_EXTERN_C +#define _MSL_END_EXTERN_C +#define _MSL_END_NAMESPACE_STD +#endif //__cplusplus + +#endif //_MSL_MSLEXTERN_H diff --git a/include/main_debug.h b/include/main_debug.h new file mode 100644 index 00000000..c5edd0e9 --- /dev/null +++ b/include/main_debug.h @@ -0,0 +1,16 @@ +#ifndef PMDSKY_MAIN_DEBUG_H +#define PMDSKY_MAIN_DEBUG_H + +#include + +// Program position info (basically stack trace info) for debug logging. +struct prog_pos_info { + char* file; // file name + int line; // line number +}; + +// Display some debug messages, then hangs the process. +// This function is called in lots of places to bail on a fatal error. Looking at the static data callers use to fill in the program position info is informative, as it tells you the original file name (probably from the standard __FILE__ macro) and line number (probably from the standard __LINE__ macro) in the source code. +void FatalError(struct prog_pos_info *prog_pos, const char* fmt, ...); + +#endif //PMDSKY_MAIN_DEBUG_H \ No newline at end of file diff --git a/include/stdarg.h b/include/stdarg.h new file mode 100644 index 00000000..ea18665e --- /dev/null +++ b/include/stdarg.h @@ -0,0 +1,25 @@ +#ifndef MSL_STDARG_H +#define MSL_STDARG_H + +// from the heartgold decomp + +#include + +_MSL_BEGIN_NAMESPACE_STD +_MSL_BEGIN_EXTERN_C + +#ifndef _MSL_VA_LIST_TYPE +#define _MSL_VA_LIST_TYPE char* +#endif //_MSL_VA_LIST_TYPE +#ifndef _MSL_VA_LIST_DEFINED +typedef _MSL_VA_LIST_TYPE va_list; +#define _MSL_VA_LIST_DEFINED +#endif + +#define va_start(list, arg) ({ list = (va_list)(((u32)&(arg) & ~3) + 4); }) +#define va_end(list) ((void)0) + +_MSL_END_EXTERN_C +_MSL_END_NAMESPACE_STD + +#endif //MSL_STDARG_H diff --git a/main.lsf b/main.lsf index 0f91bac4..d0591e85 100644 --- a/main.lsf +++ b/main.lsf @@ -10,6 +10,7 @@ Static main Address 0x02000000 StackSize 0 2048 Object asm/main_02000C6C.o + Object src/main_debug.o Object src/main_pack.o Object asm/main_0200C4CC.o } diff --git a/src/main_debug.c b/src/main_debug.c new file mode 100644 index 00000000..85e21b90 --- /dev/null +++ b/src/main_debug.c @@ -0,0 +1,31 @@ +#include "main_debug.h" + +extern void DebugPrintTrace(const char* msg, struct prog_pos_info* prog_pos); +extern int vsprintf(char* str, const char* format, va_list ap); +extern char* strcpy(char* dest, const char* src); +extern char* strcat(char* dest, const char* src); +extern void DebugDisplay(const char* fmt, ...); +extern void WaitForever(void); + +extern char STRING_DEBUG_FATAL; +extern char STRING_DEBUG_NEWLINE; +extern char STRING_DEBUG_LOG_NULL; +extern char STRING_DEBUG_STRING_NEWLINE; + +#define va_start(list, arg) ({ list = (va_list)(((u32)&(arg) & ~3) + 4); }) +#define va_end(list) ((void)0) + +void FatalError(struct prog_pos_info *prog_pos, const char* fmt, ...) { + va_list args; + char message_buffer[256]; + DebugPrintTrace(&STRING_DEBUG_FATAL, prog_pos); + if (fmt != NULL) { + va_start(args, fmt); + vsprintf(message_buffer, fmt, args); + strcat(message_buffer, &STRING_DEBUG_NEWLINE); + } else { + strcpy(message_buffer, &STRING_DEBUG_LOG_NULL); + } + DebugDisplay(&STRING_DEBUG_STRING_NEWLINE, message_buffer); + WaitForever(); +} \ No newline at end of file diff --git a/src/main_pack.c b/src/main_pack.c index 60ad6eee..ff637bd2 100644 --- a/src/main_pack.c +++ b/src/main_pack.c @@ -6,7 +6,7 @@ extern void FileSeek(struct file_stream* file, int offset, int whence); extern u32 FileRead(struct file_stream* file, void* buf, u32 size); extern void FileInitVeneer(struct file_stream* file); extern char STRING_FILE_DIRECTORY_INIT; -extern void DebugPrint0__0200C1FC(const char* fmt, ...); +extern void DebugPrint0(const char* fmt, ...); extern void FileOpen(struct file_stream* file, const char* filepath); extern void* MemAlloc(u32 len, u32 flags); extern void MemZero(void* ptr, u32 len); @@ -51,7 +51,7 @@ void OpenPackFile(struct pack_file_opened *pack_file, char *file_path) { struct pack_file_table_of_content *toc_alloc = (struct pack_file_table_of_content *) MemAlloc(toc_total_size, 0); pack_file->table_of_content = toc_alloc; FileRead(&pack_file->opened_file,pack_file->table_of_content,toc_total_size); - DebugPrint0__0200C1FC(&STRING_FILE_DIRECTORY_INIT,pack_file->zero, + DebugPrint0(&STRING_FILE_DIRECTORY_INIT,pack_file->zero, pack_file->nb_entry_table_of_content,toc_total_size,file_path); DataTransferStop(); return;