diff options
Diffstat (limited to 'arm9/modules')
53 files changed, 1272 insertions, 1272 deletions
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} |