diff options
| author | Akira Akashi <rubenru09@aol.com> | 2021-05-26 03:30:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-26 03:30:42 +0100 |
| commit | ee7aa44008bebf78301dd0f9d99306dc1a1b6502 (patch) | |
| tree | 962ac39843c509cd6cbff6a85287258a3a9f3a5b | |
| parent | 10bb8f2d4317fd606fef6c0d3b7345fd324fe583 (diff) | |
| parent | 7d10ba28169226bf00b741f7d01bc3386b383343 (diff) | |
Merge branch 'master' into unkk_020851B8
195 files changed, 2682 insertions, 2780 deletions
diff --git a/arm9/CMakeLists.txt b/arm9/CMakeLists.txt index 9170d823..fce2106f 100644 --- a/arm9/CMakeLists.txt +++ b/arm9/CMakeLists.txt @@ -16,3 +16,4 @@ file(GLOB MODULE_INC modules/*/include) add_executable(DP_Arm9 ${SOURCES}) target_include_directories(DP_Arm9 PRIVATE ../include ../include-mw lib/include ${MODULE_INC}) +target_compile_definitions(DP_Arm9 PUBLIC __CLION_IDE__) 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_0206439C.s b/arm9/asm/unk_0206439C.s deleted file mode 100644 index 4cc91f4f..00000000 --- a/arm9/asm/unk_0206439C.s +++ /dev/null @@ -1,22 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .text - - thumb_func_start FUN_0206439C -FUN_0206439C: ; 0x0206439C - push {r4-r6, lr} - add r5, r1, #0x0 - add r6, r2, #0x0 - mov r1, #0x8 - bl AllocFromHeapAtEnd - add r4, r0, #0x0 - add r0, r6, #0x0 - bl SavArray_PlayerParty_get - add r1, r5, #0x0 - bl GetPartyMonByIndex - str r0, [r4, #0x0] - mov r0, #0x0 - str r0, [r4, #0x4] - add r0, r4, #0x0 - pop {r4-r6, pc} 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} diff --git a/arm9/global.inc b/arm9/global.inc index e4c26196..d4d6b78c 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -143,7 +143,7 @@ .extern DGT_Hash2SetSource .extern DGTi_Hash2CalcHmac .extern DGTi_hash2_arm4_small -.extern ErrorHandling +.extern GF_AssertFail .extern FS_ChangeDir .extern FS_CloseFile .extern FS_ConvertPathToFileID @@ -805,11 +805,11 @@ .extern GF_RTC_CopyDate .extern GF_RTC_TimeToSec .extern GF_RTC_DateTimeToSec -.extern FUN_02012710 +.extern GF_RTC_GetDayOfYear .extern IsNighttime .extern GF_RTC_GetTimeOfDay .extern GF_RTC_GetTimeOfDayByHour -.extern FUN_020127C0 +.extern GF_RTC_TimeDelta .extern ListMenuItems_ctor .extern ListMenuItems_dtor .extern ListMenuItems_AppendFromMsgData diff --git a/arm9/lib/include/MI_memory.h b/arm9/lib/include/MI_memory.h index 339ff9b8..4e5722bb 100644 --- a/arm9/lib/include/MI_memory.h +++ b/arm9/lib/include/MI_memory.h @@ -25,6 +25,11 @@ static inline void MI_CpuClear8(void *dest, u32 size) { MI_CpuFill8(dest, 0, size); } +static inline void MI_CpuFill16(void *dest, u16 data, u32 size) +{ + MIi_CpuClear16(data, dest, size); +} + static inline void MI_CpuClear16(void * destp, u32 size) { MIi_CpuClear16(0, destp, size); @@ -55,4 +60,9 @@ static inline void MI_CpuFillFast(void *dest, u32 data, u32 size) MIi_CpuClearFast(data, dest, size); } +static inline void MI_CpuCopyFast(const void *src, void *dest, u32 size) +{ + MIi_CpuCopyFast(src, dest, size); +} + #endif //POKEDIAMOND_ARM9_MI_MEMORY_H diff --git a/arm9/lib/include/RTC_api.h b/arm9/lib/include/RTC_api.h index d2577cdf..09efde7e 100644 --- a/arm9/lib/include/RTC_api.h +++ b/arm9/lib/include/RTC_api.h @@ -1,6 +1,29 @@ #ifndef NITRO_RTC_API_H_ #define NITRO_RTC_API_H_ +typedef enum RTCAlarmChan +{ + RTC_ALARM_CHAN_1 = 0, + RTC_ALARM_CHAN_2, + RTC_ALARM_CHAN_MAX +} +RTCAlarmChan; + +// Alarm status definitions +typedef enum RTCAlarmStatus +{ + RTC_ALARM_STATUS_OFF = 0, + RTC_ALARM_STATUS_ON, + RTC_ALARM_STATUS_MAX +} +RTCAlarmStatus; + +#define RTC_ALARM_ENABLE_NONE 0x0000 +#define RTC_ALARM_ENABLE_WEEK 0x0001 +#define RTC_ALARM_ENABLE_HOUR 0x0002 +#define RTC_ALARM_ENABLE_MINUTE 0x0004 +#define RTC_ALARM_ENABLE_ALL ( RTC_ALARM_ENABLE_WEEK | RTC_ALARM_ENABLE_HOUR | RTC_ALARM_ENABLE_MINUTE ) + typedef enum RTCWeek { RTC_WEEK_SUNDAY = 0, @@ -12,7 +35,7 @@ typedef enum RTCWeek RTC_WEEK_SATURDAY, RTC_WEEK_MAX } - RTCWeek; +RTCWeek; typedef struct RTCDate { @@ -21,7 +44,7 @@ typedef struct RTCDate u32 day; RTCWeek week; } - RTCDate; +RTCDate; typedef struct RTCTime { @@ -29,6 +52,60 @@ typedef struct RTCTime u32 minute; u32 second; } - RTCTime; +RTCTime; + +typedef struct RTCAlarmParam +{ + RTCWeek week; // Day of the week + u32 hour; // Hour ( 0 ~ 23 ) + u32 minute; // Minute ( 0 ~ 59 ) + u32 enable; // Alarm enable flag ( RTC_ALARM_ENABLE_* ) + +} +RTCAlarmParam; + +typedef enum RTCResult +{ + RTC_RESULT_SUCCESS = 0, + RTC_RESULT_BUSY, + RTC_RESULT_ILLEGAL_PARAMETER, + RTC_RESULT_SEND_ERROR, + RTC_RESULT_INVALID_COMMAND, + RTC_RESULT_ILLEGAL_STATUS, + RTC_RESULT_FATAL_ERROR, + RTC_RESULT_MAX +} +RTCResult; + +typedef void (*RTCCallback) (RTCResult result, void *arg); +typedef void (*RTCInterrupt) (void); + +void RTC_Init(void); +RTCResult RTC_GetDate(RTCDate *date); +RTCResult RTC_GetTime(RTCTime *time); +RTCResult RTC_GetDateTime(RTCDate *date, RTCTime *time); +RTCResult RTC_SetDate(const RTCDate *date); +RTCResult RTC_SetTime(const RTCTime *time); +RTCResult RTC_SetDateTime(const RTCDate *date, const RTCTime *time); +RTCResult RTC_GetAlarmStatus(RTCAlarmChan chan, RTCAlarmStatus *status); +RTCResult RTC_GetAlarmParam(RTCAlarmChan chan, RTCAlarmParam *param); +RTCResult RTC_SetAlarmStatus(RTCAlarmChan chan, const RTCAlarmStatus *status); +RTCResult RTC_SetAlarmParam(RTCAlarmChan chan, const RTCAlarmParam *param); +RTCResult RTC_GetDateAsync(RTCDate *date, RTCCallback callback, void *arg); +RTCResult RTC_GetTimeAsync(RTCTime *time, RTCCallback callback, void *arg); +RTCResult RTC_GetDateTimeAsync(RTCDate *date, RTCTime *time, RTCCallback callback, void *arg); +RTCResult RTC_SetDateAsync(const RTCDate *date, RTCCallback callback, void *arg); +RTCResult RTC_SetTimeAsync(const RTCTime *time, RTCCallback callback, void *arg); +RTCResult RTC_SetDateTimeAsync(const RTCDate *date, const RTCTime *time, RTCCallback callback, + void *arg); +RTCResult RTC_GetAlarmStatusAsync(RTCAlarmChan chan, RTCAlarmStatus *status, RTCCallback callback, + void *arg); +RTCResult RTC_GetAlarmParamAsync(RTCAlarmChan chan, RTCAlarmParam *param, RTCCallback callback, + void *arg); +void RTC_SetAlarmInterrupt(RTCInterrupt interrupt); +RTCResult RTC_SetAlarmStatusAsync(RTCAlarmChan chan, const RTCAlarmStatus *status, + RTCCallback callback, void *arg); +RTCResult RTC_SetAlarmParamAsync(RTCAlarmChan chan, const RTCAlarmParam *param, + RTCCallback callback, void *arg); #endif //NITRO_RTC_API_H_ diff --git a/arm9/modules/04/asm/thumb_04.s b/arm9/modules/04/asm/thumb_04.s index db78d4fc..6f673fe8 100644 --- a/arm9/modules/04/asm/thumb_04.s +++ b/arm9/modules/04/asm/thumb_04.s @@ -12,7 +12,7 @@ MOD04_021D74E0: ; 0x021D74E0 ldr r0, [r0, #4] cmp r0, #0 beq _021D74F2 - bl ErrorHandling + bl GF_AssertFail _021D74F2: ldr r1, _021D7648 ; =0x00001FAC add r0, r4, #0 diff --git a/arm9/modules/05/asm/mod05_021D74E0.s b/arm9/modules/05/asm/mod05_021D74E0.s index ec0e0a0e..730bfc00 100644 --- a/arm9/modules/05/asm/mod05_021D74E0.s +++ b/arm9/modules/05/asm/mod05_021D74E0.s @@ -73,7 +73,7 @@ _021D7564: ldr r0, [r4, #4] cmp r0, #0 beq _021D757A - bl ErrorHandling + bl GF_AssertFail _021D757A: mov r0, #4 mov r1, #0x28 @@ -250,7 +250,7 @@ _021D76E2: ldr r0, [r4, #0x4c] cmp r0, #0 bne _021D7720 - bl ErrorHandling + bl GF_AssertFail _021D7720: ldr r0, [r4, #0x24] bl MOD05_021EF514 @@ -931,7 +931,7 @@ _021D7CC6: add sp, #0xc pop {pc} _021D7CE6: - bl ErrorHandling + bl GF_AssertFail add sp, #0xc pop {pc} .balign 4, 0 @@ -965,7 +965,7 @@ MOD05_021D7CF0: ; 0x021D7CF0 ldr r0, [r5, #0x30] cmp r0, #0 beq _021D7D36 - bl ErrorHandling + bl GF_AssertFail _021D7D36: mov r0, #4 add r1, r4, #0 diff --git a/arm9/modules/05/asm/mod05_021D7F4C.s b/arm9/modules/05/asm/mod05_021D7F4C.s index 2ba8b668..fd877faf 100644 --- a/arm9/modules/05/asm/mod05_021D7F4C.s +++ b/arm9/modules/05/asm/mod05_021D7F4C.s @@ -147,12 +147,12 @@ _021D8034: ldr r0, [r4, #4] cmp r0, #0 bne _021D8062 - bl ErrorHandling + bl GF_AssertFail _021D8062: ldr r0, [r4, #8] cmp r0, #0 bne _021D806C - bl ErrorHandling + bl GF_AssertFail _021D806C: ldrh r1, [r6, #4] cmp r1, #0 @@ -177,7 +177,7 @@ _021D808C: cmp r1, r2 blt _021D8034 _021D8094: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r4, r5, r6, pc} .balign 4, 0 diff --git a/arm9/modules/05/asm/mod05_021D80E8.s b/arm9/modules/05/asm/mod05_021D80E8.s index c00cb45f..e228ee0a 100644 --- a/arm9/modules/05/asm/mod05_021D80E8.s +++ b/arm9/modules/05/asm/mod05_021D80E8.s @@ -1674,7 +1674,7 @@ _021D8E84: mov r0, #2 b _021D8E96 _021D8E8C: - bl ErrorHandling + bl GF_AssertFail add sp, #0x20 mov r0, #0 pop {r3, r4, r5, pc} @@ -1702,7 +1702,7 @@ _021D8EB0: beq _021D8ED2 cmp r0, #3 beq _021D8ED2 - bl ErrorHandling + bl GF_AssertFail add sp, #0x20 mov r0, #0 pop {r3, r4, r5, pc} @@ -2118,7 +2118,7 @@ _021D91DC: ldr r0, _021D9244 ; =0x00000FFF cmp r1, r0 beq _021D91F2 - bl ErrorHandling + bl GF_AssertFail _021D91F2: ldr r0, [r4, #0xc] bl FUN_02034E30 diff --git a/arm9/modules/05/asm/mod05_021D9320.s b/arm9/modules/05/asm/mod05_021D9320.s index 4d0220e5..ec304548 100644 --- a/arm9/modules/05/asm/mod05_021D9320.s +++ b/arm9/modules/05/asm/mod05_021D9320.s @@ -295,7 +295,7 @@ MOD05_021D9510: ; 0x021D9510 bl FUN_0201FE94 add r5, r0, #0 bne _021D9580 - bl ErrorHandling + bl GF_AssertFail _021D9580: ldrh r1, [r4, #0xa] add r0, r5, #0 @@ -444,7 +444,7 @@ MOD05_021D967C: ; 0x021D967C bl FUN_0200945C cmp r0, #0 bne _021D96A0 - bl ErrorHandling + bl GF_AssertFail add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} _021D96A0: @@ -468,7 +468,7 @@ _021D96A0: bl FUN_02009D68 cmp r0, #1 beq _021D96D0 - bl ErrorHandling + bl GF_AssertFail _021D96D0: mov r0, #0x53 lsl r0, r0, #2 @@ -481,7 +481,7 @@ _021D96D0: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} _021D96E8: - bl ErrorHandling + bl GF_AssertFail add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -526,7 +526,7 @@ MOD05_021D971C: ; 0x021D971C bl FUN_0200945C cmp r0, #0 bne _021D9740 - bl ErrorHandling + bl GF_AssertFail add sp, #0xc pop {r4, r5, r6, r7, pc} _021D9740: @@ -554,7 +554,7 @@ _021D9740: add sp, #0xc pop {r4, r5, r6, r7, pc} _021D9774: - bl ErrorHandling + bl GF_AssertFail add sp, #0xc pop {r4, r5, r6, r7, pc} .balign 4, 0 @@ -610,7 +610,7 @@ MOD05_021D97B4: ; 0x021D97B4 bl FUN_0200945C cmp r0, #0 bne _021D97DE - bl ErrorHandling + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} _021D97DE: @@ -635,11 +635,11 @@ _021D97DE: bl MOD05_021D9780 cmp r0, #1 beq _021D9818 - bl ErrorHandling + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} _021D9814: - bl ErrorHandling + bl GF_AssertFail _021D9818: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -865,7 +865,7 @@ _021D99A6: bl FUN_02020248 b _021D99EE _021D99EA: - bl ErrorHandling + bl GF_AssertFail _021D99EE: add r0, r6, #0 add sp, #0x74 diff --git a/arm9/modules/05/asm/mod05_021D9A48.s b/arm9/modules/05/asm/mod05_021D9A48.s index 85ba30d1..ee169f98 100644 --- a/arm9/modules/05/asm/mod05_021D9A48.s +++ b/arm9/modules/05/asm/mod05_021D9A48.s @@ -15,7 +15,7 @@ MOD05_021D9A48: ; 0x021D9A48 add r4, r3, #0 cmp r1, r0 bne _021D9A60 - bl ErrorHandling + bl GF_AssertFail _021D9A60: mov r0, #0 add r1, r6, #0 @@ -70,7 +70,7 @@ MOD05_021D9AA8: ; 0x021D9AA8 add r5, r3, #0 cmp r4, r0 bne _021D9ABE - bl ErrorHandling + bl GF_AssertFail _021D9ABE: add r0, r6, #0 add r1, r4, #0 @@ -78,14 +78,14 @@ _021D9ABE: bl NARC_AllocAndReadWholeMember add r4, r0, #0 bne _021D9AD0 - bl ErrorHandling + bl GF_AssertFail _021D9AD0: add r0, r4, #0 mov r1, #0 bl NNS_G3dGetAnmByIdx add r6, r0, #0 bne _021D9AE0 - bl ErrorHandling + bl GF_AssertFail _021D9AE0: ldr r0, [sp, #0x1c] add r1, r6, #0 @@ -94,7 +94,7 @@ _021D9AE0: str r0, [r5] cmp r5, #0 bne _021D9AF4 - bl ErrorHandling + bl GF_AssertFail _021D9AF4: ldr r0, [r5] ldr r3, [sp, #0x18] @@ -257,7 +257,7 @@ MOD05_021D9C00: ; 0x021D9C00 ldr r0, [r4, #4] cmp r0, #1 beq _021D9C0E - bl ErrorHandling + bl GF_AssertFail _021D9C0E: ldr r0, [r4, #0x1c] pop {r4, pc} @@ -280,7 +280,7 @@ MOD05_021D9C14: ; 0x021D9C14 bl NARC_ReadWholeMember cmp r4, #4 blt _021D9C38 - bl ErrorHandling + bl GF_AssertFail _021D9C38: lsl r1, r4, #2 add r0, sp, #0x14 @@ -312,7 +312,7 @@ _021D9C66: ldr r0, [r4, #0x34] cmp r5, r0 bne _021D9C74 - bl ErrorHandling + bl GF_AssertFail _021D9C74: add r6, r6, #1 add r4, #0x28 @@ -368,7 +368,7 @@ _021D9CD8: add r1, #0x28 cmp r2, #0x10 blt _021D9C80 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 add sp, #0x24 pop {r4, r5, r6, r7, pc} @@ -470,7 +470,7 @@ _021D9D9C: _021D9DA4: cmp r4, #0x10 bne _021D9DAC - bl ErrorHandling + bl GF_AssertFail _021D9DAC: ldr r0, [sp, #0x10] add r0, r0, #4 @@ -495,7 +495,7 @@ MOD05_021D9DC0: ; 0x021D9DC0 str r3, [sp] cmp r6, #0 bne _021D9DDC - bl ErrorHandling + bl GF_AssertFail add sp, #0x18 mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -516,7 +516,7 @@ _021D9DEC: bl NARC_ReadWholeMember cmp r4, #4 blt _021D9E02 - bl ErrorHandling + bl GF_AssertFail _021D9E02: lsl r1, r4, #2 add r0, sp, #8 @@ -596,7 +596,7 @@ MOD05_021D9E80: ; 0x021D9E80 add r4, r2, #0 str r0, [sp] bne _021D9E94 - bl ErrorHandling + bl GF_AssertFail _021D9E94: add r0, r4, #0 bl MOD05_021DA220 @@ -734,7 +734,7 @@ MOD05_021D9F80: ; 0x021D9F80 beq _021D9FB2 cmp r5, #0 bne _021D9F90 - bl ErrorHandling + bl GF_AssertFail _021D9F90: ldr r0, [r5, #4] cmp r0, #0 @@ -770,7 +770,7 @@ MOD05_021D9FB4: ; 0x021D9FB4 bl NARC_ReadWholeMember cmp r5, #4 blt _021D9FD4 - bl ErrorHandling + bl GF_AssertFail _021D9FD4: lsl r1, r5, #2 add r0, sp, #4 @@ -779,7 +779,7 @@ _021D9FD4: mvn r0, r0 cmp r5, r0 bne _021D9FE6 - bl ErrorHandling + bl GF_AssertFail _021D9FE6: mov r0, #0 mov r2, #0x28 @@ -834,7 +834,7 @@ MOD05_021DA03C: ; 0x021DA03C add r4, r1, #0 cmp r5, #0 bne _021DA04A - bl ErrorHandling + bl GF_AssertFail _021DA04A: mov r6, #0 add r1, r6, #0 @@ -850,7 +850,7 @@ _021DA050: ldr r0, [r6, #4] cmp r0, #0 bne _021DA072 - bl ErrorHandling + bl GF_AssertFail b _021DA072 _021DA06A: add r1, r1, #1 @@ -860,7 +860,7 @@ _021DA06A: _021DA072: cmp r6, #0 bne _021DA07A - bl ErrorHandling + bl GF_AssertFail _021DA07A: add r0, r6, #0 pop {r4, r5, r6, pc} @@ -881,7 +881,7 @@ MOD05_021DA080: ; 0x021DA080 bl NARC_ReadWholeMember cmp r4, #4 blt _021DA0A0 - bl ErrorHandling + bl GF_AssertFail _021DA0A0: lsl r1, r4, #2 add r0, sp, #4 @@ -900,7 +900,7 @@ _021DA0AC: ldr r0, [r4, #4] cmp r0, #0 bne _021DA0CE - bl ErrorHandling + bl GF_AssertFail b _021DA0CE _021DA0C6: add r2, r2, #1 @@ -910,7 +910,7 @@ _021DA0C6: _021DA0CE: cmp r4, #0 bne _021DA0D6 - bl ErrorHandling + bl GF_AssertFail _021DA0D6: add r0, r4, #0 add sp, #0x14 @@ -1171,7 +1171,7 @@ MOD05_021DA26C: ; 0x021DA26C add r5, r0, #0 add r4, r1, #0 bne _021DA278 - bl ErrorHandling + bl GF_AssertFail _021DA278: mov r1, #0x10 mov r0, #0 @@ -1203,7 +1203,7 @@ _021DA292: strb r4, [r0] b _021DA2B6 _021DA2AE: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} _021DA2B6: @@ -1265,7 +1265,7 @@ MOD05_021DA304: ; 0x021DA304 add r6, r2, #0 cmp r4, #4 ble _021DA314 - bl ErrorHandling + bl GF_AssertFail _021DA314: cmp r5, #0 beq _021DA31A @@ -1284,7 +1284,7 @@ MOD05_021DA320: ; 0x021DA320 add r6, r2, #0 cmp r4, r0 blt _021DA332 - bl ErrorHandling + bl GF_AssertFail _021DA332: lsl r0, r4, #2 str r6, [r5, r0] @@ -1299,7 +1299,7 @@ MOD05_021DA338: ; 0x021DA338 add r4, r1, #0 cmp r4, r0 blt _021DA34A - bl ErrorHandling + bl GF_AssertFail _021DA34A: lsl r0, r4, #2 ldr r0, [r5, r0] @@ -1368,7 +1368,7 @@ _021DA3AC: bl MOD05_021D9C14 add r4, r0, #0 bne _021DA3D2 - bl ErrorHandling + bl GF_AssertFail _021DA3D2: ldr r0, [sp, #0x4c] add r1, r5, #0 @@ -1464,7 +1464,7 @@ MOD05_021DA464: ; 0x021DA464 bl MOD05_021DA26C add r5, r0, #0 bne _021DA482 - bl ErrorHandling + bl GF_AssertFail add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} _021DA482: @@ -1476,7 +1476,7 @@ _021DA482: ldrb r4, [r0] cmp r4, #0 bne _021DA498 - bl ErrorHandling + bl GF_AssertFail _021DA498: cmp r4, #0 bne _021DA49E @@ -1506,7 +1506,7 @@ MOD05_021DA4BC: ; 0x021DA4BC add r6, r3, #0 cmp r4, #6 blo _021DA4CE - bl ErrorHandling + bl GF_AssertFail _021DA4CE: add r0, r5, #0 add r1, r7, #0 @@ -1517,7 +1517,7 @@ _021DA4CE: ldr r0, [r5, r4] cmp r0, #0 beq _021DA4E6 - bl ErrorHandling + bl GF_AssertFail _021DA4E6: str r6, [r5, r4] pop {r3, r4, r5, r6, r7, pc} @@ -1531,7 +1531,7 @@ MOD05_021DA4EC: ; 0x021DA4EC add r6, r2, #0 cmp r4, #0 bne _021DA4FC - bl ErrorHandling + bl GF_AssertFail _021DA4FC: add r0, r5, #0 add r1, r4, #0 @@ -1552,7 +1552,7 @@ MOD05_021DA514: ; 0x021DA514 add r4, r3, #0 cmp r5, #0 bne _021DA526 - bl ErrorHandling + bl GF_AssertFail _021DA526: add r0, r6, #0 add r1, r5, #0 @@ -1578,7 +1578,7 @@ MOD05_021DA54C: ; 0x021DA54C add r4, r1, #0 add r6, r2, #0 bne _021DA55A - bl ErrorHandling + bl GF_AssertFail _021DA55A: add r0, r4, #0 add r1, r6, #0 @@ -1597,7 +1597,7 @@ MOD05_021DA574: ; 0x021DA574 add r5, r0, #0 add r4, r1, #0 bne _021DA580 - bl ErrorHandling + bl GF_AssertFail _021DA580: add r0, r5, #0 add r1, r4, #0 @@ -1611,7 +1611,7 @@ MOD05_021DA58C: ; 0x021DA58C bl MOD05_021DA574 add r4, r0, #0 bne _021DA59A - bl ErrorHandling + bl GF_AssertFail _021DA59A: add r0, r4, #0 bl MOD05_021DA20C diff --git a/arm9/modules/05/asm/mod05_021DA5B8.s b/arm9/modules/05/asm/mod05_021DA5B8.s index e961bb5a..b4648ab3 100644 --- a/arm9/modules/05/asm/mod05_021DA5B8.s +++ b/arm9/modules/05/asm/mod05_021DA5B8.s @@ -115,7 +115,7 @@ _021DA606: bl MOD05_021DA464 b _021DA692 _021DA688: - bl ErrorHandling + bl GF_AssertFail add sp, #0x84 mov r0, #1 pop {r4, r5, r6, r7, pc} @@ -156,7 +156,7 @@ _021DA6CC: mov r2, #0 b _021DA6DA _021DA6D4: - bl ErrorHandling + bl GF_AssertFail mov r2, #0 _021DA6DA: ldr r0, [r5, #0x50] @@ -220,7 +220,7 @@ _021DA752: mov r2, #1 b _021DA760 _021DA75A: - bl ErrorHandling + bl GF_AssertFail mov r2, #1 _021DA760: ldr r0, [r5, #0x50] @@ -350,7 +350,7 @@ _021DA7E4: bl MOD05_021DA464 b _021DA878 _021DA864: - bl ErrorHandling + bl GF_AssertFail mov r0, #1 bl MOD05_021D7CA4 mov r0, #6 @@ -412,7 +412,7 @@ _021DA8D6: mov r2, #2 b _021DA8E4 _021DA8DE: - bl ErrorHandling + bl GF_AssertFail mov r2, #0 _021DA8E4: ldr r0, [r5, #0x50] @@ -477,7 +477,7 @@ _021DA960: mov r2, #3 b _021DA96E _021DA968: - bl ErrorHandling + bl GF_AssertFail mov r2, #1 _021DA96E: ldr r0, [r5, #0x50] @@ -737,7 +737,7 @@ _021DAB10: bl MOD05_021DA464 b _021DAB68 _021DAB5E: - bl ErrorHandling + bl GF_AssertFail add sp, #0x40 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -753,7 +753,7 @@ _021DAB68: bl FUN_0205ADDC b _021DAB86 _021DAB82: - bl ErrorHandling + bl GF_AssertFail _021DAB86: ldr r0, [r4] add r0, r0, #1 @@ -784,7 +784,7 @@ _021DABBA: bl FUN_0205ADDC b _021DABC6 _021DABC2: - bl ErrorHandling + bl GF_AssertFail _021DABC6: ldr r0, [r4] add r0, r0, #1 @@ -958,7 +958,7 @@ _021DACDA: bl MOD05_021DA464 b _021DAD34 _021DAD2A: - bl ErrorHandling + bl GF_AssertFail add sp, #0x40 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -974,7 +974,7 @@ _021DAD34: bl FUN_0205ADDC b _021DAD52 _021DAD4E: - bl ErrorHandling + bl GF_AssertFail _021DAD52: ldr r0, [r4] add r0, r0, #1 @@ -1003,7 +1003,7 @@ _021DAD80: bl FUN_0205ADDC b _021DAD8C _021DAD88: - bl ErrorHandling + bl GF_AssertFail _021DAD8C: ldr r0, [r4] add r0, r0, #1 @@ -1152,7 +1152,7 @@ _021DAE50: add sp, #0x84 pop {r4, r5, r6, r7, pc} _021DAEC8: - bl ErrorHandling + bl GF_AssertFail add sp, #0x84 pop {r4, r5, r6, r7, pc} .balign 4, 0 @@ -1189,7 +1189,7 @@ _021DAF04: mov r2, #0 b _021DAF12 _021DAF0C: - bl ErrorHandling + bl GF_AssertFail mov r2, #0 _021DAF12: ldr r0, [r5, #0x50] @@ -1232,7 +1232,7 @@ _021DAF58: mov r2, #1 b _021DAF66 _021DAF60: - bl ErrorHandling + bl GF_AssertFail mov r2, #1 _021DAF66: ldr r0, [r5, #0x50] @@ -1302,7 +1302,7 @@ MOD05_021DAFA8: ; 0x021DAFA8 bl FUN_0204A94C cmp r0, #0 bne _021DAFEA - bl ErrorHandling + bl GF_AssertFail _021DAFEA: ldr r0, [sp, #0x18] bl MOD05_021E7EC8 @@ -1315,7 +1315,7 @@ _021DAFEA: bl MOD05_021D9DC0 cmp r0, #0 bne _021DB008 - bl ErrorHandling + bl GF_AssertFail _021DB008: ldr r0, [sp, #0x14] ldr r2, [r4, #0x4c] @@ -1675,7 +1675,7 @@ _021DB2E6: mov r6, #0x27 b _021DB2EE _021DB2EA: - bl ErrorHandling + bl GF_AssertFail _021DB2EE: mov r1, #0 str r1, [sp] diff --git a/arm9/modules/05/asm/mod05_021DB44C.s b/arm9/modules/05/asm/mod05_021DB44C.s index 6da3dfc5..eaee32f8 100644 --- a/arm9/modules/05/asm/mod05_021DB44C.s +++ b/arm9/modules/05/asm/mod05_021DB44C.s @@ -10,7 +10,7 @@ MOD05_021DB44C: ; 0x021DB44C add r5, r0, #0 cmp r6, #3 blo _021DB45A - bl ErrorHandling + bl GF_AssertFail _021DB45A: mov r0, #4 mov r1, #0x14 @@ -60,7 +60,7 @@ MOD05_021DB4B0: ; 0x021DB4B0 push {r4, lr} add r4, r0, #0 bne _021DB4BA - bl ErrorHandling + bl GF_AssertFail _021DB4BA: ldr r0, [r4] add r0, r0, #4 @@ -77,7 +77,7 @@ MOD05_021DB4D0: ; 0x021DB4D0 push {r3, r4, r5, lr} add r4, r0, #0 bne _021DB4DA - bl ErrorHandling + bl GF_AssertFail _021DB4DA: bl GF_RTC_TimeToSec lsr r1, r0, #0x1f diff --git a/arm9/modules/05/asm/mod05_021DB900.s b/arm9/modules/05/asm/mod05_021DB900.s index 9edf9e7c..931fcfad 100644 --- a/arm9/modules/05/asm/mod05_021DB900.s +++ b/arm9/modules/05/asm/mod05_021DB900.s @@ -11,7 +11,7 @@ MOD05_021DB900: ; 0x021DB900 bl AllocFromHeap add r4, r0, #0 bne _021DB912 - bl ErrorHandling + bl GF_AssertFail _021DB912: add r0, r4, #0 pop {r4, pc} @@ -37,7 +37,7 @@ MOD05_021DB918: ; 0x021DB918 bl FS_ReadFile cmp r0, #0 bge _021DB946 - bl ErrorHandling + bl GF_AssertFail _021DB946: add r0, sp, #4 add r1, sp, #0 @@ -45,7 +45,7 @@ _021DB946: bl FS_ReadFile cmp r0, #0 bge _021DB958 - bl ErrorHandling + bl GF_AssertFail _021DB958: add r0, sp, #0 ldrh r1, [r0, #2] @@ -58,7 +58,7 @@ _021DB958: str r0, [r5] cmp r0, #0 bne _021DB974 - bl ErrorHandling + bl GF_AssertFail _021DB974: mov r0, #4 add r1, r4, #0 @@ -66,7 +66,7 @@ _021DB974: str r0, [r5, #4] cmp r0, #0 bne _021DB986 - bl ErrorHandling + bl GF_AssertFail _021DB986: ldr r1, [r5] add r0, sp, #4 @@ -74,7 +74,7 @@ _021DB986: bl FS_ReadFile cmp r0, #0 bge _021DB998 - bl ErrorHandling + bl GF_AssertFail _021DB998: ldr r1, [r5, #4] add r0, sp, #4 @@ -82,14 +82,14 @@ _021DB998: bl FS_ReadFile cmp r0, #0 bge _021DB9AA - bl ErrorHandling + bl GF_AssertFail _021DB9AA: add r0, sp, #4 bl FS_CloseFile add sp, #0x4c pop {r3, r4, r5, r6, pc} _021DB9B4: - bl ErrorHandling + bl GF_AssertFail add sp, #0x4c pop {r3, r4, r5, r6, pc} diff --git a/arm9/modules/05/asm/mod05_021DBD84.s b/arm9/modules/05/asm/mod05_021DBD84.s index 7c107314..9a6cb847 100644 --- a/arm9/modules/05/asm/mod05_021DBD84.s +++ b/arm9/modules/05/asm/mod05_021DBD84.s @@ -16,7 +16,7 @@ MOD05_021DBD84: ; 0x021DBD84 add r4, r1, r0 cmp r2, #0x10 blo _021DBD9E - bl ErrorHandling + bl GF_AssertFail _021DBD9E: mov r0, #4 bl FUN_0201EB64 diff --git a/arm9/modules/05/asm/mod05_021DBE04.s b/arm9/modules/05/asm/mod05_021DBE04.s index 4b4b5177..873fd482 100644 --- a/arm9/modules/05/asm/mod05_021DBE04.s +++ b/arm9/modules/05/asm/mod05_021DBE04.s @@ -9,11 +9,11 @@ MOD05_021DBE04: ; 0x021DBE04 ldr r4, [r0, #0x18] cmp r4, #0 bne _021DBE10 - bl ErrorHandling + bl GF_AssertFail _021DBE10: cmp r4, #5 blt _021DBE18 - bl ErrorHandling + bl GF_AssertFail _021DBE18: sub r0, r4, #1 pop {r4, pc} diff --git a/arm9/modules/05/asm/mod05_021DC0B8.s b/arm9/modules/05/asm/mod05_021DC0B8.s index b637fb93..8d4f91fa 100644 --- a/arm9/modules/05/asm/mod05_021DC0B8.s +++ b/arm9/modules/05/asm/mod05_021DC0B8.s @@ -68,7 +68,7 @@ MOD05_021DC124: ; 0x021DC124 add r4, r1, #0 cmp r0, #6 beq _021DC134 - bl ErrorHandling + bl GF_AssertFail _021DC134: ldr r2, [r5, #4] cmp r2, r4 @@ -78,7 +78,7 @@ _021DC134: bl MOD05_021DC608 cmp r0, #0 bne _021DC14A - bl ErrorHandling + bl GF_AssertFail _021DC14A: ldr r0, [r5] mov r1, #0 @@ -86,7 +86,7 @@ _021DC14A: bl MOD05_021DC608 cmp r0, #0 bne _021DC15C - bl ErrorHandling + bl GF_AssertFail _021DC15C: ldr r0, [r5] mov r1, #3 @@ -94,7 +94,7 @@ _021DC15C: bl MOD05_021DC608 cmp r0, #0 bne _021DC16E - bl ErrorHandling + bl GF_AssertFail _021DC16E: str r4, [r5, #4] _021DC170: @@ -122,7 +122,7 @@ _021DC190: ldr r0, [r5, #0x14] cmp r0, #0 beq _021DC19A - bl ErrorHandling + bl GF_AssertFail _021DC19A: str r4, [r5, #8] ldr r0, [r5, #4] @@ -182,7 +182,7 @@ _021DC1F6: bl MOD05_021DC608 cmp r0, #0 bne _021DC208 - bl ErrorHandling + bl GF_AssertFail _021DC208: ldr r0, [r4, #0xc] add r0, r0, #1 @@ -200,7 +200,7 @@ _021DC210: bl MOD05_021DC608 cmp r0, #0 bne _021DC22E - bl ErrorHandling + bl GF_AssertFail _021DC22E: ldr r0, [r4, #0xc] add r0, r0, #1 @@ -213,7 +213,7 @@ _021DC236: bl MOD05_021DC608 cmp r0, #0 bne _021DC248 - bl ErrorHandling + bl GF_AssertFail _021DC248: ldr r0, [r4, #0xc] add r0, r0, #1 @@ -236,7 +236,7 @@ _021DC264: bl MOD05_021DC608 cmp r0, #0 bne _021DC276 - bl ErrorHandling + bl GF_AssertFail _021DC276: ldr r0, [r4, #0xc] add r0, r0, #1 @@ -288,7 +288,7 @@ _021DC2C4: bl MOD05_021DC608 cmp r0, #0 bne _021DC2D6 - bl ErrorHandling + bl GF_AssertFail _021DC2D6: ldr r0, [r4, #0xc] add r0, r0, #1 @@ -311,7 +311,7 @@ _021DC2F2: bl MOD05_021DC608 cmp r0, #0 bne _021DC304 - bl ErrorHandling + bl GF_AssertFail _021DC304: ldr r0, [r4] ldr r2, [r4, #8] @@ -319,7 +319,7 @@ _021DC304: bl MOD05_021DC608 cmp r0, #0 bne _021DC316 - bl ErrorHandling + bl GF_AssertFail _021DC316: ldr r0, [r4, #0xc] add r0, r0, #1 @@ -337,7 +337,7 @@ _021DC31E: bl MOD05_021DC608 cmp r0, #0 bne _021DC33C - bl ErrorHandling + bl GF_AssertFail _021DC33C: ldr r0, [r4, #0xc] add r0, r0, #1 @@ -1559,7 +1559,7 @@ _021DCC66: bl MOD05_021DCD68 cmp r0, #0 bne _021DCC74 - bl ErrorHandling + bl GF_AssertFail _021DCC74: ldr r0, [r4, #0x18] add r0, r0, #1 @@ -1981,7 +1981,7 @@ MOD05_021DCF68: ; 0x021DCF68 str r0, [sp, #0x14] cmp r0, #0 bne _021DCFA0 - bl ErrorHandling + bl GF_AssertFail _021DCFA0: ldr r0, [sp, #0x14] add r1, sp, #0x18 @@ -2043,15 +2043,15 @@ MOD05_021DD010: ; 0x021DD010 add r4, r1, #0 cmp r0, #0 beq _021DD020 - bl ErrorHandling + bl GF_AssertFail _021DD020: cmp r4, #0 bgt _021DD028 - bl ErrorHandling + bl GF_AssertFail _021DD028: cmp r4, #0x28 bls _021DD030 - bl ErrorHandling + bl GF_AssertFail _021DD030: add r0, r5, #0 add r0, #0xc @@ -10147,7 +10147,7 @@ MOD05_021E0FA4: ; 0x021E0FA4 ldr r0, [r5, r0] cmp r0, #0 beq _021E0FB6 - bl ErrorHandling + bl GF_AssertFail _021E0FB6: ldr r1, _021E0FCC ; =0x00000F5C mov r0, #1 diff --git a/arm9/modules/05/asm/mod05_021E1374.s b/arm9/modules/05/asm/mod05_021E1374.s index a0192db6..0e1a6b44 100644 --- a/arm9/modules/05/asm/mod05_021E1374.s +++ b/arm9/modules/05/asm/mod05_021E1374.s @@ -17,7 +17,7 @@ MOD05_021E1374: ; 0x021E1374 bl AllocFromHeap add r4, r0, #0 bne _021E1396 - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _021E1396: mov r2, #0x47 @@ -493,7 +493,7 @@ MOD05_021E1724: ; 0x021E1724 bl AllocFromHeap add r4, r0, #0 bne _021E173C - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} _021E173C: ldr r0, _021E1750 ; =MOD05_021E1754 @@ -520,7 +520,7 @@ MOD05_021E1754: ; 0x021E1754 ldrh r0, [r1, r0] cmp r0, #0 bne _021E1770 - bl ErrorHandling + bl GF_AssertFail _021E1770: ldr r2, [r4, #8] ldr r0, _021E1790 ; =0x00000112 diff --git a/arm9/modules/05/asm/mod05_021E2E88.s b/arm9/modules/05/asm/mod05_021E2E88.s index 75d92e5b..a81ba2f1 100644 --- a/arm9/modules/05/asm/mod05_021E2E88.s +++ b/arm9/modules/05/asm/mod05_021E2E88.s @@ -568,7 +568,7 @@ _021E32E0: str r0, [r4, #0x14] pop {r4, pc} _021E32E6: - bl ErrorHandling + bl GF_AssertFail pop {r4, pc} .balign 4, 0 _021E32EC: .word MOD05_021E3124 diff --git a/arm9/modules/05/asm/mod05_021E3444.s b/arm9/modules/05/asm/mod05_021E3444.s index d8a13888..73ee60ca 100644 --- a/arm9/modules/05/asm/mod05_021E3444.s +++ b/arm9/modules/05/asm/mod05_021E3444.s @@ -495,7 +495,7 @@ MOD05_021E37CC: ; 0x021E37CC ldr r4, [sp, #0x20] cmp r0, #0 beq _021E37E4 - bl ErrorHandling + bl GF_AssertFail _021E37E4: mov r0, #0 str r0, [r6, #0x18] @@ -587,7 +587,7 @@ MOD05_021E3888: ; 0x021E3888 bl MOD05_021E35AC cmp r0, #0 beq _021E389E - bl ErrorHandling + bl GF_AssertFail _021E389E: str r4, [r5, #0x18] mov r0, #0 @@ -837,7 +837,7 @@ MOD05_021E3A70: ; 0x021E3A70 add r7, r3, #0 cmp r0, #0 beq _021E3A84 - bl ErrorHandling + bl GF_AssertFail _021E3A84: mov r1, #0 str r1, [r5, #0x18] @@ -1508,7 +1508,7 @@ MOD05_021E3FC4: ; 0x021E3FC4 bl FUN_0201FF84 add r4, r0, #0 bne _021E3FF2 - bl ErrorHandling + bl GF_AssertFail _021E3FF2: add r0, r4, #0 add sp, #0x20 @@ -1709,7 +1709,7 @@ MOD05_021E4160: ; 0x021E4160 add r7, r3, #0 cmp r0, #0 beq _021E4176 - bl ErrorHandling + bl GF_AssertFail _021E4176: ldr r3, [sp, #0x1c] add r0, r5, #0 @@ -1827,7 +1827,7 @@ MOD05_021E4240: ; 0x021E4240 add r7, r3, #0 cmp r0, #0 beq _021E4256 - bl ErrorHandling + bl GF_AssertFail _021E4256: ldr r3, [sp, #0x1c] add r0, r5, #0 @@ -2569,7 +2569,7 @@ MOD05_021E47BC: ; 0x021E47BC add r5, r3, #0 cmp r0, #0 beq _021E47D8 - bl ErrorHandling + bl GF_AssertFail _021E47D8: mov r1, #0 str r1, [r4, #0x18] @@ -2787,7 +2787,7 @@ _021E4976: mov r6, #0 b _021E4980 _021E497A: - bl ErrorHandling + bl GF_AssertFail mov r6, #0 _021E4980: ldr r0, [r5, #4] diff --git a/arm9/modules/05/asm/mod05_021E4AE4.s b/arm9/modules/05/asm/mod05_021E4AE4.s index 635d46f6..98146a9c 100644 --- a/arm9/modules/05/asm/mod05_021E4AE4.s +++ b/arm9/modules/05/asm/mod05_021E4AE4.s @@ -76,7 +76,7 @@ MOD05_021E4B64: ; 0x021E4B64 bl MOD05_021E4D2C cmp r0, #0 beq _021E4B78 - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, pc} _021E4B78: add r0, r5, #0 @@ -166,7 +166,7 @@ MOD05_021E4C08: ; 0x021E4C08 bl MOD05_021E4D2C cmp r0, #0 bne _021E4C1A - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} _021E4C1A: @@ -333,7 +333,7 @@ _021E4D1C: sub r4, r4, #1 bne _021E4D0E _021E4D22: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} .balign 4, 0 @@ -402,7 +402,7 @@ _021E4D7A: cmp r2, #0x20 bne _021E4D72 _021E4D82: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} nop @@ -454,7 +454,7 @@ MOD05_021E4DC4: ; 0x021E4DC4 bl FUN_020644E4 add r4, r0, #0 bne _021E4DDE - bl ErrorHandling + bl GF_AssertFail _021E4DDE: add r0, r4, #0 add sp, #8 @@ -566,7 +566,7 @@ MOD05_021E4E90: ; 0x021E4E90 bl FUN_0201F6E8 add r4, r0, #0 bne _021E4EC0 - bl ErrorHandling + bl GF_AssertFail _021E4EC0: cmp r4, #0 beq _021E4EDA @@ -618,7 +618,7 @@ MOD05_021E4EFC: ; 0x021E4EFC bl FUN_02021050 add r4, r0, #0 bne _021E4F2E - bl ErrorHandling + bl GF_AssertFail _021E4F2E: add r0, r4, #0 bl FUN_020210AC @@ -638,7 +638,7 @@ _021E4F3C: bl MOD05_021E4FC8 add r4, r0, #0 bne _021E4F58 - bl ErrorHandling + bl GF_AssertFail _021E4F58: add r0, r4, #0 add sp, #0x1c @@ -700,7 +700,7 @@ _021E4FBA: add r3, #8 sub r2, r2, #1 bne _021E4FAE - bl ErrorHandling + bl GF_AssertFail pop {r3, pc} .balign 4, 0 @@ -742,7 +742,7 @@ _021E4FFC: _021E5002: cmp r4, #0 bne _021E500A - bl ErrorHandling + bl GF_AssertFail _021E500A: add r0, r4, #0 mov r1, #0 @@ -790,7 +790,7 @@ _021E505C: add r3, #8 sub r2, r2, #1 bne _021E5052 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} .balign 4, 0 @@ -884,7 +884,7 @@ MOD05_021E50D4: ; 0x021E50D4 bl FUN_02020F54 cmp r0, #0 bne _021E5106 - bl ErrorHandling + bl GF_AssertFail _021E5106: ldr r2, [r4, #0x18] add r0, r5, #0 @@ -982,7 +982,7 @@ MOD05_021E5198: ; 0x021E5198 bl NNS_G3dResDefaultSetup cmp r0, #0 bne _021E51C8 - bl ErrorHandling + bl GF_AssertFail _021E51C8: ldr r0, [r4] bl NNS_G3dGetMdlSet @@ -993,7 +993,7 @@ _021E51C8: str r0, [r5] cmp r5, #0 bne _021E51E0 - bl ErrorHandling + bl GF_AssertFail _021E51E0: ldr r1, [r5] add r0, r6, #0 diff --git a/arm9/modules/05/asm/mod05_021E55BC.s b/arm9/modules/05/asm/mod05_021E55BC.s index 9c384261..517222fb 100644 --- a/arm9/modules/05/asm/mod05_021E55BC.s +++ b/arm9/modules/05/asm/mod05_021E55BC.s @@ -134,7 +134,7 @@ MOD05_021E569C: ; 0x021E569C bl FUN_020582A8 cmp r0, #0 bne _021E56B8 - bl ErrorHandling + bl GF_AssertFail _021E56B8: ldr r0, [r4] cmp r0, #0 diff --git a/arm9/modules/05/asm/mod05_021E577C.s b/arm9/modules/05/asm/mod05_021E577C.s index 6ae8f9ed..bad97efe 100644 --- a/arm9/modules/05/asm/mod05_021E577C.s +++ b/arm9/modules/05/asm/mod05_021E577C.s @@ -134,7 +134,7 @@ MOD05_021E585C: ; 0x021E585C bl FUN_020582A8 cmp r0, #0 bne _021E5878 - bl ErrorHandling + bl GF_AssertFail _021E5878: add r0, r5, #0 add r1, sp, #0 diff --git a/arm9/modules/05/asm/mod05_021E5FD8.s b/arm9/modules/05/asm/mod05_021E5FD8.s index ab5f7010..f341dfd8 100644 --- a/arm9/modules/05/asm/mod05_021E5FD8.s +++ b/arm9/modules/05/asm/mod05_021E5FD8.s @@ -825,7 +825,7 @@ MOD05_021E6638: ; 0x021E6638 str r0, [r4, #0x14] cmp r0, #0 bne _021E6666 - bl ErrorHandling + bl GF_AssertFail _021E6666: ldr r1, _021E6674 ; =MOD05_021E6678 add r0, r5, #0 @@ -1685,13 +1685,13 @@ MOD05_021E6CC4: ; 0x021E6CC4 ldr r0, [r5, #0x30] cmp r1, r0 bgt _021E6D2A - bl ErrorHandling + bl GF_AssertFail _021E6D2A: ldr r1, [sp, #0x10] ldr r0, [r5, #0x2c] cmp r1, r0 blt _021E6D36 - bl ErrorHandling + bl GF_AssertFail _021E6D36: mov r0, #0 str r0, [sp] @@ -1807,13 +1807,13 @@ _021E6E06: ldr r0, [r4, #0x30] cmp r1, r0 beq _021E6E12 - bl ErrorHandling + bl GF_AssertFail _021E6E12: ldr r1, [sp, #4] ldr r0, [r4, #0x2c] cmp r1, r0 beq _021E6E1E - bl ErrorHandling + bl GF_AssertFail _021E6E1E: ldr r0, [r4, #0x3c] ldr r1, [r4, #0xc] @@ -1918,13 +1918,13 @@ MOD05_021E6E90: ; 0x021E6E90 ldr r0, [r5, #0x30] cmp r1, r0 blt _021E6EFA - bl ErrorHandling + bl GF_AssertFail _021E6EFA: ldr r1, [sp, #0x10] ldr r0, [r5, #0x2c] cmp r1, r0 bgt _021E6F06 - bl ErrorHandling + bl GF_AssertFail _021E6F06: mov r0, #0 str r0, [sp] @@ -2053,13 +2053,13 @@ _021E6FEC: ldr r0, [r4, #0x30] cmp r1, r0 beq _021E6FF8 - bl ErrorHandling + bl GF_AssertFail _021E6FF8: ldr r1, [sp, #4] ldr r0, [r4, #0x2c] cmp r1, r0 beq _021E7004 - bl ErrorHandling + bl GF_AssertFail _021E7004: ldr r0, [r4, #0x3c] ldr r1, [r4, #0xc] @@ -2274,7 +2274,7 @@ _021E7198: bl FUN_0200CA44 add r4, r0, #0 bne _021E71DA - bl ErrorHandling + bl GF_AssertFail _021E71DA: add r0, r4, #0 pop {r3, r4, r5, r6, r7, pc} @@ -2397,7 +2397,7 @@ MOD05_021E72B8: ; 0x021E72B8 bl AllocFromHeapAtEnd add r4, r0, #0 bne _021E72CC - bl ErrorHandling + bl GF_AssertFail _021E72CC: add r0, r4, #0 mov r1, #0 diff --git a/arm9/modules/05/asm/mod05_021E779C.s b/arm9/modules/05/asm/mod05_021E779C.s index ad4118ff..7c09387c 100644 --- a/arm9/modules/05/asm/mod05_021E779C.s +++ b/arm9/modules/05/asm/mod05_021E779C.s @@ -38,7 +38,7 @@ MOD05_021E77C8: ; 0x021E77C8 sub r1, r1, #1 str r1, [r0] bpl _021E77D6 - bl ErrorHandling + bl GF_AssertFail _021E77D6: pop {r3, pc} @@ -56,7 +56,7 @@ MOD05_021E77E0: ; 0x021E77E0 sub r1, r1, #1 str r1, [r0, #4] bpl _021E77EE - bl ErrorHandling + bl GF_AssertFail _021E77EE: pop {r3, pc} @@ -544,7 +544,7 @@ MOD05_021E7B78: ; 0x021E7B78 bl FUN_020582A8 cmp r0, #0 bne _021E7B94 - bl ErrorHandling + bl GF_AssertFail _021E7B94: add r0, r6, #0 add r1, sp, #0 diff --git a/arm9/modules/05/asm/mod05_021E7C00.s b/arm9/modules/05/asm/mod05_021E7C00.s index 686fe698..aaa4fb70 100644 --- a/arm9/modules/05/asm/mod05_021E7C00.s +++ b/arm9/modules/05/asm/mod05_021E7C00.s @@ -83,7 +83,7 @@ MOD05_021E7C80: ; 0x021E7C80 add r4, r1, #0 cmp r5, #0x20 blt _021E7C90 - bl ErrorHandling + bl GF_AssertFail _021E7C90: add r6, sp, #0 mov r3, #0 @@ -427,7 +427,7 @@ MOD05_021E7EEC: ; 0x021E7EEC add r5, r0, #0 cmp r4, #0x20 blt _021E7EFA - bl ErrorHandling + bl GF_AssertFail _021E7EFA: mov r0, #0x8c mul r0, r4 @@ -435,7 +435,7 @@ _021E7EFA: ldr r0, [r4, #4] cmp r0, #0 bne _021E7F0A - bl ErrorHandling + bl GF_AssertFail _021E7F0A: add r0, r4, #0 pop {r3, r4, r5, pc} @@ -602,7 +602,7 @@ _021E8044: lsr r4, r1, #0x18 cmp r4, #0x20 blo _021E7FD4 - bl ErrorHandling + bl GF_AssertFail mov r0, #0x20 add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index ffb9dbe2..4662c7cc 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -11065,7 +11065,7 @@ _021EDFA6: str r0, [r4] pop {r3, r4, r5, r6, r7, pc} _021EDFB6: - bl ErrorHandling + bl GF_AssertFail _021EDFBA: pop {r3, r4, r5, r6, r7, pc} @@ -11212,7 +11212,7 @@ MOD05_021EE0C0: ; 0x021EE0C0 bl NARC_ReadFromMember b _021EE0FC _021EE0E6: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x10 str r0, [sp] mov r0, #0x43 @@ -11664,7 +11664,7 @@ MOD05_021EE470: ; 0x021EE470 ldr r0, [r0, r5] cmp r0, #0 beq _021EE498 - bl ErrorHandling + bl GF_AssertFail _021EE498: ldr r0, [sp, #4] mov r1, #1 @@ -11768,7 +11768,7 @@ MOD05_021EE52C: ; 0x021EE52C ldr r0, [r0] cmp r1, r0 ble _021EE560 - bl ErrorHandling + bl GF_AssertFail _021EE560: ldr r0, [r4, #0x10] ldr r1, [r0] @@ -11819,7 +11819,7 @@ _021EE5B2: ror r1, r0 add r0, r2, r1 beq _021EE5C6 - bl ErrorHandling + bl GF_AssertFail _021EE5C6: mov r0, #0 str r0, [r4, #0x18] @@ -11836,7 +11836,7 @@ _021EE5D0: ldr r0, [r2, #8] cmp r1, r0 beq _021EE5E8 - bl ErrorHandling + bl GF_AssertFail b _021EE6B0 _021EE5E8: cmp r3, r7 @@ -11887,7 +11887,7 @@ _021EE632: ror r1, r0 add r0, r2, r1 beq _021EE6A8 - bl ErrorHandling + bl GF_AssertFail b _021EE6A8 _021EE648: add r1, r5, #0 @@ -11939,7 +11939,7 @@ _021EE694: ror r1, r0 add r0, r2, r1 beq _021EE6A8 - bl ErrorHandling + bl GF_AssertFail _021EE6A8: ldrb r0, [r4, #0x1c] add r1, r5, #0 @@ -12233,7 +12233,7 @@ MOD05_021EE8CC: ; 0x021EE8CC ldr r6, [sp, #0x30] cmp r0, #1 bne _021EE8E6 - bl ErrorHandling + bl GF_AssertFail _021EE8E6: add r0, r6, #0 add r1, r4, #0 @@ -12310,7 +12310,7 @@ _021EE964: bl MOD05_021EE470 cmp r0, #1 beq _021EE984 - bl ErrorHandling + bl GF_AssertFail _021EE984: add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} @@ -12470,7 +12470,7 @@ _021EEA9E: mvn r4, r4 b _021EEAB4 _021EEAB0: - bl ErrorHandling + bl GF_AssertFail _021EEAB4: ldr r2, [sp, #0x10] ldr r3, [sp, #0xc] @@ -12578,7 +12578,7 @@ _021EEB7C: mvn r4, r4 b _021EEB86 _021EEB82: - bl ErrorHandling + bl GF_AssertFail _021EEB86: ldr r2, [sp, #0x10] ldr r3, [sp, #0xc] @@ -12782,7 +12782,7 @@ _021EED0A: mvn r4, r4 b _021EED14 _021EED10: - bl ErrorHandling + bl GF_AssertFail _021EED14: ldr r2, [sp, #0x10] ldr r3, [sp, #0xc] @@ -12799,7 +12799,7 @@ _021EED14: add sp, #0x14 pop {r4, r5, r6, r7, pc} _021EED32: - bl ErrorHandling + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} .balign 4, 0 @@ -12954,7 +12954,7 @@ _021EEE4E: mov r0, #0 pop {r3, pc} _021EEE56: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} .balign 4, 0 @@ -13015,7 +13015,7 @@ _021EEEB8: add r0, r4, #0 pop {r3, r4, r5, pc} _021EEEC0: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 _021EEEC6: pop {r3, r4, r5, pc} @@ -13084,7 +13084,7 @@ _021EEF22: lsr r6, r0, #0x18 b _021EEF62 _021EEF30: - bl ErrorHandling + bl GF_AssertFail b _021EEF62 _021EEF36: cmp r5, r0 @@ -13106,10 +13106,10 @@ _021EEF4A: lsr r6, r0, #0x18 b _021EEF62 _021EEF58: - bl ErrorHandling + bl GF_AssertFail b _021EEF62 _021EEF5E: - bl ErrorHandling + bl GF_AssertFail _021EEF62: strb r6, [r4] pop {r4, r5, r6, pc} @@ -13145,7 +13145,7 @@ _021EEF90: mov r0, #1 pop {r3, pc} _021EEF94: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} @@ -13193,7 +13193,7 @@ MOD05_021EEFD0: ; 0x021EEFD0 add r4, #0x64 cmp r0, #0 beq _021EEFEC - bl ErrorHandling + bl GF_AssertFail _021EEFEC: add r1, r5, #0 add r1, #0xa1 @@ -13290,13 +13290,13 @@ MOD05_021EF094: ; 0x021EF094 add r4, #0x64 cmp r0, #2 blo _021EF0A8 - bl ErrorHandling + bl GF_AssertFail _021EF0A8: add r0, r5, #0 bl MOD05_021EEFD0 cmp r0, #1 beq _021EF0B6 - bl ErrorHandling + bl GF_AssertFail _021EF0B6: mov r0, #0x86 ldr r2, [r4, #0x10] @@ -13694,7 +13694,7 @@ _021EF39A: mov r7, #0 b _021EF3AE _021EF3AA: - bl ErrorHandling + bl GF_AssertFail _021EF3AE: add r0, r7, #0 bl MOD05_021F3BC0 @@ -14073,7 +14073,7 @@ _021EF66A: mvn r0, r0 cmp r5, r0 bne _021EF676 - bl ErrorHandling + bl GF_AssertFail _021EF676: add r0, r4, #0 add r0, #0xac @@ -14309,7 +14309,7 @@ MOD05_021EF824: ; 0x021EF824 add r4, r0, #0 cmp r5, #4 blo _021EF832 - bl ErrorHandling + bl GF_AssertFail _021EF832: lsl r0, r5, #2 add r0, r4, r0 @@ -14363,7 +14363,7 @@ _021EF882: mul r0, r1 cmp r7, r0 blo _021EF898 - bl ErrorHandling + bl GF_AssertFail _021EF898: add r0, r5, #0 add r0, #0xc8 @@ -14536,14 +14536,14 @@ _021EF9B6: ldrb r0, [r5, #9] cmp r0, #1 beq _021EF9CA - bl ErrorHandling + bl GF_AssertFail _021EF9CA: ldrh r0, [r5, #0xe] add r0, r5, r0 ldr r0, [r0, #0xc] add r5, r5, r0 bne _021EF9D8 - bl ErrorHandling + bl GF_AssertFail _021EF9D8: ldr r0, [r4, #8] add r1, r5, #0 @@ -14618,14 +14618,14 @@ MOD05_021EFA40: ; 0x021EFA40 bl FUN_0201B3A8 cmp r0, #0 bne _021EFA6A - bl ErrorHandling + bl GF_AssertFail _021EFA6A: ldr r0, [r4] bl NNS_G3dGetMdlSet ldrb r0, [r0, #9] cmp r0, #1 beq _021EFA7A - bl ErrorHandling + bl GF_AssertFail _021EFA7A: ldr r0, [r4] bl NNS_G3dGetMdlSet @@ -14634,7 +14634,7 @@ _021EFA7A: ldr r1, [r1, #0xc] add r4, r0, r1 bne _021EFA8E - bl ErrorHandling + bl GF_AssertFail _021EFA8E: add r0, r5, #0 add r1, r4, #0 @@ -15935,7 +15935,7 @@ MOD05_021F04F8: ; 0x021F04F8 cmp r0, #0 beq _021F0512 bne _021F0508 - bl ErrorHandling + bl GF_AssertFail _021F0508: ldr r0, [r4] bl FreeToHeap @@ -16156,7 +16156,7 @@ MOD05_021F067C: ; 0x021F067C add r5, r0, #0 cmp r5, #9 blt _021F06B6 - bl ErrorHandling + bl GF_AssertFail _021F06B6: lsl r6, r5, #2 ldr r5, _021F06EC ; UNK05_021FC4B4 @@ -16608,7 +16608,7 @@ MOD05_021F0A28: ; 0x021F0A28 add r5, r0, #0 cmp r5, #0xa blt _021F0A3E - bl ErrorHandling + bl GF_AssertFail _021F0A3E: lsl r6, r5, #2 ldr r5, _021F0A74 ; =UNK05_021FC528 @@ -17068,7 +17068,7 @@ MOD05_021F0DB4: ; 0x021F0DB4 add r5, r0, #0 cmp r5, #0xa blt _021F0DEE - bl ErrorHandling + bl GF_AssertFail _021F0DEE: lsl r6, r5, #2 ldr r5, _021F0E24 ; =UNK05_021FC500 @@ -17634,7 +17634,7 @@ MOD05_021F1234: ; 0x021F1234 str r0, [sp, #4] cmp r0, #0xc blt _021F1272 - bl ErrorHandling + bl GF_AssertFail _021F1272: mov r1, #2 ldrsb r2, [r4, r1] @@ -17886,7 +17886,7 @@ MOD05_021F1440: ; 0x021F1440 add r5, r0, #0 cmp r5, #4 blt _021F147A - bl ErrorHandling + bl GF_AssertFail _021F147A: lsl r6, r5, #2 ldr r5, _021F14B8 ; =UNK05_021FC40C @@ -18654,7 +18654,7 @@ MOD05_021F1A78: ; 0x021F1A78 ldr r0, [r4] cmp r0, #0 beq _021F1A8C - bl ErrorHandling + bl GF_AssertFail _021F1A8C: add r0, r5, #0 bl MOD06_0224A130 @@ -18671,7 +18671,7 @@ MOD05_021F1A98: ; 0x021F1A98 ldr r0, [r4] cmp r0, #0 beq _021F1AAC - bl ErrorHandling + bl GF_AssertFail _021F1AAC: add r0, r5, #0 bl MOD06_0224A6B8 @@ -18688,7 +18688,7 @@ MOD05_021F1AB8: ; 0x021F1AB8 ldr r0, [r4] cmp r0, #0 beq _021F1ACC - bl ErrorHandling + bl GF_AssertFail _021F1ACC: add r0, r5, #0 bl MOD06_0224A8D4 @@ -18705,7 +18705,7 @@ MOD05_021F1AD8: ; 0x021F1AD8 ldr r0, [r4] cmp r0, #0 beq _021F1AEC - bl ErrorHandling + bl GF_AssertFail _021F1AEC: add r0, r5, #0 bl MOD06_0224AA40 @@ -18968,7 +18968,7 @@ MOD05_021F1CB8: ; 0x021F1CB8 bl FUN_02058390 cmp r0, #0 beq _021F1CD2 - bl ErrorHandling + bl GF_AssertFail _021F1CD2: add r0, r5, #0 bl MOD05_021F1D68 @@ -19014,7 +19014,7 @@ MOD05_021F1D2C: ; 0x021F1D2C bl FUN_020587E0 cmp r0, #1 beq _021F1D3C - bl ErrorHandling + bl GF_AssertFail _021F1D3C: add r0, r4, #0 bl FUN_020583A0 @@ -19104,7 +19104,7 @@ _021F1DE4: ldr r2, [r3] cmp r2, r1 bne _021F1DDA - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} .balign 4, 0 @@ -19382,7 +19382,7 @@ MOD05_021F1FE0: ; 0x021F1FE0 bl MOD05_021F21CC add r4, r0, #0 bne _021F200C - bl ErrorHandling + bl GF_AssertFail _021F200C: add r0, r6, #0 add r1, sp, #0 @@ -19393,7 +19393,7 @@ _021F200C: bl MOD05_021F2E70 add r4, r0, #0 bne _021F2026 - bl ErrorHandling + bl GF_AssertFail _021F2026: add r0, r4, #0 add sp, #0xc @@ -19567,7 +19567,7 @@ MOD05_021F2160: ; 0x021F2160 str r4, [r0] cmp r4, #0 bne _021F2180 - bl ErrorHandling + bl GF_AssertFail _021F2180: mov r0, #4 lsl r1, r6, #3 @@ -19577,7 +19577,7 @@ _021F2180: str r5, [r7] cmp r5, #0 bne _021F2196 - bl ErrorHandling + bl GF_AssertFail _021F2196: ldr r0, _021F21A8 ; =0x0000FFFF _021F2198: @@ -19875,7 +19875,7 @@ _021F23BE: bl _021F238C add r7, r0, #0 bne _021F23D0 - bl ErrorHandling + bl GF_AssertFail _021F23D0: mov r0, #0x41 lsl r0, r0, #2 @@ -20217,7 +20217,7 @@ MOD05_021F2628: ; 0x021F2628 bl MOD05_021F25C8 cmp r0, #0 bne _021F264C - bl ErrorHandling + bl GF_AssertFail _021F264C: pop {r4, r5, r6, pc} nop @@ -20256,7 +20256,7 @@ MOD05_021F2670: ; 0x021F2670 bl MOD05_021F25C8 cmp r0, #0 bne _021F269E - bl ErrorHandling + bl GF_AssertFail _021F269E: pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -20370,7 +20370,7 @@ MOD05_021F2764: ; 0x021F2764 bl MOD05_021F25C8 cmp r0, #0 bne _021F2788 - bl ErrorHandling + bl GF_AssertFail _021F2788: pop {r4, r5, r6, pc} nop @@ -20409,7 +20409,7 @@ MOD05_021F27AC: ; 0x021F27AC bl MOD05_021F25C8 cmp r0, #0 bne _021F27DA - bl ErrorHandling + bl GF_AssertFail _021F27DA: pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -20523,7 +20523,7 @@ MOD05_021F28A0: ; 0x021F28A0 bl MOD05_021F25C8 cmp r0, #0 bne _021F28C4 - bl ErrorHandling + bl GF_AssertFail _021F28C4: pop {r4, r5, r6, pc} nop @@ -20586,7 +20586,7 @@ MOD05_021F2914: ; 0x021F2914 bl MOD05_021F25C8 cmp r0, #0 bne _021F2942 - bl ErrorHandling + bl GF_AssertFail _021F2942: pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -21247,7 +21247,7 @@ _021F2DD0: ldr r2, [r3] cmp r2, r1 bne _021F2DC6 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} .balign 4, 0 @@ -21557,7 +21557,7 @@ _021F301C: cmp r2, r3 blt _021F3004 _021F3024: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} _021F302C: @@ -21769,7 +21769,7 @@ MOD05_021F317C: ; 0x021F317C bl FUN_02020F54 cmp r0, #0 bne _021F31A2 - bl ErrorHandling + bl GF_AssertFail _021F31A2: add r0, r5, #0 add r1, r4, #0 @@ -21820,7 +21820,7 @@ _021F31F4: cmp r2, r6 blt _021F31DE _021F31FC: - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} .balign 4, 0 @@ -21963,7 +21963,7 @@ _021F32EA: cmp r4, r6 blt _021F32CE _021F32F2: - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} thumb_func_start MOD05_021F32F8 @@ -22050,7 +22050,7 @@ MOD05_021F3364: ; 0x021F3364 ldr r0, [r0] cmp r0, #0 bne _021F338A - bl ErrorHandling + bl GF_AssertFail _021F338A: ldr r0, [r4, #4] mov r1, #0 @@ -22095,7 +22095,7 @@ MOD05_021F33B4: ; 0x021F33B4 bl AllocFromHeap add r4, r0, #0 bne _021F33E2 - bl ErrorHandling + bl GF_AssertFail _021F33E2: ldr r2, [sp, #8] add r0, r4, #0 @@ -22249,7 +22249,7 @@ _021F352E: ldr r0, _021F36C8 ; =0x0000FFFF cmp r1, r0 bne _021F3538 - bl ErrorHandling + bl GF_AssertFail _021F3538: ldr r0, [sp, #0x18] ldr r1, [r4, #4] @@ -22272,7 +22272,7 @@ _021F355C: ldr r0, _021F36C8 ; =0x0000FFFF cmp r1, r0 bne _021F3566 - bl ErrorHandling + bl GF_AssertFail _021F3566: ldr r0, [sp, #0x18] ldr r1, [r4, #4] @@ -22296,7 +22296,7 @@ _021F358C: ldr r0, _021F36C8 ; =0x0000FFFF cmp r1, r0 bne _021F3596 - bl ErrorHandling + bl GF_AssertFail _021F3596: ldr r0, [sp, #0x18] ldr r1, [r4, #4] @@ -22333,7 +22333,7 @@ _021F3596: str r0, [r5, #0x24] cmp r0, #0 bne _021F35EC - bl ErrorHandling + bl GF_AssertFail _021F35EC: ldr r0, [sp, #0x10] bl FUN_0201F844 @@ -22415,7 +22415,7 @@ _021F367A: bl FUN_0200CA98 add r4, r0, #0 bne _021F36B6 - bl ErrorHandling + bl GF_AssertFail _021F36B6: add r0, r4, #0 add r1, r5, #0 @@ -22536,7 +22536,7 @@ MOD05_021F37AC: ; 0x021F37AC bl AllocFromHeap add r4, r0, #0 bne _021F37BC - bl ErrorHandling + bl GF_AssertFail _021F37BC: add r2, r4, #0 mov r1, #0x10 @@ -22606,7 +22606,7 @@ MOD05_021F3810: ; 0x021F3810 str r0, [r4, #0xc] cmp r0, #0 bne _021F382E - bl ErrorHandling + bl GF_AssertFail _021F382E: ldr r0, [r4, #0xc] mov r1, #0 @@ -23816,7 +23816,7 @@ _021F4174: lsl r0, r0, #0xc cmp r3, r0 ble _021F4180 - bl ErrorHandling + bl GF_AssertFail _021F4180: pop {r4, r5, r6, pc} .balign 4, 0 @@ -24324,7 +24324,7 @@ MOD05_021F4520: ; 0x021F4520 str r3, [sp] cmp r3, #0 bne _021F4532 - bl ErrorHandling + bl GF_AssertFail _021F4532: ldr r0, [r5] mov r4, #0 @@ -24364,7 +24364,7 @@ MOD05_021F4568: ; 0x021F4568 ldr r0, [r4] cmp r5, r0 blt _021F4578 - bl ErrorHandling + bl GF_AssertFail _021F4578: mov r0, #0x18 add r6, r5, #0 @@ -24374,7 +24374,7 @@ _021F4578: ldr r0, [r0, #0x14] cmp r0, #0 bne _021F458C - bl ErrorHandling + bl GF_AssertFail _021F458C: ldr r0, [r4, #4] add r0, r0, r6 @@ -24390,7 +24390,7 @@ MOD05_021F4594: ; 0x021F4594 add r4, r1, #0 cmp r5, r0 blt _021F45A6 - bl ErrorHandling + bl GF_AssertFail _021F45A6: mov r0, #0x18 ldr r1, [r6, #4] @@ -24438,7 +24438,7 @@ MOD05_021F45E8: ; 0x021F45E8 bl FUN_02015F34 cmp r0, #1 beq _021F45FC - bl ErrorHandling + bl GF_AssertFail _021F45FC: mov r0, #1 str r0, [r4] @@ -24455,7 +24455,7 @@ MOD05_021F4608: ; 0x021F4608 bl FUN_02015F34 cmp r0, #1 beq _021F461C - bl ErrorHandling + bl GF_AssertFail _021F461C: mov r0, #0 str r0, [r4] @@ -24470,7 +24470,7 @@ MOD05_021F4624: ; 0x021F4624 bl MOD05_021F46A8 add r4, r0, #0 bne _021F4636 - bl ErrorHandling + bl GF_AssertFail _021F4636: cmp r4, #0 beq _021F4642 @@ -24623,7 +24623,7 @@ MOD05_021F4724: ; 0x021F4724 ldr r0, [r4] cmp r0, #0 beq _021F4732 - bl ErrorHandling + bl GF_AssertFail _021F4732: mov r0, #0x31 lsl r0, r0, #4 @@ -24984,7 +24984,7 @@ MOD05_021F49AC: ; 0x021F49AC strh r1, [r7, #8] cmp r1, r0 blo _021F49E4 - bl ErrorHandling + bl GF_AssertFail _021F49E4: ldr r1, _021F4BA8 ; =0x000008A4 mov r0, #0 @@ -25028,7 +25028,7 @@ _021F4A32: bl FUN_0201B3C4 cmp r0, #0 bne _021F4A42 - bl ErrorHandling + bl GF_AssertFail _021F4A42: ldr r1, _021F4BAC ; =0x0000089C ldr r0, [r5, r1] @@ -25042,7 +25042,7 @@ _021F4A42: bl FUN_0201B3C4 cmp r0, #0 bne _021F4A62 - bl ErrorHandling + bl GF_AssertFail _021F4A62: mov r1, #0x8a lsl r1, r1, #4 @@ -25088,7 +25088,7 @@ _021F4AA6: ldr r0, [r4, #4] cmp r0, #0 beq _021F4ABE - bl ErrorHandling + bl GF_AssertFail _021F4ABE: ldr r0, [sp, #0xc] add r1, r6, #0 @@ -25117,7 +25117,7 @@ _021F4AEC: bl FUN_0201B3A8 cmp r0, #0 bne _021F4AFE - bl ErrorHandling + bl GF_AssertFail _021F4AFE: ldr r0, [sp] ldrh r1, [r7, #8] @@ -25143,14 +25143,14 @@ _021F4B10: bl FUN_0201B3C4 cmp r0, #0 bne _021F4B36 - bl ErrorHandling + bl GF_AssertFail _021F4B36: ldr r0, [r5, #4] add r1, r4, #0 bl FUN_0201B3A8 cmp r0, #0 bne _021F4B46 - bl ErrorHandling + bl GF_AssertFail _021F4B46: ldr r0, [sp, #0xc] bl NARC_dtor @@ -25211,7 +25211,7 @@ MOD05_021F4BD0: ; 0x021F4BD0 add r5, r0, #0 add r4, r1, #0 bne _021F4BDC - bl ErrorHandling + bl GF_AssertFail _021F4BDC: add r2, r4, #4 lsl r1, r5, #2 @@ -25221,7 +25221,7 @@ _021F4BDC: ldr r0, [r4, #4] cmp r0, #0 bne _021F4BF0 - bl ErrorHandling + bl GF_AssertFail _021F4BF0: add r0, r4, #4 pop {r3, r4, r5, pc} @@ -25292,7 +25292,7 @@ MOD05_021F4C74: ; 0x021F4C74 push {r4, lr} add r4, r0, #0 bne _021F4C7E - bl ErrorHandling + bl GF_AssertFail _021F4C7E: ldr r0, _021F4C84 ; =0x000008A4 ldr r0, [r4, r0] @@ -25305,7 +25305,7 @@ MOD05_021F4C88: ; 0x021F4C88 push {r4, lr} add r4, r0, #0 bne _021F4C92 - bl ErrorHandling + bl GF_AssertFail _021F4C92: ldr r0, _021F4C98 ; =0x000008A8 ldr r0, [r4, r0] @@ -25458,7 +25458,7 @@ MOD05_021F4D80: ; 0x021F4D80 add r5, r0, #0 cmp r5, #0x15 bne _021F4D96 - bl ErrorHandling + bl GF_AssertFail _021F4D96: ldr r0, [r4, #0xc] bl FUN_0202A9B0 @@ -25494,7 +25494,7 @@ MOD05_021F4DC8: ; 0x021F4DC8 add r5, r0, #0 cmp r5, #0x15 bne _021F4DDE - bl ErrorHandling + bl GF_AssertFail _021F4DDE: ldr r0, [r6, #0xc] bl FUN_0202A9B0 @@ -25525,7 +25525,7 @@ _021F4DDE: lsr r6, r0, #0x10 cmp r6, #0x64 blo _021F4E2E - bl ErrorHandling + bl GF_AssertFail _021F4E2E: cmp r6, #0x5a bhs _021F4E42 @@ -25574,7 +25574,7 @@ MOD05_021F4E7C: ; 0x021F4E7C add r4, r0, #0 cmp r4, #0x15 bne _021F4E94 - bl ErrorHandling + bl GF_AssertFail _021F4E94: add r0, r5, #0 add r0, #0xa4 @@ -25627,7 +25627,7 @@ MOD05_021F4EE4: ; 0x021F4EE4 lsr r4, r0, #0x10 cmp r4, #0x64 blo _021F4F02 - bl ErrorHandling + bl GF_AssertFail _021F4F02: cmp r6, #0 beq _021F4F2A @@ -25681,7 +25681,7 @@ MOD05_021F4F44: ; 0x021F4F44 lsr r5, r0, #0x10 cmp r5, #0x64 blo _021F4F60 - bl ErrorHandling + bl GF_AssertFail _021F4F60: cmp r5, #5 bge _021F4F6A @@ -25744,7 +25744,7 @@ MOD05_021F4FAC: ; 0x021F4FAC lsr r5, r0, #0x10 cmp r5, #0x64 blo _021F4FC8 - bl ErrorHandling + bl GF_AssertFail _021F4FC8: cmp r4, #3 bne _021F4FE8 @@ -26044,7 +26044,7 @@ MOD05_021F51D0: ; 0x021F51D0 add r5, r0, #0 cmp r5, #0x15 bne _021F51E6 - bl ErrorHandling + bl GF_AssertFail _021F51E6: ldr r0, [r4, #0xc] bl FUN_0202A9B0 @@ -26090,7 +26090,7 @@ MOD05_021F522C: ; 0x021F522C add r4, r0, #0 cmp r4, #0x15 bne _021F5242 - bl ErrorHandling + bl GF_AssertFail _021F5242: add r0, r5, #0 add r0, #0xa4 @@ -27024,7 +27024,7 @@ _021F5924: bl MOD06_0223BE70 cmp r0, #0 bne _021F5980 - bl ErrorHandling + bl GF_AssertFail b _021F5980 _021F5936: mov r0, #0xa @@ -27062,7 +27062,7 @@ _021F5978: mov r0, #1 pop {r4, r5, r6, pc} _021F597C: - bl ErrorHandling + bl GF_AssertFail _021F5980: mov r0, #0 pop {r4, r5, r6, pc} @@ -27087,7 +27087,7 @@ MOD05_021F5990: ; 0x021F5990 bl FUN_0201681C cmp r0, #1 beq _021F59B2 - bl ErrorHandling + bl GF_AssertFail _021F59B2: sub r5, r6, r5 add r0, r7, #0 @@ -27095,7 +27095,7 @@ _021F59B2: bl AllocFromHeap add r4, r0, #0 bne _021F59C4 - bl ErrorHandling + bl GF_AssertFail _021F59C4: add r0, r4, #0 mov r1, #0 @@ -27164,7 +27164,7 @@ MOD05_021F5A28: ; 0x021F5A28 str r0, [sp] cmp r0, #0 bne _021F5A40 - bl ErrorHandling + bl GF_AssertFail _021F5A40: add r0, r5, #0 add r1, r6, #0 @@ -27198,7 +27198,7 @@ MOD05_021F5A74: ; 0x021F5A74 bl MOD05_021F5B3C add r4, r0, #0 bne _021F5A82 - bl ErrorHandling + bl GF_AssertFail _021F5A82: ldr r0, [r4] bl MOD05_021F5B34 @@ -27212,7 +27212,7 @@ MOD05_021F5A90: ; 0x021F5A90 bl MOD05_021F5B3C add r4, r0, #0 bne _021F5A9E - bl ErrorHandling + bl GF_AssertFail _021F5A9E: ldr r0, [r4] pop {r4, pc} @@ -27291,7 +27291,7 @@ _021F5B26: add r4, r0, #0 cmp r4, #0 bne _021F5B30 - bl ErrorHandling + bl GF_AssertFail _021F5B30: add r0, r4, #0 pop {r4, pc} @@ -28037,7 +28037,7 @@ MOD05_021F6074: ; 0x021F6074 bl AllocFromHeapAtEnd add r4, r0, #0 bne _021F6088 - bl ErrorHandling + bl GF_AssertFail _021F6088: add r0, r4, #0 mov r1, #0 @@ -28198,7 +28198,7 @@ MOD05_021F61B0: ; 0x021F61B0 beq _021F61C6 cmp r0, #2 beq _021F61CA - bl ErrorHandling + bl GF_AssertFail _021F61C2: ldr r0, _021F61D0 ; =0x000001BD pop {r3, pc} diff --git a/arm9/modules/05/src/mod05_021E72FC.c b/arm9/modules/05/src/mod05_021E72FC.c index 7284224c..73fddb7e 100644 --- a/arm9/modules/05/src/mod05_021E72FC.c +++ b/arm9/modules/05/src/mod05_021E72FC.c @@ -148,7 +148,7 @@ THUMB_FUNC UnkStruct021E7358 *MOD05_021E74D4(u32 param0) UnkStruct021E7358 *res = (UnkStruct021E7358 *)AllocFromHeapAtEnd(4, param0); if (res == NULL) { - ErrorHandling(); + GF_AssertFail(); } memset((void *)res, 0, param0); return res; diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 9679d0e0..62890044 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -75,7 +75,7 @@ MOD06_02239714: ; 0x02239714 ldr r0, [r4, #0x38] cmp r0, #2 beq _02239722 - bl ErrorHandling + bl GF_AssertFail _02239722: mov r0, #3 str r0, [r4, #0x38] @@ -1124,7 +1124,7 @@ MOD06_02239F04: ; 0x02239F04 bl FUN_02058060 add r5, r0, #0 bne _02239F18 - bl ErrorHandling + bl GF_AssertFail _02239F18: add r0, r5, #0 bl FUN_02058B2C @@ -2298,7 +2298,7 @@ MOD06_0223A790: ; 0x0223A790 ldr r0, [r4, r0] cmp r0, #5 beq _0223A7A2 - bl ErrorHandling + bl GF_AssertFail _0223A7A2: add r0, r4, #0 bl FreeToHeap @@ -2339,7 +2339,7 @@ MOD06_0223A7DC: ; 0x0223A7DC ldr r0, [r4, r0] cmp r0, #2 beq _0223A7EE - bl ErrorHandling + bl GF_AssertFail _0223A7EE: mov r0, #0x4b mov r1, #3 @@ -3119,7 +3119,7 @@ MOD06_0223ADB4: ; 0x0223ADB4 str r0, [r4] cmp r0, #0 bne _0223ADCA - bl ErrorHandling + bl GF_AssertFail _0223ADCA: mov r0, #0 str r0, [r4, #0x24] @@ -3693,7 +3693,7 @@ MOD06_0223B20C: ; 0x0223B20C add r7, r3, #0 cmp r0, #0 beq _0223B224 - bl ErrorHandling + bl GF_AssertFail _0223B224: mov r0, #0x71 mov r1, #0 @@ -3749,7 +3749,7 @@ MOD06_0223B268: ; 0x0223B268 bl MOD06_0223B438 add r4, r0, #0 bne _0223B290 - bl ErrorHandling + bl GF_AssertFail _0223B290: mov r1, #0x73 lsl r1, r1, #2 @@ -3897,7 +3897,7 @@ MOD06_0223B378: ; 0x0223B378 add r7, r3, #0 cmp r0, #0 beq _0223B38C - bl ErrorHandling + bl GF_AssertFail _0223B38C: add r0, r5, #0 add r0, #0x7c @@ -4562,7 +4562,7 @@ MOD06_0223B814: ; 0x0223B814 ldr r0, [r4, #0x14] cmp r0, #2 beq _0223B822 - bl ErrorHandling + bl GF_AssertFail _0223B822: mov r0, #3 str r0, [r4, #0x14] @@ -5133,7 +5133,7 @@ _0223BC90: bl MOD06_0223C438 b _0223BCCC _0223BCBC: - bl ErrorHandling + bl GF_AssertFail ldr r0, [sp, #0x2c] bl FUN_02047964 add sp, #0xb4 @@ -5154,13 +5154,13 @@ _0223BCDE: bl FUN_02016B90 cmp r0, #0 bne _0223BCEC - bl ErrorHandling + bl GF_AssertFail _0223BCEC: mov r0, #0xb bl FUN_02016B90 cmp r0, #0 bne _0223BCFA - bl ErrorHandling + bl GF_AssertFail _0223BCFA: ldr r0, [sp, #0x10] cmp r0, #0 @@ -5222,7 +5222,7 @@ _0223BD2E: lsr r5, r0, #0x10 cmp r5, #0x64 blo _0223BD80 - bl ErrorHandling + bl GF_AssertFail _0223BD80: cmp r5, r6 blt _0223BD8A @@ -5570,7 +5570,7 @@ _0223C034: bl MOD06_0223C438 b _0223C06A _0223C060: - bl ErrorHandling + bl GF_AssertFail add sp, #0xac mov r0, #0 pop {r4, r5, r6, r7, pc} @@ -5583,7 +5583,7 @@ _0223C06A: bl FUN_02046A20 b _0223C07E _0223C07A: - bl ErrorHandling + bl GF_AssertFail _0223C07E: mov r0, #0 add r5, #0x74 @@ -5851,7 +5851,7 @@ _0223C2A2: bl MOD06_0223C3F4 b _0223C2DC _0223C2CC: - bl ErrorHandling + bl GF_AssertFail ldr r0, [r4] bl FUN_02047964 add sp, #0xac @@ -5867,13 +5867,13 @@ _0223C2E4: bl FUN_02016B90 cmp r0, #0 bne _0223C2F2 - bl ErrorHandling + bl GF_AssertFail _0223C2F2: mov r0, #0xb bl FUN_02016B90 cmp r0, #0 bne _0223C300 - bl ErrorHandling + bl GF_AssertFail _0223C300: ldr r0, [sp, #0x10] cmp r0, #0 @@ -6089,7 +6089,7 @@ MOD06_0223C470: ; 0x0223C470 lsr r4, r0, #0x10 cmp r4, #0x64 blo _0223C4A8 - bl ErrorHandling + bl GF_AssertFail _0223C4A8: cmp r4, #5 blo _0223C4B0 @@ -6133,7 +6133,7 @@ _0223C4EC: lsr r6, r0, #0x10 cmp r6, #0x64 blo _0223C504 - bl ErrorHandling + bl GF_AssertFail _0223C504: cmp r6, r4 bge _0223C518 @@ -6217,7 +6217,7 @@ MOD06_0223C584: ; 0x0223C584 lsr r5, r0, #0x10 cmp r5, #0x64 blo _0223C5A0 - bl ErrorHandling + bl GF_AssertFail _0223C5A0: cmp r5, r4 blo _0223C5A8 @@ -6238,7 +6238,7 @@ MOD06_0223C5AC: ; 0x0223C5AC lsr r4, r0, #0x10 cmp r4, #0x64 blo _0223C5C6 - bl ErrorHandling + bl GF_AssertFail _0223C5C6: lsl r0, r4, #0x18 lsr r0, r0, #0x18 @@ -6328,7 +6328,7 @@ MOD06_0223C648: ; 0x0223C648 lsr r4, r0, #0x10 cmp r4, #0x64 blo _0223C662 - bl ErrorHandling + bl GF_AssertFail _0223C662: lsl r0, r4, #0x18 lsr r0, r0, #0x18 @@ -6373,7 +6373,7 @@ MOD06_0223C694: ; 0x0223C694 lsr r6, r0, #0x10 cmp r6, #0x64 blo _0223C6B2 - bl ErrorHandling + bl GF_AssertFail _0223C6B2: lsl r0, r6, #0x18 lsr r0, r0, #0x18 @@ -6454,7 +6454,7 @@ _0223C72C: mov r4, #4 b _0223C734 _0223C730: - bl ErrorHandling + bl GF_AssertFail _0223C734: add r0, r4, #0 pop {r4, r5, r6, pc} @@ -6522,7 +6522,7 @@ MOD06_0223C78C: ; 0x0223C78C lsr r5, r0, #0x10 cmp r5, #2 blo _0223C7AC - bl ErrorHandling + bl GF_AssertFail _0223C7AC: cmp r5, #0 bne _0223C7C6 @@ -6543,7 +6543,7 @@ _0223C7C6: lsr r4, r0, #0x10 cmp r4, #0x19 blo _0223C7DC - bl ErrorHandling + bl GF_AssertFail _0223C7DC: lsl r0, r4, #0x18 lsr r0, r0, #0x18 @@ -6593,7 +6593,7 @@ _0223C82C: lsr r7, r0, #0x10 cmp r7, #2 blo _0223C83C - bl ErrorHandling + bl GF_AssertFail _0223C83C: cmp r7, #0 bne _0223C848 @@ -6646,7 +6646,7 @@ MOD06_0223C854: ; 0x0223C854 lsr r4, r0, #0x10 cmp r4, #3 blo _0223C8A6 - bl ErrorHandling + bl GF_AssertFail _0223C8A6: cmp r4, #0 beq _0223C8E0 @@ -6667,7 +6667,7 @@ _0223C8BE: lsr r4, r0, #0x10 cmp r4, #2 blo _0223C8D2 - bl ErrorHandling + bl GF_AssertFail _0223C8D2: cmp r4, #0 bne _0223C8E0 @@ -6691,7 +6691,7 @@ _0223C8EC: add r7, r0, #0 cmp r7, #2 bne _0223C904 - bl ErrorHandling + bl GF_AssertFail _0223C904: ldr r0, [sp, #0x24] cmp r7, r0 @@ -6731,7 +6731,7 @@ _0223C92E: bl MOD06_0223D1BC cmp r0, #0 bne _0223C95A - bl ErrorHandling + bl GF_AssertFail _0223C95A: ldr r0, [sp, #0x1c] bl FreeToHeap @@ -6780,7 +6780,7 @@ _0223C998: lsr r6, r0, #0x10 cmp r6, #3 blo _0223C9BE - bl ErrorHandling + bl GF_AssertFail _0223C9BE: cmp r6, #0 beq _0223CA28 @@ -6800,7 +6800,7 @@ _0223C9D8: mov r6, #1 b _0223C9E4 _0223C9E0: - bl ErrorHandling + bl GF_AssertFail _0223C9E4: ldr r0, [sp, #0x28] add r1, r5, #0 @@ -6825,7 +6825,7 @@ _0223C9E4: bl MOD06_0223D1BC cmp r0, #0 bne _0223CA1E - bl ErrorHandling + bl GF_AssertFail _0223CA1E: add r0, r4, #0 bl FreeToHeap @@ -6852,7 +6852,7 @@ _0223CA28: bl MOD06_0223D1BC cmp r0, #0 bne _0223CA5C - bl ErrorHandling + bl GF_AssertFail _0223CA5C: add r0, r4, #0 bl FreeToHeap @@ -6999,7 +6999,7 @@ _0223CB74: add r7, r0, #0 b _0223CB8A _0223CB86: - bl ErrorHandling + bl GF_AssertFail _0223CB8A: add r0, r5, #0 add r1, r6, #0 @@ -7048,7 +7048,7 @@ MOD06_0223CBD4: ; 0x0223CBD4 add r7, r3, #0 cmp r5, #0 bne _0223CBE8 - bl ErrorHandling + bl GF_AssertFail _0223CBE8: lsl r0, r4, #0x18 lsr r1, r0, #0x18 @@ -7197,7 +7197,7 @@ MOD06_0223CCDC: ; 0x0223CCDC lsr r6, r0, #0x10 cmp r6, #0xb blo _0223CD1A - bl ErrorHandling + bl GF_AssertFail _0223CD1A: add r0, r6, #5 lsl r0, r0, #0x18 @@ -7219,7 +7219,7 @@ _0223CD36: lsr r6, r0, #0x10 cmp r6, #2 blo _0223CD46 - bl ErrorHandling + bl GF_AssertFail _0223CD46: cmp r6, #0 beq _0223CD4C @@ -7353,7 +7353,7 @@ _0223CE32: ldr r0, [r0, r1] pop {r4, pc} _0223CE3A: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r4, pc} .align 2, 0 @@ -7454,7 +7454,7 @@ MOD06_0223CED4: ; 0x0223CED4 lsr r4, r0, #0x10 cmp r4, #2 blo _0223CEFA - bl ErrorHandling + bl GF_AssertFail _0223CEFA: cmp r4, #0 bne _0223CF0E @@ -7569,7 +7569,7 @@ _0223CFAC: lsr r4, r0, #0x10 cmp r4, #2 blo _0223CFC2 - bl ErrorHandling + bl GF_AssertFail _0223CFC2: cmp r4, #0 bne _0223CFCA @@ -7705,7 +7705,7 @@ MOD06_0223D044: ; 0x0223D044 bl AddMonToParty cmp r0, #0 bne _0223D0D8 - bl ErrorHandling + bl GF_AssertFail _0223D0D8: add r0, r4, #0 bl FreeToHeap @@ -7768,7 +7768,7 @@ _0223D148: lsr r4, r0, #0x10 cmp r4, #2 blo _0223D158 - bl ErrorHandling + bl GF_AssertFail _0223D158: cmp r4, #0 bne _0223D162 @@ -7780,7 +7780,7 @@ _0223D162: bls _0223D1AA cmp r5, #0 bne _0223D16E - bl ErrorHandling + bl GF_AssertFail _0223D16E: cmp r5, #1 bhi _0223D176 @@ -7802,7 +7802,7 @@ _0223D176: lsr r4, r0, #0x10 cmp r4, r5 blo _0223D19E - bl ErrorHandling + bl GF_AssertFail _0223D19E: lsl r1, r4, #2 add r0, sp, #8 @@ -7940,7 +7940,7 @@ _0223D296: lsr r6, r0, #0x10 cmp r6, #2 blo _0223D2A6 - bl ErrorHandling + bl GF_AssertFail _0223D2A6: cmp r6, #0 bne _0223D2AE @@ -8020,7 +8020,7 @@ _0223D308: beq _0223D342 cmp r1, #8 ble _0223D338 - bl ErrorHandling + bl GF_AssertFail _0223D338: add r5, #0xa0 ldr r0, [r5] @@ -11412,7 +11412,7 @@ MOD06_0223EF18: ; 0x0223EF18 ldr r0, [r0] cmp r0, #0 beq _0223EF28 - bl ErrorHandling + bl GF_AssertFail _0223EF28: mov r0, #4 mov r1, #0x9c @@ -12651,7 +12651,7 @@ _0223F966: ldrb r0, [r0] cmp r0, #0x11 blo _0223F982 - bl ErrorHandling + bl GF_AssertFail _0223F982: ldr r0, _0223F9D4 ; =0x02252420 ldr r0, [r0] @@ -15741,7 +15741,7 @@ _022412C8: strb r0, [r5] pop {r4, r5, pc} _022412DC: - bl ErrorHandling + bl GF_AssertFail _022412E0: add sp, #0x2c pop {r4, r5, pc} @@ -15994,7 +15994,7 @@ _022414DA: str r0, [r5] b _02241580 _022414E6: - bl ErrorHandling + bl GF_AssertFail b _02241580 _022414EC: add r4, #0xa0 @@ -16251,7 +16251,7 @@ _022416EA: str r7, [sp, #0xc] b _02241702 _022416F6: - bl ErrorHandling + bl GF_AssertFail mov r5, #0 mov r6, #1 add r7, r6, #0 @@ -16360,7 +16360,7 @@ _022417E4: mov r5, #2 b _022417F4 _022417F0: - bl ErrorHandling + bl GF_AssertFail _022417F4: add r0, r6, #0 add r1, r7, #0 @@ -16460,7 +16460,7 @@ _022418D0: lsl r4, r4, #0x10 b _022418DC _022418D6: - bl ErrorHandling + bl GF_AssertFail mov r4, #0 _022418DC: add r0, r5, #0 @@ -17241,7 +17241,7 @@ _02241F00: str r0, [r4] b _02241F2E _02241F2A: - bl ErrorHandling + bl GF_AssertFail _02241F2E: ldr r0, [r6, #0x38] ldr r1, [sp, #4] @@ -17393,7 +17393,7 @@ _0224205A: bl FUN_0205ADDC b _02242072 _0224206E: - bl ErrorHandling + bl GF_AssertFail _02242072: ldr r0, [sp] add r1, sp, #0x10 @@ -17553,7 +17553,7 @@ _022421AA: bl FUN_0205ADDC b _022421C2 _022421BE: - bl ErrorHandling + bl GF_AssertFail _022421C2: ldr r0, [sp] add r1, sp, #0x10 @@ -17886,7 +17886,7 @@ MOD06_02242458: ; 0x02242458 lsr r5, r0, #0x18 cmp r5, #3 bls _02242478 - bl ErrorHandling + bl GF_AssertFail _02242478: ldr r1, _02242498 ; =0x0224FC00 lsl r0, r5, #0xa @@ -17897,7 +17897,7 @@ _02242478: lsl r0, r0, #0xa cmp r4, r0 blt _0224248E - bl ErrorHandling + bl GF_AssertFail _0224248E: ldrb r1, [r5, r4] ldr r0, [sp, #0x10] @@ -18344,7 +18344,7 @@ _022427DC: str r0, [r4] b _022427FE _022427FA: - bl ErrorHandling + bl GF_AssertFail _022427FE: add r0, r6, #0 add r1, sp, #0 @@ -18399,7 +18399,7 @@ _0224285C: mov r0, #0xd pop {r3, pc} _02242860: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} @@ -18423,7 +18423,7 @@ _02242882: add r7, r2, #0 b _0224288A _02242886: - bl ErrorHandling + bl GF_AssertFail _0224288A: ldrb r0, [r5, #7] mov r4, #0 @@ -18431,7 +18431,7 @@ _0224288A: lsr r0, r0, #0x1e cmp r0, #3 bls _0224289A - bl ErrorHandling + bl GF_AssertFail _0224289A: ldrb r0, [r5, #7] lsl r0, r0, #0x1e @@ -18442,7 +18442,7 @@ _0224289A: asr r4, r0, #0x10 cmp r6, #3 bls _022428B0 - bl ErrorHandling + bl GF_AssertFail _022428B0: lsl r0, r6, #0x1e asr r1, r0, #0x10 @@ -18462,7 +18462,7 @@ _022428C4: asr r4, r0, #0x10 b _022428D4 _022428D0: - bl ErrorHandling + bl GF_AssertFail _022428D4: str r4, [r7] pop {r3, r4, r5, r6, r7, pc} @@ -18719,7 +18719,7 @@ _02242AAA: asr r0, r0, #0x18 b _02242ACE _02242AC8: - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _02242ACE: str r0, [r6] @@ -18829,7 +18829,7 @@ _02242B96: add r6, r0, #0 b _02242B9E _02242B9A: - bl ErrorHandling + bl GF_AssertFail _02242B9E: ldr r0, [r6] lsl r0, r0, #0x10 @@ -18885,7 +18885,7 @@ MOD06_02242BE0: ; 0x02242BE0 bl AllocFromHeap add r4, r0, #0 bne _02242C0E - bl ErrorHandling + bl GF_AssertFail add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02242C0E: @@ -20044,7 +20044,7 @@ MOD06_022434BC: ; 0x022434BC ldr r0, [r4] cmp r0, #0 beq _022434CA - bl ErrorHandling + bl GF_AssertFail _022434CA: mov r0, #0 str r0, [r4] @@ -20265,7 +20265,7 @@ MOD06_02243694: ; 0x02243694 ldr r0, _022436C0 ; =0x12345678 cmp r1, r0 beq _022436A6 - bl ErrorHandling + bl GF_AssertFail _022436A6: ldr r2, _022436C4 ; =0x000008CC ldr r5, [r4, #4] @@ -22907,7 +22907,7 @@ MOD06_02244AEC: ; 0x02244AEC ldrb r0, [r0, #0x10] cmp r0, #4 bls _02244B18 - bl ErrorHandling + bl GF_AssertFail _02244B18: add r0, sp, #0x80 ldrb r6, [r0, #0x10] @@ -23683,7 +23683,7 @@ _02245098: lsr r4, r0, #0x10 cmp r4, #0xc blo _02245104 - bl ErrorHandling + bl GF_AssertFail _02245104: lsl r1, r4, #2 add r0, sp, #4 @@ -23716,7 +23716,7 @@ _02245132: lsr r6, r0, #0x10 cmp r6, #0x24 blo _02245148 - bl ErrorHandling + bl GF_AssertFail _02245148: lsl r0, r6, #0x18 lsr r2, r0, #0x16 @@ -23962,7 +23962,7 @@ _02245302: str r0, [r5, #0x10] b _02245316 _02245312: - bl ErrorHandling + bl GF_AssertFail _02245316: ldr r0, [sp] str r0, [r5, #8] @@ -24454,7 +24454,7 @@ _022456DC: mov r4, #5 b _022456E4 _022456E0: - bl ErrorHandling + bl GF_AssertFail _022456E4: add r0, r4, #0 pop {r4, pc} @@ -24553,7 +24553,7 @@ _02245790: str r0, [r1] b _022457A0 _0224579C: - bl ErrorHandling + bl GF_AssertFail _022457A0: mov r0, #0 pop {r3, pc} @@ -24589,7 +24589,7 @@ MOD06_022457CC: ; 0x022457CC add r5, r0, #0 cmp r4, #3 blo _022457DC - bl ErrorHandling + bl GF_AssertFail _022457DC: ldr r0, [r5, #0xc] bl FUN_0202A9B0 @@ -24611,7 +24611,7 @@ MOD06_022457F8: ; 0x022457F8 add r5, r0, #0 cmp r4, #3 blo _02245808 - bl ErrorHandling + bl GF_AssertFail _02245808: ldr r0, [r5, #0xc] bl FUN_0202A9B0 @@ -25141,7 +25141,7 @@ _02245BF2: cmp r2, r5 blt _02245BB6 _02245BFA: - bl ErrorHandling + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -25173,7 +25173,7 @@ _02245C2A: cmp r2, r3 blt _02245C18 _02245C32: - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} thumb_func_start MOD06_02245C38 @@ -25203,7 +25203,7 @@ _02245C5E: cmp r2, r3 blt _02245C4C _02245C66: - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} thumb_func_start MOD06_02245C6C @@ -25262,7 +25262,7 @@ _02245CCC: cmp r2, r5 blt _02245C8E _02245CD4: - bl ErrorHandling + bl GF_AssertFail add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} @@ -25293,7 +25293,7 @@ _02245D02: cmp r2, r3 blt _02245CF0 _02245D0A: - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} thumb_func_start MOD06_02245D10 @@ -25323,7 +25323,7 @@ _02245D36: cmp r2, r3 blt _02245D24 _02245D3E: - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} thumb_func_start MOD06_02245D44 @@ -25381,7 +25381,7 @@ _02245DA2: cmp r2, r5 blt _02245D66 _02245DAA: - bl ErrorHandling + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -25441,7 +25441,7 @@ _02245E12: cmp r2, r5 blt _02245DD6 _02245E1A: - bl ErrorHandling + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -25510,7 +25510,7 @@ _02245E3E: bl FUN_0201FF84 add r4, r0, #0 bne _02245EA6 - bl ErrorHandling + bl GF_AssertFail _02245EA6: add r0, r4, #0 add sp, #0x70 @@ -28280,7 +28280,7 @@ _02247392: bl FUN_0201FF84 add r4, r0, #0 bne _022473BE - bl ErrorHandling + bl GF_AssertFail _022473BE: add r0, r4, #0 add sp, #0x70 @@ -28438,7 +28438,7 @@ _022474E4: _022474EC: cmp r5, #4 blt _022474F4 - bl ErrorHandling + bl GF_AssertFail _022474F4: mov r0, #0x72 mov r5, #0 @@ -28474,7 +28474,7 @@ _02247528: _02247530: cmp r5, #4 blt _02247538 - bl ErrorHandling + bl GF_AssertFail _02247538: add r0, r6, #0 bl NARC_dtor @@ -28656,7 +28656,7 @@ MOD06_0224767C: ; 0x0224767C ldr r0, [r4, r0] cmp r0, #0 beq _0224768E - bl ErrorHandling + bl GF_AssertFail _0224768E: ldr r0, _022476A0 ; =MOD06_022476D4 add r1, r4, #0 @@ -28678,7 +28678,7 @@ MOD06_022476A4: ; 0x022476A4 ldr r0, [r4, r0] cmp r0, #0 bne _022476B6 - bl ErrorHandling + bl GF_AssertFail _022476B6: mov r0, #0x86 lsl r0, r0, #2 @@ -28805,7 +28805,7 @@ MOD06_0224778C: ; 0x0224778C bl AllocFromHeap add r4, r0, #0 bne _022477A8 - bl ErrorHandling + bl GF_AssertFail _022477A8: mov r1, #0 add r0, r6, #0 @@ -28974,7 +28974,7 @@ _022478E6: _022478EE: cmp r0, #4 blt _022478F6 - bl ErrorHandling + bl GF_AssertFail _022478F6: mov r0, #0x1a lsl r0, r0, #4 @@ -29011,7 +29011,7 @@ _02247930: _02247938: cmp r0, #3 blt _02247940 - bl ErrorHandling + bl GF_AssertFail _02247940: mov r0, #0x69 lsl r0, r0, #2 @@ -29048,7 +29048,7 @@ _0224797A: _02247982: cmp r0, #4 blt _0224798A - bl ErrorHandling + bl GF_AssertFail _0224798A: pop {r3, r4, r5, pc} @@ -30697,7 +30697,7 @@ MOD06_02248634: ; 0x02248634 bl AllocFromHeapAtEnd add r4, r0, #0 bne _02248644 - bl ErrorHandling + bl GF_AssertFail _02248644: add r0, r4, #0 mov r1, #0 @@ -30891,7 +30891,7 @@ _022487AC: lsr r4, r0, #0x10 cmp r4, #0x64 blo _022487C4 - bl ErrorHandling + bl GF_AssertFail _022487C4: cmp r4, #0x1e bhs _022487D2 @@ -30973,7 +30973,7 @@ MOD06_0224884C: ; 0x0224884C add r5, r0, #0 cmp r6, #4 blo _0224885C - bl ErrorHandling + bl GF_AssertFail _0224885C: add r0, r5, #0 mov r1, #0x14 @@ -31284,7 +31284,7 @@ CreateInGameTradeMon: ; 0x022489D4 bl MonIsShiny cmp r0, #0 beq _02248B08 - bl ErrorHandling + bl GF_AssertFail _02248B08: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -31596,7 +31596,7 @@ MOD06_02248D00: ; 0x02248D00 cmp r4, #9 blo _02248D5A _02248D56: - bl ErrorHandling + bl GF_AssertFail _02248D5A: add r0, r4, #0 add sp, #0xc @@ -31619,7 +31619,7 @@ MOD06_02248D60: ; 0x02248D60 ldrb r0, [r0] cmp r0, #5 blo _02248D84 - bl ErrorHandling + bl GF_AssertFail _02248D84: add r0, sp, #4 ldrb r0, [r0] @@ -31983,7 +31983,7 @@ MOD06_02249018: ; 0x02249018 add r4, r0, #0 cmp r4, #8 bls _02249028 - bl ErrorHandling + bl GF_AssertFail _02249028: ldr r2, _02249034 ; =0x02251738 sub r1, r4, #1 @@ -32019,7 +32019,7 @@ _0224905E: ; jump table .short _02249096 - _0224905E - 2 ; case 2 .short _0224909A - _0224905E - 2 ; case 3 _02249066: - bl ErrorHandling + bl GF_AssertFail _0224906A: bl GF_RTC_GetTimeOfDay cmp r0, #0 @@ -32286,12 +32286,12 @@ _02249244: ldr r0, [sp, #4] cmp r0, #0 bne _02249254 - bl ErrorHandling + bl GF_AssertFail _02249254: ldr r0, [sp, #4] cmp r0, #0xc bls _0224925E - bl ErrorHandling + bl GF_AssertFail _0224925E: ldr r0, [sp, #4] ldr r3, _022492A8 ; =0x0225181C @@ -33786,7 +33786,7 @@ _02249DD6: _02249DEC: cmp r4, #0 bne _02249DF4 - bl ErrorHandling + bl GF_AssertFail _02249DF4: add r0, r4, #0 pop {r3, r4, r5, pc} @@ -33846,7 +33846,7 @@ _02249E40: _02249E52: cmp r4, #0 bne _02249E5A - bl ErrorHandling + bl GF_AssertFail _02249E5A: add r0, r4, #0 pop {r4, pc} @@ -34240,7 +34240,7 @@ _0224A124: mov r0, #5 pop {r3, pc} _0224A128: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} @@ -34683,7 +34683,7 @@ MOD06_0224A478: ; 0x0224A478 sub r1, r1, #1 str r1, [r0] bpl _0224A486 - bl ErrorHandling + bl GF_AssertFail _0224A486: pop {r3, pc} @@ -35970,7 +35970,7 @@ MOD06_0224AE3C: ; 0x0224AE3C sub r1, r1, #1 str r1, [r0] bpl _0224AE4A - bl ErrorHandling + bl GF_AssertFail _0224AE4A: pop {r3, pc} @@ -38573,7 +38573,7 @@ MOD06_0224C27C: ; 0x0224C27C add sp, #0x20 pop {r4, r5, r6, pc} _0224C2E8: - bl ErrorHandling + bl GF_AssertFail add sp, #0x20 pop {r4, r5, r6, pc} .align 2, 0 @@ -38651,7 +38651,7 @@ _0224C328: bl FUN_0204A9F0 cmp r0, #0 bne _0224C390 - bl ErrorHandling + bl GF_AssertFail _0224C390: ldr r0, [sp, #0x1c] bl MOD05_021E7EC8 @@ -38865,7 +38865,7 @@ MOD06_0224C520: ; 0x0224C520 bl FUN_0204640C pop {r4, r5, r6, pc} _0224C552: - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} .align 2, 0 _0224C558: .word 0x000001F2 @@ -38913,7 +38913,7 @@ _0224C590: bl FUN_0204A9F0 cmp r0, #0 bne _0224C5BA - bl ErrorHandling + bl GF_AssertFail _0224C5BA: ldr r0, [sp, #0x18] bl MOD05_021E7EC8 @@ -38949,7 +38949,7 @@ _0224C5EE: _0224C5FC: cmp r1, #0 bne _0224C604 - bl ErrorHandling + bl GF_AssertFail _0224C604: ldrb r2, [r4, #1] ldr r0, [r5, #0x50] @@ -39050,7 +39050,7 @@ MOD06_0224C678: ; 0x0224C678 add sp, #0x30 pop {r3, r4, r5, r6, r7, pc} _0224C6DA: - bl ErrorHandling + bl GF_AssertFail add sp, #0x30 pop {r3, r4, r5, r6, r7, pc} nop @@ -39670,7 +39670,7 @@ MOD06_0224CB90: ; 0x0224CB90 bl AllocFromHeapAtEnd add r4, r0, #0 bne _0224CBA0 - bl ErrorHandling + bl GF_AssertFail _0224CBA0: add r0, r4, #0 mov r1, #0 @@ -39722,7 +39722,7 @@ _0224CBF2: lsr r5, r0, #0x10 cmp r5, #0x10 blo _0224CC02 - bl ErrorHandling + bl GF_AssertFail _0224CC02: lsl r0, r5, #2 ldr r0, [r4, r0] @@ -39753,7 +39753,7 @@ MOD06_0224CC24: ; 0x0224CC24 ldr r0, _0224CC5C ; =0x0000FFFF cmp r1, r0 bne _0224CC40 - bl ErrorHandling + bl GF_AssertFail _0224CC40: mov r0, #0x6a mov r1, #8 @@ -39780,7 +39780,7 @@ MOD06_0224CC60: ; 0x0224CC60 lsr r4, r0, #0x10 cmp r4, #2 blo _0224CC76 - bl ErrorHandling + bl GF_AssertFail _0224CC76: cmp r4, #0 bne _0224CC80 @@ -39853,7 +39853,7 @@ _0224CCEA: str r0, [sp, #0x10] cmp r0, r1 blt _0224CD0C - bl ErrorHandling + bl GF_AssertFail _0224CD0C: lsr r2, r4, #0x1f lsl r1, r4, #0x1e @@ -41135,7 +41135,7 @@ _0224D6FE: sub r0, r4, r0 pop {r4, r5, r6, pc} _0224D702: - bl ErrorHandling + bl GF_AssertFail add r0, r4, #0 pop {r4, r5, r6, pc} .align 2, 0 @@ -41855,7 +41855,7 @@ MOD06_0224DCD8: ; 0x0224DCD8 add r6, r2, #0 cmp r0, #0 beq _0224DCEC - bl ErrorHandling + bl GF_AssertFail _0224DCEC: ldr r0, [r5, #4] mov r1, #0xf @@ -42916,7 +42916,7 @@ MOD06_0224E520: ; 0x0224E520 bl Bag_TakeItem cmp r0, #1 beq _0224E550 - bl ErrorHandling + bl GF_AssertFail _0224E550: pop {r4, r5, r6, pc} .align 2, 0 @@ -42972,7 +42972,7 @@ MOD06_0224E554: ; 0x0224E554 add sp, #0x20 pop {r4, r5, r6, pc} _0224E5C0: - bl ErrorHandling + bl GF_AssertFail add sp, #0x20 pop {r4, r5, r6, pc} .align 2, 0 @@ -43336,7 +43336,7 @@ _0224E8A4: add r5, r5, #1 b _0224E8AC _0224E8A8: - bl ErrorHandling + bl GF_AssertFail _0224E8AC: mov r3, #2 lsl r1, r5, #0x10 @@ -43392,7 +43392,7 @@ _0224E90C: add r5, r5, #1 b _0224E914 _0224E910: - bl ErrorHandling + bl GF_AssertFail _0224E914: mov r3, #2 lsl r1, r5, #0x10 @@ -44042,7 +44042,7 @@ MOD06_0224EDB0: ; 0x0224EDB0 add r5, r3, #0 cmp r0, #0 beq _0224EDC8 - bl ErrorHandling + bl GF_AssertFail _0224EDC8: add r0, r6, #0 add r1, sp, #0 @@ -44265,7 +44265,7 @@ _0224EF70: add r1, #0xcc cmp r2, #0x10 blt _0224EF44 - bl ErrorHandling + bl GF_AssertFail pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index e810c620..215c03c6 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -3163,7 +3163,7 @@ MOD07_02213810: ; 0x02213810 bl FUN_0201327C cmp r4, #0 bne _02213828 - bl ErrorHandling + bl GF_AssertFail _02213828: lsl r0, r4, #0x10 lsr r0, r0, #0xd @@ -3182,7 +3182,7 @@ MOD07_02213834: ; 0x02213834 bl FUN_020132BC cmp r4, #0 bne _0221384C - bl ErrorHandling + bl GF_AssertFail _0221384C: lsl r0, r4, #0x10 lsr r0, r0, #0xd diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s index 0ff32867..3c0363b4 100644 --- a/arm9/modules/08/asm/module_08.s +++ b/arm9/modules/08/asm/module_08.s @@ -110,7 +110,7 @@ _02211F06: strh r0, [r1] b _02211F18 _02211F14: - bl ErrorHandling + bl GF_AssertFail _02211F18: ldr r2, [sp, #0x10] add r0, r5, #0 @@ -144,7 +144,7 @@ _02211F40: strh r0, [r1] b _02211F52 _02211F4E: - bl ErrorHandling + bl GF_AssertFail _02211F52: add r0, r4, #0 bl FUN_0200CAB4 @@ -162,7 +162,7 @@ MOD08_02211F5C: ; 0x02211F5C bne _02211F78 cmp r4, #0 bne _02211F74 - bl ErrorHandling + bl GF_AssertFail _02211F74: mov r0, #0 pop {r3, r4, r5, pc} @@ -187,7 +187,7 @@ _02211F78: cmp r0, #0 bne _02211FAC bne _02211FA8 - bl ErrorHandling + bl GF_AssertFail _02211FA8: mov r0, #0 pop {r3, r4, r5, pc} @@ -235,7 +235,7 @@ MOD08_02211FF0: ; 0x02211FF0 add r4, r1, #0 cmp r5, #0 bne _02211FFE - bl ErrorHandling + bl GF_AssertFail _02211FFE: str r4, [r5, #8] pop {r3, r4, r5, pc} @@ -246,7 +246,7 @@ MOD08_02212004: ; 0x02212004 push {r4, lr} add r4, r0, #0 bne _0221200E - bl ErrorHandling + bl GF_AssertFail _0221200E: ldr r0, [r4, #8] pop {r4, pc} @@ -257,7 +257,7 @@ MOD08_02212014: ; 0x02212014 push {r4, lr} add r4, r0, #0 bne _0221201E - bl ErrorHandling + bl GF_AssertFail _0221201E: ldr r0, [r4] pop {r4, pc} @@ -412,7 +412,7 @@ _02212096: ldr r0, [r0] cmp r0, #0 bne _02212148 - bl ErrorHandling + bl GF_AssertFail _02212148: ldr r0, [sp, #4] mov r5, #0 @@ -605,7 +605,7 @@ _022122A6: cmp r0, #0 bne _022122C6 bne _022122C0 - bl ErrorHandling + bl GF_AssertFail _022122C0: add sp, #0x3c mov r0, #0 @@ -737,7 +737,7 @@ MOD08_022123B0: ; 0x022123B0 cmp r0, #0 bne _022123C2 bne _022123BE - bl ErrorHandling + bl GF_AssertFail _022123BE: mov r0, #0 pop {r3, pc} @@ -891,7 +891,7 @@ MOD08_02212498: ; 0x02212498 add r4, r0, #0 cmp r5, #0xa blt _022124A6 - bl ErrorHandling + bl GF_AssertFail _022124A6: lsl r0, r5, #2 add r0, r4, r0 @@ -906,18 +906,18 @@ MOD08_022124B0: ; 0x022124B0 add r5, r0, #0 cmp r4, #0xa blt _022124BE - bl ErrorHandling + bl GF_AssertFail _022124BE: cmp r5, #0 bne _022124C6 - bl ErrorHandling + bl GF_AssertFail _022124C6: add r5, #0xdc lsl r4, r4, #2 ldr r0, [r5, r4] cmp r0, #0 bne _022124D4 - bl ErrorHandling + bl GF_AssertFail _022124D4: ldr r0, [r5, r4] pop {r3, r4, r5, pc} @@ -929,11 +929,11 @@ MOD08_022124D8: ; 0x022124D8 add r5, r0, #0 cmp r4, #5 blt _022124E6 - bl ErrorHandling + bl GF_AssertFail _022124E6: cmp r5, #0 bne _022124EE - bl ErrorHandling + bl GF_AssertFail _022124EE: mov r0, #0x4f lsl r0, r0, #2 @@ -942,7 +942,7 @@ _022124EE: ldr r0, [r5, r4] cmp r0, #0 bne _02212500 - bl ErrorHandling + bl GF_AssertFail _02212500: ldr r0, [r5, r4] pop {r3, r4, r5, pc} @@ -952,7 +952,7 @@ MOD08_02212504: ; 0x02212504 push {r4, lr} add r4, r0, #0 bne _0221250E - bl ErrorHandling + bl GF_AssertFail _0221250E: mov r0, #0x4e lsl r0, r0, #2 @@ -985,7 +985,7 @@ MOD08_0221252C: ; 0x0221252C bl AllocFromHeap add r4, r0, #0 bne _02212544 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} _02212544: @@ -1494,7 +1494,7 @@ _022128A4: str r1, [r0, #4] pop {r3, r4, r5, r6, r7, pc} _022128B8: - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -2079,7 +2079,7 @@ _02212D04: ldr r4, [r1, r0] cmp r4, #0xff bne _02212D44 - bl ErrorHandling + bl GF_AssertFail _02212D44: sub r0, r4, #1 add sp, #0x90 @@ -2122,7 +2122,7 @@ _02212D5C: ldr r4, [r1, r0] cmp r4, #0xff bne _02212D9C - bl ErrorHandling + bl GF_AssertFail _02212D9C: add r0, r4, #0 add sp, #0x90 @@ -2369,7 +2369,7 @@ MOD08_02212F58: ; 0x02212F58 ldr r0, [r0, #0x1c] cmp r0, #0 beq _02212F7C - bl ErrorHandling + bl GF_AssertFail _02212F7C: ldr r0, [r5, #0x18] mov r2, #0 @@ -2413,7 +2413,7 @@ MOD08_02212FAC: ; 0x02212FAC ldr r0, [r0, #0x1c] cmp r0, #0 beq _02212FD2 - bl ErrorHandling + bl GF_AssertFail _02212FD2: ldr r0, [r5, #0x18] mov r1, #0x64 @@ -3660,7 +3660,7 @@ _02213926: ldr r0, [r6, r5] cmp r0, #0 beq _0221393A - bl ErrorHandling + bl GF_AssertFail _0221393A: mov r0, #0x15 str r7, [r6, r5] @@ -4271,7 +4271,7 @@ MOD08_02213DA8: ; 0x02213DA8 bl AllocFromHeap add r4, r0, #0 bne _02213DC0 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} _02213DC0: @@ -5230,7 +5230,7 @@ MOD08_02214524: ; 0x02214524 push {r4, lr} add r4, r0, #0 bne _0221452E - bl ErrorHandling + bl GF_AssertFail _0221452E: mov r0, #6 lsl r0, r0, #6 @@ -6523,7 +6523,7 @@ MOD08_02214ED4: ; 0x02214ED4 ldr r0, [r6, r4] cmp r0, #0 beq _02214EFC - bl ErrorHandling + bl GF_AssertFail _02214EFC: add r0, r5, #0 add r0, #0xc0 @@ -6535,7 +6535,7 @@ _02214EFC: ldr r0, [r6, r4] cmp r0, #0 bne _02214F16 - bl ErrorHandling + bl GF_AssertFail _02214F16: add r0, r5, #0 add r0, #0xc0 @@ -6953,7 +6953,7 @@ _0221521A: ldr r0, [r5, r4] cmp r0, #0 beq _0221524E - bl ErrorHandling + bl GF_AssertFail _0221524E: str r6, [r5, r4] add sp, #0x34 @@ -7009,10 +7009,10 @@ _022152A4: .word FUN_0200C644 thumb_func_start MOD08_022152A8 MOD08_022152A8: ; 0x022152A8 - ldr r3, _022152AC ; =ErrorHandling + ldr r3, _022152AC ; =GF_AssertFail bx r3 .align 2, 0 -_022152AC: .word ErrorHandling +_022152AC: .word GF_AssertFail thumb_func_start MOD08_022152B0 MOD08_022152B0: ; 0x022152B0 @@ -7234,7 +7234,7 @@ MOD08_02215434: ; 0x02215434 beq _02215456 cmp r5, r2 beq _02215452 - bl ErrorHandling + bl GF_AssertFail _02215452: mov r0, #0 pop {r3, r4, r5, pc} @@ -7964,7 +7964,7 @@ MOD08_02215988: ; 0x02215988 push {r4, lr} add r4, r0, #0 bne _02215992 - bl ErrorHandling + bl GF_AssertFail _02215992: ldr r0, [r4, #4] add r0, r4, r0 @@ -12531,7 +12531,7 @@ _02217BE8: ldrsh r0, [r1, r0] pop {r3, r4, r5, r6, r7, pc} _02217BF8: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -12724,7 +12724,7 @@ MOD08_02217D44: ; 0x02217D44 str r3, [sp] cmp r5, #0 bne _02217D56 - bl ErrorHandling + bl GF_AssertFail _02217D56: cmp r4, r7 bls _02217D62 @@ -12764,7 +12764,7 @@ MOD08_02217D98: ; 0x02217D98 push {r4, lr} add r4, r0, #0 bne _02217DA2 - bl ErrorHandling + bl GF_AssertFail _02217DA2: ldr r0, [r4, #4] cmp r0, #0 @@ -12890,7 +12890,7 @@ MOD08_02217E80: ; 0x02217E80 str r2, [sp] cmp r5, #0 bne _02217E94 - bl ErrorHandling + bl GF_AssertFail _02217E94: strh r4, [r5] strh r6, [r5, #2] @@ -12924,7 +12924,7 @@ MOD08_02217ECC: ; 0x02217ECC push {r4, lr} add r4, r0, #0 bne _02217ED6 - bl ErrorHandling + bl GF_AssertFail _02217ED6: ldr r0, [r4, #4] cmp r0, #0 @@ -13037,11 +13037,11 @@ MOD08_02217F9C: ; 0x02217F9C add r4, r1, #0 cmp r5, #0 bne _02217FAA - bl ErrorHandling + bl GF_AssertFail _02217FAA: cmp r4, #0 bne _02217FB2 - bl ErrorHandling + bl GF_AssertFail _02217FB2: add r0, r5, #0 bl MOD08_02217ECC @@ -13097,7 +13097,7 @@ MOD08_02218008: ; 0x02218008 add r4, r3, #0 cmp r5, #0 bne _0221801A - bl ErrorHandling + bl GF_AssertFail _0221801A: str r6, [r5] lsl r0, r6, #0xc @@ -13119,7 +13119,7 @@ MOD08_02218030: ; 0x02218030 add r4, r3, #0 cmp r5, #0 bne _02218042 - bl ErrorHandling + bl GF_AssertFail _02218042: str r6, [r5] lsl r6, r6, #0xc @@ -13137,7 +13137,7 @@ MOD08_02218058: ; 0x02218058 push {r4, lr} add r4, r0, #0 bne _02218062 - bl ErrorHandling + bl GF_AssertFail _02218062: ldr r0, [r4, #4] cmp r0, #0 @@ -13161,7 +13161,7 @@ MOD08_02218080: ; 0x02218080 push {r4, lr} add r4, r0, #0 bne _0221808A - bl ErrorHandling + bl GF_AssertFail _0221808A: ldr r0, [r4, #4] cmp r0, #0 @@ -13201,7 +13201,7 @@ MOD08_022180C4: ; 0x022180C4 push {r4, lr} add r4, r0, #0 bne _022180CE - bl ErrorHandling + bl GF_AssertFail _022180CE: ldr r0, [r4, #4] cmp r0, #0 @@ -13253,7 +13253,7 @@ MOD08_02218120: ; 0x02218120 add r7, r3, #0 cmp r4, #0 bne _02218132 - bl ErrorHandling + bl GF_AssertFail _02218132: ldr r0, [sp, #0x18] add r1, r6, #0 @@ -13289,7 +13289,7 @@ MOD08_02218170: ; 0x02218170 push {r4, lr} add r4, r0, #0 bne _0221817A - bl ErrorHandling + bl GF_AssertFail _0221817A: ldr r0, [r4, #4] cmp r0, #0 @@ -13325,7 +13325,7 @@ MOD08_022181A8: ; 0x022181A8 str r3, [sp] cmp r5, #0 bne _022181BA - bl ErrorHandling + bl GF_AssertFail _022181BA: ldr r0, [sp, #0x20] add r1, sp, #8 @@ -13380,7 +13380,7 @@ MOD08_02218224: ; 0x02218224 push {r4, lr} add r4, r0, #0 bne _0221822E - bl ErrorHandling + bl GF_AssertFail _0221822E: ldr r0, [r4, #4] cmp r0, #0 @@ -13602,7 +13602,7 @@ MOD08_022183C0: ; 0x022183C0 add r7, r3, #0 cmp r5, #0 bne _022183D2 - bl ErrorHandling + bl GF_AssertFail _022183D2: str r7, [r5, #4] ldr r0, [sp, #0x18] @@ -13625,7 +13625,7 @@ MOD08_022183F0: ; 0x022183F0 push {r4, lr} add r4, r0, #0 bne _022183FA - bl ErrorHandling + bl GF_AssertFail _022183FA: ldr r0, [r4, #0xc] cmp r0, #0 @@ -14094,7 +14094,7 @@ MOD08_02218740: ; 0x02218740 add r7, r3, #0 cmp r5, #0 bne _02218752 - bl ErrorHandling + bl GF_AssertFail _02218752: mov r0, #1 str r0, [r5, #8] @@ -14122,7 +14122,7 @@ MOD08_02218780: ; 0x02218780 push {r4, lr} add r4, r0, #0 bne _0221878A - bl ErrorHandling + bl GF_AssertFail _0221878A: ldr r0, [r4, #4] cmp r0, #0 @@ -14142,7 +14142,7 @@ MOD08_022187A4: ; 0x022187A4 push {r4, lr} add r4, r0, #0 bne _022187AE - bl ErrorHandling + bl GF_AssertFail _022187AE: mov r0, #0 str r0, [r4, #8] @@ -14199,7 +14199,7 @@ MOD08_022187F4: ; 0x022187F4 bl memset cmp r4, #0 bne _02218816 - bl ErrorHandling + bl GF_AssertFail _02218816: mov r2, #0x32 add r1, r4, #0 @@ -14211,7 +14211,7 @@ _02218816: str r0, [r4, #0x1c] cmp r0, #0 bne _02218830 - bl ErrorHandling + bl GF_AssertFail _02218830: mov r0, #0x62 lsl r0, r0, #4 @@ -14245,7 +14245,7 @@ MOD08_02218870: ; 0x02218870 push {r4, lr} add r4, r0, #0 bne _0221887A - bl ErrorHandling + bl GF_AssertFail _0221887A: add r0, r4, #0 bl MOD08_02218780 @@ -14264,7 +14264,7 @@ MOD08_02218894: ; 0x02218894 push {r4, lr} add r4, r0, #0 bne _0221889E - bl ErrorHandling + bl GF_AssertFail _0221889E: ldr r0, [r4, #0x1c] bl FUN_02012988 @@ -14276,7 +14276,7 @@ MOD08_022188A8: ; 0x022188A8 push {r4, lr} add r4, r0, #0 bne _022188B2 - bl ErrorHandling + bl GF_AssertFail _022188B2: add r0, r4, #0 bl MOD08_022187A4 @@ -14315,7 +14315,7 @@ MOD08_022188DC: ; 0x022188DC bl AllocFromHeap add r4, r0, #0 bne _022188F8 - bl ErrorHandling + bl GF_AssertFail _022188F8: add r0, r4, #0 mov r1, #0 @@ -14359,7 +14359,7 @@ MOD08_0221894C: ; 0x0221894C push {r4, lr} add r4, r0, #0 bne _02218956 - bl ErrorHandling + bl GF_AssertFail _02218956: add r0, r4, #0 bl MOD08_02218780 @@ -14378,7 +14378,7 @@ MOD08_02218970: ; 0x02218970 push {r4, lr} add r4, r0, #0 bne _0221897A - bl ErrorHandling + bl GF_AssertFail _0221897A: ldr r0, [r4, #0x1c] bl FUN_02012B20 @@ -14390,7 +14390,7 @@ MOD08_02218984: ; 0x02218984 push {r4, lr} add r4, r0, #0 bne _0221898E - bl ErrorHandling + bl GF_AssertFail _0221898E: add r0, r4, #0 bl MOD08_022187A4 @@ -14606,7 +14606,7 @@ MOD08_02218AF8: ; 0x02218AF8 push {r4, lr} add r4, r0, #0 bne _02218B02 - bl ErrorHandling + bl GF_AssertFail _02218B02: ldr r0, [r4] pop {r4, pc} @@ -14617,7 +14617,7 @@ MOD08_02218B08: ; 0x02218B08 push {r4, lr} add r4, r0, #0 bne _02218B12 - bl ErrorHandling + bl GF_AssertFail _02218B12: ldr r0, [r4, #4] bl FUN_0200CAB4 @@ -14636,7 +14636,7 @@ MOD08_02218B20: ; 0x02218B20 bl AllocFromHeap add r4, r0, #0 bne _02218B38 - bl ErrorHandling + bl GF_AssertFail _02218B38: str r5, [r4, #0x18] str r6, [r4, #8] @@ -15003,7 +15003,7 @@ MOD08_02218DCC: ; 0x02218DCC bl AllocFromHeap add r4, r0, #0 bne _02218DEA - bl ErrorHandling + bl GF_AssertFail _02218DEA: mov r0, #0 strb r0, [r4] @@ -16348,7 +16348,7 @@ _02219886: str r0, [r4, #0x28] b _022198A4 _022198A0: - bl ErrorHandling + bl GF_AssertFail _022198A4: ldr r0, [r4, #0x28] mov r1, #0 @@ -16667,7 +16667,7 @@ _02219B18: lsl r6, r6, #8 b _02219B22 _02219B1E: - bl ErrorHandling + bl GF_AssertFail _02219B22: add r0, r5, #0 mov r1, #1 @@ -17003,7 +17003,7 @@ _02219D98: str r0, [r6, #4] b _02219DA8 _02219DA4: - bl ErrorHandling + bl GF_AssertFail _02219DA8: ldr r0, [r6, #4] cmp r0, #0 @@ -18152,7 +18152,7 @@ _0221A6CA: add r6, r0, #0 b _0221A6EA _0221A6E6: - bl ErrorHandling + bl GF_AssertFail _0221A6EA: cmp r6, #0xff bne _0221A6F6 @@ -18353,7 +18353,7 @@ _0221A866: add r6, r0, #0 b _0221A886 _0221A882: - bl ErrorHandling + bl GF_AssertFail _0221A886: cmp r6, #0xff bne _0221A892 @@ -19226,7 +19226,7 @@ _0221AFC0: add r6, r0, #0 b _0221AFE0 _0221AFDC: - bl ErrorHandling + bl GF_AssertFail _0221AFE0: cmp r6, #0xff bne _0221AFEC @@ -19478,7 +19478,7 @@ _0221B1DA: str r0, [sp, #8] b _0221B1F0 _0221B1EC: - bl ErrorHandling + bl GF_AssertFail _0221B1F0: add r2, r5, #0 ldr r1, [sp, #8] @@ -19599,7 +19599,7 @@ _0221B2D8: str r0, [sp, #8] b _0221B2EE _0221B2EA: - bl ErrorHandling + bl GF_AssertFail _0221B2EE: add r2, r4, #0 ldr r1, [sp, #8] @@ -19727,7 +19727,7 @@ _0221B3DA: add r6, r0, #0 b _0221B3F0 _0221B3EC: - bl ErrorHandling + bl GF_AssertFail _0221B3F0: add r0, r5, #0 add r1, r6, #0 @@ -20004,7 +20004,7 @@ _0221B622: add r7, r0, #0 b _0221B638 _0221B634: - bl ErrorHandling + bl GF_AssertFail _0221B638: add r0, r5, #0 mov r1, #1 @@ -20139,7 +20139,7 @@ _0221B744: add r4, r0, #0 b _0221B758 _0221B754: - bl ErrorHandling + bl GF_AssertFail _0221B758: add r0, r4, #0 pop {r3, r4, r5, pc} @@ -20834,7 +20834,7 @@ _0221BCEE: ldr r0, [r4, #0x38] cmp r0, #0 bne _0221BCF8 - bl ErrorHandling + bl GF_AssertFail _0221BCF8: pop {r3, r4, r5, pc} nop @@ -21182,7 +21182,7 @@ _0221BFBE: ldr r0, [r4, #0x38] cmp r0, #0 bne _0221BFCA - bl ErrorHandling + bl GF_AssertFail _0221BFCA: ldr r1, [r4, #0x14] add r0, r5, #0 @@ -23309,7 +23309,7 @@ MOD08_0221D0EC: ; 0x0221D0EC bl AllocFromHeap add r4, r0, #0 bne _0221D10A - bl ErrorHandling + bl GF_AssertFail _0221D10A: mov r0, #0 strb r0, [r4, #4] @@ -28315,7 +28315,7 @@ MOD08_0221FA44: ; 0x0221FA44 bl AllocFromHeap add r4, r0, #0 bne _0221FA62 - bl ErrorHandling + bl GF_AssertFail _0221FA62: mov r0, #0 strb r0, [r4, #4] @@ -28769,7 +28769,7 @@ MOD08_0221FDE4: ; 0x0221FDE4 bl AllocFromHeap add r4, r0, #0 bne _0221FE02 - bl ErrorHandling + bl GF_AssertFail _0221FE02: mov r0, #0 strb r0, [r4, #7] @@ -29234,7 +29234,7 @@ MOD08_02220180: ; 0x02220180 bl AllocFromHeap add r4, r0, #0 bne _0222019E - bl ErrorHandling + bl GF_AssertFail _0222019E: mov r0, #0 strb r0, [r4, #1] @@ -36026,7 +36026,7 @@ _02223A38: add sp, #8 pop {r3, pc} _02223A50: - bl ErrorHandling + bl GF_AssertFail add sp, #8 pop {r3, pc} @@ -36292,7 +36292,7 @@ _02223C50: add sp, #8 pop {r3, pc} _02223C6A: - bl ErrorHandling + bl GF_AssertFail add sp, #8 pop {r3, pc} .align 2, 0 @@ -43300,7 +43300,7 @@ _02227514: add r4, r4, #1 cmp r4, #4 blt _022274D0 - bl ErrorHandling + bl GF_AssertFail add r0, r5, #0 _02227520: pop {r4, r5, r6, pc} @@ -43343,7 +43343,7 @@ _02227556: mov r0, #4 pop {r3, pc} _0222755A: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} .align 2, 0 @@ -43450,7 +43450,7 @@ _02227616: mov r5, #7 b _0222761E _0222761A: - bl ErrorHandling + bl GF_AssertFail _0222761E: mov r0, #0x12 lsl r0, r0, #4 @@ -44755,7 +44755,7 @@ MOD08_02228064: ; 0x02228064 add r5, r1, #0 cmp r4, #0 bne _02228072 - bl ErrorHandling + bl GF_AssertFail _02228072: add r0, r4, #0 bl MOD08_02212014 @@ -44763,7 +44763,7 @@ _02228072: bl AllocFromHeap add r4, r0, #0 bne _02228086 - bl ErrorHandling + bl GF_AssertFail _02228086: add r0, r4, #0 mov r1, #0 @@ -44777,7 +44777,7 @@ MOD08_02228094: ; 0x02228094 push {r4, lr} add r4, r0, #0 bne _0222809E - bl ErrorHandling + bl GF_AssertFail _0222809E: add r0, r4, #0 bl FreeToHeap @@ -44989,7 +44989,7 @@ MOD08_022281F4: ; 0x022281F4 bl AllocFromHeap cmp r0, #0 bne _0222820A - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r4, pc} _0222820A: @@ -45047,7 +45047,7 @@ MOD08_02228244: ; 0x02228244 ldr r0, [r0] cmp r0, #0xd blt _02228272 - bl ErrorHandling + bl GF_AssertFail _02228272: add r0, r4, #0 add r0, #0x9c @@ -45146,7 +45146,7 @@ _022282F8: ldr r0, [r0, #0x14] cmp r0, #0 beq _02228332 - bl ErrorHandling + bl GF_AssertFail _02228332: add r0, r4, #0 add r0, #0x8c @@ -45165,7 +45165,7 @@ _02228332: ldr r0, [r0, #0x14] cmp r0, #0 bne _0222835A - bl ErrorHandling + bl GF_AssertFail _0222835A: ldr r0, [r6] add r0, r0, #1 @@ -45215,7 +45215,7 @@ _02228384: ldr r0, [r0, #0x14] cmp r0, #0 beq _022283BE - bl ErrorHandling + bl GF_AssertFail _022283BE: add r0, r4, #0 add r0, #0x8c @@ -45234,7 +45234,7 @@ _022283BE: ldr r0, [r0, #0x14] cmp r0, #0 bne _022283E6 - bl ErrorHandling + bl GF_AssertFail _022283E6: ldr r0, [r6] add r0, r0, #1 @@ -45284,7 +45284,7 @@ _02228410: ldr r0, [r0, #0x14] cmp r0, #0 beq _0222844A - bl ErrorHandling + bl GF_AssertFail _0222844A: add r0, r4, #0 add r0, #0x8c @@ -45303,7 +45303,7 @@ _0222844A: ldr r0, [r0, #0x14] cmp r0, #0 bne _02228472 - bl ErrorHandling + bl GF_AssertFail _02228472: ldr r0, [r6] add r0, r0, #1 @@ -45353,7 +45353,7 @@ _0222849C: ldr r0, [r0, #0x14] cmp r0, #0 beq _022284D6 - bl ErrorHandling + bl GF_AssertFail _022284D6: add r0, r4, #0 add r0, #0x8c @@ -45372,7 +45372,7 @@ _022284D6: ldr r0, [r0, #0x14] cmp r0, #0 bne _022284FE - bl ErrorHandling + bl GF_AssertFail _022284FE: ldr r0, [r6] add r0, r0, #1 @@ -45485,7 +45485,7 @@ MOD08_022285BC: ; 0x022285BC mov r7, #0 cmp r0, #9 ble _022285CE - bl ErrorHandling + bl GF_AssertFail _022285CE: ldr r0, [r6, #0x10] mov r4, #0 @@ -45612,7 +45612,7 @@ _022286AC: bl AllocFromHeap add r4, r0, #0 bne _022286BC - bl ErrorHandling + bl GF_AssertFail _022286BC: str r7, [r4] ldr r0, [r6, #4] @@ -45629,7 +45629,7 @@ _022286BC: str r0, [r4, #0x14] cmp r0, #0 bne _022286DE - bl ErrorHandling + bl GF_AssertFail _022286DE: ldr r0, [r4, #0x14] bl MOD08_0222A078 @@ -45856,7 +45856,7 @@ MOD08_02228880: ; 0x02228880 bl AllocFromHeap add r4, r0, #0 bne _02228894 - bl ErrorHandling + bl GF_AssertFail _02228894: ldmia r5!, {r0, r1} add r2, r4, #0 @@ -46681,7 +46681,7 @@ _02228E64: ldr r0, [r5, #0x18] cmp r0, #3 blt _02228E6E - bl ErrorHandling + bl GF_AssertFail _02228E6E: ldr r0, [r5, #8] add r0, r0, #1 @@ -48093,7 +48093,7 @@ MOD08_02229918: ; 0x02229918 bl MI_CpuFill8 cmp r4, #0 bne _02229936 - bl ErrorHandling + bl GF_AssertFail _02229936: add r3, r4, #0 add r3, #0x90 @@ -48184,7 +48184,7 @@ MOD08_022299E8: ; 0x022299E8 push {r4, lr} add r4, r0, #0 bne _022299F2 - bl ErrorHandling + bl GF_AssertFail _022299F2: ldr r0, [r4, #0x1c] cmp r0, #0 @@ -48200,7 +48200,7 @@ MOD08_02229A00: ; 0x02229A00 push {r4, lr} add r4, r0, #0 bne _02229A0A - bl ErrorHandling + bl GF_AssertFail _02229A0A: ldr r0, [r4, #0x28] cmp r0, #0 @@ -48233,7 +48233,7 @@ MOD08_02229A2C: ; 0x02229A2C push {r4, lr} add r4, r0, #0 bne _02229A36 - bl ErrorHandling + bl GF_AssertFail _02229A36: add r0, r4, #0 add r0, #0xac @@ -48276,7 +48276,7 @@ MOD08_02229A80: ; 0x02229A80 push {r4, lr} add r4, r0, #0 bne _02229A8A - bl ErrorHandling + bl GF_AssertFail _02229A8A: add r4, #0x98 ldr r0, [r4] @@ -49118,7 +49118,7 @@ MOD08_0222A0D4: ; 0x0222A0D4 bl AllocFromHeap add r4, r0, #0 bne _0222A0EC - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r4, r5, r6, pc} _0222A0EC: @@ -49172,7 +49172,7 @@ _0222A138: _0222A140: cmp r4, #0 bne _0222A148 - bl ErrorHandling + bl GF_AssertFail _0222A148: add r0, r4, #0 pop {r4, r5, r6, pc} @@ -49234,7 +49234,7 @@ MOD08_0222A1A0: ; 0x0222A1A0 bl AllocFromHeap add r4, r0, #0 bne _0222A1B8 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r4, r5, r6, pc} _0222A1B8: @@ -49346,7 +49346,7 @@ _0222A26C: sub r0, r5, #5 cmp r0, #0x16 blo _0222A284 - bl ErrorHandling + bl GF_AssertFail add sp, #0x58 mov r0, #0 pop {r3, r4, r5, pc} diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s index 42f3f754..9fedcb0a 100644 --- a/arm9/modules/11/asm/module_11_thumb1.s +++ b/arm9/modules/11/asm/module_11_thumb1.s @@ -1898,7 +1898,7 @@ _0222E532: ldr r0, [r0, r1] cmp r0, #0 bne _0222E67E - bl ErrorHandling + bl GF_AssertFail _0222E67E: ldr r5, [sp, #4] mov r0, #0 @@ -3078,11 +3078,11 @@ MOD11_0222EFDC: ; 0x0222EFDC add r5, r0, #0 cmp r4, #0 bne _0222F004 - bl ErrorHandling + bl GF_AssertFail _0222F004: cmp r5, #0 bne _0222F00C - bl ErrorHandling + bl GF_AssertFail _0222F00C: bl FUN_02012CC8 pop {r3, r4, r5, pc} diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index 3a852eef..b22a9a77 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -2073,7 +2073,7 @@ _02230250: ldr r0, [r6, #0x44] cmp r4, r0 blt _0223025A - bl ErrorHandling + bl GF_AssertFail _0223025A: add r0, r4, #0 pop {r3, r4, r5, r6, r7, pc} @@ -3553,7 +3553,7 @@ MOD11_02230DE0: ; 0x02230DE0 ldr r0, [r4, #0x30] cmp r0, #0 bne _02230DEE - bl ErrorHandling + bl GF_AssertFail _02230DEE: ldr r1, [r4, #0x30] add r0, r4, #0 @@ -4278,7 +4278,7 @@ MOD11_022312DC: ; 0x022312DC add r4, r0, #0 cmp r5, #4 blt _022312EA - bl ErrorHandling + bl GF_AssertFail _022312EA: lsl r0, r5, #4 ldr r0, [r4, r0] @@ -4292,7 +4292,7 @@ MOD11_022312F0: ; 0x022312F0 add r6, r2, #0 cmp r4, #4 blt _02231300 - bl ErrorHandling + bl GF_AssertFail _02231300: lsl r0, r4, #4 add r0, r5, r0 @@ -4307,7 +4307,7 @@ MOD11_02231308: ; 0x02231308 add r6, r2, #0 cmp r4, #4 blt _02231318 - bl ErrorHandling + bl GF_AssertFail _02231318: lsl r0, r4, #4 add r0, r5, r0 @@ -4322,7 +4322,7 @@ MOD11_02231320: ; 0x02231320 add r6, r2, #0 cmp r4, #4 blt _02231330 - bl ErrorHandling + bl GF_AssertFail _02231330: lsl r0, r4, #4 add r0, r5, r0 @@ -4559,7 +4559,7 @@ MOD11_022314B0: ; 0x022314B0 add r5, r0, #0 cmp r4, #0xf blo _022314BE - bl ErrorHandling + bl GF_AssertFail _022314BE: ldr r1, _022314D0 ; =0x000023FB mov r0, #0xe0 @@ -5292,7 +5292,7 @@ _02231A22: strh r0, [r4, #2] pop {r4, r5, r6, pc} _02231A46: - bl ErrorHandling + bl GF_AssertFail _02231A4A: pop {r4, r5, r6, pc} @@ -6036,7 +6036,7 @@ _02232086: bl MOD11_022320C8 pop {r3, r4, r5, pc} _022320C2: - bl ErrorHandling + bl GF_AssertFail _022320C6: pop {r3, r4, r5, pc} @@ -9941,7 +9941,7 @@ _02233F10: str r0, [r4] b _02233F42 _02233F1A: - bl ErrorHandling + bl GF_AssertFail b _02233F42 _02233F20: ldr r0, [r4] @@ -9962,7 +9962,7 @@ _02233F36: str r0, [r4] b _02233F42 _02233F3E: - bl ErrorHandling + bl GF_AssertFail _02233F42: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -10847,7 +10847,7 @@ _0223461C: str r0, [sp, #0xc] b _02234648 _02234626: - bl ErrorHandling + bl GF_AssertFail b _02234648 _0223462C: sub r0, r0, r4 @@ -10865,7 +10865,7 @@ _0223463E: str r0, [sp, #0xc] b _02234648 _02234644: - bl ErrorHandling + bl GF_AssertFail _02234648: cmp r6, #0x1a bne _0223465E @@ -11207,7 +11207,7 @@ _022348E8: str r0, [r4] b _022348F6 _022348F2: - bl ErrorHandling + bl GF_AssertFail _022348F6: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -11368,7 +11368,7 @@ _02234A18: str r0, [sp, #0xc] b _02234A26 _02234A22: - bl ErrorHandling + bl GF_AssertFail _02234A26: cmp r5, #0x11 beq _02234A56 @@ -20606,7 +20606,7 @@ _02239324: ldr r0, [sp, #0xc] cmp r0, #0xa blt _0223932E - bl ErrorHandling + bl GF_AssertFail _0223932E: bl LCRandom mov r1, #0x64 @@ -21264,7 +21264,7 @@ _02239872: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} _0223987E: - bl ErrorHandling + bl GF_AssertFail _02239882: ldr r0, _022398B0 ; =0x00002D90 add r1, r5, r6 @@ -21323,7 +21323,7 @@ _022398E6: _022398F0: cmp r4, #0 bne _022398F8 - bl ErrorHandling + bl GF_AssertFail _022398F8: bl LCRandom mov r1, #0x64 @@ -36327,7 +36327,7 @@ _02240F28: ldr r0, [r4, r0] cmp r0, #0 blt _02240F4A - bl ErrorHandling + bl GF_AssertFail _02240F4A: ldr r1, [r4, #0x64] add r0, r5, #0 @@ -40690,7 +40690,7 @@ MOD11_022431DC: ; 0x022431DC lsl r1, r1, #6 cmp r0, r1 blo _022431F8 - bl ErrorHandling + bl GF_AssertFail _022431F8: add r0, r5, #0 add r0, #0xac @@ -40723,14 +40723,14 @@ MOD11_0224321C: ; 0x0224321C lsl r1, r1, #6 cmp r0, r1 blo _02243238 - bl ErrorHandling + bl GF_AssertFail _02243238: add r0, r5, #0 add r0, #0xb8 ldr r0, [r0] cmp r0, #4 blt _02243246 - bl ErrorHandling + bl GF_AssertFail _02243246: add r1, r5, #0 add r1, #0xb8 @@ -40861,7 +40861,7 @@ _0224332C: _02243334: cmp r3, #0x10 blt _0224333C - bl ErrorHandling + bl GF_AssertFail _0224333C: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -40874,7 +40874,7 @@ MOD11_02243340: ; 0x02243340 str r2, [sp] add r4, r3, #0 bne _02243350 - bl ErrorHandling + bl GF_AssertFail _02243350: ldr r0, [sp] lsl r6, r5, #6 @@ -40904,7 +40904,7 @@ _02243376: _0224337E: cmp r2, #0x10 blt _02243386 - bl ErrorHandling + bl GF_AssertFail _02243386: pop {r3, r4, r5, r6, r7, pc} @@ -41520,7 +41520,7 @@ _0224378A: bl MOD11_02243420 pop {r4, r5, r6, pc} _02243794: - bl ErrorHandling + bl GF_AssertFail _02243798: mov r0, #0 pop {r4, r5, r6, pc} @@ -41821,7 +41821,7 @@ _022439A8: strb r1, [r0] pop {r4, r5, r6, pc} _022439B4: - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} _022439BA: ldrb r0, [r3] @@ -42357,7 +42357,7 @@ _02243D94: bl MOD11_0224379C pop {r4, r5, r6, pc} _02243D9E: - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} .align 2, 0 _02243DA4: .word 0xF7FFFFFF @@ -42968,7 +42968,7 @@ _022441E8: str r0, [r4, #0x28] pop {r4, r5, r6, pc} _02244200: - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} nop _02244208: .word 0xFFFFFC1F @@ -44124,7 +44124,7 @@ _02244AEA: _02244AF4: cmp r6, #0 bne _02244AFC - bl ErrorHandling + bl GF_AssertFail _02244AFC: bl LCRandom mov r1, #0x64 @@ -44193,7 +44193,7 @@ _02244B72: _02244B7C: cmp r7, #0 bne _02244B84 - bl ErrorHandling + bl GF_AssertFail _02244B84: bl LCRandom mov r1, #0x64 @@ -57811,7 +57811,7 @@ MOD11_0224B310: ; 0x0224B310 cmp r0, #1 beq _0224B334 bhi _0224B334 - bl ErrorHandling + bl GF_AssertFail _0224B334: add r0, sp, #0x90 ldrb r0, [r0, #0x1c] @@ -58063,7 +58063,7 @@ _0224B558: ldr r0, [r5, r0] cmp r0, #0xa bge _0224B564 - bl ErrorHandling + bl GF_AssertFail _0224B564: ldr r0, _0224B75C ; =0x00002158 mov r1, #0xa @@ -60136,7 +60136,7 @@ _0224C51E: ldr r0, [r1, r0] pop {r4, pc} _0224C528: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r4, pc} .align 2, 0 @@ -60219,7 +60219,7 @@ _0224C5C2: strb r4, [r1, r0] pop {r3, r4, r5, pc} _0224C5CA: - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, pc} .align 2, 0 _0224C5D0: .word 0xFFFF8FFF @@ -60275,7 +60275,7 @@ _0224C628: _0224C62E: cmp r4, #0x91 blo _0224C636 - bl ErrorHandling + bl GF_AssertFail _0224C636: ldr r0, _0224C644 ; =MOD11_0225E4C8 lsl r1, r4, #2 @@ -60450,7 +60450,7 @@ _0224C756: ldrb r4, [r1, r0] b _0224C76A _0224C766: - bl ErrorHandling + bl GF_AssertFail _0224C76A: mov r0, #0xc0 mul r0, r6 @@ -64173,7 +64173,7 @@ MOD11_0224E410: ; 0x0224E410 add r5, r2, #0 cmp r0, #0 bne _0224E422 - bl ErrorHandling + bl GF_AssertFail _0224E422: add r4, r6, #0 add r4, #0x28 @@ -64241,7 +64241,7 @@ MOD11_0224E49C: ; 0x0224E49C add r5, r2, #0 cmp r0, #0 bne _0224E4AE - bl ErrorHandling + bl GF_AssertFail _0224E4AE: add r4, r6, #0 add r4, #0x28 @@ -64552,7 +64552,7 @@ MOD11_0224E6FC: ; 0x0224E6FC add r4, r2, #0 cmp r0, #0 bne _0224E70E - bl ErrorHandling + bl GF_AssertFail _0224E70E: ldrb r1, [r4, #1] add r0, r5, #0 @@ -69424,7 +69424,7 @@ _02250EB6: bl MOD11_02258820 b _02250EC8 _02250EC4: - bl ErrorHandling + bl GF_AssertFail _02250EC8: add r0, r6, #0 bl MOD11_02258E30 @@ -69807,7 +69807,7 @@ _022511FA: bl FUN_02033590 cmp r0, #0 beq _02251206 - bl ErrorHandling + bl GF_AssertFail _02251206: ldrb r1, [r6, #0x1d] ldr r0, [r6] @@ -70085,7 +70085,7 @@ MOD11_02251420: ; 0x02251420 add r4, r0, #1 cmp r4, #5 blt _02251442 - bl ErrorHandling + bl GF_AssertFail _02251442: ldrb r1, [r5, #0xd] ldr r0, [r5] @@ -72340,7 +72340,7 @@ _02252664: bl MOD11_02258820 b _02252676 _02252672: - bl ErrorHandling + bl GF_AssertFail _02252676: mov r0, #2 add sp, #0x2c @@ -74388,7 +74388,7 @@ MOD11_022536D4: ; 0x022536D4 ldr r0, [r0] cmp r0, #0 beq _022536EE - bl ErrorHandling + bl GF_AssertFail _022536EE: ldrb r2, [r4, #0xd] ldr r0, [r4] @@ -74423,7 +74423,7 @@ MOD11_02253720: ; 0x02253720 ldr r0, [r0] cmp r0, #0 bne _02253734 - bl ErrorHandling + bl GF_AssertFail _02253734: ldr r0, [r4, #4] add r0, #0x8c @@ -81452,7 +81452,7 @@ MOD11_02256D70: ; 0x02256D70 add r4, r2, #0 cmp r0, #0 bne _02256D82 - bl ErrorHandling + bl GF_AssertFail _02256D82: add r0, r5, #0 add r0, #0x25 @@ -82159,7 +82159,7 @@ MOD11_022572C8: ; 0x022572C8 add r7, r2, #0 cmp r0, #0 bne _022572DA - bl ErrorHandling + bl GF_AssertFail _022572DA: add r0, r5, #0 add r0, #0x25 @@ -82211,12 +82211,12 @@ MOD11_02257334: ; 0x02257334 add r5, r1, #0 cmp r4, #0 bne _02257342 - bl ErrorHandling + bl GF_AssertFail _02257342: ldr r0, [r4, #4] cmp r0, #0 bne _0225734C - bl ErrorHandling + bl GF_AssertFail _0225734C: add r0, r4, #0 add r0, #0x4f @@ -83788,7 +83788,7 @@ _02257FB4: mov r0, #5 pop {r3, pc} _02257FB8: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} @@ -83834,7 +83834,7 @@ _02257FFA: ldr r0, _02258020 ; =MOD11_0225EBB8 pop {r3, pc} _02257FFE: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} nop @@ -83873,7 +83873,7 @@ _0225804A: mov r0, #0 pop {r3, pc} _0225804E: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} nop @@ -84339,7 +84339,7 @@ MOD11_022583D8: ; 0x022583D8 strb r7, [r5, #9] cmp r7, #0xc blt _022583FE - bl ErrorHandling + bl GF_AssertFail mov r0, #0 strb r0, [r5, #9] _022583FE: @@ -84986,7 +84986,7 @@ MOD11_02258958: ; 0x02258958 cmp r0, #0 beq _02258974 _02258970: - bl ErrorHandling + bl GF_AssertFail _02258974: ldr r0, [sp, #0x14] ldr r0, [r0] @@ -85108,7 +85108,7 @@ _02258A12: ldr r0, [r0, #4] cmp r0, #0 beq _02258A82 - bl ErrorHandling + bl GF_AssertFail _02258A82: ldr r0, _02258AFC ; =MOD11_02258BE0 ldr r1, [sp, #0x14] @@ -85179,7 +85179,7 @@ MOD11_02258B10: ; 0x02258B10 cmp r0, #0 bne _02258B28 _02258B24: - bl ErrorHandling + bl GF_AssertFail _02258B28: ldr r0, [r6] bl MOD11_02230078 @@ -85519,7 +85519,7 @@ MOD11_02258DD0: ; 0x02258DD0 cmp r0, #0 bne _02258DE8 _02258DE4: - bl ErrorHandling + bl GF_AssertFail _02258DE8: ldr r7, _02258E28 ; =0x000005D4 mov r6, #0 @@ -85569,7 +85569,7 @@ MOD11_02258E30: ; 0x02258E30 cmp r0, #0 bne _02258E48 _02258E44: - bl ErrorHandling + bl GF_AssertFail _02258E48: ldr r7, _02258E70 ; =0x000005D4 mov r4, #0 @@ -85602,7 +85602,7 @@ MOD11_02258E74: ; 0x02258E74 sub r0, r6, #1 cmp r1, r0 bne _02258E88 - bl ErrorHandling + bl GF_AssertFail _02258E88: ldr r0, _02258F4C ; =0x0000069F ldr r3, _02258F50 ; =MOD11_0225FAAC @@ -85625,7 +85625,7 @@ _02258EA8: ldr r0, [r4, #0x18] cmp r0, #0 bne _02258EB2 - bl ErrorHandling + bl GF_AssertFail _02258EB2: ldr r0, [r5] bl MOD11_0222FF74 @@ -85833,7 +85833,7 @@ _02259020: mov r0, #0xb pop {r3, pc} _02259024: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} @@ -86090,7 +86090,7 @@ MOD11_0225916C: ; 0x0225916C bl FUN_02015F34 cmp r0, #1 beq _02259232 - bl ErrorHandling + bl GF_AssertFail _02259232: ldr r0, _0225926C ; =MOD11_0225B538 add r1, r4, #0 @@ -86503,7 +86503,7 @@ MOD11_022595C8: ; 0x022595C8 add r6, r5, #0 add r6, #0x18 bne _022595D8 - bl ErrorHandling + bl GF_AssertFail _022595D8: ldrb r1, [r6, #0x10] ldr r0, _02259854 ; =0x0000069E @@ -88010,7 +88010,7 @@ _0225A286: ldr r0, [r1, r0] cmp r0, #0 beq _0225A296 - bl ErrorHandling + bl GF_AssertFail _0225A296: lsl r0, r5, #2 add r1, r4, r0 @@ -88018,7 +88018,7 @@ _0225A296: ldr r0, [r1, r0] cmp r0, #0 beq _0225A2A6 - bl ErrorHandling + bl GF_AssertFail _0225A2A6: cmp r6, #5 bhi _0225A2CE @@ -88045,7 +88045,7 @@ _0225A2CA: ldr r6, _0225A3E0 ; =0x00004E42 b _0225A2D8 _0225A2CE: - bl ErrorHandling + bl GF_AssertFail add sp, #0x50 mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -88255,7 +88255,7 @@ MOD11_0225A458: ; 0x0225A458 ldr r4, [sp, #0xa8] cmp r0, #0 beq _0225A472 - bl ErrorHandling + bl GF_AssertFail _0225A472: ldr r0, [r7] bl MOD11_02230080 @@ -88981,7 +88981,7 @@ _0225AA14: ldr r0, [r1, r0] cmp r0, #0 beq _0225AA24 - bl ErrorHandling + bl GF_AssertFail _0225AA24: ldr r0, [sp, #4] lsl r1, r4, #1 @@ -89425,7 +89425,7 @@ MOD11_0225AD80: ; 0x0225AD80 ldr r0, [r4, #8] cmp r0, #0 beq _0225AD90 - bl ErrorHandling + bl GF_AssertFail _0225AD90: mov r0, #0x6b lsl r0, r0, #4 @@ -92883,7 +92883,7 @@ MOD11_0225C784: ; 0x0225C784 ldrb r0, [r4, r0] cmp r0, #2 blo _0225C7B0 - bl ErrorHandling + bl GF_AssertFail _0225C7B0: ldr r1, _0225C7E4 ; =0x000006FC add r0, r4, #0 @@ -93175,7 +93175,7 @@ MOD11_0225C9F0: ; 0x0225C9F0 ldr r0, [r4, #4] cmp r0, #0 beq _0225C9FE - bl ErrorHandling + bl GF_AssertFail _0225C9FE: add r0, r4, #0 bl FreeToHeap @@ -93264,7 +93264,7 @@ MOD11_0225CA90: ; 0x0225CA90 add r7, r2, #0 cmp r6, #0 bne _0225CAA0 - bl ErrorHandling + bl GF_AssertFail _0225CAA0: add r0, r6, #0 add r1, r4, #0 @@ -93347,7 +93347,7 @@ MOD11_0225CB10: ; 0x0225CB10 _0225CB2A: cmp r1, #0 bne _0225CB32 - bl ErrorHandling + bl GF_AssertFail _0225CB32: add r0, r5, #0 mov r1, #0 @@ -93508,7 +93508,7 @@ MOD11_0225CC68: ; 0x0225CC68 cmp r0, #0 beq _0225CC7E _0225CC7A: - bl ErrorHandling + bl GF_AssertFail _0225CC7E: mov r0, #0 strb r0, [r5, #0x1a] @@ -93682,7 +93682,7 @@ MOD11_0225CDB0: ; 0x0225CDB0 _0225CDCC: cmp r1, #0 bne _0225CDD4 - bl ErrorHandling + bl GF_AssertFail _0225CDD4: add r0, r5, #0 mov r1, #0 @@ -94193,7 +94193,7 @@ MOD11_0225D1A8: ; 0x0225D1A8 cmp r0, #0 beq _0225D1C2 _0225D1BE: - bl ErrorHandling + bl GF_AssertFail _0225D1C2: add r0, r5, #0 mov r1, #0 diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index 7d0a23a3..1448f650 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -761,11 +761,11 @@ MOD12_0222DCAC: ; 0x0222DCAC add r5, r0, #0 cmp r4, #0 bne _0222DCD4 - bl ErrorHandling + bl GF_AssertFail _0222DCD4: cmp r5, #0 bne _0222DCDC - bl ErrorHandling + bl GF_AssertFail _0222DCDC: bl FUN_02012CC8 pop {r3, r4, r5, pc} @@ -780,7 +780,7 @@ MOD12_0222DCEC: ; 0x0222DCEC ldr r0, [r4] cmp r0, #0 bne _0222DCFA - bl ErrorHandling + bl GF_AssertFail _0222DCFA: ldr r1, _0222DD1C ; =0x00000172 mov r0, #0 @@ -4016,11 +4016,11 @@ MOD12_0222F6E0: ; 0x0222F6E0 add r5, r0, #0 cmp r4, #0 bne _0222F708 - bl ErrorHandling + bl GF_AssertFail _0222F708: cmp r5, #0 bne _0222F710 - bl ErrorHandling + bl GF_AssertFail _0222F710: bl FUN_02012CC8 pop {r3, r4, r5, pc} @@ -4035,7 +4035,7 @@ MOD12_0222F720: ; 0x0222F720 ldr r0, [r4] cmp r0, #0 bne _0222F72E - bl ErrorHandling + bl GF_AssertFail _0222F72E: mov r3, #0 mov r0, #3 @@ -5408,7 +5408,7 @@ MOD12_0223023C: ; 0x0223023C bl FUN_020133C8 cmp r0, #0 beq _02230254 - bl ErrorHandling + bl GF_AssertFail _02230254: add r0, r4, #0 bl MOD12_02230A40 @@ -5945,7 +5945,7 @@ MOD12_022306F8: ; 0x022306F8 ldr r0, [r5] cmp r0, #0 bne _02230706 - bl ErrorHandling + bl GF_AssertFail _02230706: mov r4, #0xad lsl r4, r4, #4 @@ -6292,7 +6292,7 @@ MOD12_022309D8: ; 0x022309D8 ldr r0, [r4, #0xc] cmp r0, #0 beq _022309E8 - bl ErrorHandling + bl GF_AssertFail _022309E8: mov r1, #0x12 mov r0, #0x17 @@ -7947,7 +7947,7 @@ _022316A6: mov r6, #0x69 b _022316B2 _022316AA: - bl ErrorHandling + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} _022316B2: @@ -8241,7 +8241,7 @@ MOD12_022318DC: ; 0x022318DC ldr r0, [r4] cmp r0, #0 bne _022318EA - bl ErrorHandling + bl GF_AssertFail _022318EA: ldr r0, [r4] bl FUN_0200CAB4 @@ -8711,7 +8711,7 @@ MOD12_02231C80: ; 0x02231C80 sub r0, r6, #1 cmp r1, r0 bne _02231C96 - bl ErrorHandling + bl GF_AssertFail _02231C96: mov r0, #0x2e lsl r0, r0, #4 @@ -8730,7 +8730,7 @@ _02231CB0: ldr r0, [r4, #0x18] cmp r0, #0 bne _02231CBA - bl ErrorHandling + bl GF_AssertFail _02231CBA: ldr r0, [r4, #0x14] bl FUN_02020988 @@ -9148,7 +9148,7 @@ _02231FC0: ldrb r0, [r6, r0] cmp r0, #0xff beq _02232000 - bl ErrorHandling + bl GF_AssertFail _02232000: ldr r0, _022320A0 ; =0x000002E1 strb r4, [r6, r0] @@ -9181,7 +9181,7 @@ _02232030: str r0, [sp, #0x1c] cmp r0, #6 ble _02232040 - bl ErrorHandling + bl GF_AssertFail _02232040: mov r0, #0x18 mul r0, r4 @@ -9201,7 +9201,7 @@ _02232054: ldr r0, [r1, r0] cmp r0, #0 beq _02232066 - bl ErrorHandling + bl GF_AssertFail _02232066: ldr r0, [sp, #0x20] ldr r3, _022320BC ; =MOD12_02244E50 @@ -9516,7 +9516,7 @@ MOD12_022322C0: ; 0x022322C0 ldr r4, [sp, #0xa8] cmp r0, #0 beq _022322DA - bl ErrorHandling + bl GF_AssertFail _022322DA: ldr r1, [r7, #4] cmp r4, #0 @@ -9759,7 +9759,7 @@ _0223249A: ldr r0, [r1, r0] cmp r0, #0 beq _022324AC - bl ErrorHandling + bl GF_AssertFail _022324AC: lsl r0, r4, #1 ldrh r0, [r7, r0] @@ -9989,7 +9989,7 @@ MOD12_02232654: ; 0x02232654 ldr r0, [r4, #0x10] cmp r0, #0 beq _02232664 - bl ErrorHandling + bl GF_AssertFail _02232664: mov r0, #0xb9 lsl r0, r0, #2 @@ -10516,7 +10516,7 @@ MOD12_02232A68: ; 0x02232A68 ldr r0, [r4, #0x14] cmp r0, #0 beq _02232A78 - bl ErrorHandling + bl GF_AssertFail _02232A78: mov r0, #0xc1 lsl r0, r0, #2 @@ -12081,7 +12081,7 @@ MOD12_0223361C: ; 0x0223361C ldrb r0, [r4, #0xb] cmp r0, #0 beq _0223362A - bl ErrorHandling + bl GF_AssertFail _0223362A: ldr r0, [r4, #4] bl FUN_0200CAB4 @@ -12174,7 +12174,7 @@ MOD12_022336AC: ; 0x022336AC ldr r0, [r0, #0x58] cmp r0, #0 bne _022336D4 - bl ErrorHandling + bl GF_AssertFail _022336D4: add r2, r5, #0 add r2, #0x58 @@ -12256,7 +12256,7 @@ _02233772: ldr r0, [r7, #0x58] cmp r0, #0 beq _0223377C - bl ErrorHandling + bl GF_AssertFail _0223377C: mov r1, #0x32 mov r0, #0x15 @@ -12322,7 +12322,7 @@ _022337E6: ldr r0, [r0] cmp r0, #0 beq _0223380C - bl ErrorHandling + bl GF_AssertFail _0223380C: mov r1, #0x32 mov r0, #0x15 @@ -12802,7 +12802,7 @@ MOD12_02233BBC: ; 0x02233BBC ldr r0, [r4, r0] cmp r0, #0 bne _02233BCE - bl ErrorHandling + bl GF_AssertFail _02233BCE: mov r0, #0x5f lsl r0, r0, #2 @@ -12826,7 +12826,7 @@ MOD12_02233BE4: ; 0x02233BE4 add r5, r2, #0 cmp r0, #0 bne _02233BFA - bl ErrorHandling + bl GF_AssertFail _02233BFA: ldr r1, _02233C60 ; =MOD12_02245200 lsl r2, r6, #2 @@ -12893,7 +12893,7 @@ MOD12_02233C74: ; 0x02233C74 ldr r0, [r4, r0] cmp r0, #0 bne _02233C86 - bl ErrorHandling + bl GF_AssertFail _02233C86: mov r0, #0x5f lsl r0, r0, #2 @@ -13217,7 +13217,7 @@ MOD12_02233EEC: ; 0x02233EEC add r4, r1, #0 cmp r0, #0 beq _02233F00 - bl ErrorHandling + bl GF_AssertFail _02233F00: mov r0, #1 str r0, [sp] @@ -14137,7 +14137,7 @@ MOD12_02234628: ; 0x02234628 str r0, [sp, #4] cmp r0, #5 ble _02234644 - bl ErrorHandling + bl GF_AssertFail _02234644: ldr r0, [sp] mov r1, #0x14 @@ -14681,7 +14681,7 @@ MOD12_02234A60: ; 0x02234A60 blt _02234A78 cmp r5, #0 bne _02234A78 - bl ErrorHandling + bl GF_AssertFail _02234A78: cmp r7, #0x1c bls _02234A7E @@ -15213,7 +15213,7 @@ _02234ECC: add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234EF2: - bl ErrorHandling + bl GF_AssertFail _02234EF6: add sp, #8 pop {r3, r4, r5, r6, r7, pc} @@ -15317,7 +15317,7 @@ MOD12_02234FB0: ; 0x02234FB0 add r6, r3, #0 cmp r5, #0x2f blo _02234FC4 - bl ErrorHandling + bl GF_AssertFail _02234FC4: ldr r0, _02234FE4 ; =MOD12_0224540C + 3 lsl r3, r5, #2 @@ -15734,11 +15734,11 @@ _022352D6: ldr r4, [r0, r1] cmp r4, #0 bge _022352E4 - bl ErrorHandling + bl GF_AssertFail _022352E4: cmp r4, #0x7f ble _022352EC - bl ErrorHandling + bl GF_AssertFail _022352EC: add r0, r4, #0 pop {r4, pc} @@ -24466,13 +24466,13 @@ _02239404: ldrh r0, [r0] cmp r0, #0 bne _02239428 - bl ErrorHandling + bl GF_AssertFail _02239428: ldr r0, [sp, #0x58] ldrb r0, [r0] cmp r0, #3 blo _02239434 - bl ErrorHandling + bl GF_AssertFail _02239434: add sp, #0x44 pop {r4, r5, r6, r7, pc} @@ -25164,7 +25164,7 @@ MOD12_02239838: ; 0x02239838 ldr r0, [r0, #0x48] cmp r0, #0 beq _02239872 - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _02239858: bl FUN_02007534 @@ -25390,7 +25390,7 @@ MOD12_02239A10: ; 0x02239A10 add r4, r1, #0 cmp r0, #0 beq _02239A22 - bl ErrorHandling + bl GF_AssertFail _02239A22: mov r1, #0x30 ldr r2, [r5] @@ -25442,7 +25442,7 @@ MOD12_02239A6C: ; 0x02239A6C beq _02239A82 cmp r6, #0 bne _02239A82 - bl ErrorHandling + bl GF_AssertFail _02239A82: cmp r4, #0 beq _02239ACC @@ -25477,7 +25477,7 @@ _02239A82: add sp, #8 pop {r4, r5, r6, pc} _02239AC8: - bl ErrorHandling + bl GF_AssertFail _02239ACC: add sp, #8 pop {r4, r5, r6, pc} @@ -25547,7 +25547,7 @@ MOD12_02239B48: ; 0x02239B48 add r4, r2, #0 cmp r5, #0xf blo _02239B5A - bl ErrorHandling + bl GF_AssertFail _02239B5A: str r4, [sp] ldr r2, _02239B74 ; =MOD12_02245F48 @@ -27277,7 +27277,7 @@ _0223A886: ldr r0, [r0, #0x24] cmp r0, #0 bne _0223A892 - bl ErrorHandling + bl GF_AssertFail _0223A892: ldr r0, [r4] mov r1, #0 @@ -27863,7 +27863,7 @@ _0223AD20: ldr r0, [r0, #0x24] cmp r0, #0 bne _0223AD2C - bl ErrorHandling + bl GF_AssertFail _0223AD2C: ldrb r0, [r4, #0xf] add r0, r0, #1 @@ -29305,7 +29305,7 @@ MOD12_0223B878: ; 0x0223B878 sub r0, #0x97 cmp r1, r0 bne _0223B88A - bl ErrorHandling + bl GF_AssertFail _0223B88A: mov r0, #0x96 ldrsb r1, [r5, r0] @@ -29323,7 +29323,7 @@ _0223B8A2: ldr r0, [r4, #0x18] cmp r0, #0 bne _0223B8AC - bl ErrorHandling + bl GF_AssertFail _0223B8AC: ldr r0, [r4, #0x14] bl FUN_02020988 @@ -29881,7 +29881,7 @@ MOD12_0223BCD8: ; 0x0223BCD8 ldr r4, [sp, #0x9c] cmp r0, #0 beq _0223BCF0 - bl ErrorHandling + bl GF_AssertFail _0223BCF0: ldr r0, [sp, #0x18] mov r2, #0 @@ -30080,7 +30080,7 @@ MOD12_0223BE64: ; 0x0223BE64 ldr r0, [r4, #0xc] cmp r0, #0 beq _0223BE74 - bl ErrorHandling + bl GF_AssertFail _0223BE74: add r0, r4, #0 add r0, #0x98 @@ -30605,7 +30605,7 @@ _0223C252: ldr r0, [r0] cmp r0, #0 beq _0223C262 - bl ErrorHandling + bl GF_AssertFail _0223C262: add r4, r4, #1 _0223C264: @@ -31107,7 +31107,7 @@ _0223C618: add r2, r2, #4 cmp r0, #0x44 blt _0223C602 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 add sp, #0x34 pop {r4, r5, r6, r7, pc} @@ -33052,7 +33052,7 @@ _0223D532: mvn r4, r4 cmp r0, r4 bne _0223D540 - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} _0223D540: strb r3, [r1, r0] @@ -33295,7 +33295,7 @@ _0223D6DA: add r7, r0, #0 b _0223D70C _0223D708: - bl ErrorHandling + bl GF_AssertFail _0223D70C: cmp r7, #1 bne _0223D750 @@ -33988,7 +33988,7 @@ MOD12_0223DC28: ; 0x0223DC28 str r2, [sp] cmp r0, #0 beq _0223DC46 - bl ErrorHandling + bl GF_AssertFail _0223DC46: ldr r0, _0223DCB0 ; =0x0000106C mov r2, #0x28 @@ -34173,7 +34173,7 @@ _0223DD92: strb r0, [r2, r3] pop {r3, r4, r5, pc} _0223DDA4: - bl ErrorHandling + bl GF_AssertFail _0223DDA8: pop {r3, r4, r5, pc} nop @@ -34549,7 +34549,7 @@ MOD12_0223E068: ; 0x0223E068 beq _0223E07E cmp r5, #0 bne _0223E07E - bl ErrorHandling + bl GF_AssertFail _0223E07E: cmp r6, #6 bls _0223E084 @@ -34722,7 +34722,7 @@ _0223E16A: add sp, #8 pop {r4, r5, r6, pc} _0223E1E4: - bl ErrorHandling + bl GF_AssertFail _0223E1E8: add sp, #8 pop {r4, r5, r6, pc} @@ -34799,7 +34799,7 @@ MOD12_0223E274: ; 0x0223E274 add r6, r2, #0 cmp r4, #8 blo _0223E286 - bl ErrorHandling + bl GF_AssertFail _0223E286: lsl r3, r4, #2 ldr r2, _0223E2A0 ; =MOD12_02246224 @@ -34891,7 +34891,7 @@ MOD12_0223E32C: ; 0x0223E32C ldr r0, [r5, r0] cmp r0, #0 beq _0223E33E - bl ErrorHandling + bl GF_AssertFail _0223E33E: mov r0, #0x17 mov r1, #0x10 @@ -35065,7 +35065,7 @@ MOD12_0223E488: ; 0x0223E488 add r7, r2, #0 cmp r4, #8 blo _0223E49A - bl ErrorHandling + bl GF_AssertFail _0223E49A: ldr r0, _0223E51C ; =0x00001BF1 ldrb r0, [r5, r0] @@ -35570,7 +35570,7 @@ MOD12_0223E868: ; 0x0223E868 ldr r0, [r4, r0] cmp r0, #0 beq _0223E87A - bl ErrorHandling + bl GF_AssertFail _0223E87A: mov r0, #0x81 lsl r0, r0, #2 @@ -35613,7 +35613,7 @@ MOD12_0223E8B4: ; 0x0223E8B4 ldr r0, [r4, #4] cmp r0, #0 bne _0223E8C8 - bl ErrorHandling + bl GF_AssertFail _0223E8C8: cmp r5, #0 bne _0223E8D0 @@ -35753,7 +35753,7 @@ MOD12_0223E9C4: ; 0x0223E9C4 add r6, r2, #0 cmp r5, #0x21 blo _0223E9D6 - bl ErrorHandling + bl GF_AssertFail _0223E9D6: ldr r0, _0223EA3C ; =MOD12_0224637C lsl r1, r5, #2 @@ -38064,7 +38064,7 @@ _0223FBA6: mov r0, #4 pop {r3, pc} _0223FBAA: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} .align 2, 0 @@ -38099,7 +38099,7 @@ _0223FBDC: mov r0, #3 pop {r3, pc} _0223FBE0: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} @@ -39925,7 +39925,7 @@ MOD12_022409CC: ; 0x022409CC add r4, r0, #0 cmp r5, #4 blo _022409DA - bl ErrorHandling + bl GF_AssertFail _022409DA: ldr r0, _02240A0C ; =MOD12_022464C0 cmp r4, #3 @@ -39967,7 +39967,7 @@ MOD12_02240A10: ; 0x02240A10 add r4, r3, #0 cmp r7, #4 blo _02240A22 - bl ErrorHandling + bl GF_AssertFail _02240A22: mov r0, #0 mvn r0, r0 @@ -40469,7 +40469,7 @@ MOD12_02240DC4: ; 0x02240DC4 add r4, r0, #0 cmp r4, #5 blo _02240DD0 - bl ErrorHandling + bl GF_AssertFail _02240DD0: ldr r0, _02240DD8 ; =MOD12_022464D0 lsl r1, r4, #2 @@ -40494,7 +40494,7 @@ MOD12_02240DE4: ; 0x02240DE4 add r4, r0, #0 cmp r4, #5 blo _02240DF0 - bl ErrorHandling + bl GF_AssertFail _02240DF0: ldr r0, _02240DF8 ; =MOD12_022464C8 ldrb r0, [r0, r4] @@ -40660,7 +40660,7 @@ _02240F14: add r4, r4, #1 cmp r4, #0x20 blt _02240F00 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} .align 2, 0 @@ -40695,7 +40695,7 @@ MOD12_02240F3C: ; 0x02240F3C str r3, [sp] cmp r4, r0 bls _02240F5A - bl ErrorHandling + bl GF_AssertFail _02240F5A: add r0, r5, #0 mov r2, #2 @@ -40750,7 +40750,7 @@ MOD12_02240FB0: ; 0x02240FB0 str r3, [sp] cmp r7, r0 bls _02240FCC - bl ErrorHandling + bl GF_AssertFail _02240FCC: add r0, r5, #0 mov r2, #2 @@ -40840,7 +40840,7 @@ _02241066: ldrh r0, [r5, #4] cmp r4, r0 blt _02241070 - bl ErrorHandling + bl GF_AssertFail _02241070: add r0, r5, #0 add r1, r6, #0 @@ -42079,11 +42079,11 @@ MOD12_02241B0C: ; 0x02241B0C add r5, r0, #0 cmp r4, #0 bne _02241B34 - bl ErrorHandling + bl GF_AssertFail _02241B34: cmp r5, #0 bne _02241B3C - bl ErrorHandling + bl GF_AssertFail _02241B3C: bl FUN_02012CC8 pop {r3, r4, r5, pc} @@ -42098,7 +42098,7 @@ MOD12_02241B4C: ; 0x02241B4C ldr r0, [r4] cmp r0, #0 bne _02241B5A - bl ErrorHandling + bl GF_AssertFail _02241B5A: mov r1, #0xf3 mov r5, #0 @@ -42233,7 +42233,7 @@ _02241C1E: _02241C2C: cmp r5, #4 bne _02241C34 - bl ErrorHandling + bl GF_AssertFail _02241C34: ldr r0, _02241CE8 ; =0x00000438 ldr r1, _02241CEC ; =0x00000439 @@ -43323,7 +43323,7 @@ _02242462: ldr r0, [r0] cmp r0, #0 beq _0224247A - bl ErrorHandling + bl GF_AssertFail _0224247A: mov r1, #0x32 mov r0, #0x18 @@ -43404,7 +43404,7 @@ MOD12_02242500: ; 0x02242500 beq _02242516 cmp r5, #0 bne _02242516 - bl ErrorHandling + bl GF_AssertFail _02242516: cmp r6, #3 bhi _022425EC @@ -43509,7 +43509,7 @@ _02242596: add sp, #8 pop {r4, r5, r6, pc} _022425EC: - bl ErrorHandling + bl GF_AssertFail _022425F0: add sp, #8 pop {r4, r5, r6, pc} @@ -43586,7 +43586,7 @@ MOD12_02242678: ; 0x02242678 add r6, r2, #0 cmp r4, #7 blo _0224268A - bl ErrorHandling + bl GF_AssertFail _0224268A: lsl r3, r4, #2 ldr r2, _022426A4 ; =MOD12_0224664C @@ -44869,7 +44869,7 @@ _022430EC: add r4, r2, r0 b _02243114 _0224310C: - bl ErrorHandling + bl GF_AssertFail add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} _02243114: @@ -44901,7 +44901,7 @@ _02243144: ldr r0, [sp, #0xc] cmp r0, #0xc ble _0224314E - bl ErrorHandling + bl GF_AssertFail _0224314E: mov r0, #0 str r0, [sp, #8] @@ -45562,7 +45562,7 @@ _02243628: str r0, [r4] b _02243638 _02243630: - bl ErrorHandling + bl GF_AssertFail add sp, #0x34 pop {r4, r5, r6, r7, pc} _02243638: @@ -47498,7 +47498,7 @@ _022444C4: blt _022444C4 b _022444D8 _022444D4: - bl ErrorHandling + bl GF_AssertFail _022444D8: ldr r0, _022444F0 ; =MOD12_022444F8 ldr r2, _022444F4 ; =0x00007530 diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index 65c14608..af35772e 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -101,7 +101,7 @@ _021D759E: blx r1 pop {r4, pc} _021D75AA: - bl ErrorHandling + bl GF_AssertFail mov r0, #1 pop {r4, pc} nop @@ -3418,7 +3418,7 @@ _021D90B0: str r0, [r5] pop {r3, r4, r5, pc} _021D90F2: - bl ErrorHandling + bl GF_AssertFail mov r0, #1 str r0, [r5] pop {r3, r4, r5, pc} @@ -7587,7 +7587,7 @@ MOD14_021DB220: ; 0x021DB220 ldr r0, [r5, r0] cmp r0, #0 bne _021DB2C8 - bl ErrorHandling + bl GF_AssertFail _021DB2C8: mov r0, #0x69 lsl r0, r0, #2 @@ -8399,7 +8399,7 @@ _021DB8B6: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _021DB8C6: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -10910,7 +10910,7 @@ _021DCB3A: str r0, [r1, #8] pop {r3, r4, r5, r6, r7, pc} _021DCB78: - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _021DCB7E: add r4, r4, #1 @@ -10919,7 +10919,7 @@ _021DCB7E: blo _021DCB3A pop {r3, r4, r5, r6, r7, pc} _021DCB88: - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} nop _021DCB90: .word MOD14_021E63D0 @@ -13475,7 +13475,7 @@ MOD14_021DDF30: ; 0x021DDF30 add r6, r2, #0 cmp r0, #0x20 blo _021DDF44 - bl ErrorHandling + bl GF_AssertFail _021DDF44: ldr r2, _021DDF60 ; =MOD14_021E6A0C mov r1, #0xc @@ -18957,7 +18957,7 @@ MOD14_021E0940: ; 0x021E0940 str r0, [r4] cmp r0, #0 bne _021E0A36 - bl ErrorHandling + bl GF_AssertFail _021E0A36: ldrh r1, [r4, #0x2c] ldr r0, [r4] @@ -19065,7 +19065,7 @@ MOD14_021E0A60: ; 0x021E0A60 str r0, [r4] cmp r0, #0 bne _021E0B28 - bl ErrorHandling + bl GF_AssertFail _021E0B28: ldrh r1, [r4, #0x2c] ldr r0, [r4] @@ -19744,7 +19744,7 @@ _021E0FE0: str r0, [r4, #0x3c] cmp r0, #0 bne _021E103E - bl ErrorHandling + bl GF_AssertFail _021E103E: ldr r0, [r4, #0x3c] mov r1, #0 @@ -19829,7 +19829,7 @@ _021E10D8: str r0, [r5, #0x4c] pop {r3, r4, r5, pc} _021E10EA: - bl ErrorHandling + bl GF_AssertFail _021E10EE: pop {r3, r4, r5, pc} .align 2, 0 @@ -22123,7 +22123,7 @@ _021E227C: str r0, [r4, #0x48] cmp r0, #0 bne _021E22B6 - bl ErrorHandling + bl GF_AssertFail _021E22B6: ldr r0, [r4, #0x48] mov r1, #0 @@ -24045,7 +24045,7 @@ MOD14_021E3158: ; 0x021E3158 add r5, r0, #0 cmp r4, #6 blo _021E3166 - bl ErrorHandling + bl GF_AssertFail _021E3166: mov r0, #0x34 add r5, #0x3c @@ -25586,7 +25586,7 @@ _021E3CC2: str r0, [r5, #0x54] cmp r0, #0 bne _021E3D14 - bl ErrorHandling + bl GF_AssertFail _021E3D14: sub r4, r4, #1 bpl _021E3D1A @@ -25799,7 +25799,7 @@ _021E3E58: str r0, [r4, #0x34] cmp r0, #0 bne _021E3E94 - bl ErrorHandling + bl GF_AssertFail _021E3E94: ldr r1, [sp, #0x14] add r0, r6, #0 @@ -26004,7 +26004,7 @@ MOD14_021E4010: ; 0x021E4010 ldrb r0, [r4, r0] cmp r0, #0 bne _021E4022 - bl ErrorHandling + bl GF_AssertFail _021E4022: ldr r0, _021E4034 ; =0x000001CB ldrb r1, [r4, r0] @@ -26026,7 +26026,7 @@ MOD14_021E4038: ; 0x021E4038 ldr r4, [sp, #0x20] cmp r7, #0 bne _021E404C - bl ErrorHandling + bl GF_AssertFail _021E404C: cmp r4, #0 beq _021E4052 @@ -30126,7 +30126,7 @@ _021E601A: strb r0, [r4] pop {r4, r5, r6, pc} _021E6032: - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} thumb_func_start MOD14_021E6038 diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index bd42feb3..3bc1378b 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -2745,7 +2745,7 @@ _021D8944: blt _021D8928 pop {r4, r5, r6, pc} _021D894E: - bl ErrorHandling + bl GF_AssertFail _021D8952: pop {r4, r5, r6, pc} .align 2, 0 @@ -5998,7 +5998,7 @@ _021DA310: ldr r0, _021DA3B0 ; =0x000003EE cmp r6, r0 blo _021DA31A - bl ErrorHandling + bl GF_AssertFail _021DA31A: ldr r0, [sp, #0x24] lsl r3, r7, #0x18 @@ -6077,7 +6077,7 @@ MOD15_021DA3B4: ; 0x021DA3B4 str r2, [sp, #0x14] cmp r0, r1 blo _021DA3CC - bl ErrorHandling + bl GF_AssertFail _021DA3CC: mov r0, #0xa str r0, [sp] @@ -6191,7 +6191,7 @@ _021DA4B6: lsl r0, r0, #4 cmp r5, r0 blo _021DA4C2 - bl ErrorHandling + bl GF_AssertFail _021DA4C2: ldrh r0, [r4, #2] add r1, r6, #0 @@ -8609,7 +8609,7 @@ MOD15_021DB774: ; 0x021DB774 add r5, r1, #0 cmp r4, #0x1b blo _021DB782 - bl ErrorHandling + bl GF_AssertFail _021DB782: mov r1, #0xa ldr r2, _021DB794 ; =0x021DBA4C @@ -8630,7 +8630,7 @@ MOD15_021DB798: ; 0x021DB798 add r6, r2, #0 cmp r5, #0x1b blo _021DB7A8 - bl ErrorHandling + bl GF_AssertFail _021DB7A8: mov r0, #0xa add r1, r5, #0 @@ -8652,7 +8652,7 @@ MOD15_021DB7C4: ; 0x021DB7C4 add r4, r0, #0 cmp r4, #0x1b blo _021DB7D0 - bl ErrorHandling + bl GF_AssertFail _021DB7D0: mov r0, #0xa add r1, r4, #0 @@ -8669,7 +8669,7 @@ MOD15_021DB7E0: ; 0x021DB7E0 add r4, r0, #0 cmp r4, #0x1b blo _021DB7EC - bl ErrorHandling + bl GF_AssertFail _021DB7EC: mov r0, #0xa add r1, r4, #0 @@ -8686,7 +8686,7 @@ MOD15_021DB7FC: ; 0x021DB7FC add r4, r0, #0 cmp r4, #0x1b blo _021DB808 - bl ErrorHandling + bl GF_AssertFail _021DB808: mov r0, #0xa add r1, r4, #0 @@ -8703,7 +8703,7 @@ MOD15_021DB818: ; 0x021DB818 add r4, r0, #0 cmp r4, #0x1b blo _021DB824 - bl ErrorHandling + bl GF_AssertFail _021DB824: mov r0, #0xa add r1, r4, #0 @@ -8720,7 +8720,7 @@ MOD15_021DB834: ; 0x021DB834 add r4, r0, #0 cmp r4, #0x1b blo _021DB840 - bl ErrorHandling + bl GF_AssertFail _021DB840: mov r0, #0xa add r1, r4, #0 @@ -8737,7 +8737,7 @@ MOD15_021DB850: ; 0x021DB850 add r4, r0, #0 cmp r4, #0x1b blo _021DB85C - bl ErrorHandling + bl GF_AssertFail _021DB85C: mov r0, #0xa add r1, r4, #0 diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 4588def6..2f05ad9a 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -23,7 +23,7 @@ MOD16_021D74E0: ; 0x021D74E0 bl OverlayManager_CreateAndGetData add r4, r0, #0 bne _021D750E - bl ErrorHandling + bl GF_AssertFail _021D750E: mov r0, #0 strb r0, [r4] @@ -45,7 +45,7 @@ _021D750E: bl FUN_0201CC24 cmp r0, #1 beq _021D7546 - bl ErrorHandling + bl GF_AssertFail _021D7546: mov r0, #0x25 bl MOD16_021D79FC @@ -161,7 +161,7 @@ MOD16_021D7614: ; 0x021D7614 bl FUN_0201CD04 cmp r0, #1 beq _021D7630 - bl ErrorHandling + bl GF_AssertFail _021D7630: bl MOD16_021D7A10 bl FUN_0201C29C @@ -245,7 +245,7 @@ MOD16_021D76AC: ; 0x021D76AC bl AllocFromHeap add r4, r0, #0 bne _021D76C2 - bl ErrorHandling + bl GF_AssertFail _021D76C2: ldr r2, _021D77D0 ; =0x00001D10 add r0, r4, #0 @@ -391,7 +391,7 @@ MOD16_021D7804: ; 0x021D7804 push {r4, lr} add r4, r0, #0 bne _021D780E - bl ErrorHandling + bl GF_AssertFail _021D780E: add r0, r4, #0 add r0, #0xc @@ -638,7 +638,7 @@ MOD16_021D7A38: ; 0x021D7A38 push {r4, lr} add r4, r0, #0 bne _021D7A42 - bl ErrorHandling + bl GF_AssertFail _021D7A42: mov r0, #0x1d lsl r0, r0, #8 @@ -652,7 +652,7 @@ MOD16_021D7A4C: ; 0x021D7A4C push {r4, lr} add r4, r0, #0 bne _021D7A56 - bl ErrorHandling + bl GF_AssertFail _021D7A56: ldr r0, _021D7A5C ; =0x00001D04 ldr r0, [r4, r0] @@ -666,7 +666,7 @@ MOD16_021D7A60: ; 0x021D7A60 push {r4, lr} add r4, r0, #0 bne _021D7A6A - bl ErrorHandling + bl GF_AssertFail _021D7A6A: ldr r0, _021D7A70 ; =0x00001D08 ldr r0, [r4, r0] @@ -680,7 +680,7 @@ MOD16_021D7A74: ; 0x021D7A74 push {r4, lr} add r4, r0, #0 bne _021D7A7E - bl ErrorHandling + bl GF_AssertFail _021D7A7E: ldr r0, _021D7A84 ; =0x00001D0C ldr r0, [r4, r0] @@ -694,7 +694,7 @@ MOD16_021D7A88: ; 0x021D7A88 push {r4, lr} add r4, r0, #0 bne _021D7A92 - bl ErrorHandling + bl GF_AssertFail _021D7A92: ldr r0, _021D7A98 ; =0x00001A0C ldr r0, [r4, r0] @@ -708,7 +708,7 @@ MOD16_021D7A9C: ; 0x021D7A9C push {r4, lr} add r4, r0, #0 bne _021D7AA6 - bl ErrorHandling + bl GF_AssertFail _021D7AA6: ldr r0, _021D7AAC ; =0x00001A10 ldr r0, [r4, r0] @@ -722,7 +722,7 @@ MOD16_021D7AB0: ; 0x021D7AB0 push {r4, lr} add r4, r0, #0 bne _021D7ABA - bl ErrorHandling + bl GF_AssertFail _021D7ABA: ldr r0, _021D7AC0 ; =0x00001A14 ldr r0, [r4, r0] @@ -736,7 +736,7 @@ MOD16_021D7AC4: ; 0x021D7AC4 push {r4, lr} add r4, r0, #0 bne _021D7ACE - bl ErrorHandling + bl GF_AssertFail _021D7ACE: ldr r0, _021D7AD4 ; =0x00001A18 ldr r0, [r4, r0] @@ -750,7 +750,7 @@ MOD16_021D7AD8: ; 0x021D7AD8 push {r4, lr} add r4, r0, #0 bne _021D7AE2 - bl ErrorHandling + bl GF_AssertFail _021D7AE2: ldr r0, _021D7AE8 ; =0x000019FC add r0, r4, r0 @@ -764,7 +764,7 @@ MOD16_021D7AEC: ; 0x021D7AEC push {r4, lr} add r4, r0, #0 bne _021D7AF6 - bl ErrorHandling + bl GF_AssertFail _021D7AF6: mov r0, #0x1a lsl r0, r0, #8 @@ -778,7 +778,7 @@ MOD16_021D7B00: ; 0x021D7B00 push {r4, lr} add r4, r0, #0 bne _021D7B0A - bl ErrorHandling + bl GF_AssertFail _021D7B0A: ldr r0, _021D7B10 ; =0x00001A04 add r0, r4, r0 @@ -792,7 +792,7 @@ MOD16_021D7B14: ; 0x021D7B14 push {r4, lr} add r4, r0, #0 bne _021D7B1E - bl ErrorHandling + bl GF_AssertFail _021D7B1E: ldr r0, _021D7B24 ; =0x00001A08 add r0, r4, r0 @@ -806,7 +806,7 @@ MOD16_021D7B28: ; 0x021D7B28 push {r4, lr} add r4, r0, #0 bne _021D7B32 - bl ErrorHandling + bl GF_AssertFail _021D7B32: add r0, r4, #0 pop {r4, pc} @@ -818,7 +818,7 @@ MOD16_021D7B38: ; 0x021D7B38 push {r4, lr} add r4, r0, #0 bne _021D7B42 - bl ErrorHandling + bl GF_AssertFail _021D7B42: add r4, #0xc add r0, r4, #0 @@ -830,7 +830,7 @@ MOD16_021D7B48: ; 0x021D7B48 push {r4, lr} add r4, r0, #0 bne _021D7B52 - bl ErrorHandling + bl GF_AssertFail _021D7B52: ldr r0, _021D7B58 ; =0x0000177C add r0, r4, r0 @@ -846,7 +846,7 @@ MOD16_021D7B5C: ; 0x021D7B5C add r5, r0, #0 cmp r4, #0xa blt _021D7B6A - bl ErrorHandling + bl GF_AssertFail _021D7B6A: ldr r0, _021D7B78 ; =0x00001A30 add r1, r5, r0 @@ -865,7 +865,7 @@ MOD16_021D7B7C: ; 0x021D7B7C add r5, r0, #0 cmp r4, #8 blt _021D7B8A - bl ErrorHandling + bl GF_AssertFail _021D7B8A: mov r0, #0x6f lsl r0, r0, #6 @@ -1265,7 +1265,7 @@ MOD16_021D7E68: ; 0x021D7E68 add r7, r0, #0 cmp r7, #0 bgt _021D7E82 - bl ErrorHandling + bl GF_AssertFail _021D7E82: add r0, r4, #0 mov r1, #0xf @@ -1820,7 +1820,7 @@ MOD16_021D8298: ; 0x021D8298 ldr r0, [r6, r0] cmp r0, #0 bne _021D82B0 - bl ErrorHandling + bl GF_AssertFail _021D82B0: ldr r0, _021D83D8 ; =0x00001A0C ldr r0, [r6, r0] @@ -1829,7 +1829,7 @@ _021D82B0: ldr r0, [r6, r0] cmp r0, #0 bne _021D82C4 - bl ErrorHandling + bl GF_AssertFail _021D82C4: ldr r0, _021D83DC ; =0x00001A10 ldr r0, [r6, r0] @@ -1838,7 +1838,7 @@ _021D82C4: ldr r0, [r6, r0] cmp r0, #0 bne _021D82D8 - bl ErrorHandling + bl GF_AssertFail _021D82D8: ldr r0, _021D83E0 ; =0x00001A14 ldr r0, [r6, r0] @@ -1847,7 +1847,7 @@ _021D82D8: ldr r0, [r6, r0] cmp r0, #0 bne _021D82EC - bl ErrorHandling + bl GF_AssertFail _021D82EC: ldr r0, _021D83E4 ; =0x00001A18 ldr r0, [r6, r0] @@ -1857,7 +1857,7 @@ _021D82EC: ldr r0, [r6, r0] cmp r0, #0 bne _021D8302 - bl ErrorHandling + bl GF_AssertFail _021D8302: mov r0, #0x1d lsl r0, r0, #8 @@ -1867,7 +1867,7 @@ _021D8302: ldr r0, [r6, r0] cmp r0, #0 bne _021D8318 - bl ErrorHandling + bl GF_AssertFail _021D8318: ldr r0, _021D83E8 ; =0x00001D04 ldr r0, [r6, r0] @@ -1876,7 +1876,7 @@ _021D8318: ldr r0, [r6, r0] cmp r0, #0 bne _021D832C - bl ErrorHandling + bl GF_AssertFail _021D832C: ldr r0, _021D83EC ; =0x00001D08 ldr r0, [r6, r0] @@ -1885,7 +1885,7 @@ _021D832C: ldr r0, [r6, r0] cmp r0, #0 bne _021D8340 - bl ErrorHandling + bl GF_AssertFail _021D8340: ldr r0, _021D83F0 ; =0x00001D0C ldr r0, [r6, r0] @@ -2534,7 +2534,7 @@ MOD16_021D8838: ; 0x021D8838 ldr r0, [r4, r0] cmp r0, #0 bne _021D884A - bl ErrorHandling + bl GF_AssertFail _021D884A: mov r0, #0x6d lsl r0, r0, #2 @@ -2552,7 +2552,7 @@ MOD16_021D8854: ; 0x021D8854 ldr r0, [r4, r0] cmp r0, #0 bne _021D8866 - bl ErrorHandling + bl GF_AssertFail _021D8866: mov r0, #0x6e lsl r0, r0, #2 @@ -2624,7 +2624,7 @@ MOD16_021D88D4: ; 0x021D88D4 add r4, r0, #0 cmp r5, #3 ble _021D88E2 - bl ErrorHandling + bl GF_AssertFail _021D88E2: lsl r0, r5, #2 add r1, r4, r0 @@ -4618,7 +4618,7 @@ _021D97EE: bl MOD16_021D9CB0 cmp r0, #0 bne _021D980C - bl ErrorHandling + bl GF_AssertFail _021D980C: ldr r1, [r4, #0x1c] add r0, r5, #0 @@ -4728,7 +4728,7 @@ MOD16_021D98EC: ; 0x021D98EC add r5, r0, #0 cmp r4, #0x1c blt _021D98FA - bl ErrorHandling + bl GF_AssertFail _021D98FA: ldr r0, [r5] add r1, r4, #0 @@ -4743,7 +4743,7 @@ MOD16_021D9904: ; 0x021D9904 add r5, r0, #0 cmp r4, #2 blt _021D9912 - bl ErrorHandling + bl GF_AssertFail _021D9912: ldr r0, [r5] add r1, r4, #0 @@ -4758,7 +4758,7 @@ MOD16_021D991C: ; 0x021D991C add r5, r0, #0 cmp r4, #2 blt _021D992A - bl ErrorHandling + bl GF_AssertFail _021D992A: ldr r0, [r5] add r1, r4, #0 @@ -4773,7 +4773,7 @@ MOD16_021D9934: ; 0x021D9934 add r5, r0, #0 cmp r4, #3 blt _021D9942 - bl ErrorHandling + bl GF_AssertFail _021D9942: ldr r0, [r5] add r1, r4, #0 @@ -4788,7 +4788,7 @@ MOD16_021D994C: ; 0x021D994C add r5, r0, #0 cmp r4, #3 blt _021D995A - bl ErrorHandling + bl GF_AssertFail _021D995A: ldr r0, [r5] add r1, r4, #0 @@ -5012,7 +5012,7 @@ MOD16_021D9A90: ; 0x021D9A90 bl AllocFromHeapAtEnd add r6, r0, #0 bne _021D9AAE - bl ErrorHandling + bl GF_AssertFail _021D9AAE: ldr r2, _021D9CA8 ; =0x000003DA add r0, r6, #0 @@ -5025,7 +5025,7 @@ _021D9AAE: bl AllocFromHeapAtEnd add r4, r0, #0 bne _021D9ACC - bl ErrorHandling + bl GF_AssertFail _021D9ACC: ldr r2, _021D9CA8 ; =0x000003DA add r0, r4, #0 @@ -6017,7 +6017,7 @@ MOD16_021DA184: ; 0x021DA184 add r4, r2, #0 cmp r5, #0x2f blt _021DA196 - bl ErrorHandling + bl GF_AssertFail _021DA196: mov r2, #0 add r5, #0xb @@ -6095,7 +6095,7 @@ _021DA216: add r6, r0, #0 b _021DA226 _021DA222: - bl ErrorHandling + bl GF_AssertFail _021DA226: cmp r6, #0 beq _021DA24E @@ -6214,7 +6214,7 @@ _021DA2FA: add r4, r0, #0 b _021DA30A _021DA306: - bl ErrorHandling + bl GF_AssertFail _021DA30A: cmp r4, #0 beq _021DA332 @@ -6389,7 +6389,7 @@ _021DA44E: add r4, r0, #0 b _021DA45E _021DA45A: - bl ErrorHandling + bl GF_AssertFail _021DA45E: cmp r4, #0 beq _021DA486 @@ -6543,7 +6543,7 @@ _021DA578: add r4, r0, #0 b _021DA588 _021DA584: - bl ErrorHandling + bl GF_AssertFail _021DA588: cmp r4, #0 beq _021DA5B0 @@ -6618,7 +6618,7 @@ MOD16_021DA5FC: ; 0x021DA5FC bl AllocFromHeap add r4, r0, #0 bne _021DA60E - bl ErrorHandling + bl GF_AssertFail _021DA60E: add r0, r4, #0 mov r1, #0 @@ -6639,17 +6639,17 @@ MOD16_021DA624: ; 0x021DA624 add r4, r1, #0 cmp r5, #0 bne _021DA632 - bl ErrorHandling + bl GF_AssertFail _021DA632: cmp r4, #0 bne _021DA63A - bl ErrorHandling + bl GF_AssertFail _021DA63A: add r0, r5, #0 bl MOD16_021DA7C4 cmp r0, #0 bne _021DA648 - bl ErrorHandling + bl GF_AssertFail _021DA648: ldr r0, [r4] str r0, [r5] @@ -6694,7 +6694,7 @@ MOD16_021DA694: ; 0x021DA694 push {r4, lr} add r4, r0, #0 bne _021DA69E - bl ErrorHandling + bl GF_AssertFail _021DA69E: ldr r0, [r4, #8] cmp r0, #5 @@ -6757,7 +6757,7 @@ _021DA70E: mov r0, #1 pop {r4, pc} _021DA712: - bl ErrorHandling + bl GF_AssertFail _021DA716: mov r0, #0 pop {r4, pc} @@ -6770,7 +6770,7 @@ MOD16_021DA71C: ; 0x021DA71C sub sp, #4 add r4, r0, #0 bne _021DA728 - bl ErrorHandling + bl GF_AssertFail _021DA728: ldr r0, [r4, #8] cmp r0, #5 @@ -6838,7 +6838,7 @@ _021DA7A0: mov r0, #1 pop {r3, r4, pc} _021DA7A6: - bl ErrorHandling + bl GF_AssertFail _021DA7AA: mov r0, #0 add sp, #4 @@ -6856,7 +6856,7 @@ MOD16_021DA7B4: ; 0x021DA7B4 push {r4, lr} add r4, r0, #0 bne _021DA7BE - bl ErrorHandling + bl GF_AssertFail _021DA7BE: mov r0, #1 str r0, [r4, #0x18] @@ -6868,7 +6868,7 @@ MOD16_021DA7C4: ; 0x021DA7C4 push {r4, lr} add r4, r0, #0 bne _021DA7CE - bl ErrorHandling + bl GF_AssertFail _021DA7CE: ldr r0, [r4, #8] cmp r0, #5 @@ -6885,7 +6885,7 @@ MOD16_021DA7DC: ; 0x021DA7DC push {r4, lr} add r4, r0, #0 bne _021DA7E6 - bl ErrorHandling + bl GF_AssertFail _021DA7E6: ldr r0, [r4, #8] cmp r0, #2 @@ -6923,11 +6923,11 @@ MOD16_021DA808: ; 0x021DA808 add r6, r2, #0 cmp r5, #0 bne _021DA818 - bl ErrorHandling + bl GF_AssertFail _021DA818: cmp r4, #0 bne _021DA820 - bl ErrorHandling + bl GF_AssertFail _021DA820: add r0, r4, #0 add r1, r6, #0 @@ -6944,16 +6944,16 @@ MOD16_021DA828: ; 0x021DA828 add r7, r3, #0 cmp r5, #0 bne _021DA83A - bl ErrorHandling + bl GF_AssertFail _021DA83A: cmp r4, #0 bne _021DA842 - bl ErrorHandling + bl GF_AssertFail _021DA842: ldr r0, [sp, #0x18] cmp r0, #0 bne _021DA84C - bl ErrorHandling + bl GF_AssertFail _021DA84C: ldr r3, [sp, #0x18] add r0, r6, #0 @@ -6970,7 +6970,7 @@ MOD16_021DA858: ; 0x021DA858 bl AllocFromHeap add r4, r0, #0 bne _021DA868 - bl ErrorHandling + bl GF_AssertFail _021DA868: mov r0, #0 strb r0, [r4] @@ -6998,7 +6998,7 @@ MOD16_021DA888: ; 0x021DA888 add r6, r2, #0 cmp r5, #0 bne _021DA898 - bl ErrorHandling + bl GF_AssertFail _021DA898: str r4, [r5] str r6, [r5, #4] @@ -7013,7 +7013,7 @@ MOD16_021DA8A0: ; 0x021DA8A0 add r5, r1, #0 cmp r4, #0 bne _021DA8AE - bl ErrorHandling + bl GF_AssertFail _021DA8AE: add r0, r4, #0 bl MOD16_021DA908 @@ -7052,7 +7052,7 @@ MOD16_021DA8F0: ; 0x021DA8F0 push {r4, lr} add r4, r0, #0 bne _021DA8FA - bl ErrorHandling + bl GF_AssertFail _021DA8FA: ldr r0, [r4, #8] cmp r0, #0 @@ -7091,7 +7091,7 @@ _021DA928: ldr r0, [r5] cmp r0, #0 bne _021DA932 - bl ErrorHandling + bl GF_AssertFail _021DA932: ldr r0, [r5] ldr r1, [r0, r4] @@ -7175,7 +7175,7 @@ _021DA9AE: mov r0, #1 pop {r4, pc} _021DA9BC: - bl ErrorHandling + bl GF_AssertFail _021DA9C0: mov r0, #0 pop {r4, pc} @@ -7245,7 +7245,7 @@ _021DAA3A: add sp, #0x10 pop {r3, r4, r5, pc} _021DAA44: - bl ErrorHandling + bl GF_AssertFail _021DAA48: mov r0, #0 add sp, #0x10 @@ -7397,7 +7397,7 @@ _021DAB5E: mov r0, #1 pop {r3, r4, r5, pc} _021DAB68: - bl ErrorHandling + bl GF_AssertFail _021DAB6C: mov r0, #0 add sp, #0x10 @@ -7511,7 +7511,7 @@ _021DAC2E: mov r0, #1 pop {r3, r4, r5, pc} _021DAC38: - bl ErrorHandling + bl GF_AssertFail _021DAC3C: mov r0, #0 add sp, #8 @@ -7557,7 +7557,7 @@ MOD16_021DAC7C: ; 0x021DAC7C ldr r0, [r4, #0x10] cmp r0, #0 bne _021DAC8A - bl ErrorHandling + bl GF_AssertFail _021DAC8A: ldr r0, [r4, #0x10] bl FreeToHeap @@ -7579,7 +7579,7 @@ MOD16_021DAC98: ; 0x021DAC98 bl AllocFromHeap add r4, r0, #0 bne _021DACB2 - bl ErrorHandling + bl GF_AssertFail _021DACB2: add r0, r4, #0 mov r1, #0 @@ -7638,7 +7638,7 @@ MOD16_021DAD20: ; 0x021DAD20 bl AllocFromHeap add r4, r0, #0 bne _021DAD3A - bl ErrorHandling + bl GF_AssertFail _021DAD3A: add r2, r4, #0 mov r1, #0x14 @@ -7681,7 +7681,7 @@ MOD16_021DAD78: ; 0x021DAD78 bl AllocFromHeap add r4, r0, #0 bne _021DAD92 - bl ErrorHandling + bl GF_AssertFail _021DAD92: add r0, r4, #0 mov r1, #0 @@ -7745,7 +7745,7 @@ MOD16_021DAE0C: ; 0x021DAE0C bl AllocFromHeap add r4, r0, #0 bne _021DAE26 - bl ErrorHandling + bl GF_AssertFail _021DAE26: add r0, r4, #0 mov r1, #0 @@ -7805,7 +7805,7 @@ MOD16_021DAE94: ; 0x021DAE94 bl AllocFromHeap add r4, r0, #0 bne _021DAEB0 - bl ErrorHandling + bl GF_AssertFail _021DAEB0: add r0, r6, #0 mov r1, #0 @@ -7835,7 +7835,7 @@ MOD16_021DAED4: ; 0x021DAED4 bl AllocFromHeap add r4, r0, #0 bne _021DAEEE - bl ErrorHandling + bl GF_AssertFail _021DAEEE: add r2, r4, #0 mov r1, #0x18 @@ -7883,7 +7883,7 @@ MOD16_021DAF38: ; 0x021DAF38 bl AllocFromHeap add r4, r0, #0 bne _021DAF52 - bl ErrorHandling + bl GF_AssertFail _021DAF52: add r2, r4, #0 mov r1, #0x18 @@ -7931,7 +7931,7 @@ MOD16_021DAF9C: ; 0x021DAF9C bl AllocFromHeap add r4, r0, #0 bne _021DAFB6 - bl ErrorHandling + bl GF_AssertFail _021DAFB6: add r2, r4, #0 mov r1, #0x18 @@ -7979,7 +7979,7 @@ MOD16_021DB000: ; 0x021DB000 bl AllocFromHeap add r4, r0, #0 bne _021DB01A - bl ErrorHandling + bl GF_AssertFail _021DB01A: mov r0, #0 strb r0, [r4] @@ -8022,7 +8022,7 @@ MOD16_021DB058: ; 0x021DB058 bl AllocFromHeap add r4, r0, #0 bne _021DB072 - bl ErrorHandling + bl GF_AssertFail _021DB072: mov r0, #0 strb r0, [r4] @@ -8065,7 +8065,7 @@ MOD16_021DB0B0: ; 0x021DB0B0 bl AllocFromHeap add r4, r0, #0 bne _021DB0CA - bl ErrorHandling + bl GF_AssertFail _021DB0CA: add r2, r4, #0 mov r1, #0x18 @@ -8113,7 +8113,7 @@ MOD16_021DB114: ; 0x021DB114 bl AllocFromHeap add r4, r0, #0 bne _021DB12E - bl ErrorHandling + bl GF_AssertFail _021DB12E: mov r0, #0 strb r0, [r4] @@ -8156,7 +8156,7 @@ MOD16_021DB16C: ; 0x021DB16C bl AllocFromHeap add r4, r0, #0 bne _021DB186 - bl ErrorHandling + bl GF_AssertFail _021DB186: add r2, r4, #0 mov r1, #0x18 @@ -8204,7 +8204,7 @@ MOD16_021DB1D0: ; 0x021DB1D0 bl AllocFromHeap add r4, r0, #0 bne _021DB1EA - bl ErrorHandling + bl GF_AssertFail _021DB1EA: mov r0, #0 strb r0, [r4] @@ -8244,7 +8244,7 @@ MOD16_021DB228: ; 0x021DB228 bl AllocFromHeap add r4, r0, #0 bne _021DB23C - bl ErrorHandling + bl GF_AssertFail _021DB23C: add r2, r4, #0 mov r1, #0x18 @@ -8265,7 +8265,7 @@ _021DB242: str r0, [r4, #0xc] cmp r0, #0 bne _021DB268 - bl ErrorHandling + bl GF_AssertFail _021DB268: ldr r2, [r5, #8] ldr r0, [r4, #0xc] @@ -8289,7 +8289,7 @@ MOD16_021DB288: ; 0x021DB288 push {r4, lr} add r4, r0, #0 bne _021DB292 - bl ErrorHandling + bl GF_AssertFail _021DB292: add r0, r4, #0 bl MOD16_021DB358 @@ -8335,7 +8335,7 @@ MOD16_021DB2D4: ; 0x021DB2D4 bl MOD16_021DB460 add r4, r0, #0 bne _021DB2EA - bl ErrorHandling + bl GF_AssertFail _021DB2EA: ldr r2, [r5, #0x20] add r0, r6, #0 @@ -8473,7 +8473,7 @@ MOD16_021DB3C8: ; 0x021DB3C8 bl NewMsgDataFromNarc add r5, r0, #0 bne _021DB3E4 - bl ErrorHandling + bl GF_AssertFail _021DB3E4: add r0, r5, #0 add r1, r4, #0 @@ -8649,7 +8649,7 @@ _021DB4FC: cmp r4, r0 blt _021DB50A _021DB506: - bl ErrorHandling + bl GF_AssertFail _021DB50A: str r4, [r5, #0xc] pop {r3, r4, r5, pc} @@ -8660,7 +8660,7 @@ _021DB50E: cmp r4, r0 blt _021DB51C _021DB518: - bl ErrorHandling + bl GF_AssertFail _021DB51C: str r4, [r5, #0x10] pop {r3, r4, r5, pc} @@ -8805,7 +8805,7 @@ MOD16_021DB5EC: ; 0x021DB5EC beq _021DB602 cmp r4, #1 beq _021DB602 - bl ErrorHandling + bl GF_AssertFail _021DB602: ldr r0, [r5, #0xc] mov r1, #0x1c @@ -8852,7 +8852,7 @@ MOD16_021DB63C: ; 0x021DB63C beq _021DB652 cmp r4, #1 beq _021DB652 - bl ErrorHandling + bl GF_AssertFail _021DB652: ldr r0, [r5, #0x10] mov r1, #0x1c @@ -9655,7 +9655,7 @@ _021DBBA0: mov r4, #0x2f b _021DBBA8 _021DBBA4: - bl ErrorHandling + bl GF_AssertFail _021DBBA8: add r0, r4, #0 pop {r4, pc} @@ -9767,7 +9767,7 @@ MOD16_021DBC48: ; 0x021DBC48 bne _021DBC74 cmp r4, #1 blt _021DBC6C - bl ErrorHandling + bl GF_AssertFail _021DBC6C: add r0, r5, r4 str r0, [sp, #4] @@ -9781,7 +9781,7 @@ _021DBC6C: _021DBC74: cmp r4, #1 blt _021DBC7C - bl ErrorHandling + bl GF_AssertFail _021DBC7C: ldr r0, [sp, #4] ldr r1, [sp, #0xc] @@ -9851,7 +9851,7 @@ MOD16_021DBCE0: ; 0x021DBCE0 str r0, [r5] cmp r0, #6 blt _021DBCFA - bl ErrorHandling + bl GF_AssertFail _021DBCFA: add r0, r7, #0 bl GetMeisterSpeciesIdx @@ -9859,7 +9859,7 @@ _021DBCFA: ldr r5, [r5] cmp r5, #6 blt _021DBD0C - bl ErrorHandling + bl GF_AssertFail _021DBD0C: cmp r5, #1 bne _021DBD12 @@ -9878,7 +9878,7 @@ _021DBD22: _021DBD24: cmp r0, #0 bne _021DBD2C - bl ErrorHandling + bl GF_AssertFail _021DBD2C: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -9972,12 +9972,12 @@ MOD16_021DBDC0: ; 0x021DBDC0 push {r4, lr} add r4, r0, #0 bne _021DBDCA - bl ErrorHandling + bl GF_AssertFail _021DBDCA: ldr r0, [r4] cmp r0, #0 bne _021DBDD4 - bl ErrorHandling + bl GF_AssertFail _021DBDD4: ldr r0, [r4] bl FreeToHeap @@ -10059,7 +10059,7 @@ MOD16_021DBE3C: ; 0x021DBE3C add r0, r1, r0 cmp r0, r2 blt _021DBE54 - bl ErrorHandling + bl GF_AssertFail _021DBE54: ldrb r1, [r4] ldrb r0, [r4, #2] @@ -10067,7 +10067,7 @@ _021DBE54: ldr r0, [sp, #4] cmp r1, r0 blt _021DBE64 - bl ErrorHandling + bl GF_AssertFail _021DBE64: ldrb r7, [r4, #1] ldrb r0, [r4, #3] @@ -10154,7 +10154,7 @@ _021DBEF2: ldr r0, [r0, r7] cmp r0, #0 bne _021DBF00 - bl ErrorHandling + bl GF_AssertFail _021DBF00: mov r1, #0 cmp r4, #0 @@ -10282,13 +10282,13 @@ _021DBFE0: ldr r0, [r0, r6] cmp r0, #0 bne _021DBFEC - bl ErrorHandling + bl GF_AssertFail _021DBFEC: ldr r1, [sp, #0x10] ldr r0, [sp, #0x14] cmp r1, r0 blt _021DBFF8 - bl ErrorHandling + bl GF_AssertFail _021DBFF8: mov r1, #0 cmp r4, #0 @@ -10442,7 +10442,7 @@ MOD16_021DC10C: ; 0x021DC10C bl AllocFromHeap add r4, r0, #0 bne _021DC11E - bl ErrorHandling + bl GF_AssertFail _021DC11E: add r0, r4, #0 mov r1, #0 @@ -10469,7 +10469,7 @@ MOD16_021DC148: ; 0x021DC148 push {r4, lr} add r4, r0, #0 bne _021DC152 - bl ErrorHandling + bl GF_AssertFail _021DC152: add r0, r4, #0 bl FreeToHeap @@ -10485,7 +10485,7 @@ MOD16_021DC15C: ; 0x021DC15C bl AllocFromHeap add r4, r0, #0 bne _021DC16E - bl ErrorHandling + bl GF_AssertFail _021DC16E: mov r0, #0 strb r0, [r4] @@ -10504,7 +10504,7 @@ MOD16_021DC184: ; 0x021DC184 push {r4, lr} add r4, r0, #0 bne _021DC18E - bl ErrorHandling + bl GF_AssertFail _021DC18E: add r0, r4, #0 bl FreeToHeap @@ -10562,7 +10562,7 @@ MOD16_021DC1F8: ; 0x021DC1F8 push {r4, lr} add r4, r0, #0 bne _021DC202 - bl ErrorHandling + bl GF_AssertFail _021DC202: add r0, r4, #0 bl MOD16_021DAC7C @@ -10600,7 +10600,7 @@ MOD16_021DC234: ; 0x021DC234 str r0, [r5, #8] cmp r0, #0 bne _021DC24C - bl ErrorHandling + bl GF_AssertFail _021DC24C: ldr r0, [r5, #8] mov r1, #0 @@ -10698,7 +10698,7 @@ _021DC2E8: bl AllocFromHeap add r7, r0, #0 bne _021DC2FA - bl ErrorHandling + bl GF_AssertFail _021DC2FA: str r7, [r4, #8] add r0, r7, #0 @@ -10782,7 +10782,7 @@ _021DC388: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _021DC39C: - bl ErrorHandling + bl GF_AssertFail _021DC3A0: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -10933,7 +10933,7 @@ _021DC4C2: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _021DC4C6: - bl ErrorHandling + bl GF_AssertFail _021DC4CA: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -12746,7 +12746,7 @@ MOD16_021DD2F4: ; 0x021DD2F4 str r0, [sp] cmp r0, #0 bne _021DD312 - bl ErrorHandling + bl GF_AssertFail _021DD312: mov r0, #0x15 lsl r0, r0, #4 @@ -14019,7 +14019,7 @@ MOD16_021DDCA4: ; 0x021DDCA4 bl AllocFromHeap add r4, r0, #0 bne _021DDCB8 - bl ErrorHandling + bl GF_AssertFail _021DDCB8: add r0, r4, #0 mov r1, #0 @@ -14055,7 +14055,7 @@ MOD16_021DDCEC: ; 0x021DDCEC bl AllocFromHeap add r4, r0, #0 bne _021DDCFE - bl ErrorHandling + bl GF_AssertFail _021DDCFE: mov r0, #0 strb r0, [r4] @@ -14083,7 +14083,7 @@ MOD16_021DDD14: ; 0x021DDD14 bl AllocFromHeap add r4, r0, #0 bne _021DDD34 - bl ErrorHandling + bl GF_AssertFail _021DDD34: add r0, r4, #0 mov r1, #0 @@ -14104,7 +14104,7 @@ MOD16_021DDD50: ; 0x021DDD50 push {r4, lr} add r4, r0, #0 bne _021DDD5A - bl ErrorHandling + bl GF_AssertFail _021DDD5A: add r0, r4, #0 bl FreeToHeap @@ -14117,7 +14117,7 @@ MOD16_021DDD64: ; 0x021DDD64 push {r4, lr} add r4, r0, #0 bne _021DDD6E - bl ErrorHandling + bl GF_AssertFail _021DDD6E: add r0, r4, #0 bl FreeToHeap @@ -14130,7 +14130,7 @@ MOD16_021DDD78: ; 0x021DDD78 push {r4, lr} add r4, r0, #0 bne _021DDD82 - bl ErrorHandling + bl GF_AssertFail _021DDD82: add r0, r4, #0 bl MOD16_021DAC7C @@ -14156,7 +14156,7 @@ MOD16_021DDD94: ; 0x021DDD94 str r0, [r5, #8] cmp r0, #0 bne _021DDDAC - bl ErrorHandling + bl GF_AssertFail _021DDDAC: ldr r0, [r5, #8] mov r1, #0 @@ -14266,7 +14266,7 @@ _021DDE60: str r0, [r4, #8] cmp r0, #0 bne _021DDE72 - bl ErrorHandling + bl GF_AssertFail _021DDE72: ldr r0, [r4, #8] mov r1, #0 @@ -15179,7 +15179,7 @@ MOD16_021DE594: ; 0x021DE594 ldr r4, [r1] cmp r0, #0 bne _021DE5AA - bl ErrorHandling + bl GF_AssertFail _021DE5AA: mov r0, #0x51 lsl r0, r0, #2 @@ -15981,7 +15981,7 @@ MOD16_021DEBA4: ; 0x021DEBA4 ldr r4, [r0] cmp r5, #4 blt _021DEBB2 - bl ErrorHandling + bl GF_AssertFail _021DEBB2: str r5, [r4, #0xc] pop {r3, r4, r5, pc} @@ -16003,7 +16003,7 @@ MOD16_021DEBC0: ; 0x021DEBC0 ldr r4, [r0] cmp r5, #6 blt _021DEBCE - bl ErrorHandling + bl GF_AssertFail _021DEBCE: str r5, [r4, #0x10] pop {r3, r4, r5, pc} @@ -16025,7 +16025,7 @@ MOD16_021DEBDC: ; 0x021DEBDC ldr r4, [r0] cmp r5, #0xa blt _021DEBEA - bl ErrorHandling + bl GF_AssertFail _021DEBEA: str r5, [r4, #0x14] pop {r3, r4, r5, pc} @@ -16048,7 +16048,7 @@ MOD16_021DEBF8: ; 0x021DEBF8 ldr r4, [r0] cmp r5, #0x12 blt _021DEC08 - bl ErrorHandling + bl GF_AssertFail _021DEC08: cmp r6, #0 bne _021DEC10 @@ -16079,7 +16079,7 @@ MOD16_021DEC24: ; 0x021DEC24 ldr r4, [r0] cmp r5, #0xf blt _021DEC32 - bl ErrorHandling + bl GF_AssertFail _021DEC32: str r5, [r4, #0x20] pop {r3, r4, r5, pc} @@ -16136,7 +16136,7 @@ MOD16_021DEC64: ; 0x021DEC64 bl AllocFromHeap add r4, r0, #0 bne _021DEC76 - bl ErrorHandling + bl GF_AssertFail _021DEC76: add r0, r4, #0 mov r1, #0 @@ -16165,7 +16165,7 @@ MOD16_021DECA0: ; 0x021DECA0 bl AllocFromHeap add r4, r0, #0 bne _021DECB2 - bl ErrorHandling + bl GF_AssertFail _021DECB2: mov r0, #0 strb r0, [r4] @@ -16193,7 +16193,7 @@ MOD16_021DECC8: ; 0x021DECC8 bl AllocFromHeap add r4, r0, #0 bne _021DECE8 - bl ErrorHandling + bl GF_AssertFail _021DECE8: add r0, r4, #0 mov r1, #0 @@ -16214,7 +16214,7 @@ MOD16_021DED04: ; 0x021DED04 push {r4, lr} add r4, r0, #0 bne _021DED0E - bl ErrorHandling + bl GF_AssertFail _021DED0E: add r0, r4, #0 bl FreeToHeap @@ -16227,7 +16227,7 @@ MOD16_021DED18: ; 0x021DED18 push {r4, lr} add r4, r0, #0 bne _021DED22 - bl ErrorHandling + bl GF_AssertFail _021DED22: add r0, r4, #0 bl FreeToHeap @@ -16240,7 +16240,7 @@ MOD16_021DED2C: ; 0x021DED2C push {r4, lr} add r4, r0, #0 bne _021DED36 - bl ErrorHandling + bl GF_AssertFail _021DED36: add r0, r4, #0 bl MOD16_021DAC7C @@ -16265,7 +16265,7 @@ MOD16_021DED48: ; 0x021DED48 bl AllocFromHeap add r6, r0, #0 bne _021DED5E - bl ErrorHandling + bl GF_AssertFail _021DED5E: mov r0, #0 strb r0, [r6] @@ -16435,7 +16435,7 @@ _021DEE84: str r0, [r5] b _021DEE9A _021DEE96: - bl ErrorHandling + bl GF_AssertFail _021DEE9A: mov r0, #0 add sp, #0x14 @@ -18023,7 +18023,7 @@ MOD16_021DFAA0: ; 0x021DFAA0 bl AllocFromHeap add r4, r0, #0 bne _021DFAB2 - bl ErrorHandling + bl GF_AssertFail _021DFAB2: add r2, r4, #0 mov r1, #0x10 @@ -18059,7 +18059,7 @@ MOD16_021DFAE8: ; 0x021DFAE8 bl AllocFromHeap add r4, r0, #0 bne _021DFAFA - bl ErrorHandling + bl GF_AssertFail _021DFAFA: mov r0, #0 strb r0, [r4] @@ -18092,7 +18092,7 @@ MOD16_021DFB24: ; 0x021DFB24 push {r4, lr} add r4, r0, #0 bne _021DFB2E - bl ErrorHandling + bl GF_AssertFail _021DFB2E: add r0, r4, #0 bl FreeToHeap @@ -18105,7 +18105,7 @@ MOD16_021DFB38: ; 0x021DFB38 push {r4, lr} add r4, r0, #0 bne _021DFB42 - bl ErrorHandling + bl GF_AssertFail _021DFB42: add r0, r4, #0 bl FreeToHeap @@ -18135,7 +18135,7 @@ MOD16_021DFB54: ; 0x021DFB54 bl AllocFromHeap add r4, r0, #0 bne _021DFB6A - bl ErrorHandling + bl GF_AssertFail _021DFB6A: add r0, r4, #0 mov r1, #0 @@ -22376,7 +22376,7 @@ _021E195A: mov r4, #4 b _021E1962 _021E195E: - bl ErrorHandling + bl GF_AssertFail _021E1962: ldr r0, [r5, #0x18] mov r1, #4 @@ -25366,7 +25366,7 @@ MOD16_021E2F38: ; 0x021E2F38 ldr r4, [r0] cmp r5, #3 blt _021E2F46 - bl ErrorHandling + bl GF_AssertFail _021E2F46: str r5, [r4, #4] pop {r3, r4, r5, pc} @@ -25405,7 +25405,7 @@ MOD16_021E2F64: ; 0x021E2F64 bl AllocFromHeap add r4, r0, #0 bne _021E2F76 - bl ErrorHandling + bl GF_AssertFail _021E2F76: mov r0, #0 strb r0, [r4] @@ -25440,7 +25440,7 @@ MOD16_021E2FA8: ; 0x021E2FA8 bl AllocFromHeap add r4, r0, #0 bne _021E2FBA - bl ErrorHandling + bl GF_AssertFail _021E2FBA: add r2, r4, #0 mov r1, #0x14 @@ -25462,7 +25462,7 @@ MOD16_021E2FD4: ; 0x021E2FD4 push {r4, lr} add r4, r0, #0 bne _021E2FDE - bl ErrorHandling + bl GF_AssertFail _021E2FDE: add r0, r4, #0 bl FreeToHeap @@ -25475,7 +25475,7 @@ MOD16_021E2FE8: ; 0x021E2FE8 push {r4, lr} add r4, r0, #0 bne _021E2FF2 - bl ErrorHandling + bl GF_AssertFail _021E2FF2: add r0, r4, #0 bl FreeToHeap @@ -25499,7 +25499,7 @@ MOD16_021E3000: ; 0x021E3000 bl AllocFromHeap add r4, r0, #0 bne _021E3016 - bl ErrorHandling + bl GF_AssertFail _021E3016: add r0, r4, #0 mov r1, #0 @@ -26488,7 +26488,7 @@ MOD16_021E37E8: ; 0x021E37E8 ldr r7, [r4] cmp r0, #0 bne _021E3800 - bl ErrorHandling + bl GF_AssertFail _021E3800: mov r0, #0x51 ldr r1, [r4] @@ -27541,7 +27541,7 @@ _021E3FFA: str r0, [sp] b _021E4008 _021E4004: - bl ErrorHandling + bl GF_AssertFail _021E4008: add r0, r5, #0 ldr r2, [sp, #4] @@ -27894,7 +27894,7 @@ MOD16_021E42AC: ; 0x021E42AC bl AllocFromHeap add r4, r0, #0 bne _021E42BE - bl ErrorHandling + bl GF_AssertFail _021E42BE: mov r0, #0 strb r0, [r4] @@ -27925,7 +27925,7 @@ MOD16_021E42E8: ; 0x021E42E8 bl AllocFromHeap add r4, r0, #0 bne _021E42FA - bl ErrorHandling + bl GF_AssertFail _021E42FA: mov r0, #0 strb r0, [r4] @@ -27950,7 +27950,7 @@ MOD16_021E4314: ; 0x021E4314 push {r4, lr} add r4, r0, #0 bne _021E431E - bl ErrorHandling + bl GF_AssertFail _021E431E: add r0, r4, #0 bl FreeToHeap @@ -27963,7 +27963,7 @@ MOD16_021E4328: ; 0x021E4328 push {r4, lr} add r4, r0, #0 bne _021E4332 - bl ErrorHandling + bl GF_AssertFail _021E4332: add r0, r4, #0 bl FreeToHeap @@ -27993,7 +27993,7 @@ MOD16_021E4344: ; 0x021E4344 bl AllocFromHeap add r4, r0, #0 bne _021E435A - bl ErrorHandling + bl GF_AssertFail _021E435A: add r0, r4, #0 mov r1, #0 @@ -28963,7 +28963,7 @@ _021E4A6C: bl FUN_0201C2C8 cmp r0, #0 bne _021E4A86 - bl ErrorHandling + bl GF_AssertFail _021E4A86: pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD16_021E49B8 @@ -29157,7 +29157,7 @@ MOD16_021E4BCC: ; 0x021E4BCC bl AllocFromHeap add r4, r0, #0 bne _021E4BDE - bl ErrorHandling + bl GF_AssertFail _021E4BDE: add r0, r4, #0 mov r1, #0 @@ -29186,7 +29186,7 @@ MOD16_021E4C08: ; 0x021E4C08 bl AllocFromHeap add r4, r0, #0 bne _021E4C1A - bl ErrorHandling + bl GF_AssertFail _021E4C1A: mov r0, #0 strb r0, [r4] @@ -29205,7 +29205,7 @@ MOD16_021E4C30: ; 0x021E4C30 push {r4, lr} add r4, r0, #0 bne _021E4C3A - bl ErrorHandling + bl GF_AssertFail _021E4C3A: add r0, r4, #0 bl FreeToHeap @@ -29218,7 +29218,7 @@ MOD16_021E4C44: ; 0x021E4C44 push {r4, lr} add r4, r0, #0 bne _021E4C4E - bl ErrorHandling + bl GF_AssertFail _021E4C4E: add r0, r4, #0 bl FreeToHeap @@ -31367,7 +31367,7 @@ MOD16_021E5C88: ; 0x021E5C88 bl AllocFromHeap add r4, r0, #0 bne _021E5C9A - bl ErrorHandling + bl GF_AssertFail _021E5C9A: add r2, r4, #0 mov r1, #0x18 @@ -31400,7 +31400,7 @@ MOD16_021E5CC8: ; 0x021E5CC8 bl AllocFromHeap add r4, r0, #0 bne _021E5CDA - bl ErrorHandling + bl GF_AssertFail _021E5CDA: mov r0, #0 strb r0, [r4] @@ -31427,7 +31427,7 @@ MOD16_021E5D00: ; 0x021E5D00 push {r4, lr} add r4, r0, #0 bne _021E5D0A - bl ErrorHandling + bl GF_AssertFail _021E5D0A: add r0, r4, #0 bl FreeToHeap @@ -31440,7 +31440,7 @@ MOD16_021E5D14: ; 0x021E5D14 push {r4, lr} add r4, r0, #0 bne _021E5D1E - bl ErrorHandling + bl GF_AssertFail _021E5D1E: add r0, r4, #0 bl FreeToHeap @@ -31676,7 +31676,7 @@ _021E5E94: str r0, [r4] b _021E5EC4 _021E5EC0: - bl ErrorHandling + bl GF_AssertFail _021E5EC4: add r0, r6, #0 bl MOD16_021E6E44 @@ -31940,7 +31940,7 @@ MOD16_021E60A8: ; 0x021E60A8 ldr r4, [sp, #0x2c] cmp r5, #2 ble _021E60C0 - bl ErrorHandling + bl GF_AssertFail _021E60C0: ldr r0, [sp, #0x28] cmp r0, #9 @@ -32033,7 +32033,7 @@ _021E615E: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} _021E6172: - bl ErrorHandling + bl GF_AssertFail add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -32809,7 +32809,7 @@ _021E6718: mvn r0, r0 cmp r4, r0 bne _021E673C - bl ErrorHandling + bl GF_AssertFail _021E673C: cmp r4, #0 bne _021E6744 @@ -32871,7 +32871,7 @@ _021E6784: mvn r1, r1 cmp r0, r1 bne _021E67AA - bl ErrorHandling + bl GF_AssertFail _021E67AA: add r0, r4, #1 add r1, sp, #0x18 @@ -32902,7 +32902,7 @@ _021E67C4: mvn r1, r1 cmp r0, r1 bne _021E67EA - bl ErrorHandling + bl GF_AssertFail _021E67EA: add sp, #0x1c pop {r4, r5, r6, r7, pc} @@ -32947,7 +32947,7 @@ _021E681A: mvn r1, r1 cmp r0, r1 bne _021E683C - bl ErrorHandling + bl GF_AssertFail _021E683C: add r0, r4, #1 add r1, sp, #0x10 @@ -32976,7 +32976,7 @@ _021E6856: mvn r1, r1 cmp r0, r1 bne _021E6878 - bl ErrorHandling + bl GF_AssertFail _021E6878: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -33020,7 +33020,7 @@ _021E68A6: mvn r1, r1 cmp r0, r1 bne _021E68C8 - bl ErrorHandling + bl GF_AssertFail _021E68C8: add r0, r4, #1 add r1, sp, #0x10 @@ -33049,7 +33049,7 @@ _021E68E2: mvn r1, r1 cmp r0, r1 bne _021E6904 - bl ErrorHandling + bl GF_AssertFail _021E6904: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -33093,7 +33093,7 @@ _021E6932: mvn r1, r1 cmp r0, r1 bne _021E6954 - bl ErrorHandling + bl GF_AssertFail _021E6954: add r0, r4, #1 add r1, sp, #0x10 @@ -33122,7 +33122,7 @@ _021E696E: mvn r1, r1 cmp r0, r1 bne _021E6990 - bl ErrorHandling + bl GF_AssertFail _021E6990: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -33166,7 +33166,7 @@ _021E69BE: mvn r1, r1 cmp r0, r1 bne _021E69E0 - bl ErrorHandling + bl GF_AssertFail _021E69E0: add r0, r4, #1 add r1, sp, #0x10 @@ -33195,7 +33195,7 @@ _021E69FA: mvn r1, r1 cmp r0, r1 bne _021E6A1C - bl ErrorHandling + bl GF_AssertFail _021E6A1C: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -33239,7 +33239,7 @@ _021E6A4A: mvn r1, r1 cmp r0, r1 bne _021E6A6C - bl ErrorHandling + bl GF_AssertFail _021E6A6C: add r0, r4, #1 add r1, sp, #0x10 @@ -33268,7 +33268,7 @@ _021E6A86: mvn r1, r1 cmp r0, r1 bne _021E6AA8 - bl ErrorHandling + bl GF_AssertFail _021E6AA8: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -33310,7 +33310,7 @@ _021E6AD6: bl MOD16_021D822C cmp r0, #0xf bne _021E6AF4 - bl ErrorHandling + bl GF_AssertFail _021E6AF4: add r0, r4, #1 add r1, sp, #0x10 @@ -33337,7 +33337,7 @@ _021E6B0E: bl MOD16_021D822C cmp r0, #0xf bne _021E6B2C - bl ErrorHandling + bl GF_AssertFail _021E6B2C: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -33468,7 +33468,7 @@ MOD16_021E6C04: ; 0x021E6C04 ldr r5, [r6] cmp r0, #0 bne _021E6C20 - bl ErrorHandling + bl GF_AssertFail _021E6C20: ldr r1, [sp, #8] ldr r2, [sp, #0x58] @@ -33553,7 +33553,7 @@ MOD16_021E6CB4: ; 0x021E6CB4 mvn r0, r0 cmp r5, r0 bne _021E6CD8 - bl ErrorHandling + bl GF_AssertFail _021E6CD8: cmp r5, #0 beq _021E6CE2 @@ -33567,7 +33567,7 @@ _021E6CE6: mov r4, #0xe b _021E6CEE _021E6CEA: - bl ErrorHandling + bl GF_AssertFail _021E6CEE: add r0, r4, #0 pop {r4, r5, r6, pc} @@ -33688,7 +33688,7 @@ _021E6D80: mov r5, #0x58 b _021E6D8E _021E6D8A: - bl ErrorHandling + bl GF_AssertFail _021E6D8E: str r4, [r6] str r5, [r7] @@ -33933,7 +33933,7 @@ MOD16_021E6F18: ; 0x021E6F18 bl AllocFromHeap add r4, r0, #0 bne _021E6F2A - bl ErrorHandling + bl GF_AssertFail _021E6F2A: add r0, r4, #0 mov r1, #0 @@ -33962,7 +33962,7 @@ MOD16_021E6F54: ; 0x021E6F54 bl AllocFromHeap add r4, r0, #0 bne _021E6F66 - bl ErrorHandling + bl GF_AssertFail _021E6F66: mov r0, #0 strb r0, [r4] @@ -33981,7 +33981,7 @@ MOD16_021E6F7C: ; 0x021E6F7C push {r4, lr} add r4, r0, #0 bne _021E6F86 - bl ErrorHandling + bl GF_AssertFail _021E6F86: add r0, r4, #0 bl FreeToHeap @@ -33994,7 +33994,7 @@ MOD16_021E6F90: ; 0x021E6F90 push {r4, lr} add r4, r0, #0 bne _021E6F9A - bl ErrorHandling + bl GF_AssertFail _021E6F9A: add r0, r4, #0 bl FreeToHeap @@ -34471,7 +34471,7 @@ MOD16_021E72E4: ; 0x021E72E4 cmp r0, #2 beq _021E731E mov r7, #0 - bl ErrorHandling + bl GF_AssertFail _021E731E: ldr r0, [r4, #0x18] bl MOD16_021E7A70 @@ -35467,7 +35467,7 @@ _021E7AA6: mov r4, #0x1a b _021E7AAE _021E7AAA: - bl ErrorHandling + bl GF_AssertFail _021E7AAE: add r0, r4, #0 pop {r4, pc} @@ -35605,7 +35605,7 @@ MOD16_021E7BB0: ; 0x021E7BB0 bl AllocFromHeap add r4, r0, #0 bne _021E7BC2 - bl ErrorHandling + bl GF_AssertFail _021E7BC2: add r2, r4, #0 mov r1, #0x18 @@ -35651,7 +35651,7 @@ MOD16_021E7C10: ; 0x021E7C10 bl AllocFromHeap add r4, r0, #0 bne _021E7C22 - bl ErrorHandling + bl GF_AssertFail _021E7C22: mov r0, #0 strb r0, [r4] @@ -35679,7 +35679,7 @@ MOD16_021E7C38: ; 0x021E7C38 bl AllocFromHeap add r4, r0, #0 bne _021E7C58 - bl ErrorHandling + bl GF_AssertFail _021E7C58: add r0, r4, #0 mov r1, #0 @@ -35712,7 +35712,7 @@ MOD16_021E7C90: ; 0x021E7C90 push {r4, lr} add r4, r0, #0 bne _021E7C9A - bl ErrorHandling + bl GF_AssertFail _021E7C9A: add r0, r4, #0 bl FreeToHeap @@ -35725,7 +35725,7 @@ MOD16_021E7CA4: ; 0x021E7CA4 push {r4, lr} add r4, r0, #0 bne _021E7CAE - bl ErrorHandling + bl GF_AssertFail _021E7CAE: add r0, r4, #0 bl FreeToHeap @@ -35738,7 +35738,7 @@ MOD16_021E7CB8: ; 0x021E7CB8 push {r4, lr} add r4, r0, #0 bne _021E7CC2 - bl ErrorHandling + bl GF_AssertFail _021E7CC2: add r0, r4, #0 bl MOD16_021DAC7C @@ -37007,7 +37007,7 @@ MOD16_021E868C: ; 0x021E868C ldr r4, [r1] cmp r0, #0 bne _021E86A0 - bl ErrorHandling + bl GF_AssertFail _021E86A0: mov r0, #0x51 lsl r0, r0, #2 @@ -37367,7 +37367,7 @@ _021E8934: bl FUN_0201C2C8 cmp r0, #0 bne _021E895C - bl ErrorHandling + bl GF_AssertFail _021E895C: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -37714,7 +37714,7 @@ MOD16_021E8BB8: ; 0x021E8BB8 cmp r4, #8 blt _021E8BCC _021E8BC8: - bl ErrorHandling + bl GF_AssertFail _021E8BCC: sub r0, r4, #2 lsl r1, r0, #2 @@ -37806,7 +37806,7 @@ MOD16_021E8C70: ; 0x021E8C70 bl AllocFromHeap add r4, r0, #0 bne _021E8C82 - bl ErrorHandling + bl GF_AssertFail _021E8C82: add r0, r4, #0 mov r1, #0 @@ -37865,7 +37865,7 @@ MOD16_021E8CF4: ; 0x021E8CF4 bl AllocFromHeap add r4, r0, #0 bne _021E8D06 - bl ErrorHandling + bl GF_AssertFail _021E8D06: mov r0, #0 strb r0, [r4] @@ -37893,7 +37893,7 @@ MOD16_021E8D1C: ; 0x021E8D1C bl AllocFromHeap add r4, r0, #0 bne _021E8D3C - bl ErrorHandling + bl GF_AssertFail _021E8D3C: add r0, r4, #0 mov r1, #0 @@ -37957,7 +37957,7 @@ MOD16_021E8DBC: ; 0x021E8DBC push {r4, lr} add r4, r0, #0 bne _021E8DC6 - bl ErrorHandling + bl GF_AssertFail _021E8DC6: add r0, r4, #0 bl FreeToHeap @@ -37970,7 +37970,7 @@ MOD16_021E8DD0: ; 0x021E8DD0 push {r4, lr} add r4, r0, #0 bne _021E8DDA - bl ErrorHandling + bl GF_AssertFail _021E8DDA: add r0, r4, #0 bl FreeToHeap @@ -37983,7 +37983,7 @@ MOD16_021E8DE4: ; 0x021E8DE4 push {r4, lr} add r4, r0, #0 bne _021E8DEE - bl ErrorHandling + bl GF_AssertFail _021E8DEE: add r0, r4, #0 bl MOD16_021DAC7C @@ -38147,7 +38147,7 @@ _021E8F0E: mov r0, #1 pop {r4, r5, r6, r7, pc} _021E8F1A: - bl ErrorHandling + bl GF_AssertFail _021E8F1E: mov r0, #0 add sp, #0x14 @@ -38276,7 +38276,7 @@ _021E9002: mov r0, #1 pop {r4, r5, pc} _021E9008: - bl ErrorHandling + bl GF_AssertFail _021E900C: mov r0, #0 add sp, #0x14 @@ -38525,7 +38525,7 @@ _021E91D0: str r0, [sp, #4] b _021E91DA _021E91D6: - bl ErrorHandling + bl GF_AssertFail _021E91DA: ldr r0, [sp] cmp r0, #4 @@ -38612,7 +38612,7 @@ _021E927E: bl MOD16_021EA25C b _021E928E _021E928A: - bl ErrorHandling + bl GF_AssertFail _021E928E: ldr r0, [sp, #4] add sp, #8 @@ -39050,7 +39050,7 @@ MOD16_021E95D0: ; 0x021E95D0 bl AllocFromHeap add r4, r0, #0 bne _021E95E2 - bl ErrorHandling + bl GF_AssertFail _021E95E2: add r0, r4, #0 mov r1, #0 @@ -39079,7 +39079,7 @@ MOD16_021E960C: ; 0x021E960C bl AllocFromHeap add r4, r0, #0 bne _021E961E - bl ErrorHandling + bl GF_AssertFail _021E961E: mov r0, #0 strb r0, [r4] @@ -39104,7 +39104,7 @@ MOD16_021E9638: ; 0x021E9638 push {r4, lr} add r4, r0, #0 bne _021E9642 - bl ErrorHandling + bl GF_AssertFail _021E9642: add r0, r4, #0 bl FreeToHeap @@ -39117,7 +39117,7 @@ MOD16_021E964C: ; 0x021E964C push {r4, lr} add r4, r0, #0 bne _021E9656 - bl ErrorHandling + bl GF_AssertFail _021E9656: add r0, r4, #0 bl FreeToHeap @@ -39593,7 +39593,7 @@ _021E99AE: str r0, [r4, #0x1c] pop {r4, pc} _021E99BA: - bl ErrorHandling + bl GF_AssertFail _021E99BE: pop {r4, pc} thumb_func_end MOD16_021E9940 @@ -40777,7 +40777,7 @@ MOD16_021EA274: ; 0x021EA274 bl AllocFromHeap add r4, r0, #0 bne _021EA286 - bl ErrorHandling + bl GF_AssertFail _021EA286: add r2, r4, #0 mov r1, #0x10 @@ -40813,7 +40813,7 @@ MOD16_021EA2BC: ; 0x021EA2BC bl AllocFromHeap add r4, r0, #0 bne _021EA2CE - bl ErrorHandling + bl GF_AssertFail _021EA2CE: add r2, r4, #0 mov r1, #0x14 @@ -40835,7 +40835,7 @@ MOD16_021EA2E8: ; 0x021EA2E8 push {r4, lr} add r4, r0, #0 bne _021EA2F2 - bl ErrorHandling + bl GF_AssertFail _021EA2F2: add r0, r4, #0 bl FreeToHeap @@ -40848,7 +40848,7 @@ MOD16_021EA2FC: ; 0x021EA2FC push {r4, lr} add r4, r0, #0 bne _021EA306 - bl ErrorHandling + bl GF_AssertFail _021EA306: add r0, r4, #0 bl FreeToHeap @@ -40875,7 +40875,7 @@ MOD16_021EA314: ; 0x021EA314 bl AllocFromHeap add r4, r0, #0 bne _021EA332 - bl ErrorHandling + bl GF_AssertFail _021EA332: add r2, r4, #0 mov r1, #0x18 @@ -42482,7 +42482,7 @@ MOD16_021EAF18: ; 0x021EAF18 bl AllocFromHeap add r4, r0, #0 bne _021EAF2A - bl ErrorHandling + bl GF_AssertFail _021EAF2A: add r2, r4, #0 mov r1, #0x10 @@ -42515,7 +42515,7 @@ MOD16_021EAF58: ; 0x021EAF58 bl AllocFromHeap add r4, r0, #0 bne _021EAF6A - bl ErrorHandling + bl GF_AssertFail _021EAF6A: mov r0, #0 strb r0, [r4] @@ -42540,7 +42540,7 @@ MOD16_021EAF84: ; 0x021EAF84 push {r4, lr} add r4, r0, #0 bne _021EAF8E - bl ErrorHandling + bl GF_AssertFail _021EAF8E: add r0, r4, #0 bl FreeToHeap @@ -42553,7 +42553,7 @@ MOD16_021EAF98: ; 0x021EAF98 push {r4, lr} add r4, r0, #0 bne _021EAFA2 - bl ErrorHandling + bl GF_AssertFail _021EAFA2: add r0, r4, #0 bl FreeToHeap @@ -45063,7 +45063,7 @@ MOD16_021EC274: ; 0x021EC274 bl AllocFromHeap add r4, r0, #0 bne _021EC286 - bl ErrorHandling + bl GF_AssertFail _021EC286: mov r0, #0 strb r0, [r4] @@ -45101,7 +45101,7 @@ MOD16_021EC2C0: ; 0x021EC2C0 bl AllocFromHeap add r4, r0, #0 bne _021EC2D2 - bl ErrorHandling + bl GF_AssertFail _021EC2D2: mov r0, #0 strb r0, [r4] @@ -45126,7 +45126,7 @@ MOD16_021EC2EC: ; 0x021EC2EC push {r4, lr} add r4, r0, #0 bne _021EC2F6 - bl ErrorHandling + bl GF_AssertFail _021EC2F6: add r0, r4, #0 bl FreeToHeap @@ -45139,7 +45139,7 @@ MOD16_021EC300: ; 0x021EC300 push {r4, lr} add r4, r0, #0 bne _021EC30A - bl ErrorHandling + bl GF_AssertFail _021EC30A: add r0, r4, #0 bl FreeToHeap @@ -45168,7 +45168,7 @@ MOD16_021EC31C: ; 0x021EC31C bl AllocFromHeap add r4, r0, #0 bne _021EC330 - bl ErrorHandling + bl GF_AssertFail _021EC330: mov r0, #0 strb r0, [r4] @@ -46227,7 +46227,7 @@ MOD16_021ECB54: ; 0x021ECB54 bl AllocFromHeap add r4, r0, #0 bne _021ECB66 - bl ErrorHandling + bl GF_AssertFail _021ECB66: add r2, r4, #0 mov r1, #0x10 @@ -46262,7 +46262,7 @@ MOD16_021ECB98: ; 0x021ECB98 bl AllocFromHeap add r4, r0, #0 bne _021ECBAA - bl ErrorHandling + bl GF_AssertFail _021ECBAA: mov r0, #0 strb r0, [r4] @@ -46290,7 +46290,7 @@ MOD16_021ECBC0: ; 0x021ECBC0 bl AllocFromHeap add r4, r0, #0 bne _021ECBE0 - bl ErrorHandling + bl GF_AssertFail _021ECBE0: add r0, r4, #0 mov r1, #0 @@ -46316,7 +46316,7 @@ MOD16_021ECC08: ; 0x021ECC08 push {r4, lr} add r4, r0, #0 bne _021ECC12 - bl ErrorHandling + bl GF_AssertFail _021ECC12: add r0, r4, #0 bl FreeToHeap @@ -46329,7 +46329,7 @@ MOD16_021ECC1C: ; 0x021ECC1C push {r4, lr} add r4, r0, #0 bne _021ECC26 - bl ErrorHandling + bl GF_AssertFail _021ECC26: add r0, r4, #0 bl FreeToHeap @@ -46342,7 +46342,7 @@ MOD16_021ECC30: ; 0x021ECC30 push {r4, lr} add r4, r0, #0 bne _021ECC3A - bl ErrorHandling + bl GF_AssertFail _021ECC3A: add r0, r4, #0 bl MOD16_021DAC7C @@ -47231,7 +47231,7 @@ MOD16_021ED2B4: ; 0x021ED2B4 ldr r4, [r1] cmp r0, #0 bne _021ED2C8 - bl ErrorHandling + bl GF_AssertFail _021ED2C8: mov r0, #0x51 lsl r0, r0, #2 @@ -47425,7 +47425,7 @@ _021ED430: bl FUN_0201C2C8 cmp r0, #0 bne _021ED458 - bl ErrorHandling + bl GF_AssertFail _021ED458: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -47642,7 +47642,7 @@ MOD16_021ED5C8: ; 0x021ED5C8 bl AllocFromHeap add r4, r0, #0 bne _021ED5DA - bl ErrorHandling + bl GF_AssertFail _021ED5DA: mov r0, #0 strb r0, [r4] @@ -47674,7 +47674,7 @@ MOD16_021ED604: ; 0x021ED604 bl AllocFromHeap add r4, r0, #0 bne _021ED618 - bl ErrorHandling + bl GF_AssertFail _021ED618: add r0, r4, #0 mov r1, #0 @@ -47702,7 +47702,7 @@ MOD16_021ED648: ; 0x021ED648 push {r4, lr} add r4, r0, #0 bne _021ED652 - bl ErrorHandling + bl GF_AssertFail _021ED652: add r0, r4, #0 bl FreeToHeap @@ -47715,7 +47715,7 @@ MOD16_021ED65C: ; 0x021ED65C push {r4, lr} add r4, r0, #0 bne _021ED666 - bl ErrorHandling + bl GF_AssertFail _021ED666: add r0, r4, #0 bl MOD16_021EE0F0 @@ -47743,7 +47743,7 @@ MOD16_021ED680: ; 0x021ED680 bl AllocFromHeap add r4, r0, #0 bne _021ED696 - bl ErrorHandling + bl GF_AssertFail _021ED696: mov r0, #0 strb r0, [r4] @@ -48398,7 +48398,7 @@ MOD16_021EDAE4: ; 0x021EDAE4 bl FUN_02009D68 cmp r0, #0 bne _021EDB82 - bl ErrorHandling + bl GF_AssertFail _021EDB82: add r0, r4, #0 mov r1, #0x60 @@ -49837,7 +49837,7 @@ MOD16_021EE6CC: ; 0x021EE6CC bl AllocFromHeap add r4, r0, #0 bne _021EE6DE - bl ErrorHandling + bl GF_AssertFail _021EE6DE: add r2, r4, #0 mov r1, #0x10 @@ -49873,7 +49873,7 @@ MOD16_021EE714: ; 0x021EE714 bl AllocFromHeap add r4, r0, #0 bne _021EE726 - bl ErrorHandling + bl GF_AssertFail _021EE726: mov r0, #0 strb r0, [r4] @@ -49898,7 +49898,7 @@ MOD16_021EE740: ; 0x021EE740 push {r4, lr} add r4, r0, #0 bne _021EE74A - bl ErrorHandling + bl GF_AssertFail _021EE74A: add r0, r4, #0 bl FreeToHeap @@ -49911,7 +49911,7 @@ MOD16_021EE754: ; 0x021EE754 push {r4, lr} add r4, r0, #0 bne _021EE75E - bl ErrorHandling + bl GF_AssertFail _021EE75E: add r0, r4, #0 bl FreeToHeap @@ -50697,7 +50697,7 @@ MOD16_021EED04: ; 0x021EED04 ldr r4, [r1] cmp r0, #0 bne _021EED18 - bl ErrorHandling + bl GF_AssertFail _021EED18: mov r0, #0x51 lsl r0, r0, #2 @@ -50853,7 +50853,7 @@ _021EEE2C: bl FUN_0201C2C8 cmp r0, #0 bne _021EEE54 - bl ErrorHandling + bl GF_AssertFail _021EEE54: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -51809,7 +51809,7 @@ MOD16_021EF598: ; 0x021EF598 str r0, [r5] cmp r0, #0 bne _021EF5DA - bl ErrorHandling + bl GF_AssertFail _021EF5DA: add sp, #0x44 pop {r3, r4, r5, r6, pc} @@ -51856,7 +51856,7 @@ MOD16_021EF5EC: ; 0x021EF5EC str r0, [r5] cmp r0, #0 bne _021EF62E - bl ErrorHandling + bl GF_AssertFail _021EF62E: ldr r0, [r5] mov r1, #0x11 @@ -52280,7 +52280,7 @@ _021EF958: bl FUN_020056AC cmp r0, #0 bne _021EF976 - bl ErrorHandling + bl GF_AssertFail _021EF976: mov r0, #0x6e lsl r0, r0, #2 @@ -54602,7 +54602,7 @@ _021F0AEC: str r0, [r4, r1] pop {r3, r4, r5, pc} _021F0B0C: - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, pc} nop _021F0B14: .word 0x000003CF @@ -58151,7 +58151,7 @@ _021F266A: str r0, [r1] pop {r4, r5, r6, pc} _021F2688: - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} nop _021F2690: .word 0x000003CF @@ -58355,11 +58355,11 @@ MOD16_021F2808: ; 0x021F2808 add r6, r0, #0 cmp r4, #1 bne _021F282C - bl ErrorHandling + bl GF_AssertFail _021F282C: cmp r4, #0 bne _021F2834 - bl ErrorHandling + bl GF_AssertFail _021F2834: lsl r1, r4, #0x18 add r0, r5, #0 @@ -58394,11 +58394,11 @@ MOD16_021F2858: ; 0x021F2858 add r6, r0, #0 cmp r4, #1 bne _021F287C - bl ErrorHandling + bl GF_AssertFail _021F287C: cmp r4, #0 bne _021F2884 - bl ErrorHandling + bl GF_AssertFail _021F2884: lsl r1, r4, #0x18 add r0, r5, #0 @@ -58962,7 +58962,7 @@ MOD16_021F2C8C: ; 0x021F2C8C ldrb r0, [r4, r0] cmp r0, #8 bls _021F2CBC - bl ErrorHandling + bl GF_AssertFail _021F2CBC: pop {r3, r4, r5, pc} nop diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index 234719b2..74c32457 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -46,7 +46,7 @@ MOD17_021D7520: ; 0x021D7520 bl MOD17_021D76E0 add r4, r0, #0 bne _021D7532 - bl ErrorHandling + bl GF_AssertFail _021D7532: ldr r0, [r5, #0x18] str r0, [r4] @@ -1357,7 +1357,7 @@ _021D7E8E: ldr r0, [r5, #8] cmp r1, r0 blt _021D7E9A - bl ErrorHandling + bl GF_AssertFail _021D7E9A: ldr r0, [r4, #4] cmp r0, #0 @@ -1412,7 +1412,7 @@ _021D7EEE: ldr r0, [r5, #0x14] cmp r1, r0 blt _021D7EFA - bl ErrorHandling + bl GF_AssertFail _021D7EFA: ldr r0, [r4, #4] cmp r0, #0 @@ -1756,7 +1756,7 @@ _021D81AC: str r0, [sp, #4] cmp r0, #0 bne _021D81C6 - bl ErrorHandling + bl GF_AssertFail _021D81C6: ldr r1, [sp, #4] add r0, r7, #0 @@ -1857,7 +1857,7 @@ _021D822A: ldr r0, [r0, #4] cmp r0, #0 bne _021D8298 - bl ErrorHandling + bl GF_AssertFail _021D8298: ldr r1, [r7] ldr r0, [r5, #8] @@ -2506,7 +2506,7 @@ _021D8780: bl FUN_0201CD04 cmp r0, #1 beq _021D87F0 - bl ErrorHandling + bl GF_AssertFail _021D87F0: add r0, r6, #0 bl OverlayManager_FreeData @@ -3114,7 +3114,7 @@ MOD17_021D8C9C: ; 0x021D8C9C bl FUN_0201CD04 cmp r0, #1 beq _021D8D30 - bl ErrorHandling + bl GF_AssertFail _021D8D30: add r0, r5, #0 bl OverlayManager_FreeData @@ -3905,7 +3905,7 @@ _021D9312: bl MOD17_021DA870 cmp r0, #0 bne _021D932A - bl ErrorHandling + bl GF_AssertFail _021D932A: ldr r0, [r4, #0xc] add sp, #4 @@ -4201,7 +4201,7 @@ _021D955E: bl MOD17_021DA870 cmp r0, #0 bne _021D9576 - bl ErrorHandling + bl GF_AssertFail _021D9576: ldr r0, [r4, #0xc] add sp, #4 @@ -4813,7 +4813,7 @@ MOD17_021D9A68: ; 0x021D9A68 add r4, r1, #0 cmp r0, #0 beq _021D9A7E - bl ErrorHandling + bl GF_AssertFail _021D9A7E: ldr r0, _021D9B08 ; =0x000006A8 mov r1, #0xf @@ -5061,7 +5061,7 @@ _021D9C2E: mov r4, #0x14 b _021D9C36 _021D9C32: - bl ErrorHandling + bl GF_AssertFail _021D9C36: add r0, r4, #0 pop {r4, pc} @@ -5167,7 +5167,7 @@ MOD17_021D9CE0: ; 0x021D9CE0 add r6, r2, #0 cmp r4, #0 bne _021D9CF0 - bl ErrorHandling + bl GF_AssertFail _021D9CF0: add r0, r5, #0 add r0, #0xa8 @@ -5252,7 +5252,7 @@ MOD17_021D9D70: ; 0x021D9D70 add r4, r0, #0 cmp r5, #0x15 blo _021D9D7E - bl ErrorHandling + bl GF_AssertFail _021D9D7E: lsl r0, r5, #3 ldr r0, [r4, r0] @@ -5266,7 +5266,7 @@ MOD17_021D9D84: ; 0x021D9D84 add r4, r0, #0 cmp r5, #0x15 blo _021D9D92 - bl ErrorHandling + bl GF_AssertFail _021D9D92: lsl r0, r5, #3 add r0, r4, r0 @@ -5762,7 +5762,7 @@ MOD17_021DA0E8: ; 0x021DA0E8 sub r0, r0, #1 str r0, [r4, #0x24] bpl _021DA0FE - bl ErrorHandling + bl GF_AssertFail _021DA0FE: pop {r4, pc} thumb_func_end MOD17_021DA0E8 @@ -6674,7 +6674,7 @@ _021DA73E: str r1, [sp, #0x44] b _021DA750 _021DA74C: - bl ErrorHandling + bl GF_AssertFail _021DA750: ldr r0, [sp, #0xc] ldr r1, [r5, #0x48] @@ -6687,12 +6687,12 @@ _021DA750: ldr r1, [r2, r1] str r1, [sp, #0x34] bne _021DA76A - bl ErrorHandling + bl GF_AssertFail _021DA76A: ldr r0, [sp, #0x34] cmp r0, #0 bne _021DA774 - bl ErrorHandling + bl GF_AssertFail _021DA774: ldr r2, [r5, #4] add r0, r6, #0 @@ -7122,7 +7122,7 @@ MOD17_021DAA6C: ; 0x021DAA6C push {r4, lr} add r4, r0, #0 bne _021DAA76 - bl ErrorHandling + bl GF_AssertFail _021DAA76: ldr r0, [r4] pop {r4, pc} @@ -7137,7 +7137,7 @@ MOD17_021DAA7C: ; 0x021DAA7C add r4, r1, #0 cmp r5, #0 bne _021DAA8C - bl ErrorHandling + bl GF_AssertFail _021DAA8C: mov r0, #0xc mul r0, r4 @@ -7499,7 +7499,7 @@ MOD17_021DACA4: ; 0x021DACA4 str r0, [r4, #0x28] cmp r0, #0 bne _021DAD04 - bl ErrorHandling + bl GF_AssertFail _021DAD04: ldr r3, [r4, #0x2c] mov r2, #0xc @@ -7689,7 +7689,7 @@ _021DAE40: add sp, #4 pop {r3, r4, r5, r6, pc} _021DAE74: - bl ErrorHandling + bl GF_AssertFail _021DAE78: ldr r0, [r4, #0x28] ldr r1, [r4, #0x2c] @@ -7932,7 +7932,7 @@ MOD17_021DAFF4: ; 0x021DAFF4 add r4, r0, #0 cmp r5, #0x64 blo _021DB002 - bl ErrorHandling + bl GF_AssertFail _021DB002: lsl r0, r5, #2 ldr r0, [r4, r0] @@ -8180,7 +8180,7 @@ MOD17_021DB1D0: ; 0x021DB1D0 ldr r0, [r0, #4] cmp r0, #1 beq _021DB1E6 - bl ErrorHandling + bl GF_AssertFail _021DB1E6: ldr r0, [r4, #0x10] mov r2, #0x1c @@ -8536,7 +8536,7 @@ MOD17_021DB4AC: ; 0x021DB4AC ldr r0, [r0, #4] cmp r0, #1 beq _021DB4C0 - bl ErrorHandling + bl GF_AssertFail _021DB4C0: ldr r0, [r4, #0x10] ldr r5, [r0] @@ -9277,7 +9277,7 @@ MOD17_021DB9F4: ; 0x021DB9F4 str r0, [r5] cmp r0, #0 bne _021DBA0E - bl ErrorHandling + bl GF_AssertFail _021DBA0E: ldr r0, [r5] mov r1, #0 @@ -9309,12 +9309,12 @@ MOD17_021DBA30: ; 0x021DBA30 add r7, r2, #0 cmp r0, #0 bne _021DBA42 - bl ErrorHandling + bl GF_AssertFail _021DBA42: ldr r0, [r5, #4] cmp r0, #0 bne _021DBA4C - bl ErrorHandling + bl GF_AssertFail _021DBA4C: ldr r2, [r5, #4] mov r4, #0 @@ -9332,7 +9332,7 @@ _021DBA56: _021DBA64: cmp r2, r4 bgt _021DBA6C - bl ErrorHandling + bl GF_AssertFail _021DBA6C: ldr r0, [r5] lsl r1, r4, #4 @@ -10332,18 +10332,18 @@ MOD17_021DC1A0: ; 0x021DC1A0 add r4, r1, #0 cmp r5, #0 bne _021DC1AE - bl ErrorHandling + bl GF_AssertFail _021DC1AE: cmp r4, #0 bne _021DC1B6 - bl ErrorHandling + bl GF_AssertFail _021DC1B6: ldr r0, [r4] bl FUN_0201FE94 str r0, [r5] cmp r0, #0 bne _021DC1C6 - bl ErrorHandling + bl GF_AssertFail _021DC1C6: ldr r0, [r4, #0xc] str r0, [r5, #4] @@ -10496,7 +10496,7 @@ MOD17_021DC2C0: ; 0x021DC2C0 add r7, r3, #0 cmp r5, #0 bne _021DC2D2 - bl ErrorHandling + bl GF_AssertFail _021DC2D2: str r7, [r5, #4] str r6, [r5, #8] @@ -10756,7 +10756,7 @@ MOD17_021DC4CC: ; 0x021DC4CC ldr r0, [r4, #0x68] cmp r0, #0 bne _021DC4DA - bl ErrorHandling + bl GF_AssertFail _021DC4DA: ldr r0, [r4, #0x68] bl FUN_02022144 @@ -10819,7 +10819,7 @@ MOD17_021DC538: ; 0x021DC538 add r7, r3, #0 cmp r5, #0 bne _021DC54A - bl ErrorHandling + bl GF_AssertFail _021DC54A: cmp r4, #4 bge _021DC55E @@ -10921,7 +10921,7 @@ _021DC5E6: bl MOD17_021DC264 pop {r4, r5, r6, pc} _021DC618: - bl ErrorHandling + bl GF_AssertFail _021DC61C: pop {r4, r5, r6, pc} nop @@ -11061,7 +11061,7 @@ MOD17_021DC698: ; 0x021DC698 bl FUN_0201D568 cmp r0, #0 bne _021DC736 - bl ErrorHandling + bl GF_AssertFail _021DC736: ldr r0, [r5, #0x18] add r1, sp, #0x80 @@ -11257,7 +11257,7 @@ MOD17_021DC880: ; 0x021DC880 bl NewMsgDataFromNarc add r6, r0, #0 bne _021DC898 - bl ErrorHandling + bl GF_AssertFail _021DC898: add r0, r6, #0 add r1, r4, #0 @@ -11622,7 +11622,7 @@ MOD17_021DCB48: ; 0x021DCB48 add r7, r3, #0 tst r0, r1 bne _021DCB64 - bl ErrorHandling + bl GF_AssertFail _021DCB64: mov r0, #0 str r0, [sp] @@ -11653,7 +11653,7 @@ MOD17_021DCB80: ; 0x021DCB80 add r7, r3, #0 tst r0, r1 bne _021DCB9C - bl ErrorHandling + bl GF_AssertFail _021DCB9C: mov r0, #0 str r0, [sp] @@ -11936,7 +11936,7 @@ MOD17_021DCD80: ; 0x021DCD80 bl NewMsgDataFromNarc add r5, r0, #0 bne _021DCD98 - bl ErrorHandling + bl GF_AssertFail _021DCD98: add r0, r5, #0 add r1, r4, #0 @@ -11978,7 +11978,7 @@ MOD17_021DCDD4: ; 0x021DCDD4 str r3, [sp, #0x10] cmp r0, #0 beq _021DCDEC - bl ErrorHandling + bl GF_AssertFail _021DCDEC: mov r0, #0 add r1, r5, #0 @@ -11987,7 +11987,7 @@ _021DCDEC: bl NewMsgDataFromNarc add r5, r0, #0 bne _021DCE00 - bl ErrorHandling + bl GF_AssertFail _021DCE00: ldr r1, [sp, #0x10] add r0, r5, #0 @@ -12522,7 +12522,7 @@ _021DD21A: str r0, [sp, #4] cmp r0, #0xa ble _021DD22C - bl ErrorHandling + bl GF_AssertFail _021DD22C: ldr r0, [r5, #0x10] ldr r1, [sp, #4] @@ -14344,7 +14344,7 @@ MOD17_021DDFDC: ; 0x021DDFDC str r0, [sp, #0x10] cmp r0, #0 bne _021DDFF8 - bl ErrorHandling + bl GF_AssertFail _021DDFF8: mov r0, #0xd bl ScrStrBufs_new @@ -14522,7 +14522,7 @@ MOD17_021DE0F4: ; 0x021DE0F4 str r0, [sp, #0x10] cmp r0, #0 bne _021DE1A0 - bl ErrorHandling + bl GF_AssertFail _021DE1A0: ldr r0, [sp, #0x10] mov r1, #0x2b diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index d90cf62c..15b80554 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -2808,7 +2808,7 @@ _0223AD00: add r5, #0xc cmp r1, #8 blt _0223ACB6 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -3116,7 +3116,7 @@ _0223AF18: cmp r4, #0x55 blo _0223AF04 _0223AF20: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r4, r5, r6, pc} .align 2, 0 @@ -6327,7 +6327,7 @@ MOD18_0223C7D4: ; 0x0223C7D4 ldr r0, [r1, r0] cmp r0, #0 beq _0223C7E6 - bl ErrorHandling + bl GF_AssertFail _0223C7E6: ldr r0, _0223C834 ; =0x02251380 ldr r1, [r0] @@ -6335,7 +6335,7 @@ _0223C7E6: ldr r0, [r1, r0] cmp r0, #0 beq _0223C7F6 - bl ErrorHandling + bl GF_AssertFail _0223C7F6: mov r1, #0x5e mov r0, #0xb @@ -7102,7 +7102,7 @@ MOD18_0223CD74: ; 0x0223CD74 add r4, r0, #0 cmp r4, #0x64 blt _0223CD9E - bl ErrorHandling + bl GF_AssertFail _0223CD9E: mov r5, #0x63 cmp r4, #0x63 @@ -7552,7 +7552,7 @@ _0223D106: mvn r0, r0 cmp r1, r0 bne _0223D112 - bl ErrorHandling + bl GF_AssertFail _0223D112: cmp r4, #0x63 bge _0223D132 @@ -7602,7 +7602,7 @@ MOD18_0223D14C: ; 0x0223D14C bl MOD18_0223CE14 add r5, r0, #0 bne _0223D178 - bl ErrorHandling + bl GF_AssertFail _0223D178: add r0, r4, #0 add r1, r5, #0 @@ -7830,7 +7830,7 @@ MOD18_0223D30C: ; 0x0223D30C ldr r0, [r1, r0] cmp r0, #0 beq _0223D31E - bl ErrorHandling + bl GF_AssertFail _0223D31E: ldr r0, _0223D364 ; =0x02251384 ldr r1, [r0] @@ -7839,7 +7839,7 @@ _0223D31E: ldr r0, [r1, r0] cmp r0, #0 beq _0223D330 - bl ErrorHandling + bl GF_AssertFail _0223D330: mov r0, #0xb mov r1, #4 @@ -10255,7 +10255,7 @@ _0223E5DE: add r2, #8 cmp r6, #0x14 blt _0223E5BC - bl ErrorHandling + bl GF_AssertFail _0223E5EA: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -10464,7 +10464,7 @@ _0223E746: ldr r0, [r1, r0] cmp r0, #0x64 ble _0223E764 - bl ErrorHandling + bl GF_AssertFail _0223E764: mov r0, #0 pop {r3, r4, r5, pc} @@ -12184,7 +12184,7 @@ MOD18_0223F428: ; 0x0223F428 bne _0223F49E cmp r4, #0x60 beq _0223F456 - bl ErrorHandling + bl GF_AssertFail _0223F456: mov r0, #0 add r4, r0, #0 @@ -12402,7 +12402,7 @@ MOD18_0223F5CC: ; 0x0223F5CC lsr r0, r0, #0x1c cmp r0, #8 blo _0223F5DE - bl ErrorHandling + bl GF_AssertFail _0223F5DE: ldrb r3, [r4, #7] lsl r0, r3, #0x19 @@ -12543,7 +12543,7 @@ _0223F714: add r1, r1, #6 cmp r3, #0xc0 blt _0223F706 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} .align 2, 0 @@ -14057,7 +14057,7 @@ MOD18_02240210: ; 0x02240210 ldr r0, [r1, r0] cmp r0, #0 beq _0224023E - bl ErrorHandling + bl GF_AssertFail _0224023E: ldr r0, _02240268 ; =0x022513A0 mov r2, #0x64 @@ -23521,7 +23521,7 @@ _02244BEC: _02244BFA: cmp r4, #2 blt _02244C02 - bl ErrorHandling + bl GF_AssertFail _02244C02: cmp r4, #0 bne _02244C14 @@ -23720,7 +23720,7 @@ MOD18_02244D40: ; 0x02244D40 add r5, r0, #0 cmp r4, #8 blt _02244D4E - bl ErrorHandling + bl GF_AssertFail _02244D4E: mov r0, #0xc add r5, #0x18 @@ -23978,7 +23978,7 @@ _02244EE0: bl FUN_0202595C cmp r0, #0x94 beq _02244EEC - bl ErrorHandling + bl GF_AssertFail _02244EEC: ldr r0, _02245000 ; =0x022513EC ldr r2, _02245004 ; =0x000013E8 @@ -24736,7 +24736,7 @@ MOD18_022454BC: ; 0x022454BC bl FUN_02031190 cmp r0, #0 beq _022454D4 - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, pc} _022454D4: ldrb r0, [r4, #1] @@ -25463,7 +25463,7 @@ MOD18_02245A50: ; 0x02245A50 ldr r0, [r0] cmp r0, #2 beq _02245A9A - bl ErrorHandling + bl GF_AssertFail _02245A9A: mov r0, #2 str r0, [r4, #0x14] @@ -26171,7 +26171,7 @@ _02246020: ldrb r5, [r6] cmp r5, #0x11 blt _02246034 - bl ErrorHandling + bl GF_AssertFail _02246034: ldr r0, _022460EC ; =0x022513EC mov r2, #0x96 @@ -29117,7 +29117,7 @@ _02247774: cmp r4, #0 bne _022477A6 _022477A2: - bl ErrorHandling + bl GF_AssertFail _022477A6: add r0, r7, #0 bl FUN_02059BF4 @@ -31922,7 +31922,7 @@ MOD18_02248DF8: ; 0x02248DF8 add r6, r2, #0 cmp r0, #0 beq _02248E0C - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} _02248E0C: mov r0, #0x21 @@ -32001,7 +32001,7 @@ MOD18_02248E84: ; 0x02248E84 beq _02248EAE cmp r5, #2 beq _02248EA4 - bl ErrorHandling + bl GF_AssertFail _02248EA4: ldr r0, _02248EB0 ; =0x022513F0 ldrb r1, [r4, #1] @@ -32029,13 +32029,13 @@ MOD18_02248EB4: ; 0x02248EB4 beq _02248EEA cmp r5, #2 beq _02248ED4 - bl ErrorHandling + bl GF_AssertFail _02248ED4: ldr r0, _02248EEC ; =0x022513F0 ldr r0, [r0, #4] cmp r0, #0 bne _02248EE0 - bl ErrorHandling + bl GF_AssertFail _02248EE0: ldr r0, _02248EEC ; =0x022513F0 ldrb r1, [r4, #1] @@ -32078,7 +32078,7 @@ MOD18_02248F00: ; 0x02248F00 ldr r0, [r0] cmp r0, #0 bne _02248F1E - bl ErrorHandling + bl GF_AssertFail _02248F1E: add r0, r4, #0 add r0, #0x34 @@ -32703,7 +32703,7 @@ MOD18_022493A4: ; 0x022493A4 ldrb r1, [r1, #5] cmp r1, r0 beq _022493B4 - bl ErrorHandling + bl GF_AssertFail _022493B4: ldr r0, _022493C4 ; =0x022513F8 ldr r1, [r0] @@ -32796,7 +32796,7 @@ MOD18_02249450: ; 0x02249450 add r4, r1, #0 cmp r5, #0xb blt _0224945E - bl ErrorHandling + bl GF_AssertFail _0224945E: cmp r5, #6 blt _02249464 @@ -32823,7 +32823,7 @@ MOD18_02249480: ; 0x02249480 add r4, r0, #0 cmp r4, #0x3c blt _0224948C - bl ErrorHandling + bl GF_AssertFail _0224948C: ldr r0, _0224949C ; =0x022513F8 add r1, r4, #0 @@ -34060,7 +34060,7 @@ MOD18_02249E98: ; 0x02249E98 ldrb r1, [r1, #5] cmp r1, r0 beq _02249EA8 - bl ErrorHandling + bl GF_AssertFail _02249EA8: ldr r0, _02249EB8 ; =0x022513F8 ldr r1, [r0] @@ -39599,7 +39599,7 @@ _0224CBF0: add r5, r5, #6 cmp r3, #0x14 blt _0224CBD6 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} .align 2, 0 @@ -41024,11 +41024,11 @@ MOD18_0224D79C: ; 0x0224D79C cmp r5, #0x20 ldr r4, [r0, r1] bge _0224D7B4 - bl ErrorHandling + bl GF_AssertFail _0224D7B4: cmp r5, #0x2d ble _0224D7BC - bl ErrorHandling + bl GF_AssertFail _0224D7BC: bl FUN_0204F7E4 bl MOD18_0223D658 @@ -41488,7 +41488,7 @@ MOD18_0224DB80: ; 0x0224DB80 str r0, [r5, #0x24] cmp r0, #0 bne _0224DBAC - bl ErrorHandling + bl GF_AssertFail _0224DBAC: pop {r4, r5, r6, pc} .align 2, 0 @@ -43100,7 +43100,7 @@ MOD18_0224E764: ; 0x0224E764 add r7, r2, #0 cmp r5, #0 bne _0224E776 - bl ErrorHandling + bl GF_AssertFail _0224E776: add r4, r7, #0 add r4, #0x3c @@ -43178,7 +43178,7 @@ MOD18_0224E7F4: ; 0x0224E7F4 ldr r0, [r0, #0x5c] cmp r0, #0 bne _0224E80A - bl ErrorHandling + bl GF_AssertFail _0224E80A: add r2, r5, r4 add r2, #0x60 @@ -43592,7 +43592,7 @@ _0224EB6C: str r0, [r4, #4] b _0224EDBA _0224EB82: - bl ErrorHandling + bl GF_AssertFail b _0224EDBA _0224EB88: ldr r0, _0224EDC4 ; =0x000004DC @@ -44132,14 +44132,14 @@ _0224EFD6: ldr r0, [r0, #0x64] cmp r0, #0x20 blt _0224EFEA - bl ErrorHandling + bl GF_AssertFail _0224EFEA: ldr r0, _0224F14C ; =0x000004FC ldr r0, [r4, r0] ldr r0, [r0, #0x68] cmp r0, #0x20 blt _0224EFF8 - bl ErrorHandling + bl GF_AssertFail _0224EFF8: ldr r0, _0224F14C ; =0x000004FC add r2, r4, #0 @@ -44210,7 +44210,7 @@ _0224F06E: ldrb r0, [r4, r0] cmp r0, #0 bne _0224F08A - bl ErrorHandling + bl GF_AssertFail _0224F08A: ldr r0, _0224F158 ; =0x00000522 ldrb r1, [r4, r0] @@ -44241,7 +44241,7 @@ _0224F09E: ldrb r0, [r4, r0] cmp r0, #0 bne _0224F0CE - bl ErrorHandling + bl GF_AssertFail _0224F0CE: ldr r0, _0224F160 ; =0x00000521 ldrb r1, [r4, r0] @@ -44317,7 +44317,7 @@ _0224F164: ldrb r0, [r4, r0] sub r5, r1, r0 bpl _0224F172 - bl ErrorHandling + bl GF_AssertFail _0224F172: cmp r5, #0 bne _0224F184 @@ -44679,14 +44679,14 @@ _0224F442: ldr r0, [r0, #0x64] cmp r0, #0x20 blt _0224F456 - bl ErrorHandling + bl GF_AssertFail _0224F456: ldr r0, _0224F51C ; =0x000004FC ldr r0, [r5, r0] ldr r0, [r0, #0x68] cmp r0, #0x20 blt _0224F464 - bl ErrorHandling + bl GF_AssertFail _0224F464: ldr r0, _0224F51C ; =0x000004FC add r2, r5, #0 @@ -45216,7 +45216,7 @@ _0224F880: add r4, #0x24 cmp r2, #0x20 blt _0224F858 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r4, pc} thumb_func_end MOD18_0224F850 @@ -45229,7 +45229,7 @@ MOD18_0224F890: ; 0x0224F890 add r4, r2, #0 cmp r7, #0x20 blt _0224F8A0 - bl ErrorHandling + bl GF_AssertFail _0224F8A0: mov r0, #0x24 add r6, r7, #0 @@ -45237,7 +45237,7 @@ _0224F8A0: ldr r0, [r4, r6] cmp r0, #0 beq _0224F8B0 - bl ErrorHandling + bl GF_AssertFail _0224F8B0: mov r0, #1 str r0, [r4, r6] @@ -45262,11 +45262,11 @@ MOD18_0224F8CC: ; 0x0224F8CC add r4, r1, #0 cmp r5, #0x20 blt _0224F8DA - bl ErrorHandling + bl GF_AssertFail _0224F8DA: cmp r5, #0 bne _0224F8E2 - bl ErrorHandling + bl GF_AssertFail _0224F8E2: mov r0, #0x24 add r6, r5, #0 @@ -45274,7 +45274,7 @@ _0224F8E2: ldr r0, [r4, r6] cmp r0, #0 bne _0224F8F2 - bl ErrorHandling + bl GF_AssertFail _0224F8F2: mov r1, #0 add r0, r4, r6 @@ -45555,7 +45555,7 @@ MOD18_0224FAEC: ; 0x0224FAEC add r5, r0, #0 add r4, r1, #0 bne _0224FAF8 - bl ErrorHandling + bl GF_AssertFail _0224FAF8: ldr r0, [r5, #0x2c] add r1, r4, #0 @@ -45577,7 +45577,7 @@ MOD18_0224FB04: ; 0x0224FB04 ldr r0, [r0, #0x5c] cmp r0, #0 bne _0224FB1E - bl ErrorHandling + bl GF_AssertFail _0224FB1E: add r0, r5, #0 add r0, #0x60 @@ -45625,7 +45625,7 @@ MOD18_0224FB64: ; 0x0224FB64 ldr r0, [r0, #0x5c] cmp r0, #0 bne _0224FB7A - bl ErrorHandling + bl GF_AssertFail _0224FB7A: mov r0, #5 lsl r0, r0, #8 diff --git a/arm9/modules/20/asm/module_20.s b/arm9/modules/20/asm/module_20.s index 6b339173..23481e5a 100644 --- a/arm9/modules/20/asm/module_20.s +++ b/arm9/modules/20/asm/module_20.s @@ -226,7 +226,7 @@ _022525B2: pop {r3, r4, r5, pc} _022525C0: beq _022525C6 - bl ErrorHandling + bl GF_AssertFail _022525C6: ldr r0, [r4, #0x34] mov r1, #0 @@ -629,7 +629,7 @@ LoadPoketchApp: ; 0x022528B0 cmp r4, #0x19 blo _022528C0 _022528BC: - bl ErrorHandling + bl GF_AssertFail _022528C0: mov r0, #0 ldr r1, [r5, #0x14] @@ -688,7 +688,7 @@ MOD20_02252918: ; 0x02252918 ldrb r0, [r4, #2] cmp r0, #0 beq _02252926 - bl ErrorHandling + bl GF_AssertFail _02252926: add r0, r4, #0 ldr r2, [r4, #0x4c] @@ -723,7 +723,7 @@ MOD20_0225294C: ; 0x0225294C ldrb r0, [r4, #2] cmp r0, #2 beq _0225295A - bl ErrorHandling + bl GF_AssertFail _0225295A: ldr r0, [r4, #0x24] ldr r1, [r4, #0x40] @@ -767,7 +767,7 @@ MOD20_0225298C: ; 0x0225298C ldrb r0, [r4, #2] cmp r0, #1 beq _0225299A - bl ErrorHandling + bl GF_AssertFail _0225299A: mov r0, #2 strb r0, [r4, #2] @@ -781,7 +781,7 @@ MOD20_022529A0: ; 0x022529A0 ldrb r0, [r4, #2] cmp r0, #3 beq _022529AE - bl ErrorHandling + bl GF_AssertFail _022529AE: mov r0, #0 strb r0, [r4, #2] @@ -2587,7 +2587,7 @@ MOD20_02253714: ; 0x02253714 ldr r0, _02253750 ; =0x12345678 cmp r1, r0 beq _02253726 - bl ErrorHandling + bl GF_AssertFail _02253726: ldr r6, [r5] mov r2, #0 @@ -2625,7 +2625,7 @@ MOD20_02253754: ; 0x02253754 ldr r0, _02253790 ; =0x12345678 cmp r1, r0 beq _02253766 - bl ErrorHandling + bl GF_AssertFail _02253766: ldr r3, [r5] mov r2, #0 @@ -2648,7 +2648,7 @@ _02253782: cmp r2, r3 blo _02253770 _0225378A: - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, pc} .align 2, 0 _02253790: .word 0x12345678 @@ -2781,7 +2781,7 @@ _02253866: add sp, #0xc pop {r4, r5, r6, r7, pc} _02253870: - bl ErrorHandling + bl GF_AssertFail b _02253880 _02253876: add r3, #0xc @@ -2790,7 +2790,7 @@ _02253876: cmp r2, r1 bne _022537FA _02253880: - bl ErrorHandling + bl GF_AssertFail _02253884: add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -4035,7 +4035,7 @@ MOD20_02254130: ; 0x02254130 str r3, [sp, #4] ldr r5, [sp, #0x20] bne _02254144 - bl ErrorHandling + bl GF_AssertFail _02254144: add r0, r5, #0 mov r1, #0x18 @@ -4085,7 +4085,7 @@ MOD20_02254198: ; 0x02254198 push {r4, lr} add r4, r0, #0 bne _022541A2 - bl ErrorHandling + bl GF_AssertFail _022541A2: ldr r0, [r4, #8] ldr r1, [r4, #0x14] @@ -4481,11 +4481,11 @@ MOD20_02254420: ; 0x02254420 add r7, r3, #0 cmp r5, #0x1e blo _02254432 - bl ErrorHandling + bl GF_AssertFail _02254432: cmp r4, #0x21 blo _0225443A - bl ErrorHandling + bl GF_AssertFail _0225443A: cmp r5, #0x1e blo _02254440 @@ -4517,7 +4517,7 @@ MOD20_02254460: ; 0x02254460 add r6, r2, #0 cmp r5, #4 blo _02254470 - bl ErrorHandling + bl GF_AssertFail _02254470: ldr r0, _02254480 ; =MOD20_02254724 lsl r1, r5, #3 diff --git a/arm9/modules/24/asm/module_24.s b/arm9/modules/24/asm/module_24.s index 07a7285c..16b8766a 100644 --- a/arm9/modules/24/asm/module_24.s +++ b/arm9/modules/24/asm/module_24.s @@ -624,7 +624,7 @@ MOD24_02254CA0: ; 0x02254CA0 bl FUN_02016B90 cmp r0, #0 bne _02254CC0 - bl ErrorHandling + bl GF_AssertFail _02254CC0: add r0, r4, #0 add r0, #8 @@ -634,7 +634,7 @@ _02254CC0: bl FUN_02016B90 cmp r0, #0 bne _02254CD8 - bl ErrorHandling + bl GF_AssertFail _02254CD8: str r6, [r4] bl MOD20_02252D34 @@ -645,7 +645,7 @@ _02254CD8: bl FUN_02016B90 cmp r0, #0 bne _02254CF4 - bl ErrorHandling + bl GF_AssertFail _02254CF4: str r4, [r5] mov r0, #1 @@ -702,7 +702,7 @@ MOD24_02254D48: ; 0x02254D48 bl FUN_02016B90 cmp r0, #0 bne _02254D5C - bl ErrorHandling + bl GF_AssertFail _02254D5C: ldr r2, [r4, #0x70] cmp r2, #0 @@ -786,7 +786,7 @@ MOD24_02254DDC: ; 0x02254DDC bl FUN_02016B90 cmp r0, #0 bne _02254DF0 - bl ErrorHandling + bl GF_AssertFail _02254DF0: add r0, r4, #0 bl MOD20_022538A0 @@ -805,7 +805,7 @@ _02254DF0: bl FUN_02016B90 cmp r0, #0 bne _02254E1E - bl ErrorHandling + bl GF_AssertFail _02254E1E: mov r0, #0 str r0, [sp] @@ -838,7 +838,7 @@ _02254E1E: bl FUN_02016B90 cmp r0, #0 bne _02254E68 - bl ErrorHandling + bl GF_AssertFail _02254E68: add r0, r5, #0 bl MOD24_02254D00 @@ -848,7 +848,7 @@ _02254E68: bl FUN_02016B90 cmp r0, #0 bne _02254E82 - bl ErrorHandling + bl GF_AssertFail _02254E82: add r0, r5, #0 bl MOD24_02255078 @@ -856,7 +856,7 @@ _02254E82: bl FUN_02016B90 cmp r0, #0 bne _02254E96 - bl ErrorHandling + bl GF_AssertFail _02254E96: ldr r0, [r5, #4] mov r1, #7 @@ -880,7 +880,7 @@ _02254E96: bl FUN_02016B90 cmp r0, #0 bne _02254ECC - bl ErrorHandling + bl GF_AssertFail _02254ECC: add sp, #0x14 pop {r4, r5, pc} diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s index 07792caf..3d1890e7 100644 --- a/arm9/modules/28/asm/module_28.s +++ b/arm9/modules/28/asm/module_28.s @@ -744,7 +744,7 @@ _02254D24: bl MOD20_02253F9C b _02254DE0 _02254DDC: - bl ErrorHandling + bl GF_AssertFail _02254DE0: ldrh r0, [r4, #8] mov r1, #0x1c ; BASE_FLIP diff --git a/arm9/modules/36/asm/module_36.s b/arm9/modules/36/asm/module_36.s index 6a1e0245..b0353507 100644 --- a/arm9/modules/36/asm/module_36.s +++ b/arm9/modules/36/asm/module_36.s @@ -984,7 +984,7 @@ MOD36_02254F5C: ; 0x02254F5C bl FUN_02016B90 cmp r0, #0 bne _02254F70 - bl ErrorHandling + bl GF_AssertFail _02254F70: add r0, r5, #0 bl MOD20_022538A0 @@ -1003,7 +1003,7 @@ _02254F70: bl FUN_02016B90 cmp r0, #0 bne _02254F9E - bl ErrorHandling + bl GF_AssertFail _02254F9E: mov r0, #0 str r0, [sp] @@ -1037,7 +1037,7 @@ _02254F9E: bl FUN_02016B90 cmp r0, #0 bne _02254FEA - bl ErrorHandling + bl GF_AssertFail _02254FEA: add r0, r4, #0 lsr r1, r6, #5 @@ -1064,7 +1064,7 @@ _02254FEA: bl FUN_02016B90 cmp r0, #0 bne _02255028 - bl ErrorHandling + bl GF_AssertFail _02255028: add sp, #0x14 pop {r3, r4, r5, r6, pc} diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index 67dd59d4..1866a427 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -1981,7 +1981,7 @@ MOD53_021D852C: ; 0x021D852C bl MOD53_021D941C cmp r0, #0 bne _021D8568 - bl ErrorHandling + bl GF_AssertFail _021D8568: add r0, r5, #0 mov r1, #6 @@ -2372,7 +2372,7 @@ MOD53_021D8860: ; 0x021D8860 bl MOD53_021D941C cmp r0, #0 bne _021D889C - bl ErrorHandling + bl GF_AssertFail _021D889C: add r0, r5, #0 mov r1, #0xe @@ -3870,7 +3870,7 @@ _021D9374: _021D93C0: cmp r0, #0 bne _021D93C8 - bl ErrorHandling + bl GF_AssertFail _021D93C8: mov r0, #1 pop {r3, r4, r5, pc} diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 0469af07..42233002 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -1848,7 +1848,7 @@ _021D83DE: strb r0, [r5, r1] b _021D83FC _021D83F8: - bl ErrorHandling + bl GF_AssertFail _021D83FC: mov r0, #0x32 mov r1, #0 @@ -2688,7 +2688,7 @@ _021D8A5A: str r4, [r5, r0] pop {r3, r4, r5, r6, pc} _021D8A64: - bl ErrorHandling + bl GF_AssertFail add sp, #4 pop {r3, r4, r5, r6, pc} _021D8A6C: @@ -3131,7 +3131,7 @@ _021D8D90: ldr r0, [r6, r0] cmp r0, #0 bne _021D8D9E - bl ErrorHandling + bl GF_AssertFail _021D8D9E: mov r0, #0xd9 lsl r0, r0, #2 @@ -3583,7 +3583,7 @@ MOD54_021D90E0: ; 0x021D90E0 cmp r5, #5 ble _021D90F2 _021D90EE: - bl ErrorHandling + bl GF_AssertFail _021D90F2: add r2, r5, #1 cmp r2, #5 @@ -3786,7 +3786,7 @@ MOD54_021D9238: ; 0x021D9238 bl MOD54_021D91AC cmp r4, r0 beq _021D925E - bl ErrorHandling + bl GF_AssertFail _021D925E: mov r2, #0x63 lsl r2, r2, #2 @@ -3816,7 +3816,7 @@ MOD54_021D9274: ; 0x021D9274 bl MOD54_021D91B4 cmp r4, r0 beq _021D929A - bl ErrorHandling + bl GF_AssertFail _021D929A: add r6, #0xc add r0, r5, #0 @@ -3844,7 +3844,7 @@ MOD54_021D92AC: ; 0x021D92AC bl MOD54_021D91BC cmp r4, r0 beq _021D92D2 - bl ErrorHandling + bl GF_AssertFail _021D92D2: add r6, #0xcc add r0, r5, #0 @@ -4260,7 +4260,7 @@ _021D9580: add r7, r0, #0 cmp r6, r4 bhi _021D959C - bl ErrorHandling + bl GF_AssertFail _021D959C: ldr r1, [sp, #4] add r0, r7, #0 @@ -4317,7 +4317,7 @@ _021D95F8: str r0, [sp, #0x14] cmp r1, r0 bhi _021D960C - bl ErrorHandling + bl GF_AssertFail _021D960C: mov r6, #0 ldr r4, [sp, #4] diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index 4f7db66f..38bd1306 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -1016,7 +1016,7 @@ MOD57_021D7CA4: ; 0x021D7CA4 ldr r0, [r4, r1] cmp r0, #0 bne _021D7D4C - bl ErrorHandling + bl GF_AssertFail _021D7D4C: ldr r1, _021D7ECC ; =0x000030B8 ldr r0, [r4, r1] @@ -1025,7 +1025,7 @@ _021D7D4C: bl NNS_G2dGetUnpackedBGCharacterData cmp r0, #0 bne _021D7D60 - bl ErrorHandling + bl GF_AssertFail _021D7D60: add r0, r4, #0 add r0, #0xb4 @@ -1070,7 +1070,7 @@ _021D7D9C: ldr r0, [r4, r1] cmp r0, #0 bne _021D7DBC - bl ErrorHandling + bl GF_AssertFail _021D7DBC: ldr r1, _021D7ECC ; =0x000030B8 ldr r0, [r4, r1] @@ -1079,7 +1079,7 @@ _021D7DBC: bl NNS_G2dGetUnpackedBGCharacterData cmp r0, #0 bne _021D7DD0 - bl ErrorHandling + bl GF_AssertFail _021D7DD0: ldr r3, _021D7ED0 ; =0x000032FC mov r0, #0x19 @@ -2000,7 +2000,7 @@ MOD57_021D84AC: ; 0x021D84AC add r6, r0, #0 cmp r7, r6 bls _021D850C - bl ErrorHandling + bl GF_AssertFail _021D850C: cmp r7, r6 bhs _021D8578 @@ -2292,7 +2292,7 @@ _021D8732: mov r0, #4 pop {r3, pc} _021D873A: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} .align 2, 0 @@ -3442,7 +3442,7 @@ MOD57_021D905C: ; 0x021D905C ldr r0, [r5, #0x18] cmp r0, #0 bne _021D906E - bl ErrorHandling + bl GF_AssertFail _021D906E: ldr r0, [r5, #0x18] bl GetIGTHours @@ -3716,10 +3716,10 @@ _021D9290: lsl r0, r0, #4 ldr r0, [r5, r0] bl FreeToHeap - bl ErrorHandling + bl GF_AssertFail b _021D92CE _021D92CA: - bl ErrorHandling + bl GF_AssertFail _021D92CE: add r0, r4, #1 lsl r0, r0, #0x18 @@ -4011,11 +4011,11 @@ MOD57_021D951C: ; 0x021D951C add r6, r2, #0 cmp r4, #8 blo _021D952E - bl ErrorHandling + bl GF_AssertFail _021D952E: cmp r6, #3 bls _021D9536 - bl ErrorHandling + bl GF_AssertFail _021D9536: lsl r7, r4, #2 mov r0, #0x57 diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index b47aeeba..501480eb 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -2306,7 +2306,7 @@ _021DAC62: lsl r0, r0, #0xa cmp r7, r0 blt _021DAC6E - bl ErrorHandling + bl GF_AssertFail _021DAC6E: mov r0, #6 add r6, r6, #1 diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s index 3d0ee0fd..e697563f 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -550,7 +550,7 @@ MOD62_0222D9A0: ; 0x0222D9A0 ldr r1, [r2, r1] cmp r1, #1 bne _0222D9CC - bl ErrorHandling + bl GF_AssertFail add sp, #0x34 mov r0, #0 pop {r4, r5, r6, r7, pc} @@ -690,7 +690,7 @@ _0222DADA: str r0, [r4] b _0222DAE6 _0222DAE2: - bl ErrorHandling + bl GF_AssertFail _0222DAE6: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -1832,11 +1832,11 @@ MOD62_0222E360: ; 0x0222E360 add r5, r0, #0 cmp r4, #0 bne _0222E388 - bl ErrorHandling + bl GF_AssertFail _0222E388: cmp r5, #0 bne _0222E390 - bl ErrorHandling + bl GF_AssertFail _0222E390: bl FUN_02012CC8 pop {r3, r4, r5, pc} @@ -2454,7 +2454,7 @@ MOD62_0222E7E8: ; 0x0222E7E8 bl FUN_0200BBF0 cmp r0, #0 bne _0222E852 - bl ErrorHandling + bl GF_AssertFail _0222E852: ldr r0, [r4, #8] ldr r1, [r4, #0xc] @@ -2462,7 +2462,7 @@ _0222E852: bl FUN_0200BF60 cmp r0, #0 bne _0222E864 - bl ErrorHandling + bl GF_AssertFail _0222E864: add sp, #0x4c pop {r3, r4, r5, r6, pc} @@ -5166,7 +5166,7 @@ _0222FD9A: bl FUN_0200C61C pop {r3, pc} _0222FDA2: - bl ErrorHandling + bl GF_AssertFail pop {r3, pc} thumb_func_end MOD62_0222FD70 @@ -5540,7 +5540,7 @@ _02230074: bl FUN_020054C8 pop {r4, r5, r6, pc} _022300A4: - bl ErrorHandling + bl GF_AssertFail _022300A8: pop {r4, r5, r6, pc} nop diff --git a/arm9/modules/63/asm/mod63_021D8890.s b/arm9/modules/63/asm/mod63_021D8890.s index ccd31d01..db832531 100644 --- a/arm9/modules/63/asm/mod63_021D8890.s +++ b/arm9/modules/63/asm/mod63_021D8890.s @@ -708,7 +708,7 @@ _021D8E36: mov r0, #1 pop {r3, r4, r5, pc} _021D8E42: - bl ErrorHandling + bl GF_AssertFail _021D8E46: ldr r0, [r5, #8] cmp r0, #0 @@ -1227,7 +1227,7 @@ _021D9286: ldr r0, [r4, #8] cmp r0, #0 bne _021D9296 - bl ErrorHandling + bl GF_AssertFail _021D9296: ldr r0, [r4, #0x28] bl FUN_0200CAB4 @@ -1772,10 +1772,10 @@ _021D96C6: bne _021D96F8 ldr r0, [r6, #0x2c] bl FreeToHeap - bl ErrorHandling + bl GF_AssertFail b _021D96F8 _021D96F4: - bl ErrorHandling + bl GF_AssertFail _021D96F8: add r0, r4, #1 lsl r0, r0, #0x18 @@ -1917,13 +1917,13 @@ MOD63_021D9810: ; 0x021D9810 bl FUN_0201B3C4 cmp r0, #0 bne _021D9834 - bl ErrorHandling + bl GF_AssertFail _021D9834: ldr r0, [r5, #0x40] ldr r0, [r0, #0x14] cmp r0, #0 bne _021D9840 - bl ErrorHandling + bl GF_AssertFail _021D9840: ldr r2, [r5, #0x40] ldr r0, [r5, #0x3c] @@ -1960,7 +1960,7 @@ _021D9862: bl FUN_0201B3A8 cmp r0, #0 bne _021D9890 - bl ErrorHandling + bl GF_AssertFail _021D9890: add r0, r5, r6 add r0, #0x9c @@ -1969,7 +1969,7 @@ _021D9890: ldrb r0, [r0, #9] cmp r0, #1 beq _021D98A4 - bl ErrorHandling + bl GF_AssertFail _021D98A4: add r0, r5, r6 add r0, #0x9c @@ -1980,7 +1980,7 @@ _021D98A4: ldr r1, [r1, #0xc] add r4, r0, r1 bne _021D98BC - bl ErrorHandling + bl GF_AssertFail _021D98BC: ldr r0, [sp, #0x10] add r1, r4, #0 @@ -3043,10 +3043,10 @@ MOD63_021DA158: ; 0x021DA158 bne _021DA192 ldr r0, [r4, #0x14] bl FreeToHeap - bl ErrorHandling + bl GF_AssertFail b _021DA192 _021DA18E: - bl ErrorHandling + bl GF_AssertFail _021DA192: add r0, r5, #0 bl NARC_dtor diff --git a/arm9/modules/63/asm/mod63_021DAE5C.s b/arm9/modules/63/asm/mod63_021DAE5C.s index 77623c5c..efa1a033 100644 --- a/arm9/modules/63/asm/mod63_021DAE5C.s +++ b/arm9/modules/63/asm/mod63_021DAE5C.s @@ -165,7 +165,7 @@ MOD63_021DAF80: ; 0x021DAF80 add r4, r1, #0 cmp r4, r0 blt _021DAF90 - bl ErrorHandling + bl GF_AssertFail _021DAF90: mov r0, #0xc ldr r1, [r5, #4] @@ -603,7 +603,7 @@ _021DB2E6: lsr r4, r1, #0x18 cmp r4, #0xa blo _021DB2CE - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r4, pc} thumb_func_end MOD63_021DB2C8 diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index fa1d5be3..16c3724b 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -19,7 +19,7 @@ MOD64_021D74E0: ; 0x021D74E0 bl OverlayManager_CreateAndGetData add r5, r0, #0 bne _021D7504 - bl ErrorHandling + bl GF_AssertFail _021D7504: ldr r2, _021D7630 ; =0x000006B4 add r0, r5, #0 @@ -54,7 +54,7 @@ _021D7504: bl FUN_0201CC24 cmp r0, #1 beq _021D755E - bl ErrorHandling + bl GF_AssertFail _021D755E: add r0, r5, #0 mov r1, #0x2f @@ -254,7 +254,7 @@ MOD64_021D76F4: ; 0x021D76F4 bl FUN_0201CD04 cmp r0, #1 beq _021D7726 - bl ErrorHandling + bl GF_AssertFail _021D7726: mov r0, #0x65 lsl r0, r0, #4 @@ -2310,7 +2310,7 @@ MOD64_021D86DC: ; 0x021D86DC bl NewMsgDataFromNarc add r4, r0, #0 bne _021D86F8 - bl ErrorHandling + bl GF_AssertFail _021D86F8: add r0, r4, #0 add r1, r6, #0 @@ -2358,7 +2358,7 @@ MOD64_021D8744: ; 0x021D8744 str r3, [sp, #0x10] cmp r0, #0 beq _021D875C - bl ErrorHandling + bl GF_AssertFail _021D875C: mov r0, #0 mov r1, #0x1a @@ -2367,7 +2367,7 @@ _021D875C: bl NewMsgDataFromNarc add r6, r0, #0 bne _021D8770 - bl ErrorHandling + bl GF_AssertFail _021D8770: ldr r1, [sp, #0x10] add r0, r6, #0 @@ -2510,7 +2510,7 @@ MOD64_021D8864: ; 0x021D8864 add r6, r2, #0 cmp r0, #0 beq _021D8876 - bl ErrorHandling + bl GF_AssertFail _021D8876: ldr r1, _021D88B8 ; =0xFFFFEAAB ldr r2, _021D88BC ; =0xFFFFDC72 @@ -2828,7 +2828,7 @@ MOD64_021D8AE0: ; 0x021D8AE0 ldr r0, [r4, #0x28] cmp r0, #0 beq _021D8AEE - bl ErrorHandling + bl GF_AssertFail _021D8AEE: add r0, r4, #0 mov r1, #2 @@ -3016,7 +3016,7 @@ MOD64_021D8C3C: ; 0x021D8C3C str r3, [sp] cmp r0, #0 beq _021D8C50 - bl ErrorHandling + bl GF_AssertFail _021D8C50: ldr r4, [sp, #0x24] add r0, r5, #0 @@ -3057,7 +3057,7 @@ MOD64_021D8C94: ; 0x021D8C94 ldr r0, [r4, #0x54] cmp r0, #0 beq _021D8CA2 - bl ErrorHandling + bl GF_AssertFail _021D8CA2: mov r0, #1 mvn r0, r0 @@ -3240,7 +3240,7 @@ MOD64_021D8DDC: ; 0x021D8DDC str r3, [sp] cmp r0, #0 beq _021D8DF0 - bl ErrorHandling + bl GF_AssertFail _021D8DF0: ldr r4, [sp, #0x28] ldr r2, [sp] @@ -3281,7 +3281,7 @@ MOD64_021D8E34: ; 0x021D8E34 ldr r0, [r4, #0x3c] cmp r0, #0 beq _021D8E42 - bl ErrorHandling + bl GF_AssertFail _021D8E42: mov r0, #1 mvn r0, r0 @@ -3501,7 +3501,7 @@ MOD64_021D8FD0: ; 0x021D8FD0 bl NewMsgDataFromNarc add r4, r0, #0 bne _021D8FEC - bl ErrorHandling + bl GF_AssertFail _021D8FEC: add r0, r4, #0 add r1, r6, #0 @@ -3567,7 +3567,7 @@ _021D905C: ldr r0, _021D9070 ; =0x00000189 pop {r3, pc} _021D9060: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} .align 2, 0 diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s index 2fc19d08..c902cd22 100644 --- a/arm9/modules/66/asm/module_66.s +++ b/arm9/modules/66/asm/module_66.s @@ -4094,7 +4094,7 @@ MOD66_021D94A4: ; 0x021D94A4 bl FS_OpenFile cmp r0, #0 bne _021D94C8 - bl ErrorHandling + bl GF_AssertFail add sp, #0x4c mov r0, #0 pop {r4, r5, r6, r7, pc} @@ -4105,7 +4105,7 @@ _021D94C8: bl FS_ReadFile cmp r0, #0 bge _021D94DA - bl ErrorHandling + bl GF_AssertFail _021D94DA: add r0, r4, #0 mov r1, #8 diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index b62037b8..2a478ef5 100644 --- a/arm9/modules/69/asm/module_69.s +++ b/arm9/modules/69/asm/module_69.s @@ -3935,7 +3935,7 @@ _0222F5E2: lsl r0, r0, #0xa cmp r1, r0 blo _0222F608 - bl ErrorHandling + bl GF_AssertFail _0222F608: mov r0, #1 str r0, [r7, #4] diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index 4b488741..00f887bb 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -964,7 +964,7 @@ _0222DDD8: lsr r5, r0, #0x10 cmp r5, #0x3c blo _0222DDF8 - bl ErrorHandling + bl GF_AssertFail _0222DDF8: bl FUN_02031190 mov r1, #0x1f @@ -3551,7 +3551,7 @@ MOD71_0222F350: ; 0x0222F350 add r4, r2, #0 cmp r5, #0xd blt _0222F362 - bl ErrorHandling + bl GF_AssertFail _0222F362: ldr r1, _0222F3C8 ; =0x02231220 lsl r0, r5, #3 diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index f00d35cf..f8da5256 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -661,7 +661,7 @@ MOD73_021D79E8: ; 0x021D79E8 bl MOD73_021D90D0 cmp r0, #0 bne _021D7A3C - bl ErrorHandling + bl GF_AssertFail _021D7A3C: ldr r0, [r4, #0xc] pop {r4, pc} @@ -869,7 +869,7 @@ _021D7BC6: bl MOD73_021D90D0 cmp r0, #0 bne _021D7C0C - bl ErrorHandling + bl GF_AssertFail _021D7C0C: add r0, r6, #0 bl FreeToHeap @@ -902,14 +902,14 @@ _021D7C1A: bl MOD73_021D90D0 cmp r0, #0 bne _021D7C54 - bl ErrorHandling + bl GF_AssertFail _021D7C54: ldr r0, [r4, #0xc] add sp, #0xc add r0, r0, #1 pop {r3, r4, r5, r6, pc} _021D7C5C: - bl ErrorHandling + bl GF_AssertFail _021D7C60: ldr r0, [r4, #0xc] add sp, #0xc @@ -1204,7 +1204,7 @@ _021D7EA8: bl MOD73_021D90D0 cmp r0, #0 bne _021D7ECE - bl ErrorHandling + bl GF_AssertFail _021D7ECE: ldr r0, [r4, #0xc] add sp, #0xc @@ -1255,14 +1255,14 @@ _021D7F0C: bl MOD73_021D90D0 cmp r0, #0 bne _021D7F32 - bl ErrorHandling + bl GF_AssertFail _021D7F32: ldr r0, [r4, #0xc] add sp, #0xc add r0, r0, #1 pop {r3, r4, r5, r6, pc} _021D7F3A: - bl ErrorHandling + bl GF_AssertFail _021D7F3E: ldr r0, [r4, #0xc] add sp, #0xc @@ -2019,7 +2019,7 @@ MOD73_021D856C: ; 0x021D856C ldr r0, [r4, r0] cmp r0, #0 bne _021D857C - bl ErrorHandling + bl GF_AssertFail _021D857C: ldr r0, _021D858C ; =0x0000152C ldr r0, [r4, r0] @@ -3622,7 +3622,7 @@ _021D91F2: _021D91FA: cmp r4, #0 bne _021D9202 - bl ErrorHandling + bl GF_AssertFail _021D9202: mov r0, #0x1a lsl r0, r0, #4 @@ -3636,11 +3636,11 @@ _021D9202: blx r0 cmp r0, r5 beq _021D921E - bl ErrorHandling + bl GF_AssertFail _021D921E: cmp r5, #0x26 blt _021D9226 - bl ErrorHandling + bl GF_AssertFail _021D9226: sub r7, #0x16 str r7, [r4, #4] @@ -3865,7 +3865,7 @@ MOD73_021D9340: ; 0x021D9340 bl FUN_02009B78 cmp r0, #0 bne _021D93D0 - bl ErrorHandling + bl GF_AssertFail _021D93D0: ldr r0, [r4] bl FUN_02009474 @@ -3873,7 +3873,7 @@ _021D93D0: bl FUN_02009D68 cmp r0, #0 bne _021D93E4 - bl ErrorHandling + bl GF_AssertFail _021D93E4: ldr r0, [r4, #4] bl FUN_02009474 @@ -3969,7 +3969,7 @@ MOD73_021D942C: ; 0x021D942C bl FUN_02009B78 cmp r0, #0 bne _021D94AA - bl ErrorHandling + bl GF_AssertFail _021D94AA: ldr r0, [r4] bl FUN_02009474 @@ -4072,7 +4072,7 @@ MOD73_021D9540: ; 0x021D9540 bl FUN_0201FF84 add r4, r0, #0 bne _021D956E - bl ErrorHandling + bl GF_AssertFail _021D956E: add r0, r4, #0 add sp, #0x20 @@ -4274,7 +4274,7 @@ MOD73_021D96C8: ; 0x021D96C8 ldr r0, [r4] cmp r0, #0 beq _021D96D6 - bl ErrorHandling + bl GF_AssertFail _021D96D6: mov r2, #0x1f add r0, r4, #0 @@ -4389,7 +4389,7 @@ MOD73_021D97A4: ; 0x021D97A4 str r1, [sp] cmp r0, #1 beq _021D97B4 - bl ErrorHandling + bl GF_AssertFail _021D97B4: mov r0, #0x42 lsl r0, r0, #2 @@ -4430,7 +4430,7 @@ MOD73_021D97F0: ; 0x021D97F0 ldr r0, [r0, #4] cmp r0, #0 beq _021D9800 - bl ErrorHandling + bl GF_AssertFail _021D9800: mov r0, #0 str r0, [sp, #0xc] @@ -4668,7 +4668,7 @@ _021D99BE: str r1, [r4, r0] b _021D99E4 _021D99E0: - bl ErrorHandling + bl GF_AssertFail _021D99E4: ldr r0, [sp] add r4, r4, #4 @@ -4735,7 +4735,7 @@ MOD73_021D9A4C: ; 0x021D9A4C ldr r0, [r4, #0x30] cmp r0, #0 beq _021D9A5A - bl ErrorHandling + bl GF_AssertFail _021D9A5A: add r0, r4, #0 mov r1, #0 @@ -4754,7 +4754,7 @@ MOD73_021D9A68: ; 0x021D9A68 add r6, r2, #0 cmp r0, #0 beq _021D9A7A - bl ErrorHandling + bl GF_AssertFail _021D9A7A: add r0, r5, #0 add r1, r6, #0 @@ -4776,7 +4776,7 @@ MOD73_021D9A94: ; 0x021D9A94 ldr r0, [r4, #0x30] cmp r0, #1 beq _021D9AA2 - bl ErrorHandling + bl GF_AssertFail _021D9AA2: add r0, r4, #0 bl MOD73_021D9C7C @@ -5172,7 +5172,7 @@ MOD73_021D9DA0: ; 0x021D9DA0 ldr r0, [r4] cmp r0, #0 beq _021D9DAE - bl ErrorHandling + bl GF_AssertFail _021D9DAE: mov r0, #0 strb r0, [r4] @@ -5229,7 +5229,7 @@ MOD73_021D9E08: ; 0x021D9E08 ldr r0, [r4] cmp r0, #1 beq _021D9E16 - bl ErrorHandling + bl GF_AssertFail _021D9E16: ldr r0, [r4, #8] bl FUN_0201FFC8 @@ -5309,7 +5309,7 @@ MOD73_021D9E8C: ; 0x021D9E8C ldr r0, [r4, #0x74] cmp r0, #0 beq _021D9E9A - bl ErrorHandling + bl GF_AssertFail _021D9E9A: add r0, r4, #0 mov r1, #0 @@ -5329,7 +5329,7 @@ MOD73_021D9EA8: ; 0x021D9EA8 str r1, [sp, #0xc] cmp r0, #0 beq _021D9EBC - bl ErrorHandling + bl GF_AssertFail _021D9EBC: ldr r4, _021D9F5C ; =0x021DBDE4 ldr r5, [sp, #8] @@ -5425,7 +5425,7 @@ MOD73_021D9F74: ; 0x021D9F74 ldr r0, [r6, #0x74] cmp r0, #1 beq _021D9F82 - bl ErrorHandling + bl GF_AssertFail _021D9F82: mov r4, #0 add r5, r6, #0 @@ -5468,7 +5468,7 @@ MOD73_021D9FC0: ; 0x021D9FC0 add r6, r2, #0 cmp r4, #8 blo _021D9FD0 - bl ErrorHandling + bl GF_AssertFail _021D9FD0: lsl r0, r4, #2 add r0, r5, r0 @@ -5525,7 +5525,7 @@ MOD73_021DA01C: ; 0x021DA01C add r6, r2, #0 cmp r4, #8 blo _021DA02C - bl ErrorHandling + bl GF_AssertFail _021DA02C: lsl r0, r4, #2 add r0, r5, r0 @@ -5616,7 +5616,7 @@ _021DA0B2: str r0, [r5, #0x6c] pop {r3, r4, r5, r6, r7, pc} _021DA0CE: - bl ErrorHandling + bl GF_AssertFail _021DA0D2: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -5649,7 +5649,7 @@ MOD73_021DA0FC: ; 0x021DA0FC ldr r0, [r4] cmp r0, #0 beq _021DA10A - bl ErrorHandling + bl GF_AssertFail _021DA10A: add r0, r4, #0 mov r1, #0 @@ -5826,7 +5826,7 @@ MOD73_021DA234: ; 0x021DA234 ldr r0, [r4, #0x28] cmp r0, #0 beq _021DA242 - bl ErrorHandling + bl GF_AssertFail _021DA242: add r0, r4, #0 bl MOD73_021DA4AC @@ -5846,7 +5846,7 @@ MOD73_021DA254: ; 0x021DA254 add r6, r2, #0 cmp r0, #0 beq _021DA266 - bl ErrorHandling + bl GF_AssertFail _021DA266: add r0, r5, #0 add r1, r6, #0 @@ -5874,7 +5874,7 @@ MOD73_021DA290: ; 0x021DA290 ldr r0, [r4, #0x28] cmp r0, #1 beq _021DA29E - bl ErrorHandling + bl GF_AssertFail _021DA29E: add r0, r4, #0 bl MOD73_021DA354 @@ -6088,7 +6088,7 @@ MOD73_021DA434: ; 0x021DA434 add r4, r1, #0 cmp r0, #0 beq _021DA446 - bl ErrorHandling + bl GF_AssertFail _021DA446: mov r2, #1 ldr r0, _021DA494 ; =MOD73_021DA408 @@ -6597,7 +6597,7 @@ MOD73_021DA82C: ; 0x021DA82C ldr r0, [r4] cmp r0, #0 beq _021DA83A - bl ErrorHandling + bl GF_AssertFail _021DA83A: ldr r2, _021DA848 ; =0x00000414 add r0, r4, #0 @@ -6709,7 +6709,7 @@ MOD73_021DA8BC: ; 0x021DA8BC str r0, [sp, #0x60] cmp r0, #0 bne _021DA900 - bl ErrorHandling + bl GF_AssertFail _021DA900: ldr r0, [sp, #0x60] bl MOD73_021DAB30 @@ -7001,7 +7001,7 @@ MOD73_021DAB30: ; 0x021DAB30 ldr r0, [r4, #0x78] cmp r0, #0 bne _021DAB3E - bl ErrorHandling + bl GF_AssertFail _021DAB3E: ldr r0, [r4, #0x78] bl FUN_0201FFC8 @@ -7236,7 +7236,7 @@ MOD73_021DAC9C: ; 0x021DAC9C str r0, [r5, #0x78] cmp r0, #0 bne _021DAD14 - bl ErrorHandling + bl GF_AssertFail _021DAD14: ldr r0, [r5, #0xc] cmp r0, #0 @@ -7307,7 +7307,7 @@ MOD73_021DAD84: ; 0x021DAD84 ldr r0, [r4, #0x7c] cmp r0, #0 beq _021DAD92 - bl ErrorHandling + bl GF_AssertFail _021DAD92: add r0, r4, #0 mov r1, #0 @@ -7327,7 +7327,7 @@ MOD73_021DADA0: ; 0x021DADA0 str r2, [sp, #0x18] cmp r0, #0 beq _021DADB4 - bl ErrorHandling + bl GF_AssertFail _021DADB4: str r7, [r6] mov r0, #2 @@ -7391,7 +7391,7 @@ MOD73_021DAE24: ; 0x021DAE24 ldr r0, [r6, #0x7c] cmp r0, #1 beq _021DAE32 - bl ErrorHandling + bl GF_AssertFail _021DAE32: mov r4, #0 add r5, r6, #0 @@ -7444,7 +7444,7 @@ MOD73_021DAE7C: ; 0x021DAE7C add r4, r0, #0 cmp r5, #4 blt _021DAE8A - bl ErrorHandling + bl GF_AssertFail _021DAE8A: cmp r5, #2 beq _021DAE92 @@ -7472,7 +7472,7 @@ MOD73_021DAEAC: ; 0x021DAEAC add r4, r0, #0 cmp r5, #4 blt _021DAEBA - bl ErrorHandling + bl GF_AssertFail _021DAEBA: lsl r0, r5, #4 mov r1, #0 @@ -7491,7 +7491,7 @@ MOD73_021DAECC: ; 0x021DAECC add r4, r0, #0 cmp r5, #4 blt _021DAEDA - bl ErrorHandling + bl GF_AssertFail _021DAEDA: lsl r0, r5, #4 add r0, r4, r0 @@ -7609,7 +7609,7 @@ MOD73_021DAF88: ; 0x021DAF88 ldr r0, [r4] cmp r0, #0 beq _021DAF96 - bl ErrorHandling + bl GF_AssertFail _021DAF96: ldr r2, _021DAFA4 ; =0x0000090C add r0, r4, #0 @@ -8442,7 +8442,7 @@ MOD73_021DB56C: ; 0x021DB56C add r4, r0, #0 cmp r5, #3 blt _021DB57A - bl ErrorHandling + bl GF_AssertFail _021DB57A: str r5, [r4] mov r0, #0 diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 512cdc80..9f5fda4b 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -14039,7 +14039,7 @@ MOD80_02234640: ; 0x02234640 add r4, r0, #0 cmp r5, #0xc blt _0223464E - bl ErrorHandling + bl GF_AssertFail _0223464E: ldr r0, _02234660 ; =0x02237498 lsl r1, r5, #3 @@ -14600,7 +14600,7 @@ _02234A8A: str r0, [r4, #0x2c] b _02234AA8 _02234AA4: - bl ErrorHandling + bl GF_AssertFail _02234AA8: add r0, r4, #0 bl MOD80_0222E8BC @@ -15866,7 +15866,7 @@ MOD80_022353B4: ; 0x022353B4 lsr r5, r0, #0x10 cmp r5, #0x3c blo _022353E0 - bl ErrorHandling + bl GF_AssertFail _022353E0: ldr r0, _022353F0 ; =0x00000FDC add r1, r5, #2 @@ -17695,7 +17695,7 @@ _02236208: add r0, #0xd4 pop {r3, pc} _02236210: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} thumb_func_end MOD80_022361E8 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index 5074a352..1d4b48de 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -1388,7 +1388,7 @@ MOD81_02238898: ; 0x02238898 ldr r0, [r0] cmp r0, #0x20 blt _022388A8 - bl ErrorHandling + bl GF_AssertFail _022388A8: ldr r0, _022388B8 ; =0x0223D3C0 ldr r2, [r0] diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s index bad84718..221d2f9d 100644 --- a/arm9/modules/85/asm/module_85.s +++ b/arm9/modules/85/asm/module_85.s @@ -1477,7 +1477,7 @@ MOD85_021D80F8: ; 0x021D80F8 bl AllocFromHeap add r4, r0, #0 bne _021D810C - bl ErrorHandling + bl GF_AssertFail _021D810C: add r0, r4, #0 mov r1, #0 @@ -1535,7 +1535,7 @@ _021D8168: add r5, r0, #0 cmp r5, #0 bne _021D8172 - bl ErrorHandling + bl GF_AssertFail _021D8172: ldr r0, _021D8184 ; =0x00000438 add r1, r6, #0 @@ -2477,7 +2477,7 @@ MOD85_021D885C: ; 0x021D885C ldr r0, [r4, #0x50] cmp r0, #6 blt _021D886A - bl ErrorHandling + bl GF_AssertFail _021D886A: mov r0, #0x19 str r0, [r4] @@ -2493,7 +2493,7 @@ MOD85_021D8874: ; 0x021D8874 ldr r0, [r4, #0x50] cmp r0, #6 blt _021D8882 - bl ErrorHandling + bl GF_AssertFail _021D8882: mov r0, #0x1c str r0, [r4] @@ -3175,7 +3175,7 @@ MOD85_021D8D88: ; 0x021D8D88 str r0, [r4, #0x10] cmp r0, #1 bge _021D8D9A - bl ErrorHandling + bl GF_AssertFail _021D8D9A: add r0, r4, #0 mov r1, #0 @@ -3715,7 +3715,7 @@ MOD85_021D91A4: ; 0x021D91A4 sub r0, r0, #1 str r0, [r4, #0x10] beq _021D91B4 - bl ErrorHandling + bl GF_AssertFail _021D91B4: ldr r0, [r4, #0x2c] cmp r0, #1 @@ -4226,7 +4226,7 @@ _021D950C: bl MOD85_021D95B4 pop {r3, pc} _021D9512: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} .align 2, 0 @@ -5579,7 +5579,7 @@ _021D9F0C: add r5, r5, #1 cmp r5, #0x15 ble _021D9EFC - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} _021D9F18: cmp r1, #0 @@ -5604,7 +5604,7 @@ _021D9F3A: add r5, r5, #1 cmp r5, #0x15 ble _021D9F28 - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} _021D9F46: mov r5, #1 @@ -5621,7 +5621,7 @@ _021D9F5A: add r5, r5, #1 cmp r5, #0x15 ble _021D9F48 - bl ErrorHandling + bl GF_AssertFail b _021D9F84 _021D9F66: mov r5, #1 @@ -5638,9 +5638,9 @@ _021D9F7A: add r5, r5, #1 cmp r5, #0x15 ble _021D9F68 - bl ErrorHandling + bl GF_AssertFail _021D9F84: - bl ErrorHandling + bl GF_AssertFail _021D9F88: pop {r4, r5, r6, pc} .align 2, 0 @@ -5678,7 +5678,7 @@ _021D9FC0: add r5, r5, #1 cmp r5, #0x15 blt _021D9FAE - bl ErrorHandling + bl GF_AssertFail _021D9FCA: ldr r0, [r6, #0x10] cmp r0, #0 @@ -5703,7 +5703,7 @@ _021D9FEE: add r5, r5, #1 cmp r5, #0x15 blt _021D9FDC - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _021D9FFA: mov r5, #0 @@ -5720,7 +5720,7 @@ _021DA00E: add r5, r5, #1 cmp r5, #0x15 ble _021D9FFC - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _021DA01A: mov r5, #0 @@ -5737,9 +5737,9 @@ _021DA02E: add r5, r5, #1 cmp r5, #0x15 ble _021DA01C - bl ErrorHandling + bl GF_AssertFail _021DA038: - bl ErrorHandling + bl GF_AssertFail _021DA03C: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -6044,7 +6044,7 @@ _021DA238: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _021DA240: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 add sp, #8 pop {r3, r4, r5, r6, r7, pc} @@ -7075,7 +7075,7 @@ _021DA9EE: ldr r0, _021DAA20 ; =0x021DFCC4 ldr r0, [r0, r1] str r0, [r5, #0x18] - bl ErrorHandling + bl GF_AssertFail add sp, #8 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -7158,7 +7158,7 @@ _021DAAA4: mov r1, #1 lsl r0, r0, #2 str r1, [r6, r0] - bl ErrorHandling + bl GF_AssertFail add sp, #8 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -7254,7 +7254,7 @@ _021DAB52: str r1, [r4, r0] pop {r3, r4, r5, pc} _021DAB6A: - bl ErrorHandling + bl GF_AssertFail mov r0, #2 ldr r1, [r4, #0x74] lsl r0, r0, #8 @@ -7470,7 +7470,7 @@ _021DACF8: add r2, #0x10 cmp r1, #9 blt _021DACC8 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} .align 2, 0 @@ -7686,7 +7686,7 @@ MOD85_021DAE70: ; 0x021DAE70 ldr r6, [r7, #0x48] cmp r6, #0 bne _021DAE80 - bl ErrorHandling + bl GF_AssertFail _021DAE80: mov r4, #0 _021DAE82: @@ -7713,7 +7713,7 @@ _021DAE9C: str r0, [r5, #0x18] b _021DAEB4 _021DAEB0: - bl ErrorHandling + bl GF_AssertFail _021DAEB4: add r4, r4, #1 lsr r6, r6, #1 @@ -9228,7 +9228,7 @@ MOD85_021DB95C: ; 0x021DB95C ldr r0, [r4, r0] cmp r0, #0 beq _021DB97A - bl ErrorHandling + bl GF_AssertFail _021DB97A: str r4, [sp] mov r0, #0x8f @@ -10066,7 +10066,7 @@ MOD85_021DBF48: ; 0x021DBF48 beq _021DBF6A cmp r4, #2 beq _021DBF62 - bl ErrorHandling + bl GF_AssertFail _021DBF62: ldr r1, [r5] mov r0, #1 @@ -10106,7 +10106,7 @@ _021DBF92: add r0, r2, #0 pop {r3, pc} _021DBF9C: - bl ErrorHandling + bl GF_AssertFail mov r0, #4 pop {r3, pc} thumb_func_end MOD85_021DBF70 @@ -10142,7 +10142,7 @@ _021DBFBE: _021DBFCC: cmp r4, #3 blt _021DBFD4 - bl ErrorHandling + bl GF_AssertFail _021DBFD4: lsl r0, r4, #2 add r0, r5, r0 @@ -10297,7 +10297,7 @@ MOD85_021DC0D8: ; 0x021DC0D8 ldr r5, [r0, #0x48] cmp r4, #6 bne _021DC0E6 - bl ErrorHandling + bl GF_AssertFail _021DC0E6: ldr r3, _021DC104 ; =0x021DFCAC lsl r2, r4, #2 @@ -11585,7 +11585,7 @@ MOD85_021DCA68: ; 0x021DCA68 ldr r4, [r6, #0x38] cmp r5, #5 blt _021DCA78 - bl ErrorHandling + bl GF_AssertFail _021DCA78: mov r1, #2 mov r2, #0x45 @@ -11630,7 +11630,7 @@ _021DCA78: bl FUN_0200CA60 cmp r0, #0 bne _021DCADC - bl ErrorHandling + bl GF_AssertFail _021DCADC: ldr r0, _021DCAFC ; =MOD85_021DCB44 ldr r2, _021DCAF8 ; =0x00000101 @@ -11638,7 +11638,7 @@ _021DCADC: bl FUN_0200CA98 cmp r0, #0 bne _021DCAEE - bl ErrorHandling + bl GF_AssertFail _021DCAEE: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -12012,7 +12012,7 @@ MOD85_021DCD50: ; 0x021DCD50 bl FUN_0200CA60 cmp r0, #0 bne _021DCDB8 - bl ErrorHandling + bl GF_AssertFail _021DCDB8: ldr r0, _021DCDD4 ; =MOD85_021DCD28 ldr r2, _021DCDD0 ; =0x00000101 @@ -12020,7 +12020,7 @@ _021DCDB8: bl FUN_0200CA98 cmp r0, #0 bne _021DCDCA - bl ErrorHandling + bl GF_AssertFail _021DCDCA: pop {r3, r4, r5, pc} .align 2, 0 @@ -12126,7 +12126,7 @@ MOD85_021DCE2C: ; 0x021DCE2C bl FUN_0200CA60 cmp r0, #0 bne _021DCE9C - bl ErrorHandling + bl GF_AssertFail _021DCE9C: ldr r0, _021DCEBC ; =MOD85_021DCE04 ldr r2, _021DCEB8 ; =0x00000101 @@ -12134,7 +12134,7 @@ _021DCE9C: bl FUN_0200CA98 cmp r0, #0 bne _021DCEAE - bl ErrorHandling + bl GF_AssertFail _021DCEAE: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -12967,7 +12967,7 @@ MOD85_021DD4C4: ; 0x021DD4C4 bl FUN_0200CA60 cmp r0, #0 bne _021DD52C - bl ErrorHandling + bl GF_AssertFail _021DD52C: ldr r0, _021DD548 ; =MOD85_021DD498 ldr r2, _021DD544 ; =0x00000101 @@ -12975,7 +12975,7 @@ _021DD52C: bl FUN_0200CA98 cmp r0, #0 bne _021DD53E - bl ErrorHandling + bl GF_AssertFail _021DD53E: pop {r3, r4, r5, pc} .align 2, 0 @@ -14780,7 +14780,7 @@ _021DE2BC: ldr r0, [r4, #0x1c] cmp r0, #5 blt _021DE2C6 - bl ErrorHandling + bl GF_AssertFail _021DE2C6: add r0, r4, #0 bl MOD85_021DE4F0 @@ -15154,7 +15154,7 @@ _021DE572: bl FUN_0200CA60 cmp r0, #0 bne _021DE584 - bl ErrorHandling + bl GF_AssertFail _021DE584: ldr r0, _021DE5A0 ; =MOD85_021DE4C8 ldr r2, _021DE59C ; =0x00000101 @@ -15162,7 +15162,7 @@ _021DE584: bl FUN_0200CA98 cmp r0, #0 bne _021DE596 - bl ErrorHandling + bl GF_AssertFail _021DE596: pop {r3, r4, r5, pc} .align 2, 0 @@ -15188,7 +15188,7 @@ MOD85_021DE5A4: ; 0x021DE5A4 bl AllocFromHeap add r4, r0, #0 bne _021DE5C8 - bl ErrorHandling + bl GF_AssertFail _021DE5C8: ldr r0, [sp] add r1, r4, #0 @@ -15558,7 +15558,7 @@ _021DE898: cmp r1, r5 blo _021DE85E _021DE8A0: - bl ErrorHandling + bl GF_AssertFail add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD85_021DE840 @@ -15589,7 +15589,7 @@ _021DE8CC: cmp r4, r2 blo _021DE8BA _021DE8D4: - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end MOD85_021DE8A8 @@ -15620,7 +15620,7 @@ _021DE900: cmp r4, r2 blo _021DE8EE _021DE908: - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end MOD85_021DE8DC @@ -15679,7 +15679,7 @@ _021DE96C: cmp r1, r5 blo _021DE92E _021DE974: - bl ErrorHandling + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} thumb_func_end MOD85_021DE910 @@ -15710,7 +15710,7 @@ _021DE9A0: cmp r4, r2 blo _021DE98E _021DE9A8: - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end MOD85_021DE97C @@ -15741,7 +15741,7 @@ _021DE9D4: cmp r4, r2 blo _021DE9C2 _021DE9DC: - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end MOD85_021DE9B0 @@ -15798,7 +15798,7 @@ _021DEA3C: cmp r1, r5 blo _021DEA02 _021DEA44: - bl ErrorHandling + bl GF_AssertFail add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD85_021DE9E4 @@ -15855,7 +15855,7 @@ _021DEAA4: cmp r1, r5 blo _021DEA6A _021DEAAC: - bl ErrorHandling + bl GF_AssertFail add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD85_021DEA4C @@ -16112,7 +16112,7 @@ _021DEC6C: str r0, [r4, #4] cmp r0, #0 bne _021DEC9A - bl ErrorHandling + bl GF_AssertFail _021DEC9A: add sp, #0x70 pop {r3, r4, r5, r6, r7, pc} diff --git a/arm9/src/error_handling.c b/arm9/src/error_handling.c index 7f006039..0b76ccff 100644 --- a/arm9/src/error_handling.c +++ b/arm9/src/error_handling.c @@ -5,7 +5,7 @@ -THUMB_FUNC void ErrorHandling(void) +THUMB_FUNC void GF_AssertFail(void) { if (FUN_02031810()) { diff --git a/arm9/src/filesystem.c b/arm9/src/filesystem.c index 3775b0b8..ed82acb9 100644 --- a/arm9/src/filesystem.c +++ b/arm9/src/filesystem.c @@ -176,7 +176,7 @@ THUMB_FUNC void ReadFromNarcMemberByPathAndId(void * dest, const char * path, s3 FS_ReadFile(&file, &chunk_size, 4); FS_ReadFile(&file, &num_files, 2); if (num_files <= file_idx) - ErrorHandling(); + GF_AssertFail(); chunk_starts[1] = chunk_starts[0] + chunk_size; FS_SeekFile(&file, (s32)(chunk_starts[1] + 4), FS_SEEK_SET); FS_ReadFile(&file, &chunk_size, 4); @@ -191,7 +191,7 @@ THUMB_FUNC void ReadFromNarcMemberByPathAndId(void * dest, const char * path, s3 else chunk_size = size; if (chunk_size == 0) - ErrorHandling(); + GF_AssertFail(); FS_ReadFile(&file, dest, (s32)chunk_size); FS_CloseFile(&file); } @@ -217,7 +217,7 @@ THUMB_FUNC void * AllocAndReadFromNarcMemberByPathAndId(const char * path, s32 f FS_ReadFile(&file, &chunk_size, 4); FS_ReadFile(&file, &num_files, 2); if (num_files <= file_idx) - ErrorHandling(); + GF_AssertFail(); chunk_starts[1] = chunk_starts[0] + chunk_size; FS_SeekFile(&file, (s32)(chunk_starts[1] + 4), FS_SEEK_SET); FS_ReadFile(&file, &chunk_size, 4); @@ -232,7 +232,7 @@ THUMB_FUNC void * AllocAndReadFromNarcMemberByPathAndId(const char * path, s32 f else chunk_size = size; if (chunk_size == 0) - ErrorHandling(); + GF_AssertFail(); switch (r4) { case 0: @@ -297,7 +297,7 @@ THUMB_FUNC u32 GetNarcMemberSizeByIdPair(NarcId narc_id, s32 file_idx) FS_ReadFile(&file, &chunk_size, 4); FS_ReadFile(&file, &num_files, 2); if (num_files <= file_idx) - ErrorHandling(); + GF_AssertFail(); chunk_starts[1] = chunk_starts[0] + chunk_size; FS_SeekFile(&file, (s32)(chunk_starts[1] + 4), FS_SEEK_SET); FS_ReadFile(&file, &chunk_size, 4); @@ -309,7 +309,7 @@ THUMB_FUNC u32 GetNarcMemberSizeByIdPair(NarcId narc_id, s32 file_idx) FS_SeekFile(&file, (s32)(chunk_starts[2] + 8 + file_start + 0), FS_SEEK_SET); chunk_size = file_end - file_start; if (chunk_size == 0) - ErrorHandling(); + GF_AssertFail(); // Bug: File is never closed return chunk_size; } @@ -349,7 +349,7 @@ THUMB_FUNC void * NARC_AllocAndReadWholeMember(NARC * narc, u32 file_id, u32 hea u32 file_end; void * dest; if (narc->num_files <= file_id) - ErrorHandling(); + GF_AssertFail(); FS_SeekFile(&narc->file, (s32)(narc->btaf_start + 12 + 8 * file_id), FS_SEEK_SET); FS_ReadFile(&narc->file, &file_start, 4); FS_ReadFile(&narc->file, &file_end, 4); @@ -367,7 +367,7 @@ THUMB_FUNC void NARC_ReadWholeMember(NARC * narc, u32 file_id, void * dest) u32 file_start; u32 file_end; if (narc->num_files <= file_id) - ErrorHandling(); + GF_AssertFail(); FS_SeekFile(&narc->file, (s32)(narc->btaf_start + 12 + 8 * file_id), FS_SEEK_SET); FS_ReadFile(&narc->file, &file_start, 4); FS_ReadFile(&narc->file, &file_end, 4); @@ -380,7 +380,7 @@ THUMB_FUNC u32 NARC_GetMemberSize(NARC * narc, u32 file_id) u32 file_start; u32 file_end; if (narc->num_files <= file_id) - ErrorHandling(); + GF_AssertFail(); FS_SeekFile(&narc->file, (s32)(narc->btaf_start + 12 + 8 * file_id), FS_SEEK_SET); FS_ReadFile(&narc->file, &file_start, 4); FS_ReadFile(&narc->file, &file_end, 4); @@ -391,7 +391,7 @@ THUMB_FUNC void NARC_ReadFromMember(NARC * narc, u32 file_id, u32 pos, u32 size, { u32 file_start; if (narc->num_files <= file_id) - ErrorHandling(); + GF_AssertFail(); FS_SeekFile(&narc->file, (s32)(narc->btaf_start + 12 + 8 * file_id), FS_SEEK_SET); FS_ReadFile(&narc->file, &file_start, 4); FS_SeekFile(&narc->file, (s32)(narc->gmif_start + 8 + file_start + pos), FS_SEEK_SET); diff --git a/arm9/src/game_init.c b/arm9/src/game_init.c index 12d18629..64ea7a54 100644 --- a/arm9/src/game_init.c +++ b/arm9/src/game_init.c @@ -181,12 +181,12 @@ void InitSystemForTheGame(void) void InitGraphicMemory(void) { GX_SetBankForLCDC(0x1FF); - MIi_CpuClearFast(0, (void *)HW_LCDC_VRAM, HW_LCDC_VRAM_SIZE); + MI_CpuClearFast((void *)HW_LCDC_VRAM, HW_LCDC_VRAM_SIZE); GX_DisableBankForLCDC(); - MIi_CpuClearFast(0xC0, (void *)HW_OAM, HW_OAM_SIZE); - MIi_CpuClearFast(0xC0, (void *)HW_DB_OAM, HW_DB_OAM_SIZE); - MIi_CpuClearFast(0, (void *)HW_PLTT, HW_PLTT_SIZE); - MIi_CpuClearFast(0, (void *)HW_DB_PLTT, HW_DB_PLTT_SIZE); + MI_CpuFillFast((void *)HW_OAM, 0xC0, HW_OAM_SIZE); + MI_CpuFillFast((void *)HW_DB_OAM, 0xC0, HW_DB_OAM_SIZE); + MI_CpuClearFast((void *)HW_PLTT, HW_PLTT_SIZE); + MI_CpuClearFast((void *)HW_DB_PLTT, HW_DB_PLTT_SIZE); } void * FUN_020161A4(u32 heap_id, const char * path) diff --git a/arm9/src/gf_rtc.c b/arm9/src/gf_rtc.c new file mode 100644 index 00000000..02fa735f --- /dev/null +++ b/arm9/src/gf_rtc.c @@ -0,0 +1,183 @@ +#include "global.h"
+#include "MI_memory.h"
+#include "gf_rtc.h"
+#include "RTC_convert.h"
+
+typedef struct GF_RTC_Work
+{
+ BOOL getDateTimeSuccess;
+ BOOL getDateTimeLock;
+ s32 getDateTimeSleep;
+ RTCResult getDateTimeErrorCode;
+ RTCDate date; // 10
+ RTCTime time; // 20
+ RTCDate date_async; // 2C
+ RTCTime time_async; // 3C
+} GF_RTC_Work;
+
+GF_RTC_Work sGFRTCWork;
+
+#define MAX_SECONDS (3155759999ll)
+
+void GF_RTC_GetDateTime(GF_RTC_Work * work);
+
+THUMB_FUNC void GF_InitRTCWork(void)
+{
+ RTC_Init();
+ __builtin__clear(&sGFRTCWork, sizeof(sGFRTCWork));
+ sGFRTCWork.getDateTimeSuccess = FALSE;
+ sGFRTCWork.getDateTimeLock = FALSE;
+ sGFRTCWork.getDateTimeSleep = 0;
+ GF_RTC_GetDateTime(&sGFRTCWork);
+}
+
+THUMB_FUNC void GF_RTC_UpdateOnFrame(void)
+{
+ if (!sGFRTCWork.getDateTimeLock)
+ {
+ if (++sGFRTCWork.getDateTimeSleep > 10)
+ {
+ sGFRTCWork.getDateTimeSleep = 0;
+ GF_RTC_GetDateTime(&sGFRTCWork);
+ }
+ }
+}
+
+THUMB_FUNC void GF_RTC_GetDateTime_Callback(RTCResult result, void * data)
+{
+ GF_RTC_Work * work = (GF_RTC_Work *)data;
+ work->getDateTimeErrorCode = result;
+ GF_ASSERT(result == RTC_RESULT_SUCCESS);
+ work->getDateTimeSuccess = TRUE;
+ work->date = work->date_async;
+ work->time = work->time_async;
+ work->getDateTimeLock = FALSE;
+}
+
+THUMB_FUNC void GF_RTC_GetDateTime(GF_RTC_Work * work)
+{
+ work->getDateTimeLock = TRUE;
+ RTCResult result = RTC_GetDateTimeAsync(&work->date_async, &work->time_async, GF_RTC_GetDateTime_Callback, work);
+ work->getDateTimeErrorCode = result;
+ GF_ASSERT(result == RTC_RESULT_SUCCESS);
+}
+
+THUMB_FUNC void GF_RTC_CopyDateTime(RTCDate * date, RTCTime * time)
+{
+ GF_ASSERT(sGFRTCWork.getDateTimeSuccess == TRUE);
+ *date = sGFRTCWork.date;
+ *time = sGFRTCWork.time;
+}
+
+THUMB_FUNC void GF_RTC_CopyTime(RTCTime * time)
+{
+ GF_ASSERT(sGFRTCWork.getDateTimeSuccess == TRUE);
+ *time = sGFRTCWork.time;
+}
+
+THUMB_FUNC void GF_RTC_CopyDate(RTCDate * date)
+{
+ GF_ASSERT(sGFRTCWork.getDateTimeSuccess == TRUE);
+ *date = sGFRTCWork.date;
+}
+
+THUMB_FUNC s32 GF_RTC_TimeToSec(void)
+{
+ RTCTime* time = &sGFRTCWork.time;
+ return 60 * time->minute + 3600 * time->hour + time->second;
+}
+
+THUMB_FUNC s64 GF_RTC_DateTimeToSec(void)
+{
+ return RTC_ConvertDateTimeToSecond(&sGFRTCWork.date, &sGFRTCWork.time);
+}
+
+static inline BOOL IsLeapYear(s32 year)
+{
+ return ((year % 4) == 0 && (year % 100) != 0) || ((year % 400) == 0);
+}
+
+THUMB_FUNC s32 GF_RTC_GetDayOfYear(const RTCDate * date)
+{
+ RTCDate date_stack;
+ s32 days;
+ static const u16 sGF_DaysPerMonth[] = {
+ 0, // Jan
+ 31, // Feb
+ 59, // Mar
+ 90, // Apr
+ 120, // May
+ 151, // Jun
+ 181, // Jul
+ 212, // Aug
+ 243, // Sep
+ 273, // Oct
+ 304, // Nov
+ 334, // Dec
+ };
+
+ days = date->day;
+ days += sGF_DaysPerMonth[date->month - 1];
+ if (date->month >= RTC_MONTH_MARCH && IsLeapYear(date->year))
+ days++;
+ date_stack = *date;
+ date_stack.month = RTC_MONTH_JANUARY;
+ date_stack.day = 1;
+ RTC_ConvertDateToDay(&date_stack);
+ RTC_ConvertDateToDay(date);
+ return days;
+}
+
+enum RTC_TimeOfDay GF_RTC_GetTimeOfDay(void);
+enum RTC_TimeOfDay GF_RTC_GetTimeOfDayByHour(s32 hour);
+
+THUMB_FUNC BOOL IsNighttime(void)
+{
+ switch (GF_RTC_GetTimeOfDay())
+ {
+ case RTC_TIMEOFDAY_NITE:
+ case RTC_TIMEOFDAY_LATE:
+ return TRUE;
+ default:
+ return FALSE;
+ }
+}
+
+THUMB_FUNC enum RTC_TimeOfDay GF_RTC_GetTimeOfDay(void)
+{
+ RTCTime time;
+ GF_RTC_CopyTime(&time);
+ return GF_RTC_GetTimeOfDayByHour(time.hour);
+}
+
+THUMB_FUNC enum RTC_TimeOfDay GF_RTC_GetTimeOfDayByHour(s32 hour)
+{
+ static const u8 sTimeOfDayByHour[] = {
+ // 00:00 - 03:59
+ RTC_TIMEOFDAY_LATE, RTC_TIMEOFDAY_LATE, RTC_TIMEOFDAY_LATE, RTC_TIMEOFDAY_LATE,
+ // 04:00 - 09:59
+ RTC_TIMEOFDAY_MORN, RTC_TIMEOFDAY_MORN, RTC_TIMEOFDAY_MORN, RTC_TIMEOFDAY_MORN, RTC_TIMEOFDAY_MORN, RTC_TIMEOFDAY_MORN,
+ // 10:00 - 16:59
+ RTC_TIMEOFDAY_DAY, RTC_TIMEOFDAY_DAY, RTC_TIMEOFDAY_DAY, RTC_TIMEOFDAY_DAY, RTC_TIMEOFDAY_DAY, RTC_TIMEOFDAY_DAY, RTC_TIMEOFDAY_DAY,
+ // 17:00 - 19:59
+ RTC_TIMEOFDAY_EVE, RTC_TIMEOFDAY_EVE, RTC_TIMEOFDAY_EVE,
+ // 20:00 - 23:59
+ RTC_TIMEOFDAY_NITE, RTC_TIMEOFDAY_NITE, RTC_TIMEOFDAY_NITE, RTC_TIMEOFDAY_NITE,
+ };
+
+ GF_ASSERT(hour >= 0 && hour < 24);
+ return sTimeOfDayByHour[hour];
+}
+
+THUMB_FUNC s64 GF_RTC_TimeDelta(s64 first, s64 last)
+{
+ RTCDate maxDate = { 99, 12, 31, 0 };
+ RTCTime maxTime = { 23, 59, 59 };
+
+ s64 check = RTC_ConvertDateTimeToSecond(&maxDate, &maxTime);
+ GF_ASSERT(check == MAX_SECONDS);
+ if (first < last)
+ return last - first;
+ else
+ return last + (MAX_SECONDS - first);
+}
diff --git a/arm9/src/heap.c b/arm9/src/heap.c index 7ae25c3b..7f35fdcc 100644 --- a/arm9/src/heap.c +++ b/arm9/src/heap.c @@ -73,7 +73,7 @@ THUMB_FUNC void FUN_020166C8(u32 *param0, u32 param1, u32 param2, u32 pre_size) } else { - ErrorHandling(); + GF_AssertFail(); } param0 += 2; @@ -162,27 +162,27 @@ THUMB_FUNC u32 FUN_02016834(u32 param0, u32 param1, u32 param2, s32 param3) } else { - ErrorHandling(); + GF_AssertFail(); } } else { - ErrorHandling(); + GF_AssertFail(); } } else { - ErrorHandling(); + GF_AssertFail(); } } else { - ErrorHandling(); + GF_AssertFail(); } } else { - ErrorHandling(); + GF_AssertFail(); } return 0; } @@ -204,7 +204,7 @@ THUMB_FUNC void FUN_020168D0(u32 heap_id) } else { - ErrorHandling(); + GF_AssertFail(); } UNK_021C4D28.unk00[UNK_021C4D28.unk10[heap_id]] = 0; @@ -306,7 +306,7 @@ void FreeToHeap(void *ptr) return; } - ErrorHandling(); + GF_AssertFail(); } void FreeToHeapExplicit(u32 param0, void *param1) @@ -329,7 +329,7 @@ void FreeToHeapExplicit(u32 param0, void *param1) return; } - ErrorHandling(); + GF_AssertFail(); } THUMB_FUNC u32 FUN_02016AF8(u32 param0) @@ -340,7 +340,7 @@ THUMB_FUNC u32 FUN_02016AF8(u32 param0) return NNS_FndGetTotalFreeSizeForExpHeap(UNK_021C4D28.unk00[index]); } - ErrorHandling(); + GF_AssertFail(); return 0; } @@ -354,7 +354,7 @@ THUMB_FUNC void FUN_02016B20(u32 param0, u32 param1, u32 param2) return; } - ErrorHandling(); + GF_AssertFail(); } THUMB_FUNC void FUN_02016B44(void *ptr, u32 param1) @@ -371,7 +371,7 @@ THUMB_FUNC void FUN_02016B44(void *ptr, u32 param1) NNS_FndResizeForMBlockExpHeap(UNK_021C4D28.unk00[index], ptr - 16, param1); return; } - ErrorHandling(); + GF_AssertFail(); } THUMB_FUNC u32 FUN_02016B90(u32 param0) diff --git a/arm9/src/main.c b/arm9/src/main.c index 314c4509..7a8a14d8 100644 --- a/arm9/src/main.c +++ b/arm9/src/main.c @@ -170,7 +170,7 @@ THUMB_FUNC void Main_RunOverlayManager(void) THUMB_FUNC void RegisterMainOverlay(FSOverlayID id, const struct Unk21DBE18 * arg1) { if (UNK_02016FA8.unkC != NULL) - ErrorHandling(); + GF_AssertFail(); UNK_02016FA8.unk8 = id; UNK_02016FA8.unkC = arg1; } diff --git a/arm9/src/poke_overlay.c b/arm9/src/poke_overlay.c index 4dd98670..e11ecbb6 100644 --- a/arm9/src/poke_overlay.c +++ b/arm9/src/poke_overlay.c @@ -9,9 +9,9 @@ static struct LoadedOverlay gLoadedOverlays[3][8]; THUMB_FUNC void FreeOverlayAllocation(struct LoadedOverlay * loaded) { if (loaded->active != TRUE) - ErrorHandling(); + GF_AssertFail(); if (FS_UnloadOverlay(MI_PROCESSOR_ARM9, loaded->id) != TRUE) - ErrorHandling(); + GF_AssertFail(); loaded->active = FALSE; } @@ -35,7 +35,7 @@ THUMB_FUNC s32 GetOverlayLoadDestination(FSOverlayID id) u8 *end; u8 *start; if (FS_LoadOverlayInfo(&info, MI_PROCESSOR_ARM9, id) != TRUE) - ErrorHandling(); + GF_AssertFail(); start = (u8 *)HW_ITCM_IMAGE; end = (u8 *)HW_ITCM_END; if (info.header.ram_address <= end && info.header.ram_address >= start) @@ -72,7 +72,7 @@ THUMB_FUNC BOOL HandleLoadOverlay(FSOverlayID id, s32 a1) } if (r6 >= 8) { - ErrorHandling(); + GF_AssertFail(); return FALSE; } if (r7 == OVERLAY_LOAD_ITCM || r7 == OVERLAY_LOAD_DTCM) @@ -91,7 +91,7 @@ THUMB_FUNC BOOL HandleLoadOverlay(FSOverlayID id, s32 a1) result = LoadOverlayNoInitAsync(MI_PROCESSOR_ARM9, id); break; default: - ErrorHandling(); + GF_AssertFail(); return FALSE; } if (r7 == OVERLAY_LOAD_ITCM || r7 == OVERLAY_LOAD_DTCM) @@ -100,7 +100,7 @@ THUMB_FUNC BOOL HandleLoadOverlay(FSOverlayID id, s32 a1) } if (result == 0) { - ErrorHandling(); + GF_AssertFail(); return FALSE; } return TRUE; @@ -120,7 +120,7 @@ THUMB_FUNC BOOL CanOverlayBeLoaded(FSOverlayID id) { if ((start >= start2 && start < end2) || (end > start2 && end <= end2) || (start <= start2 && end >= end2)) { - ErrorHandling(); + GF_AssertFail(); return FALSE; } } @@ -146,7 +146,7 @@ THUMB_FUNC BOOL GetOverlayRamBounds(FSOverlayID id, void ** start, void ** end) { FSOverlayInfo info; if (!FS_LoadOverlayInfo(&info, MI_PROCESSOR_ARM9, id)) { - ErrorHandling(); + GF_AssertFail(); return FALSE; } *start = (void *)info.header.ram_address; diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c index b3e53d1a..29075833 100644 --- a/arm9/src/pokemon.c +++ b/arm9/src/pokemon.c @@ -176,14 +176,14 @@ const s8 sNatureStatMods[][5] = { void ZeroMonData(struct Pokemon * pokemon) { - MIi_CpuClearFast(0, pokemon, sizeof(struct Pokemon)); + MI_CpuClearFast(pokemon, sizeof(struct Pokemon)); ENCRYPT_BOX(&pokemon->box); ENCRYPT_PTY(pokemon); } void ZeroBoxMonData(struct BoxPokemon * boxmon) { - MIi_CpuClearFast(0, boxmon, sizeof(struct BoxPokemon)); + MI_CpuClearFast(boxmon, sizeof(struct BoxPokemon)); ENCRYPT_BOX(boxmon); } @@ -272,7 +272,7 @@ void CreateMon(struct Pokemon * pokemon, int species, int level, int fixedIV, in FreeToHeap(mail); capsule = 0; SetMonData(pokemon, MON_DATA_CAPSULE, &capsule); - MIi_CpuClearFast(0, seal_coords, sizeof(seal_coords)); + MI_CpuClearFast(seal_coords, sizeof(seal_coords)); SetMonData(pokemon, MON_DATA_SEAL_COORDS, seal_coords); CalcMonLevelAndStats(pokemon); } @@ -3004,7 +3004,7 @@ void CopyBoxPokemonToPokemon(struct BoxPokemon * src, struct Pokemon * dest) SetMonData(dest, MON_DATA_MAIL_STRUCT, mail); FreeToHeap(mail); SetMonData(dest, MON_DATA_CAPSULE, &sp0); - MIi_CpuClearFast(0, &sp4, sizeof(sp4)); + MI_CpuClearFast(&sp4, sizeof(sp4)); SetMonData(dest, MON_DATA_SEAL_COORDS, &sp4); CalcMonLevelAndStats(dest); } @@ -3724,7 +3724,7 @@ void Pokemon_RemoveCapsule(struct Pokemon * pokemon) { u8 sp0 = 0; CapsuleArray sp1; - MIi_CpuClearFast(0, &sp1, sizeof(sp1)); + MI_CpuClearFast(&sp1, sizeof(sp1)); SetMonData(pokemon, MON_DATA_CAPSULE, &sp0); SetMonData(pokemon, MON_DATA_SEAL_COORDS, &sp1); } diff --git a/arm9/src/sav_chatot.c b/arm9/src/sav_chatot.c index 7b240a99..86786e66 100644 --- a/arm9/src/sav_chatot.c +++ b/arm9/src/sav_chatot.c @@ -10,7 +10,7 @@ THUMB_FUNC u32 Sav2_Chatot_sizeof(void) THUMB_FUNC void Sav2_Chatot_init(struct SaveChatotSoundClip * chatot)
{
- MIi_CpuClear32(0, chatot, sizeof(struct SaveChatotSoundClip));
+ MI_CpuClear32(chatot, sizeof(struct SaveChatotSoundClip));
chatot->exists = FALSE;
}
@@ -94,5 +94,5 @@ THUMB_FUNC void Chatot_Encode(struct SaveChatotSoundClip * chatot, const s8 * da THUMB_FUNC void Chatot_copy(struct SaveChatotSoundClip * dest, const struct SaveChatotSoundClip * src)
{
- MIi_CpuCopyFast(src, dest, sizeof(struct SaveChatotSoundClip));
+ MI_CpuCopyFast(src, dest, sizeof(struct SaveChatotSoundClip));
}
diff --git a/arm9/src/save.c b/arm9/src/save.c index 85d18d06..89bd8374 100644 --- a/arm9/src/save.c +++ b/arm9/src/save.c @@ -82,7 +82,7 @@ BOOL FUN_0202263C(struct SaveBlock2 * sav2) FlashClobberChunkFooter(sav2, 1, (u32)(sav2->unk_20220[1] == 0 ? 1 : 0)); FlashClobberChunkFooter(sav2, 0, (u32)(sav2->unk_20220[0])); FlashClobberChunkFooter(sav2, 1, (u32)(sav2->unk_20220[1])); - MIi_CpuClearFast(-1u, r6, 0x1000); + MI_CpuFillFast(r6, -1u, 0x1000); for (int i = 0; i < 64; i++) { FlashWriteChunk((u32)(0x1000 * i), r6, 0x1000); diff --git a/arm9/src/scrcmd_24.c b/arm9/src/scrcmd_24.c index d3f955d0..9c8f8d4b 100644 --- a/arm9/src/scrcmd_24.c +++ b/arm9/src/scrcmd_24.c @@ -62,7 +62,7 @@ THUMB_FUNC asm BOOL ScrCmd_Unk01C7(struct ScriptContext* ctx) ldr r0, [r4, #0x0] cmp r0, #0x0 bne _02045DFC - bl ErrorHandling + bl GF_AssertFail _02045DFC: ldr r0, [r4, #0x0] bl FUN_02037D5C @@ -199,7 +199,7 @@ THUMB_FUNC asm BOOL ScrCmd_Unk0223(struct ScriptContext* ctx) ldr r4, [r0, #0x0] cmp r4, #0x0 bne _02045FB2 - bl ErrorHandling + bl GF_AssertFail _02045FB2: ldrb r0, [r4, #0x16] cmp r0, #0x0 @@ -257,7 +257,7 @@ THUMB_FUNC asm BOOL ScrCmd_Unk0225(struct ScriptContext* ctx) ldr r4, [r0, #0x0] cmp r4, #0x0 bne _02045FB2 - bl ErrorHandling + bl GF_AssertFail _02045FB2: ldrb r0, [r4, #0x16] cmp r0, #0x0 diff --git a/arm9/src/script.c b/arm9/src/script.c index 2fa80058..3de2ee73 100644 --- a/arm9/src/script.c +++ b/arm9/src/script.c @@ -76,7 +76,7 @@ THUMB_FUNC u8 RunScriptCommand(struct ScriptContext *ctx) cmdCode = ScriptReadHalfword(ctx);
if (cmdCode >= ctx->cmdCount)
{
- ErrorHandling();
+ GF_AssertFail();
ctx->mode = 0;
return FALSE;
}
diff --git a/arm9/src/script_pokemon_util.c b/arm9/src/script_pokemon_util.c index a3518bf4..55519ca3 100644 --- a/arm9/src/script_pokemon_util.c +++ b/arm9/src/script_pokemon_util.c @@ -109,7 +109,7 @@ struct Pokemon * GetFirstAliveMonInParty_CrashIfNone(struct PlayerParty * party) if(MonNotFaintedOrEgg(mon))
return mon;
}
- ErrorHandling();
+ GF_AssertFail();
return 0;
}
diff --git a/arm9/src/text.c b/arm9/src/text.c index 5078f229..8676cbcc 100644 --- a/arm9/src/text.c +++ b/arm9/src/text.c @@ -331,7 +331,7 @@ THUMB_FUNC u16 *FUN_0201C1B0(void) void *res = AllocFromHeap(0, 32 * 24 * sizeof(u16)); struct UnkStruct_0200B870_sub * var; void *tmp = FUN_02006BB0(NARC_GRAPHIC_FONT, 5, 0, &var, 0); - MIi_CpuCopy32(var->unk_14, res, 32 * 24 * sizeof(u16)); + MI_CpuCopy32(var->unk_14, res, 32 * 24 * sizeof(u16)); FreeToHeap(tmp); return res; } diff --git a/arm9/src/unk_0200BA78.c b/arm9/src/unk_0200BA78.c index d98b5374..457001ef 100644 --- a/arm9/src/unk_0200BA78.c +++ b/arm9/src/unk_0200BA78.c @@ -25,7 +25,7 @@ THUMB_FUNC void FUN_0200BAAC( { if (param0->data[i] >= 0xa2 && param0->data[i] <= 0xab) { - MIi_CpuCopy32( + MI_CpuCopy32( ¶m0->unk_4->unk_14[(param0->data[i] - 0xa2) << 5], dest + i * 0x20, 0x20); } else diff --git a/arm9/src/unk_02016B94.c b/arm9/src/unk_02016B94.c index a8be5958..e01b3133 100644 --- a/arm9/src/unk_02016B94.c +++ b/arm9/src/unk_02016B94.c @@ -312,7 +312,7 @@ THUMB_FUNC void FUN_02016C18( { param0->unk08[param1].unk08 = AllocFromHeap(param0->unk00, param2->unk08); - MIi_CpuClear16(0, param0->unk08[param1].unk08, param2->unk08); + MI_CpuClear16(param0->unk08[param1].unk08, param2->unk08); param0->unk08[param1].unk0c = param2->unk08; param0->unk08[param1].unk10 = param2->unk0c; @@ -2580,11 +2580,11 @@ THUMB_FUNC void FUN_02017C98(const void *param0, void *param1, u32 param2) if (((u32)param0 % 4) == 0 && ((u32)param1 % 4) == 0 && ((u16)param2 % 4) == 0) { - MIi_CpuCopy32(param0, param1, param2); + MI_CpuCopy32(param0, param1, param2); return; } - MIi_CpuCopy16(param0, param1, param2); + MI_CpuCopy16(param0, param1, param2); } THUMB_FUNC void FUN_02017CD0(struct UnkStruct_02016B94_2 *param0, u32 param1) @@ -2749,7 +2749,7 @@ THUMB_FUNC void FUN_02017F48( r5 = r5 << 0x18 | r5 << 0x10 | r5 << 8 | r5; } - MIi_CpuClearFast(r5, st4, st0); + MI_CpuFillFast(st4, r5, st0); FUN_02017E84((u8)param1, st4, param0->unk08[param1].unk1f * param4, st0); FreeToHeap(st4); @@ -3285,7 +3285,7 @@ THUMB_FUNC void FUN_02018744(struct UnkStruct_02016B94_2 *param0, u32 param1) { if (param0->unk08[param1].unk08 != NULL) { - MIi_CpuClear16(0, param0->unk08[param1].unk08, param0->unk08[param1].unk0c); + MI_CpuClear16(param0->unk08[param1].unk08, param0->unk08[param1].unk0c); FUN_02017CD0(param0, param1); } } @@ -3294,7 +3294,7 @@ THUMB_FUNC void FUN_02018768(struct UnkStruct_02016B94_2 *param0, u32 param1, u1 { if (param0->unk08[param1].unk08 != NULL) { - MIi_CpuClear16(param2, param0->unk08[param1].unk08, param0->unk08[param1].unk0c); + MI_CpuFill16(param0->unk08[param1].unk08, param2, param0->unk08[param1].unk0c); FUN_02017CD0(param0, param1); } } @@ -3303,7 +3303,7 @@ THUMB_FUNC void FUN_0201878C(struct UnkStruct_02016B94_2 *param0, u32 param1, u1 { if (param0->unk08[param1].unk08 != NULL) { - MIi_CpuClear16(param2, param0->unk08[param1].unk08, param0->unk08[param1].unk0c); + MI_CpuFill16(param0->unk08[param1].unk08, param2, param0->unk08[param1].unk0c); FUN_0201AC68(param0, param1); } } @@ -4905,9 +4905,10 @@ THUMB_FUNC void FillWindowPixelBuffer(struct Window *window, u8 param1) param1 |= param1 << 4; } - MIi_CpuClearFast((u32)((param1 << 0x18) | (param1 << 0x10) | (param1 << 0x8) | param1), + MI_CpuFillFast( window->unk0c, - (u32)(window->unk00->unk08[window->unk04].unk1f * window->width * window->height)); + (u32)((param1 << 0x18) | (param1 << 0x10) | (param1 << 0x8) | param1), + (u32)(window->unk00->unk08[window->unk04].unk1f * window->width * window->height)); } THUMB_FUNC void BlitBitmapRectToWindow(struct Window *window, diff --git a/arm9/src/unk_02024E64.c b/arm9/src/unk_02024E64.c index d8682531..ad6a7eac 100644 --- a/arm9/src/unk_02024E64.c +++ b/arm9/src/unk_02024E64.c @@ -10,14 +10,14 @@ THUMB_FUNC u32 FUN_02024E64() THUMB_FUNC void FUN_02024E6C(struct UnkStruct_02024E64 *param0) { - MIi_CpuClearFast(0, param0, sizeof(struct UnkStruct_02024E64)); + MI_CpuClearFast(param0, sizeof(struct UnkStruct_02024E64)); FUN_020250A4(param0->unk0); FUN_02025484(param0->unk700); - MIi_CpuClear16(0xFFFF, param0->rival_name_buf, sizeof(param0->rival_name_buf) / sizeof(u16)); - MIi_CpuClear16(0xFFFF, param0->unk734, sizeof(param0->unk734) / sizeof(u16)); + MI_CpuFill16(param0->rival_name_buf, EOS, sizeof(param0->rival_name_buf) / sizeof(u16)); + MI_CpuFill16(param0->unk734, EOS, sizeof(param0->unk734) / sizeof(u16)); } THUMB_FUNC struct UnkStruct_02024E64 *FUN_02024EB4(struct SaveBlock2 *sav2) diff --git a/arm9/src/unk_0202ABBC.c b/arm9/src/unk_0202ABBC.c index 7bc9d3fc..75a43f60 100644 --- a/arm9/src/unk_0202ABBC.c +++ b/arm9/src/unk_0202ABBC.c @@ -15,7 +15,7 @@ THUMB_FUNC u32 FUN_0202ABC8() THUMB_FUNC void FUN_0202ABCC(struct Unk0202ABBC* unk) { - MIi_CpuClearFast(0, unk, 0xf4); + MI_CpuClearFast(unk, sizeof(struct Unk0202ABBC)); } THUMB_FUNC u16 FUN_0202ABDC(struct Unk0202ABBC* unk) @@ -30,12 +30,12 @@ THUMB_FUNC void FUN_0202ABE4(struct Unk0202ABBC* unk, u16 data) THUMB_FUNC void FUN_0202ABEC(void *srcp, void *destp) { - MIi_CpuCopyFast(srcp, destp, 0xec); + MI_CpuCopyFast(srcp, destp, 0xec); } THUMB_FUNC void FUN_0202ABF8(void *destp, void *srcp) { - MIi_CpuCopyFast(srcp, destp, 0xec); + MI_CpuCopyFast(srcp, destp, 0xec); } THUMB_FUNC u32 FUN_0202AC08(struct Unk0202ABBC* unk) diff --git a/arm9/src/unk_0202E29C.c b/arm9/src/unk_0202E29C.c index 938107f2..2b088d6f 100644 --- a/arm9/src/unk_0202E29C.c +++ b/arm9/src/unk_0202E29C.c @@ -432,7 +432,7 @@ THUMB_FUNC s32 FUN_0202E844(u32 param0) count++; } - ErrorHandling(); + GF_AssertFail(); return 0; } diff --git a/arm9/src/unk_0202F150.c b/arm9/src/unk_0202F150.c index 1586dae5..09b5b56f 100644 --- a/arm9/src/unk_0202F150.c +++ b/arm9/src/unk_0202F150.c @@ -95,7 +95,7 @@ THUMB_FUNC u32 FUN_0202F150(u32 param0, u32 param1) r4 = 1; if (UNK_021C59F4.unk04 == 0) { - ErrorHandling(); + GF_AssertFail(); } } @@ -1191,7 +1191,7 @@ THUMB_FUNC void FUN_020304D4(u32 param0) return; } - ErrorHandling(); + GF_AssertFail(); } THUMB_FUNC void FUN_020304F0(u32 param0) @@ -1202,7 +1202,7 @@ THUMB_FUNC void FUN_020304F0(u32 param0) return; } - ErrorHandling(); + GF_AssertFail(); } THUMB_FUNC void FUN_0203050C() @@ -1741,7 +1741,7 @@ THUMB_FUNC u32 FUN_02030B3C(u32 param0, u8 *param1, u32 param2) { if (FUN_02031190() != 0) { - ErrorHandling(); + GF_AssertFail(); return 0; } diff --git a/arm9/src/unk_0206439C.c b/arm9/src/unk_0206439C.c new file mode 100644 index 00000000..80d93557 --- /dev/null +++ b/arm9/src/unk_0206439C.c @@ -0,0 +1,16 @@ +#include "global.h" +#include "heap.h" +#include "party.h" +#include "save_block_2.h" +#include "unk_0206439C.h" + +THUMB_FUNC struct UnkStruct_0206439C* FUN_0206439C(u32 heap_id, u8 mon_idx, struct SaveBlock2* sav2) +{ + struct UnkStruct_0206439C* ret = AllocFromHeapAtEnd(heap_id, sizeof(struct UnkStruct_0206439C)); + struct PlayerParty* party = SavArray_PlayerParty_get(sav2); + + ret->pokemon = GetPartyMonByIndex(party, mon_idx); + ret->unk4 = NULL; + + return ret; +} diff --git a/include/error_handling.h b/include/error_handling.h index 1299fcba..c14c93fe 100644 --- a/include/error_handling.h +++ b/include/error_handling.h @@ -1,6 +1,6 @@ #ifndef POKEDIAMOND_ERROR_HANDLING_H #define POKEDIAMOND_ERROR_HANDLING_H -void ErrorHandling(void); +void GF_AssertFail(void); #endif //POKEDIAMOND_ERROR_HANDLING_H diff --git a/include/gf_rtc.h b/include/gf_rtc.h new file mode 100644 index 00000000..f7a4e2a7 --- /dev/null +++ b/include/gf_rtc.h @@ -0,0 +1,31 @@ +#ifndef POKEDIAMOND_GF_RTC_H
+#define POKEDIAMOND_GF_RTC_H
+
+#include "RTC_api.h"
+
+enum RTC_Month
+{
+ RTC_MONTH_JANUARY = 1,
+ RTC_MONTH_FEBRUARY,
+ RTC_MONTH_MARCH,
+ RTC_MONTH_APRIL,
+ RTC_MONTH_MAY,
+ RTC_MONTH_JUNE,
+ RTC_MONTH_JULY,
+ RTC_MONTH_AUGUST,
+ RTC_MONTH_SEPTEMBER,
+ RTC_MONTH_OCTOBER,
+ RTC_MONTH_NOVEMBER,
+ RTC_MONTH_DECEMBER,
+};
+
+enum RTC_TimeOfDay
+{
+ RTC_TIMEOFDAY_MORN = 0,
+ RTC_TIMEOFDAY_DAY,
+ RTC_TIMEOFDAY_EVE,
+ RTC_TIMEOFDAY_NITE,
+ RTC_TIMEOFDAY_LATE,
+};
+
+#endif //POKEDIAMOND_GF_RTC_H
diff --git a/include/global.h b/include/global.h index 1c92a1ec..1853dbc3 100644 --- a/include/global.h +++ b/include/global.h @@ -11,7 +11,7 @@ #define NELEMS(a) (sizeof(a) / sizeof(*(a))) -#define GF_ASSERT(expr) do {if (!(expr)) ErrorHandling();} while (0) +#define GF_ASSERT(expr) do {if (!(expr)) GF_AssertFail();} while (0) #ifndef IN_MAIN_C extern const u8 gGameLanguage; diff --git a/include/unk_0206439C.h b/include/unk_0206439C.h new file mode 100644 index 00000000..6d094e5c --- /dev/null +++ b/include/unk_0206439C.h @@ -0,0 +1,15 @@ +#ifndef POKEDIAMOND_UNK_0206439C_H +#define POKEDIAMOND_UNK_0206439C_H + +struct Pokemon; +struct SaveBlock2; + +struct UnkStruct_0206439C +{ + struct Pokemon* pokemon; + void* unk4; +}; + +struct UnkStruct_0206439C* FUN_0206439C(u32 heap_id, u8 mon_idx, struct SaveBlock2* sav2); + +#endif |