summaryrefslogtreecommitdiff
path: root/arm9/modules/05/asm/module_05.s
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules/05/asm/module_05.s')
-rw-r--r--arm9/modules/05/asm/module_05.s384
1 files changed, 192 insertions, 192 deletions
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index fe346300..006e8bb1 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -339,7 +339,7 @@ MOD05_021E88C0: ; 0x021E88C0
bl GX_EngineAToggleLayers
ldr r1, [r4]
mov r0, #4
- bl FUN_02016A8C
+ bl FreeToHeapExplicit
pop {r4, pc}
thumb_func_start MOD05_021E88E8
@@ -513,7 +513,7 @@ _021E8A42:
bl MOD05_021E37A4
ldr r1, [r4, #0xc]
mov r0, #4
- bl FUN_02016A8C
+ bl FreeToHeapExplicit
add r0, r6, #0
bl FUN_0200621C
_021E8A56:
@@ -695,7 +695,7 @@ _021E8BC2:
bl MOD05_021E37A4
ldr r1, [r4, #0xc]
mov r0, #4
- bl FUN_02016A8C
+ bl FreeToHeapExplicit
add r0, r6, #0
bl FUN_0200621C
_021E8BD6:
@@ -851,7 +851,7 @@ _021E8CE6:
_021E8D00:
ldr r1, [r4, #0xc]
mov r0, #4
- bl FUN_02016A8C
+ bl FreeToHeapExplicit
add r0, r6, #0
bl FUN_0200621C
mov r0, #1
@@ -1008,7 +1008,7 @@ _021E8E1C:
_021E8E36:
ldr r1, [r4, #0xc]
mov r0, #4
- bl FUN_02016A8C
+ bl FreeToHeapExplicit
add r0, r6, #0
bl FUN_0200621C
mov r0, #1
@@ -1256,7 +1256,7 @@ _021E8FFC:
_021E9010:
ldr r1, [r4, #0xc]
mov r0, #4
- bl FUN_02016A8C
+ bl FreeToHeapExplicit
add r0, r6, #0
bl FUN_0200621C
mov r0, #1
@@ -1391,7 +1391,7 @@ _021E910C:
_021E9120:
ldr r1, [r4, #0xc]
mov r0, #4
- bl FUN_02016A8C
+ bl FreeToHeapExplicit
add r0, r6, #0
bl FUN_0200621C
mov r0, #1
@@ -1794,7 +1794,7 @@ _021E944E:
bl MOD05_021E37A4
ldr r1, [r7, #0xc]
mov r0, #4
- bl FUN_02016A8C
+ bl FreeToHeapExplicit
ldr r0, [sp, #0x10]
bl FUN_0200621C
_021E948A:
@@ -2151,7 +2151,7 @@ _021E974A:
bl MOD05_021E3A48
ldr r1, [r6, #0xc]
mov r0, #4
- bl FUN_02016A8C
+ bl FreeToHeapExplicit
ldr r0, [sp, #0x10]
bl FUN_0200621C
_021E9786:
@@ -2594,7 +2594,7 @@ _021E9AF0:
bl MOD05_021E3E44
ldr r1, [r7, #0xc]
mov r0, #4
- bl FUN_02016A8C
+ bl FreeToHeapExplicit
ldr r0, [sp, #0x14]
bl FUN_0200621C
add sp, #0x58
@@ -2737,7 +2737,7 @@ _021E9C02:
bl GX_EngineAToggleLayers
mov r0, #4
mov r1, #1
- bl FUN_02018FF4
+ bl AllocWindows
mov r1, #0x83
lsl r1, r1, #2
str r0, [r4, r1]
@@ -2766,7 +2766,7 @@ _021E9C02:
lsl r0, r0, #2
ldr r0, [r4, r0]
mov r1, #0
- bl FUN_02019620
+ bl FillWindowPixelBuffer
mov r0, #0x83
lsl r0, r0, #2
ldr r0, [r4, r0]
@@ -3183,7 +3183,7 @@ _021E9FA4:
ldr r1, [sp, #0x1c]
mov r0, #4
ldr r1, [r1, #0xc]
- bl FUN_02016A8C
+ bl FreeToHeapExplicit
ldr r0, [sp, #0x18]
bl FUN_0200621C
add sp, #0x44
@@ -3594,7 +3594,7 @@ _021EA354:
bl MOD05_021E3E44
ldr r1, [r5, #0xc]
mov r0, #4
- bl FUN_02016A8C
+ bl FreeToHeapExplicit
add r0, r6, #0
bl FUN_0200621C
_021EA382:
@@ -3709,7 +3709,7 @@ _021EA430:
bl GX_EngineAToggleLayers
mov r0, #4
mov r1, #1
- bl FUN_02018FF4
+ bl AllocWindows
mov r1, #2
lsl r1, r1, #8
str r0, [r4, r1]
@@ -3738,7 +3738,7 @@ _021EA430:
lsl r0, r0, #8
ldr r0, [r4, r0]
mov r1, #0
- bl FUN_02019620
+ bl FillWindowPixelBuffer
mov r0, #2
lsl r0, r0, #8
ldr r0, [r4, r0]
@@ -4116,7 +4116,7 @@ _021EA76C:
ldr r1, [sp, #0x18]
mov r0, #4
ldr r1, [r1, #0xc]
- bl FUN_02016A8C
+ bl FreeToHeapExplicit
ldr r0, [sp, #0x14]
bl FUN_0200621C
_021EA7DE:
@@ -4472,7 +4472,7 @@ _021EAA98:
bl MOD05_021E3E44
ldr r1, [r4, #0xc]
mov r0, #4
- bl FUN_02016A8C
+ bl FreeToHeapExplicit
add r0, r6, #0
bl FUN_0200621C
_021EAAC6:
@@ -4781,7 +4781,7 @@ _021EAD1A:
bl MOD05_021E3E44
ldr r1, [r6, #0xc]
mov r0, #4
- bl FUN_02016A8C
+ bl FreeToHeapExplicit
ldr r0, [sp, #0x10]
bl FUN_0200621C
_021EAD4C:
@@ -5156,7 +5156,7 @@ _021EB01A:
ldr r1, [sp, #0x14]
mov r0, #4
ldr r1, [r1, #0xc]
- bl FUN_02016A8C
+ bl FreeToHeapExplicit
ldr r0, [sp, #0x10]
bl FUN_0200621C
_021EB04A:
@@ -5380,7 +5380,7 @@ _021EB18E:
str r0, [r4, #4]
mov r0, #4
mov r1, #1
- bl FUN_02018FF4
+ bl AllocWindows
str r0, [r4]
mov r3, #0
str r3, [sp]
@@ -5404,7 +5404,7 @@ _021EB18E:
bl FUN_02017FB4
ldr r0, [r4]
mov r1, #0
- bl FUN_02019620
+ bl FillWindowPixelBuffer
ldr r0, [r4]
bl FUN_02019220
ldr r0, [r5]
@@ -5586,7 +5586,7 @@ _021EB394:
strb r1, [r0]
ldr r1, [r5, #0xc]
mov r0, #4
- bl FUN_02016A8C
+ bl FreeToHeapExplicit
add r0, r6, #0
bl FUN_0200621C
_021EB3F2:
@@ -5797,7 +5797,7 @@ _021EB56C:
_021EB58A:
ldr r1, [r4, #0xc]
mov r0, #4
- bl FUN_02016A8C
+ bl FreeToHeapExplicit
add r0, r6, #0
bl FUN_0200621C
mov r0, #1
@@ -6008,7 +6008,7 @@ _021EB720:
_021EB73E:
ldr r1, [r4, #0xc]
mov r0, #4
- bl FUN_02016A8C
+ bl FreeToHeapExplicit
add r0, r6, #0
bl FUN_0200621C
mov r0, #1
@@ -6506,7 +6506,7 @@ _021EBB60:
str r0, [r2]
ldr r1, [r5, #0xc]
mov r0, #4
- bl FUN_02016A8C
+ bl FreeToHeapExplicit
add sp, #0x30
mov r0, #1
pop {r3, r4, r5, r6, r7, pc}
@@ -7514,7 +7514,7 @@ _021EC37A:
bl MOD05_021E3E44
ldr r1, [r5, #0xc]
mov r0, #4
- bl FUN_02016A8C
+ bl FreeToHeapExplicit
add sp, #0x4c
mov r0, #1
pop {r4, r5, r6, r7, pc}
@@ -7747,8 +7747,8 @@ _021EC544:
cmp r0, #0
bne _021EC572
add r0, r7, #0
- bl FUN_02029EF8
- bl FUN_02029F08
+ bl Sav2_Chatot_get
+ bl Chatot_invalidate
_021EC572:
add sp, #0x24
pop {r4, r5, r6, r7, pc}
@@ -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
@@ -12073,7 +12073,7 @@ _021EE78C:
bne _021EE7C4
sub r0, #0x10
ldr r0, [r2, r0]
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
add r7, r0, #0
ldrh r0, [r7, #0xe]
add r0, r7, r0
@@ -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
@@ -13883,8 +13883,8 @@ MOD05_021EF514: ; 0x021EF514
push {r3, r4, r5, r6, r7, lr}
add r5, r0, #0
bl FUN_020162FC
- bl FUN_020AF6A4
- bl FUN_020AFA30
+ bl NNS_GfdResetLnkTexVramState
+ bl NNS_GfdResetLnkPlttVramState
mov r4, #0
add r6, r5, #4
mov r7, #0x30
@@ -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
@@ -14531,23 +14531,23 @@ _021EF9B0:
_021EF9B6:
ldr r0, [r4, #0xc]
ldr r0, [r0]
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
add r5, r0, #0
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
- bl FUN_020B80B4
+ bl NNS_G3dRenderObjInit
ldr r0, [r4, #0x18]
mov r1, #1
str r1, [r0]
@@ -14618,27 +14618,27 @@ MOD05_021EFA40: ; 0x021EFA40
bl FUN_0201B3A8
cmp r0, #0
bne _021EFA6A
- bl ErrorHandling
+ bl GF_AssertFail
_021EFA6A:
ldr r0, [r4]
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
ldrb r0, [r0, #9]
cmp r0, #1
beq _021EFA7A
- bl ErrorHandling
+ bl GF_AssertFail
_021EFA7A:
ldr r0, [r4]
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
ldrh r1, [r0, #0xe]
add r1, r0, r1
ldr r1, [r1, #0xc]
add r4, r0, r1
bne _021EFA8E
- bl ErrorHandling
+ bl GF_AssertFail
_021EFA8E:
add r0, r5, #0
add r1, r4, #0
- bl FUN_020B80B4
+ bl NNS_G3dRenderObjInit
add r0, r4, #0
pop {r3, r4, r5, pc}
.balign 4, 0
@@ -15197,7 +15197,7 @@ MOD05_021EFEDC: ; 0x021EFEDC
add r7, r0, #0
add r0, r7, #1
mov r1, #4
- bl ListMenu_ctor
+ bl ListMenuItems_ctor
str r0, [r5]
mov r0, #1
str r0, [sp]
@@ -15238,7 +15238,7 @@ _021EFF2E:
ldr r0, [r5]
ldr r1, [r5, #8]
add r2, r4, #0
- bl ListMenu_AddItem
+ bl ListMenuItems_AddItem
_021EFF54:
add r4, r4, #1
cmp r4, #0x20
@@ -15248,7 +15248,7 @@ _021EFF54:
ldr r0, [r5]
ldr r1, [r5, #0x3c]
sub r3, #0xd
- bl ListMenu_ItemFromMsgData
+ bl ListMenuItems_AppendFromMsgData
ldr r4, _021EFFC0 ; =UNK05_021F8B4C
add r3, sp, #0x14
add r2, r3, #0
@@ -15277,7 +15277,7 @@ _021EFF54:
add r0, r2, #0
add r2, r1, #0
mov r3, #4
- bl FUN_020010A8
+ bl ListMenuInit
str r0, [r5, #4]
add r0, r5, #0
add r0, #0x20
@@ -15298,7 +15298,7 @@ MOD05_021EFFC8: ; 0x021EFFC8
push {r3, r4, r5, r6, r7, lr}
add r5, r0, #0
ldr r0, [r5, #4]
- bl FUN_02001204
+ bl ListMenu_ProcessInput
add r4, r0, #0
mov r0, #1
mvn r0, r0
@@ -15366,9 +15366,9 @@ _021F0056:
mov r1, #0
ldr r0, [r5, #4]
add r2, r1, #0
- bl FUN_02001300
+ bl DestroyListMenu
ldr r0, [r5]
- bl ListMenu_dtor
+ bl ListMenuItems_dtor
mov r0, #0
pop {r3, r4, r5, r6, r7, pc}
.balign 4, 0
@@ -15780,7 +15780,7 @@ _021F03A8:
asr r0, r1, #4
lsl r3, r0, #1
lsl r1, r3, #1
- ldr r2, _021F0438 ; =UNK_020FFA38
+ ldr r2, _021F0438 ; =FX_SinCosTable_
add r3, r3, #1
lsl r3, r3, #1
ldrsh r1, [r2, r1]
@@ -15794,7 +15794,7 @@ _021F03A8:
asr r0, r5, #4
lsl r2, r0, #1
lsl r1, r2, #1
- ldr r3, _021F0438 ; =UNK_020FFA38
+ ldr r3, _021F0438 ; =FX_SinCosTable_
add r2, r2, #1
lsl r2, r2, #1
ldrsh r1, [r3, r1]
@@ -15839,7 +15839,7 @@ _021F03A8:
pop {r4, r5, r6, r7, pc}
nop
_021F0434: .word UNK05_021F8B6C
-_021F0438: .word UNK_020FFA38
+_021F0438: .word FX_SinCosTable_
thumb_func_start MOD05_021F043C
MOD05_021F043C: ; 0x021F043C
@@ -15866,7 +15866,7 @@ MOD05_021F0454: ; 0x021F0454
bl FUN_0201F008
strh r0, [r5]
ldrh r0, [r5]
- ldr r2, _021F04F0 ; =UNK_020FFA38
+ ldr r2, _021F04F0 ; =FX_SinCosTable_
asr r0, r0, #4
lsl r1, r0, #1
lsl r0, r1, #1
@@ -15909,7 +15909,7 @@ MOD05_021F0454: ; 0x021F0454
str r0, [r5, #0x1c]
add r0, sp, #0
ldrh r0, [r0]
- ldr r3, _021F04F0 ; =UNK_020FFA38
+ ldr r3, _021F04F0 ; =FX_SinCosTable_
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -15924,7 +15924,7 @@ MOD05_021F0454: ; 0x021F0454
add sp, #0x2c
pop {r4, r5, pc}
nop
-_021F04F0: .word UNK_020FFA38
+_021F04F0: .word FX_SinCosTable_
_021F04F4: .word UNK05_021F8B78
thumb_func_start MOD05_021F04F8
@@ -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:
@@ -19600,11 +19600,11 @@ MOD05_021F21AC: ; 0x021F21AC
add r1, #0xe4
ldr r1, [r1]
mov r0, #4
- bl FUN_02016A8C
+ bl FreeToHeapExplicit
add r4, #0xf4
ldr r1, [r4]
mov r0, #4
- bl FUN_02016A8C
+ bl FreeToHeapExplicit
pop {r4, pc}
thumb_func_start MOD05_021F21CC
@@ -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
@@ -21368,7 +21368,7 @@ MOD05_021F2E70: ; 0x021F2E70
add r0, r4, #0
bl FUN_0201F8E0
mov r1, #1
- bl FUN_020BB9F4
+ bl NNS_G3dMdlSetMdlFogEnableFlagAll
add r0, r4, #0
bl FUN_0201F8E0
bl MOD05_021DB5EC
@@ -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,14 +22296,14 @@ _021F358C:
ldr r0, _021F36C8 ; =0x0000FFFF
cmp r1, r0
bne _021F3596
- bl ErrorHandling
+ bl GF_AssertFail
_021F3596:
ldr r0, [sp, #0x18]
ldr r1, [r4, #4]
mov r2, #0
bl MOD05_021F2DB0
str r0, [r5, #0x10]
- bl FUN_020BC0FC
+ bl NNS_G3dGetTex
add r4, r0, #0
add r0, r6, #0
bl MOD05_021F2E00
@@ -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
@@ -22552,12 +22552,12 @@ _021F37C2:
thumb_func_start MOD05_021F37D0
MOD05_021F37D0: ; 0x021F37D0
- ldr r3, _021F37D8 ; =FUN_02016A8C
+ ldr r3, _021F37D8 ; =FreeToHeapExplicit
add r1, r0, #0
ldr r0, [r1]
bx r3
.balign 4, 0
-_021F37D8: .word FUN_02016A8C
+_021F37D8: .word FreeToHeapExplicit
thumb_func_start MOD05_021F37DC
MOD05_021F37DC: ; 0x021F37DC
@@ -22588,7 +22588,7 @@ _021F37FC:
bne _021F37F0
ldr r0, [r5]
ldr r1, [r5, #0xc]
- bl FUN_02016A8C
+ bl FreeToHeapExplicit
_021F380E:
pop {r3, r4, r5, pc}
@@ -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
@@ -25006,7 +25006,7 @@ _021F49E4:
str r0, [r5, r1]
sub r0, r1, #4
ldr r0, [r5, r0]
- bl FUN_020BC0FC
+ bl NNS_G3dGetTex
ldr r1, _021F4BA8 ; =0x000008A4
str r0, [r5, r1]
ldrh r0, [r7, #8]
@@ -25014,7 +25014,7 @@ _021F49E4:
beq _021F4A2C
sub r0, r1, #4
ldr r0, [r5, r0]
- bl FUN_020BC0FC
+ bl NNS_G3dGetTex
ldr r1, _021F4BB0 ; =0x000008A8
str r0, [r5, r1]
b _021F4A32
@@ -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
@@ -25099,7 +25099,7 @@ _021F4ABE:
cmp r6, r0
bge _021F4AEC
ldr r0, [r4, #4]
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
add r1, r0, #0
ldrh r2, [r1, #0xe]
ldr r3, [r7, #4]
@@ -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]
@@ -25137,20 +25137,20 @@ _021F4B10:
mov r2, #4
bl NARC_AllocAndReadWholeMember
str r0, [r5, #4]
- bl FUN_020BC0FC
+ bl NNS_G3dGetTex
add r4, r0, #0
beq _021F4B46
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
@@ -26118,9 +26118,9 @@ MOD05_021F5268: ; 0x021F5268
add r1, r2, #0
str r5, [sp]
add r2, r5, #0
- bl UncompressFromNarc
+ bl GfGfxLoader_LoadFromNarc
str r0, [r4]
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
str r0, [r4, #4]
ldrh r1, [r0, #0xe]
add r1, r0, r1
@@ -26128,7 +26128,7 @@ MOD05_021F5268: ; 0x021F5268
add r0, r0, r1
str r0, [r4, #8]
ldr r0, [r4]
- bl FUN_020BC0FC
+ bl NNS_G3dGetTex
str r0, [r4, #0xc]
cmp r0, #0
beq _021F52A4
@@ -26166,18 +26166,18 @@ MOD05_021F52C8: ; 0x021F52C8
beq _021F52F8
add r1, sp, #4
add r2, sp, #0
- bl FUN_020B7CF0
- ldr r1, _021F5314 ; =UNK_021064BC
+ bl NNS_G3dTexReleaseTexKey
+ ldr r1, _021F5314 ; =NNS_GfdDefaultFuncFreeTexVram
ldr r0, [sp, #4]
ldr r1, [r1]
blx r1
- ldr r1, _021F5314 ; =UNK_021064BC
+ ldr r1, _021F5314 ; =NNS_GfdDefaultFuncFreeTexVram
ldr r0, [sp]
ldr r1, [r1]
blx r1
ldr r0, [r4, #0xc]
- bl FUN_020B7C58
- ldr r1, _021F5318 ; =UNK_021064C4
+ bl NNS_G3dPlttReleasePlttKey
+ ldr r1, _021F5318 ; =NNS_GfdDefaultFuncFreePlttVram
ldr r1, [r1]
blx r1
_021F52F8:
@@ -26196,8 +26196,8 @@ _021F5306:
add sp, #8
pop {r4, pc}
nop
-_021F5314: .word UNK_021064BC
-_021F5318: .word UNK_021064C4
+_021F5314: .word NNS_GfdDefaultFuncFreeTexVram
+_021F5318: .word NNS_GfdDefaultFuncFreePlttVram
thumb_func_start MOD05_021F531C
MOD05_021F531C: ; 0x021F531C
@@ -26211,7 +26211,7 @@ MOD05_021F531C: ; 0x021F531C
ldr r3, [sp, #0x18]
add r2, r6, #0
str r6, [sp]
- bl UncompressFromNarc
+ bl GfGfxLoader_LoadFromNarc
add r2, r0, #0
ldr r3, [sp, #0x1c]
add r0, r5, #0
@@ -26241,7 +26241,7 @@ MOD05_021F5358: ; 0x021F5358
beq _021F5376
add r0, r1, #0
ldr r1, [r4, #8]
- bl thunk_FUN_020ae84c
+ bl NNS_G3dFreeAnmObj
ldr r0, [r4, #0x10]
cmp r0, #0
bne _021F5376
@@ -26343,7 +26343,7 @@ MOD05_021F5400: ; 0x021F5400
bl memset
ldr r1, [r5, #8]
add r0, r4, #0
- bl FUN_020B80B4
+ bl NNS_G3dRenderObjInit
mov r0, #1
str r0, [r4, #0x6c]
lsl r0, r0, #0xc
@@ -26354,11 +26354,11 @@ MOD05_021F5400: ; 0x021F5400
thumb_func_start MOD05_021F5424
MOD05_021F5424: ; 0x021F5424
- ldr r3, _021F542C ; =FUN_020B7EFC
+ ldr r3, _021F542C ; =NNS_G3dRenderObjAddAnmObj
ldr r1, [r1, #8]
bx r3
nop
-_021F542C: .word FUN_020B7EFC
+_021F542C: .word NNS_G3dRenderObjAddAnmObj
thumb_func_start MOD05_021F5430
MOD05_021F5430: ; 0x021F5430
@@ -26373,7 +26373,7 @@ MOD05_021F5430: ; 0x021F5430
add r0, r4, #0
add r0, #0x70
ldrh r0, [r0]
- ldr r3, _021F54C8 ; =UNK_020FFA38
+ ldr r3, _021F54C8 ; =FX_SinCosTable_
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -26390,7 +26390,7 @@ MOD05_021F5430: ; 0x021F5430
add r0, r4, #0
add r0, #0x74
ldrh r0, [r0]
- ldr r3, _021F54C8 ; =UNK_020FFA38
+ ldr r3, _021F54C8 ; =FX_SinCosTable_
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -26407,7 +26407,7 @@ MOD05_021F5430: ; 0x021F5430
add r0, r4, #0
add r0, #0x72
ldrh r0, [r0]
- ldr r3, _021F54C8 ; =UNK_020FFA38
+ ldr r3, _021F54C8 ; =FX_SinCosTable_
asr r0, r0, #4
lsl r2, r0, #1
lsl r1, r2, #1
@@ -26432,7 +26432,7 @@ _021F54C4:
add sp, #0x48
pop {r4, pc}
.balign 4, 0
-_021F54C8: .word UNK_020FFA38
+_021F54C8: .word FX_SinCosTable_
thumb_func_start MOD05_021F54CC
MOD05_021F54CC: ; 0x021F54CC
@@ -26471,17 +26471,17 @@ MOD05_021F54EC: ; 0x021F54EC
add r0, r2, #0
mov r1, #0
add r6, r3, #0
- bl FUN_020BC4C8
+ bl NNS_G3dGetAnmByIdx
str r0, [r5, #4]
ldr r1, [r5, #4]
ldr r2, [r4, #8]
add r0, r6, #0
- bl FUN_020BB8D0
+ bl NNS_G3dAllocAnmObj
str r0, [r5, #8]
ldr r1, [r5, #4]
ldr r2, [r4, #8]
ldr r3, [r4, #0xc]
- bl FUN_020B8110
+ bl NNS_G3dAnmObjInit
pop {r4, r5, r6, pc}
thumb_func_start MOD05_021F5518
@@ -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}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-04 18:36:15 +0000