diff options
Diffstat (limited to 'arm9/asm')
112 files changed, 996 insertions, 1406 deletions
diff --git a/arm9/asm/gf_rtc.s b/arm9/asm/gf_rtc.s deleted file mode 100644 index a73a4801..00000000 --- a/arm9/asm/gf_rtc.s +++ /dev/null @@ -1,410 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .rodata - - .global sMaxTime -sMaxTime: ; 0x020ED498 - ; 23:59:59 - .word 23, 59, 59 - - .global sMaxDate -sMaxDate: ; 0x020ED4A4 - ; 31 December, 2099 - .word 99, 12, 31, 0 - - .global sGF_DaysPerMonth -sGF_DaysPerMonth: ; 0x020ED4B2 - .short 0 - .short 31 - .short 59 - .short 90 - .short 120 - .short 151 - .short 181 - .short 212 - .short 243 - .short 273 - .short 304 - .short 334 - - .global sTimeOfDayByHour -sTimeOfDayByHour: ; 0x020ED4CC - ; 00:00 - 03:59 - .byte 0x04, 0x04, 0x04, 0x04 - ; 04:00 - 09:59 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - ; 10:00 - 16:59 - .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 - ; 17:00 - 19:59 - .byte 0x02, 0x02, 0x02 - ; 20:00 - 23:59 - .byte 0x03, 0x03, 0x03, 0x03 - - .section .bss - - .global sGFRTCWork -sGFRTCWork: ; 0x021C4808 - .space 0x48 - - .text - - thumb_func_start GF_InitRTCWork -GF_InitRTCWork: ; 0x0201259C - push {r3, lr} - bl RTC_Init - ldr r3, _020125CC ; =sGFRTCWork - mov r0, #0x0 - add r2, r3, #0x0 - add r1, r0, #0x0 - stmia r2!, {r0-r1} - stmia r2!, {r0-r1} - stmia r2!, {r0-r1} - stmia r2!, {r0-r1} - stmia r2!, {r0-r1} - stmia r2!, {r0-r1} - stmia r2!, {r0-r1} - stmia r2!, {r0-r1} - stmia r2!, {r0-r1} - ldr r1, _020125D0 ; =sGFRTCWork - str r0, [r1, #0x0] - str r0, [r1, #0x4] - str r0, [r1, #0x8] - add r0, r3, #0x0 - bl GF_RTC_GetDateTime - pop {r3, pc} - .balign 4 -_020125CC: .word sGFRTCWork -_020125D0: .word sGFRTCWork - - thumb_func_start GF_RTC_UpdateOnFrame -GF_RTC_UpdateOnFrame: ; 0x020125D4 - push {r3, lr} - ldr r0, _020125F4 ; =sGFRTCWork - ldr r1, [r0, #0x4] - cmp r1, #0x0 - bne _020125F2 - ldr r1, [r0, #0x8] - add r1, r1, #0x1 - str r1, [r0, #0x8] - cmp r1, #0xa - ble _020125F2 - mov r1, #0x0 - str r1, [r0, #0x8] - ldr r0, _020125F8 ; =sGFRTCWork - bl GF_RTC_GetDateTime -_020125F2: - pop {r3, pc} - .balign 4 -_020125F4: .word sGFRTCWork -_020125F8: .word sGFRTCWork - - thumb_func_start GF_RTC_GetDateTime_Callback -GF_RTC_GetDateTime_Callback: ; 0x020125FC - push {r4, lr} - add r4, r1, #0x0 - str r0, [r4, #0xc] - cmp r0, #0x0 - beq _0201260A - bl ErrorHandling -_0201260A: - add r3, r4, #0x0 - mov r0, #0x1 - add r2, r4, #0x0 - add r3, #0x2c - str r0, [r4, #0x0] - ldmia r3!, {r0-r1} - add r2, #0x10 - stmia r2!, {r0-r1} - ldmia r3!, {r0-r1} - stmia r2!, {r0-r1} - add r3, r4, #0x0 - add r3, #0x3c - add r2, r4, #0x0 - ldmia r3!, {r0-r1} - add r2, #0x20 - stmia r2!, {r0-r1} - ldr r0, [r3, #0x0] - str r0, [r2, #0x0] - mov r0, #0x0 - str r0, [r4, #0x4] - pop {r4, pc} - - thumb_func_start GF_RTC_GetDateTime -GF_RTC_GetDateTime: ; 0x02012634 - push {r4, lr} - add r4, r0, #0x0 - mov r0, #0x1 - str r0, [r4, #0x4] - add r0, r4, #0x0 - add r1, r4, #0x0 - ldr r2, _02012658 ; =GF_RTC_GetDateTime_Callback - add r0, #0x2c - add r1, #0x3c - add r3, r4, #0x0 - bl RTC_GetDateTimeAsync - str r0, [r4, #0xc] - cmp r0, #0x0 - beq _02012656 - bl ErrorHandling -_02012656: - pop {r4, pc} - .balign 4 -_02012658: .word GF_RTC_GetDateTime_Callback - - thumb_func_start GF_RTC_CopyDateTime -GF_RTC_CopyDateTime: ; 0x0201265C - push {r3-r5, lr} - add r5, r0, #0x0 - ldr r0, _02012684 ; =sGFRTCWork - add r4, r1, #0x0 - ldr r0, [r0, #0x0] - cmp r0, #0x1 - beq _0201266E - bl ErrorHandling -_0201266E: - ldr r2, _02012688 ; =sGFRTCWork + 16 - ldmia r2!, {r0-r1} - stmia r5!, {r0-r1} - ldmia r2!, {r0-r1} - ldr r2, _0201268C ; =sGFRTCWork + 32 - stmia r5!, {r0-r1} - ldmia r2!, {r0-r1} - stmia r4!, {r0-r1} - ldr r0, [r2, #0x0] - str r0, [r4, #0x0] - pop {r3-r5, pc} - .balign 4 -_02012684: .word sGFRTCWork -_02012688: .word sGFRTCWork + 16 -_0201268C: .word sGFRTCWork + 32 - - thumb_func_start GF_RTC_CopyTime -GF_RTC_CopyTime: ; 0x02012690 - push {r4, lr} - add r4, r0, #0x0 - ldr r0, _020126AC ; =sGFRTCWork - ldr r0, [r0, #0x0] - cmp r0, #0x1 - beq _020126A0 - bl ErrorHandling -_020126A0: - ldr r2, _020126B0 ; =sGFRTCWork + 32 - ldmia r2!, {r0-r1} - stmia r4!, {r0-r1} - ldr r0, [r2, #0x0] - str r0, [r4, #0x0] - pop {r4, pc} - .balign 4 -_020126AC: .word sGFRTCWork -_020126B0: .word sGFRTCWork + 32 - - thumb_func_start GF_RTC_CopyDate -GF_RTC_CopyDate: ; 0x020126B4 - push {r4, lr} - add r4, r0, #0x0 - ldr r0, _020126D0 ; =sGFRTCWork - ldr r0, [r0, #0x0] - cmp r0, #0x1 - beq _020126C4 - bl ErrorHandling -_020126C4: - ldr r2, _020126D4 ; =sGFRTCWork + 16 - ldmia r2!, {r0-r1} - stmia r4!, {r0-r1} - ldmia r2!, {r0-r1} - stmia r4!, {r0-r1} - pop {r4, pc} - .balign 4 -_020126D0: .word sGFRTCWork -_020126D4: .word sGFRTCWork + 16 - - thumb_func_start GF_RTC_TimeToSec -GF_RTC_TimeToSec: ; 0x020126D8 - push {r3-r4} - ldr r4, _020126F8 ; =sGFRTCWork + 32 - mov r0, #0x3c - ldr r1, [r4, #0x4] - ldr r3, [r4, #0x8] - add r2, r1, #0x0 - mul r2, r0 - mov r0, #0xe1 - ldr r1, [r4, #0x0] - lsl r0, r0, #0x4 - mul r0, r1 - add r0, r2, r0 - add r0, r3, r0 - pop {r3-r4} - bx lr - nop -_020126F8: .word sGFRTCWork + 32 - - thumb_func_start GF_RTC_DateTimeToSec -GF_RTC_DateTimeToSec: ; 0x020126FC - ldr r3, _02012704 ; =RTC_ConvertDateTimeToSecond - ldr r0, _02012708 ; =sGFRTCWork + 16 - ldr r1, _0201270C ; =sGFRTCWork + 32 - bx r3 - .balign 4 -_02012704: .word RTC_ConvertDateTimeToSecond -_02012708: .word sGFRTCWork + 16 -_0201270C: .word sGFRTCWork + 32 - - thumb_func_start FUN_02012710 -FUN_02012710: ; 0x02012710 - push {r4-r6, lr} - sub sp, #0x10 - add r5, r0, #0x0 - ldr r2, [r5, #0x4] - ldr r0, _02012778 ; =sGF_DaysPerMonth - 2 - lsl r1, r2, #0x1 - ldrh r0, [r0, r1] - ldr r3, [r5, #0x8] - add r4, r3, r0 - cmp r2, #0x3 - blo _02012752 - ldr r6, [r5, #0x0] - mov r0, #0x1e - lsr r2, r6, #0x1f - lsl r1, r6, #0x1e - sub r1, r1, r2 - ror r1, r0 - add r0, r2, r1 - bne _02012742 - add r0, r6, #0x0 - mov r1, #0x64 - bl _s32_div_f - cmp r1, #0x0 - bne _02012750 -_02012742: - mov r1, #0x19 - add r0, r6, #0x0 - lsl r1, r1, #0x4 - bl _s32_div_f - cmp r1, #0x0 - bne _02012752 -_02012750: - add r4, r4, #0x1 -_02012752: - add r6, r5, #0x0 - add r3, sp, #0x0 - add r2, r3, #0x0 - ldmia r6!, {r0-r1} - stmia r3!, {r0-r1} - ldmia r6!, {r0-r1} - stmia r3!, {r0-r1} - mov r0, #0x1 - str r0, [sp, #0x4] - str r0, [sp, #0x8] - add r0, r2, #0x0 - bl RTC_ConvertDateToDay - add r0, r5, #0x0 - bl RTC_ConvertDateToDay - add r0, r4, #0x0 - add sp, #0x10 - pop {r4-r6, pc} - .balign 4 -_02012778: .word sGF_DaysPerMonth - 2 - - thumb_func_start IsNighttime -IsNighttime: ; 0x0201277C - push {r3, lr} - bl GF_RTC_GetTimeOfDay - cmp r0, #0x3 - beq _0201278A - cmp r0, #0x4 - bne _0201278E -_0201278A: - mov r0, #0x1 - pop {r3, pc} -_0201278E: - mov r0, #0x0 - pop {r3, pc} - .balign 4 - - thumb_func_start GF_RTC_GetTimeOfDay -GF_RTC_GetTimeOfDay: ; 0x02012794 - push {lr} - sub sp, #0xc - add r0, sp, #0x0 - bl GF_RTC_CopyTime - ldr r0, [sp, #0x0] - bl GF_RTC_GetTimeOfDayByHour - add sp, #0xc - pop {pc} - - thumb_func_start GF_RTC_GetTimeOfDayByHour -GF_RTC_GetTimeOfDayByHour: ; 0x020127A8 - push {r4, lr} - add r4, r0, #0x0 - bmi _020127B2 - cmp r4, #0x18 - blt _020127B6 -_020127B2: - bl ErrorHandling -_020127B6: - ldr r0, _020127BC ; =sTimeOfDayByHour - ldrb r0, [r0, r4] - pop {r4, pc} - .balign 4 -_020127BC: .word sTimeOfDayByHour - - thumb_func_start FUN_020127C0 -FUN_020127C0: ; 0x020127C0 - push {r4-r7, lr} - sub sp, #0x24 - add r6, r3, #0x0 - ldr r3, _0201282C ; =sMaxDate - add r4, r0, #0x0 - add r7, r1, #0x0 - add r5, r2, #0x0 - add r2, sp, #0x14 - ldmia r3!, {r0-r1} - str r2, [sp, #0x0] - stmia r2!, {r0-r1} - ldmia r3!, {r0-r1} - stmia r2!, {r0-r1} - ldr r3, _02012830 ; =sMaxTime - add r2, sp, #0x8 - ldmia r3!, {r0-r1} - str r2, [sp, #0x4] - stmia r2!, {r0-r1} - ldr r0, [r3, #0x0] - ldr r1, [sp, #0x4] - str r0, [r2, #0x0] - ldr r0, [sp, #0x0] - bl RTC_ConvertDateTimeToSecond - add r2, r1, #0x0 - add r3, r0, #0x0 - mov r1, #0x0 - ldr r0, _02012834 ; =0xBC19137F - eor r1, r2 - eor r0, r3 - orr r0, r1 - beq _02012804 - bl ErrorHandling -_02012804: - sub r0, r4, r5 - mov r12, r7 - mov r0, r12 - sbc r0, r6 - bge _02012818 - sub r0, r5, r4 - sbc r6, r7 - add sp, #0x24 - add r1, r6, #0x0 - pop {r4-r7, pc} -_02012818: - ldr r0, _02012834 ; =0xBC19137F - mov r1, #0x0 - sub r0, r0, r4 - sbc r1, r7 - add r0, r5, r0 - adc r6, r1 - add r1, r6, #0x0 - add sp, #0x24 - pop {r4-r7, pc} - nop -_0201282C: .word sMaxDate -_02012830: .word sMaxTime -_02012834: .word 0xBC19137F diff --git a/arm9/asm/scrcmd_asm.s b/arm9/asm/scrcmd_asm.s index 71187dd6..d648ac52 100644 --- a/arm9/asm/scrcmd_asm.s +++ b/arm9/asm/scrcmd_asm.s @@ -50,7 +50,7 @@ FUN_0203B024: ; 0x0203B024 str r0, [sp, #0x4] cmp r0, #0x0 bne _0203B07A - bl ErrorHandling + bl GF_AssertFail _0203B07A: mov r0, #0x4 add r1, r0, #0x0 @@ -194,7 +194,7 @@ FUN_0203B174: ; 0x0203B174 bl AllocFromHeap add r4, r0, #0x0 bne _0203B18E - bl ErrorHandling + bl GF_AssertFail pop {r3-r7, pc} _0203B18E: str r5, [r4, #0xc] @@ -235,7 +235,7 @@ _0203B1D6: ldrb r0, [r4, #0x0] cmp r0, #0x0 bne _0203B1E8 - bl ErrorHandling + bl GF_AssertFail pop {r3-r5, pc} _0203B1E8: sub r0, r0, #0x1 @@ -521,7 +521,7 @@ FUN_0203B3F8: ; 0x0203B3F8 bl FUN_020575D4 cmp r0, #0x0 bne _0203B43A - bl ErrorHandling + bl GF_AssertFail _0203B43A: mov r0, #0x0 add sp, #0x4 @@ -1153,7 +1153,7 @@ FUN_0203B968: ; 0x0203B968 ldr r0, [r4, #0x0] cmp r0, #0x0 bne _0203B994 - bl ErrorHandling + bl GF_AssertFail _0203B994: ldr r0, [r4, #0x0] bl FUN_02037A40 @@ -1258,7 +1258,7 @@ FUN_0203BA3C: ; 0x0203BA3C ldr r0, [r4, #0x0] cmp r0, #0x0 bne _0203BA7C - bl ErrorHandling + bl GF_AssertFail _0203BA7C: ldr r0, [r4, #0x0] bl FUN_02037A40 @@ -1337,7 +1337,7 @@ FUN_0203BAF4: ; 0x0203BAF4 ldr r0, [r4, #0x0] cmp r0, #0x0 bne _0203BB20 - bl ErrorHandling + bl GF_AssertFail _0203BB20: ldr r0, [r4, #0x0] bl FUN_02037A78 @@ -2548,7 +2548,7 @@ _0203C476: ldr r0, [r6, #0x0] cmp r0, #0x0 beq _0203C492 - bl ErrorHandling + bl GF_AssertFail _0203C492: add r0, r5, #0x0 add r0, #0x80 @@ -2583,7 +2583,7 @@ FUN_0203C4B0: ; 0x0203C4B0 ldr r0, [r4, #0x0] cmp r0, #0x0 bne _0203C4DC - bl ErrorHandling + bl GF_AssertFail _0203C4DC: ldr r0, [r4, #0x0] bl FUN_020378FC @@ -5396,7 +5396,7 @@ FUN_0203DB88: ; 0x0203DB88 bl FUN_02058060 add r5, r0, #0x0 bne _0203DBC6 - bl ErrorHandling + bl GF_AssertFail _0203DBC6: add r0, r5, #0x0 add r1, r4, #0x0 @@ -5819,7 +5819,7 @@ FUN_0203DEC4: ; 0x0203DEC4 bl FUN_02058060 add r4, r0, #0x0 bne _0203DEEC - bl ErrorHandling + bl GF_AssertFail _0203DEEC: add r0, r4, #0x0 mov r1, #0x0 @@ -5844,7 +5844,7 @@ FUN_0203DEF8: ; 0x0203DEF8 bl FUN_02058060 add r4, r0, #0x0 bne _0203DF20 - bl ErrorHandling + bl GF_AssertFail _0203DF20: add r0, r4, #0x0 mov r1, #0x1 @@ -7161,7 +7161,7 @@ _0203E9AE: strh r0, [r6, #0x0] b _0203E9C8 _0203E9C4: - bl ErrorHandling + bl GF_AssertFail _0203E9C8: mov r0, #0x0 pop {r4-r6, pc} @@ -8056,7 +8056,7 @@ FUN_0203F07C: ; 0x0203F07C bl FUN_02058060 add r7, r0, #0x0 bne _0203F0FA - bl ErrorHandling + bl GF_AssertFail _0203F0FA: str r6, [sp, #0x0] str r4, [sp, #0x4] @@ -8104,7 +8104,7 @@ FUN_0203F110: ; 0x0203F110 bl FUN_02058060 add r5, r0, #0x0 bne _0203F164 - bl ErrorHandling + bl GF_AssertFail _0203F164: ldr r0, [r4, #0x74] add r1, r5, #0x0 @@ -8200,7 +8200,7 @@ _0203F212: _0203F21A: cmp r4, #0x10 blt _0203F222 - bl ErrorHandling + bl GF_AssertFail _0203F222: ldr r0, [sp, #0x0] add r4, #0x22 @@ -8855,7 +8855,7 @@ FUN_0203F720: ; 0x0203F720 add r5, r0, #0x0 cmp r4, #0x3 bls _0203F752 - bl ErrorHandling + bl GF_AssertFail _0203F752: add r0, r5, #0x0 add r1, r4, #0x0 @@ -8974,7 +8974,7 @@ FUN_0203F80C: ; 0x0203F80C ldr r0, [r4, #0x0] cmp r0, #0x0 bne _0203F84C - bl ErrorHandling + bl GF_AssertFail _0203F84C: ldr r0, [r4, #0x0] bl FUN_02037A40 @@ -9081,7 +9081,7 @@ _0203F910: bl MOD06_0224F12C b _0203F91E _0203F91A: - bl ErrorHandling + bl GF_AssertFail _0203F91E: mov r0, #0x1 pop {r3-r5, pc} @@ -9468,7 +9468,7 @@ FUN_0203FC1C: ; 0x0203FC1C bl FUN_02058060 add r5, r0, #0x0 bne _0203FC4C - bl ErrorHandling + bl GF_AssertFail _0203FC4C: add r0, r5, #0x0 add r1, r4, #0x0 diff --git a/arm9/asm/unk_020023C0.s b/arm9/asm/unk_020023C0.s index a4223e53..dc304639 100644 --- a/arm9/asm/unk_020023C0.s +++ b/arm9/asm/unk_020023C0.s @@ -147,7 +147,7 @@ _0200248C: lsl r0, r0, #0x8 cmp r5, r0 bne _020024B0 - bl ErrorHandling + bl GF_AssertFail _020024B0: ldr r0, _02002664 ; =0x0000F0FD cmp r5, r0 diff --git a/arm9/asm/unk_02002C14.s b/arm9/asm/unk_02002C14.s index 740dca10..3f62a449 100644 --- a/arm9/asm/unk_02002C14.s +++ b/arm9/asm/unk_02002C14.s @@ -92,7 +92,7 @@ FUN_02002C84: ; 0x02002C84 add r5, r1, #0x0 cmp r4, #0x4 blt _02002C92 - bl ErrorHandling + bl GF_AssertFail _02002C92: ldr r0, _02002CBC ; =UNK_02106FC8 lsl r4, r4, #0x2 @@ -102,7 +102,7 @@ _02002C92: ldr r0, [r0, #0x0] cmp r0, #0x0 bne _02002CA6 - bl ErrorHandling + bl GF_AssertFail _02002CA6: ldr r0, _02002CBC ; =UNK_02106FC8 mov r1, #0x0 @@ -122,7 +122,7 @@ FUN_02002CC0: ; 0x02002CC0 add r4, r0, #0x0 cmp r4, #0x4 blt _02002CCC - bl ErrorHandling + bl GF_AssertFail _02002CCC: ldr r0, _02002CF4 ; =UNK_02106FC8 lsl r4, r4, #0x2 @@ -132,7 +132,7 @@ _02002CCC: ldr r0, [r0, #0x0] cmp r0, #0x0 bne _02002CE0 - bl ErrorHandling + bl GF_AssertFail _02002CE0: ldr r0, _02002CF4 ; =UNK_02106FC8 mov r1, #0x1 @@ -152,7 +152,7 @@ FUN_02002CF8: ; 0x02002CF8 add r4, r0, #0x0 cmp r4, #0x4 blt _02002D04 - bl ErrorHandling + bl GF_AssertFail _02002D04: ldr r0, _02002D8C ; =UNK_02106FC8 lsl r6, r4, #0x2 @@ -284,7 +284,7 @@ FUN_02002DE0: ; 0x02002DE0 ldr r0, [r0, #0x0] cmp r0, #0x0 bne _02002DFA - bl ErrorHandling + bl GF_AssertFail _02002DFA: ldr r0, _02002E10 ; =UNK_02106FC8 add r1, r5, #0x0 @@ -311,7 +311,7 @@ FUN_02002E14: ; 0x02002E14 ldr r0, [r0, #0x0] cmp r0, #0x0 bne _02002E2E - bl ErrorHandling + bl GF_AssertFail _02002E2E: add r0, r5, #0x0 bl String_c_str diff --git a/arm9/asm/unk_02002F08.s b/arm9/asm/unk_02002F08.s index b844da17..c37869ed 100644 --- a/arm9/asm/unk_02002F08.s +++ b/arm9/asm/unk_02002F08.s @@ -18,7 +18,7 @@ FUN_02002F08: ; 0x02002F08 ldr r0, [r0, #0x0] cmp r0, #0x0 bne _02002F22 - bl ErrorHandling + bl GF_AssertFail _02002F22: add r0, r5, #0x0 bl String_c_str @@ -103,7 +103,7 @@ FUN_02002F9C: ; 0x02002F9C ldr r0, [r0, #0x0] cmp r0, #0x0 bne _02002FB4 - bl ErrorHandling + bl GF_AssertFail _02002FB4: add r0, r5, #0x0 bl String_c_str @@ -229,7 +229,7 @@ FUN_02003084: ; 0x02003084 bl FUN_02006C08 add r6, r0, #0x0 bne _0200309E - bl ErrorHandling + bl GF_AssertFail _0200309E: cmp r4, #0x0 bne _020030A6 @@ -247,7 +247,7 @@ _020030A6: add r0, r4, r0 cmp r0, r1 bls _020030C0 - bl ErrorHandling + bl GF_AssertFail _020030C0: lsl r0, r4, #0x10 lsr r0, r0, #0x10 diff --git a/arm9/asm/unk_020030E8.s b/arm9/asm/unk_020030E8.s index 8e1d3360..30d0ea43 100644 --- a/arm9/asm/unk_020030E8.s +++ b/arm9/asm/unk_020030E8.s @@ -18,7 +18,7 @@ FUN_02003108: ; 0x02003108 add r0, r7, r0 cmp r0, r1 bls _02003126 - bl ErrorHandling + bl GF_AssertFail _02003126: cmp r4, #0x3 bhi _0200315E @@ -50,7 +50,7 @@ _02003156: add r1, r0, #0x0 b _02003164 _0200315E: - bl ErrorHandling + bl GF_AssertFail pop {r3-r7, pc} _02003164: lsl r0, r7, #0x10 @@ -75,7 +75,7 @@ FUN_0200317C: ; 0x0200317C bl FUN_02006C08 add r4, r0, #0x0 bne _02003192 - bl ErrorHandling + bl GF_AssertFail _02003192: cmp r5, #0x0 bne _0200319A @@ -1089,7 +1089,7 @@ FUN_02003914: ; 0x02003914 ldr r0, [r0, #0x8] cmp r1, r0 bls _0200393A - bl ErrorHandling + bl GF_AssertFail _0200393A: sub r0, r7, #0x1 cmp r0, #0x1 @@ -1207,7 +1207,7 @@ FUN_020039E8: ; 0x020039E8 _02003A0A: cmp r0, #0x0 bne _02003A12 - bl ErrorHandling + bl GF_AssertFail _02003A12: add r3, sp, #0x10 ldrh r0, [r3, #0x14] @@ -1281,7 +1281,7 @@ FUN_02003A64: ; 0x02003A64 _02003A8E: cmp r0, #0x0 bne _02003A96 - bl ErrorHandling + bl GF_AssertFail _02003A96: cmp r5, #0x0 beq _02003AC0 @@ -1390,7 +1390,7 @@ FUN_02003B40: ; 0x02003B40 bl FUN_02006C08 add r4, r0, #0x0 bne _02003B58 - bl ErrorHandling + bl GF_AssertFail _02003B58: ldr r0, [sp, #0x1c] cmp r0, #0x0 diff --git a/arm9/asm/unk_020040F4.s b/arm9/asm/unk_020040F4.s index 86e069f9..cfd9551f 100644 --- a/arm9/asm/unk_020040F4.s +++ b/arm9/asm/unk_020040F4.s @@ -629,7 +629,7 @@ FUN_02004568: ; 0x02004568 add r0, r5, #0x0 mov r1, #0x4 bl GF_Snd_LoadSeqEx - bl ErrorHandling + bl GF_AssertFail b _0200459C _02004594: ldrh r0, [r4, #0x0] @@ -694,7 +694,7 @@ _020045E4: add r0, r7, #0x0 mov r1, #0x4 bl GF_Snd_LoadSeqEx - bl ErrorHandling + bl GF_AssertFail b _02004638 _02004630: ldrh r0, [r4, #0x0] @@ -831,7 +831,7 @@ FUN_02004748: ; 0x02004748 bl GetSoundDataPointer cmp r4, #0x7 blt _02004762 - bl ErrorHandling + bl GF_AssertFail mov r0, #0x1a bl FUN_02003D38 ldr r0, [r0, #0x0] @@ -1027,7 +1027,7 @@ FUN_020048BC: ; 0x020048BC push {r4, lr} add r4, r0, #0x0 bpl _020048C6 - bl ErrorHandling + bl GF_AssertFail _020048C6: add r0, r4, #0x0 bl NNS_SndPlayerCountPlayingSeqByPlayerNo @@ -1114,21 +1114,21 @@ FUN_02004930: ; 0x02004930 beq _02004954 cmp r5, #0xf beq _02004954 - bl ErrorHandling + bl GF_AssertFail _02004954: cmp r5, #0xe bne _02004962 ldrb r0, [r6, #0x0] cmp r0, #0x0 bne _02004962 - bl ErrorHandling + bl GF_AssertFail _02004962: cmp r5, #0xf bne _02004970 ldrb r0, [r4, #0x0] cmp r0, #0x0 bne _02004970 - bl ErrorHandling + bl GF_AssertFail _02004970: cmp r5, #0xe bne _0200497C @@ -1155,7 +1155,7 @@ FUN_02004984: ; 0x02004984 beq _020049A8 cmp r5, #0xf beq _020049A8 - bl ErrorHandling + bl GF_AssertFail _020049A8: cmp r5, #0xe bne _020049D6 @@ -1177,7 +1177,7 @@ _020049CA: strb r0, [r6, #0x0] b _020049FE _020049D0: - bl ErrorHandling + bl GF_AssertFail b _020049FE _020049D6: ldrb r0, [r4, #0x0] @@ -1198,7 +1198,7 @@ _020049F4: strb r0, [r4, #0x0] b _020049FE _020049FA: - bl ErrorHandling + bl GF_AssertFail _020049FE: mov r0, #0x1 pop {r4-r6, pc} @@ -1219,7 +1219,7 @@ FUN_02004A04: ; 0x02004A04 beq _02004A2A cmp r5, #0xf beq _02004A2A - bl ErrorHandling + bl GF_AssertFail pop {r4-r6, pc} _02004A2A: cmp r5, #0xe @@ -1235,7 +1235,7 @@ _02004A2A: strb r0, [r6, #0x0] pop {r4-r6, pc} _02004A46: - bl ErrorHandling + bl GF_AssertFail pop {r4-r6, pc} _02004A4C: ldrb r0, [r4, #0x0] @@ -1249,7 +1249,7 @@ _02004A4C: strb r0, [r4, #0x0] pop {r4-r6, pc} _02004A64: - bl ErrorHandling + bl GF_AssertFail pop {r4-r6, pc} .balign 4 @@ -1372,13 +1372,13 @@ FUN_02004B30: ; 0x02004B30 beq _02004B54 cmp r5, #0xf beq _02004B54 - bl ErrorHandling + bl GF_AssertFail _02004B54: add r0, r6, #0x0 bl NNS_SndArcGetWaveArcInfo add r7, r0, #0x0 bne _02004B68 - bl ErrorHandling + bl GF_AssertFail add sp, #0x30 mov r0, #0x0 pop {r3-r7, pc} @@ -1389,7 +1389,7 @@ _02004B68: bl NNS_SndArcGetFileSize add r6, r0, #0x0 bne _02004B80 - bl ErrorHandling + bl GF_AssertFail add sp, #0x30 mov r0, #0x0 pop {r3-r7, pc} @@ -1402,7 +1402,7 @@ _02004B80: str r0, [r4, #0x0] cmp r0, #0x0 bne _02004B9C - bl ErrorHandling + bl GF_AssertFail add sp, #0x30 mov r0, #0x0 pop {r3-r7, pc} @@ -1421,7 +1421,7 @@ _02004B9C: mvn r1, r1 cmp r0, r1 bne _02004BC6 - bl ErrorHandling + bl GF_AssertFail add sp, #0x30 mov r0, #0x0 pop {r3-r7, pc} @@ -1502,7 +1502,7 @@ FUN_02004C3C: ; 0x02004C3C beq _02004C60 cmp r5, #0xf beq _02004C60 - bl ErrorHandling + bl GF_AssertFail _02004C60: add r0, r5, #0x0 bl FUN_02004AAC @@ -1869,7 +1869,7 @@ _02004EF2: bl NNS_SndArcGetWaveArcInfo cmp r0, #0x0 bne _02004F02 - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3-r5, pc} _02004F02: @@ -1879,7 +1879,7 @@ _02004F02: bl NNS_SndArcGetFileAddress cmp r0, #0x0 bne _02004F18 - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3-r5, pc} _02004F18: diff --git a/arm9/asm/unk_020051F4.s b/arm9/asm/unk_020051F4.s index 843ae7b6..215e56c0 100644 --- a/arm9/asm/unk_020051F4.s +++ b/arm9/asm/unk_020051F4.s @@ -47,7 +47,7 @@ _0200523E: add r4, r0, #0x0 b _02005258 _02005250: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r4-r6, pc} _02005258: @@ -134,7 +134,7 @@ FUN_02005308: ; 0x02005308 add r5, r1, #0x0 cmp r0, #0x4 beq _02005318 - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3-r5, pc} _02005318: @@ -142,7 +142,7 @@ _02005318: bl FUN_020048D0 cmp r0, #0x7 beq _0200532A - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3-r5, pc} _0200532A: @@ -1072,7 +1072,7 @@ FUN_02005AE0: ; 0x02005AE0 bl AllocFromHeap add r4, r0, #0x0 bne _02005B04 - bl ErrorHandling + bl GF_AssertFail pop {r4-r6, pc} _02005B04: mov r2, #0x0 diff --git a/arm9/asm/unk_02006D98.s b/arm9/asm/unk_02006D98.s index 4b0a737d..07650c04 100644 --- a/arm9/asm/unk_02006D98.s +++ b/arm9/asm/unk_02006D98.s @@ -873,7 +873,7 @@ _020073AE: _020073BE: cmp r4, #0x4 bne _020073C6 - bl ErrorHandling + bl GF_AssertFail _020073C6: ldr r0, [sp, #0x30] ldr r3, [sp, #0x14] @@ -908,7 +908,7 @@ FUN_020073E8: ; 0x020073E8 str r3, [sp, #0x4] lsr r0, r0, #0x1f beq _02007408 - bl ErrorHandling + bl GF_AssertFail _02007408: add r5, r4, r6 mov r0, #0x0 @@ -1747,7 +1747,7 @@ _020079CC: lsr r0, r0, #0x1e pop {r3, pc} _020079D6: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3, pc} .balign 4 @@ -2961,7 +2961,7 @@ FUN_02008268: ; 0x02008268 push {r4, lr} add r4, r0, #0x0 bne _02008272 - bl ErrorHandling + bl GF_AssertFail _02008272: ldr r0, [r4, #0x0] lsl r0, r0, #0x1f diff --git a/arm9/asm/unk_02008AA4.s b/arm9/asm/unk_02008AA4.s index 45b46079..e6b5abcc 100644 --- a/arm9/asm/unk_02008AA4.s +++ b/arm9/asm/unk_02008AA4.s @@ -18,33 +18,33 @@ FUN_02008AA4: ; 0x02008AA4 str r4, [sp, #0xc] cmp r0, #0x0 bne _02008AC2 - bl ErrorHandling + bl GF_AssertFail _02008AC2: ldr r0, [sp, #0x48] cmp r0, #0x0 bne _02008ACC - bl ErrorHandling + bl GF_AssertFail _02008ACC: ldr r0, [sp, #0x50] cmp r0, #0x0 bne _02008AD6 - bl ErrorHandling + bl GF_AssertFail _02008AD6: ldr r0, [sp, #0x4c] cmp r0, #0x0 bne _02008AE0 - bl ErrorHandling + bl GF_AssertFail _02008AE0: cmp r5, #0x0 bne _02008AE8 - bl ErrorHandling + bl GF_AssertFail _02008AE8: ldr r0, [sp, #0x44] add r1, r6, #0x0 bl FUN_020094F0 add r7, r0, #0x0 bne _02008AF8 - bl ErrorHandling + bl GF_AssertFail _02008AF8: ldr r0, [sp, #0x48] ldr r1, [sp, #0x0] @@ -52,7 +52,7 @@ _02008AF8: str r0, [sp, #0x14] cmp r0, #0x0 bne _02008B0A - bl ErrorHandling + bl GF_AssertFail _02008B0A: ldr r0, [sp, #0x4c] ldr r1, [sp, #0x4] @@ -60,7 +60,7 @@ _02008B0A: str r0, [sp, #0x10] cmp r0, #0x0 bne _02008B1C - bl ErrorHandling + bl GF_AssertFail _02008B1C: ldr r0, [sp, #0x50] cmp r0, #0x0 @@ -74,7 +74,7 @@ _02008B1C: str r0, [sp, #0xc] cmp r0, #0x0 bne _02008B3A - bl ErrorHandling + bl GF_AssertFail _02008B3A: ldr r0, [sp, #0x54] cmp r0, #0x0 @@ -104,7 +104,7 @@ _02008B62: bl FUN_02009C80 add r6, r0, #0x0 bne _02008B78 - bl ErrorHandling + bl GF_AssertFail _02008B78: add r0, r7, #0x0 bl FUN_02009544 @@ -115,7 +115,7 @@ _02008B82: bl FUN_02009C5C add r6, r0, #0x0 bne _02008B90 - bl ErrorHandling + bl GF_AssertFail _02008B90: mov r0, #0x0 str r0, [r5, #0x4] @@ -247,7 +247,7 @@ FUN_02008C80: ; 0x02008C80 push {r4, lr} add r4, r0, #0x0 bne _02008C8A - bl ErrorHandling + bl GF_AssertFail _02008C8A: ldr r0, [r4, #0x0] cmp r0, #0x0 @@ -409,7 +409,7 @@ _02008DB6: bl FUN_0201D194 pop {r4, pc} _02008DC4: - bl ErrorHandling + bl GF_AssertFail pop {r4, pc} nop _02008DCC: .word 0x00100010 diff --git a/arm9/asm/unk_02008DEC.s b/arm9/asm/unk_02008DEC.s index b05df5ca..92341f16 100644 --- a/arm9/asm/unk_02008DEC.s +++ b/arm9/asm/unk_02008DEC.s @@ -39,17 +39,17 @@ FUN_02008E2C: ; 0x02008E2C push {r4, lr} add r4, r0, #0x0 bne _02008E36 - bl ErrorHandling + bl GF_AssertFail _02008E36: ldr r0, [r4, #0x0] cmp r0, #0x0 bne _02008E40 - bl ErrorHandling + bl GF_AssertFail _02008E40: ldr r0, [r4, #0x4] cmp r0, #0x0 bne _02008E4A - bl ErrorHandling + bl GF_AssertFail _02008E4A: add r0, r4, #0x0 bl FUN_020094C4 @@ -75,29 +75,29 @@ FUN_02008E6C: ; 0x02008E6C add r7, r3, #0x0 cmp r5, #0x0 bne _02008E80 - bl ErrorHandling + bl GF_AssertFail _02008E80: cmp r4, #0x0 bne _02008E88 - bl ErrorHandling + bl GF_AssertFail _02008E88: ldr r0, [r4, #0x4] cmp r0, r6 bgt _02008E92 - bl ErrorHandling + bl GF_AssertFail _02008E92: ldr r1, [r5, #0x10] ldr r0, [r4, #0x8] cmp r1, r0 beq _02008E9E - bl ErrorHandling + bl GF_AssertFail _02008E9E: add r0, r5, #0x0 bl FUN_020097D0 str r0, [sp, #0x1c] cmp r0, #0x0 bne _02008EAE - bl ErrorHandling + bl GF_AssertFail _02008EAE: ldrb r0, [r4, #0xc] cmp r0, #0x0 @@ -112,7 +112,7 @@ _02008EAE: bl FUN_0200945C cmp r0, #0x1 beq _02008ECE - bl ErrorHandling + bl GF_AssertFail _02008ECE: ldr r0, [r6, #0x44] ldr r1, [sp, #0x1c] @@ -137,7 +137,7 @@ _02008EEA: bl FUN_0200945C cmp r0, #0x1 beq _02008F02 - bl ErrorHandling + bl GF_AssertFail _02008F02: ldr r0, [r6, #0x8] ldr r1, [sp, #0x1c] @@ -175,18 +175,18 @@ FUN_02008F34: ; 0x02008F34 str r2, [sp, #0x1c] cmp r5, #0x0 bne _02008F48 - bl ErrorHandling + bl GF_AssertFail _02008F48: ldr r0, [r5, #0x10] cmp r0, #0x0 beq _02008F52 - bl ErrorHandling + bl GF_AssertFail _02008F52: add r0, r5, #0x0 bl FUN_020097D0 add r6, r0, #0x0 bne _02008F60 - bl ErrorHandling + bl GF_AssertFail _02008F60: ldr r0, [sp, #0x38] str r4, [sp, #0x0] @@ -222,18 +222,18 @@ FUN_02008F90: ; 0x02008F90 str r2, [sp, #0x1c] cmp r5, #0x0 bne _02008FA4 - bl ErrorHandling + bl GF_AssertFail _02008FA4: ldr r0, [r5, #0x10] cmp r0, #0x0 beq _02008FAE - bl ErrorHandling + bl GF_AssertFail _02008FAE: add r0, r5, #0x0 bl FUN_020097D0 add r6, r0, #0x0 bne _02008FBC - bl ErrorHandling + bl GF_AssertFail _02008FBC: ldr r0, [sp, #0x38] str r4, [sp, #0x0] @@ -269,18 +269,18 @@ FUN_02008FEC: ; 0x02008FEC str r2, [sp, #0x1c] cmp r5, #0x0 bne _02009000 - bl ErrorHandling + bl GF_AssertFail _02009000: ldr r0, [r5, #0x10] cmp r0, #0x1 beq _0200900A - bl ErrorHandling + bl GF_AssertFail _0200900A: add r0, r5, #0x0 bl FUN_020097D0 add r6, r0, #0x0 bne _02009018 - bl ErrorHandling + bl GF_AssertFail _02009018: ldr r0, [sp, #0x38] str r4, [sp, #0x0] @@ -318,18 +318,18 @@ FUN_0200904C: ; 0x0200904C str r2, [sp, #0x1c] cmp r5, #0x0 bne _02009060 - bl ErrorHandling + bl GF_AssertFail _02009060: ldr r0, [r5, #0x10] cmp r0, #0x1 beq _0200906A - bl ErrorHandling + bl GF_AssertFail _0200906A: add r0, r5, #0x0 bl FUN_020097D0 add r6, r0, #0x0 bne _02009078 - bl ErrorHandling + bl GF_AssertFail _02009078: ldr r0, [sp, #0x38] str r4, [sp, #0x0] @@ -367,13 +367,13 @@ FUN_020090AC: ; 0x020090AC str r2, [sp, #0x1c] cmp r5, #0x0 bne _020090C0 - bl ErrorHandling + bl GF_AssertFail _020090C0: add r0, r5, #0x0 bl FUN_020097D0 add r6, r0, #0x0 bne _020090CE - bl ErrorHandling + bl GF_AssertFail _020090CE: ldr r0, [sp, #0x38] str r4, [sp, #0x0] @@ -408,21 +408,21 @@ FUN_020090FC: ; 0x020090FC str r3, [sp, #0x20] cmp r5, #0x0 bne _02009110 - bl ErrorHandling + bl GF_AssertFail _02009110: ldr r0, [r5, #0x10] cmp r0, #0x0 beq _0200911A - bl ErrorHandling + bl GF_AssertFail _0200911A: cmp r4, #0x0 bne _02009122 - bl ErrorHandling + bl GF_AssertFail _02009122: ldr r0, [r4, #0x4] cmp r0, #0x0 beq _0200912C - bl ErrorHandling + bl GF_AssertFail _0200912C: add r0, r4, #0x0 bl FUN_02009530 @@ -461,21 +461,21 @@ FUN_02009168: ; 0x02009168 str r3, [sp, #0x20] cmp r5, #0x0 bne _0200917C - bl ErrorHandling + bl GF_AssertFail _0200917C: ldr r0, [r5, #0x10] cmp r0, #0x1 beq _02009186 - bl ErrorHandling + bl GF_AssertFail _02009186: cmp r4, #0x0 bne _0200918E - bl ErrorHandling + bl GF_AssertFail _0200918E: ldr r0, [r4, #0x4] cmp r0, #0x1 beq _02009198 - bl ErrorHandling + bl GF_AssertFail _02009198: add r0, r4, #0x0 bl FUN_02009530 @@ -519,18 +519,18 @@ FUN_020091E0: ; 0x020091E0 str r2, [sp, #0x1c] cmp r5, #0x0 bne _020091F4 - bl ErrorHandling + bl GF_AssertFail _020091F4: ldr r0, [r5, #0x10] cmp r0, #0x0 beq _020091FE - bl ErrorHandling + bl GF_AssertFail _020091FE: add r0, r5, #0x0 bl FUN_020097D0 add r6, r0, #0x0 bne _0200920C - bl ErrorHandling + bl GF_AssertFail _0200920C: ldr r0, [sp, #0x38] str r4, [sp, #0x0] @@ -566,18 +566,18 @@ FUN_0200923C: ; 0x0200923C str r2, [sp, #0x1c] cmp r5, #0x0 bne _02009250 - bl ErrorHandling + bl GF_AssertFail _02009250: ldr r0, [r5, #0x10] cmp r0, #0x0 beq _0200925A - bl ErrorHandling + bl GF_AssertFail _0200925A: add r0, r5, #0x0 bl FUN_020097D0 add r6, r0, #0x0 bne _02009268 - bl ErrorHandling + bl GF_AssertFail _02009268: ldr r0, [sp, #0x38] str r4, [sp, #0x0] @@ -613,18 +613,18 @@ FUN_02009298: ; 0x02009298 str r2, [sp, #0x1c] cmp r5, #0x0 bne _020092AC - bl ErrorHandling + bl GF_AssertFail _020092AC: ldr r0, [r5, #0x10] cmp r0, #0x1 beq _020092B6 - bl ErrorHandling + bl GF_AssertFail _020092B6: add r0, r5, #0x0 bl FUN_020097D0 add r6, r0, #0x0 bne _020092C4 - bl ErrorHandling + bl GF_AssertFail _020092C4: ldr r0, [sp, #0x38] str r4, [sp, #0x0] @@ -662,18 +662,18 @@ FUN_020092F8: ; 0x020092F8 str r2, [sp, #0x1c] cmp r5, #0x0 bne _0200930C - bl ErrorHandling + bl GF_AssertFail _0200930C: ldr r0, [r5, #0x10] cmp r0, #0x1 beq _02009316 - bl ErrorHandling + bl GF_AssertFail _02009316: add r0, r5, #0x0 bl FUN_020097D0 add r6, r0, #0x0 bne _02009324 - bl ErrorHandling + bl GF_AssertFail _02009324: ldr r0, [sp, #0x38] str r4, [sp, #0x0] @@ -711,13 +711,13 @@ FUN_02009358: ; 0x02009358 str r2, [sp, #0x1c] cmp r5, #0x0 bne _0200936C - bl ErrorHandling + bl GF_AssertFail _0200936C: add r0, r5, #0x0 bl FUN_020097D0 add r6, r0, #0x0 bne _0200937A - bl ErrorHandling + bl GF_AssertFail _0200937A: ldr r0, [sp, #0x38] str r4, [sp, #0x0] @@ -752,11 +752,11 @@ FUN_020093A8: ; 0x020093A8 add r7, r3, #0x0 cmp r5, #0x0 bne _020093BC - bl ErrorHandling + bl GF_AssertFail _020093BC: cmp r4, #0x0 bne _020093C4 - bl ErrorHandling + bl GF_AssertFail _020093C4: str r6, [sp, #0x0] str r7, [sp, #0x4] @@ -848,7 +848,7 @@ FUN_0200945C: ; 0x0200945C add r4, r1, #0x0 cmp r5, #0x0 bne _0200946A - bl ErrorHandling + bl GF_AssertFail _0200946A: ldr r0, [r5, #0x0] add r1, r4, #0x0 @@ -860,7 +860,7 @@ FUN_02009474: ; 0x02009474 push {r4, lr} add r4, r0, #0x0 bne _0200947E - bl ErrorHandling + bl GF_AssertFail _0200947E: add r0, r4, #0x0 bl FUN_02009920 @@ -877,12 +877,12 @@ FUN_02009490: ; 0x02009490 add r4, r1, #0x0 cmp r5, #0x0 bne _0200949E - bl ErrorHandling + bl GF_AssertFail _0200949E: ldr r0, [r5, #0x4] cmp r0, #0x0 bne _020094A8 - bl ErrorHandling + bl GF_AssertFail _020094A8: add r0, r4, #0x0 bl FUN_02009920 @@ -931,7 +931,7 @@ FUN_020094F0: ; 0x020094F0 add r7, r1, #0x0 cmp r5, #0x0 bne _020094FE - bl ErrorHandling + bl GF_AssertFail _020094FE: ldr r0, [r5, #0x8] mov r6, #0x0 @@ -966,7 +966,7 @@ FUN_02009530: ; 0x02009530 push {r4, lr} add r4, r0, #0x0 bne _0200953A - bl ErrorHandling + bl GF_AssertFail _0200953A: ldr r0, [r4, #0x0] bl FUN_02020E38 @@ -980,7 +980,7 @@ FUN_02009544: ; 0x02009544 ldr r0, [r4, #0x4] cmp r0, #0x0 beq _02009552 - bl ErrorHandling + bl GF_AssertFail _02009552: add r0, r4, #0x0 bl FUN_02009934 @@ -994,7 +994,7 @@ FUN_0200955C: ; 0x0200955C ldr r0, [r4, #0x4] cmp r0, #0x1 beq _0200956A - bl ErrorHandling + bl GF_AssertFail _0200956A: add r0, r4, #0x0 bl FUN_02009934 @@ -1008,7 +1008,7 @@ FUN_02009574: ; 0x02009574 ldr r0, [r4, #0x4] cmp r0, #0x2 beq _02009582 - bl ErrorHandling + bl GF_AssertFail _02009582: add r0, r4, #0x0 bl FUN_02009934 @@ -1022,7 +1022,7 @@ FUN_0200958C: ; 0x0200958C ldr r0, [r4, #0x4] cmp r0, #0x3 beq _0200959A - bl ErrorHandling + bl GF_AssertFail _0200959A: add r0, r4, #0x0 bl FUN_02009934 @@ -1036,7 +1036,7 @@ FUN_020095A4: ; 0x020095A4 ldr r0, [r4, #0x4] cmp r0, #0x4 beq _020095B2 - bl ErrorHandling + bl GF_AssertFail _020095B2: add r0, r4, #0x0 bl FUN_02009934 @@ -1050,7 +1050,7 @@ FUN_020095BC: ; 0x020095BC ldr r0, [r4, #0x4] cmp r0, #0x5 beq _020095CA - bl ErrorHandling + bl GF_AssertFail _020095CA: add r0, r4, #0x0 bl FUN_02009934 @@ -1062,7 +1062,7 @@ FUN_020095D4: ; 0x020095D4 push {r4, lr} add r4, r0, #0x0 bne _020095DE - bl ErrorHandling + bl GF_AssertFail _020095DE: ldr r0, [r4, #0x4] pop {r4, pc} @@ -1073,7 +1073,7 @@ FUN_020095E4: ; 0x020095E4 push {r4, lr} add r4, r0, #0x0 bne _020095EE - bl ErrorHandling + bl GF_AssertFail _020095EE: ldr r0, [r4, #0x4] cmp r0, #0x0 @@ -1098,7 +1098,7 @@ FUN_02009610: ; 0x02009610 push {r4, lr} add r4, r0, #0x0 bne _0200961A - bl ErrorHandling + bl GF_AssertFail _0200961A: ldr r0, [r4, #0x4] cmp r0, #0x1 @@ -1119,7 +1119,7 @@ FUN_02009630: ; 0x02009630 add r4, r1, #0x0 cmp r5, #0x0 bne _0200963E - bl ErrorHandling + bl GF_AssertFail _0200963E: ldr r0, [r5, #0x4] cmp r0, #0x0 @@ -1157,7 +1157,7 @@ FUN_02009668: ; 0x02009668 add r6, r2, #0x0 cmp r4, #0x0 bne _02009678 - bl ErrorHandling + bl GF_AssertFail _02009678: ldr r0, [r5, #0x0] str r0, [r4, #0x8] @@ -1210,7 +1210,7 @@ FUN_020096CC: ; 0x020096CC push {r4, lr} add r4, r0, #0x0 bne _020096D6 - bl ErrorHandling + bl GF_AssertFail _020096D6: ldr r0, [r4, #0x4] pop {r4, pc} @@ -1223,12 +1223,12 @@ FUN_020096DC: ; 0x020096DC add r4, r1, #0x0 cmp r5, #0x0 bne _020096EA - bl ErrorHandling + bl GF_AssertFail _020096EA: ldr r0, [r5, #0x4] cmp r0, r4 bgt _020096F4 - bl ErrorHandling + bl GF_AssertFail _020096F4: ldrb r0, [r5, #0xc] ldr r1, [r5, #0x0] @@ -1253,12 +1253,12 @@ FUN_02009710: ; 0x02009710 add r4, r1, #0x0 cmp r5, #0x0 bne _0200971E - bl ErrorHandling + bl GF_AssertFail _0200971E: ldr r0, [r5, #0x4] cmp r0, r4 bgt _02009728 - bl ErrorHandling + bl GF_AssertFail _02009728: ldrb r0, [r5, #0xc] cmp r0, #0x1 @@ -1279,12 +1279,12 @@ FUN_0200973C: ; 0x0200973C add r4, r1, #0x0 cmp r5, #0x0 bne _0200974A - bl ErrorHandling + bl GF_AssertFail _0200974A: ldr r0, [r5, #0x4] cmp r0, r4 bgt _02009754 - bl ErrorHandling + bl GF_AssertFail _02009754: ldrb r0, [r5, #0xc] cmp r0, #0x1 @@ -1305,12 +1305,12 @@ FUN_02009768: ; 0x02009768 add r4, r1, #0x0 cmp r5, #0x0 bne _02009776 - bl ErrorHandling + bl GF_AssertFail _02009776: ldr r0, [r5, #0x4] cmp r0, r4 bgt _02009780 - bl ErrorHandling + bl GF_AssertFail _02009780: ldrb r0, [r5, #0xc] ldr r1, [r5, #0x0] @@ -1335,12 +1335,12 @@ FUN_0200979C: ; 0x0200979C add r4, r1, #0x0 cmp r5, #0x0 bne _020097AA - bl ErrorHandling + bl GF_AssertFail _020097AA: ldr r0, [r5, #0x4] cmp r0, r4 bgt _020097B4 - bl ErrorHandling + bl GF_AssertFail _020097B4: ldrb r0, [r5, #0xc] ldr r1, [r5, #0x0] @@ -1560,12 +1560,12 @@ FUN_02009934: ; 0x02009934 push {r4, lr} add r4, r0, #0x0 bne _0200993E - bl ErrorHandling + bl GF_AssertFail _0200993E: ldr r0, [r4, #0x8] cmp r0, #0x0 bne _02009948 - bl ErrorHandling + bl GF_AssertFail _02009948: ldr r0, [r4, #0x8] pop {r4, pc} @@ -1714,13 +1714,13 @@ FUN_02009A50: ; 0x02009A50 sub sp, #0x10 add r4, r0, #0x0 bne _02009A5C - bl ErrorHandling + bl GF_AssertFail _02009A5C: add r0, r4, #0x0 bl FUN_020095D4 cmp r0, #0x0 beq _02009A6A - bl ErrorHandling + bl GF_AssertFail _02009A6A: add r0, r4, #0x0 bl FUN_02009544 @@ -1743,7 +1743,7 @@ FUN_02009A90: ; 0x02009A90 push {r4-r6, lr} add r5, r0, #0x0 bne _02009A9A - bl ErrorHandling + bl GF_AssertFail _02009A9A: ldr r0, [r5, #0x4] mov r6, #0x0 @@ -1758,7 +1758,7 @@ _02009AA4: bl FUN_02009A50 cmp r0, #0x0 bne _02009AB8 - bl ErrorHandling + bl GF_AssertFail _02009AB8: ldr r0, [r5, #0x4] add r6, r6, #0x1 @@ -1774,13 +1774,13 @@ FUN_02009AC4: ; 0x02009AC4 sub sp, #0x10 add r4, r0, #0x0 bne _02009AD0 - bl ErrorHandling + bl GF_AssertFail _02009AD0: add r0, r4, #0x0 bl FUN_020095D4 cmp r0, #0x0 beq _02009ADE - bl ErrorHandling + bl GF_AssertFail _02009ADE: add r0, r4, #0x0 bl FUN_02009544 @@ -1804,13 +1804,13 @@ FUN_02009B04: ; 0x02009B04 sub sp, #0x10 add r4, r0, #0x0 bne _02009B10 - bl ErrorHandling + bl GF_AssertFail _02009B10: add r0, r4, #0x0 bl FUN_020095D4 cmp r0, #0x0 beq _02009B1E - bl ErrorHandling + bl GF_AssertFail _02009B1E: add r0, r4, #0x0 bl FUN_02009544 @@ -1833,7 +1833,7 @@ FUN_02009B44: ; 0x02009B44 push {r4-r6, lr} add r5, r0, #0x0 bne _02009B4E - bl ErrorHandling + bl GF_AssertFail _02009B4E: ldr r0, [r5, #0x4] mov r6, #0x0 @@ -1848,7 +1848,7 @@ _02009B58: bl FUN_02009B04 cmp r0, #0x0 bne _02009B6C - bl ErrorHandling + bl GF_AssertFail _02009B6C: ldr r0, [r5, #0x4] add r6, r6, #0x1 @@ -1864,13 +1864,13 @@ FUN_02009B78: ; 0x02009B78 sub sp, #0x10 add r4, r0, #0x0 bne _02009B84 - bl ErrorHandling + bl GF_AssertFail _02009B84: add r0, r4, #0x0 bl FUN_020095D4 cmp r0, #0x0 beq _02009B92 - bl ErrorHandling + bl GF_AssertFail _02009B92: add r0, r4, #0x0 bl FUN_02009544 @@ -1895,11 +1895,11 @@ FUN_02009BB8: ; 0x02009BB8 add r5, r1, #0x0 cmp r4, #0x0 bne _02009BC6 - bl ErrorHandling + bl GF_AssertFail _02009BC6: cmp r5, #0x0 bne _02009BCE - bl ErrorHandling + bl GF_AssertFail _02009BCE: add r0, r4, #0x0 bl FUN_02009530 @@ -1917,7 +1917,7 @@ FUN_02009BE8: ; 0x02009BE8 push {r3-r5, lr} add r5, r0, #0x0 bne _02009BF2 - bl ErrorHandling + bl GF_AssertFail _02009BF2: add r0, r5, #0x0 bl FUN_02009530 @@ -1935,13 +1935,13 @@ FUN_02009C0C: ; 0x02009C0C push {r4, lr} add r4, r0, #0x0 bne _02009C16 - bl ErrorHandling + bl GF_AssertFail _02009C16: add r0, r4, #0x0 bl FUN_020095D4 cmp r0, #0x0 beq _02009C24 - bl ErrorHandling + bl GF_AssertFail _02009C24: add r0, r4, #0x0 bl FUN_02009530 @@ -1953,7 +1953,7 @@ FUN_02009C30: ; 0x02009C30 push {r4-r6, lr} add r5, r0, #0x0 bne _02009C3A - bl ErrorHandling + bl GF_AssertFail _02009C3A: ldr r0, [r5, #0x4] mov r6, #0x0 @@ -1980,13 +1980,13 @@ FUN_02009C5C: ; 0x02009C5C push {r4, lr} add r4, r0, #0x0 bne _02009C66 - bl ErrorHandling + bl GF_AssertFail _02009C66: add r0, r4, #0x0 bl FUN_020095D4 cmp r0, #0x0 beq _02009C74 - bl ErrorHandling + bl GF_AssertFail _02009C74: add r0, r4, #0x0 bl FUN_02009530 @@ -2000,23 +2000,23 @@ FUN_02009C80: ; 0x02009C80 add r5, r1, #0x0 cmp r4, #0x0 bne _02009C8E - bl ErrorHandling + bl GF_AssertFail _02009C8E: add r0, r4, #0x0 bl FUN_020095D4 cmp r0, #0x0 beq _02009C9C - bl ErrorHandling + bl GF_AssertFail _02009C9C: cmp r5, #0x0 bne _02009CA4 - bl ErrorHandling + bl GF_AssertFail _02009CA4: add r0, r5, #0x0 bl FUN_020095D4 cmp r0, #0x2 beq _02009CB2 - bl ErrorHandling + bl GF_AssertFail _02009CB2: add r0, r4, #0x0 bl FUN_02009530 @@ -2041,7 +2041,7 @@ FUN_02009CDC: ; 0x02009CDC push {r4, lr} add r4, r0, #0x0 bne _02009CE6 - bl ErrorHandling + bl GF_AssertFail _02009CE6: add r0, r4, #0x0 bl FUN_0201D4F0 @@ -2054,13 +2054,13 @@ FUN_02009CF0: ; 0x02009CF0 sub sp, #0x10 add r4, r0, #0x0 bne _02009CFC - bl ErrorHandling + bl GF_AssertFail _02009CFC: add r0, r4, #0x0 bl FUN_020095D4 cmp r0, #0x1 beq _02009D0A - bl ErrorHandling + bl GF_AssertFail _02009D0A: add r0, r4, #0x0 bl FUN_0200955C @@ -2084,7 +2084,7 @@ FUN_02009D34: ; 0x02009D34 push {r4-r6, lr} add r5, r0, #0x0 bne _02009D3E - bl ErrorHandling + bl GF_AssertFail _02009D3E: ldr r0, [r5, #0x4] mov r6, #0x0 @@ -2099,7 +2099,7 @@ _02009D48: bl FUN_02009CF0 cmp r0, #0x0 bne _02009D5C - bl ErrorHandling + bl GF_AssertFail _02009D5C: ldr r0, [r5, #0x4] add r6, r6, #0x1 @@ -2115,13 +2115,13 @@ FUN_02009D68: ; 0x02009D68 sub sp, #0x10 add r4, r0, #0x0 bne _02009D74 - bl ErrorHandling + bl GF_AssertFail _02009D74: add r0, r4, #0x0 bl FUN_020095D4 cmp r0, #0x1 beq _02009D82 - bl ErrorHandling + bl GF_AssertFail _02009D82: add r0, r4, #0x0 bl FUN_0200955C @@ -2145,7 +2145,7 @@ FUN_02009DAC: ; 0x02009DAC push {r4-r6, lr} add r5, r0, #0x0 bne _02009DB6 - bl ErrorHandling + bl GF_AssertFail _02009DB6: ldr r0, [r5, #0x4] mov r6, #0x0 @@ -2160,7 +2160,7 @@ _02009DC0: bl FUN_02009D68 cmp r0, #0x0 bne _02009DD4 - bl ErrorHandling + bl GF_AssertFail _02009DD4: ldr r0, [r5, #0x4] add r6, r6, #0x1 @@ -2175,7 +2175,7 @@ FUN_02009DE0: ; 0x02009DE0 push {r3-r5, lr} add r5, r0, #0x0 bne _02009DEA - bl ErrorHandling + bl GF_AssertFail _02009DEA: add r0, r5, #0x0 bl FUN_02009530 @@ -2193,13 +2193,13 @@ FUN_02009E04: ; 0x02009E04 push {r4, lr} add r4, r0, #0x0 bne _02009E0E - bl ErrorHandling + bl GF_AssertFail _02009E0E: add r0, r4, #0x0 bl FUN_020095D4 cmp r0, #0x1 beq _02009E1C - bl ErrorHandling + bl GF_AssertFail _02009E1C: add r0, r4, #0x0 bl FUN_02009530 @@ -2211,7 +2211,7 @@ FUN_02009E28: ; 0x02009E28 push {r4-r6, lr} add r5, r0, #0x0 bne _02009E32 - bl ErrorHandling + bl GF_AssertFail _02009E32: ldr r0, [r5, #0x4] mov r6, #0x0 @@ -2240,13 +2240,13 @@ FUN_02009E54: ; 0x02009E54 add r4, r1, #0x0 cmp r5, #0x0 bne _02009E62 - bl ErrorHandling + bl GF_AssertFail _02009E62: add r0, r5, #0x0 bl FUN_020095D4 cmp r0, #0x1 beq _02009E70 - bl ErrorHandling + bl GF_AssertFail _02009E70: add r0, r5, #0x0 bl FUN_02009530 diff --git a/arm9/asm/unk_02009EAC.s b/arm9/asm/unk_02009EAC.s index 2c51446b..95a1773a 100644 --- a/arm9/asm/unk_02009EAC.s +++ b/arm9/asm/unk_02009EAC.s @@ -68,7 +68,7 @@ FUN_02009EF0: ; 0x02009EF0 add r7, r3, #0x0 cmp r0, #0x0 beq _02009F08 - bl ErrorHandling + bl GF_AssertFail _02009F08: ldr r0, [sp, #0x30] mov r1, #0x3c @@ -77,7 +77,7 @@ _02009F08: cmp r0, #0x0 str r0, [r1, #0x0] bne _02009F1C - bl ErrorHandling + bl GF_AssertFail _02009F1C: ldr r1, _02009F7C ; =UNK_021C4670 lsl r3, r6, #0x10 @@ -98,7 +98,7 @@ _02009F1C: bl NNS_G2dGetNewOamManagerInstance cmp r0, #0x0 bne _02009F48 - bl ErrorHandling + bl GF_AssertFail _02009F48: ldr r0, [sp, #0x2c] ldr r1, [sp, #0x20] @@ -121,7 +121,7 @@ _02009F48: bl NNS_G2dGetNewOamManagerInstance cmp r0, #0x0 bne _02009F78 - bl ErrorHandling + bl GF_AssertFail _02009F78: add sp, #0x8 pop {r3-r7, pc} @@ -152,7 +152,7 @@ FUN_02009FA0: ; 0x02009FA0 ldr r0, [r0, #0x0] cmp r0, #0x0 bne _02009FAE - bl ErrorHandling + bl GF_AssertFail _02009FAE: ldr r0, _02009FD4 ; =UNK_021C4670 ldr r0, [r0, #0x0] @@ -184,7 +184,7 @@ FUN_02009FD8: ; 0x02009FD8 add r4, r3, #0x0 cmp r0, #0x0 bne _02009FF0 - bl ErrorHandling + bl GF_AssertFail _02009FF0: cmp r5, #0x1 bne _0200A00C @@ -227,7 +227,7 @@ FUN_0200A03C: ; 0x0200A03C ldr r0, [r0, #0x0] cmp r0, #0x0 bne _0200A04C - bl ErrorHandling + bl GF_AssertFail _0200A04C: cmp r4, #0x0 bne _0200A056 @@ -267,7 +267,7 @@ FUN_0200A074: ; 0x0200A074 bl NNS_G2dEntryOamManagerOamWithAffineIdx add r4, r0, #0x0 bne _0200A08C - bl ErrorHandling + bl GF_AssertFail _0200A08C: add r0, r4, #0x0 pop {r4, pc} @@ -286,7 +286,7 @@ FUN_0200A094: ; 0x0200A094 bl NNS_G2dEntryOamManagerOamWithAffineIdx add r4, r0, #0x0 bne _0200A0AE - bl ErrorHandling + bl GF_AssertFail _0200A0AE: add r0, r4, #0x0 pop {r4, pc} @@ -304,7 +304,7 @@ FUN_0200A0B8: ; 0x0200A0B8 ldr r0, _0200A0D8 ; =0x0000FFFE cmp r4, r0 bne _0200A0D0 - bl ErrorHandling + bl GF_AssertFail _0200A0D0: add r0, r4, #0x0 pop {r4, pc} @@ -324,7 +324,7 @@ FUN_0200A0DC: ; 0x0200A0DC ldr r0, _0200A100 ; =0x0000FFFE cmp r4, r0 bne _0200A0F6 - bl ErrorHandling + bl GF_AssertFail _0200A0F6: add r0, r4, #0x0 pop {r4, pc} @@ -426,7 +426,7 @@ FUN_0200A1A0: ; 0x0200A1A0 add r7, r3, #0x0 cmp r0, #0x0 beq _0200A1B4 - bl ErrorHandling + bl GF_AssertFail _0200A1B4: ldr r1, [sp, #0x18] mov r0, #0x1 diff --git a/arm9/asm/unk_0200BB14.s b/arm9/asm/unk_0200BB14.s index 7a041be2..b8a6eab5 100644 --- a/arm9/asm/unk_0200BB14.s +++ b/arm9/asm/unk_0200BB14.s @@ -27,7 +27,7 @@ FUN_0200BB34: ; 0x0200BB34 push {r4, lr} add r4, r0, #0x0 bne _0200BB3E - bl ErrorHandling + bl GF_AssertFail _0200BB3E: ldr r0, [r4, #0x0] mov r1, #0x58 @@ -67,7 +67,7 @@ FUN_0200BB6C: ; 0x0200BB6C add r7, r3, #0x0 cmp r5, #0x0 bne _0200BB80 - bl ErrorHandling + bl GF_AssertFail _0200BB80: cmp r5, #0x0 bne _0200BB8A @@ -155,7 +155,7 @@ FUN_0200BC1C: ; 0x0200BC1C push {r4, lr} add r4, r0, #0x0 bne _0200BC26 - bl ErrorHandling + bl GF_AssertFail _0200BC26: ldr r0, [r4, #0x0] bl FUN_0201FDEC @@ -288,7 +288,7 @@ FUN_0200BD04: ; 0x0200BD04 ldr r0, [r4, #0x4] cmp r0, #0x0 beq _0200BD12 - bl ErrorHandling + bl GF_AssertFail _0200BD12: add r0, r4, #0x0 bl FUN_0200BCB0 @@ -708,7 +708,7 @@ _0200C02A: mov r0, #0x1 pop {r4-r7, pc} _0200C058: - bl ErrorHandling + bl GF_AssertFail cmp r5, #0x0 beq _0200C066 add sp, #0xc @@ -755,7 +755,7 @@ _0200C08C: bl FUN_02009D68 cmp r0, #0x1 beq _0200C0B8 - bl ErrorHandling + bl GF_AssertFail _0200C0B8: ldr r0, [r4, #0x28] add r1, r5, #0x0 @@ -768,7 +768,7 @@ _0200C0B8: asr r0, r0, #0x18 pop {r3-r7, pc} _0200C0D0: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 mvn r0, r0 add sp, #0x10 @@ -1067,7 +1067,7 @@ _0200C2E0: bl FUN_02020248 b _0200C32C _0200C328: - bl ErrorHandling + bl GF_AssertFail _0200C32C: add r0, r4, #0x0 add sp, #0x74 @@ -1232,13 +1232,13 @@ _0200C42A: add r4, r0, #0x0 cmp r4, #0x1 beq _0200C45A - bl ErrorHandling + bl GF_AssertFail _0200C45A: add sp, #0x14 add r0, r4, #0x0 pop {r4-r7, pc} _0200C460: - bl ErrorHandling + bl GF_AssertFail cmp r5, #0x0 beq _0200C46E add sp, #0x14 @@ -2017,7 +2017,7 @@ _0200C936: mov r0, #0x1 pop {r4-r7, pc} _0200C964: - bl ErrorHandling + bl GF_AssertFail cmp r5, #0x0 beq _0200C972 add sp, #0xc @@ -2066,7 +2066,7 @@ _0200C996: mov r0, #0x1 pop {r4-r7, pc} _0200C9C4: - bl ErrorHandling + bl GF_AssertFail cmp r5, #0x0 beq _0200C9D2 add sp, #0xc diff --git a/arm9/asm/unk_0200E1D0.s b/arm9/asm/unk_0200E1D0.s index 85f4bfc2..3690752c 100644 --- a/arm9/asm/unk_0200E1D0.s +++ b/arm9/asm/unk_0200E1D0.s @@ -95,18 +95,18 @@ FUN_0200E1D0: ; 0x0200E1D0 add r6, r3, #0x0 cmp r0, #0x0 bne _0200E1E6 - bl ErrorHandling + bl GF_AssertFail _0200E1E6: ldr r0, [sp, #0x34] cmp r0, #0x0 bne _0200E1F0 - bl ErrorHandling + bl GF_AssertFail _0200E1F0: ldr r0, _0200E2AC ; =UNK_021C47F4 ldrh r0, [r0, #0xc] cmp r0, #0x0 beq _0200E1FC - bl ErrorHandling + bl GF_AssertFail _0200E1FC: ldr r0, _0200E2B0 ; =UNK_021C46B4 bl FUN_0200E808 @@ -672,14 +672,14 @@ FUN_0200E628: ; 0x0200E628 str r1, [sp, #0x0] cmp r0, #0x0 beq _0200E64A - bl ErrorHandling + bl GF_AssertFail _0200E64A: add r6, r5, #0x0 add r6, #0x8 ldr r0, [r6, r4] cmp r0, #0x0 bne _0200E658 - bl ErrorHandling + bl GF_AssertFail _0200E658: ldr r0, [r5, #0x10] cmp r0, #0x0 @@ -697,7 +697,7 @@ _0200E672: ldr r0, [sp, #0x4] cmp r0, #0x1 beq _0200E67C - bl ErrorHandling + bl GF_AssertFail _0200E67C: ldr r0, [sp, #0x0] cmp r7, #0x0 diff --git a/arm9/asm/unk_0200E850.s b/arm9/asm/unk_0200E850.s index f42d0a24..1919f15d 100644 --- a/arm9/asm/unk_0200E850.s +++ b/arm9/asm/unk_0200E850.s @@ -1572,7 +1572,7 @@ _0200F248: mov r7, #0xf mvn r7, r7 mov r6, #0x0 - bl ErrorHandling + bl GF_AssertFail b _0200F274 _0200F254: cmp r1, r0 @@ -1591,7 +1591,7 @@ _0200F26A: mov r7, #0x0 add r6, r7, #0x0 sub r6, #0x10 - bl ErrorHandling + bl GF_AssertFail _0200F274: ldr r0, [r5, #0x10] add r1, r7, #0x0 @@ -1701,7 +1701,7 @@ FUN_0200F330: ; 0x0200F330 push {r4-r6, lr} add r4, r0, #0x0 bne _0200F33A - bl ErrorHandling + bl GF_AssertFail _0200F33A: ldr r0, _0200F54C ; =0x04000006 ldrh r0, [r0, #0x0] @@ -2062,7 +2062,7 @@ FUN_0200F5D8: ; 0x0200F5D8 add r4, r1, #0x0 cmp r0, r4 bgt _0200F5E8 - bl ErrorHandling + bl GF_AssertFail _0200F5E8: ldr r0, _0200F5F4 ; =0x00000604 ldr r1, [r5, #0x0] @@ -2304,7 +2304,7 @@ FUN_0200F7AC: ; 0x0200F7AC push {r3-r5, lr} add r4, r0, #0x0 bne _0200F7B6 - bl ErrorHandling + bl GF_AssertFail _0200F7B6: ldr r0, _0200FAC0 ; =0x04000006 ldrh r0, [r0, #0x0] @@ -3371,7 +3371,7 @@ _0200FF9E: mov r6, #0x1 b _0200FFA6 _0200FFA2: - bl ErrorHandling + bl GF_AssertFail _0200FFA6: add r0, r6, #0x0 pop {r4-r6, pc} @@ -3740,7 +3740,7 @@ _02010272: mov r6, #0x1 b _0201027A _02010276: - bl ErrorHandling + bl GF_AssertFail _0201027A: add r0, r6, #0x0 pop {r4-r6, pc} @@ -4189,7 +4189,7 @@ FUN_020105A0: ; 0x020105A0 str r0, [sp, #0x4] cmp r0, #0xc0 blt _0201060C - bl ErrorHandling + bl GF_AssertFail _0201060C: ldr r2, [sp, #0x4] add r0, r4, #0x0 @@ -4326,7 +4326,7 @@ _02010714: mov r6, #0x1 b _0201071C _02010718: - bl ErrorHandling + bl GF_AssertFail _0201071C: add r0, r6, #0x0 pop {r4-r6, pc} @@ -4350,7 +4350,7 @@ FUN_02010720: ; 0x02010720 str r0, [r7, #0xc] cmp r0, #0x0 bne _02010748 - bl ErrorHandling + bl GF_AssertFail _02010748: ldrb r0, [r5, #0x8] str r0, [r7, #0x10] @@ -4689,7 +4689,7 @@ _020109DC: mov r6, #0x1 b _020109E4 _020109E0: - bl ErrorHandling + bl GF_AssertFail _020109E4: add r0, r6, #0x0 pop {r4-r6, pc} @@ -5102,7 +5102,7 @@ _02010D10: mov r6, #0x1 b _02010D18 _02010D14: - bl ErrorHandling + bl GF_AssertFail _02010D18: add r0, r6, #0x0 pop {r4-r6, pc} @@ -5448,7 +5448,7 @@ _02010FC4: mov r6, #0x1 b _02010FCC _02010FC8: - bl ErrorHandling + bl GF_AssertFail _02010FCC: add r0, r6, #0x0 pop {r4-r6, pc} @@ -5809,7 +5809,7 @@ _0201126A: mov r4, #0x1 b _02011272 _0201126E: - bl ErrorHandling + bl GF_AssertFail _02011272: add r0, r4, #0x0 pop {r3-r5, pc} diff --git a/arm9/asm/unk_02011744.s b/arm9/asm/unk_02011744.s index ff9364c9..8ee30228 100644 --- a/arm9/asm/unk_02011744.s +++ b/arm9/asm/unk_02011744.s @@ -34,7 +34,7 @@ FUN_02011744: ; 0x02011744 str r0, [sp, #0x8] cmp r0, #0x0 bne _0201175E - bl ErrorHandling + bl GF_AssertFail _0201175E: ldr r4, [sp, #0x8] ldr r5, [sp, #0x8] @@ -50,7 +50,7 @@ _02011766: str r0, [r5, #0x0] cmp r0, #0x0 bne _0201177E - bl ErrorHandling + bl GF_AssertFail _0201177E: add r6, r6, #0x1 add r4, r4, #0x4 @@ -68,7 +68,7 @@ _0201177E: cmp r0, #0x0 str r0, [r1, #0x60] bne _020117A4 - bl ErrorHandling + bl GF_AssertFail _020117A4: ldr r1, [sp, #0x4] ldr r0, [sp, #0x8] @@ -87,7 +87,7 @@ FUN_020117BC: ; 0x020117BC push {r4-r6, lr} add r6, r0, #0x0 bne _020117C6 - bl ErrorHandling + bl GF_AssertFail _020117C6: mov r4, #0x0 add r5, r6, #0x0 @@ -111,13 +111,13 @@ FUN_020117E8: ; 0x020117E8 sub sp, #0x1c add r5, r0, #0x0 bne _020117F4 - bl ErrorHandling + bl GF_AssertFail _020117F4: ldr r0, [r5, #0x0] bl FUN_02011BA0 add r4, r0, #0x0 bne _02011802 - bl ErrorHandling + bl GF_AssertFail _02011802: ldr r0, [r5, #0x10] add r3, sp, #0x8 @@ -173,12 +173,12 @@ FUN_02011870: ; 0x02011870 push {r4, lr} add r4, r0, #0x0 bne _0201187A - bl ErrorHandling + bl GF_AssertFail _0201187A: ldr r0, [r4, #0x0] cmp r0, #0x0 bne _02011884 - bl ErrorHandling + bl GF_AssertFail _02011884: add r0, r4, #0x0 bl FUN_02011F00 @@ -219,7 +219,7 @@ FUN_020118C4: ; 0x020118C4 str r1, [sp, #0x0] cmp r5, #0x0 bne _020118D6 - bl ErrorHandling + bl GF_AssertFail _020118D6: ldr r0, [sp, #0x0] str r0, [r5, #0xc] @@ -278,7 +278,7 @@ FUN_02011938: ; 0x02011938 sub sp, #0x10 add r5, r0, #0x0 bne _02011944 - bl ErrorHandling + bl GF_AssertFail _02011944: ldr r0, [r5, #0x8] cmp r0, #0x0 @@ -337,15 +337,15 @@ FUN_020119A4: ; 0x020119A4 add r6, r2, #0x0 cmp r5, #0x0 bne _020119B4 - bl ErrorHandling + bl GF_AssertFail _020119B4: cmp r4, #0x0 bne _020119BC - bl ErrorHandling + bl GF_AssertFail _020119BC: cmp r6, #0x0 bne _020119C4 - bl ErrorHandling + bl GF_AssertFail _020119C4: ldr r0, [r5, #0xc] str r0, [r4, #0x0] @@ -361,7 +361,7 @@ FUN_020119D0: ; 0x020119D0 add r7, r1, #0x0 cmp r5, #0x0 bne _020119DE - bl ErrorHandling + bl GF_AssertFail _020119DE: ldr r0, [r5, #0x4] mov r6, #0x0 @@ -389,7 +389,7 @@ FUN_02011A00: ; 0x02011A00 add r7, r1, #0x0 cmp r5, #0x0 bne _02011A0E - bl ErrorHandling + bl GF_AssertFail _02011A0E: ldr r0, [r5, #0x4] mov r6, #0x0 @@ -417,7 +417,7 @@ FUN_02011A30: ; 0x02011A30 add r7, r1, #0x0 cmp r5, #0x0 bne _02011A3E - bl ErrorHandling + bl GF_AssertFail _02011A3E: ldr r0, [r5, #0x4] mov r6, #0x0 @@ -445,7 +445,7 @@ FUN_02011A60: ; 0x02011A60 add r7, r1, #0x0 cmp r5, #0x0 bne _02011A6E - bl ErrorHandling + bl GF_AssertFail _02011A6E: ldr r0, [r5, #0x4] mov r6, #0x0 @@ -473,7 +473,7 @@ FUN_02011A90: ; 0x02011A90 add r7, r1, #0x0 cmp r5, #0x0 bne _02011A9E - bl ErrorHandling + bl GF_AssertFail _02011A9E: ldr r0, [r5, #0x4] mov r6, #0x0 @@ -501,7 +501,7 @@ FUN_02011AC0: ; 0x02011AC0 add r7, r1, #0x0 cmp r5, #0x0 bne _02011ACE - bl ErrorHandling + bl GF_AssertFail _02011ACE: ldr r0, [r5, #0x4] mov r6, #0x0 @@ -529,7 +529,7 @@ FUN_02011AF0: ; 0x02011AF0 add r7, r1, #0x0 cmp r5, #0x0 bne _02011AFE - bl ErrorHandling + bl GF_AssertFail _02011AFE: ldr r0, [r5, #0x4] mov r6, #0x0 @@ -567,7 +567,7 @@ FUN_02011B20: ; 0x02011B20 str r3, [sp, #0x4] cmp r1, r0 bge _02011B42 - bl ErrorHandling + bl GF_AssertFail _02011B42: ldrb r2, [r6, #0x8] ldr r1, [sp, #0x0] @@ -575,7 +575,7 @@ _02011B42: add r0, r1, r0 cmp r2, r0 bge _02011B52 - bl ErrorHandling + bl GF_AssertFail _02011B52: ldr r0, [sp, #0x0] mov r4, #0x0 @@ -719,7 +719,7 @@ FUN_02011BF4: ; 0x02011BF4 ldrb r0, [r0, #0x0] cmp r0, #0x1 bne _02011C54 - bl ErrorHandling + bl GF_AssertFail _02011C54: add r0, r5, #0x0 mov r1, #0x1 @@ -774,12 +774,12 @@ FUN_02011CA4: ; 0x02011CA4 add r6, r3, #0x0 cmp r7, #0x0 bne _02011CB8 - bl ErrorHandling + bl GF_AssertFail _02011CB8: ldr r0, [sp, #0x0] cmp r0, #0x0 bne _02011CC2 - bl ErrorHandling + bl GF_AssertFail _02011CC2: ldr r0, [sp, #0x0] mov r4, #0x0 @@ -1053,7 +1053,7 @@ _02011EC2: ldr r0, [r0, r5] cmp r0, #0x0 bne _02011EDC - bl ErrorHandling + bl GF_AssertFail _02011EDC: ldr r0, [r4, #0x0] add r7, #0x24 @@ -1174,7 +1174,7 @@ FUN_02011FAC: ; 0x02011FAC bl AllocFromHeapAtEnd add r4, r0, #0x0 bne _02011FBC - bl ErrorHandling + bl GF_AssertFail _02011FBC: mov r0, #0x0 str r0, [r4, #0xc] @@ -1188,7 +1188,7 @@ FUN_02011FC8: ; 0x02011FC8 push {r4, lr} add r4, r0, #0x0 bne _02011FD2 - bl ErrorHandling + bl GF_AssertFail _02011FD2: add r0, r4, #0x0 bl FreeToHeap diff --git a/arm9/asm/unk_02012004.s b/arm9/asm/unk_02012004.s index e43e4bb2..8c38ae93 100644 --- a/arm9/asm/unk_02012004.s +++ b/arm9/asm/unk_02012004.s @@ -78,7 +78,7 @@ FUN_02012044: ; 0x02012044 bl AllocAndReadWholeNarcMemberByIdPair add r4, r0, #0x0 bne _02012054 - bl ErrorHandling + bl GF_AssertFail _02012054: add r0, r4, #0x0 add r1, r5, #0x0 @@ -86,11 +86,11 @@ _02012054: add r6, r0, #0x0 cmp r5, #0x0 bne _02012066 - bl ErrorHandling + bl GF_AssertFail _02012066: cmp r6, #0x0 bne _0201206E - bl ErrorHandling + bl GF_AssertFail _0201206E: add r0, r4, #0x0 bl FreeToHeap @@ -109,7 +109,7 @@ FUN_02012078: ; 0x02012078 add r5, r3, #0x0 cmp r0, r6 bge _02012090 - bl ErrorHandling + bl GF_AssertFail _02012090: ldr r0, [sp, #0xc] ldrh r1, [r4, #0x0] @@ -117,7 +117,7 @@ _02012090: str r0, [sp, #0x14] cmp r1, r0 bge _020120A0 - bl ErrorHandling + bl GF_AssertFail _020120A0: ldr r0, [r4, #0x14] str r0, [sp, #0x20] @@ -305,14 +305,14 @@ FUN_020121E8: ; 0x020121E8 str r0, [sp, #0x20] cmp r0, #0x0 bne _02012204 - bl ErrorHandling + bl GF_AssertFail _02012204: ldr r0, [sp, #0x20] add r1, sp, #0x2c bl NNS_G2dGetUnpackedCharacterData cmp r0, #0x0 bne _02012214 - bl ErrorHandling + bl GF_AssertFail _02012214: ldr r1, [sp, #0x4c] ldr r0, [sp, #0x8] @@ -321,7 +321,7 @@ _02012214: ldrh r0, [r0, #0x2] cmp r0, r6 bge _02012226 - bl ErrorHandling + bl GF_AssertFail _02012226: ldr r1, [sp, #0x50] ldr r0, [sp, #0x48] @@ -332,7 +332,7 @@ _02012226: ldr r0, [sp, #0x10] cmp r1, r0 bge _0201223C - bl ErrorHandling + bl GF_AssertFail _0201223C: ldr r0, [sp, #0x2c] ldr r0, [r0, #0x14] @@ -652,7 +652,7 @@ FUN_02012470: ; 0x02012470 bl NNS_G2dGetUnpackedPaletteData cmp r0, #0x1 beq _0201249C - bl ErrorHandling + bl GF_AssertFail _0201249C: ldr r0, [sp, #0x0] add r1, r4, #0x0 diff --git a/arm9/asm/unk_02012944.s b/arm9/asm/unk_02012944.s index 1c1f2ab2..8b3029f2 100644 --- a/arm9/asm/unk_02012944.s +++ b/arm9/asm/unk_02012944.s @@ -34,7 +34,7 @@ FUN_02012974: ; 0x02012974 push {r4, lr} add r4, r0, #0x0 bne _0201297E - bl ErrorHandling + bl GF_AssertFail _0201297E: add r0, r4, #0x0 bl FreeToHeap @@ -46,7 +46,7 @@ FUN_02012988: ; 0x02012988 push {r4, lr} add r4, r0, #0x0 bne _02012992 - bl ErrorHandling + bl GF_AssertFail _02012992: ldrb r0, [r4, #0x8] lsl r0, r0, #0x2 @@ -59,7 +59,7 @@ FUN_0201299C: ; 0x0201299C push {r4, lr} add r4, r0, #0x0 bne _020129A6 - bl ErrorHandling + bl GF_AssertFail _020129A6: ldrb r1, [r4, #0x8] mov r0, #0x1 @@ -147,13 +147,13 @@ FUN_02012A30: ; 0x02012A30 add r7, r3, #0x0 cmp r5, #0x0 bne _02012A42 - bl ErrorHandling + bl GF_AssertFail _02012A42: ldr r0, _02012AB0 ; =0x00000604 ldr r0, [r5, r0] cmp r0, #0x0 beq _02012A4E - bl ErrorHandling + bl GF_AssertFail _02012A4E: ldr r0, _02012AB4 ; =0x0000078C mov r2, #0x0 @@ -212,7 +212,7 @@ FUN_02012AC4: ; 0x02012AC4 push {r4, lr} add r4, r0, #0x0 bne _02012ACE - bl ErrorHandling + bl GF_AssertFail _02012ACE: ldr r0, _02012AF8 ; =0x00000604 ldr r0, [r4, r0] @@ -451,7 +451,7 @@ FUN_02012C98: ; 0x02012C98 push {r3-r5, lr} add r4, r0, #0x0 bne _02012CA2 - bl ErrorHandling + bl GF_AssertFail _02012CA2: mov r0, #0x6 lsl r0, r0, #0x8 diff --git a/arm9/asm/unk_02012CC8.s b/arm9/asm/unk_02012CC8.s index 2961eba7..5f0f01c6 100644 --- a/arm9/asm/unk_02012CC8.s +++ b/arm9/asm/unk_02012CC8.s @@ -96,7 +96,7 @@ _02012D04: bl AllocFromHeap add r4, r0, #0x0 bne _02012D14 - bl ErrorHandling + bl GF_AssertFail _02012D14: add r0, r4, #0x0 mov r1, #0x0 @@ -337,7 +337,7 @@ _02012EE4: ldr r1, [r1, #0x14] cmp r0, r1 blo _02012EF0 - bl ErrorHandling + bl GF_AssertFail _02012EF0: add r0, r4, #0x0 pop {r4, pc} @@ -363,7 +363,7 @@ _02012F10: ldr r1, [r1, #0x14] cmp r0, r1 blo _02012F1C - bl ErrorHandling + bl GF_AssertFail _02012F1C: add r0, r4, #0x0 pop {r4, pc} @@ -389,7 +389,7 @@ _02012F3C: ldr r1, [r1, #0x14] cmp r0, r1 blo _02012F48 - bl ErrorHandling + bl GF_AssertFail _02012F48: add r0, r4, #0x0 pop {r4, pc} @@ -415,7 +415,7 @@ _02012F68: ldr r1, [r1, #0x14] cmp r0, r1 blo _02012F74 - bl ErrorHandling + bl GF_AssertFail _02012F74: add r0, r4, #0x0 pop {r4, pc} @@ -441,7 +441,7 @@ _02012F94: ldr r1, [r1, #0x14] cmp r0, r1 blo _02012FA0 - bl ErrorHandling + bl GF_AssertFail _02012FA0: add r0, r4, #0x0 pop {r4, pc} @@ -467,7 +467,7 @@ _02012FC0: ldr r1, [r1, #0x14] cmp r0, r1 blo _02012FCC - bl ErrorHandling + bl GF_AssertFail _02012FCC: add r0, r4, #0x0 pop {r4, pc} @@ -493,7 +493,7 @@ _02012FEC: ldr r1, [r1, #0x14] cmp r0, r1 blo _02012FF8 - bl ErrorHandling + bl GF_AssertFail _02012FF8: add r0, r4, #0x0 pop {r4, pc} @@ -519,7 +519,7 @@ _02013018: ldr r1, [r1, #0x14] cmp r0, r1 blo _02013024 - bl ErrorHandling + bl GF_AssertFail _02013024: add r0, r4, #0x0 pop {r4, pc} @@ -545,7 +545,7 @@ _02013044: ldr r1, [r1, #0x14] cmp r0, r1 blo _02013050 - bl ErrorHandling + bl GF_AssertFail _02013050: add r0, r4, #0x0 pop {r4, pc} @@ -571,7 +571,7 @@ _02013070: ldr r1, [r1, #0x14] cmp r0, r1 blo _0201307C - bl ErrorHandling + bl GF_AssertFail _0201307C: add r0, r4, #0x0 pop {r4, pc} @@ -597,7 +597,7 @@ _0201309C: ldr r1, [r1, #0x14] cmp r0, r1 blo _020130A8 - bl ErrorHandling + bl GF_AssertFail _020130A8: add r0, r4, #0x0 pop {r4, pc} @@ -623,7 +623,7 @@ _020130C8: ldr r1, [r1, #0x14] cmp r0, r1 blo _020130D4 - bl ErrorHandling + bl GF_AssertFail _020130D4: add r0, r4, #0x0 pop {r4, pc} @@ -649,7 +649,7 @@ _020130F4: ldr r1, [r1, #0x14] cmp r0, r1 blo _02013100 - bl ErrorHandling + bl GF_AssertFail _02013100: add r0, r4, #0x0 pop {r4, pc} @@ -675,7 +675,7 @@ _02013120: ldr r1, [r1, #0x14] cmp r0, r1 blo _0201312C - bl ErrorHandling + bl GF_AssertFail _0201312C: add r0, r4, #0x0 pop {r4, pc} @@ -701,7 +701,7 @@ _0201314C: ldr r1, [r1, #0x14] cmp r0, r1 blo _02013158 - bl ErrorHandling + bl GF_AssertFail _02013158: add r0, r4, #0x0 pop {r4, pc} @@ -727,7 +727,7 @@ _02013178: ldr r1, [r1, #0x14] cmp r0, r1 blo _02013184 - bl ErrorHandling + bl GF_AssertFail _02013184: add r0, r4, #0x0 pop {r4, pc} @@ -751,12 +751,12 @@ FUN_02013194: ; 0x02013194 add r7, r3, #0x0 cmp r0, #0x0 bne _020131A8 - bl ErrorHandling + bl GF_AssertFail _020131A8: ldr r0, [r5, #0x4] cmp r0, #0x0 beq _020131B2 - bl ErrorHandling + bl GF_AssertFail _020131B2: add r0, r5, #0x0 add r0, #0xd8 @@ -870,13 +870,13 @@ FUN_0201327C: ; 0x0201327C push {r4, lr} add r4, r0, #0x0 bne _02013286 - bl ErrorHandling + bl GF_AssertFail _02013286: ldr r0, _020132B8 ; =UNK_021C4850 ldr r0, [r0, #0x0] cmp r0, #0x0 bne _02013292 - bl ErrorHandling + bl GF_AssertFail _02013292: ldr r0, _020132B8 ; =UNK_021C4850 mov r1, #0x0 @@ -895,7 +895,7 @@ _020132A8: add r2, r2, #0x4 cmp r1, #0x10 blt _0201329A - bl ErrorHandling + bl GF_AssertFail pop {r4, pc} nop _020132B8: .word UNK_021C4850 @@ -905,13 +905,13 @@ FUN_020132BC: ; 0x020132BC push {r4, lr} add r4, r0, #0x0 bne _020132C6 - bl ErrorHandling + bl GF_AssertFail _020132C6: ldr r0, _020132FC ; =UNK_021C4850 ldr r0, [r0, #0x0] cmp r0, #0x0 bne _020132D2 - bl ErrorHandling + bl GF_AssertFail _020132D2: ldr r0, _020132FC ; =UNK_021C4850 mov r1, #0x0 @@ -933,7 +933,7 @@ _020132EE: add r2, r2, #0x4 cmp r1, #0x10 blt _020132DA - bl ErrorHandling + bl GF_AssertFail pop {r4, pc} .balign 4 _020132FC: .word UNK_021C4850 @@ -1516,7 +1516,7 @@ DestroyListMenuCursorObj: ; 0x020136C0 push {r4, lr} add r4, r0, #0x0 bne _020136CA - bl ErrorHandling + bl GF_AssertFail _020136CA: cmp r4, #0x0 beq _020136DE @@ -1537,7 +1537,7 @@ ListMenuCursorSetColor: ; 0x020136E0 add r4, r1, #0x0 cmp r5, #0x0 bne _020136EE - bl ErrorHandling + bl GF_AssertFail _020136EE: cmp r5, #0x0 beq _020136F4 diff --git a/arm9/asm/unk_02013CD4.s b/arm9/asm/unk_02013CD4.s index 330a8c95..8b846678 100644 --- a/arm9/asm/unk_02013CD4.s +++ b/arm9/asm/unk_02013CD4.s @@ -18,7 +18,7 @@ FUN_02013CD4: ; 0x02013CD4 bl AllocFromHeap add r4, r0, #0x0 bne _02013CE8 - bl ErrorHandling + bl GF_AssertFail _02013CE8: ldr r0, [r5, #0x0] ldr r1, [r5, #0xc] @@ -47,22 +47,22 @@ FUN_02013D18: ; 0x02013D18 push {r4, lr} add r4, r0, #0x0 bne _02013D22 - bl ErrorHandling + bl GF_AssertFail _02013D22: ldr r0, [r4, #0x0] cmp r0, #0x0 bne _02013D2C - bl ErrorHandling + bl GF_AssertFail _02013D2C: ldr r0, [r4, #0x8] cmp r0, #0x0 bne _02013D36 - bl ErrorHandling + bl GF_AssertFail _02013D36: ldr r0, [r4, #0x10] cmp r0, #0x0 bne _02013D40 - bl ErrorHandling + bl GF_AssertFail _02013D40: ldr r0, [r4, #0x0] bl FreeToHeap @@ -116,20 +116,20 @@ FUN_02013D98: ; 0x02013D98 bl FUN_02014024 add r4, r0, #0x0 bne _02013DAA - bl ErrorHandling + bl GF_AssertFail _02013DAA: ldr r0, [r5, #0x4] ldr r0, [r0, #0x8] cmp r0, #0x0 beq _02013DB6 - bl ErrorHandling + bl GF_AssertFail _02013DB6: ldr r0, [r5, #0x4] bl FUN_0201407C str r0, [r4, #0x0] cmp r0, #0x0 bne _02013DC6 - bl ErrorHandling + bl GF_AssertFail _02013DC6: ldr r0, [r5, #0x4] ldr r1, [r4, #0x0] @@ -185,14 +185,14 @@ FUN_02013E14: ; 0x02013E14 bl FUN_02014050 add r4, r0, #0x0 bne _02013E26 - bl ErrorHandling + bl GF_AssertFail _02013E26: ldr r0, [r5, #0x8] bl FUN_02014090 str r0, [r4, #0x0] cmp r0, #0x0 bne _02013E36 - bl ErrorHandling + bl GF_AssertFail _02013E36: ldr r0, [r5, #0x4] ldr r1, [r4, #0x0] @@ -248,7 +248,7 @@ FUN_02013E84: ; 0x02013E84 bl FUN_02013FF8 add r4, r0, #0x0 bne _02013E96 - bl ErrorHandling + bl GF_AssertFail _02013E96: add r0, r4, #0x0 add r1, r5, #0x0 @@ -273,7 +273,7 @@ FUN_02013EB0: ; 0x02013EB0 add r4, r1, #0x0 cmp r5, #0x0 bne _02013EBE - bl ErrorHandling + bl GF_AssertFail _02013EBE: str r4, [r5, #0x20] pop {r3-r5, pc} @@ -426,7 +426,7 @@ FUN_02013F68: ; 0x02013F68 bl AllocFromHeap add r7, r0, #0x0 bne _02013F7C - bl ErrorHandling + bl GF_AssertFail _02013F7C: mov r4, #0x0 cmp r6, #0x0 @@ -454,7 +454,7 @@ FUN_02013F98: ; 0x02013F98 bl AllocFromHeap add r7, r0, #0x0 bne _02013FAE - bl ErrorHandling + bl GF_AssertFail _02013FAE: mov r4, #0x0 cmp r6, #0x0 @@ -481,7 +481,7 @@ FUN_02013FC8: ; 0x02013FC8 bl AllocFromHeap add r7, r0, #0x0 bne _02013FDE - bl ErrorHandling + bl GF_AssertFail _02013FDE: mov r4, #0x0 cmp r6, #0x0 diff --git a/arm9/asm/unk_02014590.s b/arm9/asm/unk_02014590.s index ae4eadbd..aa2f249b 100644 --- a/arm9/asm/unk_02014590.s +++ b/arm9/asm/unk_02014590.s @@ -129,7 +129,7 @@ FUN_0201466C: ; 0x0201466C lsr r0, r0, #0x1c cmp r0, #0x1 beq _02014680 - bl ErrorHandling + bl GF_AssertFail _02014680: add r0, r4, #0x0 add r0, #0x9a diff --git a/arm9/asm/unk_02014BF4.s b/arm9/asm/unk_02014BF4.s index a8205c88..566b8514 100644 --- a/arm9/asm/unk_02014BF4.s +++ b/arm9/asm/unk_02014BF4.s @@ -116,7 +116,7 @@ FUN_02014C3C: ; 0x02014C3C add r4, r0, #0x0 cmp r4, #0x19 blo _02014C48 - bl ErrorHandling + bl GF_AssertFail _02014C48: ldr r0, _02014C50 ; =UNK_020ED64C ldrb r0, [r0, r4] @@ -140,7 +140,7 @@ FUN_02014C54: ; 0x02014C54 str r2, [sp, #0x0] cmp r0, r1 blo _02014C74 - bl ErrorHandling + bl GF_AssertFail _02014C74: ldr r0, [sp, #0x4] mov r1, #0x1d @@ -152,7 +152,7 @@ _02014C74: ldr r0, [r0, #0x10] cmp r0, #0x0 beq _02014C8C - bl ErrorHandling + bl GF_AssertFail _02014C8C: ldr r0, [r5, #0x0] mov r2, #0x1d @@ -280,7 +280,7 @@ FUN_02014D7C: ; 0x02014D7C add r4, r1, #0x0 cmp r4, r0 blo _02014D8C - bl ErrorHandling + bl GF_AssertFail _02014D8C: mov r0, #0x1d lsl r0, r0, #0x4 @@ -440,7 +440,7 @@ _02014EA0: ldr r0, [r0, #0x0] cmp r0, #0x22 blo _02014EB2 - bl ErrorHandling + bl GF_AssertFail _02014EB2: ldr r1, [r5, #0xc] add r0, r5, #0x0 @@ -472,7 +472,7 @@ _02014EE6: lsl r0, r0, #0x8 cmp r1, r0 blt _02014EA0 - bl ErrorHandling + bl GF_AssertFail mov r0, #0x1 str r0, [r5, #0x1c] _02014EF8: @@ -489,7 +489,7 @@ FUN_02014F08: ; 0x02014F08 ldr r4, [r0, r1] cmp r2, #0x1 beq _02014F16 - bl ErrorHandling + bl GF_AssertFail _02014F16: add r0, r4, #0x0 pop {r4, pc} @@ -546,7 +546,7 @@ _02014F68: lsr r3, r1, #0x18 cmp r3, #0x4 blo _02014F3E - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3-r5, pc} nop @@ -589,7 +589,7 @@ FUN_02014FA8: ; 0x02014FA8 ldrb r0, [r4, #0x0] cmp r0, #0x8 blo _02014FC4 - bl ErrorHandling + bl GF_AssertFail _02014FC4: pop {r4, pc} .balign 4 @@ -658,7 +658,7 @@ _0201501C: str r0, [r6, #0x0] pop {r3-r6, pc} _02015048: - bl ErrorHandling + bl GF_AssertFail add sp, #0x4 pop {r3-r6, pc} @@ -700,7 +700,7 @@ _02015082: str r0, [r4, #0x0] b _020150A2 _0201509E: - bl ErrorHandling + bl GF_AssertFail _020150A2: add r0, sp, #0x0 ldrb r0, [r0, #0x0] @@ -727,7 +727,7 @@ _020150B6: str r0, [r6, #0x0] pop {r3-r6, pc} _020150D4: - bl ErrorHandling + bl GF_AssertFail add sp, #0x4 pop {r3-r6, pc} @@ -772,7 +772,7 @@ _02015112: str r0, [r6, #0x0] b _02015132 _0201512E: - bl ErrorHandling + bl GF_AssertFail _02015132: add r0, r5, #0x0 add r1, sp, #0x0 @@ -800,7 +800,7 @@ _0201514C: str r0, [sp, #0x4] b _0201516C _02015168: - bl ErrorHandling + bl GF_AssertFail _0201516C: ldr r0, [sp, #0x4] add r0, r7, r0 @@ -1071,7 +1071,7 @@ _02015334: str r0, [sp, #0x8] b _02015362 _0201535E: - bl ErrorHandling + bl GF_AssertFail _02015362: add r1, sp, #0x0 add r0, r5, #0x0 @@ -1081,7 +1081,7 @@ _02015362: ldrb r0, [r0, #0x1] cmp r0, #0x11 bls _02015378 - bl ErrorHandling + bl GF_AssertFail _02015378: add r0, sp, #0xc add r1, sp, #0x8 @@ -1119,7 +1119,7 @@ _020153A6: str r0, [sp, #0x4] b _020153CA _020153C6: - bl ErrorHandling + bl GF_AssertFail _020153CA: add r0, sp, #0x0 ldrb r1, [r0, #0x1] @@ -1160,7 +1160,7 @@ FUN_02015404: ; 0x02015404 ldr r0, [r4, #0x50] cmp r0, #0x0 beq _02015412 - bl ErrorHandling + bl GF_AssertFail _02015412: ldr r0, [r4, #0xc] add r0, r0, #0x4 @@ -1269,7 +1269,7 @@ _020154C4: str r0, [sp, #0x4] b _020154E4 _020154E0: - bl ErrorHandling + bl GF_AssertFail _020154E4: add r0, r4, #0x0 add r1, sp, #0x0 @@ -1294,7 +1294,7 @@ _02015502: add sp, #0xc pop {r3-r4, pc} _02015514: - bl ErrorHandling + bl GF_AssertFail add sp, #0xc pop {r3-r4, pc} @@ -1387,7 +1387,7 @@ _020155B4: str r0, [r4, #0x64] pop {r3-r4, pc} _020155C6: - bl ErrorHandling + bl GF_AssertFail add sp, #0x4 pop {r3-r4, pc} .balign 4 @@ -1429,7 +1429,7 @@ _02015600: str r0, [r4, #0x64] pop {r3-r4, pc} _02015616: - bl ErrorHandling + bl GF_AssertFail add sp, #0x4 pop {r3-r4, pc} .balign 4 @@ -1486,7 +1486,7 @@ _0201566E: add r4, #0x78 b _0201567C _02015678: - bl ErrorHandling + bl GF_AssertFail _0201567C: add r1, sp, #0x0 add r0, r5, #0x0 @@ -1515,7 +1515,7 @@ _02015698: str r0, [sp, #0x4] b _020156B8 _020156B4: - bl ErrorHandling + bl GF_AssertFail _020156B8: add r0, r5, #0x0 add r1, sp, #0x0 @@ -1538,7 +1538,7 @@ _020156D0: str r0, [r4, #0x0] pop {r3-r5, pc} _020156E0: - bl ErrorHandling + bl GF_AssertFail add sp, #0x8 pop {r3-r5, pc} @@ -1626,7 +1626,7 @@ _02015778: _0201578A: cmp r0, #0x1c beq _02015792 - bl ErrorHandling + bl GF_AssertFail _02015792: pop {r4, pc} .balign 4 @@ -1673,7 +1673,7 @@ _020157D2: str r0, [r4, #0x6c] pop {r3-r4, pc} _020157E2: - bl ErrorHandling + bl GF_AssertFail add sp, #0x4 pop {r3-r4, pc} .balign 4 @@ -1771,7 +1771,7 @@ _02015886: _02015890: cmp r1, #0x0 bne _02015898 - bl ErrorHandling + bl GF_AssertFail _02015898: pop {r4, pc} nop @@ -1842,7 +1842,7 @@ _020158F6: str r0, [r3, #0x0] pop {r3, pc} _02015904: - bl ErrorHandling + bl GF_AssertFail pop {r3, pc} .balign 4 @@ -1915,7 +1915,7 @@ _02015972: str r0, [r1, #0x30] pop {r3, pc} _02015984: - bl ErrorHandling + bl GF_AssertFail pop {r3, pc} .balign 4 @@ -2080,7 +2080,7 @@ _02015AA6: str r1, [r0, #0x0] b _02015AC4 _02015AC0: - bl ErrorHandling + bl GF_AssertFail _02015AC4: add r0, r4, #0x0 add r0, #0x2c @@ -2183,7 +2183,7 @@ _02015B64: str r1, [r0, #0x0] b _02015B82 _02015B7E: - bl ErrorHandling + bl GF_AssertFail _02015B82: add r0, r4, #0x0 add r0, #0x2c @@ -2340,7 +2340,7 @@ _02015C90: str r0, [r4, #0x0] b _02015CA4 _02015CA0: - bl ErrorHandling + bl GF_AssertFail _02015CA4: add r0, r4, #0x0 add r0, #0x2c diff --git a/arm9/asm/unk_0201B1A8.s b/arm9/asm/unk_0201B1A8.s index 28308d53..359f9bfe 100644 --- a/arm9/asm/unk_0201B1A8.s +++ b/arm9/asm/unk_0201B1A8.s @@ -94,7 +94,7 @@ FUN_0201B234: ; 0x0201B234 bl FUN_0201B1E4 cmp r4, #0x0 bne _0201B24A - bl ErrorHandling + bl GF_AssertFail _0201B24A: ldr r1, [r4, #0x0] add r0, r5, #0x0 @@ -367,7 +367,7 @@ _0201B452: blx r1 cmp r0, #0x0 beq _0201B468 - bl ErrorHandling + bl GF_AssertFail _0201B468: add sp, #0x10 mov r0, #0x0 @@ -382,7 +382,7 @@ _0201B46E: blx r1 cmp r0, #0x0 beq _0201B484 - bl ErrorHandling + bl GF_AssertFail _0201B484: add sp, #0x10 mov r0, #0x0 @@ -397,7 +397,7 @@ _0201B48A: blx r1 cmp r0, #0x0 beq _0201B4A0 - bl ErrorHandling + bl GF_AssertFail _0201B4A0: add sp, #0x10 mov r0, #0x0 diff --git a/arm9/asm/unk_0201B4E8.s b/arm9/asm/unk_0201B4E8.s index 4309da51..42074f95 100644 --- a/arm9/asm/unk_0201B4E8.s +++ b/arm9/asm/unk_0201B4E8.s @@ -103,7 +103,7 @@ FUN_0201B580: ; 0x0201B580 add r5, r0, #0x0 add r4, r1, #0x0 bne _0201B58C - bl ErrorHandling + bl GF_AssertFail _0201B58C: add r1, r4, #0x0 add r1, #0x34 diff --git a/arm9/asm/unk_0201C24C.s b/arm9/asm/unk_0201C24C.s index 9e5cd227..b0c55e93 100644 --- a/arm9/asm/unk_0201C24C.s +++ b/arm9/asm/unk_0201C24C.s @@ -18,7 +18,7 @@ FUN_0201C24C: ; 0x0201C24C ldr r0, [r0, #0x0] cmp r0, #0x0 beq _0201C25E - bl ErrorHandling + bl GF_AssertFail _0201C25E: add r0, r4, #0x0 mov r1, #0xc @@ -27,7 +27,7 @@ _0201C25E: cmp r0, #0x0 str r0, [r1, #0x0] bne _0201C272 - bl ErrorHandling + bl GF_AssertFail _0201C272: add r0, r4, #0x0 lsl r1, r5, #0x4 @@ -55,7 +55,7 @@ FUN_0201C29C: ; 0x0201C29C ldr r0, [r0, #0x0] cmp r0, #0x0 bne _0201C2AA - bl ErrorHandling + bl GF_AssertFail _0201C2AA: ldr r0, _0201C2C4 ; =UNK_021C5934 ldr r0, [r0, #0x0] @@ -82,7 +82,7 @@ FUN_0201C2C8: ; 0x0201C2C8 add r7, r3, #0x0 cmp r0, #0x0 bne _0201C2DE - bl ErrorHandling + bl GF_AssertFail _0201C2DE: ldr r1, _0201C308 ; =UNK_021C5934 ldr r0, [r1, #0x0] @@ -94,7 +94,7 @@ _0201C2DE: ldr r0, [r0, #0x0] cmp r1, r0 blo _0201C2FA - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3-r7, pc} _0201C2FA: diff --git a/arm9/asm/unk_0201CC08.s b/arm9/asm/unk_0201CC08.s index c35c4b23..15457b23 100644 --- a/arm9/asm/unk_0201CC08.s +++ b/arm9/asm/unk_0201CC08.s @@ -26,7 +26,7 @@ FUN_0201CC08: ; 0x0201CC08 ldrh r0, [r0, #0x1a] cmp r0, #0x0 beq _0201CC16 - bl ErrorHandling + bl GF_AssertFail _0201CC16: ldr r0, _0201CC20 ; =UNK_021C5978 mov r1, #0x0 @@ -45,7 +45,7 @@ FUN_0201CC24: ; 0x0201CC24 ldrh r0, [r0, #0x1a] cmp r0, #0x0 beq _0201CC36 - bl ErrorHandling + bl GF_AssertFail _0201CC36: cmp r4, #0x5 bhs _0201CC3E @@ -168,7 +168,7 @@ FUN_0201CD04: ; 0x0201CD04 ldrh r0, [r0, #0x1a] cmp r0, #0x0 beq _0201CD14 - bl ErrorHandling + bl GF_AssertFail _0201CD14: bl FUN_0201CCC0 add r4, r0, #0x0 @@ -199,7 +199,7 @@ FUN_0201CD38: ; 0x0201CD38 mov r5, #0x3 cmp r0, #0x0 beq _0201CD4E - bl ErrorHandling + bl GF_AssertFail _0201CD4E: ldr r0, _0201CD8C ; =UNK_021C5978 ldrh r0, [r0, #0x18] @@ -285,7 +285,7 @@ FUN_0201CDD0: ; 0x0201CDD0 bl FUN_0201CE2C cmp r0, #0x1 beq _0201CDF2 - bl ErrorHandling + bl GF_AssertFail _0201CDF2: ldr r0, _0201CDFC ; =UNK_021C5978 mov r1, #0x0 @@ -309,7 +309,7 @@ FUN_0201CE04: ; 0x0201CE04 bl FUN_0201CCC0 cmp r0, #0x1 beq _0201CE20 - bl ErrorHandling + bl GF_AssertFail _0201CE20: ldr r0, _0201CE28 ; =UNK_021C5978 mov r1, #0x1 diff --git a/arm9/asm/unk_0201D040.s b/arm9/asm/unk_0201D040.s index ab0c07c9..b41b069c 100644 --- a/arm9/asm/unk_0201D040.s +++ b/arm9/asm/unk_0201D040.s @@ -230,12 +230,12 @@ FUN_0201D1F8: ; 0x0201D1F8 bl FUN_0201D2AC cmp r0, #0x1 bne _0201D20A - bl ErrorHandling + bl GF_AssertFail _0201D20A: bl FUN_0201DAAC add r4, r0, #0x0 bne _0201D21A - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3-r5, pc} _0201D21A: @@ -274,12 +274,12 @@ FUN_0201D250: ; 0x0201D250 bl FUN_0201D2AC cmp r0, #0x1 bne _0201D262 - bl ErrorHandling + bl GF_AssertFail _0201D262: bl FUN_0201DAAC add r4, r0, #0x0 bne _0201D272 - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3-r5, pc} _0201D272: @@ -348,13 +348,13 @@ FUN_0201D2DC: ; 0x0201D2DC add r4, r0, #0x0 add r5, r1, #0x0 bne _0201D2E8 - bl ErrorHandling + bl GF_AssertFail _0201D2E8: add r0, r4, #0x0 bl FUN_0201D7F8 add r4, r0, #0x0 bne _0201D2F6 - bl ErrorHandling + bl GF_AssertFail _0201D2F6: str r5, [r4, #0x0] ldr r1, [r4, #0x4] @@ -391,7 +391,7 @@ _0201D32C: bl FUN_0201D7F8 add r4, r0, #0x0 bne _0201D33A - bl ErrorHandling + bl GF_AssertFail _0201D33A: add r0, r4, #0x0 add r0, #0x3c @@ -465,7 +465,7 @@ FUN_0201D3B0: ; 0x0201D3B0 bl FUN_0201D7F8 add r4, r0, #0x0 bne _0201D3BE - bl ErrorHandling + bl GF_AssertFail _0201D3BE: add r0, r4, #0x0 add r0, #0x3c @@ -488,7 +488,7 @@ FUN_0201D3D4: ; 0x0201D3D4 bl FUN_0201D7F8 add r4, r0, #0x0 bne _0201D3E6 - bl ErrorHandling + bl GF_AssertFail _0201D3E6: add r0, r4, #0x0 add r0, #0x3c @@ -553,12 +553,12 @@ FUN_0201D458: ; 0x0201D458 bl FUN_0201D6D8 add r4, r0, #0x0 bne _0201D468 - bl ErrorHandling + bl GF_AssertFail _0201D468: bl FUN_0201DAAC add r5, r0, #0x0 bne _0201D474 - bl ErrorHandling + bl GF_AssertFail _0201D474: add r0, r4, #0x0 add r0, #0x3c @@ -818,7 +818,7 @@ FUN_0201D658: ; 0x0201D658 ldr r0, [r0, #0x0] cmp r0, #0x0 bne _0201D666 - bl ErrorHandling + bl GF_AssertFail _0201D666: ldr r1, _0201D670 ; =UNK_021C5994 mov r2, #0x0 @@ -836,7 +836,7 @@ FUN_0201D674: ; 0x0201D674 ldr r0, [r0, #0x0] cmp r0, #0x0 beq _0201D684 - bl ErrorHandling + bl GF_AssertFail _0201D684: ldr r0, _0201D68C ; =UNK_021C5994 str r4, [r0, #0x0] @@ -1145,7 +1145,7 @@ FUN_0201D86C: ; 0x0201D86C str r0, [r4, #0x0] cmp r0, r1 bne _0201D8B8 - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3-r7, pc} _0201D8B8: @@ -1179,7 +1179,7 @@ _0201D8C4: str r0, [r6, #0x0] cmp r0, r1 bne _0201D902 - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3-r7, pc} _0201D902: @@ -1613,7 +1613,7 @@ _0201DBD6: _0201DC12: cmp r2, #0x0 bne _0201DC1A - bl ErrorHandling + bl GF_AssertFail _0201DC1A: ldr r0, _0201DC38 ; =UNK_021C5994 mov r2, #0x0 @@ -1628,7 +1628,7 @@ _0201DC1A: _0201DC2E: cmp r2, #0x0 bne _0201DC36 - bl ErrorHandling + bl GF_AssertFail _0201DC36: pop {r3, pc} .balign 4 @@ -1783,7 +1783,7 @@ _0201DD32: ldrb r1, [r4, r1] tst r0, r1 beq _0201DD54 - bl ErrorHandling + bl GF_AssertFail _0201DD54: add r2, sp, #0x0 ldrb r3, [r2, #0x0] @@ -1901,7 +1901,7 @@ _0201DE0E: ldrb r1, [r4, r1] tst r0, r1 bne _0201DE2A - bl ErrorHandling + bl GF_AssertFail _0201DE2A: ldrb r0, [r7, #0x0] mov r1, #0x1 @@ -2077,7 +2077,7 @@ FUN_0201DF44: ; 0x0201DF44 add r3, r6, r5 cmp r3, r2 bls _0201DF6C - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 b _0201DF6E _0201DF6C: @@ -2093,7 +2093,7 @@ _0201DF6E: add r2, r3, r5 cmp r2, r1 bls _0201DF8A - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3-r7, pc} _0201DF8A: diff --git a/arm9/asm/unk_0201E00C.s b/arm9/asm/unk_0201E00C.s index ae49b439..d46fd5e0 100644 --- a/arm9/asm/unk_0201E00C.s +++ b/arm9/asm/unk_0201E00C.s @@ -134,7 +134,7 @@ FUN_0201E0E4: ; 0x0201E0E4 bl FUN_0201E428 add r4, r0, #0x0 bne _0201E0F8 - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3-r5, pc} _0201E0F8: @@ -168,7 +168,7 @@ FUN_0201E128: ; 0x0201E128 bl FUN_0201E428 add r4, r0, #0x0 bne _0201E13C - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3-r5, pc} _0201E13C: @@ -200,13 +200,13 @@ FUN_0201E168: ; 0x0201E168 add r4, r0, #0x0 add r5, r1, #0x0 bne _0201E174 - bl ErrorHandling + bl GF_AssertFail _0201E174: add r0, r4, #0x0 bl FUN_0201E3F0 add r4, r0, #0x0 bne _0201E182 - bl ErrorHandling + bl GF_AssertFail _0201E182: str r5, [r4, #0x0] ldr r1, [r4, #0x4] @@ -253,7 +253,7 @@ FUN_0201E1C8: ; 0x0201E1C8 bl FUN_0201E3F0 add r4, r0, #0x0 bne _0201E1D6 - bl ErrorHandling + bl GF_AssertFail _0201E1D6: add r0, r4, #0x0 add r0, #0x2c @@ -310,7 +310,7 @@ FUN_0201E230: ; 0x0201E230 cmp r0, #0x0 bne _0201E244 bne _0201E240 - bl ErrorHandling + bl GF_AssertFail _0201E240: mov r0, #0x0 pop {r3, pc} @@ -335,7 +335,7 @@ FUN_0201E258: ; 0x0201E258 cmp r0, #0x0 bne _0201E26E bne _0201E26A - bl ErrorHandling + bl GF_AssertFail _0201E26A: mov r0, #0x0 pop {r4, pc} @@ -405,7 +405,7 @@ FUN_0201E2C4: ; 0x0201E2C4 bl FUN_0201E1B4 cmp r0, #0x1 bne _0201E2E0 - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3-r5, pc} _0201E2E0: @@ -490,7 +490,7 @@ FUN_0201E36C: ; 0x0201E36C ldr r0, [r0, #0x4] cmp r0, #0x0 beq _0201E37C - bl ErrorHandling + bl GF_AssertFail _0201E37C: ldr r1, [r5, #0x4] mov r0, #0x1 @@ -868,7 +868,7 @@ FUN_0201E5F4: ; 0x0201E5F4 add r2, r1, r2 cmp r2, r3 bls _0201E618 - bl ErrorHandling + bl GF_AssertFail bl FUN_0201E0B8 mov r0, #0x0 b _0201E61A @@ -885,7 +885,7 @@ _0201E61A: ldr r1, [sp, #0x10] cmp r2, r1 bls _0201E63A - bl ErrorHandling + bl GF_AssertFail bl FUN_0201E0B8 mov r0, #0x0 pop {r3-r5, pc} diff --git a/arm9/asm/unk_0201E7D8.s b/arm9/asm/unk_0201E7D8.s index 32f01a13..43dcd254 100644 --- a/arm9/asm/unk_0201E7D8.s +++ b/arm9/asm/unk_0201E7D8.s @@ -415,7 +415,7 @@ FUN_0201EABC: ; 0x0201EABC add r0, r7, #0x1 cmp r0, r5 ble _0201EADA - bl ErrorHandling + bl GF_AssertFail _0201EADA: ldr r0, [sp, #0x0] mov r1, #0x24 diff --git a/arm9/asm/unk_0201F06C.s b/arm9/asm/unk_0201F06C.s index 84b32634..03e1404e 100644 --- a/arm9/asm/unk_0201F06C.s +++ b/arm9/asm/unk_0201F06C.s @@ -121,7 +121,7 @@ FUN_0201F100: ; 0x0201F100 ldr r0, [r0, #0x0] cmp r0, #0x0 beq _0201F112 - bl ErrorHandling + bl GF_AssertFail _0201F112: mov r1, #0xd4 add r0, r4, #0x0 @@ -219,7 +219,7 @@ FUN_0201F1B4: ; 0x0201F1B4 bl FUN_0201F2E4 add r4, r0, #0x0 bne _0201F1C8 - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3-r5, pc} _0201F1C8: @@ -280,7 +280,7 @@ FUN_0201F23C: ; 0x0201F23C push {r4, lr} add r4, r0, #0x0 bne _0201F24A - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r4, pc} _0201F24A: @@ -315,7 +315,7 @@ FUN_0201F284: ; 0x0201F284 cmp r0, #0x0 bne _0201F294 bne _0201F290 - bl ErrorHandling + bl GF_AssertFail _0201F290: mov r0, #0x0 pop {r3-r5, pc} @@ -349,7 +349,7 @@ FUN_0201F2C0: ; 0x0201F2C0 push {r4, lr} add r4, r0, #0x0 bne _0201F2CA - bl ErrorHandling + bl GF_AssertFail _0201F2CA: ldrb r0, [r4, #0x3] cmp r0, #0x0 @@ -407,7 +407,7 @@ FUN_0201F318: ; 0x0201F318 sub sp, #0x24 add r5, r0, #0x0 bne _0201F324 - bl ErrorHandling + bl GF_AssertFail _0201F324: add r0, sp, #0x0 bl MTX_Identity33_ @@ -588,7 +588,7 @@ FUN_0201F454: ; 0x0201F454 str r0, [r4, #0x0] cmp r0, #0x0 bne _0201F496 - bl ErrorHandling + bl GF_AssertFail b _0201F496 _0201F492: mov r0, #0x0 @@ -605,7 +605,7 @@ _0201F496: str r0, [r6, #0x0] cmp r0, #0x0 bne _0201F4B6 - bl ErrorHandling + bl GF_AssertFail b _0201F4B6 _0201F4B2: mov r0, #0x0 @@ -625,7 +625,7 @@ _0201F4B6: str r0, [r7, #0x0] cmp r0, #0x0 bne _0201F4DE - bl ErrorHandling + bl GF_AssertFail add sp, #0xc pop {r4-r7, pc} _0201F4DA: @@ -962,14 +962,14 @@ FUN_0201F744: ; 0x0201F744 push {r3-r5, lr} add r5, r0, #0x0 bne _0201F74E - bl ErrorHandling + bl GF_AssertFail _0201F74E: add r0, r5, #0x0 add r0, #0xa8 ldrb r0, [r0, #0x0] cmp r0, #0x1 bne _0201F75C - bl ErrorHandling + bl GF_AssertFail _0201F75C: add r0, r5, #0x0 add r0, #0xa8 @@ -1034,7 +1034,7 @@ FUN_0201F7C8: ; 0x0201F7C8 add r5, r1, #0x0 cmp r4, #0x0 bne _0201F7D6 - bl ErrorHandling + bl GF_AssertFail _0201F7D6: ldmia r5!, {r0-r1} stmia r4!, {r0-r1} @@ -1047,7 +1047,7 @@ FUN_0201F7E0: ; 0x0201F7E0 push {r4, lr} add r4, r0, #0x0 bne _0201F7EA - bl ErrorHandling + bl GF_AssertFail _0201F7EA: add r0, r4, #0x0 pop {r4, pc} @@ -1060,7 +1060,7 @@ FUN_0201F7F0: ; 0x0201F7F0 add r5, r1, #0x0 cmp r4, #0x0 bne _0201F7FE - bl ErrorHandling + bl GF_AssertFail _0201F7FE: ldmia r5!, {r0-r1} add r4, #0xc @@ -1077,7 +1077,7 @@ FUN_0201F80C: ; 0x0201F80C add r4, r1, #0x0 cmp r5, #0x0 bne _0201F81A - bl ErrorHandling + bl GF_AssertFail _0201F81A: strb r4, [r5, #0x18] pop {r3-r5, pc} @@ -1088,7 +1088,7 @@ FUN_0201F820: ; 0x0201F820 push {r4, lr} add r4, r0, #0x0 bne _0201F82A - bl ErrorHandling + bl GF_AssertFail _0201F82A: ldrb r0, [r4, #0x18] pop {r4, pc} @@ -1101,7 +1101,7 @@ FUN_0201F830: ; 0x0201F830 add r4, r1, #0x0 cmp r5, #0x0 bne _0201F83E - bl ErrorHandling + bl GF_AssertFail _0201F83E: add r5, #0xaa strh r4, [r5, #0x0] @@ -1112,7 +1112,7 @@ FUN_0201F844: ; 0x0201F844 push {r4, lr} add r4, r0, #0x0 bne _0201F84E - bl ErrorHandling + bl GF_AssertFail _0201F84E: add r4, #0xaa ldrh r0, [r4, #0x0] @@ -1125,7 +1125,7 @@ FUN_0201F854: ; 0x0201F854 add r4, r1, #0x0 cmp r5, #0x0 bne _0201F862 - bl ErrorHandling + bl GF_AssertFail _0201F862: add r0, r5, #0x0 add r1, r4, #0x0 @@ -1139,7 +1139,7 @@ FUN_0201F86C: ; 0x0201F86C add r4, r1, #0x0 cmp r5, #0x0 bne _0201F87A - bl ErrorHandling + bl GF_AssertFail _0201F87A: add r5, #0xac str r4, [r5, #0x0] @@ -1150,7 +1150,7 @@ FUN_0201F880: ; 0x0201F880 push {r4, lr} add r4, r0, #0x0 bne _0201F88A - bl ErrorHandling + bl GF_AssertFail _0201F88A: add r4, #0xac ldr r0, [r4, #0x0] @@ -1163,7 +1163,7 @@ FUN_0201F890: ; 0x0201F890 add r4, r1, #0x0 cmp r5, #0x0 bne _0201F89E - bl ErrorHandling + bl GF_AssertFail _0201F89E: add r1, r5, #0x0 add r1, #0xaa @@ -1187,7 +1187,7 @@ FUN_0201F8C0: ; 0x0201F8C0 push {r4, lr} add r4, r0, #0x0 bne _0201F8CA - bl ErrorHandling + bl GF_AssertFail _0201F8CA: add r1, r4, #0x0 add r1, #0xaa @@ -1205,7 +1205,7 @@ FUN_0201F8E0: ; 0x0201F8E0 push {r4, lr} add r4, r0, #0x0 bne _0201F8EA - bl ErrorHandling + bl GF_AssertFail _0201F8EA: ldr r0, [r4, #0x7c] pop {r4, pc} @@ -1346,7 +1346,7 @@ _0201F9C4: ldr r0, _0201FA00 ; =0x0000FFFF cmp r1, r0 bls _0201F9EC - bl ErrorHandling + bl GF_AssertFail _0201F9EC: ldr r0, [r5, #0x14] add r4, r4, #0x1 @@ -1449,7 +1449,7 @@ _0201FA7C: ldr r0, _0201FAB8 ; =0x00001FFF cmp r1, r0 bls _0201FAA4 - bl ErrorHandling + bl GF_AssertFail _0201FAA4: ldrh r0, [r5, #0x1c] add r4, r4, #0x1 @@ -1765,12 +1765,12 @@ FUN_0201FCB0: ; 0x0201FCB0 push {r3-r5, lr} add r5, r0, #0x0 bne _0201FCBA - bl ErrorHandling + bl GF_AssertFail _0201FCBA: ldr r0, [r5, #0x4] cmp r0, #0x0 bne _0201FCC4 - bl ErrorHandling + bl GF_AssertFail _0201FCC4: mov r1, #0x49 ldr r0, [r5, #0x8] @@ -1778,7 +1778,7 @@ _0201FCC4: bl AllocFromHeap add r4, r0, #0x0 bne _0201FCD6 - bl ErrorHandling + bl GF_AssertFail _0201FCD6: add r0, r4, #0x0 bl FUN_0201FE44 @@ -1791,7 +1791,7 @@ _0201FCD6: str r0, [r4, #0x0] cmp r0, #0x0 bne _0201FCF4 - bl ErrorHandling + bl GF_AssertFail _0201FCF4: ldr r0, [r5, #0x0] str r0, [r4, #0x4] @@ -1802,7 +1802,7 @@ _0201FCF4: str r0, [r4, #0x8] cmp r0, #0x0 bne _0201FD0C - bl ErrorHandling + bl GF_AssertFail _0201FD0C: add r0, r4, #0x0 bl FUN_0202083C @@ -1927,7 +1927,7 @@ FUN_0201FDEC: ; 0x0201FDEC push {r3-r7, lr} add r5, r0, #0x0 bne _0201FDF6 - bl ErrorHandling + bl GF_AssertFail _0201FDF6: mov r0, #0x12 lsl r0, r0, #0x4 @@ -2296,11 +2296,11 @@ FUN_020200A0: ; 0x020200A0 add r4, r1, #0x0 cmp r5, #0x0 bne _020200AE - bl ErrorHandling + bl GF_AssertFail _020200AE: cmp r4, #0x2 blt _020200B6 - bl ErrorHandling + bl GF_AssertFail _020200B6: add r5, #0x34 strb r4, [r5, #0x0] @@ -2313,11 +2313,11 @@ FUN_020200BC: ; 0x020200BC add r4, r1, #0x0 cmp r5, #0x0 bne _020200CA - bl ErrorHandling + bl GF_AssertFail _020200CA: cmp r4, #0x2 blt _020200D2 - bl ErrorHandling + bl GF_AssertFail _020200D2: add r5, #0x35 strb r4, [r5, #0x0] @@ -2330,7 +2330,7 @@ FUN_020200D8: ; 0x020200D8 add r4, r1, #0x0 cmp r5, #0x0 bne _020200E6 - bl ErrorHandling + bl GF_AssertFail _020200E6: str r4, [r5, #0x38] pop {r3-r5, pc} @@ -2343,7 +2343,7 @@ FUN_020200EC: ; 0x020200EC add r4, r1, #0x0 cmp r5, #0x0 bne _020200FA - bl ErrorHandling + bl GF_AssertFail _020200FA: add r5, #0x26 strb r4, [r5, #0x0] @@ -2356,7 +2356,7 @@ FUN_02020100: ; 0x02020100 add r4, r1, #0x0 cmp r5, #0x0 bne _0202010E - bl ErrorHandling + bl GF_AssertFail _0202010E: add r0, r5, #0x0 add r0, #0x27 @@ -2558,7 +2558,7 @@ FUN_02020248: ; 0x02020248 add r4, r1, #0x0 cmp r5, #0x0 bne _02020256 - bl ErrorHandling + bl GF_AssertFail _02020256: add r0, r5, #0x0 add r0, #0x29 @@ -2613,7 +2613,7 @@ FUN_020202A8: ; 0x020202A8 add r4, r1, #0x0 cmp r5, #0x0 bne _020202B6 - bl ErrorHandling + bl GF_AssertFail _020202B6: add r0, r5, #0x0 add r0, #0x2a @@ -2659,7 +2659,7 @@ FUN_02020300: ; 0x02020300 push {r4, lr} add r4, r0, #0x0 bne _0202030A - bl ErrorHandling + bl GF_AssertFail _0202030A: add r4, #0x2a ldrb r0, [r4, #0x0] @@ -2751,7 +2751,7 @@ FUN_02020388: ; 0x02020388 push {r4, lr} add r4, r0, #0x0 bne _02020392 - bl ErrorHandling + bl GF_AssertFail _02020392: ldr r0, [r4, #0x50] pop {r4, pc} @@ -2764,7 +2764,7 @@ FUN_02020398: ; 0x02020398 add r5, r1, #0x0 cmp r4, #0x0 bne _020203A6 - bl ErrorHandling + bl GF_AssertFail _020203A6: str r5, [r4, #0x30] cmp r5, #0x0 diff --git a/arm9/asm/unk_02020C44.s b/arm9/asm/unk_02020C44.s index 4c6cb725..235543ee 100644 --- a/arm9/asm/unk_02020C44.s +++ b/arm9/asm/unk_02020C44.s @@ -18,7 +18,7 @@ FUN_02020C44: ; 0x02020C44 bl AllocFromHeap add r6, r0, #0x0 bne _02020C5A - bl ErrorHandling + bl GF_AssertFail _02020C5A: add r0, r4, #0x0 lsl r1, r7, #0x3 @@ -26,7 +26,7 @@ _02020C5A: str r0, [r6, #0x0] cmp r0, #0x0 bne _02020C6C - bl ErrorHandling + bl GF_AssertFail _02020C6C: mov r4, #0x0 cmp r7, #0x0 @@ -53,7 +53,7 @@ FUN_02020C90: ; 0x02020C90 push {r4, lr} add r4, r0, #0x0 bne _02020C9A - bl ErrorHandling + bl GF_AssertFail _02020C9A: add r0, r4, #0x0 bl FUN_02020D9C @@ -71,7 +71,7 @@ FUN_02020CB0: ; 0x02020CB0 add r4, r1, #0x0 cmp r5, #0x0 bne _02020CBE - bl ErrorHandling + bl GF_AssertFail _02020CBE: add r0, r5, #0x0 add r1, r4, #0x0 @@ -93,20 +93,20 @@ FUN_02020CD4: ; 0x02020CD4 add r6, r2, #0x0 cmp r5, #0x0 bne _02020CE4 - bl ErrorHandling + bl GF_AssertFail _02020CE4: add r0, r5, #0x0 bl FUN_02020E48 add r4, r0, #0x0 bne _02020CF2 - bl ErrorHandling + bl GF_AssertFail _02020CF2: add r0, r5, #0x0 add r1, r6, #0x0 bl FUN_02020CB0 cmp r0, #0x1 beq _02020D02 - bl ErrorHandling + bl GF_AssertFail _02020D02: str r7, [r4, #0x4] str r6, [r4, #0x0] @@ -125,24 +125,24 @@ FUN_02020D10: ; 0x02020D10 str r3, [sp, #0x0] cmp r5, #0x0 bne _02020D22 - bl ErrorHandling + bl GF_AssertFail _02020D22: cmp r6, #0x0 bne _02020D2A - bl ErrorHandling + bl GF_AssertFail _02020D2A: add r0, r5, #0x0 bl FUN_02020E48 add r4, r0, #0x0 bne _02020D38 - bl ErrorHandling + bl GF_AssertFail _02020D38: add r0, r5, #0x0 add r1, r7, #0x0 bl FUN_02020CB0 cmp r0, #0x1 beq _02020D48 - bl ErrorHandling + bl GF_AssertFail _02020D48: ldr r0, [sp, #0x0] add r1, r6, #0x0 @@ -150,7 +150,7 @@ _02020D48: str r0, [r4, #0x4] cmp r0, #0x0 bne _02020D5A - bl ErrorHandling + bl GF_AssertFail _02020D5A: str r7, [r4, #0x0] ldr r0, [r5, #0x8] @@ -167,11 +167,11 @@ FUN_02020D68: ; 0x02020D68 add r4, r1, #0x0 cmp r5, #0x0 bne _02020D76 - bl ErrorHandling + bl GF_AssertFail _02020D76: cmp r4, #0x0 bne _02020D7E - bl ErrorHandling + bl GF_AssertFail _02020D7E: ldr r0, [r4, #0x4] cmp r0, #0x0 @@ -194,12 +194,12 @@ FUN_02020D9C: ; 0x02020D9C push {r3-r7, lr} add r5, r0, #0x0 bne _02020DA6 - bl ErrorHandling + bl GF_AssertFail _02020DA6: ldr r0, [r5, #0x0] cmp r0, #0x0 bne _02020DB0 - bl ErrorHandling + bl GF_AssertFail _02020DB0: ldr r0, [r5, #0x4] mov r6, #0x0 @@ -231,7 +231,7 @@ FUN_02020DD8: ; 0x02020DD8 add r4, r1, #0x0 cmp r5, #0x0 bne _02020DE6 - bl ErrorHandling + bl GF_AssertFail _02020DE6: ldr r6, [r5, #0x4] mov r1, #0x0 @@ -261,7 +261,7 @@ FUN_02020E0C: ; 0x02020E0C push {r4, lr} add r4, r0, #0x0 bne _02020E16 - bl ErrorHandling + bl GF_AssertFail _02020E16: ldr r0, [r4, #0x4] pop {r4, pc} @@ -274,7 +274,7 @@ FUN_02020E1C: ; 0x02020E1C add r4, r1, #0x0 cmp r5, #0x0 bne _02020E2A - bl ErrorHandling + bl GF_AssertFail _02020E2A: ldr r0, [r5, #0x4] cmp r0, #0x0 @@ -289,7 +289,7 @@ FUN_02020E38: ; 0x02020E38 push {r4, lr} add r4, r0, #0x0 bne _02020E42 - bl ErrorHandling + bl GF_AssertFail _02020E42: ldr r0, [r4, #0x0] pop {r4, pc} @@ -300,7 +300,7 @@ FUN_02020E48: ; 0x02020E48 push {r3-r5, lr} add r4, r0, #0x0 bne _02020E52 - bl ErrorHandling + bl GF_AssertFail _02020E52: ldr r5, [r4, #0x4] mov r2, #0x0 @@ -330,7 +330,7 @@ FUN_02020E78: ; 0x02020E78 push {r4, lr} add r4, r0, #0x0 bne _02020E82 - bl ErrorHandling + bl GF_AssertFail _02020E82: mov r0, #0x0 mvn r0, r0 @@ -380,7 +380,7 @@ FUN_02020ED4: ; 0x02020ED4 push {r4, lr} add r4, r0, #0x0 bne _02020EDE - bl ErrorHandling + bl GF_AssertFail _02020EDE: add r0, r4, #0x0 bl FUN_02021010 @@ -399,7 +399,7 @@ FUN_02020EF8: ; 0x02020EF8 add r4, r1, #0x0 cmp r5, #0x0 bne _02020F06 - bl ErrorHandling + bl GF_AssertFail _02020F06: ldr r0, [r5, #0x0] add r1, r4, #0x0 @@ -415,7 +415,7 @@ FUN_02020F10: ; 0x02020F10 str r2, [sp, #0x0] cmp r5, #0x0 bne _02020F22 - bl ErrorHandling + bl GF_AssertFail _02020F22: add r0, r5, #0x0 bl FUN_020211DC @@ -462,11 +462,11 @@ FUN_02020F6C: ; 0x02020F6C add r4, r1, #0x0 cmp r5, #0x0 bne _02020F7A - bl ErrorHandling + bl GF_AssertFail _02020F7A: cmp r4, #0x0 bne _02020F82 - bl ErrorHandling + bl GF_AssertFail _02020F82: ldrh r0, [r4, #0x16] cmp r0, #0x1 @@ -493,7 +493,7 @@ _02020FA4: blx r1 cmp r0, #0x0 beq _02020FB8 - bl ErrorHandling + bl GF_AssertFail _02020FB8: ldr r0, [r4, #0x8] cmp r0, #0x0 @@ -503,7 +503,7 @@ _02020FB8: blx r1 cmp r0, #0x0 beq _02020FCC - bl ErrorHandling + bl GF_AssertFail _02020FCC: ldr r0, [r4, #0xc] cmp r0, #0x0 @@ -513,7 +513,7 @@ _02020FCC: blx r1 cmp r0, #0x0 beq _02020FE0 - bl ErrorHandling + bl GF_AssertFail _02020FE0: add r0, r4, #0x0 bl FUN_0202120C @@ -529,7 +529,7 @@ FUN_02020FF0: ; 0x02020FF0 add r4, r1, #0x0 cmp r5, #0x0 bne _02020FFE - bl ErrorHandling + bl GF_AssertFail _02020FFE: add r0, r5, #0x0 add r1, r4, #0x0 @@ -544,12 +544,12 @@ FUN_02021010: ; 0x02021010 push {r4-r6, lr} add r5, r0, #0x0 bne _0202101A - bl ErrorHandling + bl GF_AssertFail _0202101A: ldr r0, [r5, #0x4] cmp r0, #0x0 bne _02021024 - bl ErrorHandling + bl GF_AssertFail _02021024: ldr r0, [r5, #0x0] mov r6, #0x0 @@ -583,7 +583,7 @@ FUN_02021050: ; 0x02021050 add r7, r1, #0x0 cmp r6, #0x0 bne _0202105E - bl ErrorHandling + bl GF_AssertFail _0202105E: ldr r0, [r6, #0x0] mov r4, #0x0 @@ -622,7 +622,7 @@ FUN_02021098: ; 0x02021098 push {r4, lr} add r4, r0, #0x0 bne _020210A2 - bl ErrorHandling + bl GF_AssertFail _020210A2: ldr r0, [r4, #0x0] bl FUN_02020E38 @@ -634,7 +634,7 @@ FUN_020210AC: ; 0x020210AC push {r4, lr} add r4, r0, #0x0 bne _020210B6 - bl ErrorHandling + bl GF_AssertFail _020210B6: add r0, r4, #0x0 bl FUN_02021220 @@ -646,17 +646,17 @@ FUN_020210C0: ; 0x020210C0 push {r4, lr} add r4, r0, #0x0 bne _020210CA - bl ErrorHandling + bl GF_AssertFail _020210CA: ldrh r0, [r4, #0x14] cmp r0, #0x0 beq _020210D4 - bl ErrorHandling + bl GF_AssertFail _020210D4: ldr r0, [r4, #0xc] cmp r0, #0x0 bne _020210E0 - bl ErrorHandling + bl GF_AssertFail pop {r4, pc} _020210E0: add r0, r4, #0x0 @@ -673,7 +673,7 @@ FUN_020210F0: ; 0x020210F0 add r4, r1, #0x0 cmp r5, #0x0 bne _020210FE - bl ErrorHandling + bl GF_AssertFail _020210FE: add r0, r5, #0x0 add r1, r4, #0x0 @@ -686,18 +686,18 @@ FUN_0202110C: ; 0x0202110C push {r4, lr} add r4, r0, #0x0 bne _02021116 - bl ErrorHandling + bl GF_AssertFail _02021116: ldrh r0, [r4, #0x16] cmp r0, #0x0 bne _02021122 - bl ErrorHandling + bl GF_AssertFail pop {r4, pc} _02021122: ldrh r0, [r4, #0x14] cmp r0, #0x0 beq _0202112E - bl ErrorHandling + bl GF_AssertFail pop {r4, pc} _0202112E: add r0, r4, #0x0 @@ -724,7 +724,7 @@ FUN_02021158: ; 0x02021158 add r4, r1, #0x0 cmp r5, #0x0 bne _02021166 - bl ErrorHandling + bl GF_AssertFail _02021166: add r0, r5, #0x0 add r1, r4, #0x0 @@ -737,17 +737,17 @@ FUN_02021174: ; 0x02021174 push {r4, lr} add r4, r0, #0x0 bne _0202117E - bl ErrorHandling + bl GF_AssertFail _0202117E: ldrh r0, [r4, #0x14] cmp r0, #0x0 beq _02021188 - bl ErrorHandling + bl GF_AssertFail _02021188: ldr r0, [r4, #0xc] cmp r0, #0x0 beq _02021194 - bl ErrorHandling + bl GF_AssertFail pop {r4, pc} _02021194: add r0, r4, #0x0 @@ -766,7 +766,7 @@ FUN_020211AC: ; 0x020211AC push {r4, lr} add r4, r0, #0x0 bne _020211B6 - bl ErrorHandling + bl GF_AssertFail _020211B6: ldr r0, [r4, #0x4] pop {r4, pc} @@ -777,7 +777,7 @@ FUN_020211BC: ; 0x020211BC push {r4, lr} add r4, r0, #0x0 bne _020211C6 - bl ErrorHandling + bl GF_AssertFail _020211C6: ldr r0, [r4, #0x8] pop {r4, pc} @@ -788,7 +788,7 @@ FUN_020211CC: ; 0x020211CC push {r4, lr} add r4, r0, #0x0 bne _020211D6 - bl ErrorHandling + bl GF_AssertFail _020211D6: ldr r0, [r4, #0xc] pop {r4, pc} @@ -989,7 +989,7 @@ FUN_02021334: ; 0x02021334 bl NNS_G3dGetTex add r4, r0, #0x0 bne _02021344 - bl ErrorHandling + bl GF_AssertFail _02021344: ldr r0, [r4, #0x14] add r0, r4, r0 diff --git a/arm9/asm/unk_02021590.s b/arm9/asm/unk_02021590.s index 67d46c65..ee27fc88 100644 --- a/arm9/asm/unk_02021590.s +++ b/arm9/asm/unk_02021590.s @@ -108,7 +108,7 @@ _02021638: ldr r0, [r5, #0x60] cmp r0, #0x0 bne _02021642 - bl ErrorHandling + bl GF_AssertFail _02021642: ldr r0, [sp, #0x18] ldr r1, [r5, #0x64] @@ -135,7 +135,7 @@ _02021660: cmp r0, #0x2 bls _02021678 _02021674: - bl ErrorHandling + bl GF_AssertFail _02021678: add r0, r5, #0x0 add r0, #0x6a diff --git a/arm9/asm/unk_02023AC4.s b/arm9/asm/unk_02023AC4.s index 31d23446..daa3a9a3 100644 --- a/arm9/asm/unk_02023AC4.s +++ b/arm9/asm/unk_02023AC4.s @@ -171,7 +171,7 @@ FUN_02023BA4: ; 0x02023BA4 add r4, r0, #0x0 cmp r5, #0x1 blt _02023BB2 - bl ErrorHandling + bl GF_AssertFail _02023BB2: add r0, r4, #0x0 mov r1, #0xd diff --git a/arm9/asm/unk_020250A4.s b/arm9/asm/unk_020250A4.s index 76e0e8ce..60cd4165 100644 --- a/arm9/asm/unk_020250A4.s +++ b/arm9/asm/unk_020250A4.s @@ -391,7 +391,7 @@ _0202531E: ; jump table (using 16-bit offset) .short _02025336 - _0202531E - 2; case 4 .short _0202534E - _0202531E - 2; case 5 _0202532A: - bl ErrorHandling + bl GF_AssertFail pop {r4, pc} _02025330: add r0, r2, #0x1 diff --git a/arm9/asm/unk_02025954.s b/arm9/asm/unk_02025954.s index 8cbf5483..40c1b236 100644 --- a/arm9/asm/unk_02025954.s +++ b/arm9/asm/unk_02025954.s @@ -482,7 +482,7 @@ _02025C50: ldr r0, [sp, #0x0] cmp r0, #0x5 blt _02025C72 - bl ErrorHandling + bl GF_AssertFail _02025C72: add r0, r6, #0x0 bl PlayerProfile_GetNamePtr @@ -593,11 +593,11 @@ FUN_02025D48: ; 0x02025D48 add r4, r0, #0x0 cmp r4, #0xb bge _02025D54 - bl ErrorHandling + bl GF_AssertFail _02025D54: cmp r4, #0x3c blt _02025D5C - bl ErrorHandling + bl GF_AssertFail _02025D5C: sub r4, #0xb ldr r0, _02025D68 ; =UNK_02105C74 @@ -685,7 +685,7 @@ FUN_02025DD4: ; 0x02025DD4 bl FUN_02025F0C cmp r0, #0x0 beq _02025DE6 - bl ErrorHandling + bl GF_AssertFail _02025DE6: mov r0, #0x81 add r1, r5, r4 @@ -827,11 +827,11 @@ FUN_02025EDC: ; 0x02025EDC add r4, r1, #0x0 cmp r6, #0x1 bge _02025EEC - bl ErrorHandling + bl GF_AssertFail _02025EEC: cmp r6, #0xf ble _02025EF4 - bl ErrorHandling + bl GF_AssertFail _02025EF4: sub r0, r6, #0x1 add r1, r5, r0 @@ -1458,7 +1458,7 @@ FUN_0202630C: ; 0x0202630C add r6, r3, #0x0 cmp r4, #0x40 blt _0202631E - bl ErrorHandling + bl GF_AssertFail _0202631E: ldr r0, _02026350 ; =0x0000010F add r1, r5, r4 @@ -1494,7 +1494,7 @@ FUN_02026354: ; 0x02026354 add r5, r0, #0x0 cmp r4, #0x40 blt _02026362 - bl ErrorHandling + bl GF_AssertFail _02026362: ldr r0, _0202636C ; =0x0000010F add r1, r5, r4 @@ -1510,7 +1510,7 @@ FUN_02026370: ; 0x02026370 add r5, r0, #0x0 cmp r4, #0x40 blt _0202637E - bl ErrorHandling + bl GF_AssertFail _0202637E: lsl r0, r4, #0x1 add r0, r4, r0 @@ -1535,7 +1535,7 @@ FUN_0202639C: ; 0x0202639C add r5, r0, #0x0 cmp r4, #0x40 blt _020263AA - bl ErrorHandling + bl GF_AssertFail _020263AA: lsl r0, r4, #0x1 add r0, r4, r0 @@ -1560,7 +1560,7 @@ FUN_020263C8: ; 0x020263C8 add r5, r0, #0x0 cmp r4, #0x40 blt _020263D6 - bl ErrorHandling + bl GF_AssertFail _020263D6: ldr r0, _020263F0 ; =0x0000010F mov r1, #0x0 @@ -1586,7 +1586,7 @@ FUN_020263F4: ; 0x020263F4 add r6, r3, #0x0 cmp r4, #0x10 blt _02026406 - bl ErrorHandling + bl GF_AssertFail _02026406: lsl r2, r4, #0x1 ldr r1, _02026440 ; =0x0000050C @@ -1682,7 +1682,7 @@ FUN_0202649C: ; 0x0202649C add r7, r3, #0x0 cmp r4, #0x64 blt _020264AE - bl ErrorHandling + bl GF_AssertFail _020264AE: ldr r1, _020264E8 ; =0x0000055C add r0, r5, r4 @@ -1840,7 +1840,7 @@ FUN_020265B8: ; 0x020265B8 add r5, r0, #0x0 cmp r4, #0xff blt _020265C6 - bl ErrorHandling + bl GF_AssertFail _020265C6: ldr r0, _020265DC ; =0x0000020F mov r2, #0x3 @@ -2059,20 +2059,20 @@ FUN_0202671C: ; 0x0202671C add r6, r3, #0x0 cmp r4, #0x20 blt _0202672E - bl ErrorHandling + bl GF_AssertFail _0202672E: cmp r6, #0x20 blt _02026736 - bl ErrorHandling + bl GF_AssertFail _02026736: ldr r0, [sp, #0x18] cmp r0, #0x20 blt _02026740 - bl ErrorHandling + bl GF_AssertFail _02026740: cmp r5, #0x0 bne _02026748 - bl ErrorHandling + bl GF_AssertFail _02026748: cmp r4, #0x0 beq _02026774 @@ -2154,7 +2154,7 @@ FUN_020267C4: ; 0x020267C4 add r4, r0, #0x0 cmp r5, #0x20 blt _020267D2 - bl ErrorHandling + bl GF_AssertFail _020267D2: cmp r5, #0x0 bne _020267DE @@ -2197,7 +2197,7 @@ FUN_02026810: ; 0x02026810 add r4, r0, #0x0 cmp r5, #0x20 blt _0202681E - bl ErrorHandling + bl GF_AssertFail _0202681E: cmp r5, #0x0 bne _02026826 @@ -2226,7 +2226,7 @@ FUN_02026840: ; 0x02026840 add r4, r0, #0x0 cmp r5, #0x20 blt _0202684E - bl ErrorHandling + bl GF_AssertFail _0202684E: cmp r5, #0x0 bne _02026856 diff --git a/arm9/asm/unk_02026CD0.s b/arm9/asm/unk_02026CD0.s index 1cfea136..28a1f682 100644 --- a/arm9/asm/unk_02026CD0.s +++ b/arm9/asm/unk_02026CD0.s @@ -72,20 +72,20 @@ FUN_02026D34: ; 0x02026D34 lsl r0, r0, #0x8 cmp r1, r0 blt _02026D5E - bl ErrorHandling + bl GF_AssertFail _02026D5E: mov r0, #0x1 ldr r1, [sp, #0x8] lsl r0, r0, #0x8 cmp r1, r0 blt _02026D6C - bl ErrorHandling + bl GF_AssertFail _02026D6C: mov r0, #0x7f mvn r0, r0 cmp r4, r0 bgt _02026D78 - bl ErrorHandling + bl GF_AssertFail _02026D78: lsl r0, r4, #0x18 asr r0, r0, #0x18 @@ -138,7 +138,7 @@ FUN_02026DC4: ; 0x02026DC4 add r6, r1, #0x0 cmp r4, #0x3d blo _02026DD4 - bl ErrorHandling + bl GF_AssertFail _02026DD4: lsr r2, r4, #0x1f lsl r1, r4, #0x1d @@ -174,7 +174,7 @@ FUN_02026E08: ; 0x02026E08 add r5, r0, #0x0 cmp r4, #0x3d blo _02026E16 - bl ErrorHandling + bl GF_AssertFail _02026E16: lsr r3, r4, #0x1f lsl r2, r4, #0x1d @@ -211,7 +211,7 @@ FUN_02026E48: ; 0x02026E48 add r6, r2, #0x0 cmp r4, #0x2 blo _02026E58 - bl ErrorHandling + bl GF_AssertFail _02026E58: lsr r2, r6, #0x1f lsl r1, r6, #0x1b @@ -269,7 +269,7 @@ FUN_02026EB0: ; 0x02026EB0 add r6, r2, #0x0 cmp r4, #0x12 bls _02026EC0 - bl ErrorHandling + bl GF_AssertFail _02026EC0: lsr r2, r6, #0x1f lsl r1, r6, #0x1e @@ -459,7 +459,7 @@ FUN_02027008: ; 0x02027008 add r5, r0, #0x0 cmp r6, #0xb blt _02027016 - bl ErrorHandling + bl GF_AssertFail _02027016: mov r0, #0x74 add r4, r6, #0x0 @@ -479,7 +479,7 @@ _0202702E: _02027030: cmp r0, #0x0 bne _02027038 - bl ErrorHandling + bl GF_AssertFail _02027038: add r0, r5, r4 pop {r4-r6, pc} @@ -494,7 +494,7 @@ FUN_02027044: ; 0x02027044 add r5, r0, #0x0 cmp r6, #0x5 blt _02027052 - bl ErrorHandling + bl GF_AssertFail _02027052: mov r0, #0x98 add r4, r6, #0x0 @@ -516,7 +516,7 @@ _0202706E: _02027070: cmp r0, #0x0 bne _02027078 - bl ErrorHandling + bl GF_AssertFail _02027078: ldr r0, _02027080 ; =0x000004FC add r0, r5, r0 @@ -542,7 +542,7 @@ FUN_02027098: ; 0x02027098 add r5, r0, #0x0 cmp r4, #0xb blt _020270A6 - bl ErrorHandling + bl GF_AssertFail _020270A6: mov r0, #0x74 mul r0, r4 @@ -558,7 +558,7 @@ FUN_020270B4: ; 0x020270B4 add r5, r0, #0x0 cmp r4, #0x5 blt _020270C2 - bl ErrorHandling + bl GF_AssertFail _020270C2: ldr r0, _020270D4 ; =0x000004FC add r1, r5, r0 @@ -614,7 +614,7 @@ FUN_02027114: ; 0x02027114 add r4, r0, #0x0 cmp r5, #0x64 blo _02027122 - bl ErrorHandling + bl GF_AssertFail _02027122: cmp r5, #0x3d bhs _02027132 @@ -625,7 +625,7 @@ _02027122: pop {r3-r5, pc} _02027132: bhs _02027138 - bl ErrorHandling + bl GF_AssertFail _02027138: sub r5, #0x3d lsl r0, r5, #0x18 @@ -644,7 +644,7 @@ FUN_0202714C: ; 0x0202714C add r5, r0, #0x0 cmp r4, #0x12 blo _0202715A - bl ErrorHandling + bl GF_AssertFail _0202715A: add r5, #0x28 lsl r1, r4, #0x18 @@ -698,7 +698,7 @@ FUN_020271A4: ; 0x020271A4 add r6, r2, #0x0 cmp r4, #0x64 blo _020271B4 - bl ErrorHandling + bl GF_AssertFail _020271B4: cmp r4, #0x3d bhs _020271DA @@ -733,7 +733,7 @@ _020271DA: _020271F2: cmp r4, #0x3d bhs _020271FA - bl ErrorHandling + bl GF_AssertFail _020271FA: sub r4, #0x3d lsl r0, r4, #0x18 @@ -754,7 +754,7 @@ FUN_02027210: ; 0x02027210 add r6, r2, #0x0 cmp r4, #0x64 blo _02027220 - bl ErrorHandling + bl GF_AssertFail _02027220: cmp r4, #0x3d bhs _02027248 @@ -778,7 +778,7 @@ _0202723C: pop {r4-r6, pc} _02027248: bhs _0202724E - bl ErrorHandling + bl GF_AssertFail _0202724E: sub r4, #0x3d lsl r0, r4, #0x18 @@ -798,7 +798,7 @@ FUN_02027264: ; 0x02027264 add r5, r0, #0x0 cmp r4, #0x12 blo _02027272 - bl ErrorHandling + bl GF_AssertFail _02027272: add r0, r5, #0x0 lsl r1, r4, #0x18 @@ -839,7 +839,7 @@ _020272B2: _020272B4: cmp r0, #0x0 bne _020272BC - bl ErrorHandling + bl GF_AssertFail _020272BC: ldr r1, [r4, #0x0] ldr r0, _020272D0 ; =0x00002345 @@ -873,7 +873,7 @@ _020272EA: _020272EC: cmp r0, #0x0 bne _020272F4 - bl ErrorHandling + bl GF_AssertFail _020272F4: ldr r0, _02027308 ; =0x00002345 str r0, [r4, #0x0] @@ -906,7 +906,7 @@ _02027326: _02027328: cmp r0, #0x0 bne _02027330 - bl ErrorHandling + bl GF_AssertFail _02027330: add r0, r4, #0x0 mov r1, #0x0 @@ -940,7 +940,7 @@ _02027362: _02027364: cmp r0, #0x0 bne _0202736C - bl ErrorHandling + bl GF_AssertFail _0202736C: add r0, r5, #0x4 add r1, r4, #0x0 @@ -973,7 +973,7 @@ FUN_02027380: ; 0x02027380 str r0, [sp, #0x8] cmp r6, #0xa blt _020273B0 - bl ErrorHandling + bl GF_AssertFail _020273B0: add r1, sp, #0xc mov r0, #0x4 @@ -981,7 +981,7 @@ _020273B0: add r0, #0xfc cmp r1, r0 blt _020273C0 - bl ErrorHandling + bl GF_AssertFail _020273C0: add r1, sp, #0xc mov r0, #0x6 @@ -989,14 +989,14 @@ _020273C0: add r0, #0xfa cmp r7, r0 blt _020273D0 - bl ErrorHandling + bl GF_AssertFail _020273D0: mov r1, #0x7f ldr r0, [sp, #0x8] mvn r1, r1 cmp r0, r1 bgt _020273DE - bl ErrorHandling + bl GF_AssertFail _020273DE: mov r0, #0x1 lsl r0, r6 @@ -1004,7 +1004,7 @@ _020273DE: str r0, [sp, #0x4] tst r0, r1 beq _020273EE - bl ErrorHandling + bl GF_AssertFail _020273EE: ldr r1, [r5, #0x0] ldr r0, _02027440 ; =0x00001234 @@ -1021,7 +1021,7 @@ _02027400: _02027402: cmp r0, #0x0 bne _0202740A - bl ErrorHandling + bl GF_AssertFail _0202740A: ldr r0, [sp, #0x8] add r1, r5, #0x0 @@ -1072,7 +1072,7 @@ _02027460: _02027462: cmp r0, #0x0 bne _0202746A - bl ErrorHandling + bl GF_AssertFail _0202746A: add r5, #0x70 strb r4, [r5, #0x0] @@ -1101,7 +1101,7 @@ _02027490: _02027492: cmp r0, #0x0 bne _0202749A - bl ErrorHandling + bl GF_AssertFail _0202749A: add r0, r5, #0x0 add r0, #0x40 @@ -1136,7 +1136,7 @@ _020274D0: _020274D2: cmp r0, #0x0 bne _020274DA - bl ErrorHandling + bl GF_AssertFail _020274DA: add r0, r5, #0x0 add r1, r4, #0x0 @@ -1168,7 +1168,7 @@ _0202750A: _0202750C: cmp r0, #0x0 bne _02027514 - bl ErrorHandling + bl GF_AssertFail _02027514: add r0, r5, #0x4 add r1, r4, #0x0 @@ -1186,7 +1186,7 @@ FUN_02027528: ; 0x02027528 add r5, r0, #0x0 cmp r4, #0xa blt _02027536 - bl ErrorHandling + bl GF_AssertFail _02027536: ldr r1, [r5, #0x0] ldr r0, _0202755C ; =0x00001234 @@ -1203,7 +1203,7 @@ _02027548: _0202754A: cmp r0, #0x0 bne _02027552 - bl ErrorHandling + bl GF_AssertFail _02027552: mov r0, #0x1 ldr r1, [r5, #0x3c] @@ -1233,7 +1233,7 @@ _0202757A: _0202757C: cmp r0, #0x0 bne _02027584 - bl ErrorHandling + bl GF_AssertFail _02027584: add r0, r4, #0x4 pop {r4, pc} @@ -1248,14 +1248,14 @@ FUN_02027590: ; 0x02027590 add r5, r0, #0x0 cmp r4, #0xa blt _0202759E - bl ErrorHandling + bl GF_AssertFail _0202759E: mov r0, #0x1 ldr r1, [r5, #0x3c] lsl r0, r4 tst r0, r1 bne _020275AC - bl ErrorHandling + bl GF_AssertFail _020275AC: ldr r1, [r5, #0x0] ldr r0, _020275D0 ; =0x00001234 @@ -1272,7 +1272,7 @@ _020275BE: _020275C0: cmp r0, #0x0 bne _020275C8 - bl ErrorHandling + bl GF_AssertFail _020275C8: add r5, #0x48 lsl r0, r4, #0x2 @@ -1301,7 +1301,7 @@ _020275EE: _020275F0: cmp r0, #0x0 bne _020275F8 - bl ErrorHandling + bl GF_AssertFail _020275F8: add r0, r4, #0x4 bl FUN_02027C84 @@ -1330,7 +1330,7 @@ _02027620: _02027622: cmp r0, #0x0 bne _0202762A - bl ErrorHandling + bl GF_AssertFail _0202762A: add r0, r5, #0x4 add r1, r4, #0x0 @@ -1359,7 +1359,7 @@ _02027652: _02027654: cmp r0, #0x0 bne _0202765C - bl ErrorHandling + bl GF_AssertFail _0202765C: add r0, r4, #0x4 bl FUN_02027C98 @@ -1387,7 +1387,7 @@ _02027682: _02027684: cmp r0, #0x0 bne _0202768C - bl ErrorHandling + bl GF_AssertFail _0202768C: add r4, #0x70 ldrb r0, [r4, #0x0] @@ -1424,7 +1424,7 @@ _020276BE: _020276C0: cmp r0, #0x0 bne _020276C8 - bl ErrorHandling + bl GF_AssertFail _020276C8: add r4, #0x71 ldrb r0, [r4, #0x0] @@ -1452,7 +1452,7 @@ _020276EE: _020276F0: cmp r0, #0x0 bne _020276F8 - bl ErrorHandling + bl GF_AssertFail _020276F8: ldr r1, [r4, #0x0] ldr r0, _0202770C ; =0x00002345 @@ -1486,7 +1486,7 @@ _02027726: _02027728: cmp r0, #0x0 bne _02027730 - bl ErrorHandling + bl GF_AssertFail _02027730: ldr r0, _0202773C ; =0x00002345 str r0, [r4, #0x0] @@ -1514,7 +1514,7 @@ _02027756: _02027758: cmp r0, #0x0 bne _02027760 - bl ErrorHandling + bl GF_AssertFail _02027760: add r0, r4, #0x0 mov r1, #0x0 @@ -1548,7 +1548,7 @@ _02027792: _02027794: cmp r0, #0x0 bne _0202779C - bl ErrorHandling + bl GF_AssertFail _0202779C: add r5, #0x8 add r0, r5, #0x0 @@ -1582,7 +1582,7 @@ FUN_020277B4: ; 0x020277B4 str r0, [sp, #0x8] cmp r6, #0x14 blt _020277E4 - bl ErrorHandling + bl GF_AssertFail _020277E4: add r1, sp, #0xc mov r0, #0x4 @@ -1590,7 +1590,7 @@ _020277E4: add r0, #0xfc cmp r1, r0 blt _020277F4 - bl ErrorHandling + bl GF_AssertFail _020277F4: add r1, sp, #0xc mov r0, #0x6 @@ -1598,14 +1598,14 @@ _020277F4: add r0, #0xfa cmp r7, r0 blt _02027804 - bl ErrorHandling + bl GF_AssertFail _02027804: mov r1, #0x7f ldr r0, [sp, #0x8] mvn r1, r1 cmp r0, r1 bgt _02027812 - bl ErrorHandling + bl GF_AssertFail _02027812: mov r0, #0x1 lsl r0, r6 @@ -1613,7 +1613,7 @@ _02027812: str r0, [sp, #0x4] tst r0, r1 beq _02027822 - bl ErrorHandling + bl GF_AssertFail _02027822: ldr r1, [r5, #0x0] ldr r0, _02027874 ; =0x00001234 @@ -1630,7 +1630,7 @@ _02027834: _02027836: cmp r0, #0x0 bne _0202783E - bl ErrorHandling + bl GF_AssertFail _0202783E: ldr r0, [sp, #0x8] add r1, r5, #0x0 @@ -1681,7 +1681,7 @@ _02027894: _02027896: cmp r0, #0x0 bne _0202789E - bl ErrorHandling + bl GF_AssertFail _0202789E: add r5, #0x94 strb r4, [r5, #0x0] @@ -1710,7 +1710,7 @@ _020278C4: _020278C6: cmp r0, #0x0 bne _020278CE - bl ErrorHandling + bl GF_AssertFail _020278CE: str r4, [r5, #0x4] pop {r3-r5, pc} @@ -1738,7 +1738,7 @@ _020278F4: _020278F6: cmp r0, #0x0 bne _020278FE - bl ErrorHandling + bl GF_AssertFail _020278FE: add r0, r5, #0x0 add r1, r4, #0x0 @@ -1771,7 +1771,7 @@ _02027930: _02027932: cmp r0, #0x0 bne _0202793A - bl ErrorHandling + bl GF_AssertFail _0202793A: add r1, sp, #0x4 add r0, r4, #0x0 @@ -1803,18 +1803,18 @@ FUN_02027964: ; 0x02027964 ldr r4, [sp, #0x24] cmp r6, #0x14 blo _0202797A - bl ErrorHandling + bl GF_AssertFail _0202797A: cmp r7, #0x64 blo _02027982 - bl ErrorHandling + bl GF_AssertFail _02027982: mov r1, #0x1 ldr r0, [sp, #0x4] lsl r1, r1, #0x8 cmp r0, r1 blt _02027990 - bl ErrorHandling + bl GF_AssertFail _02027990: add r0, sp, #0x10 ldrb r1, [r0, #0x10] @@ -1822,13 +1822,13 @@ _02027990: lsl r0, r0, #0x8 cmp r1, r0 blt _020279A0 - bl ErrorHandling + bl GF_AssertFail _020279A0: mov r0, #0x7f mvn r0, r0 cmp r4, r0 bgt _020279AC - bl ErrorHandling + bl GF_AssertFail _020279AC: mov r0, #0x1 lsl r0, r6 @@ -1836,7 +1836,7 @@ _020279AC: str r0, [sp, #0x8] tst r0, r1 beq _020279BC - bl ErrorHandling + bl GF_AssertFail _020279BC: ldr r1, [r5, #0x0] ldr r0, _02027A0C ; =0x00001234 @@ -1853,7 +1853,7 @@ _020279CE: _020279D0: cmp r0, #0x0 bne _020279D8 - bl ErrorHandling + bl GF_AssertFail _020279D8: mov r0, #0x38 ldrsb r0, [r5, r0] @@ -1892,7 +1892,7 @@ FUN_02027A14: ; 0x02027A14 add r5, r0, #0x0 cmp r4, #0x14 blt _02027A22 - bl ErrorHandling + bl GF_AssertFail _02027A22: ldr r1, [r5, #0x0] ldr r0, _02027A50 ; =0x00001234 @@ -1909,7 +1909,7 @@ _02027A34: _02027A36: cmp r0, #0x0 bne _02027A3E - bl ErrorHandling + bl GF_AssertFail _02027A3E: mov r0, #0x1 add r1, r0, #0x0 @@ -1945,7 +1945,7 @@ _02027A72: _02027A74: cmp r0, #0x0 bne _02027A7C - bl ErrorHandling + bl GF_AssertFail _02027A7C: add r5, #0x8 add r0, r5, #0x0 @@ -1976,7 +1976,7 @@ _02027AAA: _02027AAC: cmp r0, #0x0 bne _02027AB4 - bl ErrorHandling + bl GF_AssertFail _02027AB4: add r4, #0x8 add r0, r4, #0x0 @@ -1992,14 +1992,14 @@ FUN_02027AC4: ; 0x02027AC4 add r5, r0, #0x0 cmp r4, #0x14 blt _02027AD2 - bl ErrorHandling + bl GF_AssertFail _02027AD2: mov r0, #0x1 ldr r1, [r5, #0x40] lsl r0, r4 tst r0, r1 bne _02027AE0 - bl ErrorHandling + bl GF_AssertFail _02027AE0: ldr r1, [r5, #0x0] ldr r0, _02027B04 ; =0x00001234 @@ -2016,7 +2016,7 @@ _02027AF2: _02027AF4: cmp r0, #0x0 bne _02027AFC - bl ErrorHandling + bl GF_AssertFail _02027AFC: add r5, #0x44 lsl r0, r4, #0x2 @@ -2046,7 +2046,7 @@ _02027B24: _02027B26: cmp r0, #0x0 bne _02027B2E - bl ErrorHandling + bl GF_AssertFail _02027B2E: add r5, #0x8 add r0, r5, #0x0 @@ -2076,7 +2076,7 @@ _02027B5A: _02027B5C: cmp r0, #0x0 bne _02027B64 - bl ErrorHandling + bl GF_AssertFail _02027B64: add r4, #0x8 add r0, r4, #0x0 @@ -2107,7 +2107,7 @@ _02027B92: _02027B94: cmp r0, #0x0 bne _02027B9C - bl ErrorHandling + bl GF_AssertFail _02027B9C: mov r1, #0x1 str r1, [sp, #0x0] @@ -2144,14 +2144,14 @@ FUN_02027BDC: ; 0x02027BDC add r5, r0, #0x0 cmp r4, #0x14 blt _02027BEA - bl ErrorHandling + bl GF_AssertFail _02027BEA: mov r0, #0x1 ldr r1, [r5, #0x40] lsl r0, r4 tst r0, r1 bne _02027BF8 - bl ErrorHandling + bl GF_AssertFail _02027BF8: ldr r1, [r5, #0x0] ldr r0, _02027C20 ; =0x00001234 @@ -2168,7 +2168,7 @@ _02027C0A: _02027C0C: cmp r0, #0x0 bne _02027C14 - bl ErrorHandling + bl GF_AssertFail _02027C14: add r5, #0x44 lsl r0, r4, #0x2 @@ -2198,7 +2198,7 @@ _02027C3E: _02027C40: cmp r0, #0x0 bne _02027C48 - bl ErrorHandling + bl GF_AssertFail _02027C48: add r4, #0x94 ldrb r0, [r4, #0x0] @@ -2226,7 +2226,7 @@ _02027C6E: _02027C70: cmp r0, #0x0 bne _02027C78 - bl ErrorHandling + bl GF_AssertFail _02027C78: ldr r0, [r4, #0x4] pop {r4, pc} diff --git a/arm9/asm/unk_020281E0.s b/arm9/asm/unk_020281E0.s index e1a5729d..23822bb1 100644 --- a/arm9/asm/unk_020281E0.s +++ b/arm9/asm/unk_020281E0.s @@ -56,7 +56,7 @@ FUN_0202822C: ; 0x0202822C add r7, r2, #0x0 cmp r4, #0x20 blt _0202823C - bl ErrorHandling + bl GF_AssertFail _0202823C: cmp r7, #0x8 bhi _020282D0 @@ -161,7 +161,7 @@ FUN_020282E8: ; 0x020282E8 add r6, r3, #0x0 cmp r4, #0x20 blt _020282FA - bl ErrorHandling + bl GF_AssertFail _020282FA: cmp r7, #0x8 bhi _02028378 @@ -190,13 +190,13 @@ _0202831C: str r6, [r1, r0] pop {r3-r7, pc} _0202832A: - bl ErrorHandling + bl GF_AssertFail pop {r3-r7, pc} _02028330: - bl ErrorHandling + bl GF_AssertFail pop {r3-r7, pc} _02028336: - bl ErrorHandling + bl GF_AssertFail pop {r3-r7, pc} _0202833C: mov r0, #0x30 @@ -248,7 +248,7 @@ FUN_0202838C: ; 0x0202838C add r5, r0, #0x0 cmp r4, #0x20 blt _0202839A - bl ErrorHandling + bl GF_AssertFail _0202839A: mov r0, #0xc add r5, #0x40 @@ -263,7 +263,7 @@ FUN_020283A4: ; 0x020283A4 add r5, r0, #0x0 cmp r4, #0x20 blt _020283B2 - bl ErrorHandling + bl GF_AssertFail _020283B2: mov r0, #0x1d lsl r0, r0, #0x4 @@ -281,7 +281,7 @@ FUN_020283C0: ; 0x020283C0 add r6, r2, #0x0 cmp r4, #0x20 blt _020283D0 - bl ErrorHandling + bl GF_AssertFail _020283D0: mov r1, #0x1d lsl r1, r1, #0x4 @@ -302,7 +302,7 @@ FUN_020283E8: ; 0x020283E8 add r5, r0, #0x0 cmp r4, #0x20 blt _020283F6 - bl ErrorHandling + bl GF_AssertFail _020283F6: mov r0, #0x7 lsl r0, r0, #0x6 @@ -320,7 +320,7 @@ FUN_02028404: ; 0x02028404 add r6, r2, #0x0 cmp r4, #0x20 blt _02028414 - bl ErrorHandling + bl GF_AssertFail _02028414: mov r1, #0x7 lsl r1, r1, #0x6 @@ -341,7 +341,7 @@ FUN_0202842C: ; 0x0202842C add r5, r0, #0x0 cmp r4, #0x20 blt _0202843A - bl ErrorHandling + bl GF_AssertFail _0202843A: mov r0, #0xc add r5, #0x40 @@ -378,7 +378,7 @@ FUN_02028468: ; 0x02028468 str r0, [sp, #0x0] cmp r5, #0x20 blt _02028478 - bl ErrorHandling + bl GF_AssertFail _02028478: cmp r5, #0x1f bge _020284D2 diff --git a/arm9/asm/unk_02028980.s b/arm9/asm/unk_02028980.s index 8c9178e7..664e39e7 100644 --- a/arm9/asm/unk_02028980.s +++ b/arm9/asm/unk_02028980.s @@ -163,10 +163,10 @@ _02028A30: lsr r0, r0, #0x1d str r0, [sp, #0x1c] add r0, sp, #0x0 - bl FUN_02012710 + bl GF_RTC_GetDayOfYear add r4, r0, #0x0 add r0, sp, #0x10 - bl FUN_02012710 + bl GF_RTC_GetDayOfYear ldr r2, [sp, #0x4] sub r0, r4, r0 cmp r2, #0xc diff --git a/arm9/asm/unk_02029AE0.s b/arm9/asm/unk_02029AE0.s index 9e318412..3e6f8a2e 100644 --- a/arm9/asm/unk_02029AE0.s +++ b/arm9/asm/unk_02029AE0.s @@ -39,11 +39,11 @@ FUN_02029B08: ; 0x02029B08 add r4, r2, #0x0 cmp r5, r0 blt _02029B1C - bl ErrorHandling + bl GF_AssertFail _02029B1C: cmp r4, #0x40 blt _02029B24 - bl ErrorHandling + bl GF_AssertFail _02029B24: strb r5, [r6, #0x5] add r0, r6, #0x0 @@ -75,11 +75,11 @@ FUN_02029B40: ; 0x02029B40 add r4, r2, #0x0 cmp r5, r0 blt _02029B54 - bl ErrorHandling + bl GF_AssertFail _02029B54: cmp r4, #0x40 blt _02029B5C - bl ErrorHandling + bl GF_AssertFail _02029B5C: cmp r5, #0x0 bne _02029B64 @@ -118,17 +118,17 @@ FUN_02029B90: ; 0x02029B90 str r3, [sp, #0x0] cmp r3, #0x4 blt _02029BA2 - bl ErrorHandling + bl GF_AssertFail _02029BA2: mov r0, #0x1 lsl r0, r0, #0x8 cmp r5, r0 blt _02029BAE - bl ErrorHandling + bl GF_AssertFail _02029BAE: cmp r4, #0x40 blt _02029BB6 - bl ErrorHandling + bl GF_AssertFail _02029BB6: cmp r5, #0x0 beq _02029BFE diff --git a/arm9/asm/unk_02029FB0.s b/arm9/asm/unk_02029FB0.s index ac457105..c98b57b7 100644 --- a/arm9/asm/unk_02029FB0.s +++ b/arm9/asm/unk_02029FB0.s @@ -70,7 +70,7 @@ _02029FE0: ldrh r0, [r0, #0x0] pop {r3, pc} _02029FF0: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3, pc} @@ -95,7 +95,7 @@ _0202A008: strh r2, [r0, #0x0] b _0202A01E _0202A01A: - bl ErrorHandling + bl GF_AssertFail _0202A01E: add r0, r5, #0x0 add r1, r4, #0x0 @@ -129,7 +129,7 @@ _0202A04E: ldr r0, _0202A06C ; =0x0000270F pop {r3, pc} _0202A052: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3, pc} nop @@ -282,7 +282,7 @@ FUN_0202A170: ; 0x0202A170 add r5, r0, #0x0 cmp r4, #0x26 blt _0202A17E - bl ErrorHandling + bl GF_AssertFail _0202A17E: add r0, r5, #0x0 mov r1, #0x0 diff --git a/arm9/asm/unk_0202A924.s b/arm9/asm/unk_0202A924.s index d1dffcaf..f8784153 100644 --- a/arm9/asm/unk_0202A924.s +++ b/arm9/asm/unk_0202A924.s @@ -77,7 +77,7 @@ _0202A9A0: ldr r0, [r0, #0x4] pop {r3, pc} _0202A9A4: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3, pc} @@ -192,7 +192,7 @@ FUN_0202AA40: ; 0x0202AA40 add r5, r0, #0x0 cmp r4, #0x3 blo _0202AA4E - bl ErrorHandling + bl GF_AssertFail _0202AA4E: mov r0, #0x43 add r1, r5, r4 @@ -208,7 +208,7 @@ FUN_0202AA58: ; 0x0202AA58 add r6, r2, #0x0 cmp r4, #0x3 blo _0202AA68 - bl ErrorHandling + bl GF_AssertFail _0202AA68: mov r0, #0x43 add r1, r5, r4 @@ -224,7 +224,7 @@ FUN_0202AA74: ; 0x0202AA74 add r5, r0, #0x0 cmp r4, #0x3 blo _0202AA82 - bl ErrorHandling + bl GF_AssertFail _0202AA82: mov r0, #0x14 mul r0, r4 @@ -253,7 +253,7 @@ FUN_0202AAA0: ; 0x0202AAA0 add r5, r0, #0x0 cmp r4, #0x3 blo _0202AAAE - bl ErrorHandling + bl GF_AssertFail _0202AAAE: mov r0, #0x14 add r5, #0xd0 @@ -391,7 +391,7 @@ FUN_0202AB68: ; 0x0202AB68 add r5, r0, #0x0 cmp r4, #0x2 bls _0202AB76 - bl ErrorHandling + bl GF_AssertFail _0202AB76: ldr r0, _0202AB7C ; =0x00000112 strb r4, [r5, r0] @@ -427,7 +427,7 @@ FUN_0202ABA0: ; 0x0202ABA0 add r4, r0, #0x0 cmp r5, #0x10 blo _0202ABB2 - bl ErrorHandling + bl GF_AssertFail _0202ABB2: ldrh r0, [r4, #0xc] strh r0, [r4, #0xe] diff --git a/arm9/asm/unk_0202AC20.s b/arm9/asm/unk_0202AC20.s index e200b338..843845eb 100644 --- a/arm9/asm/unk_0202AC20.s +++ b/arm9/asm/unk_0202AC20.s @@ -28,7 +28,7 @@ FUN_0202AC2C: ; 0x0202AC2C add r5, r0, #0x0 cmp r4, #0x8 blt _0202AC3A - bl ErrorHandling + bl GF_AssertFail _0202AC3A: mov r0, #0x1 lsl r0, r0, #0x8 @@ -59,7 +59,7 @@ FUN_0202AC64: ; 0x0202AC64 add r5, r0, #0x0 cmp r4, #0x3 blt _0202AC72 - bl ErrorHandling + bl GF_AssertFail _0202AC72: lsl r0, r4, #0x2 add r1, r5, r0 @@ -220,7 +220,7 @@ FUN_0202AD94: ; 0x0202AD94 sub r0, r4, #0x1 cmp r0, #0x8 blt _0202ADA4 - bl ErrorHandling + bl GF_AssertFail _0202ADA4: sub r4, r4, #0x1 lsl r0, r4, #0x2 @@ -248,7 +248,7 @@ FUN_0202ADC8: ; 0x0202ADC8 add r5, r0, #0x0 cmp r4, #0x3 blt _0202ADD6 - bl ErrorHandling + bl GF_AssertFail _0202ADD6: lsl r0, r4, #0x2 add r1, r5, r0 @@ -308,7 +308,7 @@ FUN_0202AE28: ; 0x0202AE28 add r4, r0, #0x0 cmp r5, #0x8 blt _0202AE36 - bl ErrorHandling + bl GF_AssertFail _0202AE36: lsl r0, r5, #0x2 add r1, r4, r0 @@ -330,7 +330,7 @@ FUN_0202AE4C: ; 0x0202AE4C add r4, r0, #0x0 cmp r5, #0x3 blt _0202AE5A - bl ErrorHandling + bl GF_AssertFail _0202AE5A: lsl r0, r5, #0x2 add r1, r4, r0 @@ -434,7 +434,7 @@ FUN_0202AEF4: ; 0x0202AEF4 lsl r0, r0, #0xa cmp r4, r0 blt _0202AF06 - bl ErrorHandling + bl GF_AssertFail _0202AF06: mov r0, #0x1 mov r1, #0x7 @@ -462,7 +462,7 @@ FUN_0202AF24: ; 0x0202AF24 lsl r0, r0, #0xa cmp r4, r0 blt _0202AF36 - bl ErrorHandling + bl GF_AssertFail _0202AF36: asr r0, r4, #0x2 lsr r0, r0, #0x1d @@ -557,7 +557,7 @@ _0202AFCA: sub r0, r4, #0x1 cmp r0, #0x8 blt _0202AFD4 - bl ErrorHandling + bl GF_AssertFail _0202AFD4: ldr r0, _0202AFF8 ; =UNK_021C59D4 sub r1, r4, #0x1 diff --git a/arm9/asm/unk_0202B374.s b/arm9/asm/unk_0202B374.s index 67c01b0a..2becea26 100644 --- a/arm9/asm/unk_0202B374.s +++ b/arm9/asm/unk_0202B374.s @@ -112,7 +112,7 @@ _0202B422: add r3, r3, #0x1 cmp r3, #0x4 blt _0202B418 - bl ErrorHandling + bl GF_AssertFail pop {r3, pc} .balign 4 @@ -324,7 +324,7 @@ _0202B574: add r4, #0xcc b _0202B57E _0202B57A: - bl ErrorHandling + bl GF_AssertFail _0202B57E: add r0, r4, #0x0 pop {r4, pc} @@ -362,7 +362,7 @@ _0202B5B0: add r4, r0, r1 b _0202B5BA _0202B5B6: - bl ErrorHandling + bl GF_AssertFail _0202B5BA: add r0, r4, #0x0 pop {r4, pc} @@ -672,7 +672,7 @@ FUN_0202B7C8: ; 0x0202B7C8 bl FUN_0202B820 cmp r0, #0x1 beq _0202B7DE - bl ErrorHandling + bl GF_AssertFail _0202B7DE: add r0, r5, #0x0 add r1, r6, #0x0 @@ -695,7 +695,7 @@ FUN_0202B7F4: ; 0x0202B7F4 bl FUN_0202B820 cmp r0, #0x0 beq _0202B80A - bl ErrorHandling + bl GF_AssertFail _0202B80A: add r0, r5, #0x0 add r1, r6, #0x0 diff --git a/arm9/asm/unk_0202B870.s b/arm9/asm/unk_0202B870.s index ad45d567..55229d73 100644 --- a/arm9/asm/unk_0202B870.s +++ b/arm9/asm/unk_0202B870.s @@ -109,7 +109,7 @@ FUN_0202B8F0: ; 0x0202B8F0 cmp r2, #0x6 blo _0202B8FE blo _0202B930 - bl ErrorHandling + bl GF_AssertFail pop {r4-r6, pc} _0202B8FE: mov r3, #0x90 diff --git a/arm9/asm/unk_0202BE98.s b/arm9/asm/unk_0202BE98.s index 37bc1c4e..52f6b9ad 100644 --- a/arm9/asm/unk_0202BE98.s +++ b/arm9/asm/unk_0202BE98.s @@ -30,7 +30,7 @@ _0202BEB4: bl GetMonData cmp r0, #0x0 beq _0202BECC - bl ErrorHandling + bl GF_AssertFail _0202BECC: add r4, r4, #0x1 add r5, #0xec @@ -60,7 +60,7 @@ _0202BEF0: bl GetMonData cmp r0, #0x0 beq _0202BF08 - bl ErrorHandling + bl GF_AssertFail _0202BF08: add r4, r4, #0x1 add r5, #0xec @@ -178,7 +178,7 @@ FUN_0202BFD8: ; 0x0202BFD8 add r4, r2, #0x0 cmp r5, #0x6 blt _0202BFE8 - bl ErrorHandling + bl GF_AssertFail _0202BFE8: mov r0, #0xec mul r0, r5 diff --git a/arm9/asm/unk_0202D394.s b/arm9/asm/unk_0202D394.s index 1a6f2b87..ce635a79 100644 --- a/arm9/asm/unk_0202D394.s +++ b/arm9/asm/unk_0202D394.s @@ -38,7 +38,7 @@ _0202D3BC: _0202D3CC: cmp r7, #0x0 bne _0202D3D4 - bl ErrorHandling + bl GF_AssertFail _0202D3D4: add r0, r5, #0x0 add r1, r4, #0x0 diff --git a/arm9/asm/unk_0202D4C4.s b/arm9/asm/unk_0202D4C4.s index deb9a6ea..a809e579 100644 --- a/arm9/asm/unk_0202D4C4.s +++ b/arm9/asm/unk_0202D4C4.s @@ -276,7 +276,7 @@ _0202D69E: ldr r0, _0202D710 ; =0x0000FFFE cmp r7, r0 blt _0202D6A8 - bl ErrorHandling + bl GF_AssertFail _0202D6A8: ldr r0, [sp, #0x0] bl FUN_0202D9A0 diff --git a/arm9/asm/unk_0202D8D0.s b/arm9/asm/unk_0202D8D0.s index d457ca4a..13ed76b8 100644 --- a/arm9/asm/unk_0202D8D0.s +++ b/arm9/asm/unk_0202D8D0.s @@ -110,7 +110,7 @@ _0202D94C: ldr r0, [r0, #0x0] cmp r0, #0x0 bne _0202D958 - bl ErrorHandling + bl GF_AssertFail _0202D958: ldr r0, _0202D99C ; =UNK_021C59E0 ldr r1, [r0, #0x0] @@ -169,7 +169,7 @@ _0202D9B6: ldr r0, [r0, #0x0] cmp r0, #0x0 bne _0202D9C2 - bl ErrorHandling + bl GF_AssertFail _0202D9C2: ldr r0, _0202DA00 ; =UNK_021C59E0 ldr r1, [r0, #0x0] diff --git a/arm9/asm/unk_0202DB14.s b/arm9/asm/unk_0202DB14.s index 22ffb2e4..490da58f 100644 --- a/arm9/asm/unk_0202DB14.s +++ b/arm9/asm/unk_0202DB14.s @@ -942,7 +942,7 @@ _0202E1EE: ldr r0, [sp, #0x8] cmp r0, #0x0 bge _0202E1F8 - bl ErrorHandling + bl GF_AssertFail _0202E1F8: ldr r0, _0202E254 ; =UNK_021C59E4 mov r2, #0xda diff --git a/arm9/asm/unk_020336C0.s b/arm9/asm/unk_020336C0.s index ac3863f2..4f2d4dc3 100644 --- a/arm9/asm/unk_020336C0.s +++ b/arm9/asm/unk_020336C0.s @@ -55,11 +55,11 @@ _02033714: add r5, r0, #0x0 cmp r5, #0x2 bne _02033722 - bl ErrorHandling + bl GF_AssertFail _02033722: cmp r5, #0x3 bne _0203372A - bl ErrorHandling + bl GF_AssertFail _0203372A: cmp r5, #0x1 bne _02033774 @@ -81,11 +81,11 @@ _0203374A: add r5, r0, #0x0 cmp r5, #0x3 bne _02033758 - bl ErrorHandling + bl GF_AssertFail _02033758: cmp r5, #0x1 bne _02033760 - bl ErrorHandling + bl GF_AssertFail _02033760: cmp r5, #0x2 bne _02033774 diff --git a/arm9/asm/unk_02033874.s b/arm9/asm/unk_02033874.s index ddd4483b..dfad7db2 100644 --- a/arm9/asm/unk_02033874.s +++ b/arm9/asm/unk_02033874.s @@ -191,7 +191,7 @@ _020339D8: str r0, [r6, #0x0] cmp r0, #0x3 bne _020339FE - bl ErrorHandling + bl GF_AssertFail _020339FE: ldr r0, [r6, #0x0] cmp r0, #0x0 diff --git a/arm9/asm/unk_020343A8.s b/arm9/asm/unk_020343A8.s index 88fd2560..a4cac7e7 100644 --- a/arm9/asm/unk_020343A8.s +++ b/arm9/asm/unk_020343A8.s @@ -53,7 +53,7 @@ _020343D8: ldrb r7, [r6, #0x4] cmp r7, #0x10 bls _0203440A - bl ErrorHandling + bl GF_AssertFail _0203440A: ldr r1, _02034490 ; =0x00001196 add r0, r5, #0x0 @@ -170,7 +170,7 @@ FUN_020344D8: ; 0x020344D8 mul r0, r1 cmp r5, r0 blt _020344EC - bl ErrorHandling + bl GF_AssertFail _020344EC: lsl r0, r5, #0x1 add r1, r4, r0 @@ -185,7 +185,7 @@ FUN_020344FC: ; 0x020344FC push {r4, lr} add r4, r0, #0x0 bne _02034506 - bl ErrorHandling + bl GF_AssertFail _02034506: ldrb r0, [r4, #0x0] pop {r4, pc} @@ -196,7 +196,7 @@ FUN_0203450C: ; 0x0203450C push {r4, lr} add r4, r0, #0x0 bne _02034516 - bl ErrorHandling + bl GF_AssertFail _02034516: ldrb r0, [r4, #0x1] pop {r4, pc} @@ -216,7 +216,7 @@ FUN_0203451C: ; 0x0203451C cmp r5, r6 blt _02034536 _02034532: - bl ErrorHandling + bl GF_AssertFail _02034536: cmp r4, #0x0 blt _02034540 @@ -224,7 +224,7 @@ _02034536: cmp r4, r0 blt _02034544 _02034540: - bl ErrorHandling + bl GF_AssertFail _02034544: add r0, r4, #0x0 mul r0, r6 @@ -248,7 +248,7 @@ FUN_02034554: ; 0x02034554 cmp r4, r0 blt _0203456C _02034568: - bl ErrorHandling + bl GF_AssertFail _0203456C: lsl r0, r4, #0x1 add r0, r5, r0 @@ -269,7 +269,7 @@ FUN_02034578: ; 0x02034578 add r6, r3, #0x0 cmp r4, r0 blt _0203458A - bl ErrorHandling + bl GF_AssertFail _0203458A: ldr r0, [sp, #0x10] mul r0, r6 @@ -278,7 +278,7 @@ _0203458A: lsl r0, r0, #0x2 cmp r4, r0 blt _0203459C - bl ErrorHandling + bl GF_AssertFail _0203459C: ldr r0, _020345A4 ; =0x0000070E add r1, r5, r4 @@ -317,7 +317,7 @@ FUN_020345DC: ; 0x020345DC push {r4, lr} add r4, r0, #0x0 bne _020345E6 - bl ErrorHandling + bl GF_AssertFail _020345E6: add r0, r4, #0x0 bl FreeToHeap @@ -357,13 +357,13 @@ FUN_020345FC: ; 0x020345FC ldrb r0, [r0, #0x1] cmp r5, r0 blt _0203462E - bl ErrorHandling + bl GF_AssertFail _0203462E: add r0, sp, #0x0 ldrb r0, [r0, #0x0] cmp r4, r0 blt _0203463A - bl ErrorHandling + bl GF_AssertFail _0203463A: add r0, sp, #0x0 ldrb r0, [r0, #0x1] @@ -391,7 +391,7 @@ FUN_02034660: ; 0x02034660 add r5, r0, #0x0 add r4, r1, #0x0 bne _0203466C - bl ErrorHandling + bl GF_AssertFail _0203466C: add r0, r5, #0x0 add r1, r4, #0x0 diff --git a/arm9/asm/unk_02034A28.s b/arm9/asm/unk_02034A28.s index e4c8097a..19d0db80 100644 --- a/arm9/asm/unk_02034A28.s +++ b/arm9/asm/unk_02034A28.s @@ -11,7 +11,7 @@ FUN_02034A28: ; 0x02034A28 add r4, r1, #0x0 cmp r0, #0x0 beq _02034A38 - bl ErrorHandling + bl GF_AssertFail _02034A38: ldr r1, _02034A44 ; =0x00000AC8 add r0, r4, #0x0 @@ -28,7 +28,7 @@ FUN_02034A48: ; 0x02034A48 ldr r0, [r4, #0x14] cmp r0, #0x0 bne _02034A56 - bl ErrorHandling + bl GF_AssertFail _02034A56: ldr r0, [r4, #0x14] bl FreeToHeap @@ -43,7 +43,7 @@ FUN_02034A60: ; 0x02034A60 add r4, r1, #0x0 cmp r0, #0x0 bne _02034A70 - bl ErrorHandling + bl GF_AssertFail _02034A70: ldr r0, [r5, #0x14] add r1, r4, #0x0 @@ -76,7 +76,7 @@ FUN_02034A98: ; 0x02034A98 lsl r1, r1, #0xa cmp r0, r1 blo _02034AB8 - bl ErrorHandling + bl GF_AssertFail _02034AB8: add r5, #0x20 add r0, r5, #0x0 @@ -94,7 +94,7 @@ FUN_02034AC8: ; 0x02034AC8 ldr r4, [r0, #0x4] cmp r0, #0x0 bne _02034AD8 - bl ErrorHandling + bl GF_AssertFail _02034AD8: cmp r4, #0x0 beq _02034AEC @@ -232,7 +232,7 @@ _02034B9C: cmp r2, r5 blo _02034B8A _02034BA4: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3-r7, pc} @@ -261,7 +261,7 @@ _02034BCC: cmp r3, r5 blo _02034BBC _02034BD4: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r4-r6, pc} @@ -290,7 +290,7 @@ _02034BFC: cmp r3, r5 blo _02034BEC _02034C04: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r4-r6, pc} @@ -452,7 +452,7 @@ FUN_02034CEC: ; 0x02034CEC lsl r1, r1, #0x8 cmp r0, r1 blo _02034D1C - bl ErrorHandling + bl GF_AssertFail _02034D1C: mov r0, #0x82 lsl r0, r0, #0x4 @@ -469,7 +469,7 @@ FUN_02034D2C: ; 0x02034D2C ldr r0, [r4, #0x14] cmp r0, #0x0 bne _02034D3A - bl ErrorHandling + bl GF_AssertFail _02034D3A: mov r0, #0x82 ldr r1, [r4, #0x14] diff --git a/arm9/asm/unk_02034E84.s b/arm9/asm/unk_02034E84.s index 2a2e5e37..45f0b5d0 100644 --- a/arm9/asm/unk_02034E84.s +++ b/arm9/asm/unk_02034E84.s @@ -75,7 +75,7 @@ FUN_02034E78: ; 0x02034E78 cmp r0, #0x14 bls _02034E88 _02034E82: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x1 _02034E88: sub r0, r0, #0x1 diff --git a/arm9/asm/unk_02034FE4.s b/arm9/asm/unk_02034FE4.s index 8ff7abe0..81135415 100644 --- a/arm9/asm/unk_02034FE4.s +++ b/arm9/asm/unk_02034FE4.s @@ -136,14 +136,14 @@ FUN_02034FE4: ; 0x02034FE4 bl Sav2_SysInfo_RTC_get add r6, r0, #0x0 add r0, r6, #0x4 - bl FUN_02012710 + bl GF_RTC_GetDayOfYear sub r5, r0, #0x1 bmi _0203500C ldr r0, _02035060 ; =0x0000016E cmp r5, r0 blt _02035010 _0203500C: - bl ErrorHandling + bl GF_AssertFail _02035010: ldr r0, [r6, #0x8] cmp r0, #0x2 diff --git a/arm9/asm/unk_020372D4.s b/arm9/asm/unk_020372D4.s index c2bab3d0..26a50555 100644 --- a/arm9/asm/unk_020372D4.s +++ b/arm9/asm/unk_020372D4.s @@ -83,13 +83,13 @@ LoadOverlay_MODULE_05: ; 0x02037350 ldr r0, [r0, #0x4] cmp r0, #0x0 beq _02037360 - bl ErrorHandling + bl GF_AssertFail _02037360: ldr r0, [r4, #0x0] ldr r0, [r0, #0x0] cmp r0, #0x0 beq _0203736C - bl ErrorHandling + bl GF_AssertFail _0203736C: ldr r0, _0203738C ; =SDK_OVERLAY_MODULE_05_ID mov r1, #0x2 @@ -166,7 +166,7 @@ FUN_020373D4: ; 0x020373D4 add r6, r2, #0x0 cmp r0, #0x0 beq _020373E8 - bl ErrorHandling + bl GF_AssertFail _020373E8: add r0, r5, #0x0 bl FUN_02037394 diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s index 7c45ad7a..9c2132bf 100644 --- a/arm9/asm/unk_020377F0.s +++ b/arm9/asm/unk_020377F0.s @@ -322,7 +322,7 @@ _020378BC: str r1, [r0, #0x0] b _020378C8 _020378C4: - bl ErrorHandling + bl GF_AssertFail _020378C8: ldr r1, _020378F4 ; =UNK_02105DB8 add r0, r6, #0x0 @@ -357,7 +357,7 @@ FUN_020378FC: ; 0x020378FC bl FUN_0206E384 cmp r0, #0x5 bne _02037916 - bl ErrorHandling + bl GF_AssertFail _02037916: add r0, r4, #0x0 pop {r3-r5, pc} @@ -2333,7 +2333,7 @@ FUN_020388B4: ; 0x020388B4 bl MOD05_021ED49C add r5, r0, #0x0 bne _020388CC - bl ErrorHandling + bl GF_AssertFail _020388CC: add r0, r4, #0x0 add r1, r5, #0x0 @@ -2417,7 +2417,7 @@ _02038956: ldr r1, [r5, #0x8] ldr r2, [sp, #0x4] add r3, r6, #0x0 - bl FUN_020127C0 + bl GF_RTC_TimeDelta mov r2, #0x3c mov r3, #0x0 bl _ll_sdiv diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s index b60088a5..bcf7b7cf 100644 --- a/arm9/asm/unk_02038C78.s +++ b/arm9/asm/unk_02038C78.s @@ -1035,7 +1035,7 @@ _02038DA8: ldrb r0, [r4, #0x9] cmp r0, #0x0 bne _02038DC8 - bl ErrorHandling + bl GF_AssertFail _02038DC8: mov r0, #0x0 str r0, [r5, #0x38] @@ -1089,7 +1089,7 @@ CreateFieldContext: ; 0x02038E20 bl AllocFromHeap add r4, r0, #0x0 bne _02038E32 - bl ErrorHandling + bl GF_AssertFail _02038E32: add r0, r4, #0x0 mov r1, #0x0 @@ -1164,7 +1164,7 @@ CreateScriptContext: ; 0x02038EB0 bl AllocFromHeap add r4, r0, #0x0 bne _02038EC6 - bl ErrorHandling + bl GF_AssertFail _02038EC6: ldr r2, _02038EE4 ; =sNumScriptCmds ldr r1, _02038EE8 ; =gScriptCmdTable @@ -1865,7 +1865,7 @@ _02039426: add r0, r0, r1 pop {r3, pc} _02039430: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3, pc} @@ -1880,7 +1880,7 @@ FUN_02039438: ; 0x02039438 ldr r0, _0203945C ; =0x0003643F cmp r1, r0 beq _02039450 - bl ErrorHandling + bl GF_AssertFail _02039450: add r0, r4, #0x0 add r1, r5, #0x0 @@ -1989,7 +1989,7 @@ FUN_02039504: ; 0x02039504 add r5, r0, #0x0 cmp r4, #0x10 blo _02039512 - bl ErrorHandling + bl GF_AssertFail _02039512: ldr r1, _02039524 ; =0x00004020 add r0, r5, #0x0 @@ -2236,7 +2236,7 @@ _020396C0: _020396CE: cmp r1, #0xe5 blo _020396DA - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r4, pc} _020396DA: @@ -2280,7 +2280,7 @@ _02039718: _02039726: cmp r1, #0xe5 blo _02039732 - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3-r7, pc} _02039732: diff --git a/arm9/asm/unk_02047500.s b/arm9/asm/unk_02047500.s index 905cf7b1..4a5b00a0 100644 --- a/arm9/asm/unk_02047500.s +++ b/arm9/asm/unk_02047500.s @@ -79,7 +79,7 @@ FUN_0204755C: ; 0x0204755C add r4, r1, #0x0 cmp r5, #0x1f blo _0204756A - bl ErrorHandling + bl GF_AssertFail _0204756A: ldr r0, _02047580 ; =UNK_020F457C lsl r1, r5, #0x2 @@ -101,7 +101,7 @@ FUN_02047588: ; 0x02047588 add r4, r0, #0x0 cmp r4, #0x1f blo _02047594 - bl ErrorHandling + bl GF_AssertFail _02047594: ldr r0, _0204759C ; =UNK_020F457E lsl r1, r4, #0x2 diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s index 54679259..a06056dd 100644 --- a/arm9/asm/unk_020476CC.s +++ b/arm9/asm/unk_020476CC.s @@ -327,7 +327,7 @@ _0204796C: ldr r0, [r5, #0x4] cmp r0, #0x0 bne _02047976 - bl ErrorHandling + bl GF_AssertFail _02047976: ldr r0, [r5, #0x4] bl FreeToHeap @@ -343,7 +343,7 @@ _02047988: ldr r0, [r0, #0x0] cmp r0, #0x0 bne _02047996 - bl ErrorHandling + bl GF_AssertFail _02047996: add r0, r4, #0x0 add r0, #0xf8 @@ -361,7 +361,7 @@ _020479B0: ldr r0, [r4, r6] cmp r0, #0x0 bne _020479BA - bl ErrorHandling + bl GF_AssertFail _020479BA: mov r0, #0x46 lsl r0, r0, #0x2 @@ -399,7 +399,7 @@ FUN_020479FC: ; 0x020479FC add r6, r1, #0x0 cmp r4, #0x4 blt _02047A0C - bl ErrorHandling + bl GF_AssertFail _02047A0C: lsl r0, r4, #0x2 add r0, r5, r0 @@ -408,7 +408,7 @@ _02047A0C: bl AddMonToParty cmp r0, #0x0 bne _02047A20 - bl ErrorHandling + bl GF_AssertFail _02047A20: pop {r4-r6, pc} .balign 4 @@ -421,7 +421,7 @@ FUN_02047A24: ; 0x02047A24 add r6, r1, #0x0 cmp r4, #0x4 blt _02047A34 - bl ErrorHandling + bl GF_AssertFail _02047A34: lsl r1, r4, #0x2 add r1, r5, r1 @@ -439,7 +439,7 @@ FUN_02047A44: ; 0x02047A44 add r6, r1, #0x0 cmp r4, #0x4 blt _02047A54 - bl ErrorHandling + bl GF_AssertFail _02047A54: lsl r1, r4, #0x2 add r1, r5, r1 @@ -1144,7 +1144,7 @@ _02048054: ldr r0, [r0, r1] pop {r3-r5, pc} _02048060: - bl ErrorHandling + bl GF_AssertFail mov r0, #0xc pop {r3-r5, pc} .balign 4 diff --git a/arm9/asm/unk_02048120.s b/arm9/asm/unk_02048120.s index 7c046e25..96cfbab6 100644 --- a/arm9/asm/unk_02048120.s +++ b/arm9/asm/unk_02048120.s @@ -67,7 +67,7 @@ FUN_02048164: ; 0x02048164 bl AllocFromHeap add r4, r0, #0x0 bne _0204817A - bl ErrorHandling + bl GF_AssertFail _0204817A: add r0, r4, #0x0 mov r1, #0x0 diff --git a/arm9/asm/unk_02048904.s b/arm9/asm/unk_02048904.s index 1fcababe..f926f722 100644 --- a/arm9/asm/unk_02048904.s +++ b/arm9/asm/unk_02048904.s @@ -140,7 +140,7 @@ FUN_020489DC: ; 0x020489DC ldr r0, [r4, #0x6c] cmp r0, #0x5 blt _020489EA - bl ErrorHandling + bl GF_AssertFail _020489EA: ldr r0, [r4, #0x70] ldr r0, [r0, #0x0] @@ -226,7 +226,7 @@ _02048A82: bl MapHeader_GetCameraType cmp r6, r0 beq _02048AB4 - bl ErrorHandling + bl GF_AssertFail b _02048AB4 _02048AA6: add r0, r7, #0x0 @@ -341,7 +341,7 @@ FUN_02048B90: ; 0x02048B90 ldr r0, [r4, #0x58] cmp r0, #0x0 beq _02048BA2 - bl ErrorHandling + bl GF_AssertFail _02048BA2: ldr r0, [r4, #0x1c] ldr r1, [r4, #0x28] @@ -368,7 +368,7 @@ _02048BD8: ldr r0, [r4, #0x6c] cmp r0, #0x5 blt _02048BE2 - bl ErrorHandling + bl GF_AssertFail _02048BE2: ldr r0, [r4, #0x6c] ldr r1, _02048C28 ; =UNK_020F46E0 @@ -413,7 +413,7 @@ FUN_02048C2C: ; 0x02048C2C ldr r0, [r4, #0x58] cmp r0, #0x0 bne _02048C3A - bl ErrorHandling + bl GF_AssertFail _02048C3A: mov r0, #0x0 str r0, [r4, #0x58] @@ -1064,7 +1064,7 @@ FUN_02049160: ; 0x02049160 bl FUN_0203739C cmp r0, #0x0 beq _02049186 - bl ErrorHandling + bl GF_AssertFail pop {r3-r7, pc} _02049186: mov r0, #0x0 @@ -1431,7 +1431,7 @@ FUN_02049430: ; 0x02049430 bl FUN_0203739C cmp r0, #0x0 bne _02049452 - bl ErrorHandling + bl GF_AssertFail pop {r4-r6, pc} _02049452: ldr r0, [r5, #0x38] @@ -1561,7 +1561,7 @@ _0204954A: bl FUN_020637E0 b _0204955A _02049556: - bl ErrorHandling + bl GF_AssertFail _0204955A: add r0, r7, #0x0 bl FUN_020495B0 @@ -1682,7 +1682,7 @@ FUN_0204961C: ; 0x0204961C bl FUN_0203739C cmp r0, #0x0 bne _0204963E - bl ErrorHandling + bl GF_AssertFail pop {r4-r6, pc} _0204963E: ldr r2, [r6, #0x4] @@ -1883,11 +1883,11 @@ _020497A4: sub r4, r0, #0x6 cmp r6, #0x0 bge _020497D4 - bl ErrorHandling + bl GF_AssertFail _020497D4: cmp r4, #0x0 bge _020497DC - bl ErrorHandling + bl GF_AssertFail _020497DC: lsr r2, r6, #0x1f lsl r1, r6, #0x1f @@ -2395,7 +2395,7 @@ _02049BF4: ldr r0, _02049C08 ; =FUN_02049ACC pop {r3, pc} _02049BFC: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3, pc} .balign 4 @@ -2502,7 +2502,7 @@ FUN_02049CB0: ; 0x02049CB0 bl FUN_0203739C cmp r0, #0x0 beq _02049CD6 - bl ErrorHandling + bl GF_AssertFail pop {r3-r7, pc} _02049CD6: mov r0, #0x0 diff --git a/arm9/asm/unk_0204A368.s b/arm9/asm/unk_0204A368.s index 6a4e5e9b..f1f19746 100644 --- a/arm9/asm/unk_0204A368.s +++ b/arm9/asm/unk_0204A368.s @@ -160,7 +160,7 @@ _0204A478: _0204A482: cmp r4, #0x10 blo _0204A48A - bl ErrorHandling + bl GF_AssertFail _0204A48A: lsl r0, r4, #0x1 strh r5, [r6, r0] diff --git a/arm9/asm/unk_0204A498.s b/arm9/asm/unk_0204A498.s index 4a255af1..67863650 100644 --- a/arm9/asm/unk_0204A498.s +++ b/arm9/asm/unk_0204A498.s @@ -295,7 +295,7 @@ _0204A69C: str r1, [r0, #0x0] pop {r3, pc} _0204A6A6: - bl ErrorHandling + bl GF_AssertFail pop {r3, pc} .balign 4 _0204A6AC: .word UNK_020F4708 @@ -404,7 +404,7 @@ _0204A754: blt _0204A768 cmp r4, #0x0 bne _0204A76A - bl ErrorHandling + bl GF_AssertFail b _0204A76A _0204A768: mov r4, #0x0 @@ -542,7 +542,7 @@ FUN_0204A840: ; 0x0204A840 cmp r7, #0x0 bge _0204A868 _0204A864: - bl ErrorHandling + bl GF_AssertFail _0204A868: lsl r0, r6, #0x10 str r0, [r5, #0x0] diff --git a/arm9/asm/unk_0204AF24.s b/arm9/asm/unk_0204AF24.s index e6593c72..fb084cbc 100644 --- a/arm9/asm/unk_0204AF24.s +++ b/arm9/asm/unk_0204AF24.s @@ -26,7 +26,7 @@ FUN_0204AF3C: ; 0x0204AF3C bl FUN_0203739C cmp r0, #0x0 bne _0204AF54 - bl ErrorHandling + bl GF_AssertFail pop {r3-r5, pc} _0204AF54: add r0, r4, #0x0 @@ -62,7 +62,7 @@ FUN_0204AF84: ; 0x0204AF84 bl FUN_0203739C cmp r0, #0x0 beq _0204AF9C - bl ErrorHandling + bl GF_AssertFail pop {r3-r5, pc} _0204AF9C: add r0, r4, #0x0 @@ -97,7 +97,7 @@ FUN_0204AFC8: ; 0x0204AFC8 bl FUN_0203739C cmp r0, #0x0 bne _0204AFE2 - bl ErrorHandling + bl GF_AssertFail add sp, #0xc pop {r3-r4, pc} _0204AFE2: @@ -130,7 +130,7 @@ FUN_0204B00C: ; 0x0204B00C bl FUN_0203739C cmp r0, #0x0 bne _0204B026 - bl ErrorHandling + bl GF_AssertFail add sp, #0xc pop {r3-r4, pc} _0204B026: diff --git a/arm9/asm/unk_0204B34C.s b/arm9/asm/unk_0204B34C.s index fe9cc3fd..ff93214d 100644 --- a/arm9/asm/unk_0204B34C.s +++ b/arm9/asm/unk_0204B34C.s @@ -532,7 +532,7 @@ _0204B73A: add r4, r4, #0x1 b _0204B746 _0204B742: - bl ErrorHandling + bl GF_AssertFail _0204B746: add r0, r7, #0x0 add r1, r6, #0x0 @@ -604,7 +604,7 @@ _0204B7C0: add r4, r4, #0x1 b _0204B7CC _0204B7C8: - bl ErrorHandling + bl GF_AssertFail _0204B7CC: ldr r0, [r5, #0x34] add r1, r7, #0x0 diff --git a/arm9/asm/unk_0204B9EC.s b/arm9/asm/unk_0204B9EC.s index 04b6134b..2511f182 100644 --- a/arm9/asm/unk_0204B9EC.s +++ b/arm9/asm/unk_0204B9EC.s @@ -44,7 +44,7 @@ FUN_0204BA1C: ; 0x0204BA1C add r2, r0, #0x0 ldr r0, [r1, #0x40] ldr r1, [r1, #0x44] - bl FUN_020127C0 + bl GF_RTC_TimeDelta mov r2, #0xfa mov r3, #0x0 lsl r2, r2, #0x2 @@ -157,7 +157,7 @@ FUN_0204BAF4: ; 0x0204BAF4 cmp r5, r0 bls _0204BB08 _0204BB04: - bl ErrorHandling + bl GF_AssertFail _0204BB08: mov r3, #0x6 add r0, r4, #0x0 @@ -267,7 +267,7 @@ FUN_0204BBC4: ; 0x0204BBC4 lsr r5, r0, #0x10 cmp r5, #0xa blo _0204BBDE - bl ErrorHandling + bl GF_AssertFail _0204BBDE: add r0, r5, #0x5 str r0, [r4, #0x38] @@ -373,7 +373,7 @@ _0204BC86: lsl r0, r0, #0x10 lsr r0, r0, #0x10 bne _0204BC94 - bl ErrorHandling + bl GF_AssertFail _0204BC94: add r0, r6, #0x0 add r0, #0x14 @@ -405,7 +405,7 @@ _0204BCA4: lsr r0, r0, #0x10 cmp r4, r0 blo _0204BCD8 - bl ErrorHandling + bl GF_AssertFail _0204BCD8: cmp r4, #0x14 bge _0204BCE0 @@ -437,7 +437,7 @@ _0204BD04: add r0, #0x8 cmp r1, #0x6 blt _0204BCE6 - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3-r7, pc} .balign 4 @@ -463,7 +463,7 @@ _0204BD28: strb r1, [r0, #0x0] pop {r4, pc} _0204BD3A: - bl ErrorHandling + bl GF_AssertFail _0204BD3E: pop {r4, pc} diff --git a/arm9/asm/unk_0204C1B4.s b/arm9/asm/unk_0204C1B4.s index 73f9c7a5..6efee84e 100644 --- a/arm9/asm/unk_0204C1B4.s +++ b/arm9/asm/unk_0204C1B4.s @@ -186,7 +186,7 @@ _0204C2F4: mov r4, #0x6 b _0204C36A _0204C302: - bl ErrorHandling + bl GF_AssertFail b _0204C36A _0204C308: ldr r0, [sp, #0x8] @@ -207,7 +207,7 @@ _0204C320: mov r4, #0x6 b _0204C36A _0204C32E: - bl ErrorHandling + bl GF_AssertFail b _0204C36A _0204C334: ldr r0, [sp, #0x8] @@ -229,10 +229,10 @@ _0204C356: bl FUN_02034930 cmp r0, #0x0 bne _0204C36A - bl ErrorHandling + bl GF_AssertFail b _0204C36A _0204C366: - bl ErrorHandling + bl GF_AssertFail _0204C36A: ldr r1, _0204C37C ; =FUN_0204C380 add r0, r7, #0x0 @@ -556,7 +556,7 @@ _0204C5E6: bl FUN_0205ADDC b _0204C5F6 _0204C5F2: - bl ErrorHandling + bl GF_AssertFail _0204C5F6: ldr r0, [r4, #0x4] add r0, r0, #0x1 @@ -926,7 +926,7 @@ _0204C8EA: bl FUN_0205ADDC b _0204C8FC _0204C8F8: - bl ErrorHandling + bl GF_AssertFail _0204C8FC: ldr r0, [r4, #0x4] add r0, r0, #0x1 diff --git a/arm9/asm/unk_0204CB20.s b/arm9/asm/unk_0204CB20.s index 52fbcfa7..a0dc5ce2 100644 --- a/arm9/asm/unk_0204CB20.s +++ b/arm9/asm/unk_0204CB20.s @@ -360,7 +360,7 @@ FUN_0204CD78: ; 0x0204CD78 bl FUN_02064520 b _0204CDA2 _0204CD9E: - bl ErrorHandling + bl GF_AssertFail _0204CDA2: ldr r0, _0204CDB0 ; =UNK_021C5A68 mov r1, #0x0 @@ -1129,7 +1129,7 @@ _0204D37C: bl FUN_02055068 add r7, r0, #0x0 bne _0204D3B2 - bl ErrorHandling + bl GF_AssertFail _0204D3B2: ldr r0, _0204D430 ; =UNK_021C5A68 ldr r0, [r0, #0x0] @@ -1503,11 +1503,11 @@ FUN_0204D67C: ; 0x0204D67C beq _0204D6B8 cmp r1, #0x1 beq _0204D692 - bl ErrorHandling + bl GF_AssertFail _0204D692: cmp r5, #0x8 blt _0204D69A - bl ErrorHandling + bl GF_AssertFail _0204D69A: ldrb r0, [r4, #0x0] mov r1, #0x1 @@ -1519,7 +1519,7 @@ _0204D69A: _0204D6A8: cmp r1, #0x0 bne _0204D6B0 - bl ErrorHandling + bl GF_AssertFail _0204D6B0: ldrb r1, [r4, #0x0] add r0, r5, #0x0 @@ -1773,7 +1773,7 @@ FUN_0204D870: ; 0x0204D870 cmp r4, #0x5 str r0, [r2, #0x0] blt _0204D88E - bl ErrorHandling + bl GF_AssertFail _0204D88E: lsl r1, r4, #0x2 add r0, sp, #0x0 @@ -2180,7 +2180,7 @@ _0204DB5A: bl FUN_0204A6B4 cmp r0, #0x0 beq _0204DBBC - bl ErrorHandling + bl GF_AssertFail _0204DBBC: pop {r3-r7, pc} nop @@ -4023,7 +4023,7 @@ FUN_0204E96C: ; 0x0204E96C ldrb r0, [r5, #0x1] cmp r0, #0x8 blo _0204E988 - bl ErrorHandling + bl GF_AssertFail _0204E988: ldrb r0, [r5, #0x0] cmp r0, #0x4 @@ -5605,7 +5605,7 @@ _0204F62A: mov r0, #0x2 pop {r3, pc} _0204F632: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x2 pop {r3, pc} .balign 4 @@ -6052,11 +6052,11 @@ _0204F96E: add r5, r0, #0x0 cmp r4, #0x0 bne _0204F988 - bl ErrorHandling + bl GF_AssertFail _0204F988: cmp r5, #0x0 bne _0204F990 - bl ErrorHandling + bl GF_AssertFail _0204F990: add r0, r4, #0x0 add r1, r5, #0x0 @@ -6150,7 +6150,7 @@ _0204FA26: strb r2, [r1, r0] pop {r3-r7, pc} _0204FA4C: - bl ErrorHandling + bl GF_AssertFail add sp, #0x8 pop {r3-r7, pc} .balign 4 diff --git a/arm9/asm/unk_0204FBA8.s b/arm9/asm/unk_0204FBA8.s index 32c2e3c1..f1101a82 100644 --- a/arm9/asm/unk_0204FBA8.s +++ b/arm9/asm/unk_0204FBA8.s @@ -2093,7 +2093,7 @@ FUN_02050BF8: ; 0x02050BF8 add r4, r0, #0x0 cmp r4, #0x4 blt _02050C04 - bl ErrorHandling + bl GF_AssertFail _02050C04: ldr r0, _02050C10 ; =UNK_021C5A6C ldr r1, [r0, #0x0] diff --git a/arm9/asm/unk_020520AC.s b/arm9/asm/unk_020520AC.s index d29ed837..8ff9a9a1 100644 --- a/arm9/asm/unk_020520AC.s +++ b/arm9/asm/unk_020520AC.s @@ -125,7 +125,7 @@ FUN_020520AC: ; 0x020520AC push {r3-r5, lr} add r4, r0, #0x0 bne _020520B6 - bl ErrorHandling + bl GF_AssertFail _020520B6: ldr r0, [r4, #0x78] cmp r0, #0x0 @@ -814,7 +814,7 @@ _020525F4: mov r0, #0x5 pop {r4-r6, pc} _020525F8: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -1144,7 +1144,7 @@ FUN_02052814: ; 0x02052814 mvn r0, r0 cmp r4, r0 bne _02052836 - bl ErrorHandling + bl GF_AssertFail b _02052836 _02052834: add r5, r4, #0x0 @@ -1516,7 +1516,7 @@ _02052AF2: ldr r0, [r0, r1] pop {r4-r6, pc} _02052AFA: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x28 pop {r4-r6, pc} nop diff --git a/arm9/asm/unk_02052EE8.s b/arm9/asm/unk_02052EE8.s index 3d8839c2..0c163fd8 100644 --- a/arm9/asm/unk_02052EE8.s +++ b/arm9/asm/unk_02052EE8.s @@ -300,7 +300,7 @@ FUN_02053104: ; 0x02053104 ldr r0, [r0, r5] cmp r3, r0 beq _02053120 - bl ErrorHandling + bl GF_AssertFail _02053120: pop {r4-r6, pc} nop @@ -426,7 +426,7 @@ _02053206: bl FUN_02058060 add r5, r0, #0x0 bne _02053216 - bl ErrorHandling + bl GF_AssertFail _02053216: ldrb r0, [r4, #0xd] cmp r0, #0x4 @@ -761,7 +761,7 @@ _020534AC: bl FUN_02058060 add r4, r0, #0x0 bne _020534BC - bl ErrorHandling + bl GF_AssertFail _020534BC: add r0, r4, #0x0 mov r1, #0x1 @@ -787,7 +787,7 @@ FUN_020534DC: ; 0x020534DC bl FUN_02058060 add r4, r0, #0x0 bne _020534F0 - bl ErrorHandling + bl GF_AssertFail _020534F0: add r0, r4, #0x0 bl FUN_0205AD98 @@ -811,7 +811,7 @@ _0205350E: bl FUN_02058060 add r4, r0, #0x0 bne _02053524 - bl ErrorHandling + bl GF_AssertFail _02053524: ldrb r1, [r5, #0x8] add r0, r4, #0x0 diff --git a/arm9/asm/unk_0205363C.s b/arm9/asm/unk_0205363C.s index 3b13ed24..2e5f334e 100644 --- a/arm9/asm/unk_0205363C.s +++ b/arm9/asm/unk_0205363C.s @@ -148,7 +148,7 @@ _020536EE: ldr r0, [r0, r1] pop {r4, pc} _020536F8: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 _020536FE: pop {r4, pc} diff --git a/arm9/asm/unk_02053750.s b/arm9/asm/unk_02053750.s index 0cf428b2..38f594ef 100644 --- a/arm9/asm/unk_02053750.s +++ b/arm9/asm/unk_02053750.s @@ -1222,7 +1222,7 @@ FUN_02054008: ; 0x02054008 bl FUN_0201FE94 add r4, r0, #0x0 bne _02054064 - bl ErrorHandling + bl GF_AssertFail _02054064: add r0, r4, #0x0 add sp, #0x30 diff --git a/arm9/asm/unk_02055068.s b/arm9/asm/unk_02055068.s index 7db8d152..61561cbe 100644 --- a/arm9/asm/unk_02055068.s +++ b/arm9/asm/unk_02055068.s @@ -82,7 +82,7 @@ FUN_02055108: ; 0x02055108 bl FUN_020553A0 add r4, r0, #0x0 bne _02055118 - bl ErrorHandling + bl GF_AssertFail _02055118: add r0, r4, #0x0 bl FUN_02058578 @@ -139,7 +139,7 @@ FUN_0205517C: ; 0x0205517C bl AllocFromHeap add r4, r0, #0x0 bne _0205518E - bl ErrorHandling + bl GF_AssertFail _0205518E: add r0, r4, #0x0 mov r1, #0x0 @@ -208,7 +208,7 @@ FUN_02055208: ; 0x02055208 bl FUN_0205753C add r5, r0, #0x0 bne _02055228 - bl ErrorHandling + bl GF_AssertFail _02055228: add r0, r5, #0x0 mov r1, #0xff @@ -300,7 +300,7 @@ FUN_020552E4: ; 0x020552E4 bl FUN_020552A4 add r4, r0, #0x0 bne _020552F2 - bl ErrorHandling + bl GF_AssertFail _020552F2: add r0, r4, #0x0 pop {r4, pc} @@ -432,7 +432,7 @@ FUN_020553A8: ; 0x020553A8 add r5, r0, #0x0 cmp r4, #0x3 blt _020553B6 - bl ErrorHandling + bl GF_AssertFail _020553B6: add r0, r5, #0x0 add r1, r4, #0x0 @@ -446,7 +446,7 @@ FUN_020553C4: ; 0x020553C4 push {r4, lr} add r4, r0, #0x0 bne _020553CE - bl ErrorHandling + bl GF_AssertFail _020553CE: ldr r0, [r4, #0x18] pop {r4, pc} @@ -884,7 +884,7 @@ _0205563A: mov r0, #0xc9 pop {r3, pc} _0205563E: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3, pc} .balign 4 @@ -937,7 +937,7 @@ _0205568A: lsl r0, r0, #0x8 pop {r3, pc} _02055690: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x1 pop {r3, pc} diff --git a/arm9/asm/unk_020557F4.s b/arm9/asm/unk_020557F4.s index c2c01f1c..0a5c6e31 100644 --- a/arm9/asm/unk_020557F4.s +++ b/arm9/asm/unk_020557F4.s @@ -1157,7 +1157,7 @@ _0205614C: add sp, #0xc pop {r4-r7, pc} _02056162: - bl ErrorHandling + bl GF_AssertFail add sp, #0xc pop {r4-r7, pc} .balign 4 @@ -1248,7 +1248,7 @@ _02056204: mov r0, #0x2 pop {r3, pc} _02056208: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3, pc} @@ -1709,7 +1709,7 @@ _0205657E: mov r0, #0x1 pop {r3, pc} _02056582: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3, pc} .balign 4 @@ -2096,7 +2096,7 @@ _0205689A: mov r0, #0x1 pop {r3, pc} _0205689E: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3, pc} .balign 4 @@ -3227,7 +3227,7 @@ _02057172: b _0205718E _02057188: mov r4, #0x0 - bl ErrorHandling + bl GF_AssertFail _0205718E: add r0, r4, #0x0 pop {r3-r5, pc} diff --git a/arm9/asm/unk_02057380.s b/arm9/asm/unk_02057380.s index ef4050e3..adfa2f07 100644 --- a/arm9/asm/unk_02057380.s +++ b/arm9/asm/unk_02057380.s @@ -110,7 +110,7 @@ FUN_02057444: ; 0x02057444 bl AllocFromHeap add r5, r0, #0x0 bne _0205745A - bl ErrorHandling + bl GF_AssertFail _0205745A: mov r2, #0x4b add r0, r5, #0x0 @@ -126,7 +126,7 @@ _0205745A: bl AllocFromHeap add r4, r0, #0x0 bne _0205747E - bl ErrorHandling + bl GF_AssertFail _0205747E: add r0, r4, #0x0 mov r1, #0x0 @@ -455,7 +455,7 @@ FUN_02057750: ; 0x02057750 bl FUN_020587E0 cmp r0, #0x1 beq _02057760 - bl ErrorHandling + bl GF_AssertFail _02057760: add r0, r5, #0x0 mov r4, #0x0 @@ -497,7 +497,7 @@ FUN_020577A8: ; 0x020577A8 bl FUN_020587E0 cmp r0, #0x1 beq _020577B8 - bl ErrorHandling + bl GF_AssertFail _020577B8: add r0, r5, #0x0 mov r4, #0x0 @@ -559,7 +559,7 @@ _02057820: add r5, #0x50 cmp r4, #0x0 bgt _02057836 - bl ErrorHandling + bl GF_AssertFail _02057836: add r0, r6, #0x0 add r1, sp, #0x0 @@ -597,7 +597,7 @@ _02057866: bl FUN_02057C64 add r4, r0, #0x0 bne _0205787C - bl ErrorHandling + bl GF_AssertFail _0205787C: add r0, r4, #0x0 add r1, r5, #0x0 @@ -961,7 +961,7 @@ FUN_02057BAC: ; 0x02057BAC str r1, [sp, #0x0] cmp r5, #0x0 bne _02057BC0 - bl ErrorHandling + bl GF_AssertFail _02057BC0: lsl r0, r5, #0x5 str r0, [sp, #0x4] @@ -970,7 +970,7 @@ _02057BC0: bl AllocFromHeapAtEnd add r6, r0, #0x0 bne _02057BD4 - bl ErrorHandling + bl GF_AssertFail _02057BD4: ldr r2, [sp, #0x4] add r0, r6, #0x0 @@ -981,7 +981,7 @@ _02057BD4: bl AllocFromHeapAtEnd add r4, r0, #0x0 bne _02057BEE - bl ErrorHandling + bl GF_AssertFail _02057BEE: ldr r0, [sp, #0x0] str r0, [r4, #0x0] @@ -1023,7 +1023,7 @@ _02057C30: bl FUN_02057494 cmp r0, #0x0 bne _02057C42 - bl ErrorHandling + bl GF_AssertFail _02057C42: ldr r0, [r6, #0x0] add r4, #0x20 @@ -1135,7 +1135,7 @@ _02057D0A: bl FUN_0200CA44 add r5, r0, #0x0 bne _02057D1C - bl ErrorHandling + bl GF_AssertFail _02057D1C: add r0, r4, #0x0 add r1, r5, #0x0 @@ -1512,7 +1512,7 @@ FUN_02058060: ; 0x02058060 add r6, r1, #0x0 cmp r5, #0x0 bne _0205806E - bl ErrorHandling + bl GF_AssertFail _0205806E: add r0, r5, #0x0 bl FUN_02058368 @@ -1745,7 +1745,7 @@ FUN_02058214: ; 0x02058214 bl FUN_020589CC cmp r0, #0x1 beq _02058228 - bl ErrorHandling + bl GF_AssertFail _02058228: add r0, r5, #0x0 mov r1, #0x0 @@ -1776,7 +1776,7 @@ FUN_02058258: ; 0x02058258 bl FUN_02058CE0 cmp r0, #0x1 beq _0205826E - bl ErrorHandling + bl GF_AssertFail _0205826E: add r0, r5, #0x0 mov r1, #0x1 @@ -2046,7 +2046,7 @@ FUN_020583F4: ; 0x020583F4 ldr r0, [r4, #0x14] cmp r0, #0x0 bne _02058402 - bl ErrorHandling + bl GF_AssertFail _02058402: ldr r0, [r4, #0x14] pop {r4, pc} @@ -2279,7 +2279,7 @@ _02058504: str r1, [r0, #0x40] pop {r3, pc} _02058508: - bl ErrorHandling + bl GF_AssertFail pop {r3, pc} .balign 4 @@ -2303,7 +2303,7 @@ _02058528: ldr r0, [r0, #0x40] pop {r3, pc} _0205852C: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3, pc} @@ -2392,7 +2392,7 @@ FUN_0205858C: ; 0x0205858C add r4, r0, #0x0 cmp r5, #0x10 ble _0205859A - bl ErrorHandling + bl GF_AssertFail _0205859A: add r0, r4, #0x0 bl FUN_020585B0 @@ -2416,7 +2416,7 @@ FUN_020585B4: ; 0x020585B4 add r4, r0, #0x0 cmp r5, #0x10 ble _020585C2 - bl ErrorHandling + bl GF_AssertFail _020585C2: add r0, r4, #0x0 bl FUN_020585D8 @@ -2440,7 +2440,7 @@ FUN_020585DC: ; 0x020585DC add r4, r0, #0x0 cmp r5, #0x10 ble _020585EA - bl ErrorHandling + bl GF_AssertFail _020585EA: add r0, r4, #0x0 bl FUN_02058600 @@ -2464,7 +2464,7 @@ FUN_02058604: ; 0x02058604 add r4, r0, #0x0 cmp r5, #0x20 ble _02058612 - bl ErrorHandling + bl GF_AssertFail _02058612: add r0, r4, #0x0 bl FUN_02058628 @@ -2712,7 +2712,7 @@ FUN_02058750: ; 0x02058750 bl FUN_020589CC cmp r0, #0x1 beq _02058760 - bl ErrorHandling + bl GF_AssertFail _02058760: add r0, r4, #0x0 bl FUN_02058490 @@ -3583,7 +3583,7 @@ _02058C4C: strh r1, [r0, #0x12] pop {r3, pc} _02058C50: - bl ErrorHandling + bl GF_AssertFail pop {r3, pc} .balign 4 @@ -3607,7 +3607,7 @@ _02058C70: ldrh r0, [r0, #0x12] pop {r3, pc} _02058C74: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3, pc} @@ -3718,7 +3718,7 @@ FUN_02058CFC: ; 0x02058CFC bl FUN_02058CE0 cmp r0, #0x1 beq _02058D0C - bl ErrorHandling + bl GF_AssertFail _02058D0C: add r0, r4, #0x0 bl FUN_02058C1C @@ -3730,7 +3730,7 @@ FUN_02058D14: ; 0x02058D14 add r4, r0, #0x0 cmp r4, #0x37 blo _02058D20 - bl ErrorHandling + bl GF_AssertFail _02058D20: ldr r0, _02058D28 ; =UNK_020F6364 lsl r1, r4, #0x2 @@ -3795,7 +3795,7 @@ _02058D5C: ldr r2, [r3, #0x0] cmp r2, r1 bne _02058D52 - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3, pc} .balign 4 diff --git a/arm9/asm/unk_02058EE8.s b/arm9/asm/unk_02058EE8.s index 70e6414e..b021f2bd 100644 --- a/arm9/asm/unk_02058EE8.s +++ b/arm9/asm/unk_02058EE8.s @@ -2621,11 +2621,11 @@ FUN_02059A60: ; 0x02059A60 mvn r0, r0 cmp r5, r0 bne _02059A92 - bl ErrorHandling + bl GF_AssertFail _02059A92: cmp r5, #0x4 blt _02059A9A - bl ErrorHandling + bl GF_AssertFail _02059A9A: ldr r1, _02059ABC ; =UNK_020F6630 lsl r5, r5, #0x2 diff --git a/arm9/asm/unk_02059F04.s b/arm9/asm/unk_02059F04.s index 310d4f03..26971d97 100644 --- a/arm9/asm/unk_02059F04.s +++ b/arm9/asm/unk_02059F04.s @@ -480,7 +480,7 @@ _0205A254: str r0, [r4, #0xc] pop {r3-r7, pc} _0205A268: - bl ErrorHandling + bl GF_AssertFail add sp, #0x8 pop {r3-r7, pc} @@ -785,7 +785,7 @@ _0205A486: mvn r0, r0 cmp r1, r0 bne _0205A496 - bl ErrorHandling + bl GF_AssertFail _0205A496: add r4, r4, #0x1 lsl r0, r4, #0x2 @@ -942,7 +942,7 @@ _0205A5A2: mvn r0, r0 cmp r1, r0 bne _0205A5B2 - bl ErrorHandling + bl GF_AssertFail _0205A5B2: add r4, r4, #0x1 lsl r0, r4, #0x2 @@ -1617,7 +1617,7 @@ _0205AA9A: _0205AAA4: cmp r4, #0x0 bne _0205AAAC - bl ErrorHandling + bl GF_AssertFail _0205AAAC: add r0, r4, #0x0 pop {r4, pc} @@ -1674,7 +1674,7 @@ _0205AB0A: ldr r2, [r1, #0x0] cmp r2, #0x27 bne _0205AB02 - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3, pc} nop @@ -1965,7 +1965,7 @@ _0205AD26: _0205AD36: cmp r4, #0x4 blt _0205AD3E - bl ErrorHandling + bl GF_AssertFail _0205AD3E: add r0, r4, #0x1 lsr r2, r0, #0x1f diff --git a/arm9/asm/unk_0205AD98.s b/arm9/asm/unk_0205AD98.s index 54448e61..b780cf26 100644 --- a/arm9/asm/unk_0205AD98.s +++ b/arm9/asm/unk_0205AD98.s @@ -54,7 +54,7 @@ FUN_0205ADDC: ; 0x0205ADDC add r5, r0, #0x0 cmp r4, #0x69 blt _0205ADEA - bl ErrorHandling + bl GF_AssertFail _0205ADEA: add r0, r5, #0x0 add r1, r4, #0x0 @@ -160,7 +160,7 @@ FUN_0205AEA4: ; 0x0205AEA4 bl AllocFromHeapAtEnd add r4, r0, #0x0 bne _0205AEBA - bl ErrorHandling + bl GF_AssertFail _0205AEBA: add r2, r4, #0x0 mov r1, #0x14 @@ -179,7 +179,7 @@ _0205AEC0: bl FUN_0200CA44 add r7, r0, #0x0 bne _0205AEE4 - bl ErrorHandling + bl GF_AssertFail _0205AEE4: str r5, [r4, #0xc] str r6, [r4, #0x10] @@ -206,7 +206,7 @@ FUN_0205AEFC: ; 0x0205AEFC bl FUN_0205AE28 cmp r0, #0x1 beq _0205AF14 - bl ErrorHandling + bl GF_AssertFail _0205AF14: ldr r0, [r4, #0xc] bl FUN_0205AE50 @@ -335,7 +335,7 @@ FUN_0205AFDC: ; 0x0205AFDC add r4, r1, #0x0 cmp r7, #0x4 blt _0205AFEA - bl ErrorHandling + bl GF_AssertFail _0205AFEA: ldr r3, _0205B01C ; =UNK_020F6308 ldr r6, [r3, #0x0] @@ -362,7 +362,7 @@ _0205B004: cmp r6, #0x0 bne _0205AFF4 _0205B014: - bl ErrorHandling + bl GF_AssertFail add r0, r4, #0x0 pop {r3-r7, pc} .balign 4 diff --git a/arm9/asm/unk_0205BEF8.s b/arm9/asm/unk_0205BEF8.s index bb032e3d..3df9f7d7 100644 --- a/arm9/asm/unk_0205BEF8.s +++ b/arm9/asm/unk_0205BEF8.s @@ -530,7 +530,7 @@ _0205C266: _0205C276: cmp r5, #0x4 blt _0205C27E - bl ErrorHandling + bl GF_AssertFail _0205C27E: add r0, r5, #0x1 lsr r2, r0, #0x1f diff --git a/arm9/asm/unk_0205C334.s b/arm9/asm/unk_0205C334.s index b975a3f0..22bba443 100644 --- a/arm9/asm/unk_0205C334.s +++ b/arm9/asm/unk_0205C334.s @@ -316,7 +316,7 @@ _0205C584: ldr r0, [r2, #0x8] pop {r3, pc} _0205C588: - bl ErrorHandling + bl GF_AssertFail ldr r0, _0205C590 ; =0x0000FFFF pop {r3, pc} .balign 4 diff --git a/arm9/asm/unk_0205C598.s b/arm9/asm/unk_0205C598.s index d80c26b4..b40cf1a7 100644 --- a/arm9/asm/unk_0205C598.s +++ b/arm9/asm/unk_0205C598.s @@ -153,7 +153,7 @@ _0205C650: mov r0, #0x1 pop {r3-r7, pc} _0205C6AE: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 add sp, #0x58 pop {r3-r7, pc} @@ -627,7 +627,7 @@ _0205CA30: cmp r0, #0x0 bne _0205CA10 _0205CA40: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 add sp, #0x8 pop {r3-r7, pc} @@ -652,7 +652,7 @@ FUN_0205CA64: ; 0x0205CA64 push {r4, lr} add r4, r0, #0x0 bne _0205CA6E - bl ErrorHandling + bl GF_AssertFail _0205CA6E: add r0, r4, #0x0 bl FUN_0205CAD4 @@ -678,7 +678,7 @@ FUN_0205CA80: ; 0x0205CA80 bl AllocFromHeapAtEnd add r4, r0, #0x0 bne _0205CA9A - bl ErrorHandling + bl GF_AssertFail _0205CA9A: add r0, r4, #0x0 mov r1, #0x0 @@ -701,7 +701,7 @@ _0205CA9A: bl FUN_0200CA44 add r4, r0, #0x0 bne _0205CACC - bl ErrorHandling + bl GF_AssertFail _0205CACC: add r0, r4, #0x0 pop {r3-r7, pc} @@ -840,7 +840,7 @@ _0205CBB6: mvn r0, r0 cmp r1, r0 bne _0205CBC4 - bl ErrorHandling + bl GF_AssertFail _0205CBC4: ldr r0, [r4, #0x8] mov r1, #0x0 diff --git a/arm9/asm/unk_0205DD18.s b/arm9/asm/unk_0205DD18.s index 80b7ca1a..890feee8 100644 --- a/arm9/asm/unk_0205DD18.s +++ b/arm9/asm/unk_0205DD18.s @@ -101,7 +101,7 @@ _0205DDB6: ldrb r4, [r0, r5] cmp r4, #0x0 bne _0205DDC2 - bl ErrorHandling + bl GF_AssertFail _0205DDC2: cmp r4, #0x1 bhi _0205DDCA @@ -123,7 +123,7 @@ _0205DDCA: lsr r6, r0, #0x10 cmp r6, r4 blo _0205DDF2 - bl ErrorHandling + bl GF_AssertFail _0205DDF2: lsl r1, r5, #0x1 mov r0, #0x9 @@ -158,7 +158,7 @@ _0205DE30: lsl r7, r4, #0x1 cmp r6, r7 bge _0205DE3A - bl ErrorHandling + bl GF_AssertFail _0205DE3A: sub r0, r6, r7 lsl r0, r0, #0x18 @@ -267,7 +267,7 @@ _0205DEE0: lsr r7, r0, #0x10 cmp r7, #0x64 blo _0205DF12 - bl ErrorHandling + bl GF_AssertFail _0205DF12: cmp r7, #0x32 bhs _0205DF1A @@ -477,7 +477,7 @@ FUN_0205E080: ; 0x0205E080 add r6, r2, #0x0 cmp r4, #0x0 bne _0205E090 - bl ErrorHandling + bl GF_AssertFail _0205E090: str r4, [r5, #0x8] str r6, [r5, #0xc] @@ -726,7 +726,7 @@ _0205E24C: add r1, r1, #0x1 cmp r1, #0x3 blt _0205E23A - bl ErrorHandling + bl GF_AssertFail _0205E256: pop {r4-r6, pc} @@ -814,7 +814,7 @@ _0205E2DC: lsr r4, r0, #0x10 cmp r4, #0x64 blo _0205E2F4 - bl ErrorHandling + bl GF_AssertFail _0205E2F4: ldrb r0, [r6, r5] cmp r4, r0 @@ -970,7 +970,7 @@ _0205E426: lsl r0, r5, #0x10 lsr r0, r0, #0x10 bne _0205E430 - bl ErrorHandling + bl GF_AssertFail _0205E430: lsl r0, r5, #0x10 lsr r0, r0, #0x10 @@ -997,7 +997,7 @@ _0205E43C: lsr r0, r0, #0x10 cmp r4, r0 blo _0205E46A - bl ErrorHandling + bl GF_AssertFail _0205E46A: cmp r4, #0x0 bne _0205E472 diff --git a/arm9/asm/unk_0205EC84.s b/arm9/asm/unk_0205EC84.s index 74662b87..a0c7d147 100644 --- a/arm9/asm/unk_0205EC84.s +++ b/arm9/asm/unk_0205EC84.s @@ -50,7 +50,7 @@ _0205ECC0: bl FUN_0205EC94 pop {r3, pc} _0205ECCA: - bl ErrorHandling + bl GF_AssertFail _0205ECCE: mov r0, #0x0 pop {r3, pc} @@ -886,7 +886,7 @@ FUN_0205F2E4: ; 0x0205F2E4 add r6, r1, #0x0 cmp r4, #0x45 blo _0205F2F4 - bl ErrorHandling + bl GF_AssertFail _0205F2F4: mov r2, #0x9b lsl r2, r2, #0x4 diff --git a/arm9/asm/unk_0205F314.s b/arm9/asm/unk_0205F314.s index d6c97ced..548cd5a4 100644 --- a/arm9/asm/unk_0205F314.s +++ b/arm9/asm/unk_0205F314.s @@ -27,7 +27,7 @@ FUN_0205F314: ; 0x0205F314 cmp r5, r1 bls _0205F334 _0205F32C: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x0 pop {r3-r5, pc} _0205F334: @@ -212,7 +212,7 @@ FUN_0205F45C: ; 0x0205F45C cmp r4, #0x3 blo _0205F46A _0205F466: - bl ErrorHandling + bl GF_AssertFail _0205F46A: ldr r0, _0205F474 ; =UNK_020F7430 lsl r1, r4, #0x1 @@ -271,7 +271,7 @@ FUN_0205F4C8: ; 0x0205F4C8 cmp r4, #0x4 blt _0205F4D6 _0205F4D2: - bl ErrorHandling + bl GF_AssertFail _0205F4D6: ldr r0, _0205F4E0 ; =UNK_020F7436 lsl r1, r4, #0x1 diff --git a/arm9/asm/unk_0205F7A0.s b/arm9/asm/unk_0205F7A0.s index b781112b..624176f9 100644 --- a/arm9/asm/unk_0205F7A0.s +++ b/arm9/asm/unk_0205F7A0.s @@ -173,7 +173,7 @@ FUN_0205F8CC: ; 0x0205F8CC bl FS_OpenFile cmp r0, #0x0 bne _0205F8F8 - bl ErrorHandling + bl GF_AssertFail add sp, #0x70 pop {r3-r7, pc} _0205F8F8: @@ -183,7 +183,7 @@ _0205F8F8: bl FS_ReadFile cmp r0, #0x0 bge _0205F90A - bl ErrorHandling + bl GF_AssertFail _0205F90A: mov r0, #0xb mov r1, #0x4 diff --git a/arm9/asm/unk_02060344.s b/arm9/asm/unk_02060344.s index 8f67bca3..9dcfde2e 100644 --- a/arm9/asm/unk_02060344.s +++ b/arm9/asm/unk_02060344.s @@ -40,7 +40,7 @@ _0206036A: _0206038C: cmp r1, #0xc8 blt _02060394 - bl ErrorHandling + bl GF_AssertFail _02060394: mov r1, #0x0 _02060396: diff --git a/arm9/asm/unk_020603B0.s b/arm9/asm/unk_020603B0.s index 7550dc1d..d4aa42f5 100644 --- a/arm9/asm/unk_020603B0.s +++ b/arm9/asm/unk_020603B0.s @@ -100,7 +100,7 @@ _020603F6: lsr r6, r0, #0x10 cmp r6, #0x10 blo _02060412 - bl ErrorHandling + bl GF_AssertFail _02060412: cmp r6, #0x0 bne _02060420 @@ -129,7 +129,7 @@ FUN_0206043C: ; 0x0206043C add r4, r0, #0x0 cmp r4, #0x1d blo _02060448 - bl ErrorHandling + bl GF_AssertFail _02060448: ldr r0, _02060450 ; =UNK_020F7460 lsl r1, r4, #0x2 @@ -206,7 +206,7 @@ _020604C2: mov r6, #0x28 b _020604D0 _020604C8: - bl ErrorHandling + bl GF_AssertFail add sp, #0x20 pop {r3-r7, pc} _020604D0: @@ -303,7 +303,7 @@ _0206059C: lsr r5, r0, #0x10 cmp r5, #0x1d blo _020605B2 - bl ErrorHandling + bl GF_AssertFail _020605B2: lsl r0, r5, #0x18 lsr r2, r0, #0x18 @@ -361,7 +361,7 @@ _0206061E: ldrh r5, [r4, #0x0] cmp r5, #0x0 bne _02060628 - bl ErrorHandling + bl GF_AssertFail _02060628: cmp r5, #0x1 bhi _02060630 @@ -383,7 +383,7 @@ _02060630: lsr r6, r0, #0x10 cmp r6, r5 blo _02060658 - bl ErrorHandling + bl GF_AssertFail _02060658: lsl r0, r6, #0x18 lsr r0, r0, #0x17 diff --git a/arm9/asm/unk_020607D4.s b/arm9/asm/unk_020607D4.s index c017c561..2e2c4e21 100644 --- a/arm9/asm/unk_020607D4.s +++ b/arm9/asm/unk_020607D4.s @@ -149,7 +149,7 @@ _020608F0: bl FUN_020054C8 b _0206090A _020608F8: - bl ErrorHandling + bl GF_AssertFail add r0, r4, #0x0 bl FreeToHeap add sp, #0x28 @@ -472,7 +472,7 @@ _02060B6A: str r0, [r4, #0x24] b _02060B86 _02060B7C: - bl ErrorHandling + bl GF_AssertFail add sp, #0xc mov r0, #0x1 pop {r3-r4, pc} @@ -569,7 +569,7 @@ _02060BF6: bl FUN_0204A9F0 cmp r0, #0x0 bne _02060C38 - bl ErrorHandling + bl GF_AssertFail _02060C38: ldr r0, [sp, #0x20] bl MOD05_021E7EC8 @@ -594,7 +594,7 @@ _02060C38: bl MOD05_021DA464 b _02060C6E _02060C6A: - bl ErrorHandling + bl GF_AssertFail _02060C6E: add r0, r6, #0x1 lsl r0, r0, #0x18 @@ -644,7 +644,7 @@ _02060CA8: str r1, [r0, #0x8] pop {r3, pc} _02060CC4: - bl ErrorHandling + bl GF_AssertFail _02060CC8: pop {r3, pc} .balign 4 diff --git a/arm9/asm/unk_02060CCC.s b/arm9/asm/unk_02060CCC.s index b6692f24..918488c5 100644 --- a/arm9/asm/unk_02060CCC.s +++ b/arm9/asm/unk_02060CCC.s @@ -153,7 +153,7 @@ FUN_02060CCC: ; 0x02060CCC cmp r5, #0x5 blt _02060CDC _02060CD8: - bl ErrorHandling + bl GF_AssertFail _02060CDC: sub r1, r5, #0x1 ldr r6, _02060CF4 ; =UNK_020F767C @@ -163,7 +163,7 @@ _02060CDC: ldr r0, [r6, r4] cmp r0, r5 beq _02060CF0 - bl ErrorHandling + bl GF_AssertFail _02060CF0: add r0, r6, r4 pop {r4-r6, pc} @@ -183,7 +183,7 @@ FUN_02060CF8: ; 0x02060CF8 cmp r4, r0 blt _02060D12 _02060D0E: - bl ErrorHandling + bl GF_AssertFail _02060D12: sub r0, r4, #0x1 ldr r1, [r5, #0x8] @@ -206,7 +206,7 @@ FUN_02060D1C: ; 0x02060D1C ldr r4, [r0, #0x0] cmp r4, #0x0 bne _02060D3E - bl ErrorHandling + bl GF_AssertFail _02060D3E: add r0, r6, #0x0 add r1, r7, #0x0 @@ -629,7 +629,7 @@ FUN_02061028: ; 0x02061028 ldrh r0, [r5, #0x22] cmp r0, #0x0 bne _0206106C - bl ErrorHandling + bl GF_AssertFail _0206106C: add r2, r5, #0x0 add r5, #0xc @@ -1207,7 +1207,7 @@ FUN_02061498: ; 0x02061498 lsr r4, r0, #0x10 cmp r4, #0x5 blo _020614F0 - bl ErrorHandling + bl GF_AssertFail _020614F0: add r4, #0x11 add r0, r4, #0x0 @@ -1615,7 +1615,7 @@ FUN_020617D8: ; 0x020617D8 lsr r4, r0, #0x10 cmp r4, #0x3 blo _02061826 - bl ErrorHandling + bl GF_AssertFail _02061826: add r4, #0x21 add r0, r4, #0x0 @@ -1663,7 +1663,7 @@ FUN_02061868: ; 0x02061868 ldr r1, [r4, #0x0] cmp r1, r0 beq _02061884 - bl ErrorHandling + bl GF_AssertFail _02061884: add r0, r5, #0x0 mov r1, #0x0 @@ -2724,7 +2724,7 @@ FUN_020620A0: ; 0x020620A0 add r4, r0, #0x0 cmp r4, #0x0 bgt _020620BE - bl ErrorHandling + bl GF_AssertFail _020620BE: cmp r4, #0x1 ble _020620D0 @@ -2760,7 +2760,7 @@ _020620F0: _020620F8: cmp r5, #0x0 beq _02062100 - bl ErrorHandling + bl GF_AssertFail _02062100: bl LCRandom mov r1, #0xf1 @@ -2770,7 +2770,7 @@ _02062100: lsr r4, r0, #0x10 cmp r4, #0x11 blo _02062118 - bl ErrorHandling + bl GF_AssertFail _02062118: cmp r4, #0x9 blt _0206211E @@ -2828,7 +2828,7 @@ FUN_02062170: ; 0x02062170 lsr r4, r0, #0x10 cmp r4, #0x5 blo _0206218C - bl ErrorHandling + bl GF_AssertFail _0206218C: ldr r0, _02062238 ; =UNK_02105FBC lsl r1, r4, #0x1 @@ -2870,7 +2870,7 @@ _020621D4: lsr r4, r0, #0x10 cmp r4, #0x4 blo _020621E4 - bl ErrorHandling + bl GF_AssertFail _020621E4: cmp r4, #0x3 bhi _0206220C @@ -2922,7 +2922,7 @@ _02062228: mov r0, #0xc pop {r3-r7, pc} _0206222C: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x1 pop {r3-r7, pc} .balign 4 @@ -3014,7 +3014,7 @@ FUN_020622C4: ; 0x020622C4 lsr r5, r0, #0x10 cmp r5, #0x11 blo _020622E0 - bl ErrorHandling + bl GF_AssertFail _020622E0: cmp r5, #0x9 blt _020622E6 @@ -3028,7 +3028,7 @@ _020622E6: lsr r4, r0, #0x10 cmp r4, #0x11 blo _020622FE - bl ErrorHandling + bl GF_AssertFail _020622FE: cmp r4, #0x9 blt _02062304 @@ -3121,7 +3121,7 @@ _02062392: lsl r0, r4, #0x10 lsr r0, r0, #0x10 bne _020623A4 - bl ErrorHandling + bl GF_AssertFail _020623A4: lsl r0, r4, #0x10 lsr r0, r0, #0x10 @@ -3148,7 +3148,7 @@ _020623B0: lsr r0, r0, #0x10 cmp r5, r0 blo _020623DE - bl ErrorHandling + bl GF_AssertFail _020623DE: add r0, sp, #0x10 add r0, #0x2 @@ -3244,7 +3244,7 @@ FUN_02062474: ; 0x02062474 lsl r0, r0, #0x10 lsr r4, r0, #0x10 bne _02062496 - bl ErrorHandling + bl GF_AssertFail _02062496: cmp r4, #0x1 bhi _0206249E @@ -3266,7 +3266,7 @@ _0206249E: lsr r5, r0, #0x10 cmp r5, r4 blo _020624C6 - bl ErrorHandling + bl GF_AssertFail _020624C6: lsl r4, r5, #0x2 add r0, sp, #0x4 @@ -3363,7 +3363,7 @@ _0206256C: _02062572: cmp r4, #0xb blt _0206257A - bl ErrorHandling + bl GF_AssertFail _0206257A: ldr r1, [sp, #0x8] add r0, r6, #0x0 diff --git a/arm9/asm/unk_02063888.s b/arm9/asm/unk_02063888.s index 0e213436..19cd07cc 100644 --- a/arm9/asm/unk_02063888.s +++ b/arm9/asm/unk_02063888.s @@ -77,7 +77,7 @@ _020638F8: lsl r0, r0, #0x10 lsr r6, r0, #0x10 bne _02063920 - bl ErrorHandling + bl GF_AssertFail _02063920: add r0, r6, #0x0 add r1, sp, #0x8 diff --git a/arm9/asm/unk_02063948.s b/arm9/asm/unk_02063948.s index 854eaedd..b111b655 100644 --- a/arm9/asm/unk_02063948.s +++ b/arm9/asm/unk_02063948.s @@ -189,7 +189,7 @@ FUN_02063A80: ; 0x02063A80 ldr r0, _02063A98 ; =0x19740205 cmp r1, r0 beq _02063A90 - bl ErrorHandling + bl GF_AssertFail _02063A90: add r0, r4, #0x0 bl FreeToHeap diff --git a/arm9/asm/unk_020643C0.s b/arm9/asm/unk_020643C0.s index 4a7b92d3..9215f816 100644 --- a/arm9/asm/unk_020643C0.s +++ b/arm9/asm/unk_020643C0.s @@ -175,7 +175,7 @@ FUN_02064520: ; 0x02064520 push {r4, lr} add r4, r0, #0x0 bne _0206452A - bl ErrorHandling + bl GF_AssertFail _0206452A: add r0, r4, #0x0 bl FUN_020646A0 @@ -254,7 +254,7 @@ FUN_020645B0: ; 0x020645B0 bl FUN_0200CA44 add r4, r0, #0x0 bne _020645C6 - bl ErrorHandling + bl GF_AssertFail _020645C6: add r0, r4, #0x0 pop {r4, pc} @@ -276,7 +276,7 @@ FUN_020645DC: ; 0x020645DC bl AllocFromHeap add r4, r0, #0x0 bne _020645EC - bl ErrorHandling + bl GF_AssertFail _020645EC: add r2, r4, #0x0 mov r1, #0x10 @@ -309,7 +309,7 @@ FUN_0206460C: ; 0x0206460C bl AllocFromHeap add r4, r0, #0x0 bne _02064622 - bl ErrorHandling + bl GF_AssertFail _02064622: add r0, r4, #0x0 mov r1, #0x0 diff --git a/arm9/asm/unk_020647A4.s b/arm9/asm/unk_020647A4.s index cba18409..7476df71 100644 --- a/arm9/asm/unk_020647A4.s +++ b/arm9/asm/unk_020647A4.s @@ -105,7 +105,7 @@ _0206480A: bl FUN_0204AA5C cmp r0, #0x0 bne _0206482C - bl ErrorHandling + bl GF_AssertFail _0206482C: ldr r1, [sp, #0x14] add r0, sp, #0x18 @@ -316,7 +316,7 @@ _02064996: str r1, [r0, #0x8] pop {r3-r5, pc} _020649A0: - bl ErrorHandling + bl GF_AssertFail pop {r3-r5, pc} nop _020649A8: .word 0x00000123 @@ -474,7 +474,7 @@ _02064ACA: bl FUN_0204AA5C cmp r0, #0x0 bne _02064AEC - bl ErrorHandling + bl GF_AssertFail _02064AEC: ldr r1, [sp, #0xc] add r0, sp, #0x10 @@ -598,7 +598,7 @@ _02064BCA: bl FUN_0204AA5C cmp r0, #0x0 bne _02064BEC - bl ErrorHandling + bl GF_AssertFail _02064BEC: ldr r1, [sp, #0xc] add r0, sp, #0x10 diff --git a/arm9/asm/unk_02064CA8.s b/arm9/asm/unk_02064CA8.s index 851aec52..c81aafec 100644 --- a/arm9/asm/unk_02064CA8.s +++ b/arm9/asm/unk_02064CA8.s @@ -127,7 +127,7 @@ FUN_02064D88: ; 0x02064D88 add r7, r0, #0x0 cmp r5, #0x3 blo _02064D96 - bl ErrorHandling + bl GF_AssertFail _02064D96: add r0, r7, #0x0 bl ScriptEnvironment_GetSav2Ptr @@ -163,7 +163,7 @@ _02064DD2: mov r6, #0x19 b _02064DDE _02064DDA: - bl ErrorHandling + bl GF_AssertFail _02064DDE: ldr r0, [r7, #0x1c] ldr r0, [r0, #0xc] @@ -182,7 +182,7 @@ FUN_02064DEC: ; 0x02064DEC add r6, r2, #0x0 cmp r4, #0x1 bls _02064DFC - bl ErrorHandling + bl GF_AssertFail _02064DFC: mov r0, #0x0 mvn r0, r0 diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index 3124976e..2499c108 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -743,7 +743,7 @@ _0206CCCE: lsl r1, r1, #0xe cmp r0, r1 bhi _0206CD16 - bl ErrorHandling + bl GF_AssertFail _0206CD16: ldr r0, _0206CE24 ; =0x000005F9 bl FUN_020054C8 diff --git a/arm9/asm/unk_0206DE24.s b/arm9/asm/unk_0206DE24.s index 32d784c4..3203cc10 100644 --- a/arm9/asm/unk_0206DE24.s +++ b/arm9/asm/unk_0206DE24.s @@ -145,11 +145,11 @@ FUN_0206DF18: ; 0x0206DF18 add r5, r0, #0x0 cmp r4, #0x0 bne _0206DF40 - bl ErrorHandling + bl GF_AssertFail _0206DF40: cmp r5, #0x0 bne _0206DF48 - bl ErrorHandling + bl GF_AssertFail _0206DF48: bl FUN_02012CC8 pop {r3-r5, pc} @@ -313,7 +313,7 @@ FUN_0206E07C: ; 0x0206E07C bl AllocFromHeap add r4, r0, #0x0 bne _0206E090 - bl ErrorHandling + bl GF_AssertFail _0206E090: ldr r0, [r5, #0x0] ldr r2, [r5, #0x4] diff --git a/arm9/asm/unk_0206E0F0.s b/arm9/asm/unk_0206E0F0.s index 533ddc30..d00119f8 100644 --- a/arm9/asm/unk_0206E0F0.s +++ b/arm9/asm/unk_0206E0F0.s @@ -33,7 +33,7 @@ FUN_0206E0F0: ; 0x0206E0F0 add r4, r0, #0x0 cmp r4, #0x17 blo _0206E0FC - bl ErrorHandling + bl GF_AssertFail _0206E0FC: ldr r0, _0206E104 ; =UNK_020F83E0 lsl r1, r4, #0x2 @@ -63,7 +63,7 @@ FUN_0206E114: ; 0x0206E114 add r4, r0, #0x0 cmp r4, #0x17 blo _0206E120 - bl ErrorHandling + bl GF_AssertFail _0206E120: ldr r0, _0206E128 ; =UNK_020F843C ldrb r0, [r0, r4] @@ -255,7 +255,7 @@ FUN_0206E278: ; 0x0206E278 add r4, r0, #0x0 cmp r4, #0x3 blo _0206E284 - bl ErrorHandling + bl GF_AssertFail _0206E284: ldr r0, _0206E28C ; =UNK_020F83D4 lsl r1, r4, #0x2 @@ -270,7 +270,7 @@ FUN_0206E290: ; 0x0206E290 add r4, r0, #0x0 cmp r4, #0x3 blo _0206E29C - bl ErrorHandling + bl GF_AssertFail _0206E29C: ldr r0, _0206E2A4 ; =UNK_020F83D0 ldrb r0, [r0, r4] diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index 703233b3..34c0bc89 100644 --- a/arm9/asm/unk_020772F0.s +++ b/arm9/asm/unk_020772F0.s @@ -1639,11 +1639,11 @@ FUN_02077AC4: ; 0x02077AC4 ldr r0, [r4, #0x18] cmp r0, #0x0 bne _02077AD2 - bl ErrorHandling + bl GF_AssertFail _02077AD2: cmp r4, #0x0 bne _02077ADA - bl ErrorHandling + bl GF_AssertFail _02077ADA: ldr r0, [r4, #0x18] bl String_dtor diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s index 36539633..3e0d058c 100644 --- a/arm9/asm/unk_02080C38.s +++ b/arm9/asm/unk_02080C38.s @@ -246,7 +246,7 @@ _02080DD4: str r0, [r4, #0x4] b _02080DF2 _02080DE2: - bl ErrorHandling + bl GF_AssertFail _02080DE6: add r0, r4, #0x0 bl FreeToHeap @@ -497,7 +497,7 @@ _02080FC0: str r0, [r4, #0x4] b _02080FDC _02080FCE: - bl ErrorHandling + bl GF_AssertFail _02080FD2: add r0, r4, #0x0 bl FreeToHeap @@ -747,7 +747,7 @@ _02081196: str r0, [r4, #0x4] b _020811B4 _020811A4: - bl ErrorHandling + bl GF_AssertFail _020811A8: add r0, r4, #0x0 bl FreeToHeap @@ -1259,7 +1259,7 @@ _020815A6: add r6, r0, #0x0 b _020815BA _020815B6: - bl ErrorHandling + bl GF_AssertFail _020815BA: cmp r6, #0x0 beq _020815CA @@ -2347,7 +2347,7 @@ _02081DEC: bl FUN_0202DFA4 add r7, r0, #0x0 bne _02081DFA - bl ErrorHandling + bl GF_AssertFail _02081DFA: add r0, r7, #0x0 bl PlayerProfile_GetGameClearFlag @@ -2374,7 +2374,7 @@ _02081E1E: bl FUN_0202DFA4 add r7, r0, #0x0 bne _02081E2C - bl ErrorHandling + bl GF_AssertFail _02081E2C: add r0, r7, #0x0 bl PlayerProfile_GetNatDexFlag @@ -2471,7 +2471,7 @@ FUN_02081ED4: ; 0x02081ED4 ldr r0, [r4, r0] cmp r0, #0x0 beq _02081EE6 - bl ErrorHandling + bl GF_AssertFail _02081EE6: ldr r0, _02081F00 ; =0x00000176 mov r1, #0x0 @@ -3031,7 +3031,7 @@ _020822C8: add r0, #0x31 b _020822D6 _020822D0: - bl ErrorHandling + bl GF_AssertFail pop {r3-r5, pc} _020822D6: lsl r0, r0, #0x18 @@ -3229,7 +3229,7 @@ _02082412: _02082414: cmp r4, #0x64 bne _0208241C - bl ErrorHandling + bl GF_AssertFail _0208241C: ldr r0, _02082440 ; =0x0000198C ldr r0, [r5, r0] @@ -3258,7 +3258,7 @@ FUN_02082444: ; 0x02082444 ldr r0, [r5, r0] cmp r0, #0x0 beq _02082456 - bl ErrorHandling + bl GF_AssertFail _02082456: mov r0, #0x4 mov r1, #0x10 diff --git a/arm9/asm/unk_020828BC.s b/arm9/asm/unk_020828BC.s index f63a493e..58dba10d 100644 --- a/arm9/asm/unk_020828BC.s +++ b/arm9/asm/unk_020828BC.s @@ -311,7 +311,7 @@ _02082A26: ldr r0, [sp, #0x8] cmp r6, r0 bge _02082A30 - bl ErrorHandling + bl GF_AssertFail _02082A30: mov r0, #0x0 str r0, [sp, #0x10] @@ -469,7 +469,7 @@ _02082B44: _02082B4E: cmp r6, #0x4 bhs _02082B56 - bl ErrorHandling + bl GF_AssertFail _02082B56: mov r6, #0x0 mov r7, #0x30 @@ -633,7 +633,7 @@ _02082C66: ldrb r2, [r0, #0x0] b _02082C74 _02082C6E: - bl ErrorHandling + bl GF_AssertFail mov r2, #0x0 _02082C74: mov r0, #0x54 @@ -891,7 +891,7 @@ FUN_02082E64: ; 0x02082E64 ldr r0, [r4, #0x0] cmp r0, #0x0 bne _02082E98 - bl ErrorHandling + bl GF_AssertFail _02082E98: add r1, sp, #0x14 ldrh r0, [r1, #0x0] @@ -1094,7 +1094,7 @@ _0208300A: strb r1, [r0, r4] cmp r5, #0x2 bhs _0208301A - bl ErrorHandling + bl GF_AssertFail _0208301A: ldr r2, [sp, #0x4] mov r3, #0x0 @@ -1126,7 +1126,7 @@ _0208301E: blt _0208301E cmp r4, #0x1 bhs _02083058 - bl ErrorHandling + bl GF_AssertFail _02083058: ldr r0, [sp, #0x4] bl FUN_02082878 @@ -1224,7 +1224,7 @@ FUN_02083114: ; 0x02083114 add r4, r0, #0x0 cmp r4, #0x18 blo _02083120 - bl ErrorHandling + bl GF_AssertFail _02083120: mov r0, #0x1a add r1, r4, #0x0 @@ -1243,7 +1243,7 @@ FUN_02083130: ; 0x02083130 add r6, r2, #0x0 cmp r5, #0x18 blo _02083140 - bl ErrorHandling + bl GF_AssertFail _02083140: mov r0, #0x1a add r1, r5, #0x0 @@ -1265,7 +1265,7 @@ FUN_0208315C: ; 0x0208315C add r4, r0, #0x0 cmp r4, #0x18 blo _02083168 - bl ErrorHandling + bl GF_AssertFail _02083168: add r4, #0x2d add r0, r4, #0x0 @@ -1281,7 +1281,7 @@ FUN_02083170: ; 0x02083170 add r6, r3, #0x0 cmp r4, #0x18 blo _02083182 - bl ErrorHandling + bl GF_AssertFail _02083182: cmp r7, #0x4 bhi _0208319C @@ -1702,7 +1702,7 @@ _02083448: add r0, #0x8a pop {r3, pc} _0208344C: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x7a pop {r3, pc} diff --git a/arm9/asm/unk_020834D0.s b/arm9/asm/unk_020834D0.s index 39062a81..88308c6e 100644 --- a/arm9/asm/unk_020834D0.s +++ b/arm9/asm/unk_020834D0.s @@ -43,7 +43,7 @@ FUN_020834E4: ; 0x020834E4 add r4, r1, #0x0 cmp r2, r0 blt _020834F6 - bl ErrorHandling + bl GF_AssertFail _020834F6: ldr r0, _02083500 ; =0x00000985 add r1, r4, r0 @@ -110,21 +110,21 @@ _0208354A: add r4, r1, r0 b _0208355E _02083558: - bl ErrorHandling + bl GF_AssertFail pop {r3-r7, pc} _0208355E: mov r0, #0x2 lsl r0, r0, #0x8 cmp r6, r0 ble _0208356A - bl ErrorHandling + bl GF_AssertFail _0208356A: ldr r0, _0208359C ; =0x00000A11 add r7, r4, r0 ldrb r0, [r7, r5] cmp r0, #0x0 beq _02083578 - bl ErrorHandling + bl GF_AssertFail _02083578: mov r1, #0x21 lsl r1, r1, #0x4 @@ -666,7 +666,7 @@ FUN_02083970: ; 0x02083970 lsl r0, r0, #0xa cmp r1, r0 blt _0208398C - bl ErrorHandling + bl GF_AssertFail _0208398C: mov r7, #0x0 ldr r4, [sp, #0x4] @@ -709,7 +709,7 @@ FUN_020839C0: ; 0x020839C0 str r0, [sp, #0x0] cmp r0, r1 blt _020839DE - bl ErrorHandling + bl GF_AssertFail _020839DE: ldr r0, _02083A18 ; =0x00000585 mov r7, #0x0 diff --git a/arm9/asm/unk_02083D48.s b/arm9/asm/unk_02083D48.s index 4a15e685..1974ae4b 100644 --- a/arm9/asm/unk_02083D48.s +++ b/arm9/asm/unk_02083D48.s @@ -472,7 +472,7 @@ FUN_02083FDC: ; 0x02083FDC bl FUN_02031190 cmp r0, #0x0 beq _02083FEE - bl ErrorHandling + bl GF_AssertFail _02083FEE: bl FUN_02031190 cmp r0, #0x0 diff --git a/arm9/asm/unk_020859C0.s b/arm9/asm/unk_020859C0.s index 2e98e9cf..a2f90e0a 100644 --- a/arm9/asm/unk_020859C0.s +++ b/arm9/asm/unk_020859C0.s @@ -586,7 +586,7 @@ FUN_02085D6C: ; 0x02085D6C ldr r0, [r4, #0x0] cmp r0, r1 bge _02085D7C - bl ErrorHandling + bl GF_AssertFail mov r1, #0x0 _02085D7C: lsl r0, r1, #0x2 @@ -712,7 +712,7 @@ _02085E48: beq _02085E5A cmp r0, #0x1 beq _02085E60 - bl ErrorHandling + bl GF_AssertFail _02085E5A: mov r0, #0x5 str r0, [r6, #0x14] @@ -874,7 +874,7 @@ FUN_02085FAC: ; 0x02085FAC ldr r0, _02085FC8 ; =0x0000032A cmp r4, r0 blo _02085FBA - bl ErrorHandling + bl GF_AssertFail _02085FBA: mov r0, #0xa add r1, r4, #0x0 @@ -893,7 +893,7 @@ FUN_02085FD0: ; 0x02085FD0 ldr r0, _02085FEC ; =0x0000032A cmp r4, r0 blo _02085FDE - bl ErrorHandling + bl GF_AssertFail _02085FDE: mov r0, #0xa add r1, r4, #0x0 @@ -912,7 +912,7 @@ FUN_02085FF4: ; 0x02085FF4 ldr r0, _02086010 ; =0x0000032A cmp r4, r0 blo _02086002 - bl ErrorHandling + bl GF_AssertFail _02086002: mov r0, #0xa add r1, r4, #0x0 @@ -931,7 +931,7 @@ FUN_02086018: ; 0x02086018 ldr r0, _02086034 ; =0x0000032A cmp r4, r0 blo _02086026 - bl ErrorHandling + bl GF_AssertFail _02086026: mov r0, #0xa add r1, r4, #0x0 @@ -950,7 +950,7 @@ FUN_0208603C: ; 0x0208603C ldr r0, _02086058 ; =0x0000032A cmp r4, r0 blo _0208604A - bl ErrorHandling + bl GF_AssertFail _0208604A: mov r0, #0xa add r1, r4, #0x0 @@ -969,7 +969,7 @@ FUN_02086060: ; 0x02086060 ldr r0, _0208607C ; =0x0000032A cmp r4, r0 blo _0208606E - bl ErrorHandling + bl GF_AssertFail _0208606E: mov r0, #0xa add r1, r4, #0x0 diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s index 7ae62351..e5739d5b 100644 --- a/arm9/asm/unk_02086414.s +++ b/arm9/asm/unk_02086414.s @@ -234,11 +234,11 @@ FUN_0208650C: ; 0x0208650C add r5, r0, #0x0 cmp r4, #0x0 bne _02086534 - bl ErrorHandling + bl GF_AssertFail _02086534: cmp r5, #0x0 bne _0208653C - bl ErrorHandling + bl GF_AssertFail _0208653C: bl FUN_02012CC8 pop {r3-r5, pc} @@ -978,7 +978,7 @@ FUN_02086B40: ; 0x02086B40 bl AllocFromHeap add r4, r0, #0x0 bne _02086B54 - bl ErrorHandling + bl GF_AssertFail _02086B54: ldr r0, [r5, #0x0] ldr r2, [r5, #0x4] @@ -1403,7 +1403,7 @@ FUN_02086E48: ; 0x02086E48 bl FUN_0200BBF0 cmp r0, #0x0 bne _02086EB2 - bl ErrorHandling + bl GF_AssertFail _02086EB2: ldr r0, [r4, #0x4c] ldr r1, [r4, #0x48] @@ -1411,7 +1411,7 @@ _02086EB2: bl FUN_0200BF60 cmp r0, #0x0 bne _02086EC4 - bl ErrorHandling + bl GF_AssertFail _02086EC4: add sp, #0x4c pop {r3-r6, pc} diff --git a/arm9/asm/unk_02086FA8.s b/arm9/asm/unk_02086FA8.s index 2ccd040d..f164c88f 100644 --- a/arm9/asm/unk_02086FA8.s +++ b/arm9/asm/unk_02086FA8.s @@ -463,7 +463,7 @@ _02087322: str r0, [r4, #0x5c] b _02087486 _0208735C: - bl ErrorHandling + bl GF_AssertFail b _02087486 _02087362: bl FUN_02005670 diff --git a/arm9/asm/unk_02087A6C.s b/arm9/asm/unk_02087A6C.s index b343ac2c..c508e978 100644 --- a/arm9/asm/unk_02087A6C.s +++ b/arm9/asm/unk_02087A6C.s @@ -29,7 +29,7 @@ FUN_02087A84: ; 0x02087A84 push {r4, lr} add r4, r0, #0x0 bne _02087A8E - bl ErrorHandling + bl GF_AssertFail _02087A8E: add r0, r4, #0x0 bl FreeToHeap @@ -44,17 +44,17 @@ FUN_02087A98: ; 0x02087A98 add r4, r2, #0x0 cmp r5, #0x0 bne _02087AA8 - bl ErrorHandling + bl GF_AssertFail _02087AA8: ldr r0, [r5, #0x0] cmp r0, #0x0 beq _02087AB2 - bl ErrorHandling + bl GF_AssertFail _02087AB2: ldr r0, [r5, #0x4] cmp r0, #0x0 beq _02087ABC - bl ErrorHandling + bl GF_AssertFail _02087ABC: add r0, r4, #0x0 bl FUN_02087C18 @@ -99,12 +99,12 @@ FUN_02087B0C: ; 0x02087B0C ldr r0, [r4, #0x0] cmp r0, #0x0 bne _02087B1A - bl ErrorHandling + bl GF_AssertFail _02087B1A: ldr r0, [r4, #0x4] cmp r0, #0x0 bne _02087B24 - bl ErrorHandling + bl GF_AssertFail _02087B24: ldr r0, [r4, #0x0] bl FreeToHeap @@ -134,12 +134,12 @@ FUN_02087B58: ; 0x02087B58 add r4, r1, #0x0 cmp r5, #0x0 bne _02087B66 - bl ErrorHandling + bl GF_AssertFail _02087B66: ldr r0, [r5, #0x0] cmp r0, #0x0 bne _02087B70 - bl ErrorHandling + bl GF_AssertFail _02087B70: ldr r1, [r5, #0x0] lsl r0, r4, #0x2 @@ -153,12 +153,12 @@ FUN_02087B78: ; 0x02087B78 add r4, r1, #0x0 cmp r5, #0x0 bne _02087B86 - bl ErrorHandling + bl GF_AssertFail _02087B86: ldr r0, [r5, #0x4] cmp r0, #0x0 bne _02087B90 - bl ErrorHandling + bl GF_AssertFail _02087B90: ldr r1, [r5, #0x4] lsl r0, r4, #0x2 @@ -172,12 +172,12 @@ FUN_02087B98: ; 0x02087B98 add r4, r1, #0x0 cmp r5, #0x0 bne _02087BA6 - bl ErrorHandling + bl GF_AssertFail _02087BA6: ldr r0, [r5, #0x8] cmp r0, #0x0 bne _02087BB0 - bl ErrorHandling + bl GF_AssertFail _02087BB0: ldr r1, [r5, #0x8] lsl r0, r4, #0x1 @@ -191,12 +191,12 @@ FUN_02087BB8: ; 0x02087BB8 add r4, r1, #0x0 cmp r5, #0x0 bne _02087BC6 - bl ErrorHandling + bl GF_AssertFail _02087BC6: ldr r0, [r5, #0xc] cmp r0, #0x0 bne _02087BD0 - bl ErrorHandling + bl GF_AssertFail _02087BD0: ldr r1, [r5, #0xc] lsl r0, r4, #0x1 @@ -210,12 +210,12 @@ FUN_02087BD8: ; 0x02087BD8 add r4, r1, #0x0 cmp r5, #0x0 bne _02087BE6 - bl ErrorHandling + bl GF_AssertFail _02087BE6: ldr r0, [r5, #0x10] cmp r0, #0x0 bne _02087BF0 - bl ErrorHandling + bl GF_AssertFail _02087BF0: ldr r1, [r5, #0x10] lsl r0, r4, #0x1 @@ -229,12 +229,12 @@ FUN_02087BF8: ; 0x02087BF8 add r4, r1, #0x0 cmp r5, #0x0 bne _02087C06 - bl ErrorHandling + bl GF_AssertFail _02087C06: ldr r0, [r5, #0x14] cmp r0, #0x0 bne _02087C10 - bl ErrorHandling + bl GF_AssertFail _02087C10: ldr r1, [r5, #0x14] lsl r0, r4, #0x1 diff --git a/arm9/asm/unk_02088320.s b/arm9/asm/unk_02088320.s index 92381e59..aa080143 100644 --- a/arm9/asm/unk_02088320.s +++ b/arm9/asm/unk_02088320.s @@ -209,7 +209,7 @@ FUN_02088490: ; 0x02088490 str r0, [sp, #0x3c] cmp r0, #0x0 bge _020884B4 - bl ErrorHandling + bl GF_AssertFail add sp, #0x70 mov r0, #0x0 pop {r3-r7, pc} @@ -404,7 +404,7 @@ _02088612: bl FUN_02020248 b _02088656 _02088652: - bl ErrorHandling + bl GF_AssertFail _02088656: ldr r0, [sp, #0x38] str r4, [r0, #0x4] @@ -495,7 +495,7 @@ FUN_020886CC: ; 0x020886CC ldr r0, [r0, #0x0] cmp r0, #0x0 bne _02088704 - bl ErrorHandling + bl GF_AssertFail _02088704: ldr r0, [r5, #0x4] cmp r0, #0x0 @@ -546,7 +546,7 @@ _02088734: ldr r0, [r0, #0x0] cmp r0, #0x0 bne _02088768 - bl ErrorHandling + bl GF_AssertFail _02088768: add r4, r4, #0x1 add r6, r6, #0x4 @@ -584,7 +584,7 @@ _02088780: ldr r0, [r0, r4] cmp r0, #0x0 bne _020887B4 - bl ErrorHandling + bl GF_AssertFail _020887B4: ldr r0, [r6, #0x0] ldr r0, [r0, r4] diff --git a/arm9/asm/unk_02088AAC.s b/arm9/asm/unk_02088AAC.s index 65ce7a60..6f47b864 100644 --- a/arm9/asm/unk_02088AAC.s +++ b/arm9/asm/unk_02088AAC.s @@ -217,7 +217,7 @@ _02088C12: mov r0, #0x5 pop {r3-r5, pc} _02088C16: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x95 str r0, [r4, #0x8] _02088C1E: @@ -231,7 +231,7 @@ _02088C1E: bl Bag_TakeItem cmp r0, #0x0 bne _02088C38 - bl ErrorHandling + bl GF_AssertFail _02088C38: mov r0, #0x4 pop {r3-r5, pc} diff --git a/arm9/asm/unk_02088D1C.s b/arm9/asm/unk_02088D1C.s index a7a41701..f82d0498 100644 --- a/arm9/asm/unk_02088D1C.s +++ b/arm9/asm/unk_02088D1C.s @@ -209,7 +209,7 @@ FUN_02088D4C: ; 0x02088D4C add r4, r0, #0x0 cmp r4, #0x13 blo _02088D58 - bl ErrorHandling + bl GF_AssertFail _02088D58: mov r0, #0xc add r1, r4, #0x0 @@ -226,7 +226,7 @@ FUN_02088D68: ; 0x02088D68 add r4, r0, #0x0 cmp r4, #0x13 blo _02088D74 - bl ErrorHandling + bl GF_AssertFail _02088D74: mov r0, #0xc add r1, r4, #0x0 @@ -243,7 +243,7 @@ FUN_02088D84: ; 0x02088D84 add r4, r0, #0x0 cmp r4, #0x13 blo _02088D90 - bl ErrorHandling + bl GF_AssertFail _02088D90: mov r0, #0xc add r1, r4, #0x0 @@ -260,7 +260,7 @@ FUN_02088DA0: ; 0x02088DA0 add r4, r0, #0x0 cmp r4, #0x13 blo _02088DAC - bl ErrorHandling + bl GF_AssertFail _02088DAC: mov r0, #0xc add r1, r4, #0x0 @@ -277,7 +277,7 @@ FUN_02088DBC: ; 0x02088DBC add r4, r0, #0x0 cmp r4, #0x13 blo _02088DC8 - bl ErrorHandling + bl GF_AssertFail _02088DC8: mov r0, #0xc add r1, r4, #0x0 diff --git a/arm9/asm/unk_020893E0.s b/arm9/asm/unk_020893E0.s index d1cbe3de..566bab92 100644 --- a/arm9/asm/unk_020893E0.s +++ b/arm9/asm/unk_020893E0.s @@ -40,7 +40,7 @@ FUN_020893F0: ; 0x020893F0 str r4, [r0, #0x0] pop {r4, pc} _0208940A: - bl ErrorHandling + bl GF_AssertFail pop {r4, pc} .balign 4 _02089410: .word UNK_021C5C58 @@ -62,7 +62,7 @@ FUN_02089418: ; 0x02089418 mov r0, #0x1 pop {r3, pc} _02089434: - bl ErrorHandling + bl GF_AssertFail _02089438: mov r0, #0x0 pop {r3, pc} @@ -85,7 +85,7 @@ FUN_02089444: ; 0x02089444 str r4, [r0, #0x0] pop {r4, pc} _0208945E: - bl ErrorHandling + bl GF_AssertFail pop {r4, pc} .balign 4 _02089464: .word UNK_021C5C58 @@ -107,7 +107,7 @@ FUN_0208946C: ; 0x0208946C mov r0, #0x1 pop {r3, pc} _02089488: - bl ErrorHandling + bl GF_AssertFail _0208948C: mov r0, #0x0 pop {r3, pc} |