summaryrefslogtreecommitdiff
path: root/arm9/modules/17/asm/module_17.s
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules/17/asm/module_17.s')
-rw-r--r--arm9/modules/17/asm/module_17.s92
1 files changed, 46 insertions, 46 deletions
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 06:00:12 +0000