summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2021-05-23 16:43:24 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2021-05-23 16:43:24 -0400
commit57b9d8fd35548901ccd4ffcdfa7bca7140065036 (patch)
tree50a346b1519649dd3fe3f537cc8736328587c59f
parent5bc62e95bf1ea5d2416118d688b1e938f978d497 (diff)
Rename libnns symbols
-rw-r--r--arm9/asm/NNS_FND_allocator.s52
-rw-r--r--arm9/asm/NNS_FND_expheap.s160
-rw-r--r--arm9/asm/NNS_FND_frameheap.s90
-rw-r--r--arm9/asm/NNS_FND_heapcommon.s67
-rw-r--r--arm9/asm/NNS_FND_list.s57
-rw-r--r--arm9/asm/NNS_G2D_g2d_animation.s96
-rw-r--r--arm9/asm/NNS_G2D_g2d_cellanimati.s104
-rw-r--r--arm9/asm/NNS_G2D_g2d_celltransfe.s138
-rw-r--r--arm9/asm/NNS_G2D_g2d_charcanvas.s210
-rw-r--r--arm9/asm/NNS_G2D_g2d_font.s64
-rw-r--r--arm9/asm/NNS_G2D_g2d_image.s123
-rw-r--r--arm9/asm/NNS_G2D_g2d_load.s15
-rw-r--r--arm9/asm/NNS_G2D_g2d_multicellan.s144
-rw-r--r--arm9/asm/NNS_G2D_g2d_nan_load.s48
-rw-r--r--arm9/asm/NNS_G2D_g2d_ncg_load.s37
-rw-r--r--arm9/asm/NNS_G2D_g2d_ncl_load.s37
-rw-r--r--arm9/asm/NNS_G2D_g2d_nft_load.s19
-rw-r--r--arm9/asm/NNS_G2D_g2d_nmc_load.s39
-rw-r--r--arm9/asm/NNS_G2D_g2d_nob_load.s50
-rw-r--r--arm9/asm/NNS_G2D_g2d_node.s12
-rw-r--r--arm9/asm/NNS_G2D_g2d_nsc_load.s10
-rw-r--r--arm9/asm/NNS_G2D_g2d_oam.s231
-rw-r--r--arm9/asm/NNS_G2D_g2d_oamsoftware.s159
-rw-r--r--arm9/asm/NNS_G2D_g2d_palettetabl.s8
-rw-r--r--arm9/asm/NNS_G2D_g2d_renderer.s1159
-rw-r--r--arm9/asm/NNS_G2D_g2d_renderercor.s294
-rw-r--r--arm9/asm/NNS_G2D_g2d_softsprite.s24
-rw-r--r--arm9/asm/NNS_G2D_g2d_srtcontrol.s40
-rw-r--r--arm9/asm/NNS_G2D_g2d_textcanvas.s47
-rw-r--r--arm9/asm/NNS_G2D_g2di_bitreader.s10
-rw-r--r--arm9/asm/NNS_G2D_g2di_mtx32.s8
-rw-r--r--arm9/asm/NNS_G2D_g2di_splitchar.s8
-rw-r--r--arm9/asm/NNS_G3D_1mat1shp.s20
-rw-r--r--arm9/asm/NNS_G3D_3dsmax.s91
-rw-r--r--arm9/asm/NNS_G3D_anm.s115
-rw-r--r--arm9/asm/NNS_G3D_basic.s23
-rw-r--r--arm9/asm/NNS_G3D_cgtool.s36
-rw-r--r--arm9/asm/NNS_G3D_gecom.s105
-rw-r--r--arm9/asm/NNS_G3D_glbstate.s309
-rw-r--r--arm9/asm/NNS_G3D_kernel.s243
-rw-r--r--arm9/asm/NNS_G3D_maya.s139
-rw-r--r--arm9/asm/NNS_G3D_mem.s23
-rw-r--r--arm9/asm/NNS_G3D_model.s239
-rw-r--r--arm9/asm/NNS_G3D_nsbca.s203
-rw-r--r--arm9/asm/NNS_G3D_nsbma.s45
-rw-r--r--arm9/asm/NNS_G3D_nsbta.s54
-rw-r--r--arm9/asm/NNS_G3D_nsbtp.s49
-rw-r--r--arm9/asm/NNS_G3D_nsbva.s19
-rw-r--r--arm9/asm/NNS_G3D_res_struct_acce.s66
-rw-r--r--arm9/asm/NNS_G3D_sbc.s631
-rw-r--r--arm9/asm/NNS_G3D_si3d.s74
-rw-r--r--arm9/asm/NNS_G3D_util.s83
-rw-r--r--arm9/asm/NNS_G3D_xsi.s90
-rw-r--r--arm9/asm/NNS_GFD_gfd_frameplttvr.s96
-rw-r--r--arm9/asm/NNS_GFD_gfd_frametexvra.s166
-rw-r--r--arm9/asm/NNS_GFD_gfd_linkedlistp.s119
-rw-r--r--arm9/asm/NNS_GFD_gfd_linkedlistt.s177
-rw-r--r--arm9/asm/NNS_GFD_gfd_plttvramman.s29
-rw-r--r--arm9/asm/NNS_GFD_gfd_texvramman.s29
-rw-r--r--arm9/asm/NNS_GFD_gfd_vramtransfe.s463
-rw-r--r--arm9/asm/NNS_GFD_gfdi_linkedlist.s45
-rw-r--r--arm9/asm/NNS_SND_capture.s215
-rw-r--r--arm9/asm/NNS_SND_fader.s27
-rw-r--r--arm9/asm/NNS_SND_heap.s121
-rw-r--r--arm9/asm/NNS_SND_main.s99
-rw-r--r--arm9/asm/NNS_SND_player.s463
-rw-r--r--arm9/asm/NNS_SND_resource_mgr.s91
-rw-r--r--arm9/asm/NNS_SND_seqdata.s6
-rw-r--r--arm9/asm/NNS_SND_sndarc.s173
-rw-r--r--arm9/asm/NNS_SND_sndarc_loader.s282
-rw-r--r--arm9/asm/NNS_SND_sndarc_player.s93
-rw-r--r--arm9/asm/NNS_SND_sndarc_stream.s133
-rw-r--r--arm9/asm/NNS_SND_stream.s162
-rw-r--r--arm9/asm/NNS_SND_waveout.s56
-rw-r--r--arm9/asm/macros/function.inc5
-rw-r--r--arm9/asm/unk_020040F4.s90
-rw-r--r--arm9/asm/unk_020051F4.s40
-rw-r--r--arm9/asm/unk_02006864.s36
-rw-r--r--arm9/asm/unk_02006D98.s28
-rw-r--r--arm9/asm/unk_02008DEC.s14
-rw-r--r--arm9/asm/unk_02009EAC.s16
-rw-r--r--arm9/asm/unk_0200BB14.s2
-rw-r--r--arm9/asm/unk_0200CABC.s6
-rw-r--r--arm9/asm/unk_02011744.s2
-rw-r--r--arm9/asm/unk_02012004.s6
-rw-r--r--arm9/asm/unk_02012CC8.s22
-rw-r--r--arm9/asm/unk_02013CD4.s42
-rw-r--r--arm9/asm/unk_02016B94.s4
-rw-r--r--arm9/asm/unk_0201B1A8.s100
-rw-r--r--arm9/asm/unk_0201B6D0.s44
-rw-r--r--arm9/asm/unk_0201C24C.s12
-rw-r--r--arm9/asm/unk_0201C360.s4
-rw-r--r--arm9/asm/unk_0201D040.s18
-rw-r--r--arm9/asm/unk_0201E00C.s10
-rw-r--r--arm9/asm/unk_0201E7D8.s44
-rw-r--r--arm9/asm/unk_0201F06C.s158
-rw-r--r--arm9/asm/unk_02020C44.s52
-rw-r--r--arm9/asm/unk_0202134C.s6
-rw-r--r--arm9/asm/unk_02022318.s14
-rw-r--r--arm9/asm/unk_02033B68.s4
-rw-r--r--arm9/asm/unk_020607D4.s2
-rw-r--r--arm9/asm/unk_0206DE24.s22
-rw-r--r--arm9/asm/unk_0206F3FC.s4
-rw-r--r--arm9/asm/unk_020772F0.s2
-rw-r--r--arm9/asm/unk_020799E8.s8
-rw-r--r--arm9/asm/unk_02079C70.s2
-rw-r--r--arm9/asm/unk_0207EF6C.s8
-rw-r--r--arm9/asm/unk_02086414.s22
-rw-r--r--arm9/asm/unk_0208AC14.s12
-rw-r--r--arm9/global.inc782
-rw-r--r--arm9/modules/04/asm/thumb_04.s26
-rw-r--r--arm9/modules/05/asm/mod05_021D74E0.s20
-rw-r--r--arm9/modules/05/asm/mod05_021D9A48.s18
-rw-r--r--arm9/modules/05/asm/mod05_021DB44C.s8
-rw-r--r--arm9/modules/05/asm/mod05_021DBABC.s42
-rw-r--r--arm9/modules/05/asm/mod05_021DBEF4.s2
-rw-r--r--arm9/modules/05/asm/mod05_021DC0B8.s14
-rw-r--r--arm9/modules/05/asm/mod05_021E3444.s4
-rw-r--r--arm9/modules/05/asm/mod05_021E4AE4.s20
-rw-r--r--arm9/modules/05/asm/mod05_021E55BC.s2
-rw-r--r--arm9/modules/05/asm/mod05_021E577C.s2
-rw-r--r--arm9/modules/05/asm/mod05_021E5918.s2
-rw-r--r--arm9/modules/05/asm/mod05_021E5AB4.s10
-rw-r--r--arm9/modules/05/asm/mod05_021E5C8C.s8
-rw-r--r--arm9/modules/05/asm/mod05_021E5E10.s8
-rw-r--r--arm9/modules/05/asm/mod05_021E7C00.s20
-rw-r--r--arm9/modules/05/asm/module_05.s60
-rw-r--r--arm9/modules/06/asm/module_06.s60
-rw-r--r--arm9/modules/07/asm/module_07.s10
-rw-r--r--arm9/modules/08/asm/module_08.s10
-rw-r--r--arm9/modules/09/asm/module_09.s8
-rw-r--r--arm9/modules/11/asm/module_11_thumb1.s8
-rw-r--r--arm9/modules/12/asm/module_12.s32
-rw-r--r--arm9/modules/13/asm/module_13_arm2.s60
-rw-r--r--arm9/modules/14/asm/module_14.s80
-rw-r--r--arm9/modules/15/asm/module_15.s14
-rw-r--r--arm9/modules/16/asm/module_16.s36
-rw-r--r--arm9/modules/17/asm/module_17.s42
-rw-r--r--arm9/modules/18/asm/module_18.s4
-rw-r--r--arm9/modules/20/asm/module_20.s28
-rw-r--r--arm9/modules/27/asm/module_27.s2
-rw-r--r--arm9/modules/28/asm/module_28.s2
-rw-r--r--arm9/modules/53/asm/module_53.s2
-rw-r--r--arm9/modules/54/asm/module_54.s2
-rw-r--r--arm9/modules/55/asm/module_55.s8
-rw-r--r--arm9/modules/56/asm/module_56.s2
-rw-r--r--arm9/modules/57/asm/module_57.s10
-rw-r--r--arm9/modules/58/asm/module_58.s2
-rw-r--r--arm9/modules/60/asm/module_60.s8
-rw-r--r--arm9/modules/61/asm/module_61.s10
-rw-r--r--arm9/modules/62/asm/module_62.s10
-rw-r--r--arm9/modules/63/asm/mod63_021D74E0.s24
-rw-r--r--arm9/modules/63/asm/mod63_021D8890.s40
-rw-r--r--arm9/modules/63/asm/mod63_021DA640.s4
-rw-r--r--arm9/modules/63/asm/mod63_021DAE5C.s2
-rw-r--r--arm9/modules/63/src/mod63_021DB450.c12
-rw-r--r--arm9/modules/64/asm/module_64.s56
-rw-r--r--arm9/modules/65/asm/module_65.s6
-rw-r--r--arm9/modules/66/asm/module_66.s2
-rw-r--r--arm9/modules/69/asm/module_69.s36
-rw-r--r--arm9/modules/70/asm/module_70.s10
-rw-r--r--arm9/modules/71/asm/module_71.s4
-rw-r--r--arm9/modules/73/asm/module_73.s20
-rw-r--r--arm9/modules/74/asm/module_74.s2
-rw-r--r--arm9/modules/75/asm/module_75.s4
-rw-r--r--arm9/modules/77/asm/module_77.s2
-rw-r--r--arm9/modules/78/asm/module_78.s30
-rw-r--r--arm9/modules/80/asm/module_80.s10
-rw-r--r--arm9/modules/81/asm/module_81.s110
-rw-r--r--arm9/modules/82/asm/module_82.s8
-rw-r--r--arm9/modules/83/asm/module_83.s12
-rw-r--r--arm9/modules/84/asm/module_84_thumb1.s52
-rw-r--r--arm9/modules/84/asm/module_84_thumb2.s16
-rw-r--r--arm9/modules/85/asm/module_85.s32
-rw-r--r--arm9/src/heap.c40
-rw-r--r--arm9/src/sound.c30
-rw-r--r--include/sdat.h30
177 files changed, 5575 insertions, 6640 deletions
diff --git a/arm9/asm/NNS_FND_allocator.s b/arm9/asm/NNS_FND_allocator.s
index 404b1983..537ce6a0 100644
--- a/arm9/asm/NNS_FND_allocator.s
+++ b/arm9/asm/NNS_FND_allocator.s
@@ -1,19 +1,17 @@
.include "asm/macros.inc"
.include "global.inc"
-
.rodata
-
; static const in function
- .global UNK_020FF7CC
-UNK_020FF7CC: ; 0x020FF7CC
- .word FUN_020AE894
- .word FUN_020AE884
+ .global sAllocatorFunc$7864
+sAllocatorFunc$7864: ; 0x020FF7CC
+ .word AllocatorAllocForExpHeap
+ .word AllocatorFreeForExpHeap
.text
- arm_func_start FUN_020AE82C
-FUN_020AE82C: ; 0x020AE82C
- ldr ip, _020AE848 ; =UNK_020FF7CC
+ arm_func_start NNS_FndInitAllocatorForExpHeap
+NNS_FndInitAllocatorForExpHeap: ; 0x020AE82C
+ ldr ip, _020AE848 ; =sAllocatorFunc$7864
mov r3, #0x0
str r12, [r0, #0x0]
str r1, [r0, #0x4]
@@ -21,11 +19,11 @@ FUN_020AE82C: ; 0x020AE82C
str r3, [r0, #0xc]
bx lr
.balign 4
-_020AE848: .word UNK_020FF7CC
- arm_func_end FUN_020AE82C
+_020AE848: .word sAllocatorFunc$7864
+ arm_func_end NNS_FndInitAllocatorForExpHeap
- arm_func_start FUN_020AE84C
-FUN_020AE84C: ; 0x020AE84C
+ arm_func_start NNS_FndFreeToAllocator
+NNS_FndFreeToAllocator: ; 0x020AE84C
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr r2, [r0, #0x0]
@@ -33,10 +31,10 @@ FUN_020AE84C: ; 0x020AE84C
blx r2
add sp, sp, #0x4
ldmia sp!, {pc}
- arm_func_end FUN_020AE84C
+ arm_func_end NNS_FndFreeToAllocator
- arm_func_start FUN_020AE868
-FUN_020AE868: ; 0x020AE868
+ arm_func_start NNS_FndAllocFromAllocator
+NNS_FndAllocFromAllocator: ; 0x020AE868
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr r2, [r0, #0x0]
@@ -44,24 +42,24 @@ FUN_020AE868: ; 0x020AE868
blx r2
add sp, sp, #0x4
ldmia sp!, {pc}
- arm_func_end FUN_020AE868
+ arm_func_end NNS_FndAllocFromAllocator
- arm_func_start FUN_020AE884
-FUN_020AE884: ; 0x020AE884
- ldr ip, _020AE890 ; =FUN_020ADDF0
+ arm_func_start AllocatorFreeForExpHeap
+AllocatorFreeForExpHeap: ; 0x020AE884
+ ldr ip, _020AE890 ; =NNS_FndFreeToExpHeap
ldr r0, [r0, #0x4]
bx r12
.balign 4
-_020AE890: .word FUN_020ADDF0
- arm_func_end FUN_020AE884
+_020AE890: .word NNS_FndFreeToExpHeap
+ arm_func_end AllocatorFreeForExpHeap
- arm_func_start FUN_020AE894
-FUN_020AE894: ; 0x020AE894
- ldr ip, _020AE8A8 ; =tempName_NNS_FndAllocFromExpHeapEx
+ arm_func_start AllocatorAllocForExpHeap
+AllocatorAllocForExpHeap: ; 0x020AE894
+ ldr ip, _020AE8A8 ; =NNS_FndAllocFromExpHeapEx
mov r2, r0
ldr r0, [r2, #0x4]
ldr r2, [r2, #0x8]
bx r12
.balign 4
-_020AE8A8: .word tempName_NNS_FndAllocFromExpHeapEx
- arm_func_end FUN_020AE894
+_020AE8A8: .word NNS_FndAllocFromExpHeapEx
+ arm_func_end AllocatorAllocForExpHeap
diff --git a/arm9/asm/NNS_FND_expheap.s b/arm9/asm/NNS_FND_expheap.s
index cb42f116..e94dba38 100644
--- a/arm9/asm/NNS_FND_expheap.s
+++ b/arm9/asm/NNS_FND_expheap.s
@@ -1,19 +1,17 @@
.include "asm/macros.inc"
.include "global.inc"
-
- .extern FUN_020ADCA4
- .extern FUN_020ADC8C
-
+ .extern NNSi_FndInitHeapHead
+ .extern NNSi_FndFinalizeHeap
.text
- arm_func_start FUN_020ADDC0
-FUN_020ADDC0: ; 0x020ADDC0
+ arm_func_start NNS_FndGetSizeForMBlockExpHeap
+NNS_FndGetSizeForMBlockExpHeap: ; 0x020ADDC0
ldr r0, [r0, #-0xc]
bx lr
- arm_func_end FUN_020ADDC0
+ arm_func_end NNS_FndGetSizeForMBlockExpHeap
- arm_func_start FUN_020ADDC8
-FUN_020ADDC8: ; 0x020ADDC8
+ arm_func_start NNS_FndGetTotalFreeSizeForExpHeap
+NNS_FndGetTotalFreeSizeForExpHeap: ; 0x020ADDC8
ldr r2, [r0, #0x24]
mov r0, #0x0
cmp r2, #0x0
@@ -25,29 +23,29 @@ _020ADDD8:
cmp r2, #0x0
bne _020ADDD8
bx lr
- arm_func_end FUN_020ADDC8
+ arm_func_end NNS_FndGetTotalFreeSizeForExpHeap
- arm_func_start FUN_020ADDF0
-FUN_020ADDF0: ; 0x020ADDF0
+ arm_func_start NNS_FndFreeToExpHeap
+NNS_FndFreeToExpHeap: ; 0x020ADDF0
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0xc
sub r4, r1, #0x10
add r5, r0, #0x24
add r0, sp, #0x0
mov r1, r4
- bl FUN_020AE528
+ bl GetRegionOfMBlock
mov r1, r4
add r0, r5, #0x8
- bl FUN_020AE500
+ bl RemoveMBlock
add r1, sp, #0x0
mov r0, r5
- bl FUN_020AE02C
+ bl RecycleRegion
add sp, sp, #0xc
ldmia sp!, {r4-r5,pc}
- arm_func_end FUN_020ADDF0
+ arm_func_end NNS_FndFreeToExpHeap
- arm_func_start FUN_020ADE2C
-FUN_020ADE2C: ; 0x020ADE2C
+ arm_func_start NNS_FndResizeForMBlockExpHeap
+NNS_FndResizeForMBlockExpHeap: ; 0x020ADE2C
stmdb sp!, {r4-r10,lr}
sub sp, sp, #0x10
mov r4, r1
@@ -90,10 +88,10 @@ _020ADEB0:
_020ADEBC:
add r0, sp, #0x0
mov r1, r9
- bl FUN_020AE528
+ bl GetRegionOfMBlock
mov r0, r7
mov r1, r9
- bl FUN_020AE500
+ bl RemoveMBlock
ldr r2, [sp, #0x4]
add r3, r10, r4
ldr r9, [sp, #0x0]
@@ -112,11 +110,11 @@ _020ADEBC:
blo _020ADF30
ldr r1, _020ADF9C ; =0x00004652
add r0, sp, #0x0
- bl FUN_020AE4A0
+ bl InitMBlock
mov r1, r0
mov r0, r7
mov r2, r8
- bl FUN_020AE4D0
+ bl InsertMBlock
_020ADF30:
ldr r0, [r5, #0x20]
ldr r1, [sp, #0x0]
@@ -140,7 +138,7 @@ _020ADF60:
add r1, sp, #0x8
mov r0, r7
str r10, [r6, #0x4]
- bl FUN_020AE02C
+ bl RecycleRegion
cmp r0, #0x0
streq r8, [r6, #0x4]
_020ADF90:
@@ -149,10 +147,10 @@ _020ADF90:
ldmia sp!, {r4-r10,pc}
.balign 4
_020ADF9C: .word 0x00004652
- arm_func_end FUN_020ADE2C
+ arm_func_end NNS_FndResizeForMBlockExpHeap
- arm_func_start tempName_NNS_FndAllocFromExpHeapEx
-tempName_NNS_FndAllocFromExpHeapEx: ; 0x020ADFA0
+ arm_func_start NNS_FndAllocFromExpHeapEx
+NNS_FndAllocFromExpHeapEx: ; 0x020ADFA0
stmdb sp!, {lr}
sub sp, sp, #0x4
cmp r1, #0x0
@@ -161,26 +159,26 @@ tempName_NNS_FndAllocFromExpHeapEx: ; 0x020ADFA0
cmp r2, #0x0
bic r1, r1, #0x3
blt _020ADFCC
- bl FUN_020AE1D8
+ bl AllocFromHead
add sp, sp, #0x4
ldmia sp!, {pc}
_020ADFCC:
rsb r2, r2, #0x0
- bl FUN_020AE11C
+ bl AllocFromTail
add sp, sp, #0x4
ldmia sp!, {pc}
- arm_func_end tempName_NNS_FndAllocFromExpHeapEx
+ arm_func_end NNS_FndAllocFromExpHeapEx
- arm_func_start thunk_FUN_020adc8c
-thunk_FUN_020adc8c: ; 0x020ADFDC
- ldr ip, _020ADFE4 ; =FUN_020ADC8C
+ arm_func_start NNS_FndDestroyExpHeap
+NNS_FndDestroyExpHeap: ; 0x020ADFDC
+ ldr ip, _020ADFE4 ; =NNSi_FndFinalizeHeap
bx r12
.balign 4
-_020ADFE4: .word FUN_020ADC8C
- arm_func_end thunk_FUN_020adc8c
+_020ADFE4: .word NNSi_FndFinalizeHeap
+ arm_func_end NNS_FndDestroyExpHeap
- arm_func_start tempName_NNS_FndCreateExpHeapEx
-tempName_NNS_FndCreateExpHeapEx: ; 0x020ADFE8
+ arm_func_start NNS_FndCreateExpHeapEx
+NNS_FndCreateExpHeapEx: ; 0x020ADFE8
stmdb sp!, {lr}
sub sp, sp, #0x4
add r1, r1, r0
@@ -197,13 +195,13 @@ _020AE014:
mov r0, #0x0
ldmia sp!, {pc}
_020AE020:
- bl FUN_020AE420
+ bl InitExpHeap
add sp, sp, #0x4
ldmia sp!, {pc}
- arm_func_end tempName_NNS_FndCreateExpHeapEx
+ arm_func_end NNS_FndCreateExpHeapEx
- arm_func_start FUN_020AE02C
-FUN_020AE02C:
+ arm_func_start RecycleRegion
+RecycleRegion:
stmdb sp!, {r4-r6,lr}
sub sp, sp, #0x8
mov r5, r1
@@ -229,7 +227,7 @@ _020AE060:
add r2, r2, r0
mov r0, r6
str r2, [sp, #0x4]
- bl FUN_020AE500
+ bl RemoveMBlock
b _020AE0A0
_020AE094:
ldr r1, [r1, #0xc]
@@ -247,7 +245,7 @@ _020AE0A0:
mov r0, r6
mov r1, r4
str r4, [sp, #0x0]
- bl FUN_020AE500
+ bl RemoveMBlock
mov r4, r0
_020AE0D4:
ldr r1, [sp, #0x4]
@@ -259,20 +257,20 @@ _020AE0D4:
ldmccia sp!, {r4-r6,pc}
ldr r1, _020AE118 ; =0x00004652
add r0, sp, #0x0
- bl FUN_020AE4A0
+ bl InitMBlock
mov r1, r0
mov r0, r6
mov r2, r4
- bl FUN_020AE4D0
+ bl InsertMBlock
mov r0, #0x1
add sp, sp, #0x8
ldmia sp!, {r4-r6,pc}
.balign 4
_020AE118: .word 0x00004652
- arm_func_end FUN_020AE02C
+ arm_func_end RecycleRegion
- arm_func_start FUN_020AE11C
-FUN_020AE11C: ; 0x020AE11C
+ local_arm_func_start AllocFromTail
+AllocFromTail: ; 0x020AE11C
stmdb sp!, {r4-r9,lr}
sub sp, sp, #0x4
add r0, r0, #0x24
@@ -320,13 +318,13 @@ _020AE1B0:
mov r4, #0x1
mov r2, r12
str r4, [sp, #0x0]
- bl FUN_020AE298
+ bl AllocUsedBlockFromFreeBlock
add sp, sp, #0x4
ldmia sp!, {r4-r9,pc}
- arm_func_end FUN_020AE11C
+ arm_func_end AllocFromTail
- arm_func_start FUN_020AE1D8
-FUN_020AE1D8: ; 0x020AE1D8
+ local_arm_func_start AllocFromHead
+AllocFromHead: ; 0x020AE1D8
stmdb sp!, {r4-r9,lr}
sub sp, sp, #0x4
add r0, r0, #0x24
@@ -375,13 +373,13 @@ _020AE270:
mov r4, #0x0
mov r2, lr
str r4, [sp, #0x0]
- bl FUN_020AE298
+ bl AllocUsedBlockFromFreeBlock
add sp, sp, #0x4
ldmia sp!, {r4-r9,pc}
- arm_func_end FUN_020AE1D8
+ arm_func_end AllocFromHead
- arm_func_start FUN_020AE298
-FUN_020AE298: ; 0x020AE298
+ arm_func_start AllocUsedBlockFromFreeBlock
+AllocUsedBlockFromFreeBlock: ; 0x020AE298
stmdb sp!, {r4-r8,lr}
sub sp, sp, #0x18
mov r7, r0
@@ -389,7 +387,7 @@ FUN_020AE298: ; 0x020AE298
mov r8, r1
mov r6, r2
mov r5, r3
- bl FUN_020AE528
+ bl GetRegionOfMBlock
ldr r3, [sp, #0x4]
sub r4, r6, #0x10
add r2, r5, r6
@@ -398,7 +396,7 @@ FUN_020AE298: ; 0x020AE298
str r4, [sp, #0x4]
str r3, [sp, #0xc]
str r2, [sp, #0x8]
- bl FUN_020AE500
+ bl RemoveMBlock
ldr r2, [sp, #0x0]
ldr r1, [sp, #0x4]
mov r5, r0
@@ -408,11 +406,11 @@ FUN_020AE298: ; 0x020AE298
blo _020AE318
ldr r1, _020AE418 ; =0x00004652
add r0, sp, #0x0
- bl FUN_020AE4A0
+ bl InitMBlock
mov r1, r0
mov r0, r7
mov r2, r5
- bl FUN_020AE4D0
+ bl InsertMBlock
mov r5, r0
_020AE318:
ldr r1, [sp, #0xc]
@@ -423,11 +421,11 @@ _020AE318:
blo _020AE34C
ldr r1, _020AE418 ; =0x00004652
add r0, sp, #0x8
- bl FUN_020AE4A0
+ bl InitMBlock
mov r1, r0
mov r0, r7
mov r2, r5
- bl FUN_020AE4D0
+ bl InsertMBlock
_020AE34C:
ldr r0, [r7, #-0x4]
ldr r1, [sp, #0x4]
@@ -446,7 +444,7 @@ _020AE378:
add r0, sp, #0x10
str r4, [sp, #0x10]
str r2, [sp, #0x14]
- bl FUN_020AE4A0
+ bl InitMBlock
mov r1, r0
ldrh r3, [r1, #0x2]
ldrh r2, [sp, #0x30]
@@ -477,17 +475,17 @@ _020AE378:
orr r2, r2, r3
strh r2, [r1, #0x2]
ldr r2, [r7, #0xc]
- bl FUN_020AE4D0
+ bl InsertMBlock
mov r0, r6
add sp, sp, #0x18
ldmia sp!, {r4-r8,pc}
.balign 4
_020AE418: .word 0x00004652
_020AE41C: .word 0x00005544
- arm_func_end FUN_020AE298
+ arm_func_end AllocUsedBlockFromFreeBlock
- arm_func_start FUN_020AE420
-FUN_020AE420: ; 0x020AE420
+ arm_func_start InitExpHeap
+InitExpHeap: ; 0x020AE420
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0xc
mov r5, r0
@@ -496,7 +494,7 @@ FUN_020AE420: ; 0x020AE420
str r2, [sp, #0x0]
ldr r1, _020AE498 ; =0x45585048
add r2, r4, #0x14
- bl FUN_020ADCA4
+ bl NNSi_FndInitHeapHead
mov r0, #0x0
strh r0, [r4, #0x10]
strh r0, [r4, #0x12]
@@ -509,7 +507,7 @@ FUN_020AE420: ; 0x020AE420
str r2, [sp, #0x4]
ldr r2, [r5, #0x1c]
str r2, [sp, #0x8]
- bl FUN_020AE4A0
+ bl InitMBlock
str r0, [r5, #0x24]
str r0, [r4, #0x4]
mov r1, #0x0
@@ -521,10 +519,10 @@ FUN_020AE420: ; 0x020AE420
.balign 4
_020AE498: .word 0x45585048
_020AE49C: .word 0x00004652
- arm_func_end FUN_020AE420
+ arm_func_end InitExpHeap
- arm_func_start FUN_020AE4A0
-FUN_020AE4A0: ; 0x020AE4A0
+ arm_func_start InitMBlock
+InitMBlock: ; 0x020AE4A0
ldr r3, [r0, #0x0]
mov r2, #0x0
strh r1, [r3, #0x0]
@@ -537,10 +535,10 @@ FUN_020AE4A0: ; 0x020AE4A0
mov r0, r3
str r2, [r3, #0xc]
bx lr
- arm_func_end FUN_020AE4A0
+ arm_func_end InitMBlock
- arm_func_start FUN_020AE4D0
-FUN_020AE4D0: ; 0x020AE4D0
+ arm_func_start InsertMBlock
+InsertMBlock: ; 0x020AE4D0
str r2, [r1, #0x8]
cmp r2, #0x0
ldrne r3, [r2, #0xc]
@@ -553,10 +551,10 @@ FUN_020AE4D0: ; 0x020AE4D0
streq r1, [r0, #0x4]
mov r0, r1
bx lr
- arm_func_end FUN_020AE4D0
+ arm_func_end InsertMBlock
- arm_func_start FUN_020AE500
-FUN_020AE500: ; 0x020AE500
+ arm_func_start RemoveMBlock
+RemoveMBlock: ; 0x020AE500
ldr r2, [r1, #0x8]
ldr r1, [r1, #0xc]
cmp r2, #0x0
@@ -567,10 +565,10 @@ FUN_020AE500: ; 0x020AE500
streq r2, [r0, #0x4]
mov r0, r2
bx lr
- arm_func_end FUN_020AE500
+ arm_func_end RemoveMBlock
- arm_func_start FUN_020AE528
-FUN_020AE528: ; 0x020AE528
+ arm_func_start GetRegionOfMBlock
+GetRegionOfMBlock: ; 0x020AE528
ldrh r2, [r1, #0x2]
add r3, r1, #0x10
mov r2, r2, asr #0x8
@@ -582,4 +580,4 @@ FUN_020AE528: ; 0x020AE528
add r1, r1, r3
str r1, [r0, #0x4]
bx lr
- arm_func_end FUN_020AE528
+ arm_func_end GetRegionOfMBlock
diff --git a/arm9/asm/NNS_FND_frameheap.s b/arm9/asm/NNS_FND_frameheap.s
index 078180b5..cfa221d4 100644
--- a/arm9/asm/NNS_FND_frameheap.s
+++ b/arm9/asm/NNS_FND_frameheap.s
@@ -1,13 +1,11 @@
.include "asm/macros.inc"
.include "global.inc"
-
- .extern FUN_020ADCA4
- .extern FUN_020ADC8C
-
+ .extern NNSi_FndInitHeapHead
+ .extern NNSi_FndFinalizeHeap
.text
- arm_func_start FUN_020AE554
-FUN_020AE554: ; 0x020AE554
+ arm_func_start NNS_FndFreeByStateToFrmHeap
+NNS_FndFreeByStateToFrmHeap: ; 0x020AE554
add r2, r0, #0x24
cmp r1, #0x0
ldr r3, [r2, #0x8]
@@ -33,10 +31,10 @@ _020AE584:
ldr r1, [r3, #0xc]
str r1, [r2, #0x8]
bx lr
- arm_func_end FUN_020AE554
+ arm_func_end NNS_FndFreeByStateToFrmHeap
- arm_func_start FUN_020AE5B0
-FUN_020AE5B0: ; 0x020AE5B0
+ arm_func_start NNS_FndRecordStateForFrmHeap
+NNS_FndRecordStateForFrmHeap: ; 0x020AE5B0
stmdb sp!, {r4-r6,lr}
add r4, r0, #0x24
ldr r5, [r0, #0x24]
@@ -44,7 +42,7 @@ FUN_020AE5B0: ; 0x020AE5B0
mov r0, r4
mov r1, #0x10
mov r2, #0x4
- bl FUN_020AE77C
+ bl AllocFromHead
cmp r0, #0x0
moveq r0, #0x0
ldmeqia sp!, {r4-r6,pc}
@@ -57,29 +55,29 @@ FUN_020AE5B0: ; 0x020AE5B0
str r0, [r4, #0x8]
mov r0, #0x1
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020AE5B0
+ arm_func_end NNS_FndRecordStateForFrmHeap
- arm_func_start FUN_020AE600
-FUN_020AE600: ; 0x020AE600
+ arm_func_start NNS_FndFreeToFrmHeap
+NNS_FndFreeToFrmHeap: ; 0x020AE600
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r4, r1
mov r5, r0
ands r1, r4, #0x1
beq _020AE61C
- bl FUN_020AE6F8
+ bl FreeHead
_020AE61C:
ands r0, r4, #0x2
addeq sp, sp, #0x4
ldmeqia sp!, {r4-r5,pc}
mov r0, r5
- bl FUN_020AE6C8
+ bl FreeTail
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
- arm_func_end FUN_020AE600
+ arm_func_end NNS_FndFreeToFrmHeap
- arm_func_start FUN_020AE638
-FUN_020AE638: ; 0x020AE638
+ arm_func_start NNS_FndAllocFromFrmHeapEx
+NNS_FndAllocFromFrmHeapEx: ; 0x020AE638
stmdb sp!, {lr}
sub sp, sp, #0x4
cmp r1, #0x0
@@ -89,26 +87,26 @@ FUN_020AE638: ; 0x020AE638
cmp r2, #0x0
bic r1, r1, #0x3
blt _020AE668
- bl FUN_020AE77C
+ bl AllocFromHead
add sp, sp, #0x4
ldmia sp!, {pc}
_020AE668:
rsb r2, r2, #0x0
- bl FUN_020AE710
+ bl AllocFromTail
add sp, sp, #0x4
ldmia sp!, {pc}
- arm_func_end FUN_020AE638
+ arm_func_end NNS_FndAllocFromFrmHeapEx
- arm_func_start thunk_FUN_020adc8c_2
-thunk_FUN_020adc8c_2: ; 0x020AE678
- ldr ip, _020AE680 ; =FUN_020ADC8C
+ arm_func_start NNS_FndDestroyFrmHeap
+NNS_FndDestroyFrmHeap: ; 0x020AE678
+ ldr ip, _020AE680 ; =NNSi_FndFinalizeHeap
bx r12
.balign 4
-_020AE680: .word FUN_020ADC8C
- arm_func_end thunk_FUN_020adc8c_2
+_020AE680: .word NNSi_FndFinalizeHeap
+ arm_func_end NNS_FndDestroyFrmHeap
- arm_func_start FUN_020AE684
-FUN_020AE684: ; 0x020AE684
+ arm_func_start NNS_FndCreateFrmHeapEx
+NNS_FndCreateFrmHeapEx: ; 0x020AE684
stmdb sp!, {lr}
sub sp, sp, #0x4
add r1, r1, r0
@@ -125,13 +123,13 @@ _020AE6B0:
mov r0, #0x0
ldmia sp!, {pc}
_020AE6BC:
- bl FUN_020AE7E0
+ bl InitFrameHeap
add sp, sp, #0x4
ldmia sp!, {pc}
- arm_func_end FUN_020AE684
+ arm_func_end NNS_FndCreateFrmHeapEx
- arm_func_start FUN_020AE6C8
-FUN_020AE6C8: ; 0x020AE6C8
+ arm_func_start FreeTail
+FreeTail: ; 0x020AE6C8
add r2, r0, #0x24
ldr r3, [r2, #0x8]
cmp r3, #0x0
@@ -146,20 +144,20 @@ _020AE6EC:
ldr r0, [r0, #0x1c]
str r0, [r2, #0x4]
bx lr
- arm_func_end FUN_020AE6C8
+ arm_func_end FreeTail
- arm_func_start FUN_020AE6F8
-FUN_020AE6F8: ; 0x020AE6F8
+ arm_func_start FreeHead
+FreeHead: ; 0x020AE6F8
ldr r1, [r0, #0x18]
add r2, r0, #0x24
str r1, [r0, #0x24]
mov r0, #0x0
str r0, [r2, #0x8]
bx lr
- arm_func_end FUN_020AE6F8
+ arm_func_end FreeHead
- arm_func_start FUN_020AE710
-FUN_020AE710: ; 0x020AE710
+ local_arm_func_start AllocFromTail
+AllocFromTail: ; 0x020AE710
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r0
@@ -188,10 +186,10 @@ _020AE76C:
str r4, [r5, #0x4]
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
- arm_func_end FUN_020AE710
+ arm_func_end AllocFromTail
- arm_func_start FUN_020AE77C
-FUN_020AE77C:
+ local_arm_func_start AllocFromHead
+AllocFromHead:
stmdb sp!, {r4-r6,lr}
mov r6, r0
ldr r0, [r6, #0x0]
@@ -218,10 +216,10 @@ _020AE7D4:
mov r0, r5
str r4, [r6, #0x0]
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020AE77C
+ arm_func_end AllocFromHead
- arm_func_start FUN_020AE7E0
-FUN_020AE7E0: ; 0x020AE7E0
+ arm_func_start InitFrameHeap
+InitFrameHeap: ; 0x020AE7E0
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r0
@@ -230,7 +228,7 @@ FUN_020AE7E0: ; 0x020AE7E0
str r2, [sp, #0x0]
ldr r1, _020AE828 ; =0x46524D48
add r2, r4, #0xc
- bl FUN_020ADCA4
+ bl NNSi_FndInitHeapHead
ldr r0, [r5, #0x18]
mov r1, #0x0
str r0, [r5, #0x24]
@@ -242,4 +240,4 @@ FUN_020AE7E0: ; 0x020AE7E0
ldmia sp!, {r4-r5,pc}
.balign 4
_020AE828: .word 0x46524D48
- arm_func_end FUN_020AE7E0
+ arm_func_end InitFrameHeap
diff --git a/arm9/asm/NNS_FND_heapcommon.s b/arm9/asm/NNS_FND_heapcommon.s
index 0aa40512..ca3108d2 100644
--- a/arm9/asm/NNS_FND_heapcommon.s
+++ b/arm9/asm/NNS_FND_heapcommon.s
@@ -3,28 +3,27 @@
.section .bss
- .global UNK_021CCD38
-UNK_021CCD38: ; 0x021CCD38
+ .global sRootListInitialized
+sRootListInitialized: ; 0x021CCD38
.space 0x4
- .global UNK_021CCD3C
-UNK_021CCD3C: ; 0x021CCD3C
+ .global sRootList
+sRootList: ; 0x021CCD3C
.space 0xc
-
.text
- arm_func_start FUN_020ADC8C
-FUN_020ADC8C: ; 0x020ADC8C
+ arm_func_start NNSi_FndFinalizeHeap
+NNSi_FndFinalizeHeap: ; 0x020ADC8C
stmdb sp!, {r4,lr}
mov r4, r0
- bl FUN_020ADD30
+ bl FindListContainHeap
mov r1, r4
- bl FUN_020ADAB0
+ bl NNS_FndRemoveListObject
ldmia sp!, {r4,pc}
- arm_func_end FUN_020ADC8C
+ arm_func_end NNSi_FndFinalizeHeap
- arm_func_start FUN_020ADCA4
-FUN_020ADCA4:
+ arm_func_start NNSi_FndInitHeapHead
+NNSi_FndInitHeapHead:
stmdb sp!, {r4,lr}
mov r4, r0
str r1, [r4, #0x0]
@@ -42,50 +41,50 @@ FUN_020ADCA4:
add r0, r4, #0xc
mov r1, #0x4
str r2, [r4, #0x20]
- bl FUN_020ADC74
- ldr r0, _020ADD28 ; =UNK_021CCD38
+ bl NNS_FndInitList
+ ldr r0, _020ADD28 ; =sRootListInitialized
ldr r0, [r0, #0x0]
cmp r0, #0x0
bne _020ADD14
- ldr r0, _020ADD2C ; =UNK_021CCD3C
+ ldr r0, _020ADD2C ; =sRootList
mov r1, #0x4
- bl FUN_020ADC74
- ldr r0, _020ADD28 ; =UNK_021CCD38
+ bl NNS_FndInitList
+ ldr r0, _020ADD28 ; =sRootListInitialized
mov r1, #0x1
str r1, [r0, #0x0]
_020ADD14:
mov r0, r4
- bl FUN_020ADD30
+ bl FindListContainHeap
mov r1, r4
- bl FUN_020ADBE8
+ bl NNS_FndAppendListObject
ldmia sp!, {r4,pc}
.balign 4
-_020ADD28: .word UNK_021CCD38
-_020ADD2C: .word UNK_021CCD3C
- arm_func_end FUN_020ADCA4
+_020ADD28: .word sRootListInitialized
+_020ADD2C: .word sRootList
+ arm_func_end NNSi_FndInitHeapHead
- arm_func_start FUN_020ADD30
-FUN_020ADD30: ; 0x020ADD30
+ arm_func_start FindListContainHeap
+FindListContainHeap: ; 0x020ADD30
stmdb sp!, {r4,lr}
- ldr r4, _020ADD54 ; =UNK_021CCD3C
+ ldr r4, _020ADD54 ; =sRootList
mov r1, r0
mov r0, r4
- bl FUN_020ADD58
+ bl FindContainHeap
cmp r0, #0x0
addne r4, r0, #0xc
mov r0, r4
ldmia sp!, {r4,pc}
.balign 4
-_020ADD54: .word UNK_021CCD3C
- arm_func_end FUN_020ADD30
+_020ADD54: .word sRootList
+ arm_func_end FindListContainHeap
- arm_func_start FUN_020ADD58
-FUN_020ADD58:
+ arm_func_start FindContainHeap
+FindContainHeap:
stmdb sp!, {r4-r6,lr}
mov r5, r1
mov r1, #0x0
mov r6, r0
- bl FUN_020ADA98
+ bl NNS_FndGetNextListObject
movs r4, r0
beq _020ADDB8
_020ADD74:
@@ -97,17 +96,17 @@ _020ADD74:
bhs _020ADDA4
mov r1, r5
add r0, r4, #0xc
- bl FUN_020ADD58
+ bl FindContainHeap
cmp r0, #0x0
moveq r0, r4
ldmia sp!, {r4-r6,pc}
_020ADDA4:
mov r0, r6
mov r1, r4
- bl FUN_020ADA98
+ bl NNS_FndGetNextListObject
movs r4, r0
bne _020ADD74
_020ADDB8:
mov r0, #0x0
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020ADD58
+ arm_func_end FindContainHeap
diff --git a/arm9/asm/NNS_FND_list.s b/arm9/asm/NNS_FND_list.s
index b88b2159..21999c11 100644
--- a/arm9/asm/NNS_FND_list.s
+++ b/arm9/asm/NNS_FND_list.s
@@ -1,29 +1,28 @@
.include "asm/macros.inc"
.include "global.inc"
-
.text
- arm_func_start FUN_020ADA84
-FUN_020ADA84: ; 0x020ADA84
+ arm_func_start NNS_FndGetPrevListObject
+NNS_FndGetPrevListObject: ; 0x020ADA84
cmp r1, #0x0
ldreq r0, [r0, #0x4]
ldrneh r0, [r0, #0xa]
ldrne r0, [r1, r0]
bx lr
- arm_func_end FUN_020ADA84
+ arm_func_end NNS_FndGetPrevListObject
- arm_func_start FUN_020ADA98
-FUN_020ADA98: ; 0x020ADA98
+ arm_func_start NNS_FndGetNextListObject
+NNS_FndGetNextListObject: ; 0x020ADA98
cmp r1, #0x0
ldreq r0, [r0, #0x0]
ldrneh r0, [r0, #0xa]
addne r0, r1, r0
ldrne r0, [r0, #0x4]
bx lr
- arm_func_end FUN_020ADA98
+ arm_func_end NNS_FndGetNextListObject
- arm_func_start FUN_020ADAB0
-FUN_020ADAB0: ; 0x020ADAB0
+ arm_func_start NNS_FndRemoveListObject
+NNS_FndRemoveListObject: ; 0x020ADAB0
stmdb sp!, {lr}
sub sp, sp, #0x4
ldrh r12, [r0, #0xa]
@@ -50,16 +49,16 @@ FUN_020ADAB0: ; 0x020ADAB0
strh r1, [r0, #0x8]
add sp, sp, #0x4
ldmia sp!, {pc}
- arm_func_end FUN_020ADAB0
+ arm_func_end NNS_FndRemoveListObject
- arm_func_start FUN_020ADB18
-FUN_020ADB18: ; 0x020ADB18
+ arm_func_start NNS_FndInsertListObject
+NNS_FndInsertListObject: ; 0x020ADB18
stmdb sp!, {lr}
sub sp, sp, #0x4
cmp r1, #0x0
bne _020ADB38
mov r1, r2
- bl FUN_020ADBE8
+ bl NNS_FndAppendListObject
add sp, sp, #0x4
ldmia sp!, {pc}
_020ADB38:
@@ -67,7 +66,7 @@ _020ADB38:
cmp r1, r3
bne _020ADB54
mov r1, r2
- bl FUN_020ADB8C
+ bl NNS_FndPrependListObject
add sp, sp, #0x4
ldmia sp!, {pc}
_020ADB54:
@@ -85,16 +84,16 @@ _020ADB54:
strh r1, [r0, #0x8]
add sp, sp, #0x4
ldmia sp!, {pc}
- arm_func_end FUN_020ADB18
+ arm_func_end NNS_FndInsertListObject
- arm_func_start FUN_020ADB8C
-FUN_020ADB8C: ; 0x020ADB8C
+ arm_func_start NNS_FndPrependListObject
+NNS_FndPrependListObject: ; 0x020ADB8C
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr r2, [r0, #0x0]
cmp r2, #0x0
bne _020ADBAC
- bl FUN_020ADC48
+ bl SetFirstObject
add sp, sp, #0x4
ldmia sp!, {pc}
_020ADBAC:
@@ -113,16 +112,16 @@ _020ADBAC:
strh r1, [r0, #0x8]
add sp, sp, #0x4
ldmia sp!, {pc}
- arm_func_end FUN_020ADB8C
+ arm_func_end NNS_FndPrependListObject
- arm_func_start FUN_020ADBE8
-FUN_020ADBE8: ; 0x020ADBE8
+ arm_func_start NNS_FndAppendListObject
+NNS_FndAppendListObject: ; 0x020ADBE8
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr r2, [r0, #0x0]
cmp r2, #0x0
bne _020ADC08
- bl FUN_020ADC48
+ bl SetFirstObject
add sp, sp, #0x4
ldmia sp!, {pc}
_020ADC08:
@@ -142,10 +141,10 @@ _020ADC08:
strh r1, [r0, #0x8]
add sp, sp, #0x4
ldmia sp!, {pc}
- arm_func_end FUN_020ADBE8
+ arm_func_end NNS_FndAppendListObject
- arm_func_start FUN_020ADC48
-FUN_020ADC48: ; 0x020ADC48
+ arm_func_start SetFirstObject
+SetFirstObject: ; 0x020ADC48
ldrh r3, [r0, #0xa]
mov r2, #0x0
add r12, r1, r3
@@ -157,14 +156,14 @@ FUN_020ADC48: ; 0x020ADC48
add r1, r1, #0x1
strh r1, [r0, #0x8]
bx lr
- arm_func_end FUN_020ADC48
+ arm_func_end SetFirstObject
- arm_func_start FUN_020ADC74
-FUN_020ADC74: ; 0x020ADC74
+ arm_func_start NNS_FndInitList
+NNS_FndInitList: ; 0x020ADC74
mov r2, #0x0
str r2, [r0, #0x0]
str r2, [r0, #0x4]
strh r2, [r0, #0x8]
strh r1, [r0, #0xa]
bx lr
- arm_func_end FUN_020ADC74
+ arm_func_end NNS_FndInitList
diff --git a/arm9/asm/NNS_G2D_g2d_animation.s b/arm9/asm/NNS_G2D_g2d_animation.s
index 60fcde4c..23daa1c6 100644
--- a/arm9/asm/NNS_G2D_g2d_animation.s
+++ b/arm9/asm/NNS_G2D_g2d_animation.s
@@ -3,9 +3,8 @@
.section .text
- ; _end
- arm_func_start FUN_020B0408
-FUN_020B0408: ; 0x020B0408
+ arm_func_start NNSi_G2dIsAnimCtrlLoopAnim
+NNSi_G2dIsAnimCtrlLoopAnim: ; 0x020B0408
ldr r1, [r0, #0x14]
cmp r1, #0x0
ldreq r0, [r0, #0x18]
@@ -20,21 +19,19 @@ _020B0428:
_020B0430:
mov r0, #0x0
bx lr
- arm_func_end FUN_020B0408
+ arm_func_end NNSi_G2dIsAnimCtrlLoopAnim
- ; NNS_G2dBindAnimCtrl
- arm_func_start FUN_020B0438
-FUN_020B0438: ; 0x020B0438
- ldr ip, _020B0444 ; =FUN_020B0448
+ arm_func_start NNS_G2dBindAnimCtrl
+NNS_G2dBindAnimCtrl: ; 0x020B0438
+ ldr ip, _020B0444 ; =NNS_G2dResetAnimCtrlState
str r1, [r0, #0x18]
bx r12
.balign 4
-_020B0444: .word FUN_020B0448
- arm_func_end FUN_020B0438
+_020B0444: .word NNS_G2dResetAnimCtrlState
+ arm_func_end NNS_G2dBindAnimCtrl
- ; NNS_G2dResetAnimCtrlState
- arm_func_start FUN_020B0448
-FUN_020B0448: ; 0x020B0448
+ arm_func_start NNS_G2dResetAnimCtrlState
+NNS_G2dResetAnimCtrlState: ; 0x020B0448
ldr r1, [r0, #0x10]
cmp r1, #0x0
movgt r2, #0x1
@@ -56,32 +53,30 @@ _020B047C:
sub r1, r1, #0x8
str r1, [r0, #0x0]
_020B0494:
- ldr ip, _020B04A4 ; =FUN_020B0534
+ ldr ip, _020B04A4 ; =NNS_G2dTickAnimCtrl
mov r1, #0x0
str r1, [r0, #0xc]
bx r12
.balign 4
-_020B04A4: .word FUN_020B0534
- arm_func_end FUN_020B0448
+_020B04A4: .word NNS_G2dTickAnimCtrl
+ arm_func_end NNS_G2dResetAnimCtrlState
- ; _end
- arm_func_start FUN_020B04A8
-FUN_020B04A8: ; 0x020B04A8
+ arm_func_start NNS_G2dInitAnimCallBackFunctor
+NNS_G2dInitAnimCallBackFunctor: ; 0x020B04A8
mov r1, #0x0
str r1, [r0, #0x0]
str r1, [r0, #0x4]
str r1, [r0, #0x8]
strh r1, [r0, #0xc]
bx lr
- arm_func_end FUN_020B04A8
+ arm_func_end NNS_G2dInitAnimCallBackFunctor
- ; _end
- arm_func_start FUN_020B04C0
-FUN_020B04C0: ; 0x020B04C0
+ arm_func_start NNS_G2dInitAnimCtrl
+NNS_G2dInitAnimCtrl: ; 0x020B04C0
stmdb sp!, {r4,lr}
mov r4, r0
add r0, r4, #0x1c
- bl FUN_020B04A8
+ bl NNS_G2dInitAnimCallBackFunctor
mov r1, #0x0
str r1, [r4, #0x0]
str r1, [r4, #0x4]
@@ -93,11 +88,10 @@ FUN_020B04C0: ; 0x020B04C0
str r1, [r4, #0x14]
str r1, [r4, #0x18]
ldmia sp!, {r4,pc}
- arm_func_end FUN_020B04C0
+ arm_func_end NNS_G2dInitAnimCtrl
- ; _end
- arm_func_start FUN_020B04FC
-FUN_020B04FC: ; 0x020B04FC
+ arm_func_start NNS_G2dGetAnimCtrlCurrentFrame
+NNS_G2dGetAnimCtrlCurrentFrame: ; 0x020B04FC
ldr r1, [r0, #0x18]
ldr r2, [r0, #0x0]
ldr r0, [r1, #0xc]
@@ -105,23 +99,21 @@ FUN_020B04FC: ; 0x020B04FC
mov r0, r0, lsl #0xd
mov r0, r0, lsr #0x10
bx lr
- arm_func_end FUN_020B04FC
+ arm_func_end NNS_G2dGetAnimCtrlCurrentFrame
- ; _end
- arm_func_start FUN_020B0518
-FUN_020B0518: ; 0x020B0518
+ arm_func_start NNS_G2dSetAnimCtrlCurrentFrame
+NNS_G2dSetAnimCtrlCurrentFrame: ; 0x020B0518
stmdb sp!, {r4,lr}
mov r4, r0
- bl FUN_020B06EC
+ bl SetAnimCtrlCurrentFrameImpl_
cmp r0, #0x0
movne r1, #0x0
strne r1, [r4, #0xc]
ldmia sp!, {r4,pc}
- arm_func_end FUN_020B0518
+ arm_func_end NNS_G2dSetAnimCtrlCurrentFrame
- ; _end
- arm_func_start FUN_020B0534
-FUN_020B0534: ; 0x020B0534
+ arm_func_start NNS_G2dTickAnimCtrl
+NNS_G2dTickAnimCtrl: ; 0x020B0534
stmdb sp!, {r4-r8,lr}
mov r8, r0
ldr r0, [r8, #0x8]
@@ -192,7 +184,7 @@ _020B0634:
cmp r0, #0x0
beq _020B0644
mov r0, r8
- bl FUN_020B0710
+ bl SequenceEdgeHandle_
_020B0644:
ldr r0, [r8, #0x1c]
cmp r0, #0x0
@@ -238,19 +230,17 @@ _020B06D0:
bne _020B058C
mov r0, r7
ldmia sp!, {r4-r8,pc}
- arm_func_end FUN_020B0534
+ arm_func_end NNS_G2dTickAnimCtrl
- ; _end
- arm_func_start FUN_020B06E0
-FUN_020B06E0: ; 0x020B06E0
+ arm_func_start NNS_G2dGetAnimCtrlCurrentElement
+NNS_G2dGetAnimCtrlCurrentElement: ; 0x020B06E0
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x0]
bx lr
- arm_func_end FUN_020B06E0
+ arm_func_end NNS_G2dGetAnimCtrlCurrentElement
- ; _end
- arm_func_start FUN_020B06EC
-FUN_020B06EC: ; 0x020B06EC
+ arm_func_start SetAnimCtrlCurrentFrameImpl_
+SetAnimCtrlCurrentFrameImpl_: ; 0x020B06EC
ldr r3, [r0, #0x18]
ldrh r2, [r3, #0x0]
cmp r1, r2
@@ -260,11 +250,10 @@ FUN_020B06EC: ; 0x020B06EC
movcc r0, #0x1
movcs r0, #0x0
bx lr
- arm_func_end FUN_020B06EC
+ arm_func_end SetAnimCtrlCurrentFrameImpl_
- ; _end
- arm_func_start FUN_020B0710
-FUN_020B0710: ; 0x020B0710
+ arm_func_start SequenceEdgeHandle_
+SequenceEdgeHandle_: ; 0x020B0710
stmdb sp!, {r4,lr}
mov r4, r0
ldr r0, [r4, #0x14]
@@ -307,7 +296,7 @@ _020B0780:
bne _020B0800
_020B07A8:
mov r0, r4
- bl FUN_020B0448
+ bl NNS_G2dResetAnimCtrlState
b _020B0800
_020B07B4:
ldr r0, [r4, #0x1c]
@@ -330,7 +319,7 @@ _020B07D0:
bne _020B0800
_020B07F8:
mov r0, r4
- bl FUN_020B0448
+ bl NNS_G2dResetAnimCtrlState
_020B0800:
ldr r1, [r4, #0x18]
ldr r2, [r4, #0x0]
@@ -344,5 +333,4 @@ _020B0800:
cmp r2, r1
strcc r1, [r4, #0x0]
ldmia sp!, {r4,pc}
- arm_func_end FUN_020B0710
-
+ arm_func_end SequenceEdgeHandle_
diff --git a/arm9/asm/NNS_G2D_g2d_cellanimati.s b/arm9/asm/NNS_G2D_g2d_cellanimati.s
index 91d32786..31720d7a 100644
--- a/arm9/asm/NNS_G2D_g2d_cellanimati.s
+++ b/arm9/asm/NNS_G2D_g2d_cellanimati.s
@@ -3,9 +3,8 @@
.section .text
- ; NNS_G2dMakeCellToOams
- arm_func_start FUN_020B1AF8
-FUN_020B1AF8: ; 0x020B1AF8
+ arm_func_start NNS_G2dMakeCellToOams
+NNS_G2dMakeCellToOams: ; 0x020B1AF8
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x34
ldrh r5, [r2, #0x0]
@@ -85,7 +84,7 @@ _020B1C1C:
cmp r6, #0x300
bne _020B1C70
ldr r4, _020B1E8C ; =0xC000C000
- ldr r8, _020B1E90 ; =UNK_020FF8AC
+ ldr r8, _020B1E90 ; =NNSi_objSizeWTbl
and r5, r5, r4
and r4, r5, #0xc000
mov r6, r4, asr #0xe
@@ -94,7 +93,7 @@ _020B1C1C:
mov r4, r4, lsl #0x1
add r8, r8, r6, lsl #0x3
ldrh r9, [r4, r8]
- ldr r8, _020B1E94 ; =UNK_020FF894
+ ldr r8, _020B1E94 ; =NNSi_objSizeHTbl
ldr r5, [sp, #0x20]
add r6, r8, r6, lsl #0x3
add r5, r5, r9, lsl #0xb
@@ -170,12 +169,12 @@ _020B1D54:
and r5, r8, #0xc000
mov r6, r5, asr #0xe
and r5, r8, #0xc0000000
- ldr r8, _020B1E90 ; =UNK_020FF8AC
+ ldr r8, _020B1E90 ; =NNSi_objSizeWTbl
mov r5, r5, lsr #0x1e
mov r5, r5, lsl #0x1
add r8, r8, r6, lsl #0x3
ldrh r9, [r5, r8]
- ldr r8, _020B1E94 ; =UNK_020FF894
+ ldr r8, _020B1E94 ; =NNSi_objSizeHTbl
ldr r4, [sp, #0x20]
add r6, r8, r6, lsl #0x3
mov r11, r9, asr #0x1
@@ -247,53 +246,49 @@ _020B1E7C:
.balign 4
_020B1E88: .word 0x01FF0000
_020B1E8C: .word 0xC000C000
-_020B1E90: .word UNK_020FF8AC
-_020B1E94: .word UNK_020FF894
+_020B1E90: .word NNSi_objSizeWTbl
+_020B1E94: .word NNSi_objSizeHTbl
_020B1E98: .word 0xC1FFFCFF
_020B1E9C: .word 0x000001FF
_020B1EA0: .word 0xFE00FF00
- arm_func_end FUN_020B1AF8
+ arm_func_end NNS_G2dMakeCellToOams
- ; _end
- arm_func_start FUN_020B1EA4
-FUN_020B1EA4: ; 0x020B1EA4
+ arm_func_start NNS_G2dSetCellAnimationCurrentFrame
+NNS_G2dSetCellAnimationCurrentFrame: ; 0x020B1EA4
stmdb sp!, {r4,lr}
mov r4, r0
- bl FUN_020B0518
+ bl NNS_G2dSetAnimCtrlCurrentFrame
cmp r0, #0x0
ldmeqia sp!, {r4,pc}
mov r0, r4
- bl FUN_020B1FC4
+ bl ApplyCurrentAnimResult_
ldmia sp!, {r4,pc}
- arm_func_end FUN_020B1EA4
+ arm_func_end NNS_G2dSetCellAnimationCurrentFrame
- ; _end
- arm_func_start FUN_020B1EC4
-FUN_020B1EC4: ; 0x020B1EC4
+ arm_func_start NNS_G2dTickCellAnimation
+NNS_G2dTickCellAnimation: ; 0x020B1EC4
stmdb sp!, {r4,lr}
mov r4, r0
- bl FUN_020B0534
+ bl NNS_G2dTickAnimCtrl
cmp r0, #0x0
ldmeqia sp!, {r4,pc}
mov r0, r4
- bl FUN_020B1FC4
+ bl ApplyCurrentAnimResult_
ldmia sp!, {r4,pc}
- arm_func_end FUN_020B1EC4
+ arm_func_end NNS_G2dTickCellAnimation
- ; _end
- arm_func_start FUN_020B1EE4
-FUN_020B1EE4: ; 0x020B1EE4
+ arm_func_start NNS_G2dSetCellAnimationSequence
+NNS_G2dSetCellAnimationSequence: ; 0x020B1EE4
stmdb sp!, {r4,lr}
mov r4, r0
- bl FUN_020B0438
+ bl NNS_G2dBindAnimCtrl
mov r0, r4
- bl FUN_020B1FC4
+ bl ApplyCurrentAnimResult_
ldmia sp!, {r4,pc}
- arm_func_end FUN_020B1EE4
+ arm_func_end NNS_G2dSetCellAnimationSequence
- ; _end
- arm_func_start FUN_020B1EFC
-FUN_020B1EFC: ; 0x020B1EFC
+ arm_func_start NNS_G2dInitCellAnimationVramTransfered
+NNS_G2dInitCellAnimationVramTransfered: ; 0x020B1EFC
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x14
mov r4, r2
@@ -313,25 +308,24 @@ FUN_020B1EFC: ; 0x020B1EFC
ldr r3, [sp, #0x30]
mov r0, r6
str r12, [sp, #0xc]
- bl FUN_020B45F0
+ bl NNSi_G2dInitCellTransferState
str r6, [r7, #0x34]
str r4, [r7, #0x30]
add r0, r7, #0x38
mov r1, #0x1
str r6, [r7, #0x34]
- bl FUN_020B1A68
+ bl NNSi_G2dSrtcInitControl
mov r0, r7
- bl FUN_020B04C0
+ bl NNS_G2dInitAnimCtrl
mov r0, r7
mov r1, r5
- bl FUN_020B1EE4
+ bl NNS_G2dSetCellAnimationSequence
add sp, sp, #0x14
ldmia sp!, {r4-r7,pc}
- arm_func_end FUN_020B1EFC
+ arm_func_end NNS_G2dInitCellAnimationVramTransfered
- ; _end
- arm_func_start FUN_020B1F80
-FUN_020B1F80: ; 0x020B1F80
+ arm_func_start NNS_G2dInitCellAnimation
+NNS_G2dInitCellAnimation: ; 0x020B1F80
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r0
@@ -341,19 +335,18 @@ FUN_020B1F80: ; 0x020B1F80
add r0, r5, #0x38
mov r1, #0x1
str r2, [r5, #0x34]
- bl FUN_020B1A68
+ bl NNSi_G2dSrtcInitControl
mov r0, r5
- bl FUN_020B04C0
+ bl NNS_G2dInitAnimCtrl
mov r0, r5
mov r1, r4
- bl FUN_020B1EE4
+ bl NNS_G2dSetCellAnimationSequence
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
- arm_func_end FUN_020B1F80
+ arm_func_end NNS_G2dInitCellAnimation
- ; _end
- arm_func_start FUN_020B1FC4
-FUN_020B1FC4: ; 0x020B1FC4
+ arm_func_start ApplyCurrentAnimResult_
+ApplyCurrentAnimResult_: ; 0x020B1FC4
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r5, r0
@@ -362,19 +355,19 @@ FUN_020B1FC4: ; 0x020B1FC4
cmp r1, #0x0
addeq sp, sp, #0x4
ldmeqia sp!, {r4-r7,pc}
- bl FUN_020B06E0
+ bl NNS_G2dGetAnimCtrlCurrentElement
mov r4, r0
ldr r7, [r5, #0x30]
ldrh r1, [r4, #0x0]
mov r0, r7
- bl FUN_020AFE8C
+ bl NNS_G2dGetCellDataByIdx
str r0, [r5, #0x2c]
ldr r1, [r5, #0x18]
add r0, r5, #0x38
ldr r2, [r1, #0x4]
mov r1, #0x1
and r6, r2, #0xff
- bl FUN_020B1A68
+ bl NNSi_G2dSrtcInitControl
cmp r6, #0x0
beq _020B2068
cmp r6, #0x2
@@ -382,20 +375,20 @@ FUN_020B1FC4: ; 0x020B1FC4
ldrsh r1, [r4, #0x4]
ldrsh r2, [r4, #0x6]
add r0, r5, #0x38
- bl FUN_020B1AB4
+ bl NNSi_G2dSrtcSetTrans
b _020B2068
_020B203C:
ldr r1, [r4, #0x4]
ldr r2, [r4, #0x8]
add r0, r5, #0x38
- bl FUN_020B1A78
+ bl NNSi_G2dSrtcSetSRTScale
ldrh r1, [r4, #0x2]
add r0, r5, #0x38
- bl FUN_020B1A98
+ bl NNSi_G2dSrtcSetSRTRotZ
ldrsh r1, [r4, #0xc]
ldrsh r2, [r4, #0xe]
add r0, r5, #0x38
- bl FUN_020B1AB4
+ bl NNSi_G2dSrtcSetTrans
_020B2068:
ldr r2, [r7, #0xc]
cmp r2, #0x0
@@ -418,8 +411,7 @@ _020B2068:
add r3, r2, r1, lsl #0x3
ldr r1, [r2, r1, lsl #0x3]
ldr r2, [r3, #0x4]
- bl FUN_020B4400
+ bl NNS_G2dSetCellTransferStateRequested
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
- arm_func_end FUN_020B1FC4
-
+ arm_func_end ApplyCurrentAnimResult_
diff --git a/arm9/asm/NNS_G2D_g2d_celltransfe.s b/arm9/asm/NNS_G2D_g2d_celltransfe.s
index f7c8cec6..0e41bdba 100644
--- a/arm9/asm/NNS_G2D_g2d_celltransfe.s
+++ b/arm9/asm/NNS_G2D_g2d_celltransfe.s
@@ -3,41 +3,36 @@
.section .rodata
- ; cvtTbl$7926
- .global UNK_020FF8C4
-UNK_020FF8C4: ; 0x020FF8C4
+ .global cvtTbl$7926
+cvtTbl$7926: ; 0x020FF8C4
.byte 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00
-
; static const in function
+
.section .bss
- ; s_pTaskRegisterFunc
- .global UNK_021CECFC
-UNK_021CECFC: ; 0x021CECFC
+ .global s_pTaskRegisterFunc
+s_pTaskRegisterFunc: ; 0x021CECFC
.space 0x4
- ; s_numCellState
- .global UNK_021CED00
-UNK_021CED00: ; 0x021CED00
+ .global s_numCellState
+s_numCellState: ; 0x021CED00
.space 0x4
- ; s_pCellStateArray
- .global UNK_021CED04
-UNK_021CED04: ; 0x021CED04
+ .global s_pCellStateArray
+s_pCellStateArray: ; 0x021CED04
.space 0x4
.section .text
- ; NNS_G2dFreeCellTransferStateHandle
- arm_func_start FUN_020B4358
-FUN_020B4358: ; 0x020B4358
+ arm_func_start NNS_G2dFreeCellTransferStateHandle
+NNS_G2dFreeCellTransferStateHandle: ; 0x020B4358
stmdb sp!, {r4,lr}
- ldr r2, _020B43A0 ; =UNK_021CED04
+ ldr r2, _020B43A0 ; =s_pCellStateArray
mov r1, #0x30
ldr r2, [r2, #0x0]
mla r4, r0, r1, r2
mov r0, r4
- bl FUN_020B10CC
+ bl NNSi_G2dInitializeVRamLocation
mov r0, #0x0
str r0, [r4, #0xc]
str r0, [r4, #0x10]
@@ -50,18 +45,17 @@ FUN_020B4358: ; 0x020B4358
str r0, [r4, #0x2c]
ldmia sp!, {r4,pc}
.balign 4
-_020B43A0: .word UNK_021CED04
- arm_func_end FUN_020B4358
+_020B43A0: .word s_pCellStateArray
+ arm_func_end NNS_G2dFreeCellTransferStateHandle
- ; NNS_G2dGetNewCellTransferStateHandle
- arm_func_start FUN_020B43A4
-FUN_020B43A4: ; 0x020B43A4
- ldr r1, _020B43F8 ; =UNK_021CED00
+ arm_func_start NNS_G2dGetNewCellTransferStateHandle
+NNS_G2dGetNewCellTransferStateHandle: ; 0x020B43A4
+ ldr r1, _020B43F8 ; =s_numCellState
mov r0, #0x0
ldr r3, [r1, #0x0]
cmp r3, #0x0
bls _020B43F0
- ldr r1, _020B43FC ; =UNK_021CED04
+ ldr r1, _020B43FC ; =s_pCellStateArray
ldr r2, [r1, #0x0]
mov r12, r2
_020B43C4:
@@ -80,34 +74,32 @@ _020B43F0:
mvn r0, #0x0
bx lr
.balign 4
-_020B43F8: .word UNK_021CED00
-_020B43FC: .word UNK_021CED04
- arm_func_end FUN_020B43A4
+_020B43F8: .word s_numCellState
+_020B43FC: .word s_pCellStateArray
+ arm_func_end NNS_G2dGetNewCellTransferStateHandle
- ; _end
- arm_func_start FUN_020B4400
-FUN_020B4400: ; 0x020B4400
+ arm_func_start NNS_G2dSetCellTransferStateRequested
+NNS_G2dSetCellTransferStateRequested: ; 0x020B4400
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r1
mov r4, r2
- bl FUN_020B469C
+ bl NNSi_G2dGetCellTransferState
mvn r1, #0x0
str r1, [r0, #0x24]
str r5, [r0, #0x28]
str r4, [r0, #0x2c]
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
- arm_func_end FUN_020B4400
+ arm_func_end NNS_G2dSetCellTransferStateRequested
- ; NNS_G2dUpdateCellTransferStateManager
- arm_func_start FUN_020B442C
-FUN_020B442C: ; 0x020B442C
+ arm_func_start NNS_G2dUpdateCellTransferStateManager
+NNS_G2dUpdateCellTransferStateManager: ; 0x020B442C
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x14
mov r0, #0x0
str r0, [sp, #0x0]
- ldr r0, _020B4558 ; =UNK_021CED00
+ ldr r0, _020B4558 ; =s_numCellState
ldr r0, [r0, #0x0]
cmp r0, #0x0
addls sp, sp, #0x14
@@ -119,7 +111,7 @@ FUN_020B442C: ; 0x020B442C
str r0, [sp, #0x8]
str r0, [sp, #0xc]
_020B4468:
- ldr r0, _020B455C ; =UNK_021CED04
+ ldr r0, _020B455C ; =s_pCellStateArray
ldr r1, [r0, #0x0]
ldr r0, [sp, #0x4]
add r8, r1, r0
@@ -143,17 +135,17 @@ _020B4498:
_020B44B8:
cmp r1, #0x0
beq _020B4514
- ldr r0, _020B4560 ; =UNK_020FF8C4
+ ldr r0, _020B4560 ; =cvtTbl$7926
cmp r9, #0x0
ldr r7, [r0, r9, lsl #0x2]
ldreq r10, [r8, #0x14]
mov r0, r8
mov r1, r9
ldrne r10, [r8, #0x10]
- bl FUN_020B10BC
+ bl NNSi_G2dGetVramLocation
mov r1, r0
mov r0, r7
- ldr r7, _020B4564 ; =UNK_021CECFC
+ ldr r7, _020B4564 ; =s_pTaskRegisterFunc
ldr r2, [r8, #0x28]
ldr r3, [r8, #0x2c]
ldr r7, [r7, #0x0]
@@ -172,7 +164,7 @@ _020B4520:
ldr r0, [sp, #0xc]
str r0, [r8, #0x20]
_020B4528:
- ldr r0, _020B4558 ; =UNK_021CED00
+ ldr r0, _020B4558 ; =s_numCellState
ldr r1, [r0, #0x0]
ldr r0, [sp, #0x0]
add r0, r0, #0x1
@@ -185,21 +177,20 @@ _020B4528:
add sp, sp, #0x14
ldmia sp!, {r4-r11,pc}
.balign 4
-_020B4558: .word UNK_021CED00
-_020B455C: .word UNK_021CED04
-_020B4560: .word UNK_020FF8C4
-_020B4564: .word UNK_021CECFC
- arm_func_end FUN_020B442C
+_020B4558: .word s_numCellState
+_020B455C: .word s_pCellStateArray
+_020B4560: .word cvtTbl$7926
+_020B4564: .word s_pTaskRegisterFunc
+ arm_func_end NNS_G2dUpdateCellTransferStateManager
- ; NNS_G2dInitCellTransferStateManager
- arm_func_start FUN_020B4568
-FUN_020B4568: ; 0x020B4568
+ arm_func_start NNS_G2dInitCellTransferStateManager
+NNS_G2dInitCellTransferStateManager: ; 0x020B4568
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
- ldr ip, _020B45E4 ; =UNK_021CECFC
+ ldr ip, _020B45E4 ; =s_pTaskRegisterFunc
movs r6, r1
- ldr r1, _020B45E8 ; =UNK_021CED00
- ldr r3, _020B45EC ; =UNK_021CED04
+ ldr r1, _020B45E8 ; =s_numCellState
+ ldr r3, _020B45EC ; =s_pCellStateArray
mov r7, r0
str r2, [r12, #0x0]
mov r5, #0x0
@@ -210,7 +201,7 @@ FUN_020B4568: ; 0x020B4568
mov r4, r5
_020B45A0:
mov r0, r7
- bl FUN_020B10CC
+ bl NNSi_G2dInitializeVRamLocation
str r4, [r7, #0xc]
str r4, [r7, #0x10]
str r4, [r7, #0x14]
@@ -227,17 +218,16 @@ _020B45A0:
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
.balign 4
-_020B45E4: .word UNK_021CECFC
-_020B45E8: .word UNK_021CED00
-_020B45EC: .word UNK_021CED04
- arm_func_end FUN_020B4568
+_020B45E4: .word s_pTaskRegisterFunc
+_020B45E8: .word s_numCellState
+_020B45EC: .word s_pCellStateArray
+ arm_func_end NNS_G2dInitCellTransferStateManager
- ; NNSi_G2dInitCellTransferState
- arm_func_start FUN_020B45F0
-FUN_020B45F0: ; 0x020B45F0
+ arm_func_start NNSi_G2dInitCellTransferState
+NNSi_G2dInitCellTransferState: ; 0x020B45F0
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
- ldr ip, _020B4698 ; =UNK_021CED04
+ ldr ip, _020B4698 ; =s_pCellStateArray
mov r4, #0x30
ldr r12, [r12, #0x0]
mov r7, r1
@@ -245,14 +235,14 @@ FUN_020B45F0: ; 0x020B45F0
mov r0, r4
mov r6, r2
mov r5, r3
- bl FUN_020B10CC
+ bl NNSi_G2dInitializeVRamLocation
mvn r0, #0x0
cmp r7, r0
beq _020B4638
mov r0, r4
mov r2, r7
mov r1, #0x0
- bl FUN_020B10C4
+ bl NNSi_G2dSetVramLocation
_020B4638:
mvn r0, #0x0
cmp r6, r0
@@ -260,7 +250,7 @@ _020B4638:
mov r0, r4
mov r2, r6
mov r1, #0x1
- bl FUN_020B10C4
+ bl NNSi_G2dSetVramLocation
_020B4654:
mvn r0, #0x0
cmp r5, r0
@@ -268,7 +258,7 @@ _020B4654:
mov r0, r4
mov r2, r5
mov r1, #0x2
- bl FUN_020B10C4
+ bl NNSi_G2dSetVramLocation
_020B4670:
ldr r1, [sp, #0x18]
ldr r0, [sp, #0x1c]
@@ -281,18 +271,16 @@ _020B4670:
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
.balign 4
-_020B4698: .word UNK_021CED04
- arm_func_end FUN_020B45F0
+_020B4698: .word s_pCellStateArray
+ arm_func_end NNSi_G2dInitCellTransferState
- ; NNSi_G2dGetCellTransferState
- arm_func_start FUN_020B469C
-FUN_020B469C: ; 0x020B469C
- ldr r2, _020B46B0 ; =UNK_021CED04
+ arm_func_start NNSi_G2dGetCellTransferState
+NNSi_G2dGetCellTransferState: ; 0x020B469C
+ ldr r2, _020B46B0 ; =s_pCellStateArray
mov r1, #0x30
ldr r2, [r2, #0x0]
mla r0, r1, r0, r2
bx lr
.balign 4
-_020B46B0: .word UNK_021CED04
- arm_func_end FUN_020B469C
-
+_020B46B0: .word s_pCellStateArray
+ arm_func_end NNSi_G2dGetCellTransferState
diff --git a/arm9/asm/NNS_G2D_g2d_charcanvas.s b/arm9/asm/NNS_G2D_g2d_charcanvas.s
index b21235e8..6f483596 100644
--- a/arm9/asm/NNS_G2D_g2d_charcanvas.s
+++ b/arm9/asm/NNS_G2D_g2d_charcanvas.s
@@ -3,27 +3,22 @@
.section .rodata
- ; objs$8221
- .global UNK_020FF970
-UNK_020FF970: ; 0x020FF970
+ .global objs$8221
+objs$8221: ; 0x020FF970
.byte 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01
.byte 0x00, 0x02, 0x01, 0x02, 0x02, 0x02, 0x03, 0x02, 0x00, 0x02, 0x01, 0x02, 0x02, 0x03, 0x03, 0x03
- ; static const in function
- ; shape$8277
- .global UNK_020FF990
-UNK_020FF990: ; 0x020FF990
+ .global shape$8277
+shape$8277: ; 0x020FF990
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x40, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x80, 0x00, 0x40, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x40, 0x00, 0xC0
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0xC0, 0x00, 0x00, 0x00, 0xC0
- ; static const in function
.section .text
- ; NNS_G2dArrangeOBJ1D
- arm_func_start FUN_020B5E50
-FUN_020B5E50: ; 0x020B5E50
+ arm_func_start NNS_G2dArrangeOBJ1D
+NNS_G2dArrangeOBJ1D: ; 0x020B5E50
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x3c
mov r7, r0
@@ -48,7 +43,7 @@ FUN_020B5E50: ; 0x020B5E50
movge r1, #0x3
clzlt r0, r0
rsblt r1, r0, #0x1f
- ldr r0, _020B6170 ; =UNK_020FF970
+ ldr r0, _020B6170 ; =objs$8221
mvn r3, #0x0
add r1, r0, r1, lsl #0x3
add r0, r1, r2, lsl #0x1
@@ -69,7 +64,7 @@ FUN_020B5E50: ; 0x020B5E50
strne r1, [sp, #0x24]
mov r1, #0x0
str r1, [sp, #0x28]
- bl FUN_020B704C
+ bl OBJSizeToShape
ldr r1, [sp, #0x10]
ldr r2, [sp, #0x14]
mov r10, r1, asr r4
@@ -155,7 +150,7 @@ _020B5FE8:
add r3, r11, r1, lsl #0x3
mov r0, r7
mov r1, r4
- bl FUN_020B5E50
+ bl NNS_G2dArrangeOBJ1D
ldr r1, [sp, #0x24]
add r7, r7, r0, lsl #0x3
mul r2, r1, r4
@@ -186,7 +181,7 @@ _020B6078:
str r1, [sp, #0xc]
ldr r1, [sp, #0x1c]
mov r2, r4
- bl FUN_020B5E50
+ bl NNS_G2dArrangeOBJ1D
ldr r2, [sp, #0x24]
ldr r1, [sp, #0x1c]
add r7, r7, r0, lsl #0x3
@@ -223,7 +218,7 @@ _020B60F0:
mov r0, r7
add r3, r11, r3, lsl #0x3
str r4, [sp, #0xc]
- bl FUN_020B5E50
+ bl NNS_G2dArrangeOBJ1D
ldr r1, [sp, #0x28]
add r0, r1, r0
str r0, [sp, #0x28]
@@ -232,15 +227,14 @@ _020B6164:
add sp, sp, #0x3c
ldmia sp!, {r4-r11,pc}
.balign 4
-_020B6170: .word UNK_020FF970
+_020B6170: .word objs$8221
_020B6174: .word 0x000001FF
_020B6178: .word 0xFE00FF00
_020B617C: .word 0x3FFF3FFF
- arm_func_end FUN_020B5E50
+ arm_func_end NNS_G2dArrangeOBJ1D
- ; _end
- arm_func_start FUN_020B6180
-FUN_020B6180: ; 0x020B6180
+ arm_func_start NNSi_G2dCalcRequiredOBJ
+NNSi_G2dCalcRequiredOBJ: ; 0x020B6180
stmdb sp!, {r4-r6,lr}
mov r3, r0, lsr #0x3
mov r6, r1, lsr #0x3
@@ -264,11 +258,10 @@ FUN_020B6180: ; 0x020B6180
add r0, lr, r0, lsr #0x2
mla r0, r1, r0, r12
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020B6180
+ arm_func_end NNSi_G2dCalcRequiredOBJ
- ; _end
- arm_func_start FUN_020B61DC
-FUN_020B61DC: ; 0x020B61DC
+ arm_func_start NNS_G2dMapScrToChar256x16Pltt
+NNS_G2dMapScrToChar256x16Pltt: ; 0x020B61DC
stmdb sp!, {r4-r8,lr}
ldr r12, [sp, #0x1c]
ldr r8, [sp, #0x18]
@@ -297,11 +290,10 @@ _020B622C:
add r0, r0, lr
blt _020B6204
ldmia sp!, {r4-r8,pc}
- arm_func_end FUN_020B61DC
+ arm_func_end NNS_G2dMapScrToChar256x16Pltt
- ; _end
- arm_func_start FUN_020B6240
-FUN_020B6240: ; 0x020B6240
+ arm_func_start NNS_G2dMapScrToCharText
+NNS_G2dMapScrToCharText: ; 0x020B6240
stmdb sp!, {r4-r8,lr}
sub sp, sp, #0x8
ldr r5, [sp, #0x24]
@@ -315,7 +307,7 @@ FUN_020B6240: ; 0x020B6240
mov r3, r5
add r0, r0, r4, lsl #0x1
str lr, [sp, #0x4]
- bl FUN_020B61DC
+ bl NNS_G2dMapScrToChar256x16Pltt
add sp, sp, #0x8
ldmia sp!, {r4-r8,pc}
_020B6280:
@@ -352,11 +344,10 @@ _020B62E4:
blt _020B62A0
add sp, sp, #0x8
ldmia sp!, {r4-r8,pc}
- arm_func_end FUN_020B6240
+ arm_func_end NNS_G2dMapScrToCharText
- ; NNS_G2dCharCanvasInitForOBJ1D
- arm_func_start FUN_020B62F8
-FUN_020B62F8: ; 0x020B62F8
+ arm_func_start NNS_G2dCharCanvasInitForOBJ1D
+NNS_G2dCharCanvasInitForOBJ1D: ; 0x020B62F8
stmdb sp!, {r4-r6,lr}
sub sp, sp, #0x18
cmp r2, #0x8
@@ -369,16 +360,16 @@ FUN_020B62F8: ; 0x020B62F8
movge r6, #0x3
clzlt r4, r4
rsblt r6, r4, #0x1f
- ldr r4, _020B6378 ; =UNK_020FF970
+ ldr r4, _020B6378 ; =objs$8221
ldr r5, [sp, #0x28]
add r4, r4, r6, lsl #0x3
ldrb r6, [r4, r12, lsl #0x1]
add r12, r4, r12, lsl #0x1
- ldr r4, _020B637C ; =FUN_020B6908
+ ldr r4, _020B637C ; =DrawGlyph1D
strb r6, [sp, #0x14]
ldrb r6, [r12, #0x1]
- ldr lr, _020B6380 ; =FUN_020B68AC
- ldr ip, _020B6384 ; =FUN_020B64C0
+ ldr lr, _020B6380 ; =ClearContinuous
+ ldr ip, _020B6384 ; =ClearArea1D
strb r6, [sp, #0x15]
str r5, [sp, #0x0]
str r4, [sp, #0x4]
@@ -386,42 +377,40 @@ FUN_020B62F8: ; 0x020B62F8
str r12, [sp, #0xc]
ldr r12, [sp, #0x14]
str r12, [sp, #0x10]
- bl FUN_020B6488
+ bl InitCharCanvas
add sp, sp, #0x18
ldmia sp!, {r4-r6,pc}
.balign 4
-_020B6378: .word UNK_020FF970
-_020B637C: .word FUN_020B6908
-_020B6380: .word FUN_020B68AC
-_020B6384: .word FUN_020B64C0
- arm_func_end FUN_020B62F8
+_020B6378: .word objs$8221
+_020B637C: .word DrawGlyph1D
+_020B6380: .word ClearContinuous
+_020B6384: .word ClearArea1D
+ arm_func_end NNS_G2dCharCanvasInitForOBJ1D
- ; NNS_G2dCharCanvasInitForBG
- arm_func_start FUN_020B6388
-FUN_020B6388: ; 0x020B6388
+ arm_func_start NNS_G2dCharCanvasInitForBG
+NNS_G2dCharCanvasInitForBG: ; 0x020B6388
stmdb sp!, {lr}
sub sp, sp, #0x14
ldr lr, [sp, #0x18]
- ldr ip, _020B63C0 ; =FUN_020B6B10
+ ldr ip, _020B63C0 ; =DrawGlyphLine
str lr, [sp, #0x0]
- ldr lr, _020B63C4 ; =FUN_020B68AC
+ ldr lr, _020B63C4 ; =ClearContinuous
str r12, [sp, #0x4]
- ldr ip, _020B63C8 ; =FUN_020B66D4
+ ldr ip, _020B63C8 ; =ClearAreaLine
str lr, [sp, #0x8]
str r12, [sp, #0xc]
str r2, [sp, #0x10]
- bl FUN_020B6488
+ bl InitCharCanvas
add sp, sp, #0x14
ldmia sp!, {pc}
.balign 4
-_020B63C0: .word FUN_020B6B10
-_020B63C4: .word FUN_020B68AC
-_020B63C8: .word FUN_020B66D4
- arm_func_end FUN_020B6388
+_020B63C0: .word DrawGlyphLine
+_020B63C4: .word ClearContinuous
+_020B63C8: .word ClearAreaLine
+ arm_func_end NNS_G2dCharCanvasInitForBG
- ; NNS_G2dCharCanvasDrawChar
- arm_func_start FUN_020B63CC
-FUN_020B63CC: ; 0x020B63CC
+ arm_func_start NNS_G2dCharCanvasDrawChar
+NNS_G2dCharCanvasDrawChar: ; 0x020B63CC
stmdb sp!, {r4-r8,lr}
sub sp, sp, #0x10
mov r7, r1
@@ -430,7 +419,7 @@ FUN_020B63CC: ; 0x020B63CC
mov r0, r7
mov r6, r2
mov r5, r3
- bl FUN_020B5CE4
+ bl NNS_G2dFontFindGlyphIndex
ldr r1, _020B6484 ; =0x0000FFFF
mov r4, r0
cmp r4, r1
@@ -438,7 +427,7 @@ FUN_020B63CC: ; 0x020B63CC
ldreqh r4, [r0, #0x2]
mov r0, r7
mov r1, r4
- bl FUN_020B5C88
+ bl NNS_G2dFontGetCharWidthsFromIndex
str r0, [sp, #0x8]
ldr r0, [r7, #0x0]
ldr r2, [sp, #0x28]
@@ -470,11 +459,10 @@ FUN_020B63CC: ; 0x020B63CC
ldmia sp!, {r4-r8,pc}
.balign 4
_020B6484: .word 0x0000FFFF
- arm_func_end FUN_020B63CC
+ arm_func_end NNS_G2dCharCanvasDrawChar
- ; _end
- arm_func_start FUN_020B6488
-FUN_020B6488: ; 0x020B6488
+ arm_func_start InitCharCanvas
+InitCharCanvas: ; 0x020B6488
str r2, [r0, #0x4]
ldr r2, [sp, #0x0]
str r3, [r0, #0x8]
@@ -489,11 +477,10 @@ FUN_020B6488: ; 0x020B6488
str r2, [r0, #0x1c]
str r1, [r0, #0x10]
bx lr
- arm_func_end FUN_020B6488
+ arm_func_end InitCharCanvas
- ; _end
- arm_func_start FUN_020B64C0
-FUN_020B64C0: ; 0x020B64C0
+ arm_func_start ClearArea1D
+ClearArea1D: ; 0x020B64C0
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x54
ldrb r4, [r0, #0xc]
@@ -597,7 +584,7 @@ _020B6630:
str r0, [sp, #0x4]
mov r0, r7
mov r1, r6
- bl FUN_020B7068
+ bl GetCharIndex1D
ldr r2, [sp, #0x1c]
cmp r8, r10
sublt r1, r10, r8
@@ -616,7 +603,7 @@ _020B6630:
ldr r2, [sp, #0x28]
mla r0, r12, r0, r2
mov r2, r9
- bl FUN_020B6F18
+ bl ClearChar
add r8, r8, #0x8
add r7, r7, #0x1
cmp r8, r5
@@ -631,11 +618,10 @@ _020B66B0:
blt _020B65E4
add sp, sp, #0x54
ldmia sp!, {r4-r11,pc}
- arm_func_end FUN_020B64C0
+ arm_func_end ClearArea1D
- ; _end
- arm_func_start FUN_020B66D4
-FUN_020B66D4: ; 0x020B66D4
+ arm_func_start ClearAreaLine
+ClearAreaLine: ; 0x020B66D4
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x3c
ldrb r4, [r0, #0xc]
@@ -739,7 +725,7 @@ _020B6828:
mov r2, r9
str r0, [sp, #0x8]
mov r0, r6
- bl FUN_020B6F18
+ bl ClearChar
ldr r0, [sp, #0x30]
add r8, r8, #0x8
add r6, r6, r0
@@ -758,11 +744,10 @@ _020B687C:
blt _020B67E0
add sp, sp, #0x3c
ldmia sp!, {r4-r11,pc}
- arm_func_end FUN_020B66D4
+ arm_func_end ClearAreaLine
- ; _end
- arm_func_start FUN_020B68AC
-FUN_020B68AC: ; 0x020B68AC
+ arm_func_start ClearContinuous
+ClearContinuous: ; 0x020B68AC
stmdb sp!, {lr}
sub sp, sp, #0x4
mov r3, r0
@@ -786,11 +771,10 @@ FUN_020B68AC: ; 0x020B68AC
bl MIi_CpuClearFast
add sp, sp, #0x4
ldmia sp!, {pc}
- arm_func_end FUN_020B68AC
+ arm_func_end ClearContinuous
- ; _end
- arm_func_start FUN_020B6908
-FUN_020B6908: ; 0x020B6908
+ arm_func_start DrawGlyph1D
+DrawGlyph1D: ; 0x020B6908
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x4c
ldr r7, [sp, #0x74]
@@ -904,12 +888,12 @@ _020B6AAC:
mov r0, r7
mov r1, r10
str r4, [sp, #0x4]
- bl FUN_020B7068
+ bl GetCharIndex1D
mla r1, r0, r5, r6
add r0, sp, #0x24
str r9, [sp, #0x2c]
str r1, [sp, #0x24]
- bl FUN_020B6CAC
+ bl LetterChar
sub r9, r9, #0x8
add r7, r7, #0x1
cmp r9, r8
@@ -924,11 +908,10 @@ _020B6AEC:
bgt _020B6A90
add sp, sp, #0x4c
ldmia sp!, {r4-r11,pc}
- arm_func_end FUN_020B6908
+ arm_func_end DrawGlyph1D
- ; _end
- arm_func_start FUN_020B6B10
-FUN_020B6B10: ; 0x020B6B10
+ arm_func_start DrawGlyphLine
+DrawGlyphLine: ; 0x020B6B10
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x2c
ldr r4, [sp, #0x54]
@@ -1022,7 +1005,7 @@ _020B6C70:
mov r0, r4
str r6, [sp, #0x4]
str r8, [sp, #0xc]
- bl FUN_020B6CAC
+ bl LetterChar
sub r8, r8, #0x8
cmp r8, r7
add r6, r6, r5
@@ -1035,11 +1018,10 @@ _020B6C90:
bgt _020B6C60
add sp, sp, #0x2c
ldmia sp!, {r4-r11,pc}
- arm_func_end FUN_020B6B10
+ arm_func_end DrawGlyphLine
- ; _end
- arm_func_start FUN_020B6CAC
-FUN_020B6CAC: ; 0x020B6CAC
+ arm_func_start LetterChar
+LetterChar: ; 0x020B6CAC
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x34
ldr r5, [r0, #0x8]
@@ -1108,7 +1090,7 @@ _020B6D88:
strb r0, [sp, #0x28]
strb r0, [sp, #0x29]
mov r0, r9
- bl FUN_020B76B0
+ bl NNSi_G2dBitReaderRead
ldr r8, [sp, #0x0]
mov r0, r8
cmp r0, r10
@@ -1116,7 +1098,7 @@ _020B6D88:
_020B6DCC:
mov r0, r9
mov r1, r6
- bl FUN_020B76B0
+ bl NNSi_G2dBitReaderRead
cmp r0, #0x0
mvnne r1, r4, lsl r8
addne r0, r7, r0
@@ -1165,7 +1147,7 @@ _020B6E58:
strb r0, [sp, #0x30]
strb r0, [sp, #0x31]
add r0, sp, #0x2c
- bl FUN_020B76B0
+ bl NNSi_G2dBitReaderRead
ldr r0, [sp, #0x0]
cmp r0, r10
mov r5, r0
@@ -1173,7 +1155,7 @@ _020B6E58:
_020B6EA0:
add r0, sp, #0x2c
mov r1, r6
- bl FUN_020B76B0
+ bl NNSi_G2dBitReaderRead
cmp r0, #0x0
beq _020B6EDC
cmp r5, #0x20
@@ -1203,11 +1185,10 @@ _020B6EE8:
blo _020B6E58
add sp, sp, #0x34
ldmia sp!, {r4-r11,pc}
- arm_func_end FUN_020B6CAC
+ arm_func_end LetterChar
- ; _end
- arm_func_start FUN_020B6F18
-FUN_020B6F18: ; 0x020B6F18
+ arm_func_start ClearChar
+ClearChar: ; 0x020B6F18
stmdb sp!, {r4-r6,lr}
mov lr, r0
cmp r3, #0x8
@@ -1289,27 +1270,25 @@ _020B701C:
cmp r5, r4
blo _020B701C
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020B6F18
+ arm_func_end ClearChar
- ; OBJSizeToShape
- arm_func_start FUN_020B704C
-FUN_020B704C: ; 0x020B704C
+ arm_func_start OBJSizeToShape
+OBJSizeToShape: ; 0x020B704C
ldrb r3, [r0, #0x1]
- ldr r2, _020B7064 ; =UNK_020FF990
+ ldr r2, _020B7064 ; =shape$8277
ldrb r1, [r0, #0x0]
add r0, r2, r3, lsl #0x4
ldr r0, [r0, r1, lsl #0x2]
bx lr
.balign 4
-_020B7064: .word UNK_020FF990
- arm_func_end FUN_020B704C
+_020B7064: .word shape$8277
+ arm_func_end OBJSizeToShape
- ; GetCharIndex1D
- arm_func_start FUN_020B7068
-FUN_020B7068: ; 0x020B7068
+ arm_func_start GetCharIndex1D
+GetCharIndex1D: ; 0x020B7068
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x4
- ldr fp, _020B7164 ; =UNK_020FF970
+ ldr fp, _020B7164 ; =objs$8221
mov r9, #0x0
mov r10, #0x3
mvn r7, #0x0
@@ -1374,6 +1353,5 @@ _020B7118:
add sp, sp, #0x4
ldmia sp!, {r4-r11,pc}
.balign 4
-_020B7164: .word UNK_020FF970
- arm_func_end FUN_020B7068
-
+_020B7164: .word objs$8221
+ arm_func_end GetCharIndex1D
diff --git a/arm9/asm/NNS_G2D_g2d_font.s b/arm9/asm/NNS_G2D_g2d_font.s
index acb0abe8..162fe423 100644
--- a/arm9/asm/NNS_G2D_g2d_font.s
+++ b/arm9/asm/NNS_G2D_g2d_font.s
@@ -3,9 +3,8 @@
.section .text
- ; _end
- arm_func_start FUN_020B5ABC
-FUN_020B5ABC: ; 0x020B5ABC
+ arm_func_start NNSi_G2dFontGetTextRect
+NNSi_G2dFontGetTextRect: ; 0x020B5ABC
stmdb sp!, {r4-r9,lr}
sub sp, sp, #0xc
add r5, sp, #0x0
@@ -25,7 +24,7 @@ _020B5AF8:
mov r0, r9
mov r1, r8
mov r3, r6
- bl FUN_020B5BC8
+ bl NNSi_G2dFontGetStringWidth
ldr r1, [sp, #0x0]
ldr r2, [sp, #0x28]
cmp r0, r1
@@ -46,11 +45,10 @@ _020B5B24:
str r1, [r5, #0x4]
add sp, sp, #0xc
ldmia sp!, {r4-r9,pc}
- arm_func_end FUN_020B5ABC
+ arm_func_end NNSi_G2dFontGetTextRect
- ; _end
- arm_func_start FUN_020B5B54
-FUN_020B5B54: ; 0x020B5B54
+ arm_func_start NNSi_G2dFontGetTextHeight
+NNSi_G2dFontGetTextHeight: ; 0x020B5B54
stmdb sp!, {r4-r8,lr}
sub sp, sp, #0x10
str r2, [sp, #0x0]
@@ -82,11 +80,10 @@ _020B5BAC:
sub r0, r0, r5
add sp, sp, #0x10
ldmia sp!, {r4-r8,pc}
- arm_func_end FUN_020B5B54
+ arm_func_end NNSi_G2dFontGetTextHeight
- ; NNSi_G2dFontGetStringWidth
- arm_func_start FUN_020B5BC8
-FUN_020B5BC8: ; 0x020B5BC8
+ arm_func_start NNSi_G2dFontGetStringWidth
+NNSi_G2dFontGetStringWidth: ; 0x020B5BC8
stmdb sp!, {r4-r10,lr}
sub sp, sp, #0x8
mov r8, r0
@@ -105,13 +102,13 @@ _020B5C00:
cmp r1, #0xa
beq _020B5C58
mov r0, r8
- bl FUN_020B5CE4
+ bl NNS_G2dFontFindGlyphIndex
mov r1, r0
cmp r1, r9
ldreq r0, [r8, #0x0]
ldreqh r1, [r0, #0x2]
mov r0, r8
- bl FUN_020B5C88
+ bl NNS_G2dFontGetCharWidthsFromIndex
ldrh r1, [r8, #0x8]
cmp r1, #0x0
ldrnesb r1, [r0, #0x0]
@@ -139,11 +136,10 @@ _020B5C70:
ldmia sp!, {r4-r10,pc}
.balign 4
_020B5C84: .word 0x0000FFFF
- arm_func_end FUN_020B5BC8
+ arm_func_end NNSi_G2dFontGetStringWidth
- ; _end
- arm_func_start FUN_020B5C88
-FUN_020B5C88: ; 0x020B5C88
+ arm_func_start NNS_G2dFontGetCharWidthsFromIndex
+NNS_G2dFontGetCharWidthsFromIndex: ; 0x020B5C88
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr r3, [r0, #0x0]
@@ -170,11 +166,10 @@ _020B5CD8:
add r0, r3, #0x4
add sp, sp, #0x4
ldmia sp!, {pc}
- arm_func_end FUN_020B5C88
+ arm_func_end NNS_G2dFontGetCharWidthsFromIndex
- ; NNS_G2dFontFindGlyphIndex
- arm_func_start FUN_020B5CE4
-FUN_020B5CE4: ; 0x020B5CE4
+ arm_func_start NNS_G2dFontFindGlyphIndex
+NNS_G2dFontFindGlyphIndex: ; 0x020B5CE4
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr r0, [r0, #0x0]
@@ -188,7 +183,7 @@ _020B5CFC:
ldrh r2, [r0, #0x2]
cmp r1, r2
bhi _020B5D20
- bl FUN_020B5D7C
+ bl GetGlyphIndex
add sp, sp, #0x4
ldmia sp!, {pc}
_020B5D20:
@@ -201,33 +196,31 @@ _020B5D2C:
ldmia sp!, {pc}
.balign 4
_020B5D38: .word 0x0000FFFF
- arm_func_end FUN_020B5CE4
+ arm_func_end NNS_G2dFontFindGlyphIndex
- ; NNS_G2dFontInitUTF16
- arm_func_start FUN_020B5D3C
-FUN_020B5D3C: ; 0x020B5D3C
+ arm_func_start NNS_G2dFontInitUTF16
+NNS_G2dFontInitUTF16: ; 0x020B5D3C
stmdb sp!, {r4,lr}
mov r4, r0
mov r0, r1
mov r1, r4
- bl FUN_020B7558
+ bl NNSi_G2dGetUnpackedFont
sub r0, r0, #0x1
strh r0, [r4, #0x8]
ldrh r0, [r4, #0x8]
cmp r0, #0x0
movne r1, #0x2
moveq r1, #0x3
- ldr r0, _020B5D78 ; =FUN_020B7718
+ ldr r0, _020B5D78 ; =NNSi_G2dSplitCharUTF16
strh r1, [r4, #0xa]
str r0, [r4, #0x4]
ldmia sp!, {r4,pc}
.balign 4
-_020B5D78: .word FUN_020B7718
- arm_func_end FUN_020B5D3C
+_020B5D78: .word NNSi_G2dSplitCharUTF16
+ arm_func_end NNS_G2dFontInitUTF16
- ; GetGlyphIndex
- arm_func_start FUN_020B5D7C
-FUN_020B5D7C: ; 0x020B5D7C
+ arm_func_start GetGlyphIndex
+GetGlyphIndex: ; 0x020B5D7C
stmdb sp!, {lr}
sub sp, sp, #0x4
ldrh r3, [r0, #0x4]
@@ -288,5 +281,4 @@ _020B5E40:
ldmia sp!, {pc}
.balign 4
_020B5E4C: .word 0x0000FFFF
- arm_func_end FUN_020B5D7C
-
+ arm_func_end GetGlyphIndex
diff --git a/arm9/asm/NNS_G2D_g2d_image.s b/arm9/asm/NNS_G2D_g2d_image.s
index 208994cc..796da6c6 100644
--- a/arm9/asm/NNS_G2D_g2d_image.s
+++ b/arm9/asm/NNS_G2D_g2d_image.s
@@ -3,23 +3,20 @@
.section .text
- ; _end
- arm_func_start FUN_020B10BC
-FUN_020B10BC: ; 0x020B10BC
+ arm_func_start NNSi_G2dGetVramLocation
+NNSi_G2dGetVramLocation: ; 0x020B10BC
ldr r0, [r0, r1, lsl #0x2]
bx lr
- arm_func_end FUN_020B10BC
+ arm_func_end NNSi_G2dGetVramLocation
- ; _end
- arm_func_start FUN_020B10C4
-FUN_020B10C4: ; 0x020B10C4
+ arm_func_start NNSi_G2dSetVramLocation
+NNSi_G2dSetVramLocation: ; 0x020B10C4
str r2, [r0, r1, lsl #0x2]
bx lr
- arm_func_end FUN_020B10C4
+ arm_func_end NNSi_G2dSetVramLocation
- ; _end
- arm_func_start FUN_020B10CC
-FUN_020B10CC: ; 0x020B10CC
+ arm_func_start NNSi_G2dInitializeVRamLocation
+NNSi_G2dInitializeVRamLocation: ; 0x020B10CC
mov r2, #0x0
mvn r1, #0x0
_020B10D4:
@@ -28,11 +25,10 @@ _020B10D4:
cmp r2, #0x3
blt _020B10D4
bx lr
- arm_func_end FUN_020B10CC
+ arm_func_end NNSi_G2dInitializeVRamLocation
- ; _end
- arm_func_start FUN_020B10E8
-FUN_020B10E8: ; 0x020B10E8
+ arm_func_start NNS_G2dLoadPaletteEx
+NNS_G2dLoadPaletteEx: ; 0x020B10E8
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x4
mov r10, r0
@@ -124,14 +120,13 @@ _020B1210:
mov r1, r8
mov r2, r11
str r4, [r3, #0x4]
- bl FUN_020B19D0
+ bl NNS_G2dSetImagePaletteLocation
add sp, sp, #0x4
ldmia sp!, {r4-r11,pc}
- arm_func_end FUN_020B10E8
+ arm_func_end NNS_G2dLoadPaletteEx
- ; _end
- arm_func_start FUN_020B1240
-FUN_020B1240: ; 0x020B1240
+ arm_func_start NNS_G2dLoadPalette
+NNS_G2dLoadPalette: ; 0x020B1240
stmdb sp!, {r4-r9,lr}
sub sp, sp, #0x4
mov r9, r0
@@ -199,14 +194,13 @@ _020B1318:
mov r1, r7
mov r2, r8
str r3, [r6, #0x4]
- bl FUN_020B19D0
+ bl NNS_G2dSetImagePaletteLocation
add sp, sp, #0x4
ldmia sp!, {r4-r9,pc}
- arm_func_end FUN_020B1240
+ arm_func_end NNS_G2dLoadPalette
- ; NNS_G2dLoadImageVramTransfer
- arm_func_start FUN_020B1340
-FUN_020B1340: ; 0x020B1340
+ arm_func_start NNS_G2dLoadImageVramTransfer
+NNS_G2dLoadImageVramTransfer: ; 0x020B1340
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r7, r0
@@ -349,17 +343,16 @@ _020B14E8:
mov r1, r5
mov r2, r6
str r3, [r4, #0x20]
- bl FUN_020B1A1C
+ bl NNS_G2dSetImageLocation
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
.balign 4
_020B1520: .word 0xFFCFFFEF
_020B1524: .word 0x04001000
- arm_func_end FUN_020B1340
+ arm_func_end NNS_G2dLoadImageVramTransfer
- ; NNS_G2dLoadImage2DMapping
- arm_func_start FUN_020B1528
-FUN_020B1528: ; 0x020B1528
+ arm_func_start NNS_G2dLoadImage2DMapping
+NNS_G2dLoadImage2DMapping: ; 0x020B1528
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r7, r0
@@ -528,17 +521,16 @@ _020B1728:
mov r1, r5
mov r2, r6
str r3, [r4, #0x20]
- bl FUN_020B1A1C
+ bl NNS_G2dSetImageLocation
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
.balign 4
_020B1760: .word 0xFFCFFFEF
_020B1764: .word 0x04001000
- arm_func_end FUN_020B1528
+ arm_func_end NNS_G2dLoadImage2DMapping
- ; NNS_G2dLoadImage1DMapping
- arm_func_start FUN_020B1768
-FUN_020B1768: ; 0x020B1768
+ arm_func_start NNS_G2dLoadImage1DMapping
+NNS_G2dLoadImage1DMapping: ; 0x020B1768
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r7, r0
@@ -707,17 +699,16 @@ _020B1968:
mov r1, r5
mov r2, r6
str r3, [r4, #0x20]
- bl FUN_020B1A1C
+ bl NNS_G2dSetImageLocation
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
.balign 4
_020B19A0: .word 0xFFCFFFEF
_020B19A4: .word 0x04001000
- arm_func_end FUN_020B1768
+ arm_func_end NNS_G2dLoadImage1DMapping
- ; _end
- arm_func_start FUN_020B19A8
-FUN_020B19A8: ; 0x020B19A8
+ arm_func_start NNS_G2dIsImagePaletteReadyToUse
+NNS_G2dIsImagePaletteReadyToUse: ; 0x020B19A8
add r0, r0, r1, lsl #0x2
ldr r1, [r0, #0x8]
mvn r0, #0x0
@@ -725,27 +716,24 @@ FUN_020B19A8: ; 0x020B19A8
movne r0, #0x1
moveq r0, #0x0
bx lr
- arm_func_end FUN_020B19A8
+ arm_func_end NNS_G2dIsImagePaletteReadyToUse
- ; _end
- arm_func_start FUN_020B19C4
-FUN_020B19C4: ; 0x020B19C4
+ arm_func_start NNS_G2dGetImagePaletteLocation
+NNS_G2dGetImagePaletteLocation: ; 0x020B19C4
add r0, r0, r1, lsl #0x2
ldr r0, [r0, #0x8]
bx lr
- arm_func_end FUN_020B19C4
+ arm_func_end NNS_G2dGetImagePaletteLocation
- ; _end
- arm_func_start FUN_020B19D0
-FUN_020B19D0: ; 0x020B19D0
+ arm_func_start NNS_G2dSetImagePaletteLocation
+NNS_G2dSetImagePaletteLocation: ; 0x020B19D0
add r0, r0, r1, lsl #0x2
str r2, [r0, #0x8]
bx lr
- arm_func_end FUN_020B19D0
+ arm_func_end NNS_G2dSetImagePaletteLocation
- ; _end
- arm_func_start FUN_020B19DC
-FUN_020B19DC: ; 0x020B19DC
+ arm_func_start NNS_G2dInitImagePaletteProxy
+NNS_G2dInitImagePaletteProxy: ; 0x020B19DC
mov r3, #0x0
mvn r2, #0x0
_020B19E4:
@@ -755,36 +743,32 @@ _020B19E4:
cmp r3, #0x3
blt _020B19E4
bx lr
- arm_func_end FUN_020B19DC
+ arm_func_end NNS_G2dInitImagePaletteProxy
- ; _end
- arm_func_start FUN_020B19FC
-FUN_020B19FC: ; 0x020B19FC
+ arm_func_start NNS_G2dIsImageReadyToUse
+NNS_G2dIsImageReadyToUse: ; 0x020B19FC
ldr r1, [r0, r1, lsl #0x2]
mvn r0, #0x0
cmp r1, r0
movne r0, #0x1
moveq r0, #0x0
bx lr
- arm_func_end FUN_020B19FC
+ arm_func_end NNS_G2dIsImageReadyToUse
- ; _end
- arm_func_start FUN_020B1A14
-FUN_020B1A14: ; 0x020B1A14
+ arm_func_start NNS_G2dGetImageLocation
+NNS_G2dGetImageLocation: ; 0x020B1A14
ldr r0, [r0, r1, lsl #0x2]
bx lr
- arm_func_end FUN_020B1A14
+ arm_func_end NNS_G2dGetImageLocation
- ; _end
- arm_func_start FUN_020B1A1C
-FUN_020B1A1C: ; 0x020B1A1C
+ arm_func_start NNS_G2dSetImageLocation
+NNS_G2dSetImageLocation: ; 0x020B1A1C
str r2, [r0, r1, lsl #0x2]
bx lr
- arm_func_end FUN_020B1A1C
+ arm_func_end NNS_G2dSetImageLocation
- ; _end
- arm_func_start FUN_020B1A24
-FUN_020B1A24: ; 0x020B1A24
+ arm_func_start NNS_G2dInitImageProxy
+NNS_G2dInitImageProxy: ; 0x020B1A24
mov r2, #0x0
mvn r1, #0x0
_020B1A2C:
@@ -793,5 +777,4 @@ _020B1A2C:
cmp r2, #0x3
blt _020B1A2C
bx lr
- arm_func_end FUN_020B1A24
-
+ arm_func_end NNS_G2dInitImageProxy
diff --git a/arm9/asm/NNS_G2D_g2d_load.s b/arm9/asm/NNS_G2D_g2d_load.s
index ea06ed9c..340d8b17 100644
--- a/arm9/asm/NNS_G2D_g2d_load.s
+++ b/arm9/asm/NNS_G2D_g2d_load.s
@@ -3,9 +3,8 @@
.section .text
- ; _end
- arm_func_start FUN_020B01B0
-FUN_020B01B0: ; 0x020B01B0
+ arm_func_start NNSi_G2dUnpackUserExCellAttrBank
+NNSi_G2dUnpackUserExCellAttrBank: ; 0x020B01B0
ldr r1, [r0, #0x4]
mov r12, #0x0
add r1, r1, r0
@@ -25,11 +24,10 @@ _020B01CC:
cmp r12, r2
blo _020B01CC
bx lr
- arm_func_end FUN_020B01B0
+ arm_func_end NNSi_G2dUnpackUserExCellAttrBank
- ; _end
- arm_func_start FUN_020B01F8
-FUN_020B01F8: ; 0x020B01F8
+ arm_func_start NNS_G2dFindBinaryBlock
+NNS_G2dFindBinaryBlock: ; 0x020B01F8
stmdb sp!, {lr}
sub sp, sp, #0x4
ldrh r2, [r0, #0xc]
@@ -54,5 +52,4 @@ _020B0244:
mov r0, #0x0
add sp, sp, #0x4
ldmia sp!, {pc}
- arm_func_end FUN_020B01F8
-
+ arm_func_end NNS_G2dFindBinaryBlock
diff --git a/arm9/asm/NNS_G2D_g2d_multicellan.s b/arm9/asm/NNS_G2D_g2d_multicellan.s
index c6aaf3e6..8e2206df 100644
--- a/arm9/asm/NNS_G2D_g2d_multicellan.s
+++ b/arm9/asm/NNS_G2D_g2d_multicellan.s
@@ -3,9 +3,8 @@
.section .text
- ; _end
- arm_func_start FUN_020B20C8
-FUN_020B20C8: ; 0x020B20C8
+ arm_func_start NNS_G2dInitMCAnimation
+NNS_G2dInitMCAnimation: ; 0x020B20C8
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0xc
mov r6, #0x0
@@ -28,17 +27,17 @@ _020B210C:
mul r4, r6, r0
ldr r1, [sp, #0x4]
add r0, r10, r4
- bl FUN_020B1AD4
+ bl NNSi_G2dInitializeNode
mov r0, #0x54
mla r5, r6, r0, r9
ldr r1, [sp, #0x8]
mov r0, r7
str r5, [r10, r4]
- bl FUN_020AFC04
+ bl NNS_G2dGetAnimSequenceByIdx
mov r1, r0
mov r0, r5
mov r2, r11
- bl FUN_020B1F80
+ bl NNS_G2dInitCellAnimation
add r0, r6, #0x1
mov r0, r0, lsl #0x10
mov r6, r0, lsr #0x10
@@ -46,44 +45,43 @@ _020B210C:
blo _020B210C
_020B215C:
ldr r0, [sp, #0x0]
- bl FUN_020B04C0
+ bl NNS_G2dInitAnimCtrl
ldr r0, [sp, #0x0]
ldr r3, [sp, #0x38]
ldr r2, [sp, #0x0]
add r0, r0, #0x44
mov r1, #0x1
str r3, [r2, #0x40]
- bl FUN_020B1A68
+ bl NNSi_G2dSrtcInitControl
ldr r0, [sp, #0x0]
mov r1, #0x0
strh r1, [r0, #0x2c]
add sp, sp, #0xc
ldmia sp!, {r4-r11,pc}
- arm_func_end FUN_020B20C8
+ arm_func_end NNS_G2dInitMCAnimation
- ; _end
- arm_func_start FUN_020B2194
-FUN_020B2194: ; 0x020B2194
+ arm_func_start NNS_G2dSetMCAnimationCurrentFrame
+NNS_G2dSetMCAnimationCurrentFrame: ; 0x020B2194
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r7, r0
- bl FUN_020B0518
+ bl NNS_G2dSetAnimCtrlCurrentFrame
cmp r0, #0x0
addeq sp, sp, #0x4
ldmeqia sp!, {r4-r7,pc}
mov r0, r7
- bl FUN_020B06E0
+ bl NNS_G2dGetAnimCtrlCurrentElement
mov r4, r0
ldrh r1, [r4, #0x0]
ldr r0, [r7, #0x40]
- bl FUN_020AFF34
+ bl NNS_G2dGetMultiCellDataByIdx
ldr r1, [r7, #0x18]
mov r6, r0
ldr r1, [r1, #0x4]
add r0, r7, #0x44
and r5, r1, #0xff
mov r1, #0x1
- bl FUN_020B1A68
+ bl NNSi_G2dSrtcInitControl
cmp r5, #0x0
beq _020B2234
cmp r5, #0x2
@@ -91,57 +89,56 @@ FUN_020B2194: ; 0x020B2194
ldrsh r1, [r4, #0x4]
ldrsh r2, [r4, #0x6]
add r0, r7, #0x44
- bl FUN_020B1AB4
+ bl NNSi_G2dSrtcSetTrans
b _020B2234
_020B2208:
ldr r1, [r4, #0x4]
ldr r2, [r4, #0x8]
add r0, r7, #0x44
- bl FUN_020B1A78
+ bl NNSi_G2dSrtcSetSRTScale
ldrh r1, [r4, #0x2]
add r0, r7, #0x44
- bl FUN_020B1A98
+ bl NNSi_G2dSrtcSetSRTRotZ
ldrsh r1, [r4, #0xc]
ldrsh r2, [r4, #0xe]
add r0, r7, #0x44
- bl FUN_020B1AB4
+ bl NNSi_G2dSrtcSetTrans
_020B2234:
ldrh r2, [r7, #0x2c]
mov r1, r6
add r0, r7, #0x30
- bl FUN_020B24E0
+ bl SetMCDataToMCInstanceImpl_
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
- arm_func_end FUN_020B2194
+ arm_func_end NNS_G2dSetMCAnimationCurrentFrame
- ; _end
- arm_func_start FUN_020B224C
-FUN_020B224C: ; 0x020B224C
+ arm_func_start NNS_G2dTickMCAnimation
+NNS_G2dTickMCAnimation: ; 0x020B224C
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r4, r0
ldr r2, [r4, #0x0]
mov r6, r1
ldrh r5, [r2, #0x4]
- bl FUN_020B0534
+ bl NNS_G2dTickAnimCtrl
cmp r0, #0x0
beq _020B2318
ldrh r1, [r4, #0x2c]
mov r0, r4
add r1, r1, r5
strh r1, [r4, #0x2c]
- bl FUN_020B06E0
+ bl NNS_G2dGetAnimCtrlCurrentElement
mov r5, r0
ldrh r1, [r5, #0x0]
ldr r0, [r4, #0x40]
- bl FUN_020AFF34
+ bl NNS_G2dGetMultiCellDataByIdx
ldr r1, [r4, #0x18]
mov r7, r0
ldr r1, [r1, #0x4]
add r0, r4, #0x44
and r6, r1, #0xff
mov r1, #0x1
- bl FUN_020B1A68
+ bl NNSi_G2dSrtcInitControl
cmp r6, #0x0
beq _020B2300
cmp r6, #0x2
@@ -149,38 +146,37 @@ FUN_020B224C: ; 0x020B224C
ldrsh r1, [r5, #0x4]
ldrsh r2, [r5, #0x6]
add r0, r4, #0x44
- bl FUN_020B1AB4
+ bl NNSi_G2dSrtcSetTrans
b _020B2300
_020B22D4:
ldr r1, [r5, #0x4]
ldr r2, [r5, #0x8]
add r0, r4, #0x44
- bl FUN_020B1A78
+ bl NNSi_G2dSrtcSetSRTScale
ldrh r1, [r5, #0x2]
add r0, r4, #0x44
- bl FUN_020B1A98
+ bl NNSi_G2dSrtcSetSRTRotZ
ldrsh r1, [r5, #0xc]
ldrsh r2, [r5, #0xe]
add r0, r4, #0x44
- bl FUN_020B1AB4
+ bl NNSi_G2dSrtcSetTrans
_020B2300:
ldrh r2, [r4, #0x2c]
mov r1, r7
add r0, r4, #0x30
- bl FUN_020B24E0
+ bl SetMCDataToMCInstanceImpl_
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
_020B2318:
mov r1, r6
add r0, r4, #0x30
- bl FUN_020B232C
+ bl NNS_G2dTickMCInstance
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
- arm_func_end FUN_020B224C
+ arm_func_end NNS_G2dTickMCAnimation
- ; _end
- arm_func_start FUN_020B232C
-FUN_020B232C: ; 0x020B232C
+ arm_func_start NNS_G2dTickMCInstance
+NNS_G2dTickMCInstance: ; 0x020B232C
stmdb sp!, {r4-r8,lr}
mov r7, r0
ldr r0, [r7, #0x8]
@@ -197,7 +193,7 @@ FUN_020B232C: ; 0x020B232C
_020B2360:
mla r0, r5, r8, r4
mov r1, r6
- bl FUN_020B1EC4
+ bl NNS_G2dTickCellAnimation
ldr r1, [r7, #0x0]
add r0, r5, #0x1
mov r0, r0, lsl #0x10
@@ -218,7 +214,7 @@ _020B23A8:
mul r0, r5, r8
ldr r0, [r4, r0]
mov r1, r6
- bl FUN_020B1EC4
+ bl NNS_G2dTickCellAnimation
ldr r1, [r7, #0x0]
add r0, r5, #0x1
mov r0, r0, lsl #0x10
@@ -227,11 +223,10 @@ _020B23A8:
cmp r5, r1
blo _020B23A8
ldmia sp!, {r4-r8,pc}
- arm_func_end FUN_020B232C
+ arm_func_end NNS_G2dTickMCInstance
- ; _end
- arm_func_start FUN_020B23D8
-FUN_020B23D8: ; 0x020B23D8
+ arm_func_start NNS_G2dGetMCBankNumNodesRequired
+NNS_G2dGetMCBankNumNodesRequired: ; 0x020B23D8
stmdb sp!, {r4-r6,lr}
mov r5, r0
ldrh r0, [r5, #0x0]
@@ -242,7 +237,7 @@ FUN_020B23D8: ; 0x020B23D8
_020B23F4:
mov r0, r5
mov r1, r6
- bl FUN_020AFF34
+ bl NNS_G2dGetMultiCellDataByIdx
ldrh r0, [r0, #0x0]
ldrh r1, [r5, #0x0]
cmp r0, r4
@@ -255,30 +250,29 @@ _020B23F4:
_020B2424:
mov r0, r4
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020B23D8
+ arm_func_end NNS_G2dGetMCBankNumNodesRequired
- ; _end
- arm_func_start FUN_020B242C
-FUN_020B242C: ; 0x020B242C
+ arm_func_start NNS_G2dSetAnimSequenceToMCAnimation
+NNS_G2dSetAnimSequenceToMCAnimation: ; 0x020B242C
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r7, r0
- bl FUN_020B0438
+ bl NNS_G2dBindAnimCtrl
mov r1, #0x0
mov r0, r7
strh r1, [r7, #0x2c]
- bl FUN_020B06E0
+ bl NNS_G2dGetAnimCtrlCurrentElement
mov r4, r0
ldrh r1, [r4, #0x0]
ldr r0, [r7, #0x40]
- bl FUN_020AFF34
+ bl NNS_G2dGetMultiCellDataByIdx
ldr r1, [r7, #0x18]
mov r6, r0
ldr r1, [r1, #0x4]
add r0, r7, #0x44
and r5, r1, #0xff
mov r1, #0x1
- bl FUN_020B1A68
+ bl NNSi_G2dSrtcInitControl
cmp r5, #0x0
beq _020B24C8
cmp r5, #0x2
@@ -286,32 +280,31 @@ FUN_020B242C: ; 0x020B242C
ldrsh r1, [r4, #0x4]
ldrsh r2, [r4, #0x6]
add r0, r7, #0x44
- bl FUN_020B1AB4
+ bl NNSi_G2dSrtcSetTrans
b _020B24C8
_020B249C:
ldr r1, [r4, #0x4]
ldr r2, [r4, #0x8]
add r0, r7, #0x44
- bl FUN_020B1A78
+ bl NNSi_G2dSrtcSetSRTScale
ldrh r1, [r4, #0x2]
add r0, r7, #0x44
- bl FUN_020B1A98
+ bl NNSi_G2dSrtcSetSRTRotZ
ldrsh r1, [r4, #0xc]
ldrsh r2, [r4, #0xe]
add r0, r7, #0x44
- bl FUN_020B1AB4
+ bl NNSi_G2dSrtcSetTrans
_020B24C8:
ldrh r2, [r7, #0x2c]
mov r1, r6
add r0, r7, #0x30
- bl FUN_020B24E0
+ bl SetMCDataToMCInstanceImpl_
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
- arm_func_end FUN_020B242C
+ arm_func_end NNS_G2dSetAnimSequenceToMCAnimation
- ; _end
- arm_func_start FUN_020B24E0
-FUN_020B24E0: ; 0x020B24E0
+ arm_func_start SetMCDataToMCInstanceImpl_
+SetMCDataToMCInstanceImpl_: ; 0x020B24E0
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x14
mov r10, r1
@@ -361,11 +354,11 @@ _020B2560:
ldr r0, [sp, #0x0]
ldrh r1, [r7, #0x0]
ldr r0, [r0, #0x4]
- bl FUN_020AFC04
+ bl NNS_G2dGetAnimSequenceByIdx
mov r4, r0
mov r0, r6
mov r1, r4
- bl FUN_020B1EE4
+ bl NNS_G2dSetCellAnimationSequence
str r11, [r6, #0x8]
ldrh r0, [r7, #0x6]
and r0, r0, #0xf
@@ -386,7 +379,7 @@ _020B25D8:
blo _020B25D8
_020B25F0:
mov r0, r6
- bl FUN_020B0408
+ bl NNSi_G2dIsAnimCtrlLoopAnim
cmp r0, #0x0
beq _020B261C
mov r0, r9
@@ -394,14 +387,14 @@ _020B25F0:
bl _u32_div_f
mov r0, r6
mov r1, r1, lsl #0xc
- bl FUN_020B1EC4
+ bl NNS_G2dTickCellAnimation
b _020B2630
_020B261C:
cmp r9, r7
movcc r7, r9
mov r0, r6
mov r1, r7, lsl #0xc
- bl FUN_020B1EC4
+ bl NNS_G2dTickCellAnimation
_020B2630:
str r11, [r6, #0x54]
_020B2634:
@@ -434,11 +427,11 @@ _020B267C:
ldr r6, [r11, r2]
ldr r0, [r0, #0x4]
add r7, r3, r4, lsl #0x3
- bl FUN_020AFC04
+ bl NNS_G2dGetAnimSequenceByIdx
mov r5, r0
mov r0, r6
mov r1, r5
- bl FUN_020B1EE4
+ bl NNS_G2dSetCellAnimationSequence
ldr r0, [sp, #0x8]
str r0, [r6, #0x8]
ldrh r0, [r7, #0x6]
@@ -461,7 +454,7 @@ _020B26E4:
blo _020B26E4
_020B2700:
mov r0, r6
- bl FUN_020B0408
+ bl NNSi_G2dIsAnimCtrlLoopAnim
cmp r0, #0x0
beq _020B272C
mov r0, r9
@@ -469,14 +462,14 @@ _020B2700:
bl _u32_div_f
mov r0, r6
mov r1, r1, lsl #0xc
- bl FUN_020B1EC4
+ bl NNS_G2dTickCellAnimation
b _020B2740
_020B272C:
cmp r9, r8
movcc r8, r9
mov r0, r6
mov r1, r8, lsl #0xc
- bl FUN_020B1EC4
+ bl NNS_G2dTickCellAnimation
_020B2740:
mov r0, #0x28
mla r3, r4, r0, r11
@@ -485,7 +478,7 @@ _020B2740:
ldrsh r1, [r7, #0x2]
ldrsh r2, [r7, #0x4]
add r0, r3, #0xc
- bl FUN_020B1AB4
+ bl NNSi_G2dSrtcSetTrans
add r0, r4, #0x1
mov r0, r0, lsl #0x10
ldrh r1, [r10, #0x0]
@@ -494,5 +487,4 @@ _020B2740:
blo _020B267C
add sp, sp, #0x14
ldmia sp!, {r4-r11,pc}
- arm_func_end FUN_020B24E0
-
+ arm_func_end SetMCDataToMCInstanceImpl_
diff --git a/arm9/asm/NNS_G2D_g2d_nan_load.s b/arm9/asm/NNS_G2D_g2d_nan_load.s
index 4137e8ae..6e8b6c27 100644
--- a/arm9/asm/NNS_G2D_g2d_nan_load.s
+++ b/arm9/asm/NNS_G2D_g2d_nan_load.s
@@ -3,20 +3,18 @@
.section .text
- ; _end
- arm_func_start FUN_020AFC04
-FUN_020AFC04: ; 0x020AFC04
+ arm_func_start NNS_G2dGetAnimSequenceByIdx
+NNS_G2dGetAnimSequenceByIdx: ; 0x020AFC04
ldrh r2, [r0, #0x0]
cmp r2, r1
ldrhi r0, [r0, #0x4]
addhi r0, r0, r1, lsl #0x4
movls r0, #0x0
bx lr
- arm_func_end FUN_020AFC04
+ arm_func_end NNS_G2dGetAnimSequenceByIdx
- ; _end
- arm_func_start FUN_020AFC1C
-FUN_020AFC1C: ; 0x020AFC1C
+ arm_func_start NNS_G2dUnpackNAN
+NNS_G2dUnpackNAN: ; 0x020AFC1C
stmdb sp!, {r4-r9,lr}
sub sp, sp, #0x4
ldr r1, [r0, #0x4]
@@ -115,41 +113,38 @@ _020AFD6C:
blo _020AFD14
add sp, sp, #0x4
ldmia sp!, {r4-r9,pc}
- arm_func_end FUN_020AFC1C
+ arm_func_end NNS_G2dUnpackNAN
- ; NNS_G2dGetUnpackedMCAnimBank
- arm_func_start thunk_FUN_020afda0
-thunk_FUN_020afda0: ; 0x020AFD88
- ldr ip, _020AFD90 ; =FUN_020AFDA0
+ arm_func_start NNS_G2dGetUnpackedMCAnimBank
+NNS_G2dGetUnpackedMCAnimBank: ; 0x020AFD88
+ ldr ip, _020AFD90 ; =GetUnpackedAnimBankImpl_
bx r12
.balign 4
-_020AFD90: .word FUN_020AFDA0
- arm_func_end thunk_FUN_020afda0
+_020AFD90: .word GetUnpackedAnimBankImpl_
+ arm_func_end NNS_G2dGetUnpackedMCAnimBank
- ; NNS_G2dGetUnpackedAnimBank
- arm_func_start thunk_FUN_020afda0_2
-thunk_FUN_020afda0_2: ; 0x020AFD94
- ldr ip, _020AFD9C ; =FUN_020AFDA0
+ arm_func_start NNS_G2dGetUnpackedAnimBank
+NNS_G2dGetUnpackedAnimBank: ; 0x020AFD94
+ ldr ip, _020AFD9C ; =GetUnpackedAnimBankImpl_
bx r12
.balign 4
-_020AFD9C: .word FUN_020AFDA0
- arm_func_end thunk_FUN_020afda0_2
+_020AFD9C: .word GetUnpackedAnimBankImpl_
+ arm_func_end NNS_G2dGetUnpackedAnimBank
- ; GetUnpackedAnimBankImpl_
- arm_func_start FUN_020AFDA0
-FUN_020AFDA0: ; 0x020AFDA0
+ arm_func_start GetUnpackedAnimBankImpl_
+GetUnpackedAnimBankImpl_: ; 0x020AFDA0
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r1
ldr r1, _020AFDE4 ; =0x41424E4B
- bl FUN_020B01F8
+ bl NNS_G2dFindBinaryBlock
movs r4, r0
moveq r0, #0x0
addeq sp, sp, #0x4
streq r0, [r5, #0x0]
ldmeqia sp!, {r4-r5,pc}
add r0, r4, #0x8
- bl FUN_020AFC1C
+ bl NNS_G2dUnpackNAN
add r0, r4, #0x8
str r0, [r5, #0x0]
mov r0, #0x1
@@ -157,5 +152,4 @@ FUN_020AFDA0: ; 0x020AFDA0
ldmia sp!, {r4-r5,pc}
.balign 4
_020AFDE4: .word 0x41424E4B
- arm_func_end FUN_020AFDA0
-
+ arm_func_end GetUnpackedAnimBankImpl_
diff --git a/arm9/asm/NNS_G2D_g2d_ncg_load.s b/arm9/asm/NNS_G2D_g2d_ncg_load.s
index 78956dde..95535da5 100644
--- a/arm9/asm/NNS_G2D_g2d_ncg_load.s
+++ b/arm9/asm/NNS_G2D_g2d_ncg_load.s
@@ -3,30 +3,28 @@
.section .text
- ; _end
- arm_func_start FUN_020B0020
-FUN_020B0020: ; 0x020B0020
+ arm_func_start NNS_G2dUnpackBGNCG
+NNS_G2dUnpackBGNCG: ; 0x020B0020
ldr r1, [r0, #0x14]
add r1, r1, r0
str r1, [r0, #0x14]
bx lr
- arm_func_end FUN_020B0020
+ arm_func_end NNS_G2dUnpackBGNCG
- ; NNS_G2dGetUnpackedBGCharacterData
- arm_func_start FUN_020B0030
-FUN_020B0030: ; 0x020B0030
+ arm_func_start NNS_G2dGetUnpackedBGCharacterData
+NNS_G2dGetUnpackedBGCharacterData: ; 0x020B0030
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r1
ldr r1, _020B0074 ; =0x43484152
- bl FUN_020B01F8
+ bl NNS_G2dFindBinaryBlock
movs r4, r0
moveq r0, #0x0
addeq sp, sp, #0x4
streq r0, [r5, #0x0]
ldmeqia sp!, {r4-r5,pc}
add r0, r4, #0x8
- bl FUN_020B0020
+ bl NNS_G2dUnpackBGNCG
add r0, r4, #0x8
str r0, [r5, #0x0]
mov r0, #0x1
@@ -34,32 +32,30 @@ FUN_020B0030: ; 0x020B0030
ldmia sp!, {r4-r5,pc}
.balign 4
_020B0074: .word 0x43484152
- arm_func_end FUN_020B0030
+ arm_func_end NNS_G2dGetUnpackedBGCharacterData
- ; _end
- arm_func_start FUN_020B0078
-FUN_020B0078: ; 0x020B0078
+ arm_func_start NNS_G2dUnpackNCG
+NNS_G2dUnpackNCG: ; 0x020B0078
ldr r1, [r0, #0x14]
add r1, r1, r0
str r1, [r0, #0x14]
bx lr
- arm_func_end FUN_020B0078
+ arm_func_end NNS_G2dUnpackNCG
- ; NNS_G2dGetUnpackedCharacterData
- arm_func_start FUN_020B0088
-FUN_020B0088: ; 0x020B0088
+ arm_func_start NNS_G2dGetUnpackedCharacterData
+NNS_G2dGetUnpackedCharacterData: ; 0x020B0088
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r1
ldr r1, _020B00CC ; =0x43484152
- bl FUN_020B01F8
+ bl NNS_G2dFindBinaryBlock
movs r4, r0
moveq r0, #0x0
addeq sp, sp, #0x4
streq r0, [r5, #0x0]
ldmeqia sp!, {r4-r5,pc}
add r0, r4, #0x8
- bl FUN_020B0078
+ bl NNS_G2dUnpackNCG
add r0, r4, #0x8
str r0, [r5, #0x0]
mov r0, #0x1
@@ -67,5 +63,4 @@ FUN_020B0088: ; 0x020B0088
ldmia sp!, {r4-r5,pc}
.balign 4
_020B00CC: .word 0x43484152
- arm_func_end FUN_020B0088
-
+ arm_func_end NNS_G2dGetUnpackedCharacterData
diff --git a/arm9/asm/NNS_G2D_g2d_ncl_load.s b/arm9/asm/NNS_G2D_g2d_ncl_load.s
index ecaa454b..1fc246b2 100644
--- a/arm9/asm/NNS_G2D_g2d_ncl_load.s
+++ b/arm9/asm/NNS_G2D_g2d_ncl_load.s
@@ -3,39 +3,36 @@
.section .text
- ; _end
- arm_func_start FUN_020B00D0
-FUN_020B00D0: ; 0x020B00D0
+ arm_func_start NNS_G2dUnpackNCL
+NNS_G2dUnpackNCL: ; 0x020B00D0
ldr r1, [r0, #0xc]
add r1, r1, r0
str r1, [r0, #0xc]
bx lr
- arm_func_end FUN_020B00D0
+ arm_func_end NNS_G2dUnpackNCL
- ; _end
- arm_func_start FUN_020B00E0
-FUN_020B00E0: ; 0x020B00E0
+ arm_func_start NNSi_G2dUnpackNCLCmpInfo
+NNSi_G2dUnpackNCLCmpInfo: ; 0x020B00E0
ldr r1, [r0, #0x4]
add r1, r1, r0
str r1, [r0, #0x4]
bx lr
- arm_func_end FUN_020B00E0
+ arm_func_end NNSi_G2dUnpackNCLCmpInfo
- ; NNS_G2dGetUnpackedPaletteCompressInfo
- arm_func_start FUN_020B00F0
-FUN_020B00F0: ; 0x020B00F0
+ arm_func_start NNS_G2dGetUnpackedPaletteCompressInfo
+NNS_G2dGetUnpackedPaletteCompressInfo: ; 0x020B00F0
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r1
ldr r1, _020B0134 ; =0x50434D50
- bl FUN_020B01F8
+ bl NNS_G2dFindBinaryBlock
movs r4, r0
moveq r0, #0x0
addeq sp, sp, #0x4
streq r0, [r5, #0x0]
ldmeqia sp!, {r4-r5,pc}
add r0, r4, #0x8
- bl FUN_020B00E0
+ bl NNSi_G2dUnpackNCLCmpInfo
add r0, r4, #0x8
str r0, [r5, #0x0]
mov r0, #0x1
@@ -43,23 +40,22 @@ FUN_020B00F0: ; 0x020B00F0
ldmia sp!, {r4-r5,pc}
.balign 4
_020B0134: .word 0x50434D50
- arm_func_end FUN_020B00F0
+ arm_func_end NNS_G2dGetUnpackedPaletteCompressInfo
- ; NNS_G2dGetUnpackedPaletteData
- arm_func_start FUN_020B0138
-FUN_020B0138: ; 0x020B0138
+ arm_func_start NNS_G2dGetUnpackedPaletteData
+NNS_G2dGetUnpackedPaletteData: ; 0x020B0138
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r1
ldr r1, _020B017C ; =0x504C5454
- bl FUN_020B01F8
+ bl NNS_G2dFindBinaryBlock
movs r4, r0
moveq r0, #0x0
addeq sp, sp, #0x4
streq r0, [r5, #0x0]
ldmeqia sp!, {r4-r5,pc}
add r0, r4, #0x8
- bl FUN_020B00D0
+ bl NNS_G2dUnpackNCL
add r0, r4, #0x8
str r0, [r5, #0x0]
mov r0, #0x1
@@ -67,5 +63,4 @@ FUN_020B0138: ; 0x020B0138
ldmia sp!, {r4-r5,pc}
.balign 4
_020B017C: .word 0x504C5454
- arm_func_end FUN_020B0138
-
+ arm_func_end NNS_G2dGetUnpackedPaletteData
diff --git a/arm9/asm/NNS_G2D_g2d_nft_load.s b/arm9/asm/NNS_G2D_g2d_nft_load.s
index 1bd9a1bf..3f9c0e77 100644
--- a/arm9/asm/NNS_G2D_g2d_nft_load.s
+++ b/arm9/asm/NNS_G2D_g2d_nft_load.s
@@ -3,9 +3,8 @@
.section .text
- ; NNSi_G2dUnpackNFT
- arm_func_start FUN_020B7468
-FUN_020B7468: ; 0x020B7468
+ arm_func_start NNSi_G2dUnpackNFT
+NNSi_G2dUnpackNFT: ; 0x020B7468
stmdb sp!, {r4-r6,lr}
ldrh r2, [r0, #0xc]
ldrh r3, [r0, #0xe]
@@ -73,11 +72,10 @@ _020B7548: .word 0x46494E46
_020B754C: .word 0x43574448
_020B7550: .word 0x434D4150
_020B7554: .word 0x43474C50
- arm_func_end FUN_020B7468
+ arm_func_end NNSi_G2dUnpackNFT
- ; NNSi_G2dGetUnpackedFont
- arm_func_start FUN_020B7558
-FUN_020B7558: ; 0x020B7558
+ arm_func_start NNSi_G2dGetUnpackedFont
+NNSi_G2dGetUnpackedFont: ; 0x020B7558
stmdb sp!, {r4-r6,lr}
movs r6, r0
mov r5, r1
@@ -155,10 +153,10 @@ _020B7644:
bl OS_Terminate
_020B7654:
mov r0, r6
- bl FUN_020B7468
+ bl NNSi_G2dUnpackNFT
ldr r1, _020B76AC ; =0x46494E46
mov r0, r6
- bl FUN_020B01F8
+ bl NNS_G2dFindBinaryBlock
cmp r0, #0x0
moveq r0, #0x0
streq r0, [r5, #0x0]
@@ -179,5 +177,4 @@ _020B76A0:
.balign 4
_020B76A8: .word 0x4E465452
_020B76AC: .word 0x46494E46
- arm_func_end FUN_020B7558
-
+ arm_func_end NNSi_G2dGetUnpackedFont
diff --git a/arm9/asm/NNS_G2D_g2d_nmc_load.s b/arm9/asm/NNS_G2D_g2d_nmc_load.s
index eb13c705..abe55e8e 100644
--- a/arm9/asm/NNS_G2D_g2d_nmc_load.s
+++ b/arm9/asm/NNS_G2D_g2d_nmc_load.s
@@ -3,20 +3,18 @@
.section .text
- ; _end
- arm_func_start FUN_020AFF34
-FUN_020AFF34: ; 0x020AFF34
+ arm_func_start NNS_G2dGetMultiCellDataByIdx
+NNS_G2dGetMultiCellDataByIdx: ; 0x020AFF34
ldrh r2, [r0, #0x0]
cmp r1, r2
ldrcc r0, [r0, #0x4]
addcc r0, r0, r1, lsl #0x3
movcs r0, #0x0
bx lr
- arm_func_end FUN_020AFF34
+ arm_func_end NNS_G2dGetMultiCellDataByIdx
- ; _end
- arm_func_start FUN_020AFF4C
-FUN_020AFF4C: ; 0x020AFF4C
+ arm_func_start NNS_G2dUnpackNMC
+NNS_G2dUnpackNMC: ; 0x020AFF4C
stmdb sp!, {r4,lr}
ldr r1, [r0, #0x4]
mov r4, #0x0
@@ -48,35 +46,33 @@ _020AFFA8:
add r1, r1, r0
str r1, [r0, #0x10]
ldr r0, [r0, #0x10]
- bl FUN_020AFFC8
+ bl UnpackExtendedData_
ldmia sp!, {r4,pc}
- arm_func_end FUN_020AFF4C
+ arm_func_end NNS_G2dUnpackNMC
- ; UnpackExtendedData_
- arm_func_start FUN_020AFFC8
-FUN_020AFFC8: ; 0x020AFFC8
- ldr ip, _020AFFD4 ; =FUN_020B01B0
+ arm_func_start UnpackExtendedData_
+UnpackExtendedData_: ; 0x020AFFC8
+ ldr ip, _020AFFD4 ; =NNSi_G2dUnpackUserExCellAttrBank
add r0, r0, #0x8
bx r12
.balign 4
-_020AFFD4: .word FUN_020B01B0
- arm_func_end FUN_020AFFC8
+_020AFFD4: .word NNSi_G2dUnpackUserExCellAttrBank
+ arm_func_end UnpackExtendedData_
- ; NNS_G2dGetUnpackedMultiCellBank
- arm_func_start FUN_020AFFD8
-FUN_020AFFD8: ; 0x020AFFD8
+ arm_func_start NNS_G2dGetUnpackedMultiCellBank
+NNS_G2dGetUnpackedMultiCellBank: ; 0x020AFFD8
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r1
ldr r1, _020B001C ; =0x4D43424B
- bl FUN_020B01F8
+ bl NNS_G2dFindBinaryBlock
movs r4, r0
moveq r0, #0x0
addeq sp, sp, #0x4
streq r0, [r5, #0x0]
ldmeqia sp!, {r4-r5,pc}
add r0, r4, #0x8
- bl FUN_020AFF4C
+ bl NNS_G2dUnpackNMC
add r0, r4, #0x8
str r0, [r5, #0x0]
mov r0, #0x1
@@ -84,5 +80,4 @@ FUN_020AFFD8: ; 0x020AFFD8
ldmia sp!, {r4-r5,pc}
.balign 4
_020B001C: .word 0x4D43424B
- arm_func_end FUN_020AFFD8
-
+ arm_func_end NNS_G2dGetUnpackedMultiCellBank
diff --git a/arm9/asm/NNS_G2D_g2d_nob_load.s b/arm9/asm/NNS_G2D_g2d_nob_load.s
index ddeb473c..319a6a4a 100644
--- a/arm9/asm/NNS_G2D_g2d_nob_load.s
+++ b/arm9/asm/NNS_G2D_g2d_nob_load.s
@@ -3,15 +3,14 @@
.section .text
- ; _end
- arm_func_start FUN_020AFDE8
-FUN_020AFDE8: ; 0x020AFDE8
+ arm_func_start NNS_G2dUnpackNCE
+NNS_G2dUnpackNCE: ; 0x020AFDE8
stmdb sp!, {r4-r6,lr}
mov r5, r0
ldr r1, [r5, #0x4]
add r1, r1, r5
str r1, [r5, #0x4]
- bl FUN_020AFF10
+ bl GetPtrOamArrayHead_
ldrh r1, [r5, #0x0]
mov r4, r0
mov r6, #0x0
@@ -20,7 +19,7 @@ FUN_020AFDE8: ; 0x020AFDE8
_020AFE14:
mov r0, r5
mov r1, r6
- bl FUN_020AFE8C
+ bl NNS_G2dGetCellDataByIdx
ldr r2, [r0, #0x4]
add r1, r6, #0x1
add r2, r2, r4
@@ -48,13 +47,12 @@ _020AFE6C:
add r0, r0, r5
str r0, [r5, #0x14]
ldr r0, [r5, #0x14]
- bl FUN_020AFF00
+ bl UnPackExtendedData_
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020AFDE8
+ arm_func_end NNS_G2dUnpackNCE
- ; _end
- arm_func_start FUN_020AFE8C
-FUN_020AFE8C: ; 0x020AFE8C
+ arm_func_start NNS_G2dGetCellDataByIdx
+NNS_G2dGetCellDataByIdx: ; 0x020AFE8C
ldrh r2, [r0, #0x0]
cmp r1, r2
movcs r0, #0x0
@@ -66,23 +64,22 @@ FUN_020AFE8C: ; 0x020AFE8C
ldreq r0, [r0, #0x4]
addeq r0, r0, r1, lsl #0x3
bx lr
- arm_func_end FUN_020AFE8C
+ arm_func_end NNS_G2dGetCellDataByIdx
- ; NNS_G2dGetUnpackedCellBank
- arm_func_start FUN_020AFEB8
-FUN_020AFEB8: ; 0x020AFEB8
+ arm_func_start NNS_G2dGetUnpackedCellBank
+NNS_G2dGetUnpackedCellBank: ; 0x020AFEB8
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r1
ldr r1, _020AFEFC ; =0x4345424B
- bl FUN_020B01F8
+ bl NNS_G2dFindBinaryBlock
movs r4, r0
moveq r0, #0x0
addeq sp, sp, #0x4
streq r0, [r5, #0x0]
ldmeqia sp!, {r4-r5,pc}
add r0, r4, #0x8
- bl FUN_020AFDE8
+ bl NNS_G2dUnpackNCE
add r0, r4, #0x8
str r0, [r5, #0x0]
mov r0, #0x1
@@ -90,21 +87,19 @@ FUN_020AFEB8: ; 0x020AFEB8
ldmia sp!, {r4-r5,pc}
.balign 4
_020AFEFC: .word 0x4345424B
- arm_func_end FUN_020AFEB8
+ arm_func_end NNS_G2dGetUnpackedCellBank
- ; UnPackExtendedData_
- arm_func_start FUN_020AFF00
-FUN_020AFF00: ; 0x020AFF00
- ldr ip, _020AFF0C ; =FUN_020B01B0
+ arm_func_start UnPackExtendedData_
+UnPackExtendedData_: ; 0x020AFF00
+ ldr ip, _020AFF0C ; =NNSi_G2dUnpackUserExCellAttrBank
add r0, r0, #0x8
bx r12
.balign 4
-_020AFF0C: .word FUN_020B01B0
- arm_func_end FUN_020AFF00
+_020AFF0C: .word NNSi_G2dUnpackUserExCellAttrBank
+ arm_func_end UnPackExtendedData_
- ; _end
- arm_func_start FUN_020AFF10
-FUN_020AFF10: ; 0x020AFF10
+ arm_func_start GetPtrOamArrayHead_
+GetPtrOamArrayHead_: ; 0x020AFF10
ldrh r1, [r0, #0x2]
ands r1, r1, #0x1
ldrneh r1, [r0, #0x0]
@@ -114,5 +109,4 @@ FUN_020AFF10: ; 0x020AFF10
ldreq r0, [r0, #0x4]
addeq r0, r0, r1, lsl #0x3
bx lr
- arm_func_end FUN_020AFF10
-
+ arm_func_end GetPtrOamArrayHead_
diff --git a/arm9/asm/NNS_G2D_g2d_node.s b/arm9/asm/NNS_G2D_g2d_node.s
index 8e918dda..eb4e2497 100644
--- a/arm9/asm/NNS_G2D_g2d_node.s
+++ b/arm9/asm/NNS_G2D_g2d_node.s
@@ -3,18 +3,16 @@
.section .text
- ; NNSi_G2dInitializeNode
- arm_func_start FUN_020B1AD4
-FUN_020B1AD4: ; 0x020B1AD4
+ arm_func_start NNSi_G2dInitializeNode
+NNSi_G2dInitializeNode: ; 0x020B1AD4
mov r2, #0x0
str r2, [r0, #0x0]
str r1, [r0, #0x4]
mov r1, #0x1
str r1, [r0, #0x8]
- ldr ip, _020B1AF4 ; =FUN_020B1A68
+ ldr ip, _020B1AF4 ; =NNSi_G2dSrtcInitControl
add r0, r0, #0xc
bx r12
.balign 4
-_020B1AF4: .word FUN_020B1A68
- arm_func_end FUN_020B1AD4
-
+_020B1AF4: .word NNSi_G2dSrtcInitControl
+ arm_func_end NNSi_G2dInitializeNode
diff --git a/arm9/asm/NNS_G2D_g2d_nsc_load.s b/arm9/asm/NNS_G2D_g2d_nsc_load.s
index 47f76264..4f2bb65c 100644
--- a/arm9/asm/NNS_G2D_g2d_nsc_load.s
+++ b/arm9/asm/NNS_G2D_g2d_nsc_load.s
@@ -3,13 +3,12 @@
.section .text
- ; NNS_G2dGetUnpackedScreenData
- arm_func_start FUN_020B0180
-FUN_020B0180: ; 0x020B0180
+ arm_func_start NNS_G2dGetUnpackedScreenData
+NNS_G2dGetUnpackedScreenData: ; 0x020B0180
stmdb sp!, {r4,lr}
mov r4, r1
ldr r1, _020B01AC ; =0x5343524E
- bl FUN_020B01F8
+ bl NNS_G2dFindBinaryBlock
cmp r0, #0x0
addne r0, r0, #0x8
strne r0, [r4, #0x0]
@@ -19,5 +18,4 @@ FUN_020B0180: ; 0x020B0180
ldmia sp!, {r4,pc}
.balign 4
_020B01AC: .word 0x5343524E
- arm_func_end FUN_020B0180
-
+ arm_func_end NNS_G2dGetUnpackedScreenData
diff --git a/arm9/asm/NNS_G2D_g2d_oam.s b/arm9/asm/NNS_G2D_g2d_oam.s
index 9ef72ad0..cec3db64 100644
--- a/arm9/asm/NNS_G2D_g2d_oam.s
+++ b/arm9/asm/NNS_G2D_g2d_oam.s
@@ -3,87 +3,41 @@
.section .rodata
- ; NNSi_objSizeHTbl
- .global UNK_020FF894
-UNK_020FF894: ; 0x020FF894
+ .global NNSi_objSizeHTbl
+NNSi_objSizeHTbl: ; 0x020FF894
.byte 0x08, 0x00, 0x10, 0x00, 0x20, 0x00, 0x40, 0x00, 0x08, 0x00, 0x08, 0x00, 0x10, 0x00, 0x20, 0x00
.byte 0x10, 0x00, 0x20, 0x00, 0x20, 0x00, 0x40, 0x00
- ; NNSi_objSizeWTbl
- .global UNK_020FF8AC
-UNK_020FF8AC: ; 0x020FF8AC
+ .global NNSi_objSizeWTbl
+NNSi_objSizeWTbl: ; 0x020FF8AC
.byte 0x08, 0x00, 0x10, 0x00, 0x20, 0x00, 0x40, 0x00, 0x10, 0x00, 0x20, 0x00, 0x20, 0x00, 0x40, 0x00
.byte 0x08, 0x00, 0x08, 0x00, 0x10, 0x00, 0x20, 0x00
-
; static const in function
+
.section .data
- ; funcTbl$8497
- .global UNK_0210655C
-UNK_0210655C: ; 0x0210655C
- .word FUN_020B1088
- .word FUN_020B1098
+ .global funcTbl$8497
+funcTbl$8497: ; 0x0210655C
+ .word CpuLoadOAMMain_
+ .word CpuLoadOAMSub_
.word 0
.word 0
.word 0
.section .bss
- ; numRegisterdInstance_
- .global UNK_021CCD9C
-UNK_021CCD9C: ; 0x021CCD9C
+ .global numRegisterdInstance_
+numRegisterdInstance_: ; 0x021CCD9C
.space 0x4
- ; oamCache_
- .global UNK_021CCDA0
-UNK_021CCDA0: ; 0x021CCDA0
- .space 0x100
-
- ; oamCache_ + 0x100
- .global UNK_021CCEA0
-UNK_021CCEA0: ; 0x021CCEA0
- .space 0x400
-
- ; oamCache_ + 0x500
- .global UNK_021CD2A0
-UNK_021CD2A0: ; 0x021CD2A0
- .space 0x40
-
- ; oamCache_ + 0x540
- .global UNK_021CD2E0
-UNK_021CD2E0: ; 0x021CD2E0
- .space 0x100
-
- ; oamCache_ + 0x640
- .global UNK_021CD3E0
-UNK_021CD3E0: ; 0x021CD3E0
- .space 0x400
-
- ; oamCache_ + 0xA40
- .global UNK_021CD7E0
-UNK_021CD7E0: ; 0x021CD7E0
- .space 0x40
-
- ; oamCache_ + 0xA80
- .global UNK_021CD820
-UNK_021CD820: ; 0x021CD820
- .space 0x100
-
- ; oamCache_ + 0xB80
- .global UNK_021CD920
-UNK_021CD920: ; 0x021CD920
- .space 0x400
-
- ; oamCache_ + 0xF80
- .global UNK_021CDD20
-UNK_021CDD20: ; 0x021CDD20
- .space 0x40
+ .global oamCache_
+oamCache_: ; 0x021CCDA0
+ .space 0xFC0
.section .text
- ; _end
- arm_func_start FUN_020B0830
-FUN_020B0830: ; 0x020B0830
+ arm_func_start NNS_G2dGetOamManagerOamCapacity
+NNS_G2dGetOamManagerOamCapacity: ; 0x020B0830
ldrh r3, [r0, #0x6]
ldrh r2, [r0, #0x8]
mov r12, #0x0
@@ -101,22 +55,20 @@ _020B0854:
movne r0, r0, lsr #0x10
moveq r0, #0x0
bx lr
- arm_func_end FUN_020B0830
+ arm_func_end NNS_G2dGetOamManagerOamCapacity
- ; _end
- arm_func_start FUN_020B0870
-FUN_020B0870: ; 0x020B0870
+ arm_func_start NNS_G2dApplyAndResetOamManagerBuffer
+NNS_G2dApplyAndResetOamManagerBuffer: ; 0x020B0870
stmdb sp!, {r4,lr}
mov r4, r0
- bl FUN_020B09B4
+ bl NNS_G2dApplyOamManagerToHW
mov r0, r4
- bl FUN_020B0888
+ bl NNS_G2dResetOamManagerBuffer
ldmia sp!, {r4,pc}
- arm_func_end FUN_020B0870
+ arm_func_end NNS_G2dApplyAndResetOamManagerBuffer
- ; NNS_G2dResetOamManagerBuffer
- arm_func_start FUN_020B0888
-FUN_020B0888: ; 0x020B0888
+ arm_func_start NNS_G2dResetOamManagerBuffer
+NNS_G2dResetOamManagerBuffer: ; 0x020B0888
stmdb sp!, {r4-r6,lr}
mov r5, r0
ldr r0, [r5, #0x14]
@@ -142,7 +94,7 @@ _020B08C0:
mov r4, r0, lsr #0xd
_020B08E0:
ldr r2, [r5, #0x0]
- ldr r1, _020B09AC ; =UNK_021CCDA0
+ ldr r1, _020B09AC ; =oamCache_
mov r0, #0x540
mla r1, r2, r0, r1
ldrh r0, [r5, #0x4]
@@ -169,7 +121,7 @@ _020B0930:
b _020B0998
_020B0944:
ldr r2, [r5, #0x0]
- ldr r1, _020B09AC ; =UNK_021CCDA0
+ ldr r1, _020B09AC ; =oamCache_
mov r0, #0x540
mla r1, r2, r0, r1
ldrh r2, [r5, #0x4]
@@ -197,20 +149,19 @@ _020B0998:
strh r0, [r5, #0xe]
ldmia sp!, {r4-r6,pc}
.balign 4
-_020B09AC: .word UNK_021CCDA0
+_020B09AC: .word oamCache_
_020B09B0: .word GXi_DmaId
- arm_func_end FUN_020B0888
+ arm_func_end NNS_G2dResetOamManagerBuffer
- ; NNS_G2dApplyOamManagerToHW
- arm_func_start FUN_020B09B4
-FUN_020B09B4: ; 0x020B09B4
+ arm_func_start NNS_G2dApplyOamManagerToHW
+NNS_G2dApplyOamManagerToHW: ; 0x020B09B4
stmdb sp!, {r4-r10,lr}
mov r7, r0
ldr r0, [r7, #0x14]
cmp r0, #0x0
beq _020B0A48
ldr r5, [r7, #0x0]
- ldr r1, _020B0BA8 ; =UNK_021CCDA0
+ ldr r1, _020B0BA8 ; =oamCache_
mov r0, #0x540
mla r1, r5, r0, r1
ldrh r2, [r7, #0x4]
@@ -245,12 +196,12 @@ _020B0A34:
ldmia sp!, {r4-r10,pc}
_020B0A48:
ldr r0, [r7, #0x0]
- ldr r2, _020B0BA8 ; =UNK_021CCDA0
+ ldr r2, _020B0BA8 ; =oamCache_
mov r1, #0x540
mla r2, r0, r1, r2
ldrh r5, [r7, #0x4]
ldrh r1, [r7, #0x6]
- ldr r3, _020B0BAC ; =UNK_0210655C
+ ldr r3, _020B0BAC ; =funcTbl$8497
add r4, r2, #0x100
sub r1, r1, r5
add r1, r1, #0x1
@@ -291,14 +242,14 @@ _020B0AEC:
cmp r3, #0x0
ldmeqia sp!, {r4-r10,pc}
ldr r0, [r7, #0x0]
- ldr r2, _020B0BA8 ; =UNK_021CCDA0
+ ldr r2, _020B0BA8 ; =oamCache_
mov r1, #0x540
mla r2, r0, r1, r2
ldrh r5, [r7, #0xa]
add r4, r2, #0x100
ldrh r1, [r7, #0xc]
mov r2, r5, lsl #0x15
- ldr r3, _020B0BAC ; =UNK_0210655C
+ ldr r3, _020B0BAC ; =funcTbl$8497
sub r1, r1, r5
add r1, r1, #0x1
mov r1, r1, lsl #0x10
@@ -337,13 +288,12 @@ _020B0B40:
blo _020B0B40
ldmia sp!, {r4-r10,pc}
.balign 4
-_020B0BA8: .word UNK_021CCDA0
-_020B0BAC: .word UNK_0210655C
- arm_func_end FUN_020B09B4
+_020B0BA8: .word oamCache_
+_020B0BAC: .word funcTbl$8497
+ arm_func_end NNS_G2dApplyOamManagerToHW
- ; NNS_G2dEntryOamManagerAffine
- arm_func_start FUN_020B0BB0
-FUN_020B0BB0: ; 0x020B0BB0
+ arm_func_start NNS_G2dEntryOamManagerAffine
+NNS_G2dEntryOamManagerAffine: ; 0x020B0BB0
stmdb sp!, {lr}
sub sp, sp, #0x4
ldrh r12, [r0, #0xc]
@@ -370,7 +320,7 @@ _020B0BDC:
ldreq r0, _020B0C74 ; =0x0000FFFE
ldmeqia sp!, {pc}
ldr lr, [r0, #0x0]
- ldr r3, _020B0C78 ; =UNK_021CCDA0
+ ldr r3, _020B0C78 ; =oamCache_
mov r2, #0x540
mla r12, lr, r2, r3
ldr r3, [r1, #0x0]
@@ -396,12 +346,11 @@ _020B0BDC:
ldmia sp!, {pc}
.balign 4
_020B0C74: .word 0x0000FFFE
-_020B0C78: .word UNK_021CCDA0
- arm_func_end FUN_020B0BB0
+_020B0C78: .word oamCache_
+ arm_func_end NNS_G2dEntryOamManagerAffine
- ; NNS_G2dEntryOamManagerOamWithAffineIdx
- arm_func_start FUN_020B0C7C
-FUN_020B0C7C: ; 0x020B0C7C
+ arm_func_start NNS_G2dEntryOamManagerOamWithAffineIdx
+NNS_G2dEntryOamManagerOamWithAffineIdx: ; 0x020B0C7C
stmdb sp!, {r4,lr}
ldrh r12, [r0, #0x6]
ldrh r4, [r0, #0x8]
@@ -425,7 +374,7 @@ _020B0CA4:
cmp r3, #0x0
beq _020B0D48
ldr r4, [r0, #0x0]
- ldr ip, _020B0D50 ; =UNK_021CCDA0
+ ldr ip, _020B0D50 ; =oamCache_
mov r3, #0x540
mla r12, r4, r3, r12
ldrh r3, [r0, #0x8]
@@ -459,13 +408,12 @@ _020B0D48:
mov r0, #0x0
ldmia sp!, {r4,pc}
.balign 4
-_020B0D50: .word UNK_021CCDA0
+_020B0D50: .word oamCache_
_020B0D54: .word 0x0000FFFE
- arm_func_end FUN_020B0C7C
+ arm_func_end NNS_G2dEntryOamManagerOamWithAffineIdx
- ; NNS_G2dEntryOamManagerOam
- arm_func_start FUN_020B0D58
-FUN_020B0D58: ; 0x020B0D58
+ arm_func_start NNS_G2dEntryOamManagerOam
+NNS_G2dEntryOamManagerOam: ; 0x020B0D58
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
ldrh lr, [r0, #0x6]
@@ -490,7 +438,7 @@ _020B0D84:
cmp r3, #0x0
beq _020B0E24
ldr lr, [r0, #0x0]
- ldr ip, _020B0E30 ; =UNK_021CCDA0
+ ldr ip, _020B0E30 ; =oamCache_
mov r3, #0x540
mla r12, lr, r3, r12
ldrh r3, [r0, #0x8]
@@ -525,16 +473,15 @@ _020B0E24:
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
.balign 4
-_020B0E30: .word UNK_021CCDA0
- arm_func_end FUN_020B0D58
+_020B0E30: .word oamCache_
+ arm_func_end NNS_G2dEntryOamManagerOam
- ; NNS_G2dGetNewOamManagerInstance
- arm_func_start FUN_020B0E34
-FUN_020B0E34: ; 0x020B0E34
+ arm_func_start NNS_G2dGetNewOamManagerInstance
+NNS_G2dGetNewOamManagerInstance: ; 0x020B0E34
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
ldr r5, [sp, #0x1c]
- ldr r6, _020B0FB4 ; =UNK_021CCDA0
+ ldr r6, _020B0FB4 ; =oamCache_
mov r4, #0x540
mla r4, r5, r4, r6
mov lr, r1
@@ -563,7 +510,7 @@ _020B0E9C:
_020B0EA0:
cmp r0, #0x0
beq _020B0EE0
- ldr r0, _020B0FBC ; =UNK_021CCD9C
+ ldr r0, _020B0FBC ; =numRegisterdInstance_
sub r2, r12, lr
ldrh r7, [r0, #0x0]
add r1, r4, r3
@@ -639,80 +586,77 @@ _020B0F98:
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
.balign 4
-_020B0FB4: .word UNK_021CCDA0
+_020B0FB4: .word oamCache_
_020B0FB8: .word 0x0000FFFF
-_020B0FBC: .word UNK_021CCD9C
- arm_func_end FUN_020B0E34
+_020B0FBC: .word numRegisterdInstance_
+ arm_func_end NNS_G2dGetNewOamManagerInstance
- ; NNS_G2dInitOamManagerModule
- arm_func_start FUN_020B0FC0
-FUN_020B0FC0: ; 0x020B0FC0
+ arm_func_start NNS_G2dInitOamManagerModule
+NNS_G2dInitOamManagerModule: ; 0x020B0FC0
stmdb sp!, {lr}
sub sp, sp, #0x4
- ldr r1, _020B1060 ; =UNK_021CCEA0
+ ldr r1, _020B1060 ; =oamCache_ + 0x100
mov r0, #0xc0
mov r2, #0x400
bl MIi_CpuClear16
- ldr r1, _020B1064 ; =UNK_021CD3E0
+ ldr r1, _020B1064 ; =oamCache_ + 0x640
mov r0, #0xc0
mov r2, #0x400
bl MIi_CpuClear16
- ldr r1, _020B1068 ; =UNK_021CD920
+ ldr r1, _020B1068 ; =oamCache_ + 0xB80
mov r0, #0xc0
mov r2, #0x400
bl MIi_CpuClear16
ldr r0, _020B106C ; =0x0000FFFF
- ldr r1, _020B1070 ; =UNK_021CCDA0
+ ldr r1, _020B1070 ; =oamCache_
mov r2, #0x100
bl MIi_CpuClear16
ldr r0, _020B106C ; =0x0000FFFF
- ldr r1, _020B1074 ; =UNK_021CD2E0
+ ldr r1, _020B1074 ; =oamCache_ + 0x540
mov r2, #0x100
bl MIi_CpuClear16
ldr r0, _020B106C ; =0x0000FFFF
- ldr r1, _020B1078 ; =UNK_021CD820
+ ldr r1, _020B1078 ; =oamCache_ + 0xA80
mov r2, #0x100
bl MIi_CpuClear16
ldr r0, _020B106C ; =0x0000FFFF
- ldr r1, _020B107C ; =UNK_021CD2A0
+ ldr r1, _020B107C ; =oamCache_ + 0x500
mov r2, #0x40
bl MIi_CpuClear16
ldr r0, _020B106C ; =0x0000FFFF
- ldr r1, _020B1080 ; =UNK_021CD7E0
+ ldr r1, _020B1080 ; =oamCache_ + 0xA40
mov r2, #0x40
bl MIi_CpuClear16
ldr r0, _020B106C ; =0x0000FFFF
- ldr r1, _020B1084 ; =UNK_021CDD20
+ ldr r1, _020B1084 ; =oamCache_ + 0xF80
mov r2, #0x40
bl MIi_CpuClear16
add sp, sp, #0x4
ldmia sp!, {pc}
.balign 4
-_020B1060: .word UNK_021CCEA0
-_020B1064: .word UNK_021CD3E0
-_020B1068: .word UNK_021CD920
+_020B1060: .word oamCache_ + 0x100
+_020B1064: .word oamCache_ + 0x640
+_020B1068: .word oamCache_ + 0xB80
_020B106C: .word 0x0000FFFF
-_020B1070: .word UNK_021CCDA0
-_020B1074: .word UNK_021CD2E0
-_020B1078: .word UNK_021CD820
-_020B107C: .word UNK_021CD2A0
-_020B1080: .word UNK_021CD7E0
-_020B1084: .word UNK_021CDD20
- arm_func_end FUN_020B0FC0
+_020B1070: .word oamCache_
+_020B1074: .word oamCache_ + 0x540
+_020B1078: .word oamCache_ + 0xA80
+_020B107C: .word oamCache_ + 0x500
+_020B1080: .word oamCache_ + 0xA40
+_020B1084: .word oamCache_ + 0xF80
+ arm_func_end NNS_G2dInitOamManagerModule
- ; CpuLoadOAMMain_
- arm_func_start FUN_020B1088
-FUN_020B1088: ; 0x020B1088
+ arm_func_start CpuLoadOAMMain_
+CpuLoadOAMMain_: ; 0x020B1088
ldr ip, _020B1094 ; =MIi_CpuCopy16
add r1, r1, #0x7000000
bx r12
.balign 4
_020B1094: .word MIi_CpuCopy16
- arm_func_end FUN_020B1088
+ arm_func_end CpuLoadOAMMain_
- ; CpuLoadOAMSub_
- arm_func_start FUN_020B1098
-FUN_020B1098: ; 0x020B1098
+ arm_func_start CpuLoadOAMSub_
+CpuLoadOAMSub_: ; 0x020B1098
ldr r3, _020B10A8 ; =0x07000400
ldr ip, _020B10AC ; =MIi_CpuCopy16
add r1, r1, r3
@@ -720,5 +664,4 @@ FUN_020B1098: ; 0x020B1098
.balign 4
_020B10A8: .word 0x07000400
_020B10AC: .word MIi_CpuCopy16
- arm_func_end FUN_020B1098
-
+ arm_func_end CpuLoadOAMSub_
diff --git a/arm9/asm/NNS_G2D_g2d_oamsoftware.s b/arm9/asm/NNS_G2D_g2d_oamsoftware.s
index 0929557b..c89c4787 100644
--- a/arm9/asm/NNS_G2D_g2d_oamsoftware.s
+++ b/arm9/asm/NNS_G2D_g2d_oamsoftware.s
@@ -3,61 +3,52 @@
.section .rodata
- ; pltFmtTbl$8430
- .global UNK_020FF8D0
-UNK_020FF8D0: ; 0x020FF8D0
+ .global pltFmtTbl$8430
+pltFmtTbl$8430: ; 0x020FF8D0
.byte 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
-
; static const in function
- ; texSize_$8337
- .global UNK_020FF8D8
-UNK_020FF8D8: ; 0x020FF8D8
+
+ .global texSize_$8337
+texSize_$8337: ; 0x020FF8D8
.byte 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00
.byte 0x10, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00
- ; gxTexSizeSTbl
- .global UNK_020FF8F8
-UNK_020FF8F8: ; 0x020FF8F8
+ .global gxTexSizeSTbl
+gxTexSizeSTbl: ; 0x020FF8F8
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
- ; gxTexSizeTTbl
- .global UNK_020FF928
-UNK_020FF928: ; 0x020FF928
+ .global gxTexSizeTTbl
+gxTexSizeTTbl: ; 0x020FF928
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.section .data
- ; zOffsetStep_
- .global UNK_02106590
-UNK_02106590: ; 0x02106590
+ .global zOffsetStep_
+zOffsetStep_: ; 0x02106590
.byte 0x00, 0xF0, 0xFF, 0xFF
.section .bss
- ; bAutoZOffsetAdd_
- .global UNK_021CED08
-UNK_021CED08: ; 0x021CED08
+ .global bAutoZOffsetAdd_
+bAutoZOffsetAdd_: ; 0x021CED08
.space 0x4
- ; s_pUVFlipCorrectFunc
- .global UNK_021CED0C
-UNK_021CED0C: ; 0x021CED0C
+ .global s_pUVFlipCorrectFunc
+s_pUVFlipCorrectFunc: ; 0x021CED0C
.space 0x4
- ; zOffset_
- .global UNK_021CED10
-UNK_021CED10: ; 0x021CED10
+ .global zOffset_
+zOffset_: ; 0x021CED10
.space 0x4
.section .text
- ; NNS_G2dDrawOneOam3DDirectWithPosFast
- arm_func_start FUN_020B46B4
-FUN_020B46B4: ; 0x020B46B4
+ arm_func_start NNS_G2dDrawOneOam3DDirectWithPosFast
+NNS_G2dDrawOneOam3DDirectWithPosFast: ; 0x020B46B4
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x1c
add r12, sp, #0x4
@@ -70,7 +61,7 @@ FUN_020B46B4: ; 0x020B46B4
ldr r3, [sp, #0x38]
mov r0, r7
str r12, [sp, #0x0]
- bl FUN_020B498C
+ bl CalcSpriteParams_
ldr r2, [r7, #0x0]
and r1, r2, #0x300
cmp r1, #0x100
@@ -83,17 +74,17 @@ _020B4708:
cmp r1, #0x300
bne _020B478C
ldr r0, _020B4914 ; =0xC000C000
- ldr r1, _020B4918 ; =UNK_021CED08
+ ldr r1, _020B4918 ; =bAutoZOffsetAdd_
and r0, r2, r0
and r2, r0, #0xc0000000
mov r12, r2, lsr #0x1e
and r0, r0, #0xc000
mov lr, r0, asr #0xe
- ldr r3, _020B491C ; =UNK_020FF8AC
+ ldr r3, _020B491C ; =NNSi_objSizeWTbl
ldr r0, [r1, #0x0]
- ldr r2, _020B4920 ; =UNK_020FF894
+ ldr r2, _020B4920 ; =NNSi_objSizeHTbl
cmp r0, #0x0
- ldrne r0, _020B4924 ; =UNK_021CED10
+ ldrne r0, _020B4924 ; =zOffset_
mov r12, r12, lsl #0x1
add r1, r2, lr, lsl #0x3
add r3, r3, lr, lsl #0x3
@@ -114,11 +105,11 @@ _020B4708:
str r3, [r1, #0x0]
b _020B47C0
_020B478C:
- ldr r0, _020B4918 ; =UNK_021CED08
+ ldr r0, _020B4918 ; =bAutoZOffsetAdd_
ldr r1, _020B4928 ; =0x04000470
ldr r0, [r0, #0x0]
cmp r0, #0x0
- ldrne r0, _020B4924 ; =UNK_021CED10
+ ldrne r0, _020B4924 ; =zOffset_
ldrne r0, [r0, #0x0]
addne r2, r0, r4, lsl #0xc
mov r0, r6, lsl #0xc
@@ -199,14 +190,14 @@ _020B47C0:
mov r2, #0x0
str r2, [r0, #0x0]
ldr r1, _020B4940 ; =0x04000504
- ldr r0, _020B4918 ; =UNK_021CED08
+ ldr r0, _020B4918 ; =bAutoZOffsetAdd_
str r2, [r1, #0x0]
ldr r0, [r0, #0x0]
cmp r0, #0x0
addeq sp, sp, #0x1c
ldmeqia sp!, {r4-r7,pc}
- ldr r1, _020B4924 ; =UNK_021CED10
- ldr r0, _020B4944 ; =UNK_02106590
+ ldr r1, _020B4924 ; =zOffset_
+ ldr r0, _020B4944 ; =zOffsetStep_
ldr r2, [r1, #0x0]
ldr r0, [r0, #0x0]
add r0, r2, r0
@@ -215,10 +206,10 @@ _020B47C0:
ldmia sp!, {r4-r7,pc}
.balign 4
_020B4914: .word 0xC000C000
-_020B4918: .word UNK_021CED08
-_020B491C: .word UNK_020FF8AC
-_020B4920: .word UNK_020FF894
-_020B4924: .word UNK_021CED10
+_020B4918: .word bAutoZOffsetAdd_
+_020B491C: .word NNSi_objSizeWTbl
+_020B4920: .word NNSi_objSizeHTbl
+_020B4924: .word zOffset_
_020B4928: .word 0x04000470
_020B492C: .word 0x0400046C
_020B4930: .word 0x04000500
@@ -226,53 +217,48 @@ _020B4934: .word 0x04000488
_020B4938: .word 0x04000490
_020B493C: .word 0x00010040
_020B4940: .word 0x04000504
-_020B4944: .word UNK_02106590
- arm_func_end FUN_020B46B4
+_020B4944: .word zOffsetStep_
+ arm_func_end NNS_G2dDrawOneOam3DDirectWithPosFast
- ; NNSi_G2dGetOamSoftEmuAutoZOffsetStep
- arm_func_start FUN_020B4948
-FUN_020B4948: ; 0x020B4948
- ldr r0, _020B4954 ; =UNK_02106590
+ arm_func_start NNSi_G2dGetOamSoftEmuAutoZOffsetStep
+NNSi_G2dGetOamSoftEmuAutoZOffsetStep: ; 0x020B4948
+ ldr r0, _020B4954 ; =zOffsetStep_
ldr r0, [r0, #0x0]
bx lr
.balign 4
-_020B4954: .word UNK_02106590
- arm_func_end FUN_020B4948
+_020B4954: .word zOffsetStep_
+ arm_func_end NNSi_G2dGetOamSoftEmuAutoZOffsetStep
- ; NNSi_G2dSetOamSoftEmuAutoZOffsetStep
- arm_func_start FUN_020B4958
-FUN_020B4958: ; 0x020B4958
- ldr r1, _020B4964 ; =UNK_02106590
+ arm_func_start NNSi_G2dSetOamSoftEmuAutoZOffsetStep
+NNSi_G2dSetOamSoftEmuAutoZOffsetStep: ; 0x020B4958
+ ldr r1, _020B4964 ; =zOffsetStep_
str r0, [r1, #0x0]
bx lr
.balign 4
-_020B4964: .word UNK_02106590
- arm_func_end FUN_020B4958
+_020B4964: .word zOffsetStep_
+ arm_func_end NNSi_G2dSetOamSoftEmuAutoZOffsetStep
- ; NNSi_G2dResetOamSoftEmuAutoZOffset
- arm_func_start FUN_020B4968
-FUN_020B4968: ; 0x020B4968
- ldr r0, _020B4978 ; =UNK_021CED10
+ arm_func_start NNSi_G2dResetOamSoftEmuAutoZOffset
+NNSi_G2dResetOamSoftEmuAutoZOffset: ; 0x020B4968
+ ldr r0, _020B4978 ; =zOffset_
mov r1, #0x0
str r1, [r0, #0x0]
bx lr
.balign 4
-_020B4978: .word UNK_021CED10
- arm_func_end FUN_020B4968
+_020B4978: .word zOffset_
+ arm_func_end NNSi_G2dResetOamSoftEmuAutoZOffset
- ; NNSi_G2dSetOamSoftEmuAutoZOffsetFlag
- arm_func_start FUN_020B497C
-FUN_020B497C: ; 0x020B497C
- ldr r1, _020B4988 ; =UNK_021CED08
+ arm_func_start NNSi_G2dSetOamSoftEmuAutoZOffsetFlag
+NNSi_G2dSetOamSoftEmuAutoZOffsetFlag: ; 0x020B497C
+ ldr r1, _020B4988 ; =bAutoZOffsetAdd_
str r0, [r1, #0x0]
bx lr
.balign 4
-_020B4988: .word UNK_021CED08
- arm_func_end FUN_020B497C
+_020B4988: .word bAutoZOffsetAdd_
+ arm_func_end NNSi_G2dSetOamSoftEmuAutoZOffsetFlag
- ; CalcSpriteParams_
- arm_func_start FUN_020B498C
-FUN_020B498C: ; 0x020B498C
+ arm_func_start CalcSpriteParams_
+CalcSpriteParams_: ; 0x020B498C
stmdb sp!, {r4-r9,lr}
sub sp, sp, #0xc
mov r6, r0
@@ -283,9 +269,9 @@ FUN_020B498C: ; 0x020B498C
and r0, r4, #0xc0000000
and r4, r4, #0xc000
mov lr, r0, lsr #0x1e
- ldr r0, _020B4BD0 ; =UNK_020FF8AC
+ ldr r0, _020B4BD0 ; =NNSi_objSizeWTbl
mov r12, r4, asr #0xe
- ldr r8, _020B4BD4 ; =UNK_020FF894
+ ldr r8, _020B4BD4 ; =NNSi_objSizeHTbl
mov r4, lr, lsl #0x1
add r0, r0, r12, lsl #0x3
ldrh r9, [r4, r0]
@@ -320,7 +306,7 @@ FUN_020B498C: ; 0x020B498C
cmp r1, #0x4
moveq r1, r7, lsl #0xf
moveq r7, r1, lsr #0x10
- ldr r1, _020B4BDC ; =UNK_020FF8D8
+ ldr r1, _020B4BDC ; =texSize_$8337
ldr r1, [r1, r2, lsl #0x2]
sub r1, r1, #0x1
and r1, r7, r1
@@ -338,9 +324,9 @@ _020B4A74:
add r1, r1, #0x5
ldr r3, [r5, #0x8]
mov lr, lr, lsl #0x10
- ldr sb, _020B4BE0 ; =UNK_020FF8F8
+ ldr sb, _020B4BE0 ; =gxTexSizeSTbl
mov r12, r12, lsr #0x10
- ldr r8, _020B4BE4 ; =UNK_020FF928
+ ldr r8, _020B4BE4 ; =gxTexSizeTTbl
add r1, r2, r7, lsl r1
mov r2, r3, lsl #0x1a
orr r3, r2, r1, lsr #0x3
@@ -381,7 +367,7 @@ _020B4AE0:
ldrne r2, [r0, #0x4]
ldrne r1, [r0, #0xc]
strne r1, [r0, #0x4]
- ldr r1, _020B4BE8 ; =UNK_021CED0C
+ ldr r1, _020B4BE8 ; =s_pUVFlipCorrectFunc
strne r2, [r0, #0xc]
ldr r7, [r1, #0x0]
cmp r7, #0x0
@@ -400,7 +386,7 @@ _020B4B60:
mov r3, r1, lsl #0x12
ldr r1, [r5, #0xc]
mov r0, r0, lsl #0x10
- ldr r2, _020B4BEC ; =UNK_020FF8D0
+ ldr r2, _020B4BEC ; =pltFmtTbl$8430
mov r3, r3, lsr #0x1f
cmp r1, #0x0
mov r0, r0, lsr #0x10
@@ -423,14 +409,13 @@ _020B4BA4:
ldmia sp!, {r4-r9,pc}
.balign 4
_020B4BCC: .word 0xC000C000
-_020B4BD0: .word UNK_020FF8AC
-_020B4BD4: .word UNK_020FF894
+_020B4BD0: .word NNSi_objSizeWTbl
+_020B4BD4: .word NNSi_objSizeHTbl
_020B4BD8: .word 0x040004A8
-_020B4BDC: .word UNK_020FF8D8
-_020B4BE0: .word UNK_020FF8F8
-_020B4BE4: .word UNK_020FF928
-_020B4BE8: .word UNK_021CED0C
-_020B4BEC: .word UNK_020FF8D0
+_020B4BDC: .word texSize_$8337
+_020B4BE0: .word gxTexSizeSTbl
+_020B4BE4: .word gxTexSizeTTbl
+_020B4BE8: .word s_pUVFlipCorrectFunc
+_020B4BEC: .word pltFmtTbl$8430
_020B4BF0: .word 0x040004AC
- arm_func_end FUN_020B498C
-
+ arm_func_end CalcSpriteParams_
diff --git a/arm9/asm/NNS_G2D_g2d_palettetabl.s b/arm9/asm/NNS_G2D_g2d_palettetabl.s
index bfa00006..a8d342cf 100644
--- a/arm9/asm/NNS_G2D_g2d_palettetabl.s
+++ b/arm9/asm/NNS_G2D_g2d_palettetabl.s
@@ -3,11 +3,9 @@
.section .text
- ; _end
- arm_func_start FUN_020B10B0
-FUN_020B10B0: ; 0x020B10B0
+ arm_func_start NNS_G2dGetPaletteTableValue
+NNS_G2dGetPaletteTableValue: ; 0x020B10B0
mov r1, r1, lsl #0x1
ldrh r0, [r0, r1]
bx lr
- arm_func_end FUN_020B10B0
-
+ arm_func_end NNS_G2dGetPaletteTableValue
diff --git a/arm9/asm/NNS_G2D_g2d_renderer.s b/arm9/asm/NNS_G2D_g2d_renderer.s
index d6213a1b..5cd5eaac 100644
--- a/arm9/asm/NNS_G2D_g2d_renderer.s
+++ b/arm9/asm/NNS_G2D_g2d_renderer.s
@@ -3,127 +3,90 @@
.section .data
- ; firstSRTransformedMtxIdx_
- .global UNK_02106570
-UNK_02106570: ; 0x02106570
+ .global firstSRTransformedMtxIdx_
+firstSRTransformedMtxIdx_: ; 0x02106570
.short -2
-
.balign 4, 0
- ; currenVramTransferHandle_
- .global UNK_02106574
-UNK_02106574: ; 0x02106574
+
+ .global currenVramTransferHandle_
+currenVramTransferHandle_: ; 0x02106574
.word -1
- ; mtxI_
- .global UNK_02106578
-UNK_02106578: ; 0x02106578
+ .global mtxI_
+mtxI_: ; 0x02106578
.byte 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.section .bss
- ; currentMtxCachePos_
- .global UNK_021CDD60
-UNK_021CDD60: ; 0x021CDD60
+ .global currentMtxCachePos_
+currentMtxCachePos_: ; 0x021CDD60
.space 0x4
- ; groupID_
- .global UNK_021CDD64
-UNK_021CDD64: ; 0x021CDD64
+ .global groupID_
+groupID_: ; 0x021CDD64
.space 0x4
- ; bDonotUseSRTransform
- .global UNK_021CDD68
-UNK_021CDD68: ; 0x021CDD68
+ .global bDonotUseSRTransform
+bDonotUseSRTransform: ; 0x021CDD68
.space 0x4
- ; pCurrentInstance_
- .global UNK_021CDD6C
-UNK_021CDD6C: ; 0x021CDD6C
+ .global pCurrentInstance_
+pCurrentInstance_: ; 0x021CDD6C
.space 0x4
- ; stackPos_
- .global UNK_021CDD70
-UNK_021CDD70: ; 0x021CDD70
+ .global stackPos_
+stackPos_: ; 0x021CDD70
.space 0x4
- ; fxZStack_
- .global UNK_021CDD74
-UNK_021CDD74: ; 0x021CDD74
+ .global fxZStack_
+fxZStack_: ; 0x021CDD74
.space 0x80
- ; mtxStateStack_
- .global UNK_021CDDF4
-UNK_021CDDF4: ; 0x021CDDF4
- .space 0x4
-
- ; mtxStateStack_ + 0x4
- .global UNK_021CDDF8
-UNK_021CDDF8: ; 0x021CDDF8
- .space 0xfc
-
- ; mtxStack_
- .global UNK_021CDEF4
-UNK_021CDEF4: ; 0x021CDEF4
- .space 0x10
+ .global mtxStateStack_
+mtxStateStack_: ; 0x021CDDF4
+ .space 0x100
- ; mtxStack_ + 0x10
- .global UNK_021CDF04
-UNK_021CDF04: ; 0x021CDF04
- .space 0x4
-
- ; mtxStack_ + 0x14
- .global UNK_021CDF08
-UNK_021CDF08: ; 0x021CDF08
- .space 0x2ec
+ .global mtxStack_
+mtxStack_: ; 0x021CDEF4
+ .space 0x300
- ; mtxStackFor2DHW_
- .global UNK_021CE1F4
-UNK_021CE1F4: ; 0x021CE1F4
+ .global mtxStackFor2DHW_
+mtxStackFor2DHW_: ; 0x021CE1F4
.space 0x300
- ; mtxCacheBuffer_
- .global UNK_021CE4F4
-UNK_021CE4F4: ; 0x021CE4F4
+ .global mtxCacheBuffer_
+mtxCacheBuffer_: ; 0x021CE4F4
.space 0x400
- ; mcRenderState_
- .global UNK_021CE8F4
-UNK_021CE8F4: ; 0x021CE8F4
- .space 0x4
-
- ; mcRenderState_ + 0x4
- .global UNK_021CE8F8
-UNK_021CE8F8: ; 0x021CE8F8
- .space 0x404
+ .global mcRenderState_
+mcRenderState_: ; 0x021CE8F4
+ .space 0x408
.section .text
- ; NNS_G2dSetRendererImageProxy
- arm_func_start thunk_FUN_020b5040
-thunk_FUN_020b5040: ; 0x020B2780
- ldr ip, _020B2788 ; =FUN_020B5040
+ arm_func_start NNS_G2dSetRendererImageProxy
+NNS_G2dSetRendererImageProxy: ; 0x020B2780
+ ldr ip, _020B2788 ; =NNS_G2dSetRndCoreImageProxy
bx r12
.balign 4
-_020B2788: .word FUN_020B5040
- arm_func_end thunk_FUN_020b5040
+_020B2788: .word NNS_G2dSetRndCoreImageProxy
+ arm_func_end NNS_G2dSetRendererImageProxy
- ; _end
- arm_func_start FUN_020B278C
-FUN_020B278C: ; 0x020B278C
+ arm_func_start NNS_G2dGetRendererPaletteTbl
+NNS_G2dGetRendererPaletteTbl: ; 0x020B278C
ldr r0, [r0, #0x78]
bx lr
- arm_func_end FUN_020B278C
+ arm_func_end NNS_G2dGetRendererPaletteTbl
- ; NNS_G2dRotZ
- arm_func_start FUN_020B2794
-FUN_020B2794: ; 0x020B2794
+ arm_func_start NNS_G2dRotZ
+NNS_G2dRotZ: ; 0x020B2794
stmdb sp!, {lr}
sub sp, sp, #0x1c
- ldr r2, _020B2894 ; =UNK_021CDD70
+ ldr r2, _020B2894 ; =stackPos_
mov lr, #0x0
ldr r12, [r2, #0x0]
- ldr r3, _020B2898 ; =UNK_021CDEF4
+ ldr r3, _020B2898 ; =mtxStack_
mov r2, #0x18
str r1, [sp, #0x0]
str r1, [sp, #0xc]
@@ -135,20 +98,20 @@ FUN_020B2794: ; 0x020B2794
str r3, [sp, #0x8]
str lr, [sp, #0x10]
str lr, [sp, #0x14]
- bl FUN_020B423C
- ldr r0, _020B2894 ; =UNK_021CDD70
- ldr r1, _020B289C ; =UNK_021CE1F4
+ bl NNSi_G2dMtxConcat32
+ ldr r0, _020B2894 ; =stackPos_
+ ldr r1, _020B289C ; =mtxStackFor2DHW_
ldr r2, [r0, #0x0]
mov r0, #0x18
mla r1, r2, r0, r1
add r0, sp, #0x0
mov r2, r1
- bl FUN_020B423C
- ldr r0, _020B28A0 ; =UNK_021CDD68
+ bl NNSi_G2dMtxConcat32
+ ldr r0, _020B28A0 ; =bDonotUseSRTransform
ldr r0, [r0, #0x0]
cmp r0, #0x0
bne _020B2824
- ldr r1, _020B28A4 ; =UNK_02106570
+ ldr r1, _020B28A4 ; =firstSRTransformedMtxIdx_
ldr r0, _020B28A8 ; =0x0000FFFE
ldrh r1, [r1, #0x0]
cmp r1, r0
@@ -158,12 +121,12 @@ _020B2824:
mov r0, #0x0
_020B2828:
cmp r0, #0x0
- ldreq r1, _020B2894 ; =UNK_021CDD70
- ldreq r0, _020B28A4 ; =UNK_02106570
+ ldreq r1, _020B2894 ; =stackPos_
+ ldreq r0, _020B28A4 ; =firstSRTransformedMtxIdx_
ldreq r1, [r1, #0x0]
streqh r1, [r0, #0x0]
- ldr r0, _020B2894 ; =UNK_021CDD70
- ldr r1, _020B28AC ; =UNK_021CDDF4
+ ldr r0, _020B2894 ; =stackPos_
+ ldr r1, _020B28AC ; =mtxStateStack_
ldr r0, [r0, #0x0]
mov r0, r0, lsl #0x10
add r12, r1, r0, lsr #0xd
@@ -177,7 +140,7 @@ _020B2828:
b _020B2870 ; case 2
b _020B2870 ; case 3
_020B2870:
- ldr r0, _020B28B0 ; =UNK_021CDD64
+ ldr r0, _020B28B0 ; =groupID_
mov r1, #0x1
ldrh r3, [r0, #0x0]
add r2, r3, #0x1
@@ -188,26 +151,25 @@ _020B288C:
add sp, sp, #0x1c
ldmia sp!, {pc}
.balign 4
-_020B2894: .word UNK_021CDD70
-_020B2898: .word UNK_021CDEF4
-_020B289C: .word UNK_021CE1F4
-_020B28A0: .word UNK_021CDD68
-_020B28A4: .word UNK_02106570
+_020B2894: .word stackPos_
+_020B2898: .word mtxStack_
+_020B289C: .word mtxStackFor2DHW_
+_020B28A0: .word bDonotUseSRTransform
+_020B28A4: .word firstSRTransformedMtxIdx_
_020B28A8: .word 0x0000FFFE
-_020B28AC: .word UNK_021CDDF4
-_020B28B0: .word UNK_021CDD64
- arm_func_end FUN_020B2794
+_020B28AC: .word mtxStateStack_
+_020B28B0: .word groupID_
+ arm_func_end NNS_G2dRotZ
- ; NNS_G2dScale
- arm_func_start FUN_020B28B4
-FUN_020B28B4: ; 0x020B28B4
+ arm_func_start NNS_G2dScale
+NNS_G2dScale: ; 0x020B28B4
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x1c
- ldr r2, _020B29E8 ; =UNK_021CDD70
+ ldr r2, _020B29E8 ; =stackPos_
mov r12, #0x0
ldr r3, [r2, #0x0]
mov r4, r1
- ldr r2, _020B29EC ; =UNK_021CDEF4
+ ldr r2, _020B29EC ; =mtxStack_
mov r1, #0x18
mla r1, r3, r1, r2
mov r5, r0
@@ -219,7 +181,7 @@ FUN_020B28B4: ; 0x020B28B4
str r4, [sp, #0xc]
str r12, [sp, #0x10]
str r12, [sp, #0x14]
- bl FUN_020B423C
+ bl NNSi_G2dMtxConcat32
mov r0, r5
bl FX_Inv
mov r1, #0x0
@@ -229,22 +191,22 @@ FUN_020B28B4: ; 0x020B28B4
str r1, [sp, #0x8]
bl FX_Inv
mov r3, #0x0
- ldr r1, _020B29E8 ; =UNK_021CDD70
+ ldr r1, _020B29E8 ; =stackPos_
str r0, [sp, #0xc]
ldr r2, [r1, #0x0]
- ldr r1, _020B29F0 ; =UNK_021CE1F4
+ ldr r1, _020B29F0 ; =mtxStackFor2DHW_
mov r0, #0x18
mla r1, r2, r0, r1
add r0, sp, #0x0
mov r2, r1
str r3, [sp, #0x10]
str r3, [sp, #0x14]
- bl FUN_020B423C
- ldr r0, _020B29F4 ; =UNK_021CDD68
+ bl NNSi_G2dMtxConcat32
+ ldr r0, _020B29F4 ; =bDonotUseSRTransform
ldr r0, [r0, #0x0]
cmp r0, #0x0
bne _020B2978
- ldr r1, _020B29F8 ; =UNK_02106570
+ ldr r1, _020B29F8 ; =firstSRTransformedMtxIdx_
ldr r0, _020B29FC ; =0x0000FFFE
ldrh r1, [r1, #0x0]
cmp r1, r0
@@ -254,12 +216,12 @@ _020B2978:
mov r0, #0x0
_020B297C:
cmp r0, #0x0
- ldreq r1, _020B29E8 ; =UNK_021CDD70
- ldreq r0, _020B29F8 ; =UNK_02106570
+ ldreq r1, _020B29E8 ; =stackPos_
+ ldreq r0, _020B29F8 ; =firstSRTransformedMtxIdx_
ldreq r1, [r1, #0x0]
streqh r1, [r0, #0x0]
- ldr r0, _020B29E8 ; =UNK_021CDD70
- ldr r1, _020B2A00 ; =UNK_021CDDF4
+ ldr r0, _020B29E8 ; =stackPos_
+ ldr r1, _020B2A00 ; =mtxStateStack_
ldr r0, [r0, #0x0]
mov r0, r0, lsl #0x10
add r12, r1, r0, lsr #0xd
@@ -273,7 +235,7 @@ _020B297C:
b _020B29C4 ; case 2
b _020B29C4 ; case 3
_020B29C4:
- ldr r0, _020B2A04 ; =UNK_021CDD64
+ ldr r0, _020B2A04 ; =groupID_
mov r1, #0x1
ldrh r3, [r0, #0x0]
add r2, r3, #0x1
@@ -284,37 +246,36 @@ _020B29E0:
add sp, sp, #0x1c
ldmia sp!, {r4-r5,pc}
.balign 4
-_020B29E8: .word UNK_021CDD70
-_020B29EC: .word UNK_021CDEF4
-_020B29F0: .word UNK_021CE1F4
-_020B29F4: .word UNK_021CDD68
-_020B29F8: .word UNK_02106570
+_020B29E8: .word stackPos_
+_020B29EC: .word mtxStack_
+_020B29F0: .word mtxStackFor2DHW_
+_020B29F4: .word bDonotUseSRTransform
+_020B29F8: .word firstSRTransformedMtxIdx_
_020B29FC: .word 0x0000FFFE
-_020B2A00: .word UNK_021CDDF4
-_020B2A04: .word UNK_021CDD64
- arm_func_end FUN_020B28B4
+_020B2A00: .word mtxStateStack_
+_020B2A04: .word groupID_
+ arm_func_end NNS_G2dScale
- ; NNS_G2dTranslate
- arm_func_start FUN_020B2A08
-FUN_020B2A08: ; 0x020B2A08
+ arm_func_start NNS_G2dTranslate
+NNS_G2dTranslate: ; 0x020B2A08
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x1c
- ldr r3, _020B2AEC ; =UNK_021CDD68
+ ldr r3, _020B2AEC ; =bDonotUseSRTransform
mov r4, r2
ldr r2, [r3, #0x0]
cmp r2, #0x0
beq _020B2A6C
- ldr r2, _020B2AF0 ; =UNK_021CDD70
+ ldr r2, _020B2AF0 ; =stackPos_
mov r3, #0x18
ldr r2, [r2, #0x0]
- ldr lr, _020B2AF4 ; =UNK_021CDF04
+ ldr lr, _020B2AF4 ; =mtxStack_ + 0x10
mul r5, r2, r3
ldr r3, [lr, r5]
- ldr ip, _020B2AF8 ; =UNK_021CDF08
+ ldr ip, _020B2AF8 ; =mtxStack_ + 0x14
add r0, r3, r0
str r0, [lr, r5]
ldr r0, [r12, r5]
- ldr r3, _020B2AFC ; =UNK_021CDD74
+ ldr r3, _020B2AFC ; =fxZStack_
add r0, r0, r1
str r0, [r12, r5]
ldr r0, [r3, r2, lsl #0x2]
@@ -323,10 +284,10 @@ FUN_020B2A08: ; 0x020B2A08
str r0, [r3, r2, lsl #0x2]
ldmia sp!, {r4-r5,pc}
_020B2A6C:
- ldr r2, _020B2AF0 ; =UNK_021CDD70
+ ldr r2, _020B2AF0 ; =stackPos_
mov lr, #0x1000
ldr r12, [r2, #0x0]
- ldr r3, _020B2B00 ; =UNK_021CDEF4
+ ldr r3, _020B2B00 ; =mtxStack_
mov r2, #0x18
str r1, [sp, #0x14]
mla r1, r12, r2, r3
@@ -338,17 +299,17 @@ _020B2A6C:
str r3, [sp, #0x4]
str r3, [sp, #0x8]
str lr, [sp, #0xc]
- bl FUN_020B423C
- ldr r0, _020B2AF0 ; =UNK_021CDD70
- ldr r1, _020B2B04 ; =UNK_021CE1F4
+ bl NNSi_G2dMtxConcat32
+ ldr r0, _020B2AF0 ; =stackPos_
+ ldr r1, _020B2B04 ; =mtxStackFor2DHW_
ldr r2, [r0, #0x0]
mov r0, #0x18
mla r1, r2, r0, r1
add r0, sp, #0x0
mov r2, r1
- bl FUN_020B423C
- ldr r0, _020B2AF0 ; =UNK_021CDD70
- ldr r2, _020B2AFC ; =UNK_021CDD74
+ bl NNSi_G2dMtxConcat32
+ ldr r0, _020B2AF0 ; =stackPos_
+ ldr r2, _020B2AFC ; =fxZStack_
ldr r1, [r0, #0x0]
ldr r0, [r2, r1, lsl #0x2]
add r0, r0, r4
@@ -356,27 +317,26 @@ _020B2A6C:
add sp, sp, #0x1c
ldmia sp!, {r4-r5,pc}
.balign 4
-_020B2AEC: .word UNK_021CDD68
-_020B2AF0: .word UNK_021CDD70
-_020B2AF4: .word UNK_021CDF04
-_020B2AF8: .word UNK_021CDF08
-_020B2AFC: .word UNK_021CDD74
-_020B2B00: .word UNK_021CDEF4
-_020B2B04: .word UNK_021CE1F4
- arm_func_end FUN_020B2A08
+_020B2AEC: .word bDonotUseSRTransform
+_020B2AF0: .word stackPos_
+_020B2AF4: .word mtxStack_ + 0x10
+_020B2AF8: .word mtxStack_ + 0x14
+_020B2AFC: .word fxZStack_
+_020B2B00: .word mtxStack_
+_020B2B04: .word mtxStackFor2DHW_
+ arm_func_end NNS_G2dTranslate
- ; NNS_G2dPopMtx
- arm_func_start FUN_020B2B08
-FUN_020B2B08: ; 0x020B2B08
- ldr r0, _020B2B4C ; =UNK_021CDD70
+ arm_func_start NNS_G2dPopMtx
+NNS_G2dPopMtx: ; 0x020B2B08
+ ldr r0, _020B2B4C ; =stackPos_
ldr r0, [r0, #0x0]
cmp r0, #0x0
movle r0, #0x1
movgt r0, #0x0
cmp r0, #0x0
bxne lr
- ldr r1, _020B2B4C ; =UNK_021CDD70
- ldr r0, _020B2B50 ; =UNK_02106570
+ ldr r1, _020B2B4C ; =stackPos_
+ ldr r0, _020B2B50 ; =firstSRTransformedMtxIdx_
ldr r3, [r1, #0x0]
ldrh r2, [r0, #0x0]
sub r3, r3, #0x1
@@ -386,21 +346,20 @@ FUN_020B2B08: ; 0x020B2B08
strgth r1, [r0, #0x0]
bx lr
.balign 4
-_020B2B4C: .word UNK_021CDD70
-_020B2B50: .word UNK_02106570
+_020B2B4C: .word stackPos_
+_020B2B50: .word firstSRTransformedMtxIdx_
_020B2B54: .word 0x0000FFFE
- arm_func_end FUN_020B2B08
+ arm_func_end NNS_G2dPopMtx
- ; NNS_G2dPushMtx
- arm_func_start FUN_020B2B58
-FUN_020B2B58: ; 0x020B2B58
+ arm_func_start NNS_G2dPushMtx
+NNS_G2dPushMtx: ; 0x020B2B58
stmdb sp!, {r4-r10,lr}
- ldr r0, _020B2D74 ; =UNK_021CDD6C
+ ldr r0, _020B2D74 ; =pCurrentInstance_
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x7c]
ands r0, r0, #0x1
bne _020B2CA4
- ldr r0, _020B2D78 ; =UNK_021CDD70
+ ldr r0, _020B2D78 ; =stackPos_
ldr r1, [r0, #0x0]
mov r0, r1, lsl #0x10
add r5, r1, #0x1
@@ -410,34 +369,34 @@ FUN_020B2B58: ; 0x020B2B58
movge r0, #0x0
cmp r0, #0x0
beq _020B2C44
- ldr r0, _020B2D7C ; =UNK_021CDD68
+ ldr r0, _020B2D7C ; =bDonotUseSRTransform
ldr r0, [r0, #0x0]
cmp r0, #0x0
beq _020B2BE4
- ldr r1, _020B2D78 ; =UNK_021CDD70
+ ldr r1, _020B2D78 ; =stackPos_
mov r0, #0x18
ldr r3, [r1, #0x0]
- ldr r1, _020B2D80 ; =UNK_021CDD74
+ ldr r1, _020B2D80 ; =fxZStack_
mul r8, r3, r0
- ldr r6, _020B2D84 ; =UNK_021CDF04
+ ldr r6, _020B2D84 ; =mtxStack_ + 0x10
mul r7, r5, r0
ldr r2, [r6, r8]
ldr r0, [r1, r3, lsl #0x2]
- ldr r3, _020B2D88 ; =UNK_021CDF08
+ ldr r3, _020B2D88 ; =mtxStack_ + 0x14
str r2, [r6, r7]
ldr r2, [r3, r8]
str r0, [r1, r5, lsl #0x2]
str r2, [r3, r7]
b _020B2C3C
_020B2BE4:
- ldr r1, _020B2D78 ; =UNK_021CDD70
+ ldr r1, _020B2D78 ; =stackPos_
mov r0, #0x18
ldr r2, [r1, #0x0]
- ldr r7, _020B2D80 ; =UNK_021CDD74
+ ldr r7, _020B2D80 ; =fxZStack_
mul lr, r2, r0
- ldr r1, _020B2D8C ; =UNK_021CDEF4
+ ldr r1, _020B2D8C ; =mtxStack_
mul r12, r5, r0
- ldr r8, _020B2D90 ; =UNK_021CE1F4
+ ldr r8, _020B2D90 ; =mtxStackFor2DHW_
add r10, r1, lr
ldr r6, [r7, r2, lsl #0x2]
add r9, r1, r12
@@ -453,11 +412,11 @@ _020B2BE4:
ldmia r7, {r0-r1}
stmia r6, {r0-r1}
_020B2C3C:
- ldr r0, _020B2D78 ; =UNK_021CDD70
+ ldr r0, _020B2D78 ; =stackPos_
str r5, [r0, #0x0]
_020B2C44:
- ldr r0, _020B2D78 ; =UNK_021CDD70
- ldr r2, _020B2D94 ; =UNK_021CDDF4
+ ldr r0, _020B2D78 ; =stackPos_
+ ldr r2, _020B2D94 ; =mtxStateStack_
ldr r0, [r0, #0x0]
mov r5, r4, lsl #0x3
mov r0, r0, lsl #0x10
@@ -471,7 +430,7 @@ _020B2C44:
strh r0, [r3, #0x2]
ldrh r2, [r4, #0x4]
ldrh r0, [r4, #0x6]
- ldr r1, _020B2D98 ; =UNK_021CDDF8
+ ldr r1, _020B2D98 ; =mtxStateStack_ + 0x4
strh r2, [r3, #0x4]
strh r0, [r3, #0x6]
ldrh r0, [r1, r5]
@@ -481,7 +440,7 @@ _020B2C44:
strneh r0, [r1, r6]
ldmia sp!, {r4-r10,pc}
_020B2CA4:
- ldr r0, _020B2D78 ; =UNK_021CDD70
+ ldr r0, _020B2D78 ; =stackPos_
ldr r0, [r0, #0x0]
add r4, r0, #0x1
cmp r4, #0x20
@@ -489,34 +448,34 @@ _020B2CA4:
movge r0, #0x0
cmp r0, #0x0
ldmeqia sp!, {r4-r10,pc}
- ldr r0, _020B2D7C ; =UNK_021CDD68
+ ldr r0, _020B2D7C ; =bDonotUseSRTransform
ldr r0, [r0, #0x0]
cmp r0, #0x0
beq _020B2D10
- ldr r1, _020B2D78 ; =UNK_021CDD70
+ ldr r1, _020B2D78 ; =stackPos_
mov r0, #0x18
ldr r3, [r1, #0x0]
- ldr r1, _020B2D80 ; =UNK_021CDD74
+ ldr r1, _020B2D80 ; =fxZStack_
mul r7, r3, r0
- ldr r5, _020B2D84 ; =UNK_021CDF04
+ ldr r5, _020B2D84 ; =mtxStack_ + 0x10
mul r6, r4, r0
ldr r2, [r5, r7]
ldr r0, [r1, r3, lsl #0x2]
- ldr r3, _020B2D88 ; =UNK_021CDF08
+ ldr r3, _020B2D88 ; =mtxStack_ + 0x14
str r2, [r5, r6]
ldr r2, [r3, r7]
str r0, [r1, r4, lsl #0x2]
str r2, [r3, r6]
b _020B2D68
_020B2D10:
- ldr r1, _020B2D78 ; =UNK_021CDD70
+ ldr r1, _020B2D78 ; =stackPos_
mov r0, #0x18
ldr r2, [r1, #0x0]
- ldr ip, _020B2D80 ; =UNK_021CDD74
+ ldr ip, _020B2D80 ; =fxZStack_
mul r9, r2, r0
- ldr r1, _020B2D8C ; =UNK_021CDEF4
+ ldr r1, _020B2D8C ; =mtxStack_
mul r8, r4, r0
- ldr lr, _020B2D90 ; =UNK_021CE1F4
+ ldr lr, _020B2D90 ; =mtxStackFor2DHW_
add r6, r1, r9
ldr r5, [r12, r2, lsl #0x2]
add r7, r1, r8
@@ -532,54 +491,53 @@ _020B2D10:
stmia lr, {r0-r1}
str r5, [r12, r4, lsl #0x2]
_020B2D68:
- ldr r0, _020B2D78 ; =UNK_021CDD70
+ ldr r0, _020B2D78 ; =stackPos_
str r4, [r0, #0x0]
ldmia sp!, {r4-r10,pc}
.balign 4
-_020B2D74: .word UNK_021CDD6C
-_020B2D78: .word UNK_021CDD70
-_020B2D7C: .word UNK_021CDD68
-_020B2D80: .word UNK_021CDD74
-_020B2D84: .word UNK_021CDF04
-_020B2D88: .word UNK_021CDF08
-_020B2D8C: .word UNK_021CDEF4
-_020B2D90: .word UNK_021CE1F4
-_020B2D94: .word UNK_021CDDF4
-_020B2D98: .word UNK_021CDDF8
- arm_func_end FUN_020B2B58
+_020B2D74: .word pCurrentInstance_
+_020B2D78: .word stackPos_
+_020B2D7C: .word bDonotUseSRTransform
+_020B2D80: .word fxZStack_
+_020B2D84: .word mtxStack_ + 0x10
+_020B2D88: .word mtxStack_ + 0x14
+_020B2D8C: .word mtxStack_
+_020B2D90: .word mtxStackFor2DHW_
+_020B2D94: .word mtxStateStack_
+_020B2D98: .word mtxStateStack_ + 0x4
+ arm_func_end NNS_G2dPushMtx
- ; NNS_G2dDrawMultiCellAnimation
- arm_func_start FUN_020B2D9C
-FUN_020B2D9C: ; 0x020B2D9C
+ arm_func_start NNS_G2dDrawMultiCellAnimation
+NNS_G2dDrawMultiCellAnimation: ; 0x020B2D9C
stmdb sp!, {r4-r6,lr}
mov r4, r0
ldrh r0, [r4, #0x56]
cmp r0, #0x0
bne _020B2DBC
add r0, r4, #0x30
- bl FUN_020B2E78
+ bl NNS_G2dDrawMultiCell
ldmia sp!, {r4-r6,pc}
_020B2DBC:
- bl FUN_020B2B58
+ bl NNS_G2dPushMtx
ldrh r0, [r4, #0x56]
ands r0, r0, #0x8
beq _020B2E0C
- ldr r0, _020B2E70 ; =UNK_021CDD6C
+ ldr r0, _020B2E70 ; =pCurrentInstance_
ldrsh r6, [r4, #0x52]
ldr r0, [r0, #0x0]
ldrsh r5, [r4, #0x50]
- bl FUN_020B4F88
+ bl NNS_G2dIsRndCoreFlipH
cmp r0, #0x0
- ldr r0, _020B2E70 ; =UNK_021CDD6C
+ ldr r0, _020B2E70 ; =pCurrentInstance_
rsbne r5, r5, #0x0
ldr r0, [r0, #0x0]
- bl FUN_020B4F74
+ bl NNS_G2dIsRndCoreFlipV
cmp r0, #0x0
rsbne r6, r6, #0x0
mov r0, r5, lsl #0xc
mov r1, r6, lsl #0xc
mov r2, #0x0
- bl FUN_020B2A08
+ bl NNS_G2dTranslate
_020B2E0C:
ldrh r0, [r4, #0x56]
ands r0, r0, #0x4
@@ -593,7 +551,7 @@ _020B2E0C:
mov r1, r0, lsl #0x1
ldrsh r0, [r2, r3]
ldrsh r1, [r2, r1]
- bl FUN_020B2794
+ bl NNS_G2dRotZ
_020B2E40:
ldrh r0, [r4, #0x56]
ands r0, r0, #0x2
@@ -601,21 +559,20 @@ _020B2E40:
ldr r0, [r4, #0x48]
ldr r1, [r4, #0x4c]
mov r2, #0x1000
- bl FUN_020B28B4
+ bl NNS_G2dScale
_020B2E5C:
add r0, r4, #0x30
- bl FUN_020B2E78
+ bl NNS_G2dDrawMultiCell
mov r0, #0x1
- bl FUN_020B2B08
+ bl NNS_G2dPopMtx
ldmia sp!, {r4-r6,pc}
.balign 4
-_020B2E70: .word UNK_021CDD6C
+_020B2E70: .word pCurrentInstance_
_020B2E74: .word FX_SinCosTable_
- arm_func_end FUN_020B2D9C
+ arm_func_end NNS_G2dDrawMultiCellAnimation
- ; NNS_G2dDrawMultiCell
- arm_func_start FUN_020B2E78
-FUN_020B2E78: ; 0x020B2E78
+ arm_func_start NNS_G2dDrawMultiCell
+NNS_G2dDrawMultiCell: ; 0x020B2E78
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0xc
mov r5, r0
@@ -627,7 +584,7 @@ FUN_020B2E78: ; 0x020B2E78
ldrh r0, [r0, #0x2]
cmp r0, #0x0
bls _020B2ED0
- ldr r3, _020B3174 ; =UNK_021CE8F4
+ ldr r3, _020B3174 ; =mcRenderState_
mov r4, r2
_020B2EAC:
add r0, r3, r2, lsl #0x2
@@ -640,22 +597,22 @@ _020B2EAC:
cmp r2, r1
blo _020B2EAC
_020B2ED0:
- ldr r0, _020B3178 ; =UNK_021CDD6C
+ ldr r0, _020B3178 ; =pCurrentInstance_
mov r6, #0x1
ldr r1, [r0, #0x0]
- ldr r0, _020B3174 ; =UNK_021CE8F4
+ ldr r0, _020B3174 ; =mcRenderState_
str r6, [r0, #0x404]
ldr r0, [r1, #0x80]
cmp r0, #0x0
beq _020B2FD8
- bl FUN_020B4948
+ bl NNSi_G2dGetOamSoftEmuAutoZOffsetStep
str r0, [sp, #0x0]
mov r0, r6
- bl FUN_020B497C
- ldr r0, _020B3178 ; =UNK_021CDD6C
+ bl NNSi_G2dSetOamSoftEmuAutoZOffsetFlag
+ ldr r0, _020B3178 ; =pCurrentInstance_
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x80]
- bl FUN_020B4958
+ bl NNSi_G2dSetOamSoftEmuAutoZOffsetStep
ldr r2, [r5, #0x0]
mov r7, #0x0
ldrh r0, [r2, #0x0]
@@ -670,30 +627,30 @@ _020B2F28:
and r0, r0, #0xff00
mov r0, r0, lsl #0x8
mov r8, r0, lsr #0x10
- ldr r0, _020B3174 ; =UNK_021CE8F4
+ ldr r0, _020B3174 ; =mcRenderState_
strh r8, [r0, #0x0]
- bl FUN_020B2B58
- ldr r0, _020B3178 ; =UNK_021CDD6C
+ bl NNS_G2dPushMtx
+ ldr r0, _020B3178 ; =pCurrentInstance_
ldrsh r4, [r10, #0x4]
ldr r0, [r0, #0x0]
ldrsh r10, [r10, #0x2]
- bl FUN_020B4F88
+ bl NNS_G2dIsRndCoreFlipH
cmp r0, #0x0
- ldr r0, _020B3178 ; =UNK_021CDD6C
+ ldr r0, _020B3178 ; =pCurrentInstance_
rsbne r10, r10, #0x0
ldr r0, [r0, #0x0]
- bl FUN_020B4F74
+ bl NNS_G2dIsRndCoreFlipV
cmp r0, #0x0
rsbne r4, r4, #0x0
mov r2, r11
mov r0, r10, lsl #0xc
mov r1, r4, lsl #0xc
- bl FUN_020B2A08
+ bl NNS_G2dTranslate
mov r0, #0x58
mla r0, r8, r0, r9
- bl FUN_020B3554
+ bl DrawCellAnimationImpl_
mov r0, r6
- bl FUN_020B2B08
+ bl NNS_G2dPopMtx
ldr r2, [r5, #0x0]
add r0, r7, #0x1
mov r0, r0, lsl #0x10
@@ -703,10 +660,10 @@ _020B2F28:
blo _020B2F28
_020B2FC0:
mov r0, #0x0
- bl FUN_020B497C
+ bl NNSi_G2dSetOamSoftEmuAutoZOffsetFlag
ldr r0, [sp, #0x0]
- bl FUN_020B4958
- bl FUN_020B4968
+ bl NNSi_G2dSetOamSoftEmuAutoZOffsetStep
+ bl NNSi_G2dResetOamSoftEmuAutoZOffset
b _020B3088
_020B2FD8:
ldr r2, [r5, #0x0]
@@ -724,29 +681,29 @@ _020B2FF4:
and r0, r0, #0xff00
mov r0, r0, lsl #0x8
mov r8, r0, lsr #0x10
- ldr r0, _020B3174 ; =UNK_021CE8F4
+ ldr r0, _020B3174 ; =mcRenderState_
strh r8, [r0, #0x0]
- bl FUN_020B2B58
- ldr r0, _020B3178 ; =UNK_021CDD6C
+ bl NNS_G2dPushMtx
+ ldr r0, _020B3178 ; =pCurrentInstance_
ldrsh r4, [r10, #0x4]
ldr r0, [r0, #0x0]
ldrsh r10, [r10, #0x2]
- bl FUN_020B4F88
+ bl NNS_G2dIsRndCoreFlipH
cmp r0, #0x0
- ldr r0, _020B3178 ; =UNK_021CDD6C
+ ldr r0, _020B3178 ; =pCurrentInstance_
rsbne r10, r10, #0x0
ldr r0, [r0, #0x0]
- bl FUN_020B4F74
+ bl NNS_G2dIsRndCoreFlipV
cmp r0, #0x0
rsbne r4, r4, #0x0
ldr r2, [sp, #0x4]
mov r0, r10, lsl #0xc
mov r1, r4, lsl #0xc
- bl FUN_020B2A08
+ bl NNS_G2dTranslate
mla r0, r8, r11, r9
- bl FUN_020B3554
+ bl DrawCellAnimationImpl_
mov r0, r6
- bl FUN_020B2B08
+ bl NNS_G2dPopMtx
ldr r2, [r5, #0x0]
add r0, r7, #0x1
mov r0, r0, lsl #0x10
@@ -755,26 +712,26 @@ _020B2FF4:
cmp r7, r1
blo _020B2FF4
_020B3088:
- ldr r0, _020B3174 ; =UNK_021CE8F4
+ ldr r0, _020B3174 ; =mcRenderState_
mov r1, #0x0
str r1, [r0, #0x404]
add sp, sp, #0xc
ldmia sp!, {r4-r11,pc}
_020B309C:
- ldr r0, _020B3178 ; =UNK_021CDD6C
+ ldr r0, _020B3178 ; =pCurrentInstance_
ldr r7, [r5, #0xc]
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x80]
cmp r0, #0x0
beq _020B312C
- bl FUN_020B4948
+ bl NNSi_G2dGetOamSoftEmuAutoZOffsetStep
mov r6, r0
mov r0, #0x1
- bl FUN_020B497C
- ldr r0, _020B3178 ; =UNK_021CDD6C
+ bl NNSi_G2dSetOamSoftEmuAutoZOffsetFlag
+ ldr r0, _020B3178 ; =pCurrentInstance_
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x80]
- bl FUN_020B4958
+ bl NNSi_G2dSetOamSoftEmuAutoZOffsetStep
ldr r0, [r5, #0x0]
mov r4, #0x0
ldrh r0, [r0, #0x0]
@@ -783,7 +740,7 @@ _020B309C:
mov r8, #0x28
_020B30EC:
mla r0, r4, r8, r7
- bl FUN_020B3474
+ bl DrawNode_
ldr r1, [r5, #0x0]
add r0, r4, #0x1
mov r0, r0, lsl #0x10
@@ -793,10 +750,10 @@ _020B30EC:
blo _020B30EC
_020B3110:
mov r0, #0x0
- bl FUN_020B497C
+ bl NNSi_G2dSetOamSoftEmuAutoZOffsetFlag
mov r0, r6
- bl FUN_020B4958
- bl FUN_020B4968
+ bl NNSi_G2dSetOamSoftEmuAutoZOffsetStep
+ bl NNSi_G2dResetOamSoftEmuAutoZOffset
add sp, sp, #0xc
ldmia sp!, {r4-r11,pc}
_020B312C:
@@ -809,7 +766,7 @@ _020B312C:
mov r6, #0x28
_020B3148:
mla r0, r4, r6, r7
- bl FUN_020B3474
+ bl DrawNode_
ldr r1, [r5, #0x0]
add r0, r4, #0x1
mov r0, r0, lsl #0x10
@@ -820,102 +777,99 @@ _020B3148:
add sp, sp, #0xc
ldmia sp!, {r4-r11,pc}
.balign 4
-_020B3174: .word UNK_021CE8F4
-_020B3178: .word UNK_021CDD6C
- arm_func_end FUN_020B2E78
+_020B3174: .word mcRenderState_
+_020B3178: .word pCurrentInstance_
+ arm_func_end NNS_G2dDrawMultiCell
- ; NNS_G2dDrawCellAnimation
- arm_func_start FUN_020B317C
-FUN_020B317C: ; 0x020B317C
+ arm_func_start NNS_G2dDrawCellAnimation
+NNS_G2dDrawCellAnimation: ; 0x020B317C
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
- ldr r1, _020B31EC ; =UNK_021CDD6C
+ ldr r1, _020B31EC ; =pCurrentInstance_
mov r5, r0
ldr r1, [r1, #0x0]
ldr r1, [r1, #0x80]
cmp r1, #0x0
beq _020B31E0
- bl FUN_020B4948
+ bl NNSi_G2dGetOamSoftEmuAutoZOffsetStep
mov r4, r0
mov r0, #0x1
- bl FUN_020B497C
- ldr r0, _020B31EC ; =UNK_021CDD6C
+ bl NNSi_G2dSetOamSoftEmuAutoZOffsetFlag
+ ldr r0, _020B31EC ; =pCurrentInstance_
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x80]
- bl FUN_020B4958
+ bl NNSi_G2dSetOamSoftEmuAutoZOffsetStep
mov r0, r5
- bl FUN_020B3554
+ bl DrawCellAnimationImpl_
mov r0, #0x0
- bl FUN_020B497C
+ bl NNSi_G2dSetOamSoftEmuAutoZOffsetFlag
mov r0, r4
- bl FUN_020B4958
- bl FUN_020B4968
+ bl NNSi_G2dSetOamSoftEmuAutoZOffsetStep
+ bl NNSi_G2dResetOamSoftEmuAutoZOffset
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
_020B31E0:
- bl FUN_020B3554
+ bl DrawCellAnimationImpl_
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
.balign 4
-_020B31EC: .word UNK_021CDD6C
- arm_func_end FUN_020B317C
+_020B31EC: .word pCurrentInstance_
+ arm_func_end NNS_G2dDrawCellAnimation
- ; NNS_G2dEndRendering
- arm_func_start FUN_020B31F0
-FUN_020B31F0: ; 0x020B31F0
+ arm_func_start NNS_G2dEndRendering
+NNS_G2dEndRendering: ; 0x020B31F0
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr r1, _020B3260 ; =0x04000448
mov r2, #0x1
- ldr r0, _020B3264 ; =UNK_021CDD6C
+ ldr r0, _020B3264 ; =pCurrentInstance_
str r2, [r1, #0x0]
ldr r2, [r0, #0x0]
ldr r3, [r2, #0x7c]
cmp r3, #0x0
beq _020B324C
ands r0, r3, #0x1
- ldrne r0, _020B3268 ; =UNK_021CDD68
+ ldrne r0, _020B3268 ; =bDonotUseSRTransform
movne r1, #0x0
strne r1, [r0, #0x0]
ands r0, r3, #0x2
beq _020B323C
mov r0, #0x0
str r0, [r2, #0x74]
- bl FUN_020B4DA0
+ bl NNS_G2dRndCoreEndRendering
_020B323C:
- ldr r0, _020B3264 ; =UNK_021CDD6C
+ ldr r0, _020B3264 ; =pCurrentInstance_
mov r1, #0x0
ldr r0, [r0, #0x0]
str r1, [r0, #0x7c]
_020B324C:
- ldr r0, _020B3264 ; =UNK_021CDD6C
+ ldr r0, _020B3264 ; =pCurrentInstance_
mov r1, #0x0
str r1, [r0, #0x0]
add sp, sp, #0x4
ldmia sp!, {pc}
.balign 4
_020B3260: .word 0x04000448
-_020B3264: .word UNK_021CDD6C
-_020B3268: .word UNK_021CDD68
- arm_func_end FUN_020B31F0
+_020B3264: .word pCurrentInstance_
+_020B3268: .word bDonotUseSRTransform
+ arm_func_end NNS_G2dEndRendering
- ; NNS_G2dBeginRendering
- arm_func_start FUN_020B326C
-FUN_020B326C: ; 0x020B326C
+ arm_func_start NNS_G2dBeginRendering
+NNS_G2dBeginRendering: ; 0x020B326C
stmdb sp!, {r4-r8,lr}
- ldr r5, _020B330C ; =UNK_021CDD60
- ldr r3, _020B3310 ; =UNK_021CDD6C
+ ldr r5, _020B330C ; =currentMtxCachePos_
+ ldr r3, _020B3310 ; =pCurrentInstance_
ldrh r6, [r5, #0x0]
- ldr r2, _020B3314 ; =UNK_021CDD70
+ ldr r2, _020B3314 ; =stackPos_
mov r4, #0x0
ldr r7, _020B3318 ; =0x0000FFFE
- ldr r1, _020B331C ; =UNK_02106570
+ ldr r1, _020B331C ; =firstSRTransformedMtxIdx_
str r0, [r3, #0x0]
str r4, [r2, #0x0]
strh r7, [r1, #0x0]
cmp r6, #0x0
ble _020B32D0
- ldr r8, _020B3320 ; =UNK_021CE4F4
+ ldr r8, _020B3320 ; =mtxCacheBuffer_
mvn r7, #0x0
mov r6, #0x10
_020B32AC:
@@ -929,10 +883,10 @@ _020B32AC:
cmp r4, r0
blt _020B32AC
_020B32D0:
- ldr r4, _020B330C ; =UNK_021CDD60
+ ldr r4, _020B330C ; =currentMtxCachePos_
mov r0, #0x0
- ldr r3, _020B3324 ; =UNK_021CDD64
- ldr r1, _020B3328 ; =UNK_021CDDF4
+ ldr r3, _020B3324 ; =groupID_
+ ldr r1, _020B3328 ; =mtxStateStack_
mov r2, #0x100
strh r0, [r4, #0x0]
strh r0, [r3, #0x0]
@@ -942,24 +896,23 @@ _020B32D0:
ldr r0, _020B3330 ; =0x04000454
str r2, [r1, #0x0]
str r2, [r0, #0x0]
- bl FUN_020B4178
+ bl NNSi_G2dIdentity
ldmia sp!, {r4-r8,pc}
.balign 4
-_020B330C: .word UNK_021CDD60
-_020B3310: .word UNK_021CDD6C
-_020B3314: .word UNK_021CDD70
+_020B330C: .word currentMtxCachePos_
+_020B3310: .word pCurrentInstance_
+_020B3314: .word stackPos_
_020B3318: .word 0x0000FFFE
-_020B331C: .word UNK_02106570
-_020B3320: .word UNK_021CE4F4
-_020B3324: .word UNK_021CDD64
-_020B3328: .word UNK_021CDDF4
+_020B331C: .word firstSRTransformedMtxIdx_
+_020B3320: .word mtxCacheBuffer_
+_020B3324: .word groupID_
+_020B3328: .word mtxStateStack_
_020B332C: .word 0x04000444
_020B3330: .word 0x04000454
- arm_func_end FUN_020B326C
+ arm_func_end NNS_G2dBeginRendering
- ; NNS_G2dInitRenderSurface
- arm_func_start FUN_020B3334
-FUN_020B3334: ; 0x020B3334
+ arm_func_start NNS_G2dInitRenderSurface
+NNS_G2dInitRenderSurface: ; 0x020B3334
stmdb sp!, {r4,lr}
mov r4, r0
mov r1, r4
@@ -969,39 +922,37 @@ FUN_020B3334: ; 0x020B3334
mov r0, #0x1
str r0, [r4, #0x10]
mov r0, #0x3
- ldr r1, _020B3380 ; =FUN_020B3EE0
+ ldr r1, _020B3380 ; =RndCoreCBFuncBeforeCell_
str r0, [r4, #0x14]
- ldr r0, _020B3384 ; =FUN_020B3E48
+ ldr r0, _020B3384 ; =RndCoreCBFuncAfterCell_
str r1, [r4, #0x18]
- ldr r1, _020B3388 ; =FUN_020B3C40
+ ldr r1, _020B3388 ; =RndCoreCBFuncBeforeOBJ_
str r0, [r4, #0x1c]
- ldr r0, _020B338C ; =FUN_020B3B90
+ ldr r0, _020B338C ; =RndCoreCBFuncAfterOBJ_
str r1, [r4, #0x20]
str r0, [r4, #0x24]
ldmia sp!, {r4,pc}
.balign 4
-_020B3380: .word FUN_020B3EE0
-_020B3384: .word FUN_020B3E48
-_020B3388: .word FUN_020B3C40
-_020B338C: .word FUN_020B3B90
- arm_func_end FUN_020B3334
+_020B3380: .word RndCoreCBFuncBeforeCell_
+_020B3384: .word RndCoreCBFuncAfterCell_
+_020B3388: .word RndCoreCBFuncBeforeOBJ_
+_020B338C: .word RndCoreCBFuncAfterOBJ_
+ arm_func_end NNS_G2dInitRenderSurface
- ; _end
- arm_func_start FUN_020B3390
-FUN_020B3390: ; 0x020B3390
+ arm_func_start NNS_G2dAddRendererTargetSurface
+NNS_G2dAddRendererTargetSurface: ; 0x020B3390
ldr r2, [r0, #0x70]
str r2, [r1, #0x30]
str r1, [r0, #0x70]
bx lr
- arm_func_end FUN_020B3390
+ arm_func_end NNS_G2dAddRendererTargetSurface
- ; NNS_G2dInitRenderer
- arm_func_start FUN_020B33A0
-FUN_020B33A0: ; 0x020B33A0
+ arm_func_start NNS_G2dInitRenderer
+NNS_G2dInitRenderer: ; 0x020B33A0
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r4, r0
- bl FUN_020B504C
+ bl NNS_G2dInitRndCore
mov r7, #0x0
str r7, [r4, #0x70]
str r7, [r4, #0x74]
@@ -1013,11 +964,11 @@ FUN_020B33A0: ; 0x020B33A0
strh r7, [r4, #0x8a]
str r7, [r4, #0x8c]
str r7, [r4, #0x90]
- ldr r1, _020B3454 ; =UNK_021CDD70
+ ldr r1, _020B3454 ; =stackPos_
strh r7, [r4, #0x94]
ldr r2, _020B3458 ; =0x0000FFFE
- ldr r0, _020B345C ; =UNK_02106570
- ldr r6, _020B3460 ; =UNK_021CE4F4
+ ldr r0, _020B345C ; =firstSRTransformedMtxIdx_
+ ldr r6, _020B3460 ; =mtxCacheBuffer_
str r7, [r1, #0x0]
strh r2, [r0, #0x0]
mvn r5, #0x0
@@ -1031,33 +982,32 @@ _020B3400:
cmp r7, #0x20
add r6, r6, #0x20
blt _020B3400
- ldr ip, _020B3464 ; =UNK_021CDD60
+ ldr ip, _020B3464 ; =currentMtxCachePos_
mov r0, #0x0
- ldr r3, _020B3468 ; =UNK_021CDD64
- ldr r1, _020B346C ; =UNK_021CDDF4
+ ldr r3, _020B3468 ; =groupID_
+ ldr r1, _020B346C ; =mtxStateStack_
mov r2, #0x100
strh r0, [r12, #0x0]
strh r0, [r3, #0x0]
bl MIi_CpuClearFast
- ldr r0, _020B3470 ; =UNK_021CDD68
+ ldr r0, _020B3470 ; =bDonotUseSRTransform
mov r1, #0x0
str r1, [r0, #0x0]
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
.balign 4
-_020B3454: .word UNK_021CDD70
+_020B3454: .word stackPos_
_020B3458: .word 0x0000FFFE
-_020B345C: .word UNK_02106570
-_020B3460: .word UNK_021CE4F4
-_020B3464: .word UNK_021CDD60
-_020B3468: .word UNK_021CDD64
-_020B346C: .word UNK_021CDDF4
-_020B3470: .word UNK_021CDD68
- arm_func_end FUN_020B33A0
+_020B345C: .word firstSRTransformedMtxIdx_
+_020B3460: .word mtxCacheBuffer_
+_020B3464: .word currentMtxCachePos_
+_020B3468: .word groupID_
+_020B346C: .word mtxStateStack_
+_020B3470: .word bDonotUseSRTransform
+ arm_func_end NNS_G2dInitRenderer
- ; DrawNode_
- arm_func_start FUN_020B3474
-FUN_020B3474: ; 0x020B3474
+ arm_func_start DrawNode_
+DrawNode_: ; 0x020B3474
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r5, r0
@@ -1066,26 +1016,26 @@ FUN_020B3474: ; 0x020B3474
addeq sp, sp, #0x4
ldmeqia sp!, {r4-r7,pc}
ldr r4, [r5, #0x0]
- bl FUN_020B2B58
+ bl NNS_G2dPushMtx
ldrh r0, [r5, #0x1e]
ands r0, r0, #0x8
beq _020B34E4
- ldr r0, _020B354C ; =UNK_021CDD6C
+ ldr r0, _020B354C ; =pCurrentInstance_
ldrsh r7, [r5, #0x1a]
ldr r0, [r0, #0x0]
ldrsh r6, [r5, #0x18]
- bl FUN_020B4F88
+ bl NNS_G2dIsRndCoreFlipH
cmp r0, #0x0
- ldr r0, _020B354C ; =UNK_021CDD6C
+ ldr r0, _020B354C ; =pCurrentInstance_
rsbne r6, r6, #0x0
ldr r0, [r0, #0x0]
- bl FUN_020B4F74
+ bl NNS_G2dIsRndCoreFlipV
cmp r0, #0x0
rsbne r7, r7, #0x0
mov r0, r6, lsl #0xc
mov r1, r7, lsl #0xc
mov r2, #0x0
- bl FUN_020B2A08
+ bl NNS_G2dTranslate
_020B34E4:
ldrh r0, [r5, #0x1e]
ands r0, r0, #0x4
@@ -1099,7 +1049,7 @@ _020B34E4:
mov r1, r0, lsl #0x1
ldrsh r0, [r2, r3]
ldrsh r1, [r2, r1]
- bl FUN_020B2794
+ bl NNS_G2dRotZ
_020B3518:
ldrh r0, [r5, #0x1e]
ands r0, r0, #0x2
@@ -1107,22 +1057,21 @@ _020B3518:
ldr r0, [r5, #0x10]
ldr r1, [r5, #0x14]
mov r2, #0x1000
- bl FUN_020B28B4
+ bl NNS_G2dScale
_020B3534:
mov r0, r4
- bl FUN_020B3554
+ bl DrawCellAnimationImpl_
mov r0, #0x1
- bl FUN_020B2B08
+ bl NNS_G2dPopMtx
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
.balign 4
-_020B354C: .word UNK_021CDD6C
+_020B354C: .word pCurrentInstance_
_020B3550: .word FX_SinCosTable_
- arm_func_end FUN_020B3474
+ arm_func_end DrawNode_
- ; DrawCellAnimationImpl_
- arm_func_start FUN_020B3554
-FUN_020B3554: ; 0x020B3554
+ arm_func_start DrawCellAnimationImpl_
+DrawCellAnimationImpl_: ; 0x020B3554
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r5, r0
@@ -1137,41 +1086,41 @@ FUN_020B3554: ; 0x020B3554
moveq r0, #0x0
cmp r0, #0x0
beq _020B35B0
- ldr r1, _020B36B4 ; =UNK_02106574
+ ldr r1, _020B36B4 ; =currenVramTransferHandle_
mov r0, r4
str r2, [r1, #0x0]
- bl FUN_020B36C0
- ldr r0, _020B36B4 ; =UNK_02106574
+ bl DrawCellImpl_
+ ldr r0, _020B36B4 ; =currenVramTransferHandle_
mvn r1, #0x0
str r1, [r0, #0x0]
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
_020B35B0:
mov r0, r4
- bl FUN_020B36C0
+ bl DrawCellImpl_
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
_020B35C0:
- bl FUN_020B2B58
+ bl NNS_G2dPushMtx
ldrh r0, [r5, #0x4a]
ands r0, r0, #0x8
beq _020B3610
- ldr r0, _020B36B8 ; =UNK_021CDD6C
+ ldr r0, _020B36B8 ; =pCurrentInstance_
ldrsh r7, [r5, #0x46]
ldr r0, [r0, #0x0]
ldrsh r6, [r5, #0x44]
- bl FUN_020B4F88
+ bl NNS_G2dIsRndCoreFlipH
cmp r0, #0x0
- ldr r0, _020B36B8 ; =UNK_021CDD6C
+ ldr r0, _020B36B8 ; =pCurrentInstance_
rsbne r6, r6, #0x0
ldr r0, [r0, #0x0]
- bl FUN_020B4F74
+ bl NNS_G2dIsRndCoreFlipV
cmp r0, #0x0
rsbne r7, r7, #0x0
mov r0, r6, lsl #0xc
mov r1, r7, lsl #0xc
mov r2, #0x0
- bl FUN_020B2A08
+ bl NNS_G2dTranslate
_020B3610:
ldrh r0, [r5, #0x4a]
ands r0, r0, #0x4
@@ -1185,7 +1134,7 @@ _020B3610:
mov r1, r0, lsl #0x1
ldrsh r0, [r2, r3]
ldrsh r1, [r2, r1]
- bl FUN_020B2794
+ bl NNS_G2dRotZ
_020B3644:
ldrh r0, [r5, #0x4a]
ands r0, r0, #0x2
@@ -1193,7 +1142,7 @@ _020B3644:
ldr r0, [r5, #0x3c]
ldr r1, [r5, #0x40]
mov r2, #0x1000
- bl FUN_020B28B4
+ bl NNS_G2dScale
_020B3660:
ldr r2, [r5, #0x34]
mvn r0, #0x0
@@ -1202,34 +1151,33 @@ _020B3660:
moveq r0, #0x0
cmp r0, #0x0
beq _020B369C
- ldr r1, _020B36B4 ; =UNK_02106574
+ ldr r1, _020B36B4 ; =currenVramTransferHandle_
mov r0, r4
str r2, [r1, #0x0]
- bl FUN_020B36C0
- ldr r0, _020B36B4 ; =UNK_02106574
+ bl DrawCellImpl_
+ ldr r0, _020B36B4 ; =currenVramTransferHandle_
mvn r1, #0x0
str r1, [r0, #0x0]
b _020B36A4
_020B369C:
mov r0, r4
- bl FUN_020B36C0
+ bl DrawCellImpl_
_020B36A4:
mov r0, #0x1
- bl FUN_020B2B08
+ bl NNS_G2dPopMtx
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
.balign 4
-_020B36B4: .word UNK_02106574
-_020B36B8: .word UNK_021CDD6C
+_020B36B4: .word currenVramTransferHandle_
+_020B36B8: .word pCurrentInstance_
_020B36BC: .word FX_SinCosTable_
- arm_func_end FUN_020B3554
+ arm_func_end DrawCellAnimationImpl_
- ; DrawCellImpl_
- arm_func_start FUN_020B36C0
-FUN_020B36C0: ; 0x020B36C0
+ arm_func_start DrawCellImpl_
+DrawCellImpl_: ; 0x020B36C0
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x4
- ldr r5, _020B3B54 ; =UNK_021CDD6C
+ ldr r5, _020B3B54 ; =pCurrentInstance_
mov r10, r0
ldr r0, [r5, #0x0]
ldr r1, [r0, #0x7c]
@@ -1240,12 +1188,12 @@ FUN_020B36C0: ; 0x020B36C0
ldr r0, [r9, #0x14]
cmp r0, #0x0
beq _020B3840
- ldr r0, _020B3B58 ; =UNK_021CDD68
+ ldr r0, _020B3B58 ; =bDonotUseSRTransform
mov r1, #0x0
ldr r0, [r0, #0x0]
cmp r0, #0x0
bne _020B3720
- ldr r2, _020B3B5C ; =UNK_02106570
+ ldr r2, _020B3B5C ; =firstSRTransformedMtxIdx_
ldr r0, _020B3B60 ; =0x0000FFFE
ldrh r2, [r2, #0x0]
cmp r2, r0
@@ -1256,63 +1204,63 @@ _020B3720:
_020B3724:
cmp r0, #0x0
beq _020B37AC
- ldr r0, _020B3B64 ; =UNK_021CE8F4
+ ldr r0, _020B3B64 ; =mcRenderState_
ldr r1, [r0, #0x404]
cmp r1, #0x0
beq _020B3788
ldrh r1, [r0, #0x0]
- ldr r0, _020B3B68 ; =UNK_021CE8F8
+ ldr r0, _020B3B68 ; =mcRenderState_ + 0x4
ldr r1, [r0, r1, lsl #0x2]
cmp r1, #0x0
bne _020B37AC
- bl FUN_020B4010
- ldr r0, _020B3B6C ; =UNK_021CDD70
- ldr r2, _020B3B70 ; =UNK_021CDDF4
+ bl NNSi_G2dMCMStoreCurrentMtxToMtxCache
+ ldr r0, _020B3B6C ; =stackPos_
+ ldr r2, _020B3B70 ; =mtxStateStack_
ldr r0, [r0, #0x0]
- ldr r1, _020B3B64 ; =UNK_021CE8F4
+ ldr r1, _020B3B64 ; =mcRenderState_
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0xd
ldrh r3, [r2, r0]
- ldr r4, _020B3B74 ; =UNK_021CE4F4
+ ldr r4, _020B3B74 ; =mtxCacheBuffer_
ldrh r2, [r1, #0x0]
- ldr r0, _020B3B68 ; =UNK_021CE8F8
+ ldr r0, _020B3B68 ; =mcRenderState_ + 0x4
add r1, r4, r3, lsl #0x5
str r1, [r0, r2, lsl #0x2]
b _020B37AC
_020B3788:
- bl FUN_020B4010
- ldr r0, _020B3B6C ; =UNK_021CDD70
- ldr r1, _020B3B70 ; =UNK_021CDDF4
+ bl NNSi_G2dMCMStoreCurrentMtxToMtxCache
+ ldr r0, _020B3B6C ; =stackPos_
+ ldr r1, _020B3B70 ; =mtxStateStack_
ldr r0, [r0, #0x0]
- ldr r2, _020B3B74 ; =UNK_021CE4F4
+ ldr r2, _020B3B74 ; =mtxCacheBuffer_
mov r0, r0, lsl #0x10
mov r0, r0, lsr #0xd
ldrh r0, [r1, r0]
add r1, r2, r0, lsl #0x5
_020B37AC:
- ldr r0, _020B3B58 ; =UNK_021CDD68
+ ldr r0, _020B3B58 ; =bDonotUseSRTransform
ldr r0, [r0, #0x0]
cmp r0, #0x0
- ldreq r0, _020B3B6C ; =UNK_021CDD70
- ldreq r3, _020B3B78 ; =UNK_021CDEF4
+ ldreq r0, _020B3B6C ; =stackPos_
+ ldreq r3, _020B3B78 ; =mtxStack_
ldreq r2, [r0, #0x0]
moveq r0, #0x18
mlaeq r0, r2, r0, r3
beq _020B37FC
- ldr r2, _020B3B6C ; =UNK_021CDD70
+ ldr r2, _020B3B6C ; =stackPos_
mov r0, #0x18
ldr r2, [r2, #0x0]
- ldr r3, _020B3B7C ; =UNK_021CDF04
+ ldr r3, _020B3B7C ; =mtxStack_ + 0x10
mul r4, r2, r0
- ldr r2, _020B3B80 ; =UNK_021CDF08
+ ldr r2, _020B3B80 ; =mtxStack_ + 0x14
ldr r3, [r3, r4]
- ldr r0, _020B3B84 ; =UNK_02106578
+ ldr r0, _020B3B84 ; =mtxI_
ldr r2, [r2, r4]
str r3, [r0, #0x10]
str r2, [r0, #0x14]
_020B37FC:
- bl FUN_020B4FAC
- ldr r1, _020B3B88 ; =UNK_02106574
+ bl NNS_G2dSetRndCoreCurrentMtx2D
+ ldr r1, _020B3B88 ; =currenVramTransferHandle_
mvn r0, #0x0
ldr r1, [r1, #0x0]
cmp r1, r0
@@ -1321,44 +1269,44 @@ _020B37FC:
cmp r0, #0x0
beq _020B3830
mov r0, r10
- bl FUN_020B4BF4
+ bl NNS_G2dRndCoreDrawCellVramTransfer
add sp, sp, #0x4
ldmia sp!, {r4-r11,pc}
_020B3830:
mov r0, r10
- bl FUN_020B4CDC
+ bl NNS_G2dRndCoreDrawCell
add sp, sp, #0x4
ldmia sp!, {r4-r11,pc}
_020B3840:
- ldr r0, _020B3B6C ; =UNK_021CDD70
- ldr r1, _020B3B8C ; =UNK_021CDD74
+ ldr r0, _020B3B6C ; =stackPos_
+ ldr r1, _020B3B8C ; =fxZStack_
ldr r2, [r0, #0x0]
ldr r0, [sp, #0x0]
ldr r1, [r1, r2, lsl #0x2]
- bl FUN_020B4FA4
- ldr r0, _020B3B58 ; =UNK_021CDD68
+ bl NNS_G2dSetRndCore3DSoftSpriteZvalue
+ ldr r0, _020B3B58 ; =bDonotUseSRTransform
ldr r0, [r0, #0x0]
cmp r0, #0x0
- ldreq r0, _020B3B6C ; =UNK_021CDD70
- ldreq r2, _020B3B78 ; =UNK_021CDEF4
+ ldreq r0, _020B3B6C ; =stackPos_
+ ldreq r2, _020B3B78 ; =mtxStack_
ldreq r1, [r0, #0x0]
moveq r0, #0x18
mlaeq r0, r1, r0, r2
beq _020B38A8
- ldr r1, _020B3B6C ; =UNK_021CDD70
+ ldr r1, _020B3B6C ; =stackPos_
mov r0, #0x18
ldr r1, [r1, #0x0]
- ldr r2, _020B3B7C ; =UNK_021CDF04
+ ldr r2, _020B3B7C ; =mtxStack_ + 0x10
mul r3, r1, r0
- ldr r1, _020B3B80 ; =UNK_021CDF08
+ ldr r1, _020B3B80 ; =mtxStack_ + 0x14
ldr r2, [r2, r3]
- ldr r0, _020B3B84 ; =UNK_02106578
+ ldr r0, _020B3B84 ; =mtxI_
ldr r1, [r1, r3]
str r2, [r0, #0x10]
str r1, [r0, #0x14]
_020B38A8:
- bl FUN_020B4FC4
- ldr r1, _020B3B88 ; =UNK_02106574
+ bl NNS_G2dSetRndCoreCurrentMtx3D
+ ldr r1, _020B3B88 ; =currenVramTransferHandle_
mvn r0, #0x0
ldr r1, [r1, #0x0]
cmp r1, r0
@@ -1367,20 +1315,20 @@ _020B38A8:
cmp r0, #0x0
beq _020B38DC
mov r0, r10
- bl FUN_020B4BF4
+ bl NNS_G2dRndCoreDrawCellVramTransfer
add sp, sp, #0x4
ldmia sp!, {r4-r11,pc}
_020B38DC:
mov r0, r10
- bl FUN_020B4CDC
+ bl NNS_G2dRndCoreDrawCell
add sp, sp, #0x4
ldmia sp!, {r4-r11,pc}
_020B38EC:
cmp r9, #0x0
addeq sp, sp, #0x4
ldmeqia sp!, {r4-r11,pc}
- ldr r4, _020B3B6C ; =UNK_021CDD70
- ldr fp, _020B3B78 ; =UNK_021CDEF4
+ ldr r4, _020B3B6C ; =stackPos_
+ ldr fp, _020B3B78 ; =mtxStack_
mov r7, #0x0
mov r6, #0x1
_020B3908:
@@ -1394,19 +1342,19 @@ _020B3908:
mov r1, r9
str r9, [r8, #0x74]
mov r0, r8
- bl FUN_020B4F9C
+ bl NNS_G2dSetRndCoreSurface
ldr r1, [r9, #0x28]
ldr r2, [r9, #0x2c]
mov r0, r8
- bl FUN_020B5034
+ bl NNS_G2dSetRndCoreOamRegisterFunc
mov r0, r8
- bl FUN_020B4E0C
- ldr r0, _020B3B58 ; =UNK_021CDD68
+ bl NNS_G2dRndCoreBeginRendering
+ ldr r0, _020B3B58 ; =bDonotUseSRTransform
mov r1, r7
ldr r0, [r0, #0x0]
cmp r0, #0x0
bne _020B3978
- ldr r0, _020B3B5C ; =UNK_02106570
+ ldr r0, _020B3B5C ; =firstSRTransformedMtxIdx_
ldrh r2, [r0, #0x0]
ldr r0, _020B3B60 ; =0x0000FFFE
cmp r2, r0
@@ -1417,41 +1365,41 @@ _020B3978:
_020B397C:
cmp r0, #0x0
beq _020B3A04
- ldr r0, _020B3B64 ; =UNK_021CE8F4
+ ldr r0, _020B3B64 ; =mcRenderState_
ldr r0, [r0, #0x404]
cmp r0, #0x0
beq _020B39E4
- ldr r0, _020B3B64 ; =UNK_021CE8F4
+ ldr r0, _020B3B64 ; =mcRenderState_
ldrh r1, [r0, #0x0]
add r0, r0, r1, lsl #0x2
ldr r1, [r0, #0x4]
cmp r1, #0x0
bne _020B3A04
- bl FUN_020B4010
- ldr r0, _020B3B64 ; =UNK_021CE8F4
+ bl NNSi_G2dMCMStoreCurrentMtxToMtxCache
+ ldr r0, _020B3B64 ; =mcRenderState_
ldr r2, [r4, #0x0]
ldrh r1, [r0, #0x0]
mov r0, r2, lsl #0x10
mov r2, r0, lsr #0xd
- ldr r0, _020B3B70 ; =UNK_021CDDF4
+ ldr r0, _020B3B70 ; =mtxStateStack_
ldrh r3, [r0, r2]
- ldr r0, _020B3B64 ; =UNK_021CE8F4
+ ldr r0, _020B3B64 ; =mcRenderState_
add r2, r0, r1, lsl #0x2
- ldr r0, _020B3B74 ; =UNK_021CE4F4
+ ldr r0, _020B3B74 ; =mtxCacheBuffer_
add r1, r0, r3, lsl #0x5
str r1, [r2, #0x4]
b _020B3A04
_020B39E4:
- bl FUN_020B4010
+ bl NNSi_G2dMCMStoreCurrentMtxToMtxCache
ldr r0, [r4, #0x0]
mov r0, r0, lsl #0x10
mov r1, r0, lsr #0xd
- ldr r0, _020B3B70 ; =UNK_021CDDF4
+ ldr r0, _020B3B70 ; =mtxStateStack_
ldrh r1, [r0, r1]
- ldr r0, _020B3B74 ; =UNK_021CE4F4
+ ldr r0, _020B3B74 ; =mtxCacheBuffer_
add r1, r0, r1, lsl #0x5
_020B3A04:
- ldr r0, _020B3B58 ; =UNK_021CDD68
+ ldr r0, _020B3B58 ; =bDonotUseSRTransform
ldr r0, [r0, #0x0]
cmp r0, #0x0
ldreq r2, [r4, #0x0]
@@ -1461,15 +1409,15 @@ _020B3A04:
ldr r2, [r4, #0x0]
mov r0, #0x18
mla r8, r2, r0, r11
- ldr r0, _020B3B84 ; =UNK_02106578
+ ldr r0, _020B3B84 ; =mtxI_
ldr r3, [r8, #0x10]
mov r2, r0
str r3, [r2, #0x10]
ldr r3, [r8, #0x14]
str r3, [r2, #0x14]
_020B3A44:
- bl FUN_020B4FAC
- ldr r0, _020B3B88 ; =UNK_02106574
+ bl NNS_G2dSetRndCoreCurrentMtx2D
+ ldr r0, _020B3B88 ; =currenVramTransferHandle_
ldr r1, [r0, #0x0]
mvn r0, #0x0
cmp r1, r0
@@ -1478,30 +1426,30 @@ _020B3A44:
cmp r0, #0x0
beq _020B3A74
mov r0, r10
- bl FUN_020B4BF4
+ bl NNS_G2dRndCoreDrawCellVramTransfer
b _020B3A7C
_020B3A74:
mov r0, r10
- bl FUN_020B4CDC
+ bl NNS_G2dRndCoreDrawCell
_020B3A7C:
ldr r0, [r5, #0x0]
str r7, [r0, #0x74]
- bl FUN_020B4DA0
+ bl NNS_G2dRndCoreEndRendering
b _020B3B40
_020B3A8C:
ldr r8, [r5, #0x0]
mov r1, r9
mov r0, r8
str r9, [r8, #0x74]
- bl FUN_020B4F9C
+ bl NNS_G2dSetRndCoreSurface
mov r0, r8
- bl FUN_020B4E0C
+ bl NNS_G2dRndCoreBeginRendering
ldr r2, [r4, #0x0]
- ldr r1, _020B3B8C ; =UNK_021CDD74
+ ldr r1, _020B3B8C ; =fxZStack_
ldr r0, [sp, #0x0]
ldr r1, [r1, r2, lsl #0x2]
- bl FUN_020B4FA4
- ldr r0, _020B3B58 ; =UNK_021CDD68
+ bl NNS_G2dSetRndCore3DSoftSpriteZvalue
+ ldr r0, _020B3B58 ; =bDonotUseSRTransform
ldr r0, [r0, #0x0]
cmp r0, #0x0
ldreq r1, [r4, #0x0]
@@ -1511,15 +1459,15 @@ _020B3A8C:
ldr r1, [r4, #0x0]
mov r0, #0x18
mla r3, r1, r0, r11
- ldr r0, _020B3B84 ; =UNK_02106578
+ ldr r0, _020B3B84 ; =mtxI_
ldr r2, [r3, #0x10]
mov r1, r0
str r2, [r1, #0x10]
ldr r2, [r3, #0x14]
str r2, [r1, #0x14]
_020B3AFC:
- bl FUN_020B4FC4
- ldr r0, _020B3B88 ; =UNK_02106574
+ bl NNS_G2dSetRndCoreCurrentMtx3D
+ ldr r0, _020B3B88 ; =currenVramTransferHandle_
ldr r1, [r0, #0x0]
mvn r0, #0x0
cmp r1, r0
@@ -1528,15 +1476,15 @@ _020B3AFC:
cmp r0, #0x0
beq _020B3B2C
mov r0, r10
- bl FUN_020B4BF4
+ bl NNS_G2dRndCoreDrawCellVramTransfer
b _020B3B34
_020B3B2C:
mov r0, r10
- bl FUN_020B4CDC
+ bl NNS_G2dRndCoreDrawCell
_020B3B34:
ldr r0, [r5, #0x0]
str r7, [r0, #0x74]
- bl FUN_020B4DA0
+ bl NNS_G2dRndCoreEndRendering
_020B3B40:
ldr r9, [r9, #0x30]
cmp r9, #0x0
@@ -1544,29 +1492,28 @@ _020B3B40:
add sp, sp, #0x4
ldmia sp!, {r4-r11,pc}
.balign 4
-_020B3B54: .word UNK_021CDD6C
-_020B3B58: .word UNK_021CDD68
-_020B3B5C: .word UNK_02106570
+_020B3B54: .word pCurrentInstance_
+_020B3B58: .word bDonotUseSRTransform
+_020B3B5C: .word firstSRTransformedMtxIdx_
_020B3B60: .word 0x0000FFFE
-_020B3B64: .word UNK_021CE8F4
-_020B3B68: .word UNK_021CE8F8
-_020B3B6C: .word UNK_021CDD70
-_020B3B70: .word UNK_021CDDF4
-_020B3B74: .word UNK_021CE4F4
-_020B3B78: .word UNK_021CDEF4
-_020B3B7C: .word UNK_021CDF04
-_020B3B80: .word UNK_021CDF08
-_020B3B84: .word UNK_02106578
-_020B3B88: .word UNK_02106574
-_020B3B8C: .word UNK_021CDD74
- arm_func_end FUN_020B36C0
+_020B3B64: .word mcRenderState_
+_020B3B68: .word mcRenderState_ + 0x4
+_020B3B6C: .word stackPos_
+_020B3B70: .word mtxStateStack_
+_020B3B74: .word mtxCacheBuffer_
+_020B3B78: .word mtxStack_
+_020B3B7C: .word mtxStack_ + 0x10
+_020B3B80: .word mtxStack_ + 0x14
+_020B3B84: .word mtxI_
+_020B3B88: .word currenVramTransferHandle_
+_020B3B8C: .word fxZStack_
+ arm_func_end DrawCellImpl_
- ; RndCoreCBFuncAfterOBJ_
- arm_func_start FUN_020B3B90
-FUN_020B3B90: ; 0x020B3B90
+ arm_func_start RndCoreCBFuncAfterOBJ_
+RndCoreCBFuncAfterOBJ_: ; 0x020B3B90
stmdb sp!, {r4-r6,lr}
sub sp, sp, #0x8
- ldr r0, _020B3C24 ; =UNK_021CDD6C
+ ldr r0, _020B3C24 ; =pCurrentInstance_
mov r12, r1
ldr r0, [r0, #0x0]
mov r3, r2
@@ -1575,23 +1522,23 @@ FUN_020B3B90: ; 0x020B3B90
cmp r2, #0x0
addeq sp, sp, #0x8
ldmeqia sp!, {r4-r6,pc}
- ldr r2, _020B3C28 ; =UNK_021CDD68
+ ldr r2, _020B3C28 ; =bDonotUseSRTransform
ldr r2, [r2, #0x0]
cmp r2, #0x0
- ldreq r2, _020B3C2C ; =UNK_021CDD70
- ldreq r4, _020B3C30 ; =UNK_021CDEF4
+ ldreq r2, _020B3C2C ; =stackPos_
+ ldreq r4, _020B3C30 ; =mtxStack_
ldreq lr, [r2, #0x0]
moveq r2, #0x18
mlaeq r6, lr, r2, r4
beq _020B3C0C
- ldr lr, _020B3C2C ; =UNK_021CDD70
+ ldr lr, _020B3C2C ; =stackPos_
mov r2, #0x18
ldr lr, [lr, #0x0]
- ldr r4, _020B3C34 ; =UNK_021CDF04
+ ldr r4, _020B3C34 ; =mtxStack_ + 0x10
mul r5, lr, r2
- ldr r2, _020B3C38 ; =UNK_021CDF08
+ ldr r2, _020B3C38 ; =mtxStack_ + 0x14
ldr r4, [r4, r5]
- ldr r6, _020B3C3C ; =UNK_02106578
+ ldr r6, _020B3C3C ; =mtxI_
ldr r2, [r2, r5]
str r4, [r6, #0x10]
str r2, [r6, #0x14]
@@ -1603,40 +1550,39 @@ _020B3C0C:
add sp, sp, #0x8
ldmia sp!, {r4-r6,pc}
.balign 4
-_020B3C24: .word UNK_021CDD6C
-_020B3C28: .word UNK_021CDD68
-_020B3C2C: .word UNK_021CDD70
-_020B3C30: .word UNK_021CDEF4
-_020B3C34: .word UNK_021CDF04
-_020B3C38: .word UNK_021CDF08
-_020B3C3C: .word UNK_02106578
- arm_func_end FUN_020B3B90
+_020B3C24: .word pCurrentInstance_
+_020B3C28: .word bDonotUseSRTransform
+_020B3C2C: .word stackPos_
+_020B3C30: .word mtxStack_
+_020B3C34: .word mtxStack_ + 0x10
+_020B3C38: .word mtxStack_ + 0x14
+_020B3C3C: .word mtxI_
+ arm_func_end RndCoreCBFuncAfterOBJ_
- ; RndCoreCBFuncBeforeOBJ_
- arm_func_start FUN_020B3C40
-FUN_020B3C40: ; 0x020B3C40
+ arm_func_start RndCoreCBFuncBeforeOBJ_
+RndCoreCBFuncBeforeOBJ_: ; 0x020B3C40
stmdb sp!, {r4-r6,lr}
sub sp, sp, #0x8
- ldr r3, _020B3E2C ; =UNK_021CDD6C
+ ldr r3, _020B3E2C ; =pCurrentInstance_
add r4, r0, #0x38
ldr r0, [r3, #0x0]
mov r6, r1
mov r5, r2
- bl FUN_020B278C
+ bl NNS_G2dGetRendererPaletteTbl
cmp r0, #0x0
beq _020B3C90
ldrh r1, [r4, #0x4]
and r1, r1, #0xf000
mov r1, r1, lsl #0x4
mov r1, r1, lsr #0x10
- bl FUN_020B10B0
+ bl NNS_G2dGetPaletteTableValue
ldr r1, [r4, #0x4]
and r0, r0, #0xf
bic r1, r1, #0xf000
orr r0, r1, r0, lsl #0xc
str r0, [r4, #0x4]
_020B3C90:
- ldr r0, _020B3E2C ; =UNK_021CDD6C
+ ldr r0, _020B3E2C ; =pCurrentInstance_
ldr r1, [r0, #0x0]
ldr r0, [r1, #0x84]
cmp r0, #0x0
@@ -1651,7 +1597,7 @@ _020B3C90:
orr r0, r1, r0, lsl #0xa
str r0, [r4, #0x4]
_020B3CC8:
- ldr r0, _020B3E2C ; =UNK_021CDD6C
+ ldr r0, _020B3E2C ; =pCurrentInstance_
ldr r1, [r0, #0x0]
ldr r0, [r1, #0x84]
ands r0, r0, #0x2
@@ -1663,7 +1609,7 @@ _020B3CC8:
orr r0, r1, r0, lsl #0xc
str r0, [r4, #0x4]
_020B3CF4:
- ldr r0, _020B3E2C ; =UNK_021CDD6C
+ ldr r0, _020B3E2C ; =pCurrentInstance_
ldr r1, [r0, #0x0]
ldr r0, [r1, #0x84]
ands r0, r0, #0x10
@@ -1678,7 +1624,7 @@ _020B3CF4:
orr r0, r2, r0, lsl #0xc
str r0, [r4, #0x4]
_020B3D2C:
- ldr r0, _020B3E2C ; =UNK_021CDD6C
+ ldr r0, _020B3E2C ; =pCurrentInstance_
ldr r1, [r0, #0x0]
ldr r0, [r1, #0x84]
ands r0, r0, #0x4
@@ -1692,7 +1638,7 @@ _020B3D2C:
biceq r0, r0, #0x1000
streq r0, [r4, #0x0]
_020B3D60:
- ldr r0, _020B3E2C ; =UNK_021CDD6C
+ ldr r0, _020B3E2C ; =pCurrentInstance_
ldr r1, [r0, #0x0]
ldr r0, [r1, #0x84]
ands r0, r0, #0x8
@@ -1710,30 +1656,30 @@ _020B3D60:
orr r0, r0, r1, lsl #0xc
strh r0, [r4, #0x4]
_020B3DA4:
- ldr r0, _020B3E2C ; =UNK_021CDD6C
+ ldr r0, _020B3E2C ; =pCurrentInstance_
ldr r0, [r0, #0x0]
ldr r1, [r0, #0x74]
ldr r2, [r1, #0x40]
cmp r2, #0x0
addeq sp, sp, #0x8
ldmeqia sp!, {r4-r6,pc}
- ldr r2, _020B3E30 ; =UNK_021CDD68
+ ldr r2, _020B3E30 ; =bDonotUseSRTransform
ldr r2, [r2, #0x0]
cmp r2, #0x0
- ldreq r2, _020B3E34 ; =UNK_021CDD70
- ldreq r4, _020B3E38 ; =UNK_021CDEF4
+ ldreq r2, _020B3E34 ; =stackPos_
+ ldreq r4, _020B3E38 ; =mtxStack_
ldreq r3, [r2, #0x0]
moveq r2, #0x18
mlaeq r4, r3, r2, r4
beq _020B3E10
- ldr r3, _020B3E34 ; =UNK_021CDD70
+ ldr r3, _020B3E34 ; =stackPos_
mov r2, #0x18
ldr r4, [r3, #0x0]
- ldr r3, _020B3E3C ; =UNK_021CDF04
+ ldr r3, _020B3E3C ; =mtxStack_ + 0x10
mul r12, r4, r2
- ldr r2, _020B3E40 ; =UNK_021CDF08
+ ldr r2, _020B3E40 ; =mtxStack_ + 0x14
ldr r3, [r3, r12]
- ldr r4, _020B3E44 ; =UNK_02106578
+ ldr r4, _020B3E44 ; =mtxI_
ldr r2, [r2, r12]
str r3, [r4, #0x10]
str r2, [r4, #0x14]
@@ -1746,43 +1692,42 @@ _020B3E10:
add sp, sp, #0x8
ldmia sp!, {r4-r6,pc}
.balign 4
-_020B3E2C: .word UNK_021CDD6C
-_020B3E30: .word UNK_021CDD68
-_020B3E34: .word UNK_021CDD70
-_020B3E38: .word UNK_021CDEF4
-_020B3E3C: .word UNK_021CDF04
-_020B3E40: .word UNK_021CDF08
-_020B3E44: .word UNK_02106578
- arm_func_end FUN_020B3C40
+_020B3E2C: .word pCurrentInstance_
+_020B3E30: .word bDonotUseSRTransform
+_020B3E34: .word stackPos_
+_020B3E38: .word mtxStack_
+_020B3E3C: .word mtxStack_ + 0x10
+_020B3E40: .word mtxStack_ + 0x14
+_020B3E44: .word mtxI_
+ arm_func_end RndCoreCBFuncBeforeOBJ_
- ; RndCoreCBFuncAfterCell_
- arm_func_start FUN_020B3E48
-FUN_020B3E48: ; 0x020B3E48
+ arm_func_start RndCoreCBFuncAfterCell_
+RndCoreCBFuncAfterCell_: ; 0x020B3E48
stmdb sp!, {r4,lr}
- ldr r0, _020B3EC4 ; =UNK_021CDD6C
+ ldr r0, _020B3EC4 ; =pCurrentInstance_
mov r2, r1
ldr r0, [r0, #0x0]
ldr r1, [r0, #0x74]
ldr r3, [r1, #0x3c]
cmp r3, #0x0
ldmeqia sp!, {r4,pc}
- ldr r3, _020B3EC8 ; =UNK_021CDD68
+ ldr r3, _020B3EC8 ; =bDonotUseSRTransform
ldr r3, [r3, #0x0]
cmp r3, #0x0
- ldreq r3, _020B3ECC ; =UNK_021CDD70
- ldreq lr, _020B3ED0 ; =UNK_021CDEF4
+ ldreq r3, _020B3ECC ; =stackPos_
+ ldreq lr, _020B3ED0 ; =mtxStack_
ldreq r12, [r3, #0x0]
moveq r3, #0x18
mlaeq r3, r12, r3, lr
beq _020B3EB8
- ldr ip, _020B3ECC ; =UNK_021CDD70
+ ldr ip, _020B3ECC ; =stackPos_
mov r3, #0x18
ldr r12, [r12, #0x0]
- ldr lr, _020B3ED4 ; =UNK_021CDF04
+ ldr lr, _020B3ED4 ; =mtxStack_ + 0x10
mul r4, r12, r3
- ldr ip, _020B3ED8 ; =UNK_021CDF08
+ ldr ip, _020B3ED8 ; =mtxStack_ + 0x14
ldr lr, [lr, r4]
- ldr r3, _020B3EDC ; =UNK_02106578
+ ldr r3, _020B3EDC ; =mtxI_
ldr r12, [r12, r4]
str lr, [r3, #0x10]
str r12, [r3, #0x14]
@@ -1791,20 +1736,19 @@ _020B3EB8:
blx r12
ldmia sp!, {r4,pc}
.balign 4
-_020B3EC4: .word UNK_021CDD6C
-_020B3EC8: .word UNK_021CDD68
-_020B3ECC: .word UNK_021CDD70
-_020B3ED0: .word UNK_021CDEF4
-_020B3ED4: .word UNK_021CDF04
-_020B3ED8: .word UNK_021CDF08
-_020B3EDC: .word UNK_02106578
- arm_func_end FUN_020B3E48
+_020B3EC4: .word pCurrentInstance_
+_020B3EC8: .word bDonotUseSRTransform
+_020B3ECC: .word stackPos_
+_020B3ED0: .word mtxStack_
+_020B3ED4: .word mtxStack_ + 0x10
+_020B3ED8: .word mtxStack_ + 0x14
+_020B3EDC: .word mtxI_
+ arm_func_end RndCoreCBFuncAfterCell_
- ; RndCoreCBFuncBeforeCell_
- arm_func_start FUN_020B3EE0
-FUN_020B3EE0: ; 0x020B3EE0
+ arm_func_start RndCoreCBFuncBeforeCell_
+RndCoreCBFuncBeforeCell_: ; 0x020B3EE0
stmdb sp!, {r4-r6,lr}
- ldr r2, _020B3FF4 ; =UNK_021CDD6C
+ ldr r2, _020B3FF4 ; =pCurrentInstance_
mov r6, r0
ldr r0, [r2, #0x0]
mov r5, r1
@@ -1812,23 +1756,23 @@ FUN_020B3EE0: ; 0x020B3EE0
ldr r0, [r4, #0x34]
cmp r0, #0x0
beq _020B3F7C
- ldr r0, _020B3FF8 ; =UNK_021CDD68
+ ldr r0, _020B3FF8 ; =bDonotUseSRTransform
ldr r0, [r0, #0x0]
cmp r0, #0x0
- ldreq r0, _020B3FFC ; =UNK_021CDD70
- ldreq r1, _020B4000 ; =UNK_021CDEF4
+ ldreq r0, _020B3FFC ; =stackPos_
+ ldreq r1, _020B4000 ; =mtxStack_
ldreq r2, [r0, #0x0]
moveq r0, #0x18
mlaeq r1, r2, r0, r1
beq _020B3F54
- ldr r1, _020B3FFC ; =UNK_021CDD70
+ ldr r1, _020B3FFC ; =stackPos_
mov r0, #0x18
ldr r2, [r1, #0x0]
- ldr r1, _020B4004 ; =UNK_021CDF04
+ ldr r1, _020B4004 ; =mtxStack_ + 0x10
mul r3, r2, r0
- ldr r0, _020B4008 ; =UNK_021CDF08
+ ldr r0, _020B4008 ; =mtxStack_ + 0x14
ldr r2, [r1, r3]
- ldr r1, _020B400C ; =UNK_02106578
+ ldr r1, _020B400C ; =mtxI_
ldr r0, [r0, r3]
str r2, [r1, #0x10]
str r0, [r1, #0x14]
@@ -1847,28 +1791,28 @@ _020B3F7C:
ldr r0, [r4, #0x38]
cmp r0, #0x0
ldmeqia sp!, {r4-r6,pc}
- ldr r0, _020B3FF8 ; =UNK_021CDD68
+ ldr r0, _020B3FF8 ; =bDonotUseSRTransform
ldr r0, [r0, #0x0]
cmp r0, #0x0
- ldreq r0, _020B3FFC ; =UNK_021CDD70
- ldreq r2, _020B4000 ; =UNK_021CDEF4
+ ldreq r0, _020B3FFC ; =stackPos_
+ ldreq r2, _020B4000 ; =mtxStack_
ldreq r1, [r0, #0x0]
moveq r0, #0x18
mlaeq r3, r1, r0, r2
beq _020B3FD8
- ldr r1, _020B3FFC ; =UNK_021CDD70
+ ldr r1, _020B3FFC ; =stackPos_
mov r0, #0x18
ldr r2, [r1, #0x0]
- ldr r1, _020B4004 ; =UNK_021CDF04
+ ldr r1, _020B4004 ; =mtxStack_ + 0x10
mul r6, r2, r0
- ldr r0, _020B4008 ; =UNK_021CDF08
+ ldr r0, _020B4008 ; =mtxStack_ + 0x14
ldr r1, [r1, r6]
- ldr r3, _020B400C ; =UNK_02106578
+ ldr r3, _020B400C ; =mtxI_
ldr r0, [r0, r6]
str r1, [r3, #0x10]
str r0, [r3, #0x14]
_020B3FD8:
- ldr r0, _020B3FF4 ; =UNK_021CDD6C
+ ldr r0, _020B3FF4 ; =pCurrentInstance_
ldr r6, [r4, #0x38]
ldr r0, [r0, #0x0]
mov r1, r4
@@ -1876,22 +1820,21 @@ _020B3FD8:
blx r6
ldmia sp!, {r4-r6,pc}
.balign 4
-_020B3FF4: .word UNK_021CDD6C
-_020B3FF8: .word UNK_021CDD68
-_020B3FFC: .word UNK_021CDD70
-_020B4000: .word UNK_021CDEF4
-_020B4004: .word UNK_021CDF04
-_020B4008: .word UNK_021CDF08
-_020B400C: .word UNK_02106578
- arm_func_end FUN_020B3EE0
+_020B3FF4: .word pCurrentInstance_
+_020B3FF8: .word bDonotUseSRTransform
+_020B3FFC: .word stackPos_
+_020B4000: .word mtxStack_
+_020B4004: .word mtxStack_ + 0x10
+_020B4008: .word mtxStack_ + 0x14
+_020B400C: .word mtxI_
+ arm_func_end RndCoreCBFuncBeforeCell_
- ; NNSi_G2dMCMStoreCurrentMtxToMtxCache
- arm_func_start FUN_020B4010
-FUN_020B4010: ; 0x020B4010
+ arm_func_start NNSi_G2dMCMStoreCurrentMtxToMtxCache
+NNSi_G2dMCMStoreCurrentMtxToMtxCache: ; 0x020B4010
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
- ldr r0, _020B4154 ; =UNK_021CDD70
- ldr r1, _020B4158 ; =UNK_021CDDF4
+ ldr r0, _020B4154 ; =stackPos_
+ ldr r1, _020B4158 ; =mtxStateStack_
ldr r0, [r0, #0x0]
mov r2, #0x1
mov r0, r0, lsl #0x10
@@ -1905,46 +1848,46 @@ _020B4044:
cmp r2, #0x0
addeq sp, sp, #0x4
ldmeqia sp!, {r4-r5,pc}
- ldr r0, _020B415C ; =UNK_021CDD60
+ ldr r0, _020B415C ; =currentMtxCachePos_
mov r2, #0x10
ldrh r4, [r0, #0x0]
cmp r4, #0x1f
addcc r1, r4, #0x1
strcch r1, [r0, #0x0]
- ldr r0, _020B4160 ; =UNK_021CE4F4
+ ldr r0, _020B4160 ; =mtxCacheBuffer_
ldrh r5, [r3, #0x2]
add r0, r0, r4, lsl #0x5
add r1, r0, #0x10
mvn r0, #0x0
strh r4, [r3, #0x0]
bl MIi_CpuClearFast
- ldr r0, _020B4154 ; =UNK_021CDD70
- ldr r1, _020B4164 ; =UNK_021CDD68
+ ldr r0, _020B4154 ; =stackPos_
+ ldr r1, _020B4164 ; =bDonotUseSRTransform
ldr r0, [r0, #0x0]
ldr r2, [r1, #0x0]
mov r1, r0, lsl #0x10
cmp r2, #0x0
- ldr r3, _020B4158 ; =UNK_021CDDF4
+ ldr r3, _020B4158 ; =mtxStateStack_
mov r1, r1, lsr #0xd
ldrh r1, [r3, r1]
- ldr r3, _020B4160 ; =UNK_021CE4F4
+ ldr r3, _020B4160 ; =mtxCacheBuffer_
moveq r2, #0x18
add r1, r3, r1, lsl #0x5
- ldreq r3, _020B4168 ; =UNK_021CE1F4
+ ldreq r3, _020B4168 ; =mtxStackFor2DHW_
mlaeq r12, r0, r2, r3
beq _020B40E4
mov r2, #0x18
mul r3, r0, r2
- ldr r2, _020B416C ; =UNK_021CDF04
- ldr r0, _020B4170 ; =UNK_021CDF08
+ ldr r2, _020B416C ; =mtxStack_ + 0x10
+ ldr r0, _020B4170 ; =mtxStack_ + 0x14
ldr r2, [r2, r3]
- ldr ip, _020B4174 ; =UNK_02106578
+ ldr ip, _020B4174 ; =mtxI_
ldr r0, [r0, r3]
str r2, [r12, #0x10]
str r0, [r12, #0x14]
_020B40E4:
ldr r2, [r12, #0x0]
- ldr r0, _020B4154 ; =UNK_021CDD70
+ ldr r0, _020B4154 ; =stackPos_
str r2, [r1, #0x0]
ldr r2, [r12, #0x4]
str r2, [r1, #0x4]
@@ -1957,7 +1900,7 @@ _020B40E4:
movs lr, r0, lsr #0x10
addmi sp, sp, #0x4
ldmmiia sp!, {r4-r5,pc}
- ldr r3, _020B4158 ; =UNK_021CDDF4
+ ldr r3, _020B4158 ; =mtxStateStack_
mov r0, #0x3
_020B4124:
add r2, r3, lr, lsl #0x3
@@ -1973,41 +1916,40 @@ _020B4124:
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
.balign 4
-_020B4154: .word UNK_021CDD70
-_020B4158: .word UNK_021CDDF4
-_020B415C: .word UNK_021CDD60
-_020B4160: .word UNK_021CE4F4
-_020B4164: .word UNK_021CDD68
-_020B4168: .word UNK_021CE1F4
-_020B416C: .word UNK_021CDF04
-_020B4170: .word UNK_021CDF08
-_020B4174: .word UNK_02106578
- arm_func_end FUN_020B4010
+_020B4154: .word stackPos_
+_020B4158: .word mtxStateStack_
+_020B415C: .word currentMtxCachePos_
+_020B4160: .word mtxCacheBuffer_
+_020B4164: .word bDonotUseSRTransform
+_020B4168: .word mtxStackFor2DHW_
+_020B416C: .word mtxStack_ + 0x10
+_020B4170: .word mtxStack_ + 0x14
+_020B4174: .word mtxI_
+ arm_func_end NNSi_G2dMCMStoreCurrentMtxToMtxCache
- ; NNSi_G2dIdentity
- arm_func_start FUN_020B4178
-FUN_020B4178: ; 0x020B4178
+ arm_func_start NNSi_G2dIdentity
+NNSi_G2dIdentity: ; 0x020B4178
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
- ldr r0, _020B4220 ; =UNK_021CDD68
+ ldr r0, _020B4220 ; =bDonotUseSRTransform
ldr r0, [r0, #0x0]
cmp r0, #0x0
beq _020B41B8
- ldr r1, _020B4224 ; =UNK_021CDD70
+ ldr r1, _020B4224 ; =stackPos_
mov r0, #0x18
ldr r12, [r1, #0x0]
- ldr r1, _020B4228 ; =UNK_021CDF04
+ ldr r1, _020B4228 ; =mtxStack_ + 0x10
mul r3, r12, r0
mov r2, #0x0
- ldr r0, _020B422C ; =UNK_021CDF08
+ ldr r0, _020B422C ; =mtxStack_ + 0x14
str r2, [r1, r3]
str r2, [r0, r3]
b _020B420C
_020B41B8:
- ldr r0, _020B4224 ; =UNK_021CDD70
+ ldr r0, _020B4224 ; =stackPos_
mov lr, #0x18
ldr r1, [r0, #0x0]
- ldr r4, _020B4230 ; =UNK_021CDEF4
+ ldr r4, _020B4230 ; =mtxStack_
mul r3, r1, lr
mov r2, #0x1000
str r2, [r4, r3]
@@ -2019,25 +1961,24 @@ _020B41B8:
str r1, [r5, #0x10]
str r1, [r5, #0x14]
ldr r12, [r0, #0x0]
- ldr r4, _020B4234 ; =UNK_021CE1F4
+ ldr r4, _020B4234 ; =mtxStackFor2DHW_
ldmia r5!, {r0-r3}
mla lr, r12, lr, r4
stmia lr!, {r0-r3}
ldmia r5, {r0-r1}
stmia lr, {r0-r1}
_020B420C:
- ldr r0, _020B4238 ; =UNK_021CDD74
+ ldr r0, _020B4238 ; =fxZStack_
mov r1, #0x0
str r1, [r0, r12, lsl #0x2]
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
.balign 4
-_020B4220: .word UNK_021CDD68
-_020B4224: .word UNK_021CDD70
-_020B4228: .word UNK_021CDF04
-_020B422C: .word UNK_021CDF08
-_020B4230: .word UNK_021CDEF4
-_020B4234: .word UNK_021CE1F4
-_020B4238: .word UNK_021CDD74
- arm_func_end FUN_020B4178
-
+_020B4220: .word bDonotUseSRTransform
+_020B4224: .word stackPos_
+_020B4228: .word mtxStack_ + 0x10
+_020B422C: .word mtxStack_ + 0x14
+_020B4230: .word mtxStack_
+_020B4234: .word mtxStackFor2DHW_
+_020B4238: .word fxZStack_
+ arm_func_end NNSi_G2dIdentity
diff --git a/arm9/asm/NNS_G2D_g2d_renderercor.s b/arm9/asm/NNS_G2D_g2d_renderercor.s
index e1c3be6e..bf415c1c 100644
--- a/arm9/asm/NNS_G2D_g2d_renderercor.s
+++ b/arm9/asm/NNS_G2D_g2d_renderercor.s
@@ -3,27 +3,24 @@
.section .rodata
- ; mtxIdentity_
- .global UNK_020FF958
-UNK_020FF958: ; 0x020FF958
+ .global mtxIdentity_
+mtxIdentity_: ; 0x020FF958
.byte 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
; static const in function
+
.section .bss
- ; pTheInstance_
- .global UNK_021CED14
-UNK_021CED14: ; 0x021CED14
+ .global pTheInstance_
+pTheInstance_: ; 0x021CED14
.space 0x4
.section .text
- ; NNS_G2dRndCoreDrawCellVramTransfer
- arm_func_start FUN_020B4BF4
-FUN_020B4BF4: ; 0x020B4BF4
+ arm_func_start NNS_G2dRndCoreDrawCellVramTransfer
+NNS_G2dRndCoreDrawCellVramTransfer: ; 0x020B4BF4
stmdb sp!, {r4-r6,lr}
- ldr r2, _020B4CD8 ; =UNK_021CED14
+ ldr r2, _020B4CD8 ; =pTheInstance_
mov r6, r0
ldr r3, [r2, #0x0]
mov r4, r1
@@ -40,7 +37,7 @@ FUN_020B4BF4: ; 0x020B4BF4
mov r1, r6
blx r3
_020B4C38:
- ldr r0, _020B4CD8 ; =UNK_021CED14
+ ldr r0, _020B4CD8 ; =pTheInstance_
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x30]
cmp r0, #0x0
@@ -50,7 +47,7 @@ _020B4C38:
beq _020B4C7C
mov r0, r4
ldr r4, [r5, #0x14]
- bl FUN_020B469C
+ bl NNSi_G2dGetCellTransferState
mov r3, #0x1
mvn r1, r3, lsl r4
ldr r2, [r0, #0x20]
@@ -70,31 +67,30 @@ _020B4C7C:
_020B4C9C:
mov r0, r5
mov r1, r6
- bl FUN_020B5090
+ bl DrawCellToSurface3D_
b _020B4CB8
_020B4CAC:
mov r0, r5
mov r1, r6
- bl FUN_020B53B4
+ bl DrawCellToSurface2D_
_020B4CB8:
ldr r2, [r5, #0x1c]
cmp r2, #0x0
ldmeqia sp!, {r4-r6,pc}
- ldr r0, _020B4CD8 ; =UNK_021CED14
+ ldr r0, _020B4CD8 ; =pTheInstance_
mov r1, r6
ldr r0, [r0, #0x0]
blx r2
ldmia sp!, {r4-r6,pc}
.balign 4
-_020B4CD8: .word UNK_021CED14
- arm_func_end FUN_020B4BF4
+_020B4CD8: .word pTheInstance_
+ arm_func_end NNS_G2dRndCoreDrawCellVramTransfer
- ; NNS_G2dRndCoreDrawCell
- arm_func_start FUN_020B4CDC
-FUN_020B4CDC: ; 0x020B4CDC
+ arm_func_start NNS_G2dRndCoreDrawCell
+NNS_G2dRndCoreDrawCell: ; 0x020B4CDC
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
- ldr r1, _020B4D9C ; =UNK_021CED14
+ ldr r1, _020B4D9C ; =pTheInstance_
mov r5, r0
ldr r2, [r1, #0x0]
ldr r4, [r2, #0x0]
@@ -111,7 +107,7 @@ FUN_020B4CDC: ; 0x020B4CDC
mov r1, r5
blx r2
_020B4D24:
- ldr r0, _020B4D9C ; =UNK_021CED14
+ ldr r0, _020B4D9C ; =pTheInstance_
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x30]
cmp r0, #0x0
@@ -128,31 +124,30 @@ _020B4D24:
_020B4D58:
mov r0, r4
mov r1, r5
- bl FUN_020B5090
+ bl DrawCellToSurface3D_
b _020B4D74
_020B4D68:
mov r0, r4
mov r1, r5
- bl FUN_020B53B4
+ bl DrawCellToSurface2D_
_020B4D74:
ldr r2, [r4, #0x1c]
cmp r2, #0x0
addeq sp, sp, #0x4
ldmeqia sp!, {r4-r5,pc}
- ldr r0, _020B4D9C ; =UNK_021CED14
+ ldr r0, _020B4D9C ; =pTheInstance_
mov r1, r5
ldr r0, [r0, #0x0]
blx r2
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
.balign 4
-_020B4D9C: .word UNK_021CED14
- arm_func_end FUN_020B4CDC
+_020B4D9C: .word pTheInstance_
+ arm_func_end NNS_G2dRndCoreDrawCell
- ; NNS_G2dRndCoreEndRendering
- arm_func_start FUN_020B4DA0
-FUN_020B4DA0: ; 0x020B4DA0
- ldr r0, _020B4E00 ; =UNK_021CED14
+ arm_func_start NNS_G2dRndCoreEndRendering
+NNS_G2dRndCoreEndRendering: ; 0x020B4DA0
+ ldr r0, _020B4E00 ; =pTheInstance_
ldr r3, [r0, #0x0]
ldr r1, [r3, #0x0]
ldr r1, [r1, #0x14]
@@ -174,22 +169,21 @@ _020B4DD8:
ldr r0, [r0, #0x0]
str r2, [r0, #0x28]
_020B4DF0:
- ldr r0, _020B4E00 ; =UNK_021CED14
+ ldr r0, _020B4E00 ; =pTheInstance_
mov r1, #0x0
str r1, [r0, #0x0]
bx lr
.balign 4
-_020B4E00: .word UNK_021CED14
+_020B4E00: .word pTheInstance_
_020B4E04: .word 0x04000440
_020B4E08: .word 0x04000448
- arm_func_end FUN_020B4DA0
+ arm_func_end NNS_G2dRndCoreEndRendering
- ; NNS_G2dRndCoreBeginRendering
- arm_func_start FUN_020B4E0C
-FUN_020B4E0C: ; 0x020B4E0C
+ arm_func_start NNS_G2dRndCoreBeginRendering
+NNS_G2dRndCoreBeginRendering: ; 0x020B4E0C
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
- ldr r2, _020B4F28 ; =UNK_021CED14
+ ldr r2, _020B4F28 ; =pTheInstance_
mov r4, r0
str r4, [r2, #0x0]
ldr r0, [r4, #0x0]
@@ -215,27 +209,27 @@ FUN_020B4E0C: ; 0x020B4E0C
ldr r0, [r2, #0x0]
ldr r5, [r0, #0x8]
mov r0, r5
- bl FUN_020B19FC
+ bl NNS_G2dIsImageReadyToUse
cmp r0, #0x0
moveq r0, #0x0
beq _020B4E98
mov r0, r5
mov r1, #0x0
- bl FUN_020B1A14
+ bl NNS_G2dGetImageLocation
_020B4E98:
- ldr r1, _020B4F28 ; =UNK_021CED14
+ ldr r1, _020B4F28 ; =pTheInstance_
str r0, [r4, #0x14]
ldr r0, [r1, #0x0]
mov r1, #0x0
ldr r5, [r0, #0xc]
mov r0, r5
- bl FUN_020B19A8
+ bl NNS_G2dIsImagePaletteReadyToUse
cmp r0, #0x0
moveq r0, #0x0
beq _020B4ECC
mov r0, r5
mov r1, #0x0
- bl FUN_020B19C4
+ bl NNS_G2dGetImagePaletteLocation
_020B4ECC:
add sp, sp, #0x4
str r0, [r4, #0x18]
@@ -244,34 +238,33 @@ _020B4ED8:
ldr r4, [r4, #0x8]
mov r1, r5
mov r0, r4
- bl FUN_020B19FC
+ bl NNS_G2dIsImageReadyToUse
cmp r0, #0x0
moveq r1, #0x0
beq _020B4F14
mov r0, r4
mov r1, r5
- bl FUN_020B1A14
+ bl NNS_G2dGetImageLocation
ldr r1, [r4, #0x20]
and r1, r1, #0x700000
mov r1, r1, asr #0x14
add r1, r1, #0x5
mov r1, r0, lsr r1
_020B4F14:
- ldr r0, _020B4F28 ; =UNK_021CED14
+ ldr r0, _020B4F28 ; =pTheInstance_
ldr r0, [r0, #0x0]
str r1, [r0, #0x10]
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
.balign 4
-_020B4F28: .word UNK_021CED14
+_020B4F28: .word pTheInstance_
_020B4F2C: .word 0x04000440
_020B4F30: .word 0x04000444
_020B4F34: .word 0x04000470
- arm_func_end FUN_020B4E0C
+ arm_func_end NNS_G2dRndCoreBeginRendering
- ; _end
- arm_func_start FUN_020B4F38
-FUN_020B4F38: ; 0x020B4F38
+ arm_func_start NNS_G2dSetRndCoreFlipMode
+NNS_G2dSetRndCoreFlipMode: ; 0x020B4F38
cmp r1, #0x0
ldrne r1, [r0, #0x24]
orrne r1, r1, #0x1
@@ -287,58 +280,52 @@ FUN_020B4F38: ; 0x020B4F38
biceq r1, r1, #0x2
streq r1, [r0, #0x24]
bx lr
- arm_func_end FUN_020B4F38
+ arm_func_end NNS_G2dSetRndCoreFlipMode
- ; _end
- arm_func_start FUN_020B4F74
-FUN_020B4F74: ; 0x020B4F74
+ arm_func_start NNS_G2dIsRndCoreFlipV
+NNS_G2dIsRndCoreFlipV: ; 0x020B4F74
ldr r0, [r0, #0x24]
ands r0, r0, #0x2
movne r0, #0x1
moveq r0, #0x0
bx lr
- arm_func_end FUN_020B4F74
+ arm_func_end NNS_G2dIsRndCoreFlipV
- ; _end
- arm_func_start FUN_020B4F88
-FUN_020B4F88: ; 0x020B4F88
+ arm_func_start NNS_G2dIsRndCoreFlipH
+NNS_G2dIsRndCoreFlipH: ; 0x020B4F88
ldr r0, [r0, #0x24]
ands r0, r0, #0x1
movne r0, #0x1
moveq r0, #0x0
bx lr
- arm_func_end FUN_020B4F88
+ arm_func_end NNS_G2dIsRndCoreFlipH
- ; _end
- arm_func_start FUN_020B4F9C
-FUN_020B4F9C: ; 0x020B4F9C
+ arm_func_start NNS_G2dSetRndCoreSurface
+NNS_G2dSetRndCoreSurface: ; 0x020B4F9C
str r1, [r0, #0x0]
bx lr
- arm_func_end FUN_020B4F9C
+ arm_func_end NNS_G2dSetRndCoreSurface
- ; _end
- arm_func_start FUN_020B4FA4
-FUN_020B4FA4: ; 0x020B4FA4
+ arm_func_start NNS_G2dSetRndCore3DSoftSpriteZvalue
+NNS_G2dSetRndCore3DSoftSpriteZvalue: ; 0x020B4FA4
str r1, [r0, #0x34]
bx lr
- arm_func_end FUN_020B4FA4
+ arm_func_end NNS_G2dSetRndCore3DSoftSpriteZvalue
- ; NNS_G2dSetRndCoreCurrentMtx2D
- arm_func_start FUN_020B4FAC
-FUN_020B4FAC: ; 0x020B4FAC
- ldr r2, _020B4FC0 ; =UNK_021CED14
+ arm_func_start NNS_G2dSetRndCoreCurrentMtx2D
+NNS_G2dSetRndCoreCurrentMtx2D: ; 0x020B4FAC
+ ldr r2, _020B4FC0 ; =pTheInstance_
ldr r2, [r2, #0x0]
str r0, [r2, #0x2c]
str r1, [r2, #0x28]
bx lr
.balign 4
-_020B4FC0: .word UNK_021CED14
- arm_func_end FUN_020B4FAC
+_020B4FC0: .word pTheInstance_
+ arm_func_end NNS_G2dSetRndCoreCurrentMtx2D
- ; NNS_G2dSetRndCoreCurrentMtx3D
- arm_func_start FUN_020B4FC4
-FUN_020B4FC4: ; 0x020B4FC4
- ldr r1, _020B5028 ; =UNK_021CED14
+ arm_func_start NNS_G2dSetRndCoreCurrentMtx3D
+NNS_G2dSetRndCoreCurrentMtx3D: ; 0x020B4FC4
+ ldr r1, _020B5028 ; =pTheInstance_
mov r3, #0x0
ldr r12, [r1, #0x0]
mov r1, #0x1000
@@ -364,35 +351,31 @@ FUN_020B4FC4: ; 0x020B4FC4
str r0, [r12, #0x6c]
bx lr
.balign 4
-_020B5028: .word UNK_021CED14
- arm_func_end FUN_020B4FC4
+_020B5028: .word pTheInstance_
+ arm_func_end NNS_G2dSetRndCoreCurrentMtx3D
- ; _end
- arm_func_start FUN_020B502C
-FUN_020B502C: ; 0x020B502C
+ arm_func_start NNS_G2dSetRndCoreAffineOverwriteMode
+NNS_G2dSetRndCoreAffineOverwriteMode: ; 0x020B502C
str r1, [r0, #0x4]
bx lr
- arm_func_end FUN_020B502C
+ arm_func_end NNS_G2dSetRndCoreAffineOverwriteMode
- ; _end
- arm_func_start FUN_020B5034
-FUN_020B5034: ; 0x020B5034
+ arm_func_start NNS_G2dSetRndCoreOamRegisterFunc
+NNS_G2dSetRndCoreOamRegisterFunc: ; 0x020B5034
str r1, [r0, #0x1c]
str r2, [r0, #0x20]
bx lr
- arm_func_end FUN_020B5034
+ arm_func_end NNS_G2dSetRndCoreOamRegisterFunc
- ; _end
- arm_func_start FUN_020B5040
-FUN_020B5040: ; 0x020B5040
+ arm_func_start NNS_G2dSetRndCoreImageProxy
+NNS_G2dSetRndCoreImageProxy: ; 0x020B5040
str r1, [r0, #0x8]
str r2, [r0, #0xc]
bx lr
- arm_func_end FUN_020B5040
+ arm_func_end NNS_G2dSetRndCoreImageProxy
- ; _end
- arm_func_start FUN_020B504C
-FUN_020B504C: ; 0x020B504C
+ arm_func_start NNS_G2dInitRndCore
+NNS_G2dInitRndCore: ; 0x020B504C
stmdb sp!, {r4,lr}
mov r4, r0
mov r1, r4
@@ -410,13 +393,12 @@ FUN_020B504C: ; 0x020B504C
str r0, [r4, #0x30]
str r1, [r4, #0x28]
ldmia sp!, {r4,pc}
- arm_func_end FUN_020B504C
+ arm_func_end NNS_G2dInitRndCore
- ; DrawCellToSurface3D_
- arm_func_start FUN_020B5090
-FUN_020B5090: ; 0x020B5090
+ arm_func_start DrawCellToSurface3D_
+DrawCellToSurface3D_: ; 0x020B5090
stmdb sp!, {r4-r10,lr}
- ldr r5, _020B5158 ; =UNK_021CED14
+ ldr r5, _020B5158 ; =pTheInstance_
mov r9, r1
ldrh r1, [r9, #0x0]
ldr r2, [r5, #0x0]
@@ -452,7 +434,7 @@ _020B5108:
cmp r0, #0x0
beq _020B5120
mov r0, r7
- bl FUN_020B515C
+ bl DrawOamToSurface3D_
_020B5120:
ldr r3, [r10, #0x24]
cmp r3, #0x0
@@ -470,20 +452,19 @@ _020B513C:
blo _020B50C0
ldmia sp!, {r4-r10,pc}
.balign 4
-_020B5158: .word UNK_021CED14
- arm_func_end FUN_020B5090
+_020B5158: .word pTheInstance_
+ arm_func_end DrawCellToSurface3D_
- ; DrawOamToSurface3D_
- arm_func_start FUN_020B515C
-FUN_020B515C: ; 0x020B515C
+ arm_func_start DrawOamToSurface3D_
+DrawOamToSurface3D_: ; 0x020B515C
stmdb sp!, {r4-r8,lr}
sub sp, sp, #0x10
- ldr r1, _020B53A4 ; =UNK_021CED14
+ ldr r1, _020B53A4 ; =pTheInstance_
mov r7, r0
ldr r0, [r1, #0x0]
add r0, r0, #0x40
bl G3_LoadMtx43
- ldr r0, _020B53A4 ; =UNK_021CED14
+ ldr r0, _020B53A4 ; =pTheInstance_
ldr r0, [r0, #0x0]
ldr r1, [r0, #0x24]
cmp r1, #0x0
@@ -491,7 +472,7 @@ FUN_020B515C: ; 0x020B515C
ldr r2, [r7, #0x0]
ldr r1, _020B53A8 ; =0xC000C000
and r4, r2, r1
- bl FUN_020B4F88
+ bl NNS_G2dIsRndCoreFlipH
cmp r0, #0x0
beq _020B51F4
ldr r0, [r7, #0x0]
@@ -500,7 +481,7 @@ FUN_020B515C: ; 0x020B515C
mov r3, r0, lsr #0x17
and r1, r4, #0xc0000000
mov r1, r1, lsr #0x1e
- ldr r0, _020B53AC ; =UNK_020FF8AC
+ ldr r0, _020B53AC ; =NNSi_objSizeWTbl
mov r2, r2, asr #0xe
mov r1, r1, lsl #0x1
add r0, r0, r2, lsl #0x3
@@ -525,17 +506,17 @@ _020B51F4:
mov r0, r0, lsl #0x10
mov r1, r0, lsr #0x10
_020B5218:
- ldr r0, _020B53A4 ; =UNK_021CED14
+ ldr r0, _020B53A4 ; =pTheInstance_
mov r1, r1, lsl #0x10
ldr r0, [r0, #0x0]
mov r6, r1, asr #0x10
- bl FUN_020B4F74
+ bl NNS_G2dIsRndCoreFlipV
cmp r0, #0x0
beq _020B527C
and r1, r4, #0xc000
and r0, r4, #0xc0000000
ldrb r4, [r7, #0x0]
- ldr r2, _020B53B0 ; =UNK_020FF894
+ ldr r2, _020B53B0 ; =NNSi_objSizeHTbl
mov r0, r0, lsr #0x1e
mov r3, r1, asr #0xe
mov r1, r0, lsl #0x1
@@ -559,23 +540,23 @@ _020B527C:
mov r0, r0, lsl #0x10
mov r4, r0, lsr #0x10
_020B5298:
- ldr r0, _020B53A4 ; =UNK_021CED14
+ ldr r0, _020B53A4 ; =pTheInstance_
ldr r1, [r7, #0x0]
ldr r0, [r0, #0x0]
mov r5, r1, lsl #0x3
- bl FUN_020B4F88
+ bl NNS_G2dIsRndCoreFlipH
ldr r2, [r7, #0x0]
- ldr r1, _020B53A4 ; =UNK_021CED14
+ ldr r1, _020B53A4 ; =pTheInstance_
eor r5, r0, r5, lsr #0x1f
ldr r0, [r1, #0x0]
mov r8, r2, lsl #0x2
- bl FUN_020B4F74
+ bl NNS_G2dIsRndCoreFlipV
ldr r2, [r7, #0x0]
eor r1, r0, r8, lsr #0x1f
bic r0, r2, #0x10000000
str r0, [r7, #0x0]
ldr r2, [r7, #0x0]
- ldr r3, _020B53A4 ; =UNK_021CED14
+ ldr r3, _020B53A4 ; =pTheInstance_
orr r2, r2, r5, lsl #0x1c
str r2, [r7, #0x0]
ldr r2, [r7, #0x0]
@@ -597,11 +578,11 @@ _020B5298:
str r4, [sp, #0x4]
ldr r4, [r5, #0x18]
str r4, [sp, #0x8]
- bl FUN_020B46B4
+ bl NNS_G2dDrawOneOam3DDirectWithPosFast
add sp, sp, #0x10
ldmia sp!, {r4-r8,pc}
_020B533C:
- ldr r2, _020B53A4 ; =UNK_021CED14
+ ldr r2, _020B53A4 ; =pTheInstance_
ldr r0, [r7, #0x0]
ldr r5, [r2, #0x0]
mov r0, r0, lsl #0x7
@@ -624,29 +605,28 @@ _020B533C:
mov r3, r7
mvn r2, #0x0
str r4, [sp, #0x8]
- bl FUN_020B46B4
+ bl NNS_G2dDrawOneOam3DDirectWithPosFast
add sp, sp, #0x10
ldmia sp!, {r4-r8,pc}
.balign 4
-_020B53A4: .word UNK_021CED14
+_020B53A4: .word pTheInstance_
_020B53A8: .word 0xC000C000
-_020B53AC: .word UNK_020FF8AC
-_020B53B0: .word UNK_020FF894
- arm_func_end FUN_020B515C
+_020B53AC: .word NNSi_objSizeWTbl
+_020B53B0: .word NNSi_objSizeHTbl
+ arm_func_end DrawOamToSurface3D_
- ; DrawCellToSurface2D_
- arm_func_start FUN_020B53B4
-FUN_020B53B4: ; 0x020B53B4
+ arm_func_start DrawCellToSurface2D_
+DrawCellToSurface2D_: ; 0x020B53B4
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x44
- ldr r2, _020B57B0 ; =UNK_021CED14
+ ldr r2, _020B57B0 ; =pTheInstance_
mov r10, r0
ldr r0, [r2, #0x0]
mov r11, r1
ldr r9, [r0, #0x2c]
- ldr r1, _020B57B0 ; =UNK_021CED14
+ ldr r1, _020B57B0 ; =pTheInstance_
cmp r9, #0x0
- ldreq sb, _020B57B4 ; =UNK_020FF958
+ ldreq sb, _020B57B4 ; =mtxIdentity_
ldr r3, [r1, #0x0]
ldr r4, [r9, #0x10]
str r4, [sp, #0x18]
@@ -679,7 +659,7 @@ _020B5438:
addls sp, sp, #0x44
ldmlsia sp!, {r4-r11,pc}
mov r0, #0x1
- ldr r4, _020B57B0 ; =UNK_021CED14
+ ldr r4, _020B57B0 ; =pTheInstance_
str r8, [sp, #0x14]
str r0, [sp, #0xc]
_020B5460:
@@ -791,7 +771,7 @@ _020B55CC:
str r3, [sp, #0x28]
ldr r3, [r9, #0xc]
str r3, [sp, #0x2c]
- bl FUN_020B57D8
+ bl DoAffineTransforme_
b _020B5750
_020B5600:
ldr r0, _020B57C0 ; =0x0000FFFE
@@ -804,13 +784,13 @@ _020B5600:
ldr r1, _020B57C4 ; =0xC000C000
mov r6, r2, lsl #0x3
and r5, r2, r1
- bl FUN_020B4F88
+ bl NNS_G2dIsRndCoreFlipH
ldr r1, [r7, #0x0]
eor r6, r0, r6, lsr #0x1f
mov r1, r1, lsl #0x2
ldr r0, [r4, #0x0]
str r1, [sp, #0x10]
- bl FUN_020B4F74
+ bl NNS_G2dIsRndCoreFlipV
ldr r1, [sp, #0x10]
eor r0, r0, r1, lsr #0x1f
ldr r1, [r7, #0x0]
@@ -826,12 +806,12 @@ _020B5600:
orr r0, r1, r0, lsl #0x1d
str r0, [r7, #0x0]
ldr r0, [r4, #0x0]
- bl FUN_020B4F88
+ bl NNS_G2dIsRndCoreFlipH
cmp r0, #0x0
beq _020B56D4
and r1, r5, #0xc000
mov r2, r1, asr #0xe
- ldr r1, _020B57C8 ; =UNK_020FF8AC
+ ldr r1, _020B57C8 ; =NNSi_objSizeWTbl
and r3, r5, #0xc0000000
mov r3, r3, lsr #0x1e
add r2, r1, r2, lsl #0x3
@@ -849,7 +829,7 @@ _020B5600:
str r0, [r7, #0x0]
_020B56D4:
ldr r0, [r4, #0x0]
- bl FUN_020B4F74
+ bl NNS_G2dIsRndCoreFlipV
cmp r0, #0x0
beq _020B5714
and r1, r5, #0xc000
@@ -857,7 +837,7 @@ _020B56D4:
and r1, r5, #0xc0000000
mov r1, r1, lsr #0x1e
mov r2, r1, lsl #0x1
- ldr r1, _020B57D4 ; =UNK_020FF894
+ ldr r1, _020B57D4 ; =NNSi_objSizeHTbl
ldrb r0, [r7, #0x0]
add r1, r1, r3, lsl #0x3
ldrh r1, [r2, r1]
@@ -907,21 +887,20 @@ _020B5790:
add sp, sp, #0x44
ldmia sp!, {r4-r11,pc}
.balign 4
-_020B57B0: .word UNK_021CED14
-_020B57B4: .word UNK_020FF958
+_020B57B0: .word pTheInstance_
+_020B57B4: .word mtxIdentity_
_020B57B8: .word 0x000003FF
_020B57BC: .word 0x0000FFFF
_020B57C0: .word 0x0000FFFE
_020B57C4: .word 0xC000C000
-_020B57C8: .word UNK_020FF8AC
+_020B57C8: .word NNSi_objSizeWTbl
_020B57CC: .word 0xFE00FFFF
_020B57D0: .word 0x000001FF
-_020B57D4: .word UNK_020FF894
- arm_func_end FUN_020B53B4
+_020B57D4: .word NNSi_objSizeHTbl
+ arm_func_end DrawCellToSurface2D_
- ; DoAffineTransforme_
- arm_func_start FUN_020B57D8
-FUN_020B57D8: ; 0x020B57D8
+ arm_func_start DoAffineTransforme_
+DoAffineTransforme_: ; 0x020B57D8
stmdb sp!, {r4-r8,lr}
sub sp, sp, #0x10
ldr r4, [r1, #0x0]
@@ -958,13 +937,13 @@ _020B5858:
cmp r4, #0x300
bne _020B58AC
ldr r3, _020B5AA0 ; =0xC000C000
- ldr r4, _020B5AA4 ; =UNK_020FF8AC
+ ldr r4, _020B5AA4 ; =NNSi_objSizeWTbl
and r3, r5, r3
and r5, r3, #0xc0000000
and r3, r3, #0xc000
mov r6, r5, lsr #0x1e
mov r5, r3, asr #0xe
- ldr r3, _020B5AA8 ; =UNK_020FF894
+ ldr r3, _020B5AA8 ; =NNSi_objSizeHTbl
mov r6, r6, lsl #0x1
add r4, r4, r5, lsl #0x3
add r3, r3, r5, lsl #0x3
@@ -1008,7 +987,7 @@ _020B58AC:
ldreq r3, [sp, #0xc]
ldreq r4, [sp, #0x8]
streq r3, [sp, #0x4]
- ldr r3, _020B5AAC ; =UNK_021CED14
+ ldr r3, _020B5AAC ; =pTheInstance_
streq r4, [sp, #0x0]
ldr r3, [r3, #0x0]
ldr r3, [r3, #0x4]
@@ -1040,7 +1019,7 @@ _020B597C:
orr r5, r5, r3
_020B599C:
ldr r3, _020B5AA0 ; =0xC000C000
- ldr r4, _020B5AA4 ; =UNK_020FF8AC
+ ldr r4, _020B5AA4 ; =NNSi_objSizeWTbl
and r3, r6, r3
and r6, r3, #0xc0000000
and r3, r3, #0xc000
@@ -1050,7 +1029,7 @@ _020B599C:
add r4, r4, lr, lsl #0x3
ldrh r4, [r3, r4]
ldr r6, [r0, #0x0]
- ldr r8, _020B5AA8 ; =UNK_020FF894
+ ldr r8, _020B5AA8 ; =NNSi_objSizeHTbl
mov r12, r4, asr #0x1
mov r4, r12, lsl #0xc
rsb r7, r4, #0x0
@@ -1107,11 +1086,10 @@ _020B5A4C:
.balign 4
_020B5A9C: .word 0x01FF0000
_020B5AA0: .word 0xC000C000
-_020B5AA4: .word UNK_020FF8AC
-_020B5AA8: .word UNK_020FF894
-_020B5AAC: .word UNK_021CED14
+_020B5AA4: .word NNSi_objSizeWTbl
+_020B5AA8: .word NNSi_objSizeHTbl
+_020B5AAC: .word pTheInstance_
_020B5AB0: .word 0xC1FFFCFF
_020B5AB4: .word 0x000001FF
_020B5AB8: .word 0xFE00FF00
- arm_func_end FUN_020B57D8
-
+ arm_func_end DoAffineTransforme_
diff --git a/arm9/asm/NNS_G2D_g2d_softsprite.s b/arm9/asm/NNS_G2D_g2d_softsprite.s
index 9a22950f..49cddc88 100644
--- a/arm9/asm/NNS_G2D_g2d_softsprite.s
+++ b/arm9/asm/NNS_G2D_g2d_softsprite.s
@@ -3,9 +3,8 @@
.section .text
- ; NNS_G2dDrawSpriteFast
- arm_func_start FUN_020B0250
-FUN_020B0250: ; 0x020B0250
+ arm_func_start NNS_G2dDrawSpriteFast
+NNS_G2dDrawSpriteFast: ; 0x020B0250
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
ldr r5, _020B02C0 ; =0x04000470
@@ -31,17 +30,16 @@ FUN_020B0250: ; 0x020B0250
mov r2, r2, lsl #0xc
mov r3, r3, lsl #0xc
str r12, [lr, #0x0]
- bl FUN_020B0340
+ bl DrawOneQuad_
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
.balign 4
_020B02C0: .word 0x04000470
_020B02C4: .word 0x0400046C
- arm_func_end FUN_020B0250
+ arm_func_end NNS_G2dDrawSpriteFast
- ; NNS_G2dSetupSoftwareSpriteCamera
- arm_func_start FUN_020B02C8
-FUN_020B02C8: ; 0x020B02C8
+ arm_func_start NNS_G2dSetupSoftwareSpriteCamera
+NNS_G2dSetupSoftwareSpriteCamera: ; 0x020B02C8
stmdb sp!, {lr}
sub sp, sp, #0x14
ldr r2, _020B0330 ; =0xBFFF0000
@@ -73,11 +71,10 @@ _020B0330: .word 0xBFFF0000
_020B0334: .word 0x04000580
_020B0338: .word 0x0400044C
_020B033C: .word 0x04000440
- arm_func_end FUN_020B02C8
+ arm_func_end NNS_G2dSetupSoftwareSpriteCamera
- ; DrawOneQuad_
- arm_func_start FUN_020B0340
-FUN_020B0340: ; 0x020B0340
+ arm_func_start DrawOneQuad_
+DrawOneQuad_: ; 0x020B0340
stmdb sp!, {r4-r6,lr}
mov r3, r3, lsl #0x8
mov r0, r0, lsl #0x8
@@ -129,5 +126,4 @@ _020B03F8: .word 0x04000488
_020B03FC: .word 0x0400048C
_020B0400: .word 0x10001000
_020B0404: .word 0x04000504
- arm_func_end FUN_020B0340
-
+ arm_func_end DrawOneQuad_
diff --git a/arm9/asm/NNS_G2D_g2d_srtcontrol.s b/arm9/asm/NNS_G2D_g2d_srtcontrol.s
index 01f30a6d..7c9139ef 100644
--- a/arm9/asm/NNS_G2D_g2d_srtcontrol.s
+++ b/arm9/asm/NNS_G2D_g2d_srtcontrol.s
@@ -3,9 +3,8 @@
.section .text
- ; _end
- arm_func_start FUN_020B1A40
-FUN_020B1A40: ; 0x020B1A40
+ arm_func_start NNSi_G2dSrtcSetInitialValue
+NNSi_G2dSrtcSetInitialValue: ; 0x020B1A40
stmdb sp!, {r4,lr}
mov r4, r0
add r1, r4, #0x4
@@ -16,21 +15,19 @@ FUN_020B1A40: ; 0x020B1A40
str r0, [r4, #0x4]
str r0, [r4, #0x8]
ldmia sp!, {r4,pc}
- arm_func_end FUN_020B1A40
+ arm_func_end NNSi_G2dSrtcSetInitialValue
- ; NNSi_G2dSrtcInitControl
- arm_func_start FUN_020B1A68
-FUN_020B1A68: ; 0x020B1A68
- ldr ip, _020B1A74 ; =FUN_020B1A40
+ arm_func_start NNSi_G2dSrtcInitControl
+NNSi_G2dSrtcInitControl: ; 0x020B1A68
+ ldr ip, _020B1A74 ; =NNSi_G2dSrtcSetInitialValue
str r1, [r0, #0x0]
bx r12
.balign 4
-_020B1A74: .word FUN_020B1A40
- arm_func_end FUN_020B1A68
+_020B1A74: .word NNSi_G2dSrtcSetInitialValue
+ arm_func_end NNSi_G2dSrtcInitControl
- ; _end
- arm_func_start FUN_020B1A78
-FUN_020B1A78: ; 0x020B1A78
+ arm_func_start NNSi_G2dSrtcSetSRTScale
+NNSi_G2dSrtcSetSRTScale: ; 0x020B1A78
ldr r3, [r0, #0x0]
cmp r3, #0x1
ldreqh r3, [r0, #0x12]
@@ -39,11 +36,10 @@ FUN_020B1A78: ; 0x020B1A78
streq r1, [r0, #0x4]
streq r2, [r0, #0x8]
bx lr
- arm_func_end FUN_020B1A78
+ arm_func_end NNSi_G2dSrtcSetSRTScale
- ; _end
- arm_func_start FUN_020B1A98
-FUN_020B1A98: ; 0x020B1A98
+ arm_func_start NNSi_G2dSrtcSetSRTRotZ
+NNSi_G2dSrtcSetSRTRotZ: ; 0x020B1A98
ldr r2, [r0, #0x0]
cmp r2, #0x1
ldreqh r2, [r0, #0x12]
@@ -51,11 +47,10 @@ FUN_020B1A98: ; 0x020B1A98
streqh r2, [r0, #0x12]
streqh r1, [r0, #0x10]
bx lr
- arm_func_end FUN_020B1A98
+ arm_func_end NNSi_G2dSrtcSetSRTRotZ
- ; _end
- arm_func_start FUN_020B1AB4
-FUN_020B1AB4: ; 0x020B1AB4
+ arm_func_start NNSi_G2dSrtcSetTrans
+NNSi_G2dSrtcSetTrans: ; 0x020B1AB4
ldr r3, [r0, #0x0]
cmp r3, #0x1
ldreqh r3, [r0, #0x12]
@@ -64,5 +59,4 @@ FUN_020B1AB4: ; 0x020B1AB4
streqh r1, [r0, #0xc]
streqh r2, [r0, #0xe]
bx lr
- arm_func_end FUN_020B1AB4
-
+ arm_func_end NNSi_G2dSrtcSetTrans
diff --git a/arm9/asm/NNS_G2D_g2d_textcanvas.s b/arm9/asm/NNS_G2D_g2d_textcanvas.s
index 7ac3477a..95ebf85a 100644
--- a/arm9/asm/NNS_G2D_g2d_textcanvas.s
+++ b/arm9/asm/NNS_G2D_g2d_textcanvas.s
@@ -3,9 +3,8 @@
.section .text
- ; _end
- arm_func_start FUN_020B7168
-FUN_020B7168: ; 0x020B7168
+ arm_func_start NNSi_G2dTextCanvasDrawTextRect
+NNSi_G2dTextCanvasDrawTextRect: ; 0x020B7168
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0xc
ldr r12, [sp, #0x28]
@@ -18,7 +17,7 @@ FUN_020B7168: ; 0x020B7168
ldr r0, [r7, #0x4]
ldr r1, [r7, #0xc]
ldr r2, [sp, #0x2c]
- bl FUN_020B5B54
+ bl NNSi_G2dFontGetTextHeight
ldr r1, [sp, #0x20]
sub r0, r1, r0
add r5, r5, r0
@@ -29,7 +28,7 @@ _020B71AC:
ldr r0, [r7, #0x4]
ldr r1, [r7, #0xc]
ldr r2, [sp, #0x2c]
- bl FUN_020B5B54
+ bl NNSi_G2dFontGetTextHeight
ldr r2, [sp, #0x20]
add r1, r0, #0x1
add r0, r2, #0x1
@@ -49,14 +48,13 @@ _020B71E4:
mov r2, r5
mov r3, r4
str r12, [sp, #0x8]
- bl FUN_020B72C4
+ bl NNSi_G2dTextCanvasDrawTextAlign
add sp, sp, #0xc
ldmia sp!, {r4-r7,pc}
- arm_func_end FUN_020B7168
+ arm_func_end NNSi_G2dTextCanvasDrawTextRect
- ; _end
- arm_func_start FUN_020B7218
-FUN_020B7218: ; 0x020B7218
+ arm_func_start NNSi_G2dTextCanvasDrawText
+NNSi_G2dTextCanvasDrawText: ; 0x020B7218
stmdb sp!, {r4-r8,lr}
sub sp, sp, #0x18
ldr r4, [sp, #0x34]
@@ -70,7 +68,7 @@ FUN_020B7218: ; 0x020B7218
ldr r2, [r8, #0x8]
ldr r3, [r8, #0xc]
add r0, sp, #0xc
- bl FUN_020B5ABC
+ bl NNSi_G2dFontGetTextRect
ands r0, r4, #0x10
ldrne r0, [sp, #0xc]
addne r0, r0, #0x1
@@ -99,14 +97,13 @@ _020B7298:
mov r0, r8
mov r1, r7
mov r2, r6
- bl FUN_020B72C4
+ bl NNSi_G2dTextCanvasDrawTextAlign
add sp, sp, #0x18
ldmia sp!, {r4-r8,pc}
- arm_func_end FUN_020B7218
+ arm_func_end NNSi_G2dTextCanvasDrawText
- ; _end
- arm_func_start FUN_020B72C4
-FUN_020B72C4: ; 0x020B72C4
+ arm_func_start NNSi_G2dTextCanvasDrawTextAlign
+NNSi_G2dTextCanvasDrawTextAlign: ; 0x020B72C4
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x14
mov r10, r0
@@ -141,7 +138,7 @@ _020B732C:
ldr r1, [r10, #0x8]
ldr r2, [sp, #0xc]
mov r3, r4
- bl FUN_020B5BC8
+ bl NNSi_G2dFontGetStringWidth
sub r0, r7, r0
add r1, r9, r0
b _020B7388
@@ -152,7 +149,7 @@ _020B7358:
ldr r1, [r10, #0x8]
ldr r2, [sp, #0xc]
mov r3, r4
- bl FUN_020B5BC8
+ bl NNSi_G2dFontGetStringWidth
add r0, r0, #0x1
add r1, r0, r0, lsr #0x1f
ldr r0, [sp, #0x8]
@@ -166,18 +163,17 @@ _020B7388:
ldr r3, [sp, #0x38]
mov r0, r10
mov r2, r8
- bl FUN_020B73C0
+ bl NNSi_G2dTextCanvasDrawString
ldr r0, [sp, #0xc]
add r8, r8, r6
cmp r0, #0x0
bne _020B732C
add sp, sp, #0x14
ldmia sp!, {r4-r11,pc}
- arm_func_end FUN_020B72C4
+ arm_func_end NNSi_G2dTextCanvasDrawTextAlign
- ; _end
- arm_func_start FUN_020B73C0
-FUN_020B73C0: ; 0x020B73C0
+ arm_func_start NNSi_G2dTextCanvasDrawString
+NNSi_G2dTextCanvasDrawString: ; 0x020B73C0
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0xc
mov r10, r0
@@ -203,7 +199,7 @@ _020B7400:
mov r1, r5
mov r2, r9
mov r3, r8
- bl FUN_020B63CC
+ bl NNS_G2dCharCanvasDrawChar
add r1, r9, r0
mov r0, r11
add r9, r1, r6
@@ -222,5 +218,4 @@ _020B743C:
str r1, [r0, #0x0]
add sp, sp, #0xc
ldmia sp!, {r4-r11,pc}
- arm_func_end FUN_020B73C0
-
+ arm_func_end NNSi_G2dTextCanvasDrawString
diff --git a/arm9/asm/NNS_G2D_g2di_bitreader.s b/arm9/asm/NNS_G2D_g2di_bitreader.s
index da823629..d36c774f 100644
--- a/arm9/asm/NNS_G2D_g2di_bitreader.s
+++ b/arm9/asm/NNS_G2D_g2di_bitreader.s
@@ -3,9 +3,8 @@
.section .text
- ; _end
- arm_func_start FUN_020B76B0
-FUN_020B76B0: ; 0x020B76B0
+ arm_func_start NNSi_G2dBitReaderRead
+NNSi_G2dBitReaderRead: ; 0x020B76B0
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
ldrsb r2, [r0, #0x4]
@@ -25,7 +24,7 @@ FUN_020B76B0: ; 0x020B76B0
strb r2, [r0, #0x5]
mov r2, #0x8
strb r2, [r0, #0x4]
- bl FUN_020B76B0
+ bl NNSi_G2dBitReaderRead
orr r5, r0, r5
_020B7704:
rsb r0, r4, #0x8
@@ -33,5 +32,4 @@ _020B7704:
and r0, r5, r1, asr r0
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
- arm_func_end FUN_020B76B0
-
+ arm_func_end NNSi_G2dBitReaderRead
diff --git a/arm9/asm/NNS_G2D_g2di_mtx32.s b/arm9/asm/NNS_G2D_g2di_mtx32.s
index 777ed944..68fa5831 100644
--- a/arm9/asm/NNS_G2D_g2di_mtx32.s
+++ b/arm9/asm/NNS_G2D_g2di_mtx32.s
@@ -3,9 +3,8 @@
.section .text
- ; _end
- arm_func_start FUN_020B423C
-FUN_020B423C: ; 0x020B423C
+ arm_func_start NNSi_G2dMtxConcat32
+NNSi_G2dMtxConcat32: ; 0x020B423C
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x1c
ldr r4, [r0, #0x4]
@@ -77,5 +76,4 @@ FUN_020B423C: ; 0x020B423C
stmeqia r12, {r0-r1}
add sp, sp, #0x1c
ldmia sp!, {r4-r7,pc}
- arm_func_end FUN_020B423C
-
+ arm_func_end NNSi_G2dMtxConcat32
diff --git a/arm9/asm/NNS_G2D_g2di_splitchar.s b/arm9/asm/NNS_G2D_g2di_splitchar.s
index e96ae08d..4df7621d 100644
--- a/arm9/asm/NNS_G2D_g2di_splitchar.s
+++ b/arm9/asm/NNS_G2D_g2di_splitchar.s
@@ -3,13 +3,11 @@
.section .text
- ; _end
- arm_func_start FUN_020B7718
-FUN_020B7718: ; 0x020B7718
+ arm_func_start NNSi_G2dSplitCharUTF16
+NNSi_G2dSplitCharUTF16: ; 0x020B7718
ldr r1, [r0, #0x0]
ldrh r2, [r1], #0x2
str r1, [r0, #0x0]
mov r0, r2
bx lr
- arm_func_end FUN_020B7718
-
+ arm_func_end NNSi_G2dSplitCharUTF16
diff --git a/arm9/asm/NNS_G3D_1mat1shp.s b/arm9/asm/NNS_G3D_1mat1shp.s
index 34f2e482..01cb5a35 100644
--- a/arm9/asm/NNS_G3D_1mat1shp.s
+++ b/arm9/asm/NNS_G3D_1mat1shp.s
@@ -3,9 +3,8 @@
.section .text
- ; NNS_G3dDraw1Mat1Shp
- arm_func_start FUN_020BAFB8
-FUN_020BAFB8: ; 0x020BAFB8
+ arm_func_start NNS_G3dDraw1Mat1Shp
+NNS_G3dDraw1Mat1Shp: ; 0x020BAFB8
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x6c
mov r6, r0
@@ -21,7 +20,7 @@ FUN_020BAFB8: ; 0x020BAFB8
str r12, [sp, #0x54]
str r12, [sp, #0x58]
str r12, [sp, #0x5c]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020BAFF8:
cmp r7, #0x0
beq _020BB150
@@ -59,13 +58,13 @@ _020BAFF8:
add r1, sp, #0x4
mov r2, #0x6
str r3, [sp, #0x18]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
ldrh r0, [r4, #0x1e]
ands r0, r0, #0x1
beq _020BB150
ldrb r12, [r6, #0x16]
mov r3, #0x8
- ldr r1, _020BB1BC ; =UNK_02106620
+ ldr r1, _020BB1BC ; =NNS_G3dSendTexSRT_FuncArray
str r3, [sp, #0x1c]
ldrh r2, [r4, #0x20]
add r0, r4, #0x2c
@@ -123,7 +122,7 @@ _020BB150:
ldr r0, [r2, #0x8]
ldr r1, [r2, #0xc]
add r0, r2, r0
- bl FUN_020BB2B0
+ bl NNS_G3dGeSendDL
ldr r3, [r6, #0x20]
cmp r3, #0x1000
addeq sp, sp, #0x6c
@@ -134,12 +133,11 @@ _020BB150:
str r3, [sp, #0x60]
str r3, [sp, #0x64]
str r3, [sp, #0x68]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
add sp, sp, #0x6c
ldmia sp!, {r4-r7,pc}
.balign 4
_020BB1B4: .word 0x00293130
_020BB1B8: .word 0x00002B2A
-_020BB1BC: .word UNK_02106620
- arm_func_end FUN_020BAFB8
-
+_020BB1BC: .word NNS_G3dSendTexSRT_FuncArray
+ arm_func_end NNS_G3dDraw1Mat1Shp
diff --git a/arm9/asm/NNS_G3D_3dsmax.s b/arm9/asm/NNS_G3D_3dsmax.s
index 8037126d..e54e2315 100644
--- a/arm9/asm/NNS_G3D_3dsmax.s
+++ b/arm9/asm/NNS_G3D_3dsmax.s
@@ -2,24 +2,20 @@
.include "global.inc"
.section .data
-
- ; calcTexMtx_
- .global UNK_021067D0
-UNK_021067D0: ; 0x021067D0
- .word FUN_020BF988
- .word FUN_020BF894
- .word FUN_020BF810
- .word FUN_020BF7C8
- .word FUN_020BF6C8
- .word FUN_020BF5E8
- .word FUN_020BF598
- .word FUN_020BF574
+calcTexMtx_: ; 0x021067D0
+ .word texmtxCalc_flag_
+ .word texmtxCalc_flagS_
+ .word texmtxCalc_flagR_
+ .word texmtxCalc_flagRS_
+ .word texmtxCalc_flagT_
+ .word texmtxCalc_flagTS_
+ .word texmtxCalc_flagTR_
+ .word texmtxCalc_flagTRS_
.section .text
- ; NNSi_G3dSendTexSRT3dsMax
- arm_func_start FUN_020BF42C
-FUN_020BF42C: ; 0x020BF42C
+ arm_func_start NNSi_G3dSendTexSRT3dsMax
+NNSi_G3dSendTexSRT3dsMax: ; 0x020BF42C
stmdb sp!, {r4,lr}
sub sp, sp, #0x50
mov r4, r0
@@ -46,7 +42,7 @@ FUN_020BF42C: ; 0x020BF42C
str r1, [sp, #0x14]
str r1, [sp, #0x10]
ldr r1, [r4, #0x0]
- ldr r0, _020BF570 ; =UNK_021067D0
+ ldr r0, _020BF570 ; =calcTexMtx_
and r1, r1, #0x7
ldr r2, [r0, r1, lsl #0x2]
add r0, sp, #0x8
@@ -98,18 +94,17 @@ _020BF54C:
ldr r0, [sp, #0x0]
add r1, r1, #0x4
mov r2, #0x12
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
add sp, sp, #0x50
ldmia sp!, {r4,pc}
.balign 4
_020BF568: .word 0x00101610
_020BF56C: .word 0x00101810
-_020BF570: .word UNK_021067D0
- arm_func_end FUN_020BF42C
+_020BF570: .word calcTexMtx_
+ arm_func_end NNSi_G3dSendTexSRT3dsMax
- ; _end
- arm_func_start FUN_020BF574
-FUN_020BF574: ; 0x020BF574
+ local_arm_func_start texmtxCalc_flagTRS_
+texmtxCalc_flagTRS_: ; 0x020BF574
mov r2, #0x1000
str r2, [r0, #0x0]
mov r1, #0x0
@@ -119,11 +114,10 @@ FUN_020BF574: ; 0x020BF574
str r1, [r0, #0x30]
str r1, [r0, #0x34]
bx lr
- arm_func_end FUN_020BF574
+ arm_func_end texmtxCalc_flagTRS_
- ; _end
- arm_func_start FUN_020BF598
-FUN_020BF598: ; 0x020BF598
+ local_arm_func_start texmtxCalc_flagTR_
+texmtxCalc_flagTR_: ; 0x020BF598
ldr r2, [r1, #0x18]
mov r12, #0x0
str r2, [r0, #0x0]
@@ -144,11 +138,10 @@ FUN_020BF598: ; 0x020BF598
str r1, [r0, #0x34]
str r12, [r0, #0x10]
bx lr
- arm_func_end FUN_020BF598
+ arm_func_end texmtxCalc_flagTR_
- ; _end
- arm_func_start FUN_020BF5E8
-FUN_020BF5E8: ; 0x020BF5E8
+ local_arm_func_start texmtxCalc_flagTS_
+texmtxCalc_flagTS_: ; 0x020BF5E8
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r5, r1
@@ -205,11 +198,10 @@ FUN_020BF5E8: ; 0x020BF5E8
str r0, [r6, #0x10]
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
- arm_func_end FUN_020BF5E8
+ arm_func_end texmtxCalc_flagTS_
- ; _end
- arm_func_start FUN_020BF6C8
-FUN_020BF6C8: ; 0x020BF6C8
+ local_arm_func_start texmtxCalc_flagT_
+texmtxCalc_flagT_: ; 0x020BF6C8
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x4
mov r9, r1
@@ -274,11 +266,10 @@ FUN_020BF6C8: ; 0x020BF6C8
str r0, [r10, #0x10]
add sp, sp, #0x4
ldmia sp!, {r4-r11,pc}
- arm_func_end FUN_020BF6C8
+ arm_func_end texmtxCalc_flagT_
- ; _end
- arm_func_start FUN_020BF7C8
-FUN_020BF7C8: ; 0x020BF7C8
+ local_arm_func_start texmtxCalc_flagRS_
+texmtxCalc_flagRS_: ; 0x020BF7C8
mov r2, #0x1000
str r2, [r0, #0x0]
str r2, [r0, #0x14]
@@ -297,11 +288,10 @@ FUN_020BF7C8: ; 0x020BF7C8
str r1, [r0, #0x34]
str r12, [r0, #0x10]
bx lr
- arm_func_end FUN_020BF7C8
+ arm_func_end texmtxCalc_flagRS_
- ; _end
- arm_func_start FUN_020BF810
-FUN_020BF810: ; 0x020BF810
+ local_arm_func_start texmtxCalc_flagR_
+texmtxCalc_flagR_: ; 0x020BF810
stmdb sp!, {r4-r6,lr}
ldr r2, [r1, #0x18]
mov r3, #0x0
@@ -335,11 +325,10 @@ FUN_020BF810: ; 0x020BF810
str r1, [r0, #0x34]
str r3, [r0, #0x10]
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020BF810
+ arm_func_end texmtxCalc_flagR_
- ; _end
- arm_func_start FUN_020BF894
-FUN_020BF894: ; 0x020BF894
+ local_arm_func_start texmtxCalc_flagS_
+texmtxCalc_flagS_: ; 0x020BF894
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r5, r1
@@ -401,11 +390,10 @@ FUN_020BF894: ; 0x020BF894
str r0, [r6, #0x10]
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
- arm_func_end FUN_020BF894
+ arm_func_end texmtxCalc_flagS_
- ; _end
- arm_func_start FUN_020BF988
-FUN_020BF988: ; 0x020BF988
+ local_arm_func_start texmtxCalc_flag_
+texmtxCalc_flag_: ; 0x020BF988
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x4
mov r9, r1
@@ -475,5 +463,4 @@ FUN_020BF988: ; 0x020BF988
str r0, [r10, #0x10]
add sp, sp, #0x4
ldmia sp!, {r4-r11,pc}
- arm_func_end FUN_020BF988
-
+ arm_func_end texmtxCalc_flag_
diff --git a/arm9/asm/NNS_G3D_anm.s b/arm9/asm/NNS_G3D_anm.s
index ddd94ecd..512ef7c0 100644
--- a/arm9/asm/NNS_G3D_anm.s
+++ b/arm9/asm/NNS_G3D_anm.s
@@ -3,77 +3,62 @@
.section .data
- ; NNS_G3dAnmFmtNum
- .global UNK_02106594
-UNK_02106594: ; 0x02106594
+ .global NNS_G3dAnmFmtNum
+NNS_G3dAnmFmtNum: ; 0x02106594
.byte 0x05, 0x00, 0x00, 0x00
- ; NNS_G3dFuncAnmVisNsBvaDefault
- .global UNK_02106598
-UNK_02106598: ; 0x02106598
- .word FUN_020BE5A0
+ .global NNS_G3dFuncAnmVisNsBvaDefault
+NNS_G3dFuncAnmVisNsBvaDefault: ; 0x02106598
+ .word NNSi_G3dAnmCalcNsBva
- ; NNS_G3dFuncAnmJntNsBcaDefault
- .global UNK_0210659C
-UNK_0210659C: ; 0x0210659C
- .word FUN_020BDA70
+ .global NNS_G3dFuncAnmJntNsBcaDefault
+NNS_G3dFuncAnmJntNsBcaDefault: ; 0x0210659C
+ .word NNSi_G3dAnmCalcNsBca
- ; NNS_G3dFuncAnmMatNsBtaDefault
- .global UNK_021065A0
-UNK_021065A0: ; 0x021065A0
- .word FUN_020BDF38
+ .global NNS_G3dFuncAnmMatNsBtaDefault
+NNS_G3dFuncAnmMatNsBtaDefault: ; 0x021065A0
+ .word NNSi_G3dAnmCalcNsBta
- ; NNS_G3dFuncAnmMatNsBtpDefault
- .global UNK_021065A4
-UNK_021065A4: ; 0x021065A4
- .word FUN_020BE334
+ .global NNS_G3dFuncAnmMatNsBtpDefault
+NNS_G3dFuncAnmMatNsBtpDefault: ; 0x021065A4
+ .word NNSi_G3dAnmCalcNsBtp
- ; NNS_G3dFuncAnmMatNsBmaDefault
- .global UNK_021065A8
-UNK_021065A8: ; 0x021065A8
- .word FUN_020BDB40
+ .global NNS_G3dFuncAnmMatNsBmaDefault
+NNS_G3dFuncAnmMatNsBmaDefault: ; 0x021065A8
+ .word NNSi_G3dAnmCalcNsBma
- ; NNS_G3dFuncBlendVisDefault
- .global UNK_021065AC
-UNK_021065AC: ; 0x021065AC
- .word FUN_020B8640
+ .global NNS_G3dFuncBlendVisDefault
+NNS_G3dFuncBlendVisDefault: ; 0x021065AC
+ .word NNSi_G3dAnmBlendVis
- ; NNS_G3dFuncBlendJntDefault
- .global UNK_021065B0
-UNK_021065B0: ; 0x021065B0
- .word FUN_020B86B0
+ .global NNS_G3dFuncBlendJntDefault
+NNS_G3dFuncBlendJntDefault: ; 0x021065B0
+ .word NNSi_G3dAnmBlendJnt
- ; NNS_G3dFuncBlendMatDefault
- .global UNK_021065B4
-UNK_021065B4: ; 0x021065B4
- .word FUN_020B8A08
+ .global NNS_G3dFuncBlendMatDefault
+NNS_G3dFuncBlendMatDefault: ; 0x021065B4
+ .word NNSi_G3dAnmBlendMat
- ; NNS_G3dAnmObjInitFuncArray
- .global UNK_021065B8
-UNK_021065B8: ; 0x021065B8
+ .global NNS_G3dAnmObjInitFuncArray
+NNS_G3dAnmObjInitFuncArray: ; 0x021065B8
.byte 0x4D, 0x00, 0x41, 0x4D
-
- ; NNS_G3dAnmObjInitFuncArray + 0x4
- .global UNK_021065BC
-UNK_021065BC: ; 0x021065BC
- .word FUN_020BDC0C
+ .word NNSi_G3dAnmObjInitNsBma
.byte 0x4D, 0x00, 0x50, 0x54
- .word FUN_020BE4F0
+ .word NNSi_G3dAnmObjInitNsBtp
.byte 0x4D, 0x00, 0x41, 0x54
- .word FUN_020BDF84
+ .word NNSi_G3dAnmObjInitNsBta
.byte 0x56, 0x00, 0x41, 0x56
- .word FUN_020BE5E0
+ .word NNSi_G3dAnmObjInitNsBva
.byte 0x4A, 0x00, 0x41, 0x43
- .word FUN_020BDAB4
+ .word NNSi_G3dAnmObjInitNsBca
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.section .text
- ; _end
- arm_func_start FUN_020B8640
-FUN_020B8640: ; 0x020B8640
+ arm_func_start NNSi_G3dAnmBlendVis
+NNSi_G3dAnmBlendVis: ; 0x020B8640
stmdb sp!, {r4-r8,lr}
sub sp, sp, #0x8
mov r7, r0
@@ -104,11 +89,10 @@ _020B869C:
bne _020B8664
add sp, sp, #0x8
ldmia sp!, {r4-r8,pc}
- arm_func_end FUN_020B8640
+ arm_func_end NNSi_G3dAnmBlendVis
- ; _end
- arm_func_start FUN_020B86B0
-FUN_020B86B0: ; 0x020B86B0
+ arm_func_start NNSi_G3dAnmBlendJnt
+NNSi_G3dAnmBlendJnt: ; 0x020B86B0
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x5c
mov r9, r1
@@ -199,19 +183,19 @@ _020B87F0:
mov r2, r6
add r0, r10, #0x4
and r3, r3, #0x1
- bl FUN_020B8998
+ bl blendScaleVec_
ldr r1, [sp, #0x0]
add r0, r10, #0x10
and r3, r1, #0x8
mov r1, r11
mov r2, r6
- bl FUN_020B8998
+ bl blendScaleVec_
ldr r3, [sp, #0x0]
add r0, r10, #0x1c
add r1, sp, #0x1c
mov r2, r6
and r3, r3, #0x10
- bl FUN_020B8998
+ bl blendScaleVec_
ldr r0, [sp, #0x0]
ands r0, r0, #0x4
bne _020B8898
@@ -304,11 +288,10 @@ _020B8948:
mov r0, #0x1
add sp, sp, #0x5c
ldmia sp!, {r4-r11,pc}
- arm_func_end FUN_020B86B0
+ arm_func_end NNSi_G3dAnmBlendJnt
- ; _end
- arm_func_start FUN_020B8998
-FUN_020B8998: ; 0x020B8998
+ arm_func_start blendScaleVec_
+blendScaleVec_: ; 0x020B8998
cmp r3, #0x0
beq _020B89C8
ldr r1, [r0, #0x0]
@@ -338,11 +321,10 @@ _020B89C8:
add r1, r3, r1, asr #0xc
str r1, [r0, #0x8]
bx lr
- arm_func_end FUN_020B8998
+ arm_func_end blendScaleVec_
- ; _end
- arm_func_start FUN_020B8A08
-FUN_020B8A08: ; 0x020B8A08
+ arm_func_start NNSi_G3dAnmBlendMat
+NNSi_G3dAnmBlendMat: ; 0x020B8A08
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r6, r0
@@ -367,5 +349,4 @@ _020B8A4C:
bne _020B8A24
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
- arm_func_end FUN_020B8A08
-
+ arm_func_end NNSi_G3dAnmBlendMat
diff --git a/arm9/asm/NNS_G3D_basic.s b/arm9/asm/NNS_G3D_basic.s
index 03950bfc..a9849429 100644
--- a/arm9/asm/NNS_G3D_basic.s
+++ b/arm9/asm/NNS_G3D_basic.s
@@ -3,9 +3,8 @@
.section .text
- ; _end
- arm_func_start FUN_020BE62C
-FUN_020BE62C: ; 0x020BE62C
+ arm_func_start NNSi_G3dGetJointScaleBasic
+NNSi_G3dGetJointScaleBasic: ; 0x020BE62C
ands r2, r3, #0x4
ldrne r1, [r0, #0x0]
orrne r1, r1, #0x1
@@ -22,11 +21,10 @@ _020BE658:
orr r1, r1, #0x18
str r1, [r0, #0x0]
bx lr
- arm_func_end FUN_020BE62C
+ arm_func_end NNSi_G3dGetJointScaleBasic
- ; _end
- arm_func_start FUN_020BE668
-FUN_020BE668: ; 0x020BE668
+ arm_func_start NNSi_G3dSendJointSRTBasic
+NNSi_G3dSendJointSRTBasic: ; 0x020BE668
stmdb sp!, {r4,lr}
mov r4, r0
ldr r1, [r4, #0x0]
@@ -37,13 +35,13 @@ FUN_020BE668: ; 0x020BE668
add r1, r4, #0x28
mov r0, #0x19
mov r2, #0xc
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
b _020BE6C4
_020BE698:
add r1, r4, #0x4c
mov r0, #0x1c
mov r2, #0x3
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
b _020BE6C4
_020BE6AC:
ands r0, r1, #0x2
@@ -51,7 +49,7 @@ _020BE6AC:
add r1, r4, #0x28
mov r0, #0x1a
mov r2, #0x9
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020BE6C4:
ldr r0, [r4, #0x0]
ands r0, r0, #0x1
@@ -59,7 +57,6 @@ _020BE6C4:
add r1, r4, #0x4
mov r0, #0x1b
mov r2, #0x3
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
ldmia sp!, {r4,pc}
- arm_func_end FUN_020BE668
-
+ arm_func_end NNSi_G3dSendJointSRTBasic
diff --git a/arm9/asm/NNS_G3D_cgtool.s b/arm9/asm/NNS_G3D_cgtool.s
index 9abb2031..e17cfaf5 100644
--- a/arm9/asm/NNS_G3D_cgtool.s
+++ b/arm9/asm/NNS_G3D_cgtool.s
@@ -3,25 +3,21 @@
.section .data
- ; NNS_G3dSendJointSRT_FuncArray
- .global UNK_02106608
-UNK_02106608: ; 0x02106608
- .word FUN_020BE668
- .word FUN_020BEE3C
- .word FUN_020BF2FC
+ .global NNS_G3dSendJointSRT_FuncArray
+NNS_G3dSendJointSRT_FuncArray: ; 0x02106608
+ .word NNSi_G3dSendJointSRTBasic
+ .word NNSi_G3dSendJointSRTMaya
+ .word NNSi_G3dSendJointSRTSi3d
- ; NNS_G3dGetJointScale_FuncArray
- .global UNK_02106614
-UNK_02106614: ; 0x02106614
- .word FUN_020BE62C
- .word FUN_020BECEC
- .word FUN_020BF0D4
-
- ; NNS_G3dSendTexSRT_FuncArray
- .global UNK_02106620
-UNK_02106620: ; 0x02106620
- .word FUN_020BE6E4
- .word FUN_020BEF10
- .word FUN_020BF42C
- .word FUN_020BFA9C
+ .global NNS_G3dGetJointScale_FuncArray
+NNS_G3dGetJointScale_FuncArray: ; 0x02106614
+ .word NNSi_G3dGetJointScaleBasic
+ .word NNSi_G3dGetJointScaleMaya
+ .word NNSi_G3dGetJointScaleSi3d
+ .global NNS_G3dSendTexSRT_FuncArray
+NNS_G3dSendTexSRT_FuncArray: ; 0x02106620
+ .word NNSi_G3dSendTexSRTMaya
+ .word NNSi_G3dSendTexSRTSi3d
+ .word NNSi_G3dSendTexSRT3dsMax
+ .word NNSi_G3dSendTexSRTXsi
diff --git a/arm9/asm/NNS_G3D_gecom.s b/arm9/asm/NNS_G3D_gecom.s
index 56c81114..2caeb535 100644
--- a/arm9/asm/NNS_G3D_gecom.s
+++ b/arm9/asm/NNS_G3D_gecom.s
@@ -3,35 +3,31 @@
.section .bss
- ; NNS_G3dGeBuffer
- .global UNK_021D1C80
-UNK_021D1C80: ; 0x021D1C80
+ .global NNS_G3dGeBuffer
+NNS_G3dGeBuffer: ; 0x021D1C80
.space 0x4
- ; NNS_G3dFlagGXDmaAsync
- .global UNK_021D1C84
-UNK_021D1C84: ; 0x021D1C84
+ .global NNS_G3dFlagGXDmaAsync
+NNS_G3dFlagGXDmaAsync: ; 0x021D1C84
.space 0x4
- ; NNS_G3dFlagUseFastDma
- .global UNK_021D1C88
-UNK_021D1C88: ; 0x021D1C88
+ .global NNS_G3dFlagUseFastDma
+NNS_G3dFlagUseFastDma: ; 0x021D1C88
.space 0x4
.section .text
- ; NNS_G3dGeBufferOP_N
- arm_func_start FUN_020BB1C0
-FUN_020BB1C0: ; 0x020BB1C0
+ arm_func_start NNS_G3dGeBufferOP_N
+NNS_G3dGeBufferOP_N: ; 0x020BB1C0
stmdb sp!, {r4-r6,lr}
- ldr r3, _020BB2A4 ; =UNK_021D1C80
+ ldr r3, _020BB2A4 ; =NNS_G3dGeBuffer
mov r6, r0
ldr r12, [r3, #0x0]
mov r5, r1
mov r4, r2
cmp r12, #0x0
beq _020BB278
- ldr r0, _020BB2A8 ; =UNK_021D1C84
+ ldr r0, _020BB2A8 ; =NNS_G3dFlagGXDmaAsync
ldr r0, [r0, #0x0]
cmp r0, #0x0
beq _020BB24C
@@ -52,7 +48,7 @@ FUN_020BB1C0: ; 0x020BB1C0
add r1, r2, r1, lsl #0x2
mov r2, r4, lsl #0x2
bl MIi_CpuCopyFast
- ldr r0, _020BB2A4 ; =UNK_021D1C80
+ ldr r0, _020BB2A4 ; =NNS_G3dGeBuffer
ldr r1, [r0, #0x0]
ldr r0, [r1, #0x0]
add r0, r0, r4
@@ -62,21 +58,21 @@ _020BB24C:
ldr r0, [r12, #0x0]
cmp r0, #0x0
beq _020BB260
- bl FUN_020BB394
+ bl NNS_G3dGeFlushBuffer
b _020BB28C
_020BB260:
- ldr r0, _020BB2A8 ; =UNK_021D1C84
+ ldr r0, _020BB2A8 ; =NNS_G3dFlagGXDmaAsync
ldr r0, [r0, #0x0]
cmp r0, #0x0
beq _020BB28C
- bl FUN_020BB37C
+ bl NNS_G3dGeWaitSendDL
b _020BB28C
_020BB278:
- ldr r0, _020BB2A8 ; =UNK_021D1C84
+ ldr r0, _020BB2A8 ; =NNS_G3dFlagGXDmaAsync
ldr r0, [r0, #0x0]
cmp r0, #0x0
beq _020BB28C
- bl FUN_020BB37C
+ bl NNS_G3dGeWaitSendDL
_020BB28C:
ldr r1, _020BB2AC ; =0x04000400
mov r0, r5
@@ -85,14 +81,13 @@ _020BB28C:
bl MIi_CpuSend32
ldmia sp!, {r4-r6,pc}
.balign 4
-_020BB2A4: .word UNK_021D1C80
-_020BB2A8: .word UNK_021D1C84
+_020BB2A4: .word NNS_G3dGeBuffer
+_020BB2A8: .word NNS_G3dFlagGXDmaAsync
_020BB2AC: .word 0x04000400
- arm_func_end FUN_020BB1C0
+ arm_func_end NNS_G3dGeBufferOP_N
- ; NNS_G3dGeSendDL
- arm_func_start FUN_020BB2B0
-FUN_020BB2B0: ; 0x020BB2B0
+ arm_func_start NNS_G3dGeSendDL
+NNS_G3dGeSendDL: ; 0x020BB2B0
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r4, r1
@@ -109,13 +104,13 @@ _020BB2DC:
ldr r0, [r5, #0x0]
add r1, r5, #0x4
sub r2, r2, #0x1
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
_020BB2F8:
- bl FUN_020BB394
- ldr r0, _020BB364 ; =UNK_021D1C88
- ldr r1, _020BB368 ; =UNK_021D1C84
+ bl NNS_G3dGeFlushBuffer
+ ldr r0, _020BB364 ; =NNS_G3dFlagUseFastDma
+ ldr r1, _020BB368 ; =NNS_G3dFlagGXDmaAsync
ldr r0, [r0, #0x0]
mov r2, #0x1
str r2, [r1, #0x0]
@@ -124,7 +119,7 @@ _020BB2F8:
ldr r0, _020BB360 ; =GXi_DmaId
str r1, [sp, #0x0]
ldr r0, [r0, #0x0]
- ldr r3, _020BB36C ; =FUN_020BB370
+ ldr r3, _020BB36C ; =simpleUnlock_
mov r1, r5
mov r2, r4
bl MI_SendGXCommandAsyncFast
@@ -134,7 +129,7 @@ _020BB33C:
ldr r0, _020BB360 ; =GXi_DmaId
str r1, [sp, #0x0]
ldr r0, [r0, #0x0]
- ldr r3, _020BB36C ; =FUN_020BB370
+ ldr r3, _020BB36C ; =simpleUnlock_
mov r1, r5
mov r2, r4
bl MI_SendGXCommandAsync
@@ -142,44 +137,41 @@ _020BB33C:
ldmia sp!, {r4-r5,pc}
.balign 4
_020BB360: .word GXi_DmaId
-_020BB364: .word UNK_021D1C88
-_020BB368: .word UNK_021D1C84
-_020BB36C: .word FUN_020BB370
- arm_func_end FUN_020BB2B0
+_020BB364: .word NNS_G3dFlagUseFastDma
+_020BB368: .word NNS_G3dFlagGXDmaAsync
+_020BB36C: .word simpleUnlock_
+ arm_func_end NNS_G3dGeSendDL
- ; _end
- arm_func_start FUN_020BB370
-FUN_020BB370: ; 0x020BB370
+ arm_func_start simpleUnlock_
+simpleUnlock_: ; 0x020BB370
mov r1, #0x0
str r1, [r0, #0x0]
bx lr
- arm_func_end FUN_020BB370
+ arm_func_end simpleUnlock_
- ; NNS_G3dGeWaitSendDL
- arm_func_start FUN_020BB37C
-FUN_020BB37C: ; 0x020BB37C
- ldr r0, _020BB390 ; =UNK_021D1C84
+ arm_func_start NNS_G3dGeWaitSendDL
+NNS_G3dGeWaitSendDL: ; 0x020BB37C
+ ldr r0, _020BB390 ; =NNS_G3dFlagGXDmaAsync
_020BB380:
ldr r1, [r0, #0x0]
cmp r1, #0x0
bne _020BB380
bx lr
.balign 4
-_020BB390: .word UNK_021D1C84
- arm_func_end FUN_020BB37C
+_020BB390: .word NNS_G3dFlagGXDmaAsync
+ arm_func_end NNS_G3dGeWaitSendDL
- ; NNS_G3dGeFlushBuffer
- arm_func_start FUN_020BB394
-FUN_020BB394: ; 0x020BB394
+ arm_func_start NNS_G3dGeFlushBuffer
+NNS_G3dGeFlushBuffer: ; 0x020BB394
stmdb sp!, {lr}
sub sp, sp, #0x4
- ldr r0, _020BB3FC ; =UNK_021D1C84
+ ldr r0, _020BB3FC ; =NNS_G3dFlagGXDmaAsync
ldr r0, [r0, #0x0]
cmp r0, #0x0
beq _020BB3B0
- bl FUN_020BB37C
+ bl NNS_G3dGeWaitSendDL
_020BB3B0:
- ldr r0, _020BB400 ; =UNK_021D1C80
+ ldr r0, _020BB400 ; =NNS_G3dGeBuffer
ldr r0, [r0, #0x0]
cmp r0, #0x0
addeq sp, sp, #0x4
@@ -192,15 +184,14 @@ _020BB3B0:
add r0, r0, #0x4
mov r2, r2, lsl #0x2
bl MIi_CpuSend32
- ldr r0, _020BB400 ; =UNK_021D1C80
+ ldr r0, _020BB400 ; =NNS_G3dGeBuffer
mov r1, #0x0
ldr r0, [r0, #0x0]
str r1, [r0, #0x0]
add sp, sp, #0x4
ldmia sp!, {pc}
.balign 4
-_020BB3FC: .word UNK_021D1C84
-_020BB400: .word UNK_021D1C80
+_020BB3FC: .word NNS_G3dFlagGXDmaAsync
+_020BB400: .word NNS_G3dGeBuffer
_020BB404: .word 0x04000400
- arm_func_end FUN_020BB394
-
+ arm_func_end NNS_G3dGeFlushBuffer
diff --git a/arm9/asm/NNS_G3D_glbstate.s b/arm9/asm/NNS_G3D_glbstate.s
index 73b6609d..3dbb215f 100644
--- a/arm9/asm/NNS_G3D_glbstate.s
+++ b/arm9/asm/NNS_G3D_glbstate.s
@@ -3,275 +3,199 @@
.section .bss
- ; NNS_G3dGlb
- .global UNK_021CED18
-UNK_021CED18: ; 0x021CED18
- .space 0x8
-
- ; NNS_G3dGlb + 0x8
- .global UNK_021CED20
-UNK_021CED20: ; 0x021CED20
- .space 0x44
-
- ; NNS_G3dGlb + 0x4C
- .global UNK_021CED64
-UNK_021CED64: ; 0x021CED64
- .space 0x34
-
- ; NNS_G3dGlb + 0x80
- .global UNK_021CED98
-UNK_021CED98: ; 0x021CED98
- .space 0x28
-
- ; NNS_G3dGlb + 0xA8
- .global UNK_021CEDC0
-UNK_021CEDC0: ; 0x021CEDC0
- .space 0x14
-
- ; NNS_G3dGlb + 0xBC
- .global UNK_021CEDD4
-UNK_021CEDD4: ; 0x021CEDD4
- .space 0x24
-
- ; NNS_G3dGlb + 0xE0
- .global UNK_021CEDF8
-UNK_021CEDF8: ; 0x021CEDF8
- .space 0xc
-
- ; NNS_G3dGlb + 0xEC
- .global UNK_021CEE04
-UNK_021CEE04: ; 0x021CEE04
- .space 0x14
-
- ; NNS_G3dGlb + 0x100
- .global UNK_021CEE18
-UNK_021CEE18: ; 0x021CEE18
- .space 0x30
-
- ; NNS_G3dGlb + 0x130
- .global UNK_021CEE48
-UNK_021CEE48: ; 0x021CEE48
- .space 0x30
-
- ; NNS_G3dGlb + 0x160
- .global UNK_021CEE78
-UNK_021CEE78: ; 0x021CEE78
- .space 0xe0
-
- ; NNS_G3dGlb + 0x240
- .global UNK_021CEF58
-UNK_021CEF58: ; 0x021CEF58
- .space 0xc
-
- ; NNS_G3dGlb + 0x24C
- .global UNK_021CEF64
-UNK_021CEF64: ; 0x021CEF64
- .space 0xc
-
- ; NNS_G3dGlb + 0x258
- .global UNK_021CEF70
-UNK_021CEF70: ; 0x021CEF70
- .space 0xc
+ .global NNS_G3dGlb
+NNS_G3dGlb: ; 0x021CED18
+ .space 0x264
.section .text
- ; NNS_G3dGlbGetViewPort
- arm_func_start FUN_020B8200
-FUN_020B8200: ; 0x020B8200
+ arm_func_start NNS_G3dGlbGetViewPort
+NNS_G3dGlbGetViewPort: ; 0x020B8200
cmp r0, #0x0
- ldrne ip, _020B8260 ; =UNK_021CED18
+ ldrne ip, _020B8260 ; =NNS_G3dGlb
ldrne r12, [r12, #0xa0]
andne r12, r12, #0xff
strne r12, [r0, #0x0]
cmp r1, #0x0
- ldrne r0, _020B8260 ; =UNK_021CED18
+ ldrne r0, _020B8260 ; =NNS_G3dGlb
ldrne r0, [r0, #0xa0]
movne r0, r0, lsr #0x8
andne r0, r0, #0xff
strne r0, [r1, #0x0]
cmp r2, #0x0
- ldrne r0, _020B8260 ; =UNK_021CED18
+ ldrne r0, _020B8260 ; =NNS_G3dGlb
ldrne r0, [r0, #0xa0]
movne r0, r0, lsr #0x10
andne r0, r0, #0xff
strne r0, [r2, #0x0]
cmp r3, #0x0
- ldrne r0, _020B8260 ; =UNK_021CED18
+ ldrne r0, _020B8260 ; =NNS_G3dGlb
ldrne r0, [r0, #0xa0]
movne r0, r0, lsr #0x18
andne r0, r0, #0xff
strne r0, [r3, #0x0]
bx lr
.balign 4
-_020B8260: .word UNK_021CED18
- arm_func_end FUN_020B8200
+_020B8260: .word NNS_G3dGlb
+ arm_func_end NNS_G3dGlbGetViewPort
- ; NNS_G3dGlbGetInvWV
- arm_func_start FUN_020B8264
-FUN_020B8264: ; 0x020B8264
+ arm_func_start NNS_G3dGlbGetInvWV
+NNS_G3dGlbGetInvWV: ; 0x020B8264
stmdb sp!, {lr}
sub sp, sp, #0x4
- ldr r0, _020B829C ; =UNK_021CED18
+ ldr r0, _020B829C ; =NNS_G3dGlb
ldr r0, [r0, #0xfc]
ands r0, r0, #0x80
bne _020B8290
- bl FUN_020B82E4
- ldr r0, _020B829C ; =UNK_021CED18
+ bl calcSrtCameraMtx_
+ ldr r0, _020B829C ; =NNS_G3dGlb
ldr r1, [r0, #0xfc]
orr r1, r1, #0x80
str r1, [r0, #0xfc]
_020B8290:
- ldr r0, _020B82A0 ; =UNK_021CEE78
+ ldr r0, _020B82A0 ; =NNS_G3dGlb + 0x160
add sp, sp, #0x4
ldmia sp!, {pc}
.balign 4
-_020B829C: .word UNK_021CED18
-_020B82A0: .word UNK_021CEE78
- arm_func_end FUN_020B8264
+_020B829C: .word NNS_G3dGlb
+_020B82A0: .word NNS_G3dGlb + 0x160
+ arm_func_end NNS_G3dGlbGetInvWV
- ; NNS_G3dGlbGetWV
- arm_func_start FUN_020B82A4
-FUN_020B82A4: ; 0x020B82A4
+ arm_func_start NNS_G3dGlbGetWV
+NNS_G3dGlbGetWV: ; 0x020B82A4
stmdb sp!, {lr}
sub sp, sp, #0x4
- ldr r0, _020B82DC ; =UNK_021CED18
+ ldr r0, _020B82DC ; =NNS_G3dGlb
ldr r0, [r0, #0xfc]
ands r0, r0, #0x80
bne _020B82D0
- bl FUN_020B82E4
- ldr r0, _020B82DC ; =UNK_021CED18
+ bl calcSrtCameraMtx_
+ ldr r0, _020B82DC ; =NNS_G3dGlb
ldr r1, [r0, #0xfc]
orr r1, r1, #0x80
str r1, [r0, #0xfc]
_020B82D0:
- ldr r0, _020B82E0 ; =UNK_021CEE48
+ ldr r0, _020B82E0 ; =NNS_G3dGlb + 0x130
add sp, sp, #0x4
ldmia sp!, {pc}
.balign 4
-_020B82DC: .word UNK_021CED18
-_020B82E0: .word UNK_021CEE48
- arm_func_end FUN_020B82A4
+_020B82DC: .word NNS_G3dGlb
+_020B82E0: .word NNS_G3dGlb + 0x130
+ arm_func_end NNS_G3dGlbGetWV
- ; calcSrtCameraMtx_
- arm_func_start FUN_020B82E4
-FUN_020B82E4: ; 0x020B82E4
+ arm_func_start calcSrtCameraMtx_
+calcSrtCameraMtx_: ; 0x020B82E4
stmdb sp!, {lr}
sub sp, sp, #0x4
- ldr r0, _020B8330 ; =UNK_021CEDD4
- ldr r1, _020B8334 ; =UNK_021CED64
- ldr r2, _020B8338 ; =UNK_021CEE48
+ ldr r0, _020B8330 ; =NNS_G3dGlb + 0xBC
+ ldr r1, _020B8334 ; =NNS_G3dGlb + 0x4C
+ ldr r2, _020B8338 ; =NNS_G3dGlb + 0x130
bl MTX_Concat43
- ldr r3, _020B833C ; =UNK_021CED18
- ldr r0, _020B8338 ; =UNK_021CEE48
+ ldr r3, _020B833C ; =NNS_G3dGlb
+ ldr r0, _020B8338 ; =NNS_G3dGlb + 0x130
ldr r2, [r3, #0xf4]
mov r1, r0
str r2, [sp, #0x0]
ldr r2, [r3, #0xec]
ldr r3, [r3, #0xf0]
bl MTX_ScaleApply43
- ldr r0, _020B8338 ; =UNK_021CEE48
- ldr r1, _020B8340 ; =UNK_021CEE78
+ ldr r0, _020B8338 ; =NNS_G3dGlb + 0x130
+ ldr r1, _020B8340 ; =NNS_G3dGlb + 0x160
bl MTX_Inverse43
add sp, sp, #0x4
ldmia sp!, {pc}
.balign 4
-_020B8330: .word UNK_021CEDD4
-_020B8334: .word UNK_021CED64
-_020B8338: .word UNK_021CEE48
-_020B833C: .word UNK_021CED18
-_020B8340: .word UNK_021CEE78
- arm_func_end FUN_020B82E4
+_020B8330: .word NNS_G3dGlb + 0xBC
+_020B8334: .word NNS_G3dGlb + 0x4C
+_020B8338: .word NNS_G3dGlb + 0x130
+_020B833C: .word NNS_G3dGlb
+_020B8340: .word NNS_G3dGlb + 0x160
+ arm_func_end calcSrtCameraMtx_
- ; NNS_G3dGlbGetInvV
- arm_func_start FUN_020B8344
-FUN_020B8344: ; 0x020B8344
+ arm_func_start NNS_G3dGlbGetInvV
+NNS_G3dGlbGetInvV: ; 0x020B8344
stmdb sp!, {lr}
sub sp, sp, #0x4
- ldr r0, _020B8384 ; =UNK_021CED18
+ ldr r0, _020B8384 ; =NNS_G3dGlb
ldr r0, [r0, #0xfc]
ands r0, r0, #0x8
bne _020B8378
- ldr r0, _020B8388 ; =UNK_021CED64
- ldr r1, _020B838C ; =UNK_021CEE18
+ ldr r0, _020B8388 ; =NNS_G3dGlb + 0x4C
+ ldr r1, _020B838C ; =NNS_G3dGlb + 0x100
bl MTX_Inverse43
- ldr r0, _020B8384 ; =UNK_021CED18
+ ldr r0, _020B8384 ; =NNS_G3dGlb
ldr r1, [r0, #0xfc]
orr r1, r1, #0x8
str r1, [r0, #0xfc]
_020B8378:
- ldr r0, _020B838C ; =UNK_021CEE18
+ ldr r0, _020B838C ; =NNS_G3dGlb + 0x100
add sp, sp, #0x4
ldmia sp!, {pc}
.balign 4
-_020B8384: .word UNK_021CED18
-_020B8388: .word UNK_021CED64
-_020B838C: .word UNK_021CEE18
- arm_func_end FUN_020B8344
+_020B8384: .word NNS_G3dGlb
+_020B8388: .word NNS_G3dGlb + 0x4C
+_020B838C: .word NNS_G3dGlb + 0x100
+ arm_func_end NNS_G3dGlbGetInvV
- ; NNS_G3dGlbPolygonAttr
- arm_func_start FUN_020B8390
-FUN_020B8390: ; 0x020B8390
+ arm_func_start NNS_G3dGlbPolygonAttr
+NNS_G3dGlbPolygonAttr: ; 0x020B8390
orr r0, r0, r1, lsl #0x4
ldr r1, [sp, #0x4]
orr r0, r0, r2, lsl #0x6
orr r0, r1, r0
ldr r2, [sp, #0x0]
orr r1, r0, r3, lsl #0x18
- ldr r0, _020B83B8 ; =UNK_021CED18
+ ldr r0, _020B83B8 ; =NNS_G3dGlb
orr r1, r1, r2, lsl #0x10
str r1, [r0, #0x9c]
bx lr
.balign 4
-_020B83B8: .word UNK_021CED18
- arm_func_end FUN_020B8390
+_020B83B8: .word NNS_G3dGlb
+ arm_func_end NNS_G3dGlbPolygonAttr
- ; NNS_G3dGlbMaterialColorSpecEmi
- arm_func_start FUN_020B83BC
-FUN_020B83BC: ; 0x020B83BC
+ arm_func_start NNS_G3dGlbMaterialColorSpecEmi
+NNS_G3dGlbMaterialColorSpecEmi: ; 0x020B83BC
cmp r2, #0x0
movne r2, #0x1
orr r1, r0, r1, lsl #0x10
moveq r2, #0x0
- ldr r0, _020B83DC ; =UNK_021CED18
+ ldr r0, _020B83DC ; =NNS_G3dGlb
orr r1, r1, r2, lsl #0xf
str r1, [r0, #0x98]
bx lr
.balign 4
-_020B83DC: .word UNK_021CED18
- arm_func_end FUN_020B83BC
+_020B83DC: .word NNS_G3dGlb
+ arm_func_end NNS_G3dGlbMaterialColorSpecEmi
- ; NNS_G3dGlbMaterialColorDiffAmb
- arm_func_start FUN_020B83E0
-FUN_020B83E0: ; 0x020B83E0
+ arm_func_start NNS_G3dGlbMaterialColorDiffAmb
+NNS_G3dGlbMaterialColorDiffAmb: ; 0x020B83E0
cmp r2, #0x0
movne r2, #0x1
orr r1, r0, r1, lsl #0x10
moveq r2, #0x0
- ldr r0, _020B8400 ; =UNK_021CED18
+ ldr r0, _020B8400 ; =NNS_G3dGlb
orr r1, r1, r2, lsl #0xf
str r1, [r0, #0x94]
bx lr
.balign 4
-_020B8400: .word UNK_021CED18
- arm_func_end FUN_020B83E0
+_020B8400: .word NNS_G3dGlb
+ arm_func_end NNS_G3dGlbMaterialColorDiffAmb
- ; NNS_G3dGlbLightColor
- arm_func_start FUN_020B8404
-FUN_020B8404: ; 0x020B8404
- ldr r2, _020B8414 ; =UNK_021CEDC0
+ arm_func_start NNS_G3dGlbLightColor
+NNS_G3dGlbLightColor: ; 0x020B8404
+ ldr r2, _020B8414 ; =NNS_G3dGlb + 0xA8
orr r1, r1, r0, lsl #0x1e
str r1, [r2, r0, lsl #0x2]
bx lr
.balign 4
-_020B8414: .word UNK_021CEDC0
- arm_func_end FUN_020B8404
+_020B8414: .word NNS_G3dGlb + 0xA8
+ arm_func_end NNS_G3dGlbLightColor
- ; NNS_G3dGlbLightVector
- arm_func_start FUN_020B8418
-FUN_020B8418: ; 0x020B8418
+ arm_func_start NNS_G3dGlbLightVector
+NNS_G3dGlbLightVector: ; 0x020B8418
stmdb sp!, {r4,lr}
ldr ip, _020B8444 ; =0x000003FF
- ldr lr, _020B8448 ; =UNK_021CED98
+ ldr lr, _020B8448 ; =NNS_G3dGlb + 0x80
and r4, r12, r1, asr #0x3
and r1, r12, r2, asr #0x3
and r2, r12, r3, asr #0x3
@@ -282,51 +206,48 @@ FUN_020B8418: ; 0x020B8418
ldmia sp!, {r4,pc}
.balign 4
_020B8444: .word 0x000003FF
-_020B8448: .word UNK_021CED98
- arm_func_end FUN_020B8418
+_020B8448: .word NNS_G3dGlb + 0x80
+ arm_func_end NNS_G3dGlbLightVector
- ; NNS_G3dGlbSetBaseScale
- arm_func_start FUN_020B844C
-FUN_020B844C: ; 0x020B844C
- ldr r3, _020B846C ; =UNK_021CEE04
+ arm_func_start NNS_G3dGlbSetBaseScale
+NNS_G3dGlbSetBaseScale: ; 0x020B844C
+ ldr r3, _020B846C ; =NNS_G3dGlb + 0xEC
ldmia r0, {r0-r2}
stmia r3, {r0-r2}
- ldr r0, _020B8470 ; =UNK_021CED18
+ ldr r0, _020B8470 ; =NNS_G3dGlb
ldr r1, [r0, #0xfc]
bic r1, r1, #0xa4
str r1, [r0, #0xfc]
bx lr
.balign 4
-_020B846C: .word UNK_021CEE04
-_020B8470: .word UNK_021CED18
- arm_func_end FUN_020B844C
+_020B846C: .word NNS_G3dGlb + 0xEC
+_020B8470: .word NNS_G3dGlb
+ arm_func_end NNS_G3dGlbSetBaseScale
- ; NNS_G3dGlbSetBaseTrans
- arm_func_start FUN_020B8474
-FUN_020B8474: ; 0x020B8474
- ldr r3, _020B8494 ; =UNK_021CEDF8
+ arm_func_start NNS_G3dGlbSetBaseTrans
+NNS_G3dGlbSetBaseTrans: ; 0x020B8474
+ ldr r3, _020B8494 ; =NNS_G3dGlb + 0xE0
ldmia r0, {r0-r2}
stmia r3, {r0-r2}
- ldr r0, _020B8498 ; =UNK_021CED18
+ ldr r0, _020B8498 ; =NNS_G3dGlb
ldr r1, [r0, #0xfc]
bic r1, r1, #0xa4
str r1, [r0, #0xfc]
bx lr
.balign 4
-_020B8494: .word UNK_021CEDF8
-_020B8498: .word UNK_021CED18
- arm_func_end FUN_020B8474
+_020B8494: .word NNS_G3dGlb + 0xE0
+_020B8498: .word NNS_G3dGlb
+ arm_func_end NNS_G3dGlbSetBaseTrans
- ; NNS_G3dGlbFlushP
- arm_func_start FUN_020B849C
-FUN_020B849C: ; 0x020B849C
+ arm_func_start NNS_G3dGlbFlushP
+NNS_G3dGlbFlushP: ; 0x020B849C
stmdb sp!, {lr}
sub sp, sp, #0x4
- ldr r1, _020B84D4 ; =UNK_021CED18
+ ldr r1, _020B84D4 ; =NNS_G3dGlb
mov r2, #0x3e
ldr r0, [r1], #0x4
- bl FUN_020BB1C0
- ldr r0, _020B84D4 ; =UNK_021CED18
+ bl NNS_G3dGeBufferOP_N
+ ldr r0, _020B84D4 ; =NNS_G3dGlb
ldr r1, [r0, #0xfc]
bic r1, r1, #0x1
str r1, [r0, #0xfc]
@@ -335,23 +256,22 @@ FUN_020B849C: ; 0x020B849C
add sp, sp, #0x4
ldmia sp!, {pc}
.balign 4
-_020B84D4: .word UNK_021CED18
- arm_func_end FUN_020B849C
+_020B84D4: .word NNS_G3dGlb
+ arm_func_end NNS_G3dGlbFlushP
- ; NNS_G3dGlbInit
- arm_func_start FUN_020B84D8
-FUN_020B84D8: ; 0x020B84D8
+ arm_func_start NNS_G3dGlbInit
+NNS_G3dGlbInit: ; 0x020B84D8
stmdb sp!, {r4-r9,lr}
sub sp, sp, #0x4
ldr r8, _020B85F4 ; =0x17101610
- ldr r1, _020B85F8 ; =UNK_021CED18
+ ldr r1, _020B85F8 ; =NNS_G3dGlb
ldr r5, _020B85FC ; =0x32323232
ldr r4, _020B8600 ; =0x60293130
ldr r3, _020B8604 ; =0x33333333
ldr r2, _020B8608 ; =0x002A1B19
mov r7, #0x0
mov r6, #0x2
- ldr r0, _020B860C ; =UNK_021CED64
+ ldr r0, _020B860C ; =NNS_G3dGlb + 0x4C
str r8, [r1, #0x0]
str r7, [r1, #0x4]
str r6, [r1, #0x48]
@@ -360,10 +280,10 @@ FUN_020B84D8: ; 0x020B84D8
str r3, [r1, #0xa4]
str r2, [r1, #0xb8]
bl MTX_Identity43_
- ldr r0, _020B8610 ; =UNK_021CED20
+ ldr r0, _020B8610 ; =NNS_G3dGlb + 0x8
bl MTX_Identity44_
mov r2, r7
- ldr r1, _020B85F8 ; =UNK_021CED18
+ ldr r1, _020B85F8 ; =NNS_G3dGlb
ldr r7, _020B8614 ; =0x4210C210
ldr r0, _020B8618 ; =0x40000200
ldr lr, _020B861C ; =0x2D8B62D8
@@ -377,7 +297,7 @@ FUN_020B84D8: ; 0x020B84D8
str r0, [r1, #0x84]
str lr, [r1, #0x80]
mov lr, #0x4000001f
- ldr r0, _020B863C ; =UNK_021CEDD4
+ ldr r0, _020B863C ; =NNS_G3dGlb + 0xBC
str r9, [r1, #0x88]
str r8, [r1, #0x8c]
str r7, [r1, #0x94]
@@ -393,7 +313,7 @@ FUN_020B84D8: ; 0x020B84D8
str r2, [r1, #0xe8]
bl MTX_Identity33_
mov r3, #0x1000
- ldr r0, _020B85F8 ; =UNK_021CED18
+ ldr r0, _020B85F8 ; =NNS_G3dGlb
mov r2, #0x0
rsb r1, r3, #0x0
str r3, [r0, #0xec]
@@ -414,13 +334,13 @@ FUN_020B84D8: ; 0x020B84D8
ldmia sp!, {r4-r9,pc}
.balign 4
_020B85F4: .word 0x17101610
-_020B85F8: .word UNK_021CED18
+_020B85F8: .word NNS_G3dGlb
_020B85FC: .word 0x32323232
_020B8600: .word 0x60293130
_020B8604: .word 0x33333333
_020B8608: .word 0x002A1B19
-_020B860C: .word UNK_021CED64
-_020B8610: .word UNK_021CED20
+_020B860C: .word NNS_G3dGlb + 0x4C
+_020B8610: .word NNS_G3dGlb + 0x8
_020B8614: .word 0x4210C210
_020B8618: .word 0x40000200
_020B861C: .word 0x2D8B62D8
@@ -431,6 +351,5 @@ _020B862C: .word 0xBFFF0000
_020B8630: .word 0x00007FFF
_020B8634: .word 0x800003E0
_020B8638: .word 0xC0007C00
-_020B863C: .word UNK_021CEDD4
- arm_func_end FUN_020B84D8
-
+_020B863C: .word NNS_G3dGlb + 0xBC
+ arm_func_end NNS_G3dGlbInit
diff --git a/arm9/asm/NNS_G3D_kernel.s b/arm9/asm/NNS_G3D_kernel.s
index 71052927..ebf3d210 100644
--- a/arm9/asm/NNS_G3D_kernel.s
+++ b/arm9/asm/NNS_G3D_kernel.s
@@ -3,9 +3,8 @@
.section .text
- ; _end
- arm_func_start FUN_020B772C
-FUN_020B772C: ; 0x020B772C
+ arm_func_start NNS_G3dReleaseMdlSet
+NNS_G3dReleaseMdlSet: ; 0x020B772C
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r6, r0
@@ -23,20 +22,19 @@ _020B7750:
ldr r0, [r0, #0x4]
add r7, r6, r0
mov r0, r7
- bl FUN_020B79A4
+ bl NNS_G3dReleaseMdlTex
mov r0, r7
- bl FUN_020B780C
+ bl NNS_G3dReleaseMdlPltt
ldrb r0, [r6, #0x9]
add r5, r5, #0x1
cmp r5, r0
blo _020B7750
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
- arm_func_end FUN_020B772C
+ arm_func_end NNS_G3dReleaseMdlSet
- ; _end
- arm_func_start FUN_020B7790
-FUN_020B7790: ; 0x020B7790
+ arm_func_start NNS_G3dBindMdlSet
+NNS_G3dBindMdlSet: ; 0x020B7790
stmdb sp!, {r4-r9,lr}
sub sp, sp, #0x4
mov r8, r0
@@ -56,11 +54,11 @@ _020B77B8:
ldr r0, [r0, #0x4]
add r9, r8, r0
mov r0, r9
- bl FUN_020B7A04
+ bl NNS_G3dBindMdlTex
and r5, r5, r0
mov r0, r9
mov r1, r7
- bl FUN_020B7864
+ bl NNS_G3dBindMdlPltt
ldrb r1, [r8, #0x9]
add r6, r6, #0x1
and r5, r5, r0
@@ -70,11 +68,10 @@ _020B7800:
mov r0, r5
add sp, sp, #0x4
ldmia sp!, {r4-r9,pc}
- arm_func_end FUN_020B7790
+ arm_func_end NNS_G3dBindMdlSet
- ; _end
- arm_func_start FUN_020B780C
-FUN_020B780C: ; 0x020B780C
+ arm_func_start NNS_G3dReleaseMdlPltt
+NNS_G3dReleaseMdlPltt: ; 0x020B780C
ldr r2, [r0, #0x8]
mov r1, #0x0
add r2, r0, r2
@@ -98,11 +95,10 @@ _020B782C:
cmp r1, r0
blo _020B782C
bx lr
- arm_func_end FUN_020B780C
+ arm_func_end NNS_G3dReleaseMdlPltt
- ; _end
- arm_func_start FUN_020B7864
-FUN_020B7864: ; 0x020B7864
+ arm_func_start NNS_G3dBindMdlPltt
+NNS_G3dBindMdlPltt: ; 0x020B7864
stmdb sp!, {r4-r10,lr}
ldr r2, [r0, #0x8]
mov r10, r1
@@ -124,7 +120,7 @@ _020B7898:
add r0, r10, r0
add r1, r2, r1
add r1, r1, r5
- bl FUN_020BC2A0
+ bl NNS_G3dGetResDataByName
movs r3, r0
beq _020B78F0
ldrh r1, [r8, #0x6]
@@ -137,7 +133,7 @@ _020B7898:
bne _020B78F4
mov r0, r9
mov r2, r10
- bl FUN_020B7910
+ bl bindMdlPltt_Internal_
b _020B78F4
_020B78F0:
mov r6, r4
@@ -150,11 +146,10 @@ _020B78F4:
_020B7908:
mov r0, r6
ldmia sp!, {r4-r10,pc}
- arm_func_end FUN_020B7864
+ arm_func_end NNS_G3dBindMdlPltt
- ; _end
- arm_func_start FUN_020B7910
-FUN_020B7910: ; 0x020B7910
+ arm_func_start bindMdlPltt_Internal_
+bindMdlPltt_Internal_: ; 0x020B7910
stmdb sp!, {r4-r6,lr}
ldrh r5, [r1, #0x0]
ldr r2, [r2, #0x2c]
@@ -194,11 +189,10 @@ _020B7994:
orr r0, r0, #0x1
strb r0, [r1, #0x3]
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020B7910
+ arm_func_end bindMdlPltt_Internal_
- ; _end
- arm_func_start FUN_020B79A4
-FUN_020B79A4: ; 0x020B79A4
+ arm_func_start NNS_G3dReleaseMdlTex
+NNS_G3dReleaseMdlTex: ; 0x020B79A4
stmdb sp!, {r4-r6,lr}
ldr r2, [r0, #0x8]
mov r4, #0x0
@@ -218,18 +212,17 @@ _020B79C8:
ands r0, r0, #0x1
beq _020B79F0
mov r0, r6
- bl FUN_020B7AB8
+ bl releaseMdlTex_Internal_
_020B79F0:
ldrb r0, [r5, #0x1]
add r4, r4, #0x1
cmp r4, r0
blo _020B79C8
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020B79A4
+ arm_func_end NNS_G3dReleaseMdlTex
- ; _end
- arm_func_start FUN_020B7A04
-FUN_020B7A04: ; 0x020B7A04
+ arm_func_start NNS_G3dBindMdlTex
+NNS_G3dBindMdlTex: ; 0x020B7A04
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x4
ldr r2, [r0, #0x8]
@@ -252,7 +245,7 @@ _020B7A40:
ldrh r1, [r2, #0x2]
add r1, r2, r1
add r1, r1, r6
- bl FUN_020BC2A0
+ bl NNS_G3dGetResDataByName
movs r3, r0
beq _020B7A94
ldrh r1, [r8, #0x6]
@@ -265,7 +258,7 @@ _020B7A40:
bne _020B7A98
mov r0, r9
mov r2, r10
- bl FUN_020B7B40
+ bl bindMdlTex_Internal_
b _020B7A98
_020B7A94:
mov r11, r4
@@ -279,11 +272,10 @@ _020B7AAC:
mov r0, r11
add sp, sp, #0x4
ldmia sp!, {r4-r11,pc}
- arm_func_end FUN_020B7A04
+ arm_func_end NNS_G3dBindMdlTex
- ; releaseMdlTex_Internal_
- arm_func_start FUN_020B7AB8
-FUN_020B7AB8: ; 0x020B7AB8
+ arm_func_start releaseMdlTex_Internal_
+releaseMdlTex_Internal_: ; 0x020B7AB8
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
ldrh r4, [r1, #0x0]
@@ -321,11 +313,10 @@ _020B7B28:
ldmia sp!, {r4-r7,pc}
.balign 4
_020B7B3C: .word 0xC00F0000
- arm_func_end FUN_020B7AB8
+ arm_func_end releaseMdlTex_Internal_
- ; bindMdlTex_Internal_
- arm_func_start FUN_020B7B40
-FUN_020B7B40: ; 0x020B7B40
+ arm_func_start bindMdlTex_Internal_
+bindMdlTex_Internal_: ; 0x020B7B40
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0xc
mov r11, r1
@@ -401,11 +392,10 @@ _020B7C3C:
.balign 4
_020B7C50: .word 0x0000FFFF
_020B7C54: .word 0x000007FF
- arm_func_end FUN_020B7B40
+ arm_func_end bindMdlTex_Internal_
- ; _end
- arm_func_start FUN_020B7C58
-FUN_020B7C58: ; 0x020B7C58
+ arm_func_start NNS_G3dPlttReleasePlttKey
+NNS_G3dPlttReleasePlttKey: ; 0x020B7C58
ldrh r2, [r0, #0x32]
mov r1, #0x0
bic r2, r2, #0x1
@@ -414,11 +404,10 @@ FUN_020B7C58: ; 0x020B7C58
str r1, [r0, #0x2c]
mov r0, r2
bx lr
- arm_func_end FUN_020B7C58
+ arm_func_end NNS_G3dPlttReleasePlttKey
- ; NNS_G3dPlttLoad
- arm_func_start FUN_020B7C78
-FUN_020B7C78: ; 0x020B7C78
+ arm_func_start NNS_G3dPlttLoad
+NNS_G3dPlttLoad: ; 0x020B7C78
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
movs r4, r1
@@ -446,26 +435,23 @@ _020B7C90:
ldmia sp!, {r4-r5,pc}
.balign 4
_020B7CD8: .word 0x0000FFFF
- arm_func_end FUN_020B7C78
+ arm_func_end NNS_G3dPlttLoad
- ; _end
- arm_func_start FUN_020B7CDC
-FUN_020B7CDC: ; 0x020B7CDC
+ arm_func_start NNS_G3dPlttSetPlttKey
+NNS_G3dPlttSetPlttKey: ; 0x020B7CDC
str r1, [r0, #0x2c]
bx lr
- arm_func_end FUN_020B7CDC
+ arm_func_end NNS_G3dPlttSetPlttKey
- ; _end
- arm_func_start FUN_020B7CE4
-FUN_020B7CE4: ; 0x020B7CE4
+ arm_func_start NNS_G3dPlttGetRequiredSize
+NNS_G3dPlttGetRequiredSize: ; 0x020B7CE4
ldrh r0, [r0, #0x30]
mov r0, r0, lsl #0x3
bx lr
- arm_func_end FUN_020B7CE4
+ arm_func_end NNS_G3dPlttGetRequiredSize
- ; _end
- arm_func_start FUN_020B7CF0
-FUN_020B7CF0: ; 0x020B7CF0
+ arm_func_start NNS_G3dTexReleaseTexKey
+NNS_G3dTexReleaseTexKey: ; 0x020B7CF0
ldrh r12, [r0, #0x10]
mov r3, #0x0
bic r12, r12, #0x1
@@ -480,11 +466,10 @@ FUN_020B7CF0: ; 0x020B7CF0
str r1, [r2, #0x0]
str r3, [r0, #0x18]
bx lr
- arm_func_end FUN_020B7CF0
+ arm_func_end NNS_G3dTexReleaseTexKey
- ; NNS_G3dTexLoad
- arm_func_start FUN_020B7D28
-FUN_020B7D28: ; 0x020B7D28
+ arm_func_start NNS_G3dTexLoad
+NNS_G3dTexLoad: ; 0x020B7D28
stmdb sp!, {r4-r9,lr}
sub sp, sp, #0x4
movs r8, r1
@@ -542,53 +527,49 @@ _020B7DDC:
.balign 4
_020B7DF4: .word 0x0000FFFF
_020B7DF8: .word 0x0001FFFF
- arm_func_end FUN_020B7D28
+ arm_func_end NNS_G3dTexLoad
- ; _end
- arm_func_start FUN_020B7DFC
-FUN_020B7DFC: ; 0x020B7DFC
+ arm_func_start NNS_G3dTexSetTexKey
+NNS_G3dTexSetTexKey: ; 0x020B7DFC
cmp r1, #0x0
strne r1, [r0, #0x8]
cmp r2, #0x0
strne r2, [r0, #0x18]
bx lr
- arm_func_end FUN_020B7DFC
+ arm_func_end NNS_G3dTexSetTexKey
- ; _end
- arm_func_start FUN_020B7E10
-FUN_020B7E10: ; 0x020B7E10
+ arm_func_start NNS_G3dTex4x4GetRequiredSize
+NNS_G3dTex4x4GetRequiredSize: ; 0x020B7E10
ldrh r0, [r0, #0x1c]
mov r0, r0, lsl #0x3
bx lr
- arm_func_end FUN_020B7E10
+ arm_func_end NNS_G3dTex4x4GetRequiredSize
- ; _end
- arm_func_start FUN_020B7E1C
-FUN_020B7E1C: ; 0x020B7E1C
+ arm_func_start NNS_G3dTexGetRequiredSize
+NNS_G3dTexGetRequiredSize: ; 0x020B7E1C
ldrh r0, [r0, #0xc]
mov r0, r0, lsl #0x3
bx lr
- arm_func_end FUN_020B7E1C
+ arm_func_end NNS_G3dTexGetRequiredSize
- ; _end
- arm_func_start FUN_020B7E28
-FUN_020B7E28: ; 0x020B7E28
+ arm_func_start NNS_G3dRenderObjRemoveAnmObj
+NNS_G3dRenderObjRemoveAnmObj: ; 0x020B7E28
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r0
add r0, r5, #0x8
mov r4, r1
- bl FUN_020B7E88
+ bl removeLink_
cmp r0, #0x0
bne _020B7E74
mov r1, r4
add r0, r5, #0x10
- bl FUN_020B7E88
+ bl removeLink_
cmp r0, #0x0
bne _020B7E74
mov r1, r4
add r0, r5, #0x18
- bl FUN_020B7E88
+ bl removeLink_
cmp r0, #0x0
addeq sp, sp, #0x4
ldmeqia sp!, {r4-r5,pc}
@@ -598,11 +579,10 @@ _020B7E74:
str r0, [r5, #0x0]
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
- arm_func_end FUN_020B7E28
+ arm_func_end NNS_G3dRenderObjRemoveAnmObj
- ; _end
- arm_func_start FUN_020B7E88
-FUN_020B7E88: ; 0x020B7E88
+ arm_func_start removeLink_
+removeLink_: ; 0x020B7E88
ldr r2, [r0, #0x0]
cmp r2, #0x0
moveq r0, #0x0
@@ -636,11 +616,10 @@ _020B7EE4:
_020B7EF4:
mov r0, #0x0
bx lr
- arm_func_end FUN_020B7E88
+ arm_func_end removeLink_
- ; _end
- arm_func_start FUN_020B7EFC
-FUN_020B7EFC: ; 0x020B7EFC
+ arm_func_start NNS_G3dRenderObjAddAnmObj
+NNS_G3dRenderObjAddAnmObj: ; 0x020B7EFC
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r4, r1
@@ -657,33 +636,32 @@ FUN_020B7EFC: ; 0x020B7EFC
ldmia sp!, {r4-r5,pc}
_020B7F34:
add r0, r5, #0x3c
- bl FUN_020B7F88
+ bl updateHintVec_
mov r1, r4
add r0, r5, #0x8
- bl FUN_020B7FF8
+ bl addLink_
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
_020B7F50:
add r0, r5, #0x44
- bl FUN_020B7F88
+ bl updateHintVec_
mov r1, r4
add r0, r5, #0x10
- bl FUN_020B7FF8
+ bl addLink_
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
_020B7F6C:
add r0, r5, #0x4c
- bl FUN_020B7F88
+ bl updateHintVec_
mov r1, r4
add r0, r5, #0x18
- bl FUN_020B7FF8
+ bl addLink_
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
- arm_func_end FUN_020B7EFC
+ arm_func_end NNS_G3dRenderObjAddAnmObj
- ; _end
- arm_func_start FUN_020B7F88
-FUN_020B7F88: ; 0x020B7F88
+ local_arm_func_start updateHintVec_
+updateHintVec_: ; 0x020B7F88
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
cmp r1, #0x0
@@ -715,11 +693,10 @@ _020B7FE4:
bne _020B7FA4
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
- arm_func_end FUN_020B7F88
+ arm_func_end updateHintVec_
- ; _end
- arm_func_start FUN_020B7FF8
-FUN_020B7FF8: ; 0x020B7FF8
+ arm_func_start addLink_
+addLink_: ; 0x020B7FF8
ldr r12, [r0, #0x0]
cmp r12, #0x0
streq r1, [r0, #0x0]
@@ -776,11 +753,10 @@ _020B809C:
_020B80AC:
str r1, [r12, #0x10]
bx lr
- arm_func_end FUN_020B7FF8
+ arm_func_end addLink_
- ; NNS_G3dRenderObjInit
- arm_func_start FUN_020B80B4
-FUN_020B80B4: ; 0x020B80B4
+ arm_func_start NNS_G3dRenderObjInit
+NNS_G3dRenderObjInit: ; 0x020B80B4
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r0
@@ -789,10 +765,10 @@ FUN_020B80B4: ; 0x020B80B4
mov r0, #0x0
mov r2, #0x54
bl MIi_CpuClear32
- ldr r0, _020B8104 ; =UNK_021065B4
- ldr r1, _020B8108 ; =UNK_021065B0
+ ldr r0, _020B8104 ; =NNS_G3dFuncBlendMatDefault
+ ldr r1, _020B8108 ; =NNS_G3dFuncBlendJntDefault
ldr r2, [r0, #0x0]
- ldr r0, _020B810C ; =UNK_021065AC
+ ldr r0, _020B810C ; =NNS_G3dFuncBlendVisDefault
str r2, [r5, #0xc]
ldr r1, [r1, #0x0]
str r1, [r5, #0x14]
@@ -802,14 +778,13 @@ FUN_020B80B4: ; 0x020B80B4
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
.balign 4
-_020B8104: .word UNK_021065B4
-_020B8108: .word UNK_021065B0
-_020B810C: .word UNK_021065AC
- arm_func_end FUN_020B80B4
+_020B8104: .word NNS_G3dFuncBlendMatDefault
+_020B8108: .word NNS_G3dFuncBlendJntDefault
+_020B810C: .word NNS_G3dFuncBlendVisDefault
+ arm_func_end NNS_G3dRenderObjInit
- ; NNS_G3dAnmObjInit
- arm_func_start FUN_020B8110
-FUN_020B8110: ; 0x020B8110
+ arm_func_start NNS_G3dAnmObjInit
+NNS_G3dAnmObjInit: ; 0x020B8110
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r12, #0x0
@@ -820,14 +795,14 @@ FUN_020B8110: ; 0x020B8110
strb r4, [r0, #0x18]
mov r4, #0x1000
str r4, [r0, #0x4]
- ldr lr, _020B81A4 ; =UNK_02106594
+ ldr lr, _020B81A4 ; =NNS_G3dAnmFmtNum
str r3, [r0, #0x14]
ldr r6, [lr, #0x0]
cmp r6, #0x0
addls sp, sp, #0x4
ldmlsia sp!, {r4-r7,pc}
ldrb r7, [r1, #0x0]
- ldr r4, _020B81A8 ; =UNK_021065B8
+ ldr r4, _020B81A8 ; =NNS_G3dAnmObjInitFuncArray
_020B8158:
ldrb r3, [r4, r12, lsl #0x3]
mov r5, r12, lsl #0x3
@@ -838,7 +813,7 @@ _020B8158:
ldrh r3, [r3, #0x2]
cmp lr, r3
bne _020B8190
- ldr r3, _020B81AC ; =UNK_021065BC
+ ldr r3, _020B81AC ; =NNS_G3dAnmObjInitFuncArray + 0x4
ldr r3, [r3, r5]
blx r3
add sp, sp, #0x4
@@ -850,14 +825,13 @@ _020B8190:
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
.balign 4
-_020B81A4: .word UNK_02106594
-_020B81A8: .word UNK_021065B8
-_020B81AC: .word UNK_021065BC
- arm_func_end FUN_020B8110
+_020B81A4: .word NNS_G3dAnmFmtNum
+_020B81A8: .word NNS_G3dAnmObjInitFuncArray
+_020B81AC: .word NNS_G3dAnmObjInitFuncArray + 0x4
+ arm_func_end NNS_G3dAnmObjInit
- ; _end
- arm_func_start FUN_020B81B0
-FUN_020B81B0: ; 0x020B81B0
+ arm_func_start NNS_G3dAnmObjCalcSizeRequired
+NNS_G3dAnmObjCalcSizeRequired: ; 0x020B81B0
ldrb r0, [r0, #0x0]
cmp r0, #0x4a
beq _020B81E4
@@ -881,5 +855,4 @@ _020B81E4:
_020B81F8:
mov r0, #0x0
bx lr
- arm_func_end FUN_020B81B0
-
+ arm_func_end NNS_G3dAnmObjCalcSizeRequired
diff --git a/arm9/asm/NNS_G3D_maya.s b/arm9/asm/NNS_G3D_maya.s
index d7d26b5c..7a675533 100644
--- a/arm9/asm/NNS_G3D_maya.s
+++ b/arm9/asm/NNS_G3D_maya.s
@@ -2,24 +2,20 @@
.include "global.inc"
.section .data
-
- ; calcTexMtx_
- .global UNK_021067B0
-UNK_021067B0: ; 0x021067B0
- .word FUN_020BEBD8
- .word FUN_020BEB00
- .word FUN_020BEA84
- .word FUN_020BEA3C
- .word FUN_020BE954
- .word FUN_020BE894
- .word FUN_020BE850
- .word FUN_020BE82C
+calcTexMtx_: ; 0x021067B0
+ .word texmtxCalc_flag_
+ .word texmtxCalc_flagS_
+ .word texmtxCalc_flagR_
+ .word texmtxCalc_flagRS_
+ .word texmtxCalc_flagT_
+ .word texmtxCalc_flagTS_
+ .word texmtxCalc_flagTR_
+ .word texmtxCalc_flagTRS_
.section .text
- ; NNSi_G3dSendTexSRTMaya
- arm_func_start FUN_020BE6E4
-FUN_020BE6E4: ; 0x020BE6E4
+ arm_func_start NNSi_G3dSendTexSRTMaya
+NNSi_G3dSendTexSRTMaya: ; 0x020BE6E4
stmdb sp!, {r4,lr}
sub sp, sp, #0x50
mov r4, r0
@@ -46,7 +42,7 @@ FUN_020BE6E4: ; 0x020BE6E4
str r1, [sp, #0x14]
str r1, [sp, #0x10]
ldr r1, [r4, #0x0]
- ldr r0, _020BE828 ; =UNK_021067B0
+ ldr r0, _020BE828 ; =calcTexMtx_
and r1, r1, #0x7
ldr r2, [r0, r1, lsl #0x2]
add r0, sp, #0x8
@@ -98,18 +94,17 @@ _020BE804:
ldr r0, [sp, #0x0]
add r1, r1, #0x4
mov r2, #0x12
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
add sp, sp, #0x50
ldmia sp!, {r4,pc}
.balign 4
_020BE820: .word 0x00101610
_020BE824: .word 0x00101810
-_020BE828: .word UNK_021067B0
- arm_func_end FUN_020BE6E4
+_020BE828: .word calcTexMtx_
+ arm_func_end NNSi_G3dSendTexSRTMaya
- ; _end
- arm_func_start FUN_020BE82C
-FUN_020BE82C: ; 0x020BE82C
+ local_arm_func_start texmtxCalc_flagTRS_
+texmtxCalc_flagTRS_: ; 0x020BE82C
mov r2, #0x1000
str r2, [r0, #0x0]
mov r1, #0x0
@@ -119,11 +114,10 @@ FUN_020BE82C: ; 0x020BE82C
str r1, [r0, #0x30]
str r1, [r0, #0x34]
bx lr
- arm_func_end FUN_020BE82C
+ arm_func_end texmtxCalc_flagTRS_
- ; _end
- arm_func_start FUN_020BE850
-FUN_020BE850: ; 0x020BE850
+ local_arm_func_start texmtxCalc_flagTR_
+texmtxCalc_flagTR_: ; 0x020BE850
ldr r2, [r1, #0x18]
mov r12, #0x0
str r2, [r0, #0x0]
@@ -141,11 +135,10 @@ FUN_020BE850: ; 0x020BE850
str r1, [r0, #0x34]
str r12, [r0, #0x10]
bx lr
- arm_func_end FUN_020BE850
+ arm_func_end texmtxCalc_flagTR_
- ; _end
- arm_func_start FUN_020BE894
-FUN_020BE894: ; 0x020BE894
+ local_arm_func_start texmtxCalc_flagTS_
+texmtxCalc_flagTS_: ; 0x020BE894
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r5, r1
@@ -194,11 +187,10 @@ FUN_020BE894: ; 0x020BE894
str r0, [r6, #0x10]
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
- arm_func_end FUN_020BE894
+ arm_func_end texmtxCalc_flagTS_
- ; _end
- arm_func_start FUN_020BE954
-FUN_020BE954: ; 0x020BE954
+ local_arm_func_start texmtxCalc_flagT_
+texmtxCalc_flagT_: ; 0x020BE954
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x4
mov r9, r1
@@ -257,11 +249,10 @@ FUN_020BE954: ; 0x020BE954
str r0, [r10, #0x10]
add sp, sp, #0x4
ldmia sp!, {r4-r11,pc}
- arm_func_end FUN_020BE954
+ arm_func_end texmtxCalc_flagT_
- ; _end
- arm_func_start FUN_020BEA3C
-FUN_020BEA3C: ; 0x020BEA3C
+ local_arm_func_start texmtxCalc_flagRS_
+texmtxCalc_flagRS_: ; 0x020BEA3C
mov r2, #0x1000
str r2, [r0, #0x0]
str r2, [r0, #0x14]
@@ -280,11 +271,10 @@ FUN_020BEA3C: ; 0x020BEA3C
str r1, [r0, #0x34]
str r12, [r0, #0x10]
bx lr
- arm_func_end FUN_020BEA3C
+ arm_func_end texmtxCalc_flagRS_
- ; _end
- arm_func_start FUN_020BEA84
-FUN_020BEA84: ; 0x020BEA84
+ local_arm_func_start texmtxCalc_flagR_
+texmtxCalc_flagR_: ; 0x020BEA84
stmdb sp!, {r4,lr}
ldr r3, [r1, #0x18]
mov r2, #0x0
@@ -316,11 +306,10 @@ FUN_020BEA84: ; 0x020BEA84
str r1, [r0, #0x34]
str r2, [r0, #0x10]
ldmia sp!, {r4,pc}
- arm_func_end FUN_020BEA84
+ arm_func_end texmtxCalc_flagR_
- ; _end
- arm_func_start FUN_020BEB00
-FUN_020BEB00: ; 0x020BEB00
+ local_arm_func_start texmtxCalc_flagS_
+texmtxCalc_flagS_: ; 0x020BEB00
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r5, r1
@@ -375,11 +364,10 @@ FUN_020BEB00: ; 0x020BEB00
str r0, [r6, #0x10]
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
- arm_func_end FUN_020BEB00
+ arm_func_end texmtxCalc_flagS_
- ; _end
- arm_func_start FUN_020BEBD8
-FUN_020BEBD8: ; 0x020BEBD8
+ local_arm_func_start texmtxCalc_flag_
+texmtxCalc_flag_: ; 0x020BEBD8
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x4
mov r9, r1
@@ -449,11 +437,10 @@ FUN_020BEBD8: ; 0x020BEBD8
str r0, [r10, #0x10]
add sp, sp, #0x4
ldmia sp!, {r4-r11,pc}
- arm_func_end FUN_020BEBD8
+ arm_func_end texmtxCalc_flag_
- ; NNSi_G3dGetJointScaleMaya
- arm_func_start FUN_020BECEC
-FUN_020BECEC: ; 0x020BECEC
+ arm_func_start NNSi_G3dGetJointScaleMaya
+NNSi_G3dGetJointScaleMaya: ; 0x020BECEC
stmdb sp!, {r4-r8,lr}
mov r12, r0
ands r0, r3, #0x4
@@ -464,7 +451,7 @@ FUN_020BECEC: ; 0x020BECEC
orr r0, r1, #0x1
str r0, [r12, #0x0]
beq _020BEDB8
- ldr r0, _020BEE2C ; =UNK_021CEF7C
+ ldr r0, _020BEE2C ; =NNS_G3dRS
ldrb r7, [r2, #0x1]
ldr r0, [r0, #0x0]
mov r1, #0x1
@@ -484,7 +471,7 @@ _020BED40:
ldr r0, [r1, #0x8]
str r0, [r12, #0xc]
beq _020BEDB8
- ldr lr, _020BEE2C ; =UNK_021CEF7C
+ ldr lr, _020BEE2C ; =NNS_G3dRS
ldrb r0, [r2, #0x1]
ldr r4, [lr, #0x0]
mov lr, #0x18
@@ -498,11 +485,11 @@ _020BED40:
and r0, r6, r4
str r0, [r8, r7, lsl #0x2]
ldr r4, [r1, #0xc]
- ldr r0, _020BEE30 ; =UNK_021CFD8C
- ldr lr, _020BEE34 ; =UNK_021CFD90
+ ldr r0, _020BEE30 ; =NNS_G3dRSOnGlb + 0xE0C
+ ldr lr, _020BEE34 ; =NNS_G3dRSOnGlb + 0xE10
str r4, [r0, r5]
ldr r4, [r1, #0x10]
- ldr r0, _020BEE38 ; =UNK_021CFD94
+ ldr r0, _020BEE38 ; =NNS_G3dRSOnGlb + 0xE14
str r4, [lr, r5]
ldr r1, [r1, #0x14]
str r1, [r0, r5]
@@ -511,7 +498,7 @@ _020BEDB8:
beq _020BEE1C
ldrb r0, [r2, #0x2]
ldr r2, [r12, #0x0]
- ldr r1, _020BEE2C ; =UNK_021CEF7C
+ ldr r1, _020BEE2C ; =NNS_G3dRS
orr r2, r2, #0x20
str r2, [r12, #0x0]
ldr r2, [r1, #0x0]
@@ -526,7 +513,7 @@ _020BEDB8:
orrne r0, r0, #0x8
strne r0, [r12, #0x0]
bne _020BEE1C
- ldr r2, _020BEE30 ; =UNK_021CFD8C
+ ldr r2, _020BEE30 ; =NNS_G3dRSOnGlb + 0xE0C
mov r1, #0x18
mla r1, r0, r1, r2
add r3, r12, #0x10
@@ -538,15 +525,14 @@ _020BEE1C:
str r0, [r12, #0x0]
ldmia sp!, {r4-r8,pc}
.balign 4
-_020BEE2C: .word UNK_021CEF7C
-_020BEE30: .word UNK_021CFD8C
-_020BEE34: .word UNK_021CFD90
-_020BEE38: .word UNK_021CFD94
- arm_func_end FUN_020BECEC
+_020BEE2C: .word NNS_G3dRS
+_020BEE30: .word NNS_G3dRSOnGlb + 0xE0C
+_020BEE34: .word NNS_G3dRSOnGlb + 0xE10
+_020BEE38: .word NNS_G3dRSOnGlb + 0xE14
+ arm_func_end NNSi_G3dGetJointScaleMaya
- ; _end
- arm_func_start FUN_020BEE3C
-FUN_020BEE3C: ; 0x020BEE3C
+ arm_func_start NNSi_G3dSendJointSRTMaya
+NNSi_G3dSendJointSRTMaya: ; 0x020BEE3C
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r0
@@ -563,13 +549,13 @@ FUN_020BEE3C: ; 0x020BEE3C
add r1, r5, #0x4c
mov r0, #0x1c
mov r2, #0x3
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
mov r4, #0x0
_020BEE84:
add r1, r5, #0x10
mov r0, #0x1b
mov r2, #0x3
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020BEE94:
ldr r0, [r5, #0x0]
ands r0, r0, #0x2
@@ -579,13 +565,13 @@ _020BEE94:
add r1, r5, #0x28
mov r0, #0x19
mov r2, #0xc
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
b _020BEEE8
_020BEEBC:
add r1, r5, #0x28
mov r0, #0x1a
mov r2, #0x9
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
b _020BEEE8
_020BEED0:
cmp r4, #0x0
@@ -593,7 +579,7 @@ _020BEED0:
add r1, r5, #0x4c
mov r0, #0x1c
mov r2, #0x3
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020BEEE8:
ldr r0, [r5, #0x0]
ands r0, r0, #0x1
@@ -602,8 +588,7 @@ _020BEEE8:
add r1, r5, #0x4
mov r0, #0x1b
mov r2, #0x3
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
- arm_func_end FUN_020BEE3C
-
+ arm_func_end NNSi_G3dSendJointSRTMaya
diff --git a/arm9/asm/NNS_G3D_mem.s b/arm9/asm/NNS_G3D_mem.s
index 97d2c224..e01336e5 100644
--- a/arm9/asm/NNS_G3D_mem.s
+++ b/arm9/asm/NNS_G3D_mem.s
@@ -3,26 +3,23 @@
.section .text
- ; NNS_G3dFreeAnmObj
- arm_func_start thunk_FUN_020ae84c
-thunk_FUN_020ae84c: ; 0x020BB8C4
- ldr ip, _020BB8CC ; =FUN_020AE84C
+ arm_func_start NNS_G3dFreeAnmObj
+NNS_G3dFreeAnmObj: ; 0x020BB8C4
+ ldr ip, _020BB8CC ; =NNS_FndFreeToAllocator
bx r12
.balign 4
-_020BB8CC: .word FUN_020AE84C
- arm_func_end thunk_FUN_020ae84c
+_020BB8CC: .word NNS_FndFreeToAllocator
+ arm_func_end NNS_G3dFreeAnmObj
- ; _end
- arm_func_start FUN_020BB8D0
-FUN_020BB8D0: ; 0x020BB8D0
+ arm_func_start NNS_G3dAllocAnmObj
+NNS_G3dAllocAnmObj: ; 0x020BB8D0
stmdb sp!, {r4,lr}
mov r4, r0
mov r0, r1
mov r1, r2
- bl FUN_020B81B0
+ bl NNS_G3dAnmObjCalcSizeRequired
mov r1, r0
mov r0, r4
- bl FUN_020AE868
+ bl NNS_FndAllocFromAllocator
ldmia sp!, {r4,pc}
- arm_func_end FUN_020BB8D0
-
+ arm_func_end NNS_G3dAllocAnmObj
diff --git a/arm9/asm/NNS_G3D_model.s b/arm9/asm/NNS_G3D_model.s
index 437290e8..958a9b8a 100644
--- a/arm9/asm/NNS_G3D_model.s
+++ b/arm9/asm/NNS_G3D_model.s
@@ -3,9 +3,8 @@
.section .text
- ; _end
- arm_func_start FUN_020BB8F4
-FUN_020BB8F4: ; 0x020BB8F4
+ arm_func_start NNS_G3dMdlSetMdlXLDepthUpdateAll
+NNS_G3dMdlSetMdlXLDepthUpdateAll: ; 0x020BB8F4
stmdb sp!, {r4-r6,lr}
mov r6, r0
ldrb r0, [r6, #0x18]
@@ -17,17 +16,16 @@ _020BB910:
mov r0, r6
mov r1, r4
mov r2, r5
- bl FUN_020BBC74
+ bl NNS_G3dMdlSetMdlXLDepthUpdate
ldrb r0, [r6, #0x18]
add r4, r4, #0x1
cmp r4, r0
blo _020BB910
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020BB8F4
+ arm_func_end NNS_G3dMdlSetMdlXLDepthUpdateAll
- ; _end
- arm_func_start FUN_020BB934
-FUN_020BB934: ; 0x020BB934
+ arm_func_start NNS_G3dMdlSetMdlFarClipAll
+NNS_G3dMdlSetMdlFarClipAll: ; 0x020BB934
stmdb sp!, {r4-r6,lr}
mov r6, r0
ldrb r0, [r6, #0x18]
@@ -39,17 +37,16 @@ _020BB950:
mov r0, r6
mov r1, r4
mov r2, r5
- bl FUN_020BBCB8
+ bl NNS_G3dMdlSetMdlFarClip
ldrb r0, [r6, #0x18]
add r4, r4, #0x1
cmp r4, r0
blo _020BB950
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020BB934
+ arm_func_end NNS_G3dMdlSetMdlFarClipAll
- ; _end
- arm_func_start FUN_020BB974
-FUN_020BB974: ; 0x020BB974
+ arm_func_start NNS_G3dMdlSetMdl1DotAll
+NNS_G3dMdlSetMdl1DotAll: ; 0x020BB974
stmdb sp!, {r4-r6,lr}
mov r6, r0
ldrb r0, [r6, #0x18]
@@ -61,17 +58,16 @@ _020BB990:
mov r0, r6
mov r1, r4
mov r2, r5
- bl FUN_020BBCFC
+ bl NNS_G3dMdlSetMdl1Dot
ldrb r0, [r6, #0x18]
add r4, r4, #0x1
cmp r4, r0
blo _020BB990
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020BB974
+ arm_func_end NNS_G3dMdlSetMdl1DotAll
- ; _end
- arm_func_start FUN_020BB9B4
-FUN_020BB9B4: ; 0x020BB9B4
+ arm_func_start NNS_G3dMdlSetMdlDepthTestCondAll
+NNS_G3dMdlSetMdlDepthTestCondAll: ; 0x020BB9B4
stmdb sp!, {r4-r6,lr}
mov r6, r0
ldrb r0, [r6, #0x18]
@@ -83,17 +79,16 @@ _020BB9D0:
mov r0, r6
mov r1, r4
mov r2, r5
- bl FUN_020BBD40
+ bl NNS_G3dMdlSetMdlDepthTestCond
ldrb r0, [r6, #0x18]
add r4, r4, #0x1
cmp r4, r0
blo _020BB9D0
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020BB9B4
+ arm_func_end NNS_G3dMdlSetMdlDepthTestCondAll
- ; _end
- arm_func_start FUN_020BB9F4
-FUN_020BB9F4: ; 0x020BB9F4
+ arm_func_start NNS_G3dMdlSetMdlFogEnableFlagAll
+NNS_G3dMdlSetMdlFogEnableFlagAll: ; 0x020BB9F4
stmdb sp!, {r4-r6,lr}
mov r6, r0
ldrb r0, [r6, #0x18]
@@ -105,17 +100,16 @@ _020BBA10:
mov r0, r6
mov r1, r4
mov r2, r5
- bl FUN_020BBD84
+ bl NNS_G3dMdlSetMdlFogEnableFlag
ldrb r0, [r6, #0x18]
add r4, r4, #0x1
cmp r4, r0
blo _020BBA10
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020BB9F4
+ arm_func_end NNS_G3dMdlSetMdlFogEnableFlagAll
- ; _end
- arm_func_start FUN_020BBA34
-FUN_020BBA34: ; 0x020BBA34
+ arm_func_start NNS_G3dMdlSetMdlAlphaAll
+NNS_G3dMdlSetMdlAlphaAll: ; 0x020BBA34
stmdb sp!, {r4-r6,lr}
mov r6, r0
ldrb r0, [r6, #0x18]
@@ -127,17 +121,16 @@ _020BBA50:
mov r0, r6
mov r1, r4
mov r2, r5
- bl FUN_020BBDC8
+ bl NNS_G3dMdlSetMdlAlpha
ldrb r0, [r6, #0x18]
add r4, r4, #0x1
cmp r4, r0
blo _020BBA50
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020BBA34
+ arm_func_end NNS_G3dMdlSetMdlAlphaAll
- ; _end
- arm_func_start FUN_020BBA74
-FUN_020BBA74: ; 0x020BBA74
+ arm_func_start NNS_G3dMdlSetMdlPolygonIDAll
+NNS_G3dMdlSetMdlPolygonIDAll: ; 0x020BBA74
stmdb sp!, {r4-r6,lr}
mov r6, r0
ldrb r0, [r6, #0x18]
@@ -149,17 +142,16 @@ _020BBA90:
mov r0, r6
mov r1, r4
mov r2, r5
- bl FUN_020BBE0C
+ bl NNS_G3dMdlSetMdlPolygonID
ldrb r0, [r6, #0x18]
add r4, r4, #0x1
cmp r4, r0
blo _020BBA90
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020BBA74
+ arm_func_end NNS_G3dMdlSetMdlPolygonIDAll
- ; _end
- arm_func_start FUN_020BBAB4
-FUN_020BBAB4: ; 0x020BBAB4
+ arm_func_start NNS_G3dMdlSetMdlCullModeAll
+NNS_G3dMdlSetMdlCullModeAll: ; 0x020BBAB4
stmdb sp!, {r4-r6,lr}
mov r6, r0
ldrb r0, [r6, #0x18]
@@ -171,17 +163,16 @@ _020BBAD0:
mov r0, r6
mov r1, r4
mov r2, r5
- bl FUN_020BBE50
+ bl NNS_G3dMdlSetMdlCullMode
ldrb r0, [r6, #0x18]
add r4, r4, #0x1
cmp r4, r0
blo _020BBAD0
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020BBAB4
+ arm_func_end NNS_G3dMdlSetMdlCullModeAll
- ; _end
- arm_func_start FUN_020BBAF4
-FUN_020BBAF4: ; 0x020BBAF4
+ arm_func_start NNS_G3dMdlSetMdlPolygonModeAll
+NNS_G3dMdlSetMdlPolygonModeAll: ; 0x020BBAF4
stmdb sp!, {r4-r6,lr}
mov r6, r0
ldrb r0, [r6, #0x18]
@@ -193,17 +184,16 @@ _020BBB10:
mov r0, r6
mov r1, r4
mov r2, r5
- bl FUN_020BBE94
+ bl NNS_G3dMdlSetMdlPolygonMode
ldrb r0, [r6, #0x18]
add r4, r4, #0x1
cmp r4, r0
blo _020BBB10
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020BBAF4
+ arm_func_end NNS_G3dMdlSetMdlPolygonModeAll
- ; _end
- arm_func_start FUN_020BBB34
-FUN_020BBB34: ; 0x020BBB34
+ arm_func_start NNS_G3dMdlSetMdlLightEnableFlagAll
+NNS_G3dMdlSetMdlLightEnableFlagAll: ; 0x020BBB34
stmdb sp!, {r4-r6,lr}
mov r6, r0
ldrb r0, [r6, #0x18]
@@ -215,17 +205,16 @@ _020BBB50:
mov r0, r6
mov r1, r4
mov r2, r5
- bl FUN_020BBED8
+ bl NNS_G3dMdlSetMdlLightEnableFlag
ldrb r0, [r6, #0x18]
add r4, r4, #0x1
cmp r4, r0
blo _020BBB50
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020BBB34
+ arm_func_end NNS_G3dMdlSetMdlLightEnableFlagAll
- ; _end
- arm_func_start FUN_020BBB74
-FUN_020BBB74: ; 0x020BBB74
+ arm_func_start NNS_G3dMdlSetMdlEmiAll
+NNS_G3dMdlSetMdlEmiAll: ; 0x020BBB74
stmdb sp!, {r4-r6,lr}
mov r6, r0
ldrb r0, [r6, #0x18]
@@ -237,17 +226,16 @@ _020BBB90:
mov r0, r6
mov r1, r4
mov r2, r5
- bl FUN_020BBF1C
+ bl NNS_G3dMdlSetMdlEmi
ldrb r0, [r6, #0x18]
add r4, r4, #0x1
cmp r4, r0
blo _020BBB90
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020BBB74
+ arm_func_end NNS_G3dMdlSetMdlEmiAll
- ; _end
- arm_func_start FUN_020BBBB4
-FUN_020BBBB4: ; 0x020BBBB4
+ arm_func_start NNS_G3dMdlSetMdlSpecAll
+NNS_G3dMdlSetMdlSpecAll: ; 0x020BBBB4
stmdb sp!, {r4-r6,lr}
mov r6, r0
ldrb r0, [r6, #0x18]
@@ -259,17 +247,16 @@ _020BBBD0:
mov r0, r6
mov r1, r4
mov r2, r5
- bl FUN_020BBF60
+ bl NNS_G3dMdlSetMdlSpec
ldrb r0, [r6, #0x18]
add r4, r4, #0x1
cmp r4, r0
blo _020BBBD0
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020BBBB4
+ arm_func_end NNS_G3dMdlSetMdlSpecAll
- ; _end
- arm_func_start FUN_020BBBF4
-FUN_020BBBF4: ; 0x020BBBF4
+ arm_func_start NNS_G3dMdlSetMdlAmbAll
+NNS_G3dMdlSetMdlAmbAll: ; 0x020BBBF4
stmdb sp!, {r4-r6,lr}
mov r6, r0
ldrb r0, [r6, #0x18]
@@ -281,17 +268,16 @@ _020BBC10:
mov r0, r6
mov r1, r4
mov r2, r5
- bl FUN_020BBFA4
+ bl NNS_G3dMdlSetMdlAmb
ldrb r0, [r6, #0x18]
add r4, r4, #0x1
cmp r4, r0
blo _020BBC10
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020BBBF4
+ arm_func_end NNS_G3dMdlSetMdlAmbAll
- ; _end
- arm_func_start FUN_020BBC34
-FUN_020BBC34: ; 0x020BBC34
+ arm_func_start NNS_G3dMdlSetMdlDiffAll
+NNS_G3dMdlSetMdlDiffAll: ; 0x020BBC34
stmdb sp!, {r4-r6,lr}
mov r6, r0
ldrb r0, [r6, #0x18]
@@ -303,17 +289,16 @@ _020BBC50:
mov r0, r6
mov r1, r4
mov r2, r5
- bl FUN_020BBFE8
+ bl NNS_G3dMdlSetMdlDiff
ldrb r0, [r6, #0x18]
add r4, r4, #0x1
cmp r4, r0
blo _020BBC50
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020BBC34
+ arm_func_end NNS_G3dMdlSetMdlDiffAll
- ; _end
- arm_func_start FUN_020BBC74
-FUN_020BBC74: ; 0x020BBC74
+ arm_func_start NNS_G3dMdlSetMdlXLDepthUpdate
+NNS_G3dMdlSetMdlXLDepthUpdate: ; 0x020BBC74
ldr r3, [r0, #0x8]
cmp r2, #0x0
add r12, r0, r3
@@ -331,11 +316,10 @@ FUN_020BBC74: ; 0x020BBC74
biceq r0, r0, #0x800
streq r0, [r1, #0xc]
bx lr
- arm_func_end FUN_020BBC74
+ arm_func_end NNS_G3dMdlSetMdlXLDepthUpdate
- ; _end
- arm_func_start FUN_020BBCB8
-FUN_020BBCB8: ; 0x020BBCB8
+ arm_func_start NNS_G3dMdlSetMdlFarClip
+NNS_G3dMdlSetMdlFarClip: ; 0x020BBCB8
ldr r3, [r0, #0x8]
cmp r2, #0x0
add r12, r0, r3
@@ -353,11 +337,10 @@ FUN_020BBCB8: ; 0x020BBCB8
biceq r0, r0, #0x1000
streq r0, [r1, #0xc]
bx lr
- arm_func_end FUN_020BBCB8
+ arm_func_end NNS_G3dMdlSetMdlFarClip
- ; _end
- arm_func_start FUN_020BBCFC
-FUN_020BBCFC: ; 0x020BBCFC
+ arm_func_start NNS_G3dMdlSetMdl1Dot
+NNS_G3dMdlSetMdl1Dot: ; 0x020BBCFC
ldr r3, [r0, #0x8]
cmp r2, #0x0
add r12, r0, r3
@@ -375,11 +358,10 @@ FUN_020BBCFC: ; 0x020BBCFC
biceq r0, r0, #0x2000
streq r0, [r1, #0xc]
bx lr
- arm_func_end FUN_020BBCFC
+ arm_func_end NNS_G3dMdlSetMdl1Dot
- ; _end
- arm_func_start FUN_020BBD40
-FUN_020BBD40: ; 0x020BBD40
+ arm_func_start NNS_G3dMdlSetMdlDepthTestCond
+NNS_G3dMdlSetMdlDepthTestCond: ; 0x020BBD40
ldr r3, [r0, #0x8]
cmp r2, #0x0
add r12, r0, r3
@@ -397,11 +379,10 @@ FUN_020BBD40: ; 0x020BBD40
biceq r0, r0, #0x4000
streq r0, [r1, #0xc]
bx lr
- arm_func_end FUN_020BBD40
+ arm_func_end NNS_G3dMdlSetMdlDepthTestCond
- ; _end
- arm_func_start FUN_020BBD84
-FUN_020BBD84: ; 0x020BBD84
+ arm_func_start NNS_G3dMdlSetMdlFogEnableFlag
+NNS_G3dMdlSetMdlFogEnableFlag: ; 0x020BBD84
ldr r3, [r0, #0x8]
cmp r2, #0x0
add r12, r0, r3
@@ -419,11 +400,10 @@ FUN_020BBD84: ; 0x020BBD84
biceq r0, r0, #0x8000
streq r0, [r1, #0xc]
bx lr
- arm_func_end FUN_020BBD84
+ arm_func_end NNS_G3dMdlSetMdlFogEnableFlag
- ; _end
- arm_func_start FUN_020BBDC8
-FUN_020BBDC8: ; 0x020BBDC8
+ arm_func_start NNS_G3dMdlSetMdlAlpha
+NNS_G3dMdlSetMdlAlpha: ; 0x020BBDC8
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr r3, [r0, #0x8]
@@ -441,11 +421,10 @@ FUN_020BBDC8: ; 0x020BBDC8
str r0, [r1, #0xc]
add sp, sp, #0x4
ldmia sp!, {pc}
- arm_func_end FUN_020BBDC8
+ arm_func_end NNS_G3dMdlSetMdlAlpha
- ; _end
- arm_func_start FUN_020BBE0C
-FUN_020BBE0C: ; 0x020BBE0C
+ arm_func_start NNS_G3dMdlSetMdlPolygonID
+NNS_G3dMdlSetMdlPolygonID: ; 0x020BBE0C
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr r3, [r0, #0x8]
@@ -463,11 +442,10 @@ FUN_020BBE0C: ; 0x020BBE0C
str r0, [r1, #0xc]
add sp, sp, #0x4
ldmia sp!, {pc}
- arm_func_end FUN_020BBE0C
+ arm_func_end NNS_G3dMdlSetMdlPolygonID
- ; _end
- arm_func_start FUN_020BBE50
-FUN_020BBE50: ; 0x020BBE50
+ arm_func_start NNS_G3dMdlSetMdlCullMode
+NNS_G3dMdlSetMdlCullMode: ; 0x020BBE50
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr r3, [r0, #0x8]
@@ -485,11 +463,10 @@ FUN_020BBE50: ; 0x020BBE50
str r0, [r1, #0xc]
add sp, sp, #0x4
ldmia sp!, {pc}
- arm_func_end FUN_020BBE50
+ arm_func_end NNS_G3dMdlSetMdlCullMode
- ; _end
- arm_func_start FUN_020BBE94
-FUN_020BBE94: ; 0x020BBE94
+ arm_func_start NNS_G3dMdlSetMdlPolygonMode
+NNS_G3dMdlSetMdlPolygonMode: ; 0x020BBE94
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr r3, [r0, #0x8]
@@ -507,11 +484,10 @@ FUN_020BBE94: ; 0x020BBE94
str r0, [r1, #0xc]
add sp, sp, #0x4
ldmia sp!, {pc}
- arm_func_end FUN_020BBE94
+ arm_func_end NNS_G3dMdlSetMdlPolygonMode
- ; _end
- arm_func_start FUN_020BBED8
-FUN_020BBED8: ; 0x020BBED8
+ arm_func_start NNS_G3dMdlSetMdlLightEnableFlag
+NNS_G3dMdlSetMdlLightEnableFlag: ; 0x020BBED8
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr r3, [r0, #0x8]
@@ -529,11 +505,10 @@ FUN_020BBED8: ; 0x020BBED8
str r0, [r1, #0xc]
add sp, sp, #0x4
ldmia sp!, {pc}
- arm_func_end FUN_020BBED8
+ arm_func_end NNS_G3dMdlSetMdlLightEnableFlag
- ; NNS_G3dMdlSetMdlEmi
- arm_func_start FUN_020BBF1C
-FUN_020BBF1C: ; 0x020BBF1C
+ arm_func_start NNS_G3dMdlSetMdlEmi
+NNS_G3dMdlSetMdlEmi: ; 0x020BBF1C
stmdb sp!, {r4,lr}
ldr r12, [r0, #0x8]
ldr r3, _020BBF5C ; =0x8000FFFF
@@ -552,11 +527,10 @@ FUN_020BBF1C: ; 0x020BBF1C
ldmia sp!, {r4,pc}
.balign 4
_020BBF5C: .word 0x8000FFFF
- arm_func_end FUN_020BBF1C
+ arm_func_end NNS_G3dMdlSetMdlEmi
- ; _end
- arm_func_start FUN_020BBF60
-FUN_020BBF60: ; 0x020BBF60
+ arm_func_start NNS_G3dMdlSetMdlSpec
+NNS_G3dMdlSetMdlSpec: ; 0x020BBF60
stmdb sp!, {r4,lr}
ldr r12, [r0, #0x8]
mov r3, #0x8000
@@ -574,11 +548,10 @@ FUN_020BBF60: ; 0x020BBF60
orr r0, r0, r2
str r0, [r3, #0x8]
ldmia sp!, {r4,pc}
- arm_func_end FUN_020BBF60
+ arm_func_end NNS_G3dMdlSetMdlSpec
- ; NNS_G3dMdlSetMdlAmb
- arm_func_start FUN_020BBFA4
-FUN_020BBFA4: ; 0x020BBFA4
+ arm_func_start NNS_G3dMdlSetMdlAmb
+NNS_G3dMdlSetMdlAmb: ; 0x020BBFA4
stmdb sp!, {r4,lr}
ldr r12, [r0, #0x8]
ldr r3, _020BBFE4 ; =0x8000FFFF
@@ -597,11 +570,10 @@ FUN_020BBFA4: ; 0x020BBFA4
ldmia sp!, {r4,pc}
.balign 4
_020BBFE4: .word 0x8000FFFF
- arm_func_end FUN_020BBFA4
+ arm_func_end NNS_G3dMdlSetMdlAmb
- ; _end
- arm_func_start FUN_020BBFE8
-FUN_020BBFE8: ; 0x020BBFE8
+ arm_func_start NNS_G3dMdlSetMdlDiff
+NNS_G3dMdlSetMdlDiff: ; 0x020BBFE8
stmdb sp!, {r4,lr}
ldr r12, [r0, #0x8]
mov r3, #0x8000
@@ -619,11 +591,10 @@ FUN_020BBFE8: ; 0x020BBFE8
orr r0, r0, r2
str r0, [r3, #0x4]
ldmia sp!, {r4,pc}
- arm_func_end FUN_020BBFE8
+ arm_func_end NNS_G3dMdlSetMdlDiff
- ; _end
- arm_func_start FUN_020BC02C
-FUN_020BC02C: ; 0x020BC02C
+ arm_func_start NNSi_G3dModifyPolygonAttrMask
+NNSi_G3dModifyPolygonAttrMask: ; 0x020BC02C
stmdb sp!, {r4-r6,lr}
ldrb r4, [r0, #0x18]
ldr r3, [r0, #0x8]
@@ -651,11 +622,10 @@ _020BC050:
cmp lr, r4
blo _020BC050
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020BC02C
+ arm_func_end NNSi_G3dModifyPolygonAttrMask
- ; _end
- arm_func_start FUN_020BC094
-FUN_020BC094: ; 0x020BC094
+ arm_func_start NNSi_G3dModifyMatFlag
+NNSi_G3dModifyMatFlag: ; 0x020BC094
stmdb sp!, {r4-r6,lr}
ldrb r4, [r0, #0x18]
ldr r3, [r0, #0x8]
@@ -683,5 +653,4 @@ _020BC0B8:
cmp lr, r4
blo _020BC0B8
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020BC094
-
+ arm_func_end NNSi_G3dModifyMatFlag
diff --git a/arm9/asm/NNS_G3D_nsbca.s b/arm9/asm/NNS_G3D_nsbca.s
index b8835362..a29deb70 100644
--- a/arm9/asm/NNS_G3D_nsbca.s
+++ b/arm9/asm/NNS_G3D_nsbca.s
@@ -3,9 +3,8 @@
.section .rodata
- ; pivotUtil_
- .global UNK_020FFA14
-UNK_020FFA14: ; 0x020FFA14
+ .global pivotUtil_
+pivotUtil_: ; 0x020FFA14
.byte 0x04, 0x05, 0x07, 0x08
.byte 0x03, 0x05, 0x06, 0x08
.byte 0x03, 0x04, 0x06, 0x07
@@ -18,9 +17,8 @@ UNK_020FFA14: ; 0x020FFA14
.section .text
- ; getRotDataByIdx_
- arm_func_start FUN_020BC500
-FUN_020BC500: ; 0x020BC500
+ arm_func_start getRotDataByIdx_
+getRotDataByIdx_: ; 0x020BC500
stmdb sp!, {r4,lr}
ands r4, r3, #0x8000
beq _020BC5E0
@@ -57,21 +55,21 @@ FUN_020BC500: ; 0x020BC500
rsbne lr, lr, #0x0
moveq lr, #0x1000
str lr, [r0, r1, lsl #0x2]
- ldr r4, _020BC688 ; =UNK_020FFA14
- ldr lr, _020BC68C ; =UNK_020FFA14 + 1
+ ldr r4, _020BC688 ; =pivotUtil_
+ ldr lr, _020BC68C ; =pivotUtil_ + 1
ldrb r4, [r4, r1, lsl #0x2]
str r12, [r0, r4, lsl #0x2]
ldrb lr, [lr, r1, lsl #0x2]
str r3, [r0, lr, lsl #0x2]
ldrsh lr, [r2, #0x0]
ands lr, lr, #0x20
- ldr lr, _020BC690 ; =UNK_020FFA14 + 2
+ ldr lr, _020BC690 ; =pivotUtil_ + 2
rsbne r3, r3, #0x0
ldrb lr, [lr, r1, lsl #0x2]
str r3, [r0, lr, lsl #0x2]
ldrsh r2, [r2, #0x0]
ands r2, r2, #0x40
- ldr r2, _020BC694 ; =UNK_020FFA14 + 3
+ ldr r2, _020BC694 ; =pivotUtil_ + 3
rsbne r12, r12, #0x0
ldrb r1, [r2, r1, lsl #0x2]
str r12, [r0, r1, lsl #0x2]
@@ -121,15 +119,14 @@ _020BC5E0:
ldmia sp!, {r4,pc}
.balign 4
_020BC684: .word 0x00007FFF
-_020BC688: .word UNK_020FFA14
-_020BC68C: .word UNK_020FFA14 + 1
-_020BC690: .word UNK_020FFA14 + 2
-_020BC694: .word UNK_020FFA14 + 3
- arm_func_end FUN_020BC500
+_020BC688: .word pivotUtil_
+_020BC68C: .word pivotUtil_ + 1
+_020BC690: .word pivotUtil_ + 2
+_020BC694: .word pivotUtil_ + 3
+ arm_func_end getRotDataByIdx_
- ; getRotDataEx_
- arm_func_start FUN_020BC698
-FUN_020BC698: ; 0x020BC698
+ arm_func_start getRotDataEx_
+getRotDataEx_: ; 0x020BC698
stmdb sp!, {r4-r10,lr}
sub sp, sp, #0x48
ldrh r4, [r3, #0x4]
@@ -162,7 +159,7 @@ _020BC6F0:
mov r0, r6
mov r1, r5
mov r2, r4
- bl FUN_020BC500
+ bl getRotDataByIdx_
cmp r0, #0x0
addeq sp, sp, #0x48
ldmeqia sp!, {r4-r10,pc}
@@ -231,14 +228,14 @@ _020BC800:
add r0, sp, #0x0
mov r1, r5
mov r2, r4
- bl FUN_020BC500
+ bl getRotDataByIdx_
mov r1, r7, lsl #0x1
ldrh r3, [r8, r1]
orr r7, r0, #0x0
add r0, sp, #0x24
mov r1, r5
mov r2, r4
- bl FUN_020BC500
+ bl getRotDataByIdx_
ldr r3, [sp, #0x0]
ldr r1, [sp, #0x24]
mul r2, r3, r9
@@ -345,11 +342,10 @@ _020BC9C4: .word 0x1FFF0000
_020BC9C8: .word 0x00001FFF
_020BC9CC: .word 0x00003FFF
_020BC9D0: .word 0x00000FFF
- arm_func_end FUN_020BC698
+ arm_func_end getRotDataEx_
- ; getRotData_
- arm_func_start FUN_020BC9D4
-FUN_020BC9D4: ; 0x020BC9D4
+ arm_func_start getRotData_
+getRotData_: ; 0x020BC9D4
stmdb sp!, {r4-r9,lr}
sub sp, sp, #0x4c
ldr r5, [r3, #0xc]
@@ -398,14 +394,14 @@ _020BCA44:
mov r1, r5
mov r2, r4
mov r7, #0x0
- bl FUN_020BC500
+ bl getRotDataByIdx_
mov r1, r9, lsl #0x1
ldrh r3, [r8, r1]
orr r7, r7, r0
add r0, sp, #0x0
mov r1, r5
mov r2, r4
- bl FUN_020BC500
+ bl getRotDataByIdx_
ldr r3, [sp, #0x0]
ldr r1, [r6, #0x0]
mov r2, #0x3
@@ -494,14 +490,14 @@ _020BCBE8:
mov r0, r6
mov r1, r5
mov r2, r4
- bl FUN_020BC500
+ bl getRotDataByIdx_
add r1, r8, r7, lsl #0x1
ldrh r3, [r1, #0x2]
orr r7, r0, #0x0
add r0, sp, #0x24
mov r1, r5
mov r2, r4
- bl FUN_020BC500
+ bl getRotDataByIdx_
ldr r2, [r6, #0x0]
ldr r1, [sp, #0x24]
orr r7, r7, r0
@@ -582,7 +578,7 @@ _020BCD40:
mov r0, r6
mov r1, r5
mov r2, r4
- bl FUN_020BC500
+ bl getRotDataByIdx_
cmp r0, #0x0
addeq sp, sp, #0x4c
ldmeqia sp!, {r4-r9,pc}
@@ -611,11 +607,10 @@ _020BCD40:
ldmia sp!, {r4-r9,pc}
.balign 4
_020BCDC0: .word 0x1FFF0000
- arm_func_end FUN_020BC9D4
+ arm_func_end getRotData_
- ; getScaleDataEx_
- arm_func_start FUN_020BCDC4
-FUN_020BCDC4: ; 0x020BCDC4
+ arm_func_start getScaleDataEx_
+getScaleDataEx_: ; 0x020BCDC4
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
ldrh r4, [r3, #0x4]
@@ -732,11 +727,10 @@ _020BCF60: .word 0x1FFF0000
_020BCF64: .word 0x00001FFF
_020BCF68: .word 0x00003FFF
_020BCF6C: .word 0x00000FFF
- arm_func_end FUN_020BCDC4
+ arm_func_end getScaleDataEx_
- ; getScaleData_
- arm_func_start FUN_020BCF70
-FUN_020BCF70: ; 0x020BCF70
+ arm_func_start getScaleData_
+getScaleData_: ; 0x020BCF70
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
ldr r4, [r2, #0x4]
@@ -880,11 +874,10 @@ _020BD150:
ldmia sp!, {r4-r5,pc}
.balign 4
_020BD184: .word 0x1FFF0000
- arm_func_end FUN_020BCF70
+ arm_func_end getScaleData_
- ; getTransDataEx_
- arm_func_start FUN_020BD188
-FUN_020BD188: ; 0x020BD188
+ arm_func_start getTransDataEx_
+getTransDataEx_: ; 0x020BD188
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
ldrh r4, [r3, #0x4]
@@ -984,11 +977,10 @@ _020BD2E8: .word 0x00000FFF
_020BD2EC: .word 0x1FFF0000
_020BD2F0: .word 0x00001FFF
_020BD2F4: .word 0x00003FFF
- arm_func_end FUN_020BD188
+ arm_func_end getTransDataEx_
- ; getTransData_
- arm_func_start FUN_020BD2F8
-FUN_020BD2F8: ; 0x020BD2F8
+ arm_func_start getTransData_
+getTransData_: ; 0x020BD2F8
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr r12, [r2, #0x4]
@@ -1092,11 +1084,10 @@ _020BD44C:
ldmia sp!, {pc}
.balign 4
_020BD46C: .word 0x1FFF0000
- arm_func_end FUN_020BD2F8
+ arm_func_end getTransData_
- ; getJntSRTAnmResult_
- arm_func_start FUN_020BD470
-FUN_020BD470: ; 0x020BD470
+ arm_func_start getJntSRTAnmResult_
+getJntSRTAnmResult_: ; 0x020BD470
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x34
mov r9, r0
@@ -1133,14 +1124,14 @@ _020BD4C8:
mov r2, r4
mov r3, r9
add r0, r7, #0x4c
- bl FUN_020BD188
+ bl getTransDataEx_
b _020BD514
_020BD500:
mov r1, r8
mov r2, r4
mov r3, r9
add r0, r7, #0x4c
- bl FUN_020BD2F8
+ bl getTransData_
_020BD514:
add r4, r4, #0x8
b _020BD524
@@ -1156,14 +1147,14 @@ _020BD524:
mov r2, r4
mov r3, r9
add r0, r7, #0x50
- bl FUN_020BD188
+ bl getTransDataEx_
b _020BD560
_020BD54C:
mov r1, r8
mov r2, r4
mov r3, r9
add r0, r7, #0x50
- bl FUN_020BD2F8
+ bl getTransData_
_020BD560:
add r4, r4, #0x8
b _020BD570
@@ -1179,14 +1170,14 @@ _020BD570:
mov r2, r4
mov r3, r9
add r0, r7, #0x54
- bl FUN_020BD188
+ bl getTransDataEx_
b _020BD5AC
_020BD598:
mov r1, r8
mov r2, r4
mov r3, r9
add r0, r7, #0x54
- bl FUN_020BD2F8
+ bl getTransData_
_020BD5AC:
add r4, r4, #0x8
b _020BD5DC
@@ -1201,7 +1192,7 @@ _020BD5C0:
strne r0, [r7, #0x0]
bne _020BD5DC
mov r0, r7
- bl FUN_020BDA08
+ bl getMdlTrans_
_020BD5DC:
ands r0, r5, #0xc0
bne _020BD6A8
@@ -1213,14 +1204,14 @@ _020BD5DC:
mov r2, r4
mov r3, r9
add r0, r7, #0x28
- bl FUN_020BC698
+ bl getRotDataEx_
b _020BD620
_020BD60C:
mov r1, r8
mov r2, r4
mov r3, r9
add r0, r7, #0x28
- bl FUN_020BC9D4
+ bl getRotData_
_020BD620:
add r4, r4, #0x8
b _020BD6C4
@@ -1231,7 +1222,7 @@ _020BD628:
add r0, r7, #0x28
add r1, r9, r1
add r2, r9, r2
- bl FUN_020BC500
+ bl getRotDataByIdx_
cmp r0, #0x0
beq _020BD6A0
ldr r12, [r7, #0x3c]
@@ -1265,7 +1256,7 @@ _020BD6A8:
strne r0, [r7, #0x0]
bne _020BD6C4
mov r0, r7
- bl FUN_020BD850
+ bl getMdlRot_
_020BD6C4:
ands r0, r5, #0x600
bne _020BD7F0
@@ -1277,14 +1268,14 @@ _020BD6C4:
mov r1, r8
mov r2, r4
mov r3, r9
- bl FUN_020BCDC4
+ bl getScaleDataEx_
b _020BD708
_020BD6F4:
add r0, sp, #0x0
mov r1, r8
mov r2, r4
mov r3, r9
- bl FUN_020BCF70
+ bl getScaleData_
_020BD708:
ldr r1, [sp, #0x0]
ldr r0, [sp, #0x4]
@@ -1305,14 +1296,14 @@ _020BD72C:
mov r1, r8
mov r3, r9
add r2, r4, #0x8
- bl FUN_020BCDC4
+ bl getScaleDataEx_
b _020BD768
_020BD754:
add r0, sp, #0x8
mov r1, r8
mov r3, r9
add r2, r4, #0x8
- bl FUN_020BCF70
+ bl getScaleData_
_020BD768:
ldr r1, [sp, #0x8]
ldr r0, [sp, #0xc]
@@ -1333,14 +1324,14 @@ _020BD78C:
mov r1, r8
mov r3, r9
add r2, r4, #0x10
- bl FUN_020BCDC4
+ bl getScaleDataEx_
b _020BD7C8
_020BD7B4:
add r0, sp, #0x10
mov r1, r8
mov r3, r9
add r2, r4, #0x10
- bl FUN_020BCF70
+ bl getScaleData_
_020BD7C8:
ldr r1, [sp, #0x10]
ldr r0, [sp, #0x14]
@@ -1360,14 +1351,14 @@ _020BD7F0:
strne r0, [r7, #0x0]
bne _020BD814
mov r0, r7
- bl FUN_020BD9A4
+ bl getMdlScale_
add sp, sp, #0x34
ldmia sp!, {r4-r11,pc}
_020BD814:
ldr r0, [r7, #0x0]
add r1, sp, #0x18
ands r0, r0, #0x1
- ldr r0, _020BD84C ; =UNK_021CEF7C
+ ldr r0, _020BD84C ; =NNS_G3dRS
movne r3, #0x4
ldr r4, [r0, #0x0]
moveq r3, #0x0
@@ -1379,14 +1370,13 @@ _020BD814:
ldmia sp!, {r4-r11,pc}
.balign 4
_020BD848: .word 0x00000FFF
-_020BD84C: .word UNK_021CEF7C
- arm_func_end FUN_020BD470
+_020BD84C: .word NNS_G3dRS
+ arm_func_end getJntSRTAnmResult_
- ; getMdlRot_
- arm_func_start FUN_020BD850
-FUN_020BD850: ; 0x020BD850
+ arm_func_start getMdlRot_
+getMdlRot_: ; 0x020BD850
stmdb sp!, {r4-r8,lr}
- ldr r1, _020BD990 ; =UNK_021CEF7C
+ ldr r1, _020BD990 ; =NNS_G3dRS
mov r8, r0
ldr r0, [r1, #0x0]
ldr r3, [r0, #0xd4]
@@ -1418,10 +1408,10 @@ FUN_020BD850: ; 0x020BD850
movne r0, #0x1000
rsbne r2, r0, #0x0
moveq r2, #0x1000
- ldr r0, _020BD994 ; =UNK_020FFA14
+ ldr r0, _020BD994 ; =pivotUtil_
str r2, [r1, #0x28]
ldrb r1, [r0, r5, lsl #0x2]
- ldr r0, _020BD998 ; =UNK_020FFA14 + 1
+ ldr r0, _020BD998 ; =pivotUtil_ + 1
add r1, r8, r1, lsl #0x2
str r7, [r1, #0x28]
ldrb r0, [r0, r5, lsl #0x2]
@@ -1429,14 +1419,14 @@ FUN_020BD850: ; 0x020BD850
str r6, [r0, #0x28]
ldrh r0, [r4, #0x0]
ands r0, r0, #0x200
- ldr r0, _020BD99C ; =UNK_020FFA14 + 2
+ ldr r0, _020BD99C ; =pivotUtil_ + 2
rsbne r6, r6, #0x0
ldrb r0, [r0, r5, lsl #0x2]
add r0, r8, r0, lsl #0x2
str r6, [r0, #0x28]
ldrh r0, [r4, #0x0]
ands r0, r0, #0x400
- ldr r0, _020BD9A0 ; =UNK_020FFA14 + 3
+ ldr r0, _020BD9A0 ; =pivotUtil_ + 3
rsbne r7, r7, #0x0
ldrb r0, [r0, r5, lsl #0x2]
add r0, r8, r0, lsl #0x2
@@ -1468,18 +1458,17 @@ _020BD980:
str r0, [r8, #0x0]
ldmia sp!, {r4-r8,pc}
.balign 4
-_020BD990: .word UNK_021CEF7C
-_020BD994: .word UNK_020FFA14
-_020BD998: .word UNK_020FFA14 + 1
-_020BD99C: .word UNK_020FFA14 + 2
-_020BD9A0: .word UNK_020FFA14 + 3
- arm_func_end FUN_020BD850
+_020BD990: .word NNS_G3dRS
+_020BD994: .word pivotUtil_
+_020BD998: .word pivotUtil_ + 1
+_020BD99C: .word pivotUtil_ + 2
+_020BD9A0: .word pivotUtil_ + 3
+ arm_func_end getMdlRot_
- ; getMdlScale_
- arm_func_start FUN_020BD9A4
-FUN_020BD9A4: ; 0x020BD9A4
+ arm_func_start getMdlScale_
+getMdlScale_: ; 0x020BD9A4
stmdb sp!, {r4,lr}
- ldr r1, _020BDA04 ; =UNK_021CEF7C
+ ldr r1, _020BDA04 ; =NNS_G3dRS
ldr r12, [r1, #0x0]
ldr r4, [r12, #0xd4]
ldr r2, [r12, #0x0]
@@ -1504,13 +1493,12 @@ _020BD9F8:
blx r12
ldmia sp!, {r4,pc}
.balign 4
-_020BDA04: .word UNK_021CEF7C
- arm_func_end FUN_020BD9A4
+_020BDA04: .word NNS_G3dRS
+ arm_func_end getMdlScale_
- ; getMdlTrans_
- arm_func_start FUN_020BDA08
-FUN_020BDA08: ; 0x020BDA08
- ldr r1, _020BDA6C ; =UNK_021CEF7C
+ arm_func_start getMdlTrans_
+getMdlTrans_: ; 0x020BDA08
+ ldr r1, _020BDA6C ; =NNS_G3dRS
ldr r1, [r1, #0x0]
ldr r12, [r1, #0xd4]
ldr r1, [r1, #0x0]
@@ -1536,12 +1524,11 @@ FUN_020BDA08: ; 0x020BDA08
str r1, [r0, #0x54]
bx lr
.balign 4
-_020BDA6C: .word UNK_021CEF7C
- arm_func_end FUN_020BDA08
+_020BDA6C: .word NNS_G3dRS
+ arm_func_end getMdlTrans_
- ; _end
- arm_func_start FUN_020BDA70
-FUN_020BDA70: ; 0x020BDA70
+ arm_func_start NNSi_G3dAnmCalcNsBca
+NNSi_G3dAnmCalcNsBca: ; 0x020BDA70
stmdb sp!, {lr}
sub sp, sp, #0x4
mov r3, r0
@@ -1557,19 +1544,18 @@ FUN_020BDA70: ; 0x020BDA70
_020BDAA0:
mov r1, r2
mov r2, r12
- bl FUN_020BD470
+ bl getJntSRTAnmResult_
add sp, sp, #0x4
ldmia sp!, {pc}
- arm_func_end FUN_020BDA70
+ arm_func_end NNSi_G3dAnmCalcNsBca
- ; NNSi_G3dAnmObjInitNsBca
- arm_func_start FUN_020BDAB4
-FUN_020BDAB4: ; 0x020BDAB4
+ arm_func_start NNSi_G3dAnmObjInitNsBca
+NNSi_G3dAnmObjInitNsBca: ; 0x020BDAB4
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r0
mov r4, r1
- ldr r0, _020BDB3C ; =UNK_0210659C
+ ldr r0, _020BDB3C ; =NNS_G3dFuncAnmJntNsBcaDefault
str r4, [r5, #0x8]
ldr r0, [r0, #0x0]
add r1, r5, #0x1a
@@ -1601,6 +1587,5 @@ _020BDB08:
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
.balign 4
-_020BDB3C: .word UNK_0210659C
- arm_func_end FUN_020BDAB4
-
+_020BDB3C: .word NNS_G3dFuncAnmJntNsBcaDefault
+ arm_func_end NNSi_G3dAnmObjInitNsBca
diff --git a/arm9/asm/NNS_G3D_nsbma.s b/arm9/asm/NNS_G3D_nsbma.s
index 67c92e46..acadbe75 100644
--- a/arm9/asm/NNS_G3D_nsbma.s
+++ b/arm9/asm/NNS_G3D_nsbma.s
@@ -3,9 +3,8 @@
.section .text
- ; _end
- arm_func_start FUN_020BDB40
-FUN_020BDB40: ; 0x020BDB40
+ arm_func_start NNSi_G3dAnmCalcNsBma
+NNSi_G3dAnmCalcNsBma: ; 0x020BDB40
stmdb sp!, {r4-r8,lr}
ldr r7, [r1, #0x8]
mov r2, r2, lsl #0x10
@@ -23,12 +22,12 @@ FUN_020BDB40: ; 0x020BDB40
mov r0, r7
mov r2, r6
add r5, r3, r4
- bl FUN_020BDDAC
+ bl GetMatColAnmValue_
mov r4, r0
ldr r1, [r5, #0x4]
mov r0, r7
mov r2, r6
- bl FUN_020BDDAC
+ bl GetMatColAnmValue_
ldr r1, [r8, #0x4]
mov r2, r6
and r1, r1, #0x8000
@@ -37,12 +36,12 @@ FUN_020BDB40: ; 0x020BDB40
str r0, [r8, #0x4]
mov r0, r7
ldr r1, [r5, #0xc]
- bl FUN_020BDDAC
+ bl GetMatColAnmValue_
mov r4, r0
mov r0, r7
ldr r1, [r5, #0x8]
mov r2, r6
- bl FUN_020BDDAC
+ bl GetMatColAnmValue_
mov r2, r6
ldr r1, [r8, #0x8]
and r1, r1, #0x8000
@@ -51,20 +50,19 @@ FUN_020BDB40: ; 0x020BDB40
str r0, [r8, #0x8]
mov r0, r7
ldr r1, [r5, #0x10]
- bl FUN_020BDCB8
+ bl GetMatColAnmuAlphaValue_
ldr r1, [r8, #0xc]
bic r1, r1, #0x1f0000
orr r0, r1, r0, lsl #0x10
str r0, [r8, #0xc]
ldmia sp!, {r4-r8,pc}
- arm_func_end FUN_020BDB40
+ arm_func_end NNSi_G3dAnmCalcNsBma
- ; NNSi_G3dAnmObjInitNsBma
- arm_func_start FUN_020BDC0C
-FUN_020BDC0C: ; 0x020BDC0C
+ arm_func_start NNSi_G3dAnmObjInitNsBma
+NNSi_G3dAnmObjInitNsBma: ; 0x020BDC0C
stmdb sp!, {r4-r9,lr}
sub sp, sp, #0x4
- ldr r3, _020BDCB4 ; =UNK_021065A8
+ ldr r3, _020BDCB4 ; =NNS_G3dFuncAnmMatNsBmaDefault
ldr r4, [r2, #0x8]
ldr r3, [r3, #0x0]
mov r9, r0
@@ -93,7 +91,7 @@ _020BDC6C:
ldrh r1, [r2, #0x2]
add r1, r2, r1
add r1, r1, r6
- bl FUN_020BC14C
+ bl NNS_G3dGetResDictIdxByName
cmp r0, #0x0
orrge r1, r7, #0x100
addge r0, r9, r0, lsl #0x1
@@ -106,12 +104,11 @@ _020BDC6C:
add sp, sp, #0x4
ldmia sp!, {r4-r9,pc}
.balign 4
-_020BDCB4: .word UNK_021065A8
- arm_func_end FUN_020BDC0C
+_020BDCB4: .word NNS_G3dFuncAnmMatNsBmaDefault
+ arm_func_end NNSi_G3dAnmObjInitNsBma
- ; GetMatColAnmuAlphaValue_
- arm_func_start FUN_020BDCB8
-FUN_020BDCB8: ; 0x020BDCB8
+ arm_func_start GetMatColAnmuAlphaValue_
+GetMatColAnmuAlphaValue_: ; 0x020BDCB8
ands r3, r1, #0x20000000
movne r0, r1, lsl #0x10
movne r0, r0, lsr #0x10
@@ -178,11 +175,10 @@ _020BDD9C:
.balign 4
_020BDDA4: .word 0x0000FFFF
_020BDDA8: .word 0x1FFF0000
- arm_func_end FUN_020BDCB8
+ arm_func_end GetMatColAnmuAlphaValue_
- ; GetMatColAnmValue_
- arm_func_start FUN_020BDDAC
-FUN_020BDDAC: ; 0x020BDDAC
+ arm_func_start GetMatColAnmValue_
+GetMatColAnmValue_: ; 0x020BDDAC
stmdb sp!, {lr}
sub sp, sp, #0x4
ands r3, r1, #0x20000000
@@ -288,5 +284,4 @@ _020BDEE0:
_020BDF2C: .word 0x0000FFFF
_020BDF30: .word 0x1FFF0000
_020BDF34: .word 0x00007C1F
- arm_func_end FUN_020BDDAC
-
+ arm_func_end GetMatColAnmValue_
diff --git a/arm9/asm/NNS_G3D_nsbta.s b/arm9/asm/NNS_G3D_nsbta.s
index 85d25dca..a9fde7cb 100644
--- a/arm9/asm/NNS_G3D_nsbta.s
+++ b/arm9/asm/NNS_G3D_nsbta.s
@@ -3,9 +3,8 @@
.section .text
- ; _end
- arm_func_start FUN_020BDF38
-FUN_020BDF38: ; 0x020BDF38
+ arm_func_start NNSi_G3dAnmCalcNsBta
+NNSi_G3dAnmCalcNsBta: ; 0x020BDF38
stmdb sp!, {r4,lr}
ldr r12, [r1, #0x0]
mov r4, r0
@@ -14,7 +13,7 @@ FUN_020BDF38: ; 0x020BDF38
mov r1, r2, lsr #0x10
mov r3, r4
mov r2, r12, asr #0xc
- bl FUN_020BE030
+ bl GetTexSRTAnm_
ldr r0, [r4, #0x10]
bic r0, r0, #0xc0000000
str r0, [r4, #0x10]
@@ -25,14 +24,13 @@ FUN_020BDF38: ; 0x020BDF38
orr r0, r0, #0x8
str r0, [r4, #0x0]
ldmia sp!, {r4,pc}
- arm_func_end FUN_020BDF38
+ arm_func_end NNSi_G3dAnmCalcNsBta
- ; NNSi_G3dAnmObjInitNsBta
- arm_func_start FUN_020BDF84
-FUN_020BDF84: ; 0x020BDF84
+ arm_func_start NNSi_G3dAnmObjInitNsBta
+NNSi_G3dAnmObjInitNsBta: ; 0x020BDF84
stmdb sp!, {r4-r9,lr}
sub sp, sp, #0x4
- ldr r3, _020BE02C ; =UNK_021065A0
+ ldr r3, _020BE02C ; =NNS_G3dFuncAnmMatNsBtaDefault
ldr r4, [r2, #0x8]
ldr r3, [r3, #0x0]
mov r9, r0
@@ -61,7 +59,7 @@ _020BDFE4:
ldrh r1, [r2, #0x2]
add r1, r2, r1
add r1, r1, r6
- bl FUN_020BC14C
+ bl NNS_G3dGetResDictIdxByName
cmp r0, #0x0
orrge r1, r7, #0x100
addge r0, r9, r0, lsl #0x1
@@ -74,12 +72,11 @@ _020BDFE4:
add sp, sp, #0x4
ldmia sp!, {r4-r9,pc}
.balign 4
-_020BE02C: .word UNK_021065A0
- arm_func_end FUN_020BDF84
+_020BE02C: .word NNS_G3dFuncAnmMatNsBtaDefault
+ arm_func_end NNSi_G3dAnmObjInitNsBta
- ; _end
- arm_func_start FUN_020BE030
-FUN_020BE030: ; 0x020BE030
+ arm_func_start GetTexSRTAnm_
+GetTexSRTAnm_: ; 0x020BE030
stmdb sp!, {r4-r9,lr}
sub sp, sp, #0x4
mov r8, r0
@@ -95,13 +92,13 @@ FUN_020BE030: ; 0x020BE030
ldr r2, [r5, #0x1c]
mov r3, r7
ldr r4, [r6, #0x0]
- bl FUN_020BE238
+ bl GetTexSRTAnmVectorVal_
mov r9, r0
ldr r1, [r5, #0x20]
mov r0, r8
ldr r2, [r5, #0x24]
mov r3, r7
- bl FUN_020BE238
+ bl GetTexSRTAnmVectorVal_
cmp r9, #0x0
bne _020BE09C
cmp r0, #0x0
@@ -116,7 +113,7 @@ _020BE0A8:
ldr r2, [r5, #0x14]
mov r0, r8
mov r3, r7
- bl FUN_020BE12C
+ bl GetTexSRTAnmSinCosVal_
cmp r0, #0x10000000
strneh r0, [r6, #0x20]
movne r0, r0, lsr #0x10
@@ -127,13 +124,13 @@ _020BE0A8:
mov r0, r8
mov r3, r7
bicne r4, r4, #0x2
- bl FUN_020BE238
+ bl GetTexSRTAnmVectorVal_
mov r9, r0
ldr r1, [r5, #0x8]
ldr r2, [r5, #0xc]
mov r0, r8
mov r3, r7
- bl FUN_020BE238
+ bl GetTexSRTAnmVectorVal_
cmp r9, #0x1000
bne _020BE114
cmp r0, #0x1000
@@ -147,11 +144,10 @@ _020BE120:
str r4, [r6, #0x0]
add sp, sp, #0x4
ldmia sp!, {r4-r9,pc}
- arm_func_end FUN_020BE030
+ arm_func_end GetTexSRTAnm_
- ; GetTexSRTAnmSinCosVal_
- arm_func_start FUN_020BE12C
-FUN_020BE12C: ; 0x020BE12C
+ arm_func_start GetTexSRTAnmSinCosVal_
+GetTexSRTAnmSinCosVal_: ; 0x020BE12C
ands r12, r1, #0x20000000
movne r0, r2
bxne lr
@@ -226,11 +222,10 @@ _020BE200:
bx lr
.balign 4
_020BE234: .word 0x0000FFFF
- arm_func_end FUN_020BE12C
+ arm_func_end GetTexSRTAnmSinCosVal_
- ; GetTexSRTAnmVectorVal_
- arm_func_start FUN_020BE238
-FUN_020BE238: ; 0x020BE238
+ arm_func_start GetTexSRTAnmVectorVal_
+GetTexSRTAnmVectorVal_: ; 0x020BE238
ands r12, r1, #0x20000000
movne r0, r2
bxne lr
@@ -301,5 +296,4 @@ _020BE304:
bx lr
.balign 4
_020BE330: .word 0x0000FFFF
- arm_func_end FUN_020BE238
-
+ arm_func_end GetTexSRTAnmVectorVal_
diff --git a/arm9/asm/NNS_G3D_nsbtp.s b/arm9/asm/NNS_G3D_nsbtp.s
index 3701b92e..0ae2aa13 100644
--- a/arm9/asm/NNS_G3D_nsbtp.s
+++ b/arm9/asm/NNS_G3D_nsbtp.s
@@ -3,9 +3,8 @@
.section .text
- ; _end
- arm_func_start FUN_020BE334
-FUN_020BE334: ; 0x020BE334
+ arm_func_start NNSi_G3dAnmCalcNsBtp
+NNSi_G3dAnmCalcNsBtp: ; 0x020BE334
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r6, r1
@@ -17,39 +16,38 @@ FUN_020BE334: ; 0x020BE334
mov r0, r5
mov r1, r1, lsr #0x10
mov r2, r2, lsr #0x10
- bl FUN_020BC42C
+ bl NNSi_G3dGetTexPatAnmFV
mov r4, r0
ldrb r1, [r4, #0x2]
mov r0, r5
- bl FUN_020BC4B8
+ bl NNSi_G3dGetTexPatAnmTexNameByIdx
mov r1, r0
ldr r0, [r6, #0x14]
mov r2, r7
- bl FUN_020BE408
+ bl SetTexParamaters_
ldrb r1, [r4, #0x3]
cmp r1, #0xff
addeq sp, sp, #0x4
ldmeqia sp!, {r4-r7,pc}
mov r0, r5
- bl FUN_020BC4A8
+ bl NNSi_G3dGetTexPatAnmPlttNameByIdx
mov r1, r0
ldr r0, [r6, #0x14]
mov r2, r7
- bl FUN_020BE3B4
+ bl SetPlttParamaters_
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
- arm_func_end FUN_020BE334
+ arm_func_end NNSi_G3dAnmCalcNsBtp
- ; _end
- arm_func_start FUN_020BE3B4
-FUN_020BE3B4: ; 0x020BE3B4
+ arm_func_start SetPlttParamaters_
+SetPlttParamaters_: ; 0x020BE3B4
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r0
ldrh r0, [r5, #0x34]
mov r4, r2
add r0, r5, r0
- bl FUN_020BC2A0
+ bl NNS_G3dGetResDataByName
ldr r1, [r5, #0x2c]
ldrh r2, [r0, #0x2]
mov r1, r1, lsl #0x10
@@ -64,17 +62,16 @@ FUN_020BE3B4: ; 0x020BE3B4
str r0, [r4, #0x14]
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
- arm_func_end FUN_020BE3B4
+ arm_func_end SetPlttParamaters_
- ; SetTexParamaters_
- arm_func_start FUN_020BE408
-FUN_020BE408: ; 0x020BE408
+ arm_func_start SetTexParamaters_
+SetTexParamaters_: ; 0x020BE408
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r0
add r0, r5, #0x3c
mov r4, r2
- bl FUN_020BC2A0
+ bl NNS_G3dGetResDataByName
ldr r1, [r0, #0x0]
ldr r3, [r4, #0x10]
and r1, r1, #0x1c000000
@@ -130,14 +127,13 @@ _020BE4E0: .word 0x0000FFFF
_020BE4E4: .word 0xC00F0000
_020BE4E8: .word 0x000007FF
_020BE4EC: .word 0x003FF800
- arm_func_end FUN_020BE408
+ arm_func_end SetTexParamaters_
- ; NNSi_G3dAnmObjInitNsBtp
- arm_func_start FUN_020BE4F0
-FUN_020BE4F0: ; 0x020BE4F0
+ arm_func_start NNSi_G3dAnmObjInitNsBtp
+NNSi_G3dAnmObjInitNsBtp: ; 0x020BE4F0
stmdb sp!, {r4-r9,lr}
sub sp, sp, #0x4
- ldr r3, _020BE59C ; =UNK_021065A4
+ ldr r3, _020BE59C ; =NNS_G3dFuncAnmMatNsBtpDefault
ldr r4, [r2, #0x8]
ldr r3, [r3, #0x0]
mov r9, r0
@@ -167,7 +163,7 @@ _020BE554:
ldrh r1, [r2, #0x2]
add r1, r2, r1
add r1, r1, r6
- bl FUN_020BC14C
+ bl NNS_G3dGetResDictIdxByName
cmp r0, #0x0
orrge r1, r7, #0x100
addge r0, r9, r0, lsl #0x1
@@ -180,6 +176,5 @@ _020BE554:
add sp, sp, #0x4
ldmia sp!, {r4-r9,pc}
.balign 4
-_020BE59C: .word UNK_021065A4
- arm_func_end FUN_020BE4F0
-
+_020BE59C: .word NNS_G3dFuncAnmMatNsBtpDefault
+ arm_func_end NNSi_G3dAnmObjInitNsBtp
diff --git a/arm9/asm/NNS_G3D_nsbva.s b/arm9/asm/NNS_G3D_nsbva.s
index 8b675545..e8dc75e4 100644
--- a/arm9/asm/NNS_G3D_nsbva.s
+++ b/arm9/asm/NNS_G3D_nsbva.s
@@ -3,9 +3,8 @@
.section .text
- ; _end
- arm_func_start FUN_020BE5A0
-FUN_020BE5A0: ; 0x020BE5A0
+ arm_func_start NNSi_G3dAnmCalcNsBva
+NNSi_G3dAnmCalcNsBva: ; 0x020BE5A0
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr lr, [r1, #0x8]
@@ -22,12 +21,11 @@ FUN_020BE5A0: ; 0x020BE5A0
str r1, [r0, #0x0]
add sp, sp, #0x4
ldmia sp!, {pc}
- arm_func_end FUN_020BE5A0
+ arm_func_end NNSi_G3dAnmCalcNsBva
- ; NNSi_G3dAnmObjInitNsBva
- arm_func_start FUN_020BE5E0
-FUN_020BE5E0: ; 0x020BE5E0
- ldr r3, _020BE628 ; =UNK_02106598
+ arm_func_start NNSi_G3dAnmObjInitNsBva
+NNSi_G3dAnmObjInitNsBva: ; 0x020BE5E0
+ ldr r3, _020BE628 ; =NNS_G3dFuncAnmVisNsBvaDefault
mov r12, #0x0
ldr r3, [r3, #0x0]
str r3, [r0, #0xc]
@@ -47,6 +45,5 @@ _020BE608:
blo _020BE608
bx lr
.balign 4
-_020BE628: .word UNK_02106598
- arm_func_end FUN_020BE5E0
-
+_020BE628: .word NNS_G3dFuncAnmVisNsBvaDefault
+ arm_func_end NNSi_G3dAnmObjInitNsBva
diff --git a/arm9/asm/NNS_G3D_res_struct_acce.s b/arm9/asm/NNS_G3D_res_struct_acce.s
index 1455f0dc..e0420f9b 100644
--- a/arm9/asm/NNS_G3D_res_struct_acce.s
+++ b/arm9/asm/NNS_G3D_res_struct_acce.s
@@ -3,9 +3,8 @@
.section .text
- ; NNS_G3dGetTex
- arm_func_start FUN_020BC0FC
-FUN_020BC0FC: ; 0x020BC0FC
+ arm_func_start NNS_G3dGetTex
+NNS_G3dGetTex: ; 0x020BC0FC
ldrh r2, [r0, #0xc]
ldrh r1, [r0, #0xe]
add r3, r0, r2
@@ -24,20 +23,18 @@ _020BC12C:
bx lr
.balign 4
_020BC138: .word 0x30585442
- arm_func_end FUN_020BC0FC
+ arm_func_end NNS_G3dGetTex
- ; _end
- arm_func_start FUN_020BC13C
-FUN_020BC13C: ; 0x020BC13C
+ arm_func_start NNS_G3dGetMdlSet
+NNS_G3dGetMdlSet: ; 0x020BC13C
ldrh r1, [r0, #0xc]
ldr r1, [r0, r1]
add r0, r0, r1
bx lr
- arm_func_end FUN_020BC13C
+ arm_func_end NNS_G3dGetMdlSet
- ; _end
- arm_func_start FUN_020BC14C
-FUN_020BC14C: ; 0x020BC14C
+ arm_func_start NNS_G3dGetResDictIdxByName
+NNS_G3dGetResDictIdxByName: ; 0x020BC14C
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
ldrb r2, [r0, #0x1]
@@ -129,11 +126,10 @@ _020BC294:
mvn r0, #0x0
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
- arm_func_end FUN_020BC14C
+ arm_func_end NNS_G3dGetResDictIdxByName
- ; _end
- arm_func_start FUN_020BC2A0
-FUN_020BC2A0: ; 0x020BC2A0
+ arm_func_start NNS_G3dGetResDataByName
+NNS_G3dGetResDataByName: ; 0x020BC2A0
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
ldrb r2, [r0, #0x1]
@@ -232,11 +228,10 @@ _020BC404:
mov r0, #0x0
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
- arm_func_end FUN_020BC2A0
+ arm_func_end NNS_G3dGetResDataByName
- ; _end
- arm_func_start FUN_020BC410
-FUN_020BC410: ; 0x020BC410
+ arm_func_start NNSi_G3dGetTexPatAnmDataByIdx
+NNSi_G3dGetTexPatAnmDataByIdx: ; 0x020BC410
ldrh r3, [r0, #0x12]
add r0, r0, #0xc
ldrh r2, [r0, r3]
@@ -244,16 +239,15 @@ FUN_020BC410: ; 0x020BC410
add r0, r0, #0x4
mla r0, r2, r1, r0
bx lr
- arm_func_end FUN_020BC410
+ arm_func_end NNSi_G3dGetTexPatAnmDataByIdx
- ; _end
- arm_func_start FUN_020BC42C
-FUN_020BC42C: ; 0x020BC42C
+ arm_func_start NNSi_G3dGetTexPatAnmFV
+NNSi_G3dGetTexPatAnmFV: ; 0x020BC42C
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r0
mov r4, r2
- bl FUN_020BC410
+ bl NNSi_G3dGetTexPatAnmDataByIdx
ldrsh r1, [r0, #0x4]
ldrh r3, [r0, #0x6]
mul r2, r1, r4
@@ -286,29 +280,26 @@ _020BC49C:
add r0, r3, r2, lsl #0x2
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
- arm_func_end FUN_020BC42C
+ arm_func_end NNSi_G3dGetTexPatAnmFV
- ; _end
- arm_func_start FUN_020BC4A8
-FUN_020BC4A8: ; 0x020BC4A8
+ arm_func_start NNSi_G3dGetTexPatAnmPlttNameByIdx
+NNSi_G3dGetTexPatAnmPlttNameByIdx: ; 0x020BC4A8
ldrh r2, [r0, #0xa]
add r0, r0, r2
add r0, r0, r1, lsl #0x4
bx lr
- arm_func_end FUN_020BC4A8
+ arm_func_end NNSi_G3dGetTexPatAnmPlttNameByIdx
- ; _end
- arm_func_start FUN_020BC4B8
-FUN_020BC4B8: ; 0x020BC4B8
+ arm_func_start NNSi_G3dGetTexPatAnmTexNameByIdx
+NNSi_G3dGetTexPatAnmTexNameByIdx: ; 0x020BC4B8
ldrh r2, [r0, #0x8]
add r0, r0, r2
add r0, r0, r1, lsl #0x4
bx lr
- arm_func_end FUN_020BC4B8
+ arm_func_end NNSi_G3dGetTexPatAnmTexNameByIdx
- ; _end
- arm_func_start FUN_020BC4C8
-FUN_020BC4C8: ; 0x020BC4C8
+ arm_func_start NNS_G3dGetAnmByIdx
+NNS_G3dGetAnmByIdx: ; 0x020BC4C8
ldrh r2, [r0, #0xc]
ldr r2, [r0, r2]
add r12, r0, r2
@@ -323,5 +314,4 @@ FUN_020BC4C8: ; 0x020BC4C8
addne r0, r12, r0
moveq r0, #0x0
bx lr
- arm_func_end FUN_020BC4C8
-
+ arm_func_end NNS_G3dGetAnmByIdx
diff --git a/arm9/asm/NNS_G3D_sbc.s b/arm9/asm/NNS_G3D_sbc.s
index 48ad7470..86ee394f 100644
--- a/arm9/asm/NNS_G3D_sbc.s
+++ b/arm9/asm/NNS_G3D_sbc.s
@@ -3,16 +3,14 @@
.section .rodata
- ; matColorMask_$8998
- .global UNK_020FF9D0
-UNK_020FF9D0: ; 0x020FF9D0
+ .global matColorMask_$8998
+matColorMask_$8998: ; 0x020FF9D0
.byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x7F, 0xFF, 0x7F, 0xFF, 0x7F
.byte 0x00, 0x80, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x80, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0x7F
-
; static const in function
- ; pivotUtil_$9100
- .global UNK_020FF9F0
-UNK_020FF9F0: ; 0x020FF9F0
+
+ .global pivotUtil_$9100
+pivotUtil_$9100: ; 0x020FF9F0
.byte 0x04, 0x05, 0x07, 0x08
.byte 0x03, 0x05, 0x06, 0x08
.byte 0x03, 0x04, 0x06, 0x07
@@ -22,121 +20,73 @@ UNK_020FF9F0: ; 0x020FF9F0
.byte 0x01, 0x02, 0x04, 0x05
.byte 0x00, 0x02, 0x03, 0x05
.byte 0x00, 0x01, 0x03, 0x04
-
; static const in function
+
.section .data
- ; cmd$9407
- .global UNK_02106630
-UNK_02106630: ; 0x02106630
+ .global cmd$9407
+cmd$9407: ; 0x02106630
.byte 0x2A, 0x00, 0x00, 0x00
-
- ; cmd$9407 + 0x4
- .global UNK_02106634
-UNK_02106634: ; 0x02106634
.byte 0x00, 0x00, 0x00, 0x00
- ; cmd$9366
- .global UNK_02106638
-UNK_02106638: ; 0x02106638
+ .global cmd$9366
+cmd$9366: ; 0x02106638
.byte 0x2A, 0x00, 0x00, 0x00
-
- ; cmd$9366 + 0x4
- .global UNK_0210663C
-UNK_0210663C: ; 0x0210663C
.byte 0x00, 0x00, 0x00, 0x00
- ; NNS_G3dFuncSbcMatTable
- .global UNK_02106640
-UNK_02106640: ; 0x02106640
- .word FUN_020BA58C
+ .global NNS_G3dFuncSbcMatTable
+NNS_G3dFuncSbcMatTable: ; 0x02106640
+ .word NNSi_G3dFuncSbc_MAT_InternalDefault
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- ; NNS_G3dFuncSbcShpTable
- .global UNK_02106650
-UNK_02106650: ; 0x02106650
- .word FUN_020BA438
+ .global NNS_G3dFuncSbcShpTable
+NNS_G3dFuncSbcShpTable: ; 0x02106650
+ .word NNSi_G3dFuncSbc_SHP_InternalDefault
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- ; mtx$9412
- .global UNK_02106660
-UNK_02106660: ; 0x02106660
+ .global mtx$9412
+mtx$9412: ; 0x02106660
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00
- ; bbcmd1$9173
- .global UNK_021066A0
-UNK_021066A0: ; 0x021066A0
+ .global bbcmd1$9173
+bbcmd1$9173: ; 0x021066A0
.byte 0x12, 0x10, 0x17, 0x1B
-
- ; bbcmd1$9173 + 0x4
- .global UNK_021066A4
-UNK_021066A4: ; 0x021066A4
.byte 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
-
- ; bbcmd1$9173 + 0xC
- .global UNK_021066AC
-UNK_021066AC: ; 0x021066AC
.byte 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x10, 0x00, 0x00
-
- ; bbcmd1$9173 + 0x30
- .global UNK_021066D0
-UNK_021066D0: ; 0x021066D0
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
- ; bbcmd1$9173 + 0x3C
- .global UNK_021066DC
-UNK_021066DC: ; 0x021066DC
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- ; bbcmd1$9234
- .global UNK_021066E8
-UNK_021066E8: ; 0x021066E8
+ .global bbcmd1$9234
+bbcmd1$9234: ; 0x021066E8
.byte 0x12, 0x10, 0x17, 0x1B
-
- ; bbcmd1$9234 + 0x4
- .global UNK_021066EC
-UNK_021066EC: ; 0x021066EC
.byte 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
-
- ; bbcmd1$9234 + 0xC
- .global UNK_021066F4
-UNK_021066F4: ; 0x021066F4
.byte 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x10, 0x00, 0x00
-
- ; bbcmd1$9234 + 0x30
- .global UNK_02106718
-UNK_02106718: ; 0x02106718
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
- ; bbcmd1$9234 + 0x3C
- .global UNK_02106724
-UNK_02106724: ; 0x02106724
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- ; NNS_G3dFuncSbcTable
- .global UNK_02106730
-UNK_02106730: ; 0x02106730
- .word FUN_020BAC70
- .word FUN_020BAC48
- .word FUN_020BAAC0
- .word FUN_020BA9EC
- .word FUN_020BA50C
- .word FUN_020BA3C4
- .word FUN_020B9F84
- .word FUN_020B9C54
- .word FUN_020B98C4
- .word FUN_020B9258
- .word FUN_020B9178
- .word FUN_020B9110
- .word FUN_020B8DF0
- .word FUN_020B8A60
+ .global NNS_G3dFuncSbcTable
+NNS_G3dFuncSbcTable: ; 0x02106730
+ .word NNSi_G3dFuncSbc_NOP
+ .word NNSi_G3dFuncSbc_RET
+ .word NNSi_G3dFuncSbc_NODE
+ .word NNSi_G3dFuncSbc_MTX
+ .word NNSi_G3dFuncSbc_MAT
+ .word NNSi_G3dFuncSbc_SHP
+ .word NNSi_G3dFuncSbc_NODEDESC
+ .word NNSi_G3dFuncSbc_BB
+ .word NNSi_G3dFuncSbc_BBY
+ .word NNSi_G3dFuncSbc_NODEMIX
+ .word NNSi_G3dFuncSbc_CALLDL
+ .word NNSi_G3dFuncSbc_POSSCALE
+ .word NNSi_G3dFuncSbc_ENVMAP
+ .word NNSi_G3dFuncSbc_PRJMAP
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -145,71 +95,18 @@ UNK_02106730: ; 0x02106730
.section .bss
- ; NNS_G3dRS
- .global UNK_021CEF7C
-UNK_021CEF7C: ; 0x021CEF7C
- .space 0x4
-
- ; NNS_G3dRSOnGlb
- .global UNK_021CEF80
-UNK_021CEF80: ; 0x021CEF80
- .space 0xe00
-
- ; NNS_G3dRSOnGlb + 0xE00
- .global UNK_021CFD80
-UNK_021CFD80: ; 0x021CFD80
- .space 0x4
-
- ; NNS_G3dRSOnGlb + 0xE04
- .global UNK_021CFD84
-UNK_021CFD84: ; 0x021CFD84
+ .global NNS_G3dRS
+NNS_G3dRS: ; 0x021CEF7C
.space 0x4
- ; NNS_G3dRSOnGlb + 0xE08
- .global UNK_021CFD88
-UNK_021CFD88: ; 0x021CFD88
- .space 0x4
-
- ; NNS_G3dRSOnGlb + 0xE0C
- .global UNK_021CFD8C
-UNK_021CFD8C: ; 0x021CFD8C
- .space 0x4
-
- ; NNS_G3dRSOnGlb + 0xE10
- .global UNK_021CFD90
-UNK_021CFD90: ; 0x021CFD90
- .space 0x4
-
- ; NNS_G3dRSOnGlb + 0xE14
- .global UNK_021CFD94
-UNK_021CFD94: ; 0x021CFD94
- .space 0x2ba
-
- ; NNS_G3dRSOnGlb + 0x10CE
- .global UNK_021D004E
-UNK_021D004E: ; 0x021D004E
- .space 0x332
-
- ; NNS_G3dRSOnGlb + 0x1400
- .global UNK_021D0380
-UNK_021D0380: ; 0x021D0380
- .space 0x40
-
- ; NNS_G3dRSOnGlb + 0x1440
- .global UNK_021D03C0
-UNK_021D03C0: ; 0x021D03C0
- .space 0xb42
-
- ; NNS_G3dRSOnGlb + 0x1F82
- .global UNK_021D0F02
-UNK_021D0F02: ; 0x021D0F02
- .space 0xd7e
+ .global NNS_G3dRSOnGlb
+NNS_G3dRSOnGlb: ; 0x021CEF80
+ .space 0x2d00
.section .text
- ; NNSi_G3dFuncSbc_PRJMAP
- arm_func_start FUN_020B8A60
-FUN_020B8A60: ; 0x020B8A60
+ arm_func_start NNSi_G3dFuncSbc_PRJMAP
+NNSi_G3dFuncSbc_PRJMAP: ; 0x020B8A60
stmdb sp!, {r4-r6,lr}
sub sp, sp, #0x80
mov r5, r0
@@ -220,13 +117,13 @@ FUN_020B8A60: ; 0x020B8A60
beq _020B8DB4
add r0, sp, #0x10
mov r1, #0x0
- bl FUN_020BB824
+ bl NNS_G3dGetCurrentMtx
mov r0, #0x1e
str r0, [sp, #0x0]
add r1, sp, #0x0
mov r0, #0x13
mov r2, #0x1
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
ldr r2, [r5, #0xb0]
ldr r0, [r2, #0x10]
and r1, r0, #0xc0000000
@@ -235,9 +132,9 @@ FUN_020B8A60: ; 0x020B8A60
bic r0, r0, #0xc0000000
str r0, [r2, #0x10]
ldr r2, [r5, #0xb0]
- ldr r3, _020B8DC8 ; =UNK_02106630
+ ldr r3, _020B8DC8 ; =cmd$9407
ldr r0, [r2, #0x10]
- ldr r1, _020B8DCC ; =UNK_02106634
+ ldr r1, _020B8DCC ; =cmd$9407 + 0x4
orr r0, r0, #0xc0000000
str r0, [r2, #0x10]
ldr r2, [r5, #0xb0]
@@ -245,7 +142,7 @@ FUN_020B8A60: ; 0x020B8A60
ldr r4, [r2, #0x10]
mov r2, #0x1
str r4, [r3, #0x4]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020B8AF0:
ldr r0, [r5, #0x40]
cmp r0, #0x0
@@ -272,7 +169,7 @@ _020B8B40:
cmp r0, #0x0
bne _020B8B84
ldr r0, [r5, #0xb0]
- ldr r1, _020B8DD0 ; =UNK_02106660
+ ldr r1, _020B8DD0 ; =mtx$9412
ldrh r6, [r0, #0x2e]
ldrh r3, [r0, #0x2c]
mov r0, #0x16
@@ -285,7 +182,7 @@ _020B8B40:
str r12, [r1, #0x14]
str lr, [r1, #0x30]
str r3, [r1, #0x34]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020B8B84:
cmp r4, #0x2
bne _020B8BC0
@@ -329,7 +226,7 @@ _020B8BC4:
addeq r1, r1, #0x8
mov r0, #0x18
mov r2, #0x10
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020B8C28:
cmp r4, #0x3
movne r0, #0x0
@@ -345,22 +242,22 @@ _020B8C28:
_020B8C54:
cmp r0, #0x0
bne _020B8D84
- ldr r0, _020B8DD4 ; =UNK_021CED18
+ ldr r0, _020B8DD4 ; =NNS_G3dGlb
ldr r1, [r0, #0xfc]
ands r0, r1, #0x1
beq _020B8CA0
- ldr r1, _020B8DD8 ; =UNK_021CEDF8
+ ldr r1, _020B8DD8 ; =NNS_G3dGlb + 0xE0
mov r0, #0x1c
mov r2, #0x3
- bl FUN_020BB1C0
- ldr r1, _020B8DDC ; =UNK_021CEDD4
+ bl NNS_G3dGeBufferOP_N
+ ldr r1, _020B8DDC ; =NNS_G3dGlb + 0xBC
mov r0, #0x1a
mov r2, #0x9
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
add r1, sp, #0x10
mov r0, #0x19
mov r2, #0xc
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
b _020B8CE0
_020B8CA0:
ands r0, r1, #0x2
@@ -368,20 +265,20 @@ _020B8CA0:
add r1, sp, #0x10
mov r0, #0x19
mov r2, #0xc
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
b _020B8CE0
_020B8CBC:
- bl FUN_020B8344
+ bl NNS_G3dGlbGetInvV
mov r1, r0
mov r0, #0x19
mov r2, #0xc
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
add r1, sp, #0x10
mov r0, #0x19
mov r2, #0xc
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020B8CE0:
- bl FUN_020BB394
+ bl NNS_G3dGeFlushBuffer
ldr r0, _020B8DE0 ; =0x04000440
mov r2, #0x0
ldr r1, _020B8DE4 ; =0x04000444
@@ -404,7 +301,7 @@ _020B8D04:
add r1, sp, #0x40
mov r0, #0x16
mov r2, #0x10
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
ldr r1, [sp, #0x70]
ldr r0, [sp, #0x74]
mov r2, r1, asr #0x4
@@ -422,20 +319,20 @@ _020B8D04:
mov r0, #0x22
mov r2, #0x1
str r3, [sp, #0x4]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020B8D84:
mov r3, #0x2
add r1, sp, #0x8
mov r0, #0x10
mov r2, #0x1
str r3, [sp, #0x8]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
mov r3, #0x1e
add r1, sp, #0xc
mov r0, #0x14
mov r2, #0x1
str r3, [sp, #0xc]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020B8DB4:
ldr r0, [r5, #0x0]
add r0, r0, #0x3
@@ -443,21 +340,20 @@ _020B8DB4:
add sp, sp, #0x80
ldmia sp!, {r4-r6,pc}
.balign 4
-_020B8DC8: .word UNK_02106630
-_020B8DCC: .word UNK_02106634
-_020B8DD0: .word UNK_02106660
-_020B8DD4: .word UNK_021CED18
-_020B8DD8: .word UNK_021CEDF8
-_020B8DDC: .word UNK_021CEDD4
+_020B8DC8: .word cmd$9407
+_020B8DCC: .word cmd$9407 + 0x4
+_020B8DD0: .word mtx$9412
+_020B8DD4: .word NNS_G3dGlb
+_020B8DD8: .word NNS_G3dGlb + 0xE0
+_020B8DDC: .word NNS_G3dGlb + 0xBC
_020B8DE0: .word 0x04000440
_020B8DE4: .word 0x04000444
_020B8DE8: .word 0x04000454
_020B8DEC: .word 0x04000448
- arm_func_end FUN_020B8A60
+ arm_func_end NNSi_G3dFuncSbc_PRJMAP
- ; NNSi_G3dFuncSbc_ENVMAP
- arm_func_start FUN_020B8DF0
-FUN_020B8DF0: ; 0x020B8DF0
+ arm_func_start NNSi_G3dFuncSbc_ENVMAP
+NNSi_G3dFuncSbc_ENVMAP: ; 0x020B8DF0
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x44
mov r7, r0
@@ -474,9 +370,9 @@ FUN_020B8DF0: ; 0x020B8DF0
bic r0, r0, #0xc0000000
str r0, [r2, #0x10]
ldr r2, [r7, #0xb0]
- ldr r3, _020B90FC ; =UNK_02106638
+ ldr r3, _020B90FC ; =cmd$9366
ldr r0, [r2, #0x10]
- ldr r1, _020B9100 ; =UNK_0210663C
+ ldr r1, _020B9100 ; =cmd$9366 + 0x4
orr r0, r0, #0x80000000
str r0, [r2, #0x10]
ldr r2, [r7, #0xb0]
@@ -484,14 +380,14 @@ FUN_020B8DF0: ; 0x020B8DF0
ldr r4, [r2, #0x10]
mov r2, #0x1
str r4, [r3, #0x4]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020B8E5C:
mov r0, #0x3
str r0, [sp, #0x0]
add r1, sp, #0x0
mov r0, #0x10
mov r2, #0x1
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
ldr r0, [r7, #0x3c]
cmp r0, #0x0
ldrneb r6, [r7, #0x98]
@@ -529,7 +425,7 @@ _020B8EC4:
str lr, [sp, #0x38]
str r12, [sp, #0x3c]
str r3, [sp, #0x40]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
mov r0, r5, lsl #0x13
mov r1, r4, lsl #0x13
mov r0, r0, asr #0x10
@@ -543,7 +439,7 @@ _020B8EC4:
mov r0, #0x22
mov r2, #0x1
str r3, [sp, #0x4]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020B8F3C:
cmp r6, #0x2
bne _020B8F78
@@ -587,7 +483,7 @@ _020B8F7C:
addeq r1, r1, #0x8
mov r0, #0x18
mov r2, #0x10
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020B8FE0:
cmp r6, #0x3
movne r0, #0x0
@@ -608,57 +504,57 @@ _020B900C:
mov r0, #0x10
mov r2, #0x1
str r3, [sp, #0x8]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
add r1, sp, #0x14
mov r0, #0x0
- bl FUN_020BB824
+ bl NNS_G3dGetCurrentMtx
mov r3, #0x3
add r1, sp, #0xc
mov r0, #0x10
mov r2, #0x1
str r3, [sp, #0xc]
- bl FUN_020BB1C0
- ldr r0, _020B9104 ; =UNK_021CED18
+ bl NNS_G3dGeBufferOP_N
+ ldr r0, _020B9104 ; =NNS_G3dGlb
ldr r1, [r0, #0xfc]
ands r0, r1, #0x1
beq _020B9094
- ldr r1, _020B9108 ; =UNK_021CED64
+ ldr r1, _020B9108 ; =NNS_G3dGlb + 0x4C
mov r0, #0x1a
mov r2, #0x9
- bl FUN_020BB1C0
- ldr r1, _020B910C ; =UNK_021CEDD4
+ bl NNS_G3dGeBufferOP_N
+ ldr r1, _020B910C ; =NNS_G3dGlb + 0xBC
mov r0, #0x1a
mov r2, #0x9
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
add r1, sp, #0x14
mov r0, #0x1a
mov r2, #0x9
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
b _020B90D0
_020B9094:
ands r0, r1, #0x2
beq _020B90C0
- ldr r1, _020B9108 ; =UNK_021CED64
+ ldr r1, _020B9108 ; =NNS_G3dGlb + 0x4C
mov r0, #0x1a
mov r2, #0x9
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
add r1, sp, #0x14
mov r0, #0x1a
mov r2, #0x9
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
b _020B90D0
_020B90C0:
add r1, sp, #0x14
mov r0, #0x1a
mov r2, #0x9
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020B90D0:
mov r3, #0x2
add r1, sp, #0x10
mov r0, #0x10
mov r2, #0x1
str r3, [sp, #0x10]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020B90E8:
ldr r0, [r7, #0x0]
add r0, r0, #0x3
@@ -666,16 +562,15 @@ _020B90E8:
add sp, sp, #0x44
ldmia sp!, {r4-r7,pc}
.balign 4
-_020B90FC: .word UNK_02106638
-_020B9100: .word UNK_0210663C
-_020B9104: .word UNK_021CED18
-_020B9108: .word UNK_021CED64
-_020B910C: .word UNK_021CEDD4
- arm_func_end FUN_020B8DF0
+_020B90FC: .word cmd$9366
+_020B9100: .word cmd$9366 + 0x4
+_020B9104: .word NNS_G3dGlb
+_020B9108: .word NNS_G3dGlb + 0x4C
+_020B910C: .word NNS_G3dGlb + 0xBC
+ arm_func_end NNSi_G3dFuncSbc_ENVMAP
- ; _end
- arm_func_start FUN_020B9110
-FUN_020B9110: ; 0x020B9110
+ arm_func_start NNSi_G3dFuncSbc_POSSCALE
+NNSi_G3dFuncSbc_POSSCALE: ; 0x020B9110
stmdb sp!, {r4,lr}
sub sp, sp, #0x10
mov r4, r0
@@ -696,18 +591,17 @@ FUN_020B9110: ; 0x020B9110
strne r0, [sp, #0x4]
strne r0, [sp, #0x0]
mov r0, #0x1b
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020B9164:
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
add sp, sp, #0x10
ldmia sp!, {r4,pc}
- arm_func_end FUN_020B9110
+ arm_func_end NNSi_G3dFuncSbc_POSSCALE
- ; _end
- arm_func_start FUN_020B9178
-FUN_020B9178: ; 0x020B9178
+ arm_func_start NNSi_G3dFuncSbc_CALLDL
+NNSi_G3dFuncSbc_CALLDL: ; 0x020B9178
stmdb sp!, {r4-r6,lr}
mov r5, r0
ldr r0, [r5, #0x34]
@@ -753,7 +647,7 @@ _020B91D0:
orr r1, r1, r3, lsl #0x10
add r0, r0, r6
orr r1, r1, r2, lsl #0x18
- bl FUN_020BB2B0
+ bl NNS_G3dGeSendDL
_020B9228:
cmp r4, #0x3
bne _020B9248
@@ -768,11 +662,10 @@ _020B9248:
add r0, r0, #0x9
str r0, [r5, #0x0]
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020B9178
+ arm_func_end NNSi_G3dFuncSbc_CALLDL
- ; NNSi_G3dFuncSbc_NODEMIX
- arm_func_start FUN_020B9258
-FUN_020B9258: ; 0x020B9258
+ arm_func_start NNSi_G3dFuncSbc_NODEMIX
+NNSi_G3dFuncSbc_NODEMIX: ; 0x020B9258
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x8c
ldr r1, [r0, #0x4]
@@ -791,7 +684,7 @@ FUN_020B9258: ; 0x020B9258
str r3, [sp, #0x4]
add r8, r4, #0x3
bl MIi_CpuClearFast
- bl FUN_020BB394
+ bl NNS_G3dGeFlushBuffer
ldr r0, _020B98AC ; =0x04000440
mov r7, r10
str r7, [r0, #0x0]
@@ -811,7 +704,7 @@ FUN_020B9258: ; 0x020B9258
_020B92E4:
ldrb r4, [r8, #0x1]
mov r0, #0x64
- ldr r3, _020B98B8 ; =UNK_021D0380
+ ldr r3, _020B98B8 ; =NNS_G3dRSOnGlb + 0x1400
mul r0, r4, r0
str r0, [sp, #0xc]
ldr r0, [sp, #0x0]
@@ -1050,7 +943,7 @@ _020B9538:
adds r0, r2, r1
str r0, [sp, #0x60]
cmp r11, #0x0
- ldr r1, _020B98C0 ; =UNK_021D03C0
+ ldr r1, _020B98C0 ; =NNS_G3dRSOnGlb + 0x1440
ldr r0, [sp, #0xc]
add r5, r1, r0
add r8, r8, #0x3
@@ -1190,14 +1083,13 @@ _020B96CC:
_020B98AC: .word 0x04000440
_020B98B0: .word 0x0400044C
_020B98B4: .word 0x04000454
-_020B98B8: .word UNK_021D0380
+_020B98B8: .word NNS_G3dRSOnGlb + 0x1400
_020B98BC: .word 0x04000450
-_020B98C0: .word UNK_021D03C0
- arm_func_end FUN_020B9258
+_020B98C0: .word NNS_G3dRSOnGlb + 0x1440
+ arm_func_end NNSi_G3dFuncSbc_NODEMIX
- ; NNSi_G3dFuncSbc_BBY
- arm_func_start FUN_020B98C4
-FUN_020B98C4: ; 0x020B98C4
+ arm_func_start NNSi_G3dFuncSbc_BBY
+NNSi_G3dFuncSbc_BBY: ; 0x020B98C4
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0xcc
mov r10, r0
@@ -1205,9 +1097,9 @@ FUN_020B98C4: ; 0x020B98C4
mov r9, r1
ands r0, r2, #0x200
mov r7, #0x2
- ldr r6, _020B9C28 ; =UNK_02106718
- ldr fp, _020B9C2C ; =UNK_02106724
- ldr r5, _020B9C30 ; =UNK_021066F4
+ ldr r6, _020B9C28 ; =bbcmd1$9234 + 0x30
+ ldr fp, _020B9C2C ; =bbcmd1$9234 + 0x3C
+ ldr r5, _020B9C30 ; =bbcmd1$9234 + 0xC
beq _020B992C
cmp r9, #0x40
beq _020B9900
@@ -1247,7 +1139,7 @@ _020B993C:
ldrneb r0, [r0, #0x3]
strne r0, [sp, #0x0]
mov r0, #0x14
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020B9974:
ldr r0, [r10, #0x2c]
cmp r0, #0x0
@@ -1276,7 +1168,7 @@ _020B99C4:
bne _020B9BA4
cmp r1, #0x0
bne _020B9BA4
- bl FUN_020BB394
+ bl NNS_G3dGeFlushBuffer
ldr r2, _020B9C34 ; =0x00151110
ldr r1, _020B9C38 ; =0x04000400
mov r0, #0x0
@@ -1289,11 +1181,11 @@ _020B99F8:
bl G3X_GetClipMtx
cmp r0, #0x0
bne _020B99F8
- ldr r0, _020B9C3C ; =UNK_021CED18
+ ldr r0, _020B9C3C ; =NNS_G3dGlb
ldr r1, [r0, #0xfc]
ands r0, r1, #0x1
beq _020B9A38
- bl FUN_020B82A4
+ bl NNS_G3dGlbGetWV
add r1, sp, #0x48
bl MTX_Copy43To44_
add r0, sp, #0x8
@@ -1304,7 +1196,7 @@ _020B99F8:
_020B9A38:
ands r0, r1, #0x2
beq _020B9A5C
- ldr r0, _020B9C40 ; =UNK_021CED64
+ ldr r0, _020B9C40 ; =NNS_G3dGlb + 0x4C
add r1, sp, #0x88
bl MTX_Copy43To44_
add r0, sp, #0x8
@@ -1353,23 +1245,23 @@ _020B9AD4:
ldr r0, [r5, #0x20]
str r0, [r5, #0x10]
_020B9AF4:
- ldr r0, _020B9C3C ; =UNK_021CED18
+ ldr r0, _020B9C3C ; =NNS_G3dGlb
ldr r1, [r0, #0xfc]
ands r0, r1, #0x1
beq _020B9B48
ldr r3, _020B9C44 ; =0x00171012
ldr r1, _020B9C38 ; =0x04000400
- ldr r0, _020B9C48 ; =UNK_021066EC
+ ldr r0, _020B9C48 ; =bbcmd1$9234 + 0x4
mov r2, #0x8
str r3, [r1, #0x0]
bl MIi_CpuSend32
- bl FUN_020B8264
+ bl NNS_G3dGlbGetInvWV
ldr r1, _020B9C38 ; =0x04000400
mov r2, #0x30
bl MIi_CpuSend32
ldr r2, _020B9C4C ; =0x00001B19
ldr r1, _020B9C38 ; =0x04000400
- ldr r0, _020B9C30 ; =UNK_021066F4
+ ldr r0, _020B9C30 ; =bbcmd1$9234 + 0xC
str r2, [r1, #0x0]
mov r2, #0x3c
bl MIi_CpuSend32
@@ -1379,23 +1271,23 @@ _020B9B48:
beq _020B9B94
ldr r3, _020B9C44 ; =0x00171012
ldr r1, _020B9C38 ; =0x04000400
- ldr r0, _020B9C48 ; =UNK_021066EC
+ ldr r0, _020B9C48 ; =bbcmd1$9234 + 0x4
mov r2, #0x8
str r3, [r1, #0x0]
bl MIi_CpuSend32
- bl FUN_020B8344
+ bl NNS_G3dGlbGetInvV
ldr r1, _020B9C38 ; =0x04000400
mov r2, #0x30
bl MIi_CpuSend32
ldr r2, _020B9C4C ; =0x00001B19
ldr r1, _020B9C38 ; =0x04000400
- ldr r0, _020B9C30 ; =UNK_021066F4
+ ldr r0, _020B9C30 ; =bbcmd1$9234 + 0xC
str r2, [r1, #0x0]
mov r2, #0x3c
bl MIi_CpuSend32
b _020B9BA4
_020B9B94:
- ldr r0, _020B9C50 ; =UNK_021066E8
+ ldr r0, _020B9C50 ; =bbcmd1$9234
ldr r1, _020B9C38 ; =0x04000400
mov r2, #0x48
bl MIi_CpuSend32
@@ -1429,7 +1321,7 @@ _020B9BE0:
mov r0, #0x13
mov r2, #0x1
str r3, [sp, #0x4]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020B9C14:
ldr r0, [r10, #0x0]
add r0, r0, r7
@@ -1437,22 +1329,21 @@ _020B9C14:
add sp, sp, #0xcc
ldmia sp!, {r4-r11,pc}
.balign 4
-_020B9C28: .word UNK_02106718
-_020B9C2C: .word UNK_02106724
-_020B9C30: .word UNK_021066F4
+_020B9C28: .word bbcmd1$9234 + 0x30
+_020B9C2C: .word bbcmd1$9234 + 0x3C
+_020B9C30: .word bbcmd1$9234 + 0xC
_020B9C34: .word 0x00151110
_020B9C38: .word 0x04000400
-_020B9C3C: .word UNK_021CED18
-_020B9C40: .word UNK_021CED64
+_020B9C3C: .word NNS_G3dGlb
+_020B9C40: .word NNS_G3dGlb + 0x4C
_020B9C44: .word 0x00171012
-_020B9C48: .word UNK_021066EC
+_020B9C48: .word bbcmd1$9234 + 0x4
_020B9C4C: .word 0x00001B19
-_020B9C50: .word UNK_021066E8
- arm_func_end FUN_020B98C4
+_020B9C50: .word bbcmd1$9234
+ arm_func_end NNSi_G3dFuncSbc_BBY
- ; NNSi_G3dFuncSbc_BB
- arm_func_start FUN_020B9C54
-FUN_020B9C54: ; 0x020B9C54
+ arm_func_start NNSi_G3dFuncSbc_BB
+NNSi_G3dFuncSbc_BB: ; 0x020B9C54
stmdb sp!, {r4-r10,lr}
sub sp, sp, #0xc8
mov r9, r0
@@ -1460,8 +1351,8 @@ FUN_020B9C54: ; 0x020B9C54
mov r8, r1
ands r0, r2, #0x200
mov r6, #0x2
- ldr r5, _020B9F58 ; =UNK_021066D0
- ldr r4, _020B9F5C ; =UNK_021066DC
+ ldr r5, _020B9F58 ; =bbcmd1$9173 + 0x30
+ ldr r4, _020B9F5C ; =bbcmd1$9173 + 0x3C
beq _020B9CB8
cmp r8, #0x40
beq _020B9C8C
@@ -1501,7 +1392,7 @@ _020B9CC8:
ldrneb r0, [r0, #0x3]
strne r0, [sp, #0x0]
mov r0, #0x14
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020B9D00:
ldr r0, [r9, #0x28]
cmp r0, #0x0
@@ -1530,7 +1421,7 @@ _020B9D50:
bne _020B9ED4
cmp r1, #0x0
bne _020B9ED4
- bl FUN_020BB394
+ bl NNS_G3dGeFlushBuffer
ldr r2, _020B9F60 ; =0x00151110
ldr r1, _020B9F64 ; =0x04000400
mov r0, #0x0
@@ -1543,11 +1434,11 @@ _020B9D84:
bl G3X_GetClipMtx
cmp r0, #0x0
bne _020B9D84
- ldr r0, _020B9F68 ; =UNK_021CED18
+ ldr r0, _020B9F68 ; =NNS_G3dGlb
ldr r1, [r0, #0xfc]
ands r0, r1, #0x1
beq _020B9DC4
- bl FUN_020B82A4
+ bl NNS_G3dGlbGetWV
add r1, sp, #0x48
bl MTX_Copy43To44_
add r0, sp, #0x8
@@ -1558,7 +1449,7 @@ _020B9D84:
_020B9DC4:
ands r0, r1, #0x2
beq _020B9DE8
- ldr r0, _020B9F6C ; =UNK_021CED64
+ ldr r0, _020B9F6C ; =NNS_G3dGlb + 0x4C
add r1, sp, #0x88
bl MTX_Copy43To44_
add r0, sp, #0x8
@@ -1580,24 +1471,24 @@ _020B9DE8:
str r0, [r4, #0x4]
add r0, sp, #0x28
bl VEC_Mag
- ldr r1, _020B9F68 ; =UNK_021CED18
+ ldr r1, _020B9F68 ; =NNS_G3dGlb
str r0, [r4, #0x8]
ldr r1, [r1, #0xfc]
ands r0, r1, #0x1
beq _020B9E78
ldr r3, _020B9F70 ; =0x00171012
ldr r1, _020B9F64 ; =0x04000400
- ldr r0, _020B9F74 ; =UNK_021066A4
+ ldr r0, _020B9F74 ; =bbcmd1$9173 + 0x4
mov r2, #0x8
str r3, [r1, #0x0]
bl MIi_CpuSend32
- bl FUN_020B8264
+ bl NNS_G3dGlbGetInvWV
ldr r1, _020B9F64 ; =0x04000400
mov r2, #0x30
bl MIi_CpuSend32
ldr r2, _020B9F78 ; =0x00001B19
ldr r1, _020B9F64 ; =0x04000400
- ldr r0, _020B9F7C ; =UNK_021066AC
+ ldr r0, _020B9F7C ; =bbcmd1$9173 + 0xC
str r2, [r1, #0x0]
mov r2, #0x3c
bl MIi_CpuSend32
@@ -1607,23 +1498,23 @@ _020B9E78:
beq _020B9EC4
ldr r3, _020B9F70 ; =0x00171012
ldr r1, _020B9F64 ; =0x04000400
- ldr r0, _020B9F74 ; =UNK_021066A4
+ ldr r0, _020B9F74 ; =bbcmd1$9173 + 0x4
mov r2, #0x8
str r3, [r1, #0x0]
bl MIi_CpuSend32
- bl FUN_020B8344
+ bl NNS_G3dGlbGetInvV
ldr r1, _020B9F64 ; =0x04000400
mov r2, #0x30
bl MIi_CpuSend32
ldr r2, _020B9F78 ; =0x00001B19
ldr r1, _020B9F64 ; =0x04000400
- ldr r0, _020B9F7C ; =UNK_021066AC
+ ldr r0, _020B9F7C ; =bbcmd1$9173 + 0xC
str r2, [r1, #0x0]
mov r2, #0x3c
bl MIi_CpuSend32
b _020B9ED4
_020B9EC4:
- ldr r0, _020B9F80 ; =UNK_021066A0
+ ldr r0, _020B9F80 ; =bbcmd1$9173
ldr r1, _020B9F64 ; =0x04000400
mov r2, #0x48
bl MIi_CpuSend32
@@ -1657,7 +1548,7 @@ _020B9F10:
mov r0, #0x13
mov r2, #0x1
str r3, [sp, #0x4]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020B9F44:
ldr r0, [r9, #0x0]
add r0, r0, r6
@@ -1665,22 +1556,21 @@ _020B9F44:
add sp, sp, #0xc8
ldmia sp!, {r4-r10,pc}
.balign 4
-_020B9F58: .word UNK_021066D0
-_020B9F5C: .word UNK_021066DC
+_020B9F58: .word bbcmd1$9173 + 0x30
+_020B9F5C: .word bbcmd1$9173 + 0x3C
_020B9F60: .word 0x00151110
_020B9F64: .word 0x04000400
-_020B9F68: .word UNK_021CED18
-_020B9F6C: .word UNK_021CED64
+_020B9F68: .word NNS_G3dGlb
+_020B9F6C: .word NNS_G3dGlb + 0x4C
_020B9F70: .word 0x00171012
-_020B9F74: .word UNK_021066A4
+_020B9F74: .word bbcmd1$9173 + 0x4
_020B9F78: .word 0x00001B19
-_020B9F7C: .word UNK_021066AC
-_020B9F80: .word UNK_021066A0
- arm_func_end FUN_020B9C54
+_020B9F7C: .word bbcmd1$9173 + 0xC
+_020B9F80: .word bbcmd1$9173
+ arm_func_end NNSi_G3dFuncSbc_BB
- ; NNSi_G3dFuncSbc_NODEDESC
- arm_func_start FUN_020B9F84
-FUN_020B9F84: ; 0x020B9F84
+ arm_func_start NNSi_G3dFuncSbc_NODEDESC
+NNSi_G3dFuncSbc_NODEDESC: ; 0x020B9F84
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x14
mov r10, r0
@@ -1716,7 +1606,7 @@ _020B9FE0:
mov r0, #0x14
mov r2, #0x1
str r3, [sp, #0x8]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020BA008:
ldr r0, [r10, #0x0]
add sp, sp, #0x14
@@ -1743,7 +1633,7 @@ _020BA02C:
add r1, sp, #0xc
mov r0, #0x14
mov r2, #0x1
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020BA068:
add r0, r10, #0x12c
str r0, [r10, #0xb4]
@@ -1847,8 +1737,8 @@ _020BA188:
rsbne r2, r0, #0x0
moveq r2, #0x1000
str r2, [r1, #0x28]
- ldr r0, _020BA3B4 ; =UNK_020FF9F0
- ldr r1, _020BA3B8 ; =UNK_020FF9F0 + 1
+ ldr r0, _020BA3B4 ; =pivotUtil_$9100
+ ldr r1, _020BA3B8 ; =pivotUtil_$9100 + 1
ldrb r0, [r0, r11, lsl #0x2]
add r2, r6, r0, lsl #0x2
ldr r0, [sp, #0x0]
@@ -1862,7 +1752,7 @@ _020BA188:
ldrne r0, [sp, #0x4]
rsbne r0, r0, #0x0
strne r0, [sp, #0x4]
- ldr r0, _020BA3BC ; =UNK_020FF9F0 + 2
+ ldr r0, _020BA3BC ; =pivotUtil_$9100 + 2
ldrb r0, [r0, r11, lsl #0x2]
add r1, r6, r0, lsl #0x2
ldr r0, [sp, #0x4]
@@ -1872,7 +1762,7 @@ _020BA188:
ldrne r0, [sp, #0x0]
rsbne r0, r0, #0x0
strne r0, [sp, #0x0]
- ldr r0, _020BA3C0 ; =UNK_020FF9F0 + 3
+ ldr r0, _020BA3C0 ; =pivotUtil_$9100 + 3
ldrb r0, [r0, r11, lsl #0x2]
add r1, r6, r0, lsl #0x2
ldr r0, [sp, #0x0]
@@ -1965,7 +1855,7 @@ _020BA36C:
mov r0, #0x13
mov r2, #0x1
str r3, [sp, #0x10]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020BA3A0:
ldr r0, [r10, #0x0]
add r0, r0, r7
@@ -1973,15 +1863,14 @@ _020BA3A0:
add sp, sp, #0x14
ldmia sp!, {r4-r11,pc}
.balign 4
-_020BA3B4: .word UNK_020FF9F0
-_020BA3B8: .word UNK_020FF9F0 + 1
-_020BA3BC: .word UNK_020FF9F0 + 2
-_020BA3C0: .word UNK_020FF9F0 + 3
- arm_func_end FUN_020B9F84
+_020BA3B4: .word pivotUtil_$9100
+_020BA3B8: .word pivotUtil_$9100 + 1
+_020BA3BC: .word pivotUtil_$9100 + 2
+_020BA3C0: .word pivotUtil_$9100 + 3
+ arm_func_end NNSi_G3dFuncSbc_NODEDESC
- ; NNSi_G3dFuncSbc_SHP
- arm_func_start FUN_020BA3C4
-FUN_020BA3C4: ; 0x020BA3C4
+ arm_func_start NNSi_G3dFuncSbc_SHP
+NNSi_G3dFuncSbc_SHP: ; 0x020BA3C4
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r4, r0
@@ -1996,7 +1885,7 @@ FUN_020BA3C4: ; 0x020BA3C4
ldr r3, [r4, #0x0]
ldrh r2, [r5, #0x6]
ldrb r3, [r3, #0x1]
- ldr ip, _020BA434 ; =UNK_02106650
+ ldr ip, _020BA434 ; =NNS_G3dFuncSbcShpTable
ldrh lr, [r5, r2]
add r2, r5, r2
mla r2, lr, r3, r2
@@ -2012,12 +1901,11 @@ _020BA420:
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
.balign 4
-_020BA434: .word UNK_02106650
- arm_func_end FUN_020BA3C4
+_020BA434: .word NNS_G3dFuncSbcShpTable
+ arm_func_end NNSi_G3dFuncSbc_SHP
- ; _end
- arm_func_start FUN_020BA438
-FUN_020BA438: ; 0x020BA438
+ arm_func_start NNSi_G3dFuncSbc_SHP_InternalDefault
+NNSi_G3dFuncSbc_SHP_InternalDefault: ; 0x020BA438
stmdb sp!, {r4-r6,lr}
mov r6, r0
ldr r0, [r6, #0x20]
@@ -2051,7 +1939,7 @@ _020BA494:
ldr r0, [r5, #0x8]
ldr r1, [r5, #0xc]
add r0, r5, r0
- bl FUN_020BB2B0
+ bl NNS_G3dGeSendDL
_020BA4B8:
cmp r4, #0x2
bne _020BA4E8
@@ -2075,11 +1963,10 @@ _020BA4E8:
ldr r1, [r6, #0x20]
blx r1
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020BA438
+ arm_func_end NNSi_G3dFuncSbc_SHP_InternalDefault
- ; NNSi_G3dFuncSbc_MAT
- arm_func_start FUN_020BA50C
-FUN_020BA50C: ; 0x020BA50C
+ arm_func_start NNSi_G3dFuncSbc_MAT
+NNSi_G3dFuncSbc_MAT: ; 0x020BA50C
stmdb sp!, {r4-r6,lr}
mov r4, r0
ldr r5, [r4, #0x8]
@@ -2096,7 +1983,7 @@ FUN_020BA50C: ; 0x020BA50C
beq _020BA578
_020BA544:
ldr r6, [r4, #0xd8]
- ldr ip, _020BA588 ; =UNK_02106640
+ ldr ip, _020BA588 ; =NNS_G3dFuncSbcMatTable
ldrh r2, [r6, #0xa]
add r5, r6, #0x4
mov r0, r4
@@ -2114,12 +2001,11 @@ _020BA578:
str r0, [r4, #0x0]
ldmia sp!, {r4-r6,pc}
.balign 4
-_020BA588: .word UNK_02106640
- arm_func_end FUN_020BA50C
+_020BA588: .word NNS_G3dFuncSbcMatTable
+ arm_func_end NNSi_G3dFuncSbc_MAT
- ; NNSi_G3dFuncSbc_MAT_InternalDefault
- arm_func_start FUN_020BA58C
-FUN_020BA58C: ; 0x020BA58C
+ arm_func_start NNSi_G3dFuncSbc_MAT_InternalDefault
+NNSi_G3dFuncSbc_MAT_InternalDefault: ; 0x020BA58C
stmdb sp!, {r4-r8,lr}
sub sp, sp, #0x20
mov r8, r0
@@ -2182,7 +2068,7 @@ _020BA648:
cmp r0, #0x0
movne r1, #0x38
mlane r4, r6, r1, r0
- ldreq r1, _020BA9D8 ; =UNK_021CEF80
+ ldreq r1, _020BA9D8 ; =NNS_G3dRSOnGlb
moveq r0, #0x38
mlaeq r4, r6, r0, r1
b _020BA8BC
@@ -2207,7 +2093,7 @@ _020BA6BC:
bne _020BA6F0
add lr, r8, #0xbc
mov r12, r6, lsr #0x5
- ldr r1, _020BA9D8 ; =UNK_021CEF80
+ ldr r1, _020BA9D8 ; =NNS_G3dRSOnGlb
ldr r4, [lr, r12, lsl #0x2]
mov r0, #0x38
and r2, r6, #0x1f
@@ -2225,7 +2111,7 @@ _020BA6F0:
add r0, r2, r0
mla r0, r1, r6, r0
ldr r0, [r0, #0x4]
- ldr r1, _020BA9DC ; =UNK_021CED18
+ ldr r1, _020BA9DC ; =NNS_G3dGlb
add r0, r3, r0
ldrh r0, [r0, #0x1e]
ands r0, r0, #0x20
@@ -2233,7 +2119,7 @@ _020BA6F0:
orrne r0, r0, #0x20
strne r0, [r4, #0x0]
ldrh r2, [r7, #0x1e]
- ldr r0, _020BA9E0 ; =UNK_020FF9D0
+ ldr r0, _020BA9E0 ; =matColorMask_$8998
ldr r12, [r1, #0x94]
mov r2, r2, asr #0x6
and r2, r2, #0x7
@@ -2388,7 +2274,7 @@ _020BA900:
str r3, [sp, #0x14]
ldr r3, [r4, #0x14]
str r3, [sp, #0x18]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
ldr r0, [r4, #0x0]
ands r0, r0, #0x18
beq _020BA9AC
@@ -2413,16 +2299,15 @@ _020BA9AC:
add sp, sp, #0x20
ldmia sp!, {r4-r8,pc}
.balign 4
-_020BA9D8: .word UNK_021CEF80
-_020BA9DC: .word UNK_021CED18
-_020BA9E0: .word UNK_020FF9D0
+_020BA9D8: .word NNS_G3dRSOnGlb
+_020BA9DC: .word NNS_G3dGlb
+_020BA9E0: .word matColorMask_$8998
_020BA9E4: .word 0x00293130
_020BA9E8: .word 0x00002B2A
- arm_func_end FUN_020BA58C
+ arm_func_end NNSi_G3dFuncSbc_MAT_InternalDefault
- ; _end
- arm_func_start FUN_020BA9EC
-FUN_020BA9EC: ; 0x020BA9EC
+ arm_func_start NNSi_G3dFuncSbc_MTX
+NNSi_G3dFuncSbc_MTX: ; 0x020BA9EC
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r0
@@ -2464,7 +2349,7 @@ _020BAA5C:
add r1, sp, #0x0
mov r0, #0x14
mov r2, #0x1
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020BAA8C:
cmp r4, #0x3
bne _020BAAAC
@@ -2480,11 +2365,10 @@ _020BAAAC:
str r0, [r5, #0x0]
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
- arm_func_end FUN_020BA9EC
+ arm_func_end NNSi_G3dFuncSbc_MTX
- ; _end
- arm_func_start FUN_020BAAC0
-FUN_020BAAC0: ; 0x020BAAC0
+ arm_func_start NNSi_G3dFuncSbc_NODE
+NNSi_G3dFuncSbc_NODE: ; 0x020BAAC0
stmdb sp!, {r4-r6,lr}
mov r6, r0
ldr r0, [r6, #0x8]
@@ -2591,11 +2475,10 @@ _020BAC38:
add r0, r0, #0x3
str r0, [r6, #0x0]
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020BAAC0
+ arm_func_end NNSi_G3dFuncSbc_NODE
- ; _end
- arm_func_start FUN_020BAC48
-FUN_020BAC48: ; 0x020BAC48
+ arm_func_start NNSi_G3dFuncSbc_RET
+NNSi_G3dFuncSbc_RET: ; 0x020BAC48
stmdb sp!, {r4,lr}
mov r4, r0
ldr r1, [r4, #0x10]
@@ -2607,11 +2490,10 @@ _020BAC60:
orr r0, r0, #0x20
str r0, [r4, #0x8]
ldmia sp!, {r4,pc}
- arm_func_end FUN_020BAC48
+ arm_func_end NNSi_G3dFuncSbc_RET
- ; _end
- arm_func_start FUN_020BAC70
-FUN_020BAC70: ; 0x020BAC70
+ arm_func_start NNSi_G3dFuncSbc_NOP
+NNSi_G3dFuncSbc_NOP: ; 0x020BAC70
stmdb sp!, {r4,lr}
mov r4, r0
ldr r1, [r4, #0xc]
@@ -2623,11 +2505,10 @@ _020BAC88:
add r0, r0, #0x1
str r0, [r4, #0x0]
ldmia sp!, {r4,pc}
- arm_func_end FUN_020BAC70
+ arm_func_end NNSi_G3dFuncSbc_NOP
- ; NNS_G3dDraw
- arm_func_start FUN_020BAC98
-FUN_020BAC98: ; 0x020BAC98
+ arm_func_start NNS_G3dDraw
+NNS_G3dDraw: ; 0x020BAC98
stmdb sp!, {r4,lr}
sub sp, sp, #0x188
mov r4, r0
@@ -2651,49 +2532,48 @@ FUN_020BAC98: ; 0x020BAC98
cmp r1, #0x0
beq _020BACF8
add r0, r4, #0x3c
- bl FUN_020BAD74
+ bl updateHintVec_
_020BACF8:
ldr r1, [r4, #0x10]
cmp r1, #0x0
beq _020BAD0C
add r0, r4, #0x44
- bl FUN_020BAD74
+ bl updateHintVec_
_020BAD0C:
ldr r1, [r4, #0x18]
cmp r1, #0x0
beq _020BAD20
add r0, r4, #0x4c
- bl FUN_020BAD74
+ bl updateHintVec_
_020BAD20:
ldr r0, [r4, #0x0]
bic r0, r0, #0x10
str r0, [r4, #0x0]
_020BAD2C:
- ldr r2, _020BAD70 ; =UNK_021CEF7C
+ ldr r2, _020BAD70 ; =NNS_G3dRS
ldr r0, [r2, #0x0]
cmp r0, #0x0
beq _020BAD4C
mov r1, r4
- bl FUN_020BADE4
+ bl G3dDrawInternal_
add sp, sp, #0x188
ldmia sp!, {r4,pc}
_020BAD4C:
add r0, sp, #0x0
mov r1, r4
str r0, [r2, #0x0]
- bl FUN_020BADE4
- ldr r0, _020BAD70 ; =UNK_021CEF7C
+ bl G3dDrawInternal_
+ ldr r0, _020BAD70 ; =NNS_G3dRS
mov r1, #0x0
str r1, [r0, #0x0]
add sp, sp, #0x188
ldmia sp!, {r4,pc}
.balign 4
-_020BAD70: .word UNK_021CEF7C
- arm_func_end FUN_020BAC98
+_020BAD70: .word NNS_G3dRS
+ arm_func_end NNS_G3dDraw
- ; _end
- arm_func_start FUN_020BAD74
-FUN_020BAD74: ; 0x020BAD74
+ local_arm_func_start updateHintVec_
+updateHintVec_: ; 0x020BAD74
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
cmp r1, #0x0
@@ -2725,11 +2605,10 @@ _020BADD0:
bne _020BAD90
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
- arm_func_end FUN_020BAD74
+ arm_func_end updateHintVec_
- ; G3dDrawInternal_
- arm_func_start FUN_020BADE4
-FUN_020BADE4: ; 0x020BADE4
+ arm_func_start G3dDrawInternal_
+G3dDrawInternal_: ; 0x020BADE4
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r0
@@ -2742,7 +2621,7 @@ FUN_020BADE4: ; 0x020BADE4
str r0, [r5, #0xc4]
str r0, [r5, #0x8]
ldr r0, [r4, #0x30]
- ldr r2, _020BAF60 ; =UNK_02106614
+ ldr r2, _020BAF60 ; =NNS_G3dGetJointScale_FuncArray
cmp r0, #0x0
strne r0, [r5, #0x0]
ldreq r1, [r4, #0x4]
@@ -2751,11 +2630,11 @@ FUN_020BADE4: ; 0x020BADE4
streq r0, [r5, #0x0]
str r4, [r5, #0x4]
ldr r0, [r4, #0x4]
- ldr r1, _020BAF64 ; =UNK_02106608
+ ldr r1, _020BAF64 ; =NNS_G3dSendJointSRT_FuncArray
add r0, r0, #0x40
str r0, [r5, #0xd4]
ldr r12, [r4, #0x4]
- ldr r0, _020BAF68 ; =UNK_02106620
+ ldr r0, _020BAF68 ; =NNS_G3dSendTexSRT_FuncArray
ldr r3, [r12, #0x8]
add r3, r12, r3
str r3, [r5, #0xd8]
@@ -2821,24 +2700,23 @@ _020BAEE0:
blx r1
_020BAF44:
mov r0, r5
- bl FUN_020BAF6C
+ bl G3dDrawInternal_Loop_
ldr r0, [r4, #0x0]
bic r0, r0, #0x1
str r0, [r4, #0x0]
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
.balign 4
-_020BAF60: .word UNK_02106614
-_020BAF64: .word UNK_02106608
-_020BAF68: .word UNK_02106620
- arm_func_end FUN_020BADE4
+_020BAF60: .word NNS_G3dGetJointScale_FuncArray
+_020BAF64: .word NNS_G3dSendJointSRT_FuncArray
+_020BAF68: .word NNS_G3dSendTexSRT_FuncArray
+ arm_func_end G3dDrawInternal_
- ; G3dDrawInternal_Loop_
- arm_func_start FUN_020BAF6C
-FUN_020BAF6C: ; 0x020BAF6C
+ arm_func_start G3dDrawInternal_Loop_
+G3dDrawInternal_Loop_: ; 0x020BAF6C
stmdb sp!, {r4-r6,lr}
mov r5, r0
- ldr r6, _020BAFB4 ; =UNK_02106730
+ ldr r6, _020BAFB4 ; =NNS_G3dFuncSbcTable
add r4, r5, #0x8
_020BAF7C:
ldr r1, [r4, #0x0]
@@ -2856,6 +2734,5 @@ _020BAF7C:
beq _020BAF7C
ldmia sp!, {r4-r6,pc}
.balign 4
-_020BAFB4: .word UNK_02106730
- arm_func_end FUN_020BAF6C
-
+_020BAFB4: .word NNS_G3dFuncSbcTable
+ arm_func_end G3dDrawInternal_Loop_
diff --git a/arm9/asm/NNS_G3D_si3d.s b/arm9/asm/NNS_G3D_si3d.s
index d6986712..66bfe460 100644
--- a/arm9/asm/NNS_G3D_si3d.s
+++ b/arm9/asm/NNS_G3D_si3d.s
@@ -3,9 +3,8 @@
.section .text
- ; NNSi_G3dSendTexSRTSi3d
- arm_func_start FUN_020BEF10
-FUN_020BEF10: ; 0x020BEF10
+ arm_func_start NNSi_G3dSendTexSRTSi3d
+NNSi_G3dSendTexSRTSi3d: ; 0x020BEF10
stmdb sp!, {lr}
sub sp, sp, #0x3c
ldr r1, [r0, #0x0]
@@ -119,17 +118,16 @@ _020BF0B0:
ldr r0, [sp, #0x0]
add r1, r1, #0x4
mov r2, #0xe
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
add sp, sp, #0x3c
ldmia sp!, {pc}
.balign 4
_020BF0CC: .word 0x00101710
_020BF0D0: .word 0x00101910
- arm_func_end FUN_020BEF10
+ arm_func_end NNSi_G3dSendTexSRTSi3d
- ; NNSi_G3dGetJointScaleSi3d
- arm_func_start FUN_020BF0D4
-FUN_020BF0D4: ; 0x020BF0D4
+ arm_func_start NNSi_G3dGetJointScaleSi3d
+NNSi_G3dGetJointScaleSi3d: ; 0x020BF0D4
stmdb sp!, {r4-r8,lr}
mov r5, r0
ands r0, r3, #0x4
@@ -137,7 +135,7 @@ FUN_020BF0D4: ; 0x020BF0D4
ldrb r0, [r2, #0x2]
beq _020BF174
ldr r2, [r5, #0x0]
- ldr r1, _020BF2E0 ; =UNK_021CEF7C
+ ldr r1, _020BF2E0 ; =NNS_G3dRS
orr r2, r2, #0x1
str r2, [r5, #0x0]
ldr r3, [r1, #0x0]
@@ -160,7 +158,7 @@ FUN_020BF0D4: ; 0x020BF0D4
str r0, [r5, #0x0]
ldmia sp!, {r4-r8,pc}
_020BF148:
- ldr r1, _020BF2E4 ; =UNK_021CFD80
+ ldr r1, _020BF2E4 ; =NNS_G3dRSOnGlb + 0xE00
mov r2, #0x18
mla r6, r0, r2, r1
mla r1, r4, r2, r1
@@ -173,7 +171,7 @@ _020BF148:
ldmia sp!, {r4-r8,pc}
_020BF174:
ldr r3, [r1, #0x0]
- ldr r2, _020BF2E0 ; =UNK_021CEF7C
+ ldr r2, _020BF2E0 ; =NNS_G3dRS
str r3, [r5, #0x4]
ldr r3, [r1, #0x4]
mov r7, r0, lsr #0x5
@@ -188,12 +186,12 @@ _020BF174:
ldr r2, [r2, #0xc4]
ands r2, r7, r2
beq _020BF200
- ldr r3, _020BF2E4 ; =UNK_021CFD80
+ ldr r3, _020BF2E4 ; =NNS_G3dRSOnGlb + 0xE00
mov r2, #0x18
mov r0, r1
mla r1, r4, r2, r3
bl MIi_CpuCopy32
- ldr r0, _020BF2E0 ; =UNK_021CEF7C
+ ldr r0, _020BF2E0 ; =NNS_G3dRS
mov r2, r4, lsr #0x5
ldr r1, [r0, #0x0]
and r0, r4, #0x1f
@@ -211,7 +209,7 @@ _020BF200:
mov r2, #0x18
mul r12, r0, r2
and r7, r4, #0x1f
- ldr r0, _020BF2E4 ; =UNK_021CFD80
+ ldr r0, _020BF2E4 ; =NNS_G3dRSOnGlb + 0xE00
add r6, r6, #0xc4
mov lr, r4, lsr #0x5
mvn r7, r3, lsl r7
@@ -221,35 +219,35 @@ _020BF200:
str r4, [r6, lr, lsl #0x2]
ldr r7, [r1, #0x0]
ldr r4, [r0, r12]
- ldr r6, _020BF2E8 ; =UNK_021CFD84
+ ldr r6, _020BF2E8 ; =NNS_G3dRSOnGlb + 0xE04
smull r8, r4, r7, r4
mov r7, r8, lsr #0xc
orr r7, r7, r4, lsl #0x14
str r7, [r0, r3]
ldr r8, [r1, #0x4]
ldr r4, [r6, r12]
- ldr r7, _020BF2EC ; =UNK_021CFD88
+ ldr r7, _020BF2EC ; =NNS_G3dRSOnGlb + 0xE08
smull lr, r4, r8, r4
mov r8, lr, lsr #0xc
orr r8, r8, r4, lsl #0x14
str r8, [r6, r3]
ldr r8, [r1, #0x8]
ldr r4, [r7, r12]
- ldr r6, _020BF2F0 ; =UNK_021CFD8C
+ ldr r6, _020BF2F0 ; =NNS_G3dRSOnGlb + 0xE0C
smull lr, r4, r8, r4
mov r8, lr, lsr #0xc
orr r8, r8, r4, lsl #0x14
str r8, [r7, r3]
ldr r7, [r1, #0xc]
ldr r4, [r6, r12]
- ldr lr, _020BF2F4 ; =UNK_021CFD90
+ ldr lr, _020BF2F4 ; =NNS_G3dRSOnGlb + 0xE10
smull r8, r4, r7, r4
mov r7, r8, lsr #0xc
orr r7, r7, r4, lsl #0x14
str r7, [r6, r3]
ldr r7, [r1, #0x10]
ldr r4, [lr, r12]
- ldr r6, _020BF2F8 ; =UNK_021CFD94
+ ldr r6, _020BF2F8 ; =NNS_G3dRSOnGlb + 0xE14
smull r8, r4, r7, r4
add r0, r0, r12
mov r7, r8, lsr #0xc
@@ -265,18 +263,17 @@ _020BF200:
bl MIi_CpuCopy32
ldmia sp!, {r4-r8,pc}
.balign 4
-_020BF2E0: .word UNK_021CEF7C
-_020BF2E4: .word UNK_021CFD80
-_020BF2E8: .word UNK_021CFD84
-_020BF2EC: .word UNK_021CFD88
-_020BF2F0: .word UNK_021CFD8C
-_020BF2F4: .word UNK_021CFD90
-_020BF2F8: .word UNK_021CFD94
- arm_func_end FUN_020BF0D4
+_020BF2E0: .word NNS_G3dRS
+_020BF2E4: .word NNS_G3dRSOnGlb + 0xE00
+_020BF2E8: .word NNS_G3dRSOnGlb + 0xE04
+_020BF2EC: .word NNS_G3dRSOnGlb + 0xE08
+_020BF2F0: .word NNS_G3dRSOnGlb + 0xE0C
+_020BF2F4: .word NNS_G3dRSOnGlb + 0xE10
+_020BF2F8: .word NNS_G3dRSOnGlb + 0xE14
+ arm_func_end NNSi_G3dGetJointScaleSi3d
- ; _end
- arm_func_start FUN_020BF2FC
-FUN_020BF2FC: ; 0x020BF2FC
+ arm_func_start NNSi_G3dSendJointSRTSi3d
+NNSi_G3dSendJointSRTSi3d: ; 0x020BF2FC
stmdb sp!, {r4-r6,lr}
sub sp, sp, #0x10
mov r6, r0
@@ -287,7 +284,7 @@ FUN_020BF2FC: ; 0x020BF2FC
add r1, r6, #0x1c
mov r0, #0x1b
mov r2, #0x3
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020BF328:
ldr r0, [r6, #0x0]
ands r0, r0, #0x4
@@ -316,7 +313,7 @@ _020BF328:
mov r12, lr, lsr #0xc
orr r12, r12, r3, lsl #0x14
str r12, [sp, #0x8]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020BF398:
ldr r0, [r6, #0x0]
ands r0, r0, #0x2
@@ -326,13 +323,13 @@ _020BF398:
add r1, r6, #0x28
mov r0, #0x19
mov r2, #0xc
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
b _020BF3EC
_020BF3C0:
add r1, r6, #0x28
mov r0, #0x1a
mov r2, #0x9
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
b _020BF3EC
_020BF3D4:
cmp r5, #0x0
@@ -340,14 +337,14 @@ _020BF3D4:
add r1, r6, #0x4c
mov r0, #0x1c
mov r2, #0x3
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020BF3EC:
cmp r4, #0x0
bne _020BF404
add r1, r6, #0x10
mov r0, #0x1b
mov r2, #0x3
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_020BF404:
ldr r0, [r6, #0x0]
ands r0, r0, #0x1
@@ -356,8 +353,7 @@ _020BF404:
add r1, r6, #0x4
mov r0, #0x1b
mov r2, #0x3
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
add sp, sp, #0x10
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020BF2FC
-
+ arm_func_end NNSi_G3dSendJointSRTSi3d
diff --git a/arm9/asm/NNS_G3D_util.s b/arm9/asm/NNS_G3D_util.s
index f6f204d4..932cf871 100644
--- a/arm9/asm/NNS_G3D_util.s
+++ b/arm9/asm/NNS_G3D_util.s
@@ -3,15 +3,14 @@
.section .text
- ; NNS_G3dWorldPosToScrPos
- arm_func_start FUN_020BB408
-FUN_020BB408: ; 0x020BB408
+ arm_func_start NNS_G3dWorldPosToScrPos
+NNS_G3dWorldPosToScrPos: ; 0x020BB408
stmdb sp!, {r4-r9,lr}
sub sp, sp, #0x1c
mov r5, r1
mov r4, r2
- ldr r6, _020BB594 ; =UNK_021CED20
- ldr r1, _020BB598 ; =UNK_021CED64
+ ldr r6, _020BB594 ; =NNS_G3dGlb + 0x8
+ ldr r1, _020BB598 ; =NNS_G3dGlb + 0x4C
add r2, sp, #0x10
bl MTX_MultVec43
ldr r1, [sp, #0x14]
@@ -87,7 +86,7 @@ _020BB534:
add r1, sp, #0x4
add r2, sp, #0x8
add r3, sp, #0xc
- bl FUN_020B8200
+ bl NNS_G3dGlbGetViewPort
ldr r2, [sp, #0x0]
ldr r0, [sp, #0x8]
ldr r12, [sp, #0xc]
@@ -108,13 +107,12 @@ _020BB534:
add sp, sp, #0x1c
ldmia sp!, {r4-r9,pc}
.balign 4
-_020BB594: .word UNK_021CED20
-_020BB598: .word UNK_021CED64
- arm_func_end FUN_020BB408
+_020BB594: .word NNS_G3dGlb + 0x8
+_020BB598: .word NNS_G3dGlb + 0x4C
+ arm_func_end NNS_G3dWorldPosToScrPos
- ; NNS_G3dResDefaultSetup
- arm_func_start FUN_020BB59C
-FUN_020BB59C: ; 0x020BB59C
+ arm_func_start NNS_G3dResDefaultSetup
+NNS_G3dResDefaultSetup: ; 0x020BB59C
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x4
mov r5, r0
@@ -157,20 +155,20 @@ _020BB624:
mov r0, r5
mov r9, r11
mov r8, r11
- bl FUN_020BC0FC
+ bl NNS_G3dGetTex
movs r4, r0
beq _020BB77C
- bl FUN_020B7E1C
+ bl NNS_G3dTexGetRequiredSize
mov r7, r0
mov r0, r4
- bl FUN_020B7E10
+ bl NNS_G3dTex4x4GetRequiredSize
mov r6, r0
mov r0, r4
- bl FUN_020B7CE4
+ bl NNS_G3dPlttGetRequiredSize
mov r10, r0
cmp r7, #0x0
beq _020BB68C
- ldr r0, _020BB7E4 ; =UNK_021064B8
+ ldr r0, _020BB7E4 ; =NNS_GfdDefaultFuncAllocTexVram
mov r1, #0x0
ldr r3, [r0, #0x0]
mov r0, r7
@@ -184,7 +182,7 @@ _020BB68C:
_020BB690:
cmp r6, #0x0
beq _020BB6BC
- ldr r1, _020BB7E4 ; =UNK_021064B8
+ ldr r1, _020BB7E4 ; =NNS_GfdDefaultFuncAllocTexVram
mov r0, r6
ldr r3, [r1, #0x0]
mov r1, #0x1
@@ -198,7 +196,7 @@ _020BB6BC:
_020BB6C0:
cmp r10, #0x0
beq _020BB6F0
- ldr r1, _020BB7E8 ; =UNK_021064C0
+ ldr r1, _020BB7E8 ; =NNS_GfdDefaultFuncAllocPlttVram
ldrh r2, [r4, #0x20]
ldr r3, [r1, #0x0]
mov r0, r10
@@ -218,15 +216,15 @@ _020BB6F4:
cmp r8, #0x0
bne _020BB748
_020BB70C:
- ldr r1, _020BB7EC ; =UNK_021064C4
+ ldr r1, _020BB7EC ; =NNS_GfdDefaultFuncFreePlttVram
mov r0, r10
ldr r1, [r1, #0x0]
blx r1
- ldr r1, _020BB7F0 ; =UNK_021064BC
+ ldr r1, _020BB7F0 ; =NNS_GfdDefaultFuncFreeTexVram
mov r0, r6
ldr r1, [r1, #0x0]
blx r1
- ldr r1, _020BB7F0 ; =UNK_021064BC
+ ldr r1, _020BB7F0 ; =NNS_GfdDefaultFuncFreeTexVram
mov r0, r7
ldr r1, [r1, #0x0]
blx r1
@@ -237,27 +235,27 @@ _020BB748:
mov r0, r4
mov r1, r7
mov r2, r6
- bl FUN_020B7DFC
+ bl NNS_G3dTexSetTexKey
mov r0, r4
mov r1, r10
- bl FUN_020B7CDC
+ bl NNS_G3dPlttSetPlttKey
mov r0, r4
mov r1, #0x1
- bl FUN_020B7D28
+ bl NNS_G3dTexLoad
mov r0, r4
mov r1, #0x1
- bl FUN_020B7C78
+ bl NNS_G3dPlttLoad
_020BB77C:
ldr r1, [r5, #0x0]
ldr r0, _020BB7DC ; =0x30444D42
cmp r1, r0
bne _020BB7A4
mov r0, r5
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
cmp r4, #0x0
beq _020BB7A4
mov r1, r4
- bl FUN_020B7790
+ bl NNS_G3dBindMdlSet
_020BB7A4:
add sp, sp, #0x4
mov r0, #0x1
@@ -278,19 +276,18 @@ _020BB7D4: .word 0x30415442
_020BB7D8: .word 0x30505442
_020BB7DC: .word 0x30444D42
_020BB7E0: .word 0x30585442
-_020BB7E4: .word UNK_021064B8
-_020BB7E8: .word UNK_021064C0
-_020BB7EC: .word UNK_021064C4
-_020BB7F0: .word UNK_021064BC
- arm_func_end FUN_020BB59C
+_020BB7E4: .word NNS_GfdDefaultFuncAllocTexVram
+_020BB7E8: .word NNS_GfdDefaultFuncAllocPlttVram
+_020BB7EC: .word NNS_GfdDefaultFuncFreePlttVram
+_020BB7F0: .word NNS_GfdDefaultFuncFreeTexVram
+ arm_func_end NNS_G3dResDefaultSetup
- ; NNS_G3dInit
- arm_func_start FUN_020BB7F4
-FUN_020BB7F4: ; 0x020BB7F4
+ arm_func_start NNS_G3dInit
+NNS_G3dInit: ; 0x020BB7F4
stmdb sp!, {lr}
sub sp, sp, #0x4
bl G3X_Init
- bl FUN_020B84D8
+ bl NNS_G3dGlbInit
ldr r1, _020BB820 ; =0x04000600
ldr r0, [r1, #0x0]
bic r0, r0, #0xc0000000
@@ -300,16 +297,15 @@ FUN_020BB7F4: ; 0x020BB7F4
ldmia sp!, {pc}
.balign 4
_020BB820: .word 0x04000600
- arm_func_end FUN_020BB7F4
+ arm_func_end NNS_G3dInit
- ; NNS_G3dGetCurrentMtx
- arm_func_start FUN_020BB824
-FUN_020BB824: ; 0x020BB824
+ arm_func_start NNS_G3dGetCurrentMtx
+NNS_G3dGetCurrentMtx: ; 0x020BB824
stmdb sp!, {r4-r6,lr}
sub sp, sp, #0x40
mov r6, r0
mov r5, r1
- bl FUN_020BB394
+ bl NNS_G3dGeFlushBuffer
ldr r0, _020BB8B4 ; =0x04000440
mov r2, #0x0
ldr r1, _020BB8B8 ; =0x04000444
@@ -350,5 +346,4 @@ _020BB8B4: .word 0x04000440
_020BB8B8: .word 0x04000444
_020BB8BC: .word 0x04000454
_020BB8C0: .word 0x04000448
- arm_func_end FUN_020BB824
-
+ arm_func_end NNS_G3dGetCurrentMtx
diff --git a/arm9/asm/NNS_G3D_xsi.s b/arm9/asm/NNS_G3D_xsi.s
index bc0315c1..63787926 100644
--- a/arm9/asm/NNS_G3D_xsi.s
+++ b/arm9/asm/NNS_G3D_xsi.s
@@ -3,23 +3,21 @@
.section .data
- ; calcTexMtx_
- .global UNK_021067F0
-UNK_021067F0: ; 0x021067F0
- .word FUN_020BFFD4
- .word FUN_020BFEEC
- .word FUN_020BFE68
- .word FUN_020BFE0C
- .word FUN_020BFD38
- .word FUN_020BFC8C
- .word FUN_020BFC4C
- .word FUN_020BFC28
+ .global calcTexMtx_
+calcTexMtx_: ; 0x021067F0
+ .word texmtxCalc_flag_
+ .word texmtxCalc_flagS_
+ .word texmtxCalc_flagR_
+ .word texmtxCalc_flagRS_
+ .word texmtxCalc_flagT_
+ .word texmtxCalc_flagTS_
+ .word texmtxCalc_flagTR_
+ .word texmtxCalc_flagTRS_
.section .text
- ; NNSi_G3dSendTexSRTXsi
- arm_func_start FUN_020BFA9C
-FUN_020BFA9C: ; 0x020BFA9C
+ arm_func_start NNSi_G3dSendTexSRTXsi
+NNSi_G3dSendTexSRTXsi: ; 0x020BFA9C
stmdb sp!, {r4,lr}
sub sp, sp, #0x50
mov r4, r0
@@ -63,7 +61,7 @@ FUN_020BFA9C: ; 0x020BFA9C
ldrne r0, [r4, #0x28]
strne r0, [r4, #0x24]
ldr r1, [r4, #0x0]
- ldr r0, _020BFC24 ; =UNK_021067F0
+ ldr r0, _020BFC24 ; =calcTexMtx_
and r1, r1, #0x7
ldr r2, [r0, r1, lsl #0x2]
add r0, sp, #0x8
@@ -115,18 +113,17 @@ _020BFC00:
ldr r0, [sp, #0x0]
add r1, r1, #0x4
mov r2, #0x12
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
add sp, sp, #0x50
ldmia sp!, {r4,pc}
.balign 4
_020BFC1C: .word 0x00101610
_020BFC20: .word 0x00101810
-_020BFC24: .word UNK_021067F0
- arm_func_end FUN_020BFA9C
+_020BFC24: .word calcTexMtx_
+ arm_func_end NNSi_G3dSendTexSRTXsi
- ; _end
- arm_func_start FUN_020BFC28
-FUN_020BFC28: ; 0x020BFC28
+ arm_func_start texmtxCalc_flagTRS_
+texmtxCalc_flagTRS_: ; 0x020BFC28
mov r2, #0x1000
str r2, [r0, #0x0]
mov r1, #0x0
@@ -136,11 +133,10 @@ FUN_020BFC28: ; 0x020BFC28
str r1, [r0, #0x30]
str r1, [r0, #0x34]
bx lr
- arm_func_end FUN_020BFC28
+ arm_func_end texmtxCalc_flagTRS_
- ; _end
- arm_func_start FUN_020BFC4C
-FUN_020BFC4C: ; 0x020BFC4C
+ arm_func_start texmtxCalc_flagTR_
+texmtxCalc_flagTR_: ; 0x020BFC4C
ldr r2, [r1, #0x18]
mov r3, #0x0
str r2, [r0, #0x0]
@@ -157,11 +153,10 @@ FUN_020BFC4C: ; 0x020BFC4C
str r1, [r0, #0x34]
str r3, [r0, #0x10]
bx lr
- arm_func_end FUN_020BFC4C
+ arm_func_end texmtxCalc_flagTR_
- ; _end
- arm_func_start FUN_020BFC8C
-FUN_020BFC8C: ; 0x020BFC8C
+ arm_func_start texmtxCalc_flagTS_
+texmtxCalc_flagTS_: ; 0x020BFC8C
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r5, r1
@@ -205,11 +200,10 @@ FUN_020BFC8C: ; 0x020BFC8C
str r0, [r6, #0x10]
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
- arm_func_end FUN_020BFC8C
+ arm_func_end texmtxCalc_flagTS_
- ; _end
- arm_func_start FUN_020BFD38
-FUN_020BFD38: ; 0x020BFD38
+ arm_func_start texmtxCalc_flagT_
+texmtxCalc_flagT_: ; 0x020BFD38
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x4
mov r9, r1
@@ -263,11 +257,10 @@ FUN_020BFD38: ; 0x020BFD38
str r0, [r10, #0x10]
add sp, sp, #0x4
ldmia sp!, {r4-r11,pc}
- arm_func_end FUN_020BFD38
+ arm_func_end texmtxCalc_flagT_
- ; _end
- arm_func_start FUN_020BFE0C
-FUN_020BFE0C: ; 0x020BFE0C
+ arm_func_start texmtxCalc_flagRS_
+texmtxCalc_flagRS_: ; 0x020BFE0C
stmdb sp!, {lr}
sub sp, sp, #0x4
mov r2, #0x1000
@@ -291,11 +284,10 @@ FUN_020BFE0C: ; 0x020BFE0C
str lr, [r0, #0x10]
add sp, sp, #0x4
ldmia sp!, {pc}
- arm_func_end FUN_020BFE0C
+ arm_func_end texmtxCalc_flagRS_
- ; _end
- arm_func_start FUN_020BFE68
-FUN_020BFE68: ; 0x020BFE68
+ arm_func_start texmtxCalc_flagR_
+texmtxCalc_flagR_: ; 0x020BFE68
stmdb sp!, {r4,lr}
ldr r3, [r1, #0x18]
mov r2, #0x0
@@ -329,11 +321,10 @@ FUN_020BFE68: ; 0x020BFE68
str r1, [r0, #0x34]
str r2, [r0, #0x10]
ldmia sp!, {r4,pc}
- arm_func_end FUN_020BFE68
+ arm_func_end texmtxCalc_flagR_
- ; _end
- arm_func_start FUN_020BFEEC
-FUN_020BFEEC: ; 0x020BFEEC
+ arm_func_start texmtxCalc_flagS_
+texmtxCalc_flagS_: ; 0x020BFEEC
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r5, r1
@@ -392,11 +383,10 @@ FUN_020BFEEC: ; 0x020BFEEC
str r0, [r6, #0x10]
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
- arm_func_end FUN_020BFEEC
+ arm_func_end texmtxCalc_flagS_
- ; _end
- arm_func_start FUN_020BFFD4
-FUN_020BFFD4: ; 0x020BFFD4
+ arm_func_start texmtxCalc_flag_
+texmtxCalc_flag_: ; 0x020BFFD4
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x4
mov r6, r1
@@ -484,4 +474,4 @@ FUN_020BFFD4: ; 0x020BFFD4
str r0, [r7, #0x10]
add sp, sp, #0x4
ldmia sp!, {r4-r11,pc}
- arm_func_end FUN_020BFFD4
+ arm_func_end texmtxCalc_flag_
diff --git a/arm9/asm/NNS_GFD_gfd_frameplttvr.s b/arm9/asm/NNS_GFD_gfd_frameplttvr.s
index de838ccd..63d32aec 100644
--- a/arm9/asm/NNS_GFD_gfd_frameplttvr.s
+++ b/arm9/asm/NNS_GFD_gfd_frameplttvr.s
@@ -3,62 +3,56 @@
.section .bss
- ; s_managerState_
- .global UNK_021CCD4C
-UNK_021CCD4C: ; 0x021CCD4C
+ .global s_managerState_
+s_managerState_: ; 0x021CCD4C
.space 0xc
.section .text
- ; NNS_GfdResetFrmPlttVramState
- arm_func_start FUN_020AEC60
-FUN_020AEC60: ; 0x020AEC60
- ldr r0, _020AEC78 ; =UNK_021CCD4C
+ arm_func_start NNS_GfdResetFrmPlttVramState
+NNS_GfdResetFrmPlttVramState: ; 0x020AEC60
+ ldr r0, _020AEC78 ; =s_managerState_
mov r2, #0x0
ldr r1, [r0, #0x8]
str r2, [r0, #0x0]
str r1, [r0, #0x4]
bx lr
.balign 4
-_020AEC78: .word UNK_021CCD4C
- arm_func_end FUN_020AEC60
+_020AEC78: .word s_managerState_
+ arm_func_end NNS_GfdResetFrmPlttVramState
- ; NNS_GfdSetFrmPlttVramState
- arm_func_start FUN_020AEC7C
-FUN_020AEC7C: ; 0x020AEC7C
+ arm_func_start NNS_GfdSetFrmPlttVramState
+NNS_GfdSetFrmPlttVramState: ; 0x020AEC7C
ldr r2, [r0, #0x0]
- ldr r1, _020AEC94 ; =UNK_021CCD4C
+ ldr r1, _020AEC94 ; =s_managerState_
str r2, [r1, #0x0]
ldr r0, [r0, #0x4]
str r0, [r1, #0x4]
bx lr
.balign 4
-_020AEC94: .word UNK_021CCD4C
- arm_func_end FUN_020AEC7C
+_020AEC94: .word s_managerState_
+ arm_func_end NNS_GfdSetFrmPlttVramState
- ; NNS_GfdGetFrmPlttVramState
- arm_func_start FUN_020AEC98
-FUN_020AEC98: ; 0x020AEC98
- ldr r1, _020AECB0 ; =UNK_021CCD4C
+ arm_func_start NNS_GfdGetFrmPlttVramState
+NNS_GfdGetFrmPlttVramState: ; 0x020AEC98
+ ldr r1, _020AECB0 ; =s_managerState_
ldr r2, [r1, #0x0]
str r2, [r0, #0x0]
ldr r1, [r1, #0x4]
str r1, [r0, #0x4]
bx lr
.balign 4
-_020AECB0: .word UNK_021CCD4C
- arm_func_end FUN_020AEC98
+_020AECB0: .word s_managerState_
+ arm_func_end NNS_GfdGetFrmPlttVramState
- ; _end
- arm_func_start FUN_020AECB4
-FUN_020AECB4: ; 0x020AECB4
+ arm_func_start NNS_GfdFreeFrmPlttVram
+NNS_GfdFreeFrmPlttVram: ; 0x020AECB4
mov r0, #0x0
bx lr
- arm_func_end FUN_020AECB4
+ arm_func_end NNS_GfdFreeFrmPlttVram
- ; NNS_GfdAllocFrmPlttVram
- arm_func_start FUN_020AECBC
-FUN_020AECBC: ; 0x020AECBC
+ arm_func_start NNS_GfdAllocFrmPlttVram
+NNS_GfdAllocFrmPlttVram: ; 0x020AECBC
stmdb sp!, {r4,lr}
cmp r0, #0x0
moveq r0, #0x8
@@ -71,7 +65,7 @@ FUN_020AECBC: ; 0x020AECBC
ldmcsia sp!, {r4,pc}
cmp r2, #0x1
bne _020AED64
- ldr r2, _020AEDEC ; =UNK_021CCD4C
+ ldr r2, _020AEDEC ; =s_managerState_
cmp r1, #0x0
ldr r12, [r2, #0x0]
andne r2, r12, #0x7
@@ -80,7 +74,7 @@ FUN_020AECBC: ; 0x020AECBC
andeq r2, r12, #0xf
rsbeq r2, r2, #0x10
andeq r4, r2, #0xf
- ldr r2, _020AEDEC ; =UNK_021CCD4C
+ ldr r2, _020AEDEC ; =s_managerState_
add lr, r0, r4
ldr r2, [r2, #0x4]
sub r2, r2, r12
@@ -93,7 +87,7 @@ FUN_020AECBC: ; 0x020AECBC
movhi r12, #0x0
bhi _020AEDCC
_020AED40:
- ldr r1, _020AEDEC ; =UNK_021CCD4C
+ ldr r1, _020AEDEC ; =s_managerState_
add r3, r12, r4
ldr r2, [r1, #0x0]
mov r12, #0x1
@@ -104,7 +98,7 @@ _020AED5C:
mov r12, #0x0
b _020AEDCC
_020AED64:
- ldr r2, _020AEDEC ; =UNK_021CCD4C
+ ldr r2, _020AEDEC ; =s_managerState_
ldr r12, [r2, #0x4]
cmp r12, r0
blo _020AEDC8
@@ -112,7 +106,7 @@ _020AED64:
cmp r1, #0x0
andne r4, r2, #0x7
andeq r4, r2, #0xf
- ldr r2, _020AEDEC ; =UNK_021CCD4C
+ ldr r2, _020AEDEC ; =s_managerState_
add lr, r0, r4
ldr r2, [r2, #0x0]
sub r2, r12, r2
@@ -124,7 +118,7 @@ _020AED64:
movhi r12, #0x0
bhi _020AEDCC
_020AEDB0:
- ldr r1, _020AEDEC ; =UNK_021CCD4C
+ ldr r1, _020AEDEC ; =s_managerState_
mov r12, #0x1
ldr r2, [r1, #0x4]
sub r3, r2, lr
@@ -142,32 +136,30 @@ _020AEDCC:
ldmia sp!, {r4,pc}
.balign 4
_020AEDE8: .word 0x0007FFF8
-_020AEDEC: .word UNK_021CCD4C
+_020AEDEC: .word s_managerState_
_020AEDF0: .word 0x0000FFFF
- arm_func_end FUN_020AECBC
+ arm_func_end NNS_GfdAllocFrmPlttVram
- ; NNS_GfdInitFrmPlttVramManager
- arm_func_start FUN_020AEDF4
-FUN_020AEDF4: ; 0x020AEDF4
+ arm_func_start NNS_GfdInitFrmPlttVramManager
+NNS_GfdInitFrmPlttVramManager: ; 0x020AEDF4
stmdb sp!, {r4,lr}
- ldr r2, _020AEE2C ; =UNK_021CCD4C
+ ldr r2, _020AEE2C ; =s_managerState_
mov r4, r1
str r0, [r2, #0x8]
- bl FUN_020AEC60
+ bl NNS_GfdResetFrmPlttVramState
cmp r4, #0x0
ldmeqia sp!, {r4,pc}
- ldr r3, _020AEE30 ; =FUN_020AECBC
- ldr r1, _020AEE34 ; =UNK_021064C0
- ldr r2, _020AEE38 ; =FUN_020AECB4
- ldr r0, _020AEE3C ; =UNK_021064C4
+ ldr r3, _020AEE30 ; =NNS_GfdAllocFrmPlttVram
+ ldr r1, _020AEE34 ; =NNS_GfdDefaultFuncAllocPlttVram
+ ldr r2, _020AEE38 ; =NNS_GfdFreeFrmPlttVram
+ ldr r0, _020AEE3C ; =NNS_GfdDefaultFuncFreePlttVram
str r3, [r1, #0x0]
str r2, [r0, #0x0]
ldmia sp!, {r4,pc}
.balign 4
-_020AEE2C: .word UNK_021CCD4C
-_020AEE30: .word FUN_020AECBC
-_020AEE34: .word UNK_021064C0
-_020AEE38: .word FUN_020AECB4
-_020AEE3C: .word UNK_021064C4
- arm_func_end FUN_020AEDF4
-
+_020AEE2C: .word s_managerState_
+_020AEE30: .word NNS_GfdAllocFrmPlttVram
+_020AEE34: .word NNS_GfdDefaultFuncAllocPlttVram
+_020AEE38: .word NNS_GfdFreeFrmPlttVram
+_020AEE3C: .word NNS_GfdDefaultFuncFreePlttVram
+ arm_func_end NNS_GfdInitFrmPlttVramManager
diff --git a/arm9/asm/NNS_GFD_gfd_frametexvra.s b/arm9/asm/NNS_GFD_gfd_frametexvra.s
index 7d9f5874..6cc4da87 100644
--- a/arm9/asm/NNS_GFD_gfd_frametexvra.s
+++ b/arm9/asm/NNS_GFD_gfd_frametexvra.s
@@ -3,67 +3,46 @@
.section .data
- ; tex4x4SearchArray_
- .global UNK_021064C8
-UNK_021064C8: ; 0x021064C8
- .word UNK_021064E4
- .word UNK_0210652C
+ .global tex4x4SearchArray_
+tex4x4SearchArray_: ; 0x021064C8
+ .word vramRegions_
+ .word vramRegions_ + 0x48
- ; texNrmSearchArray_
- .global UNK_021064D0
-UNK_021064D0: ; 0x021064D0
- .word UNK_02106544
- .word UNK_0210652C
- .word UNK_021064E4
- .word UNK_02106514
- .word UNK_021064FC
+ .global texNrmSearchArray_
+texNrmSearchArray_: ; 0x021064D0
+ .word vramRegions_ + 0x60
+ .word vramRegions_ + 0x48
+ .word vramRegions_
+ .word vramRegions_ + 0x30
+ .word vramRegions_ + 0x18
- ; vramRegions_
- .global UNK_021064E4
-UNK_021064E4: ; 0x021064E4
+ .global vramRegions_
+vramRegions_: ; 0x021064E4
.byte 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00
-
- ; vramRegions_ + 0x18
- .global UNK_021064FC
-UNK_021064FC: ; 0x021064FC
.byte 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x02, 0x00
-
- ; vramRegions_ + 0x30
- .global UNK_02106514
-UNK_02106514: ; 0x02106514
.byte 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x03, 0x00
-
- ; vramRegions_ + 0x48
- .global UNK_0210652C
-UNK_0210652C: ; 0x0210652C
.byte 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x04, 0x00
-
- ; vramRegions_ + 0x60
- .global UNK_02106544
-UNK_02106544: ; 0x02106544
.byte 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x04, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x06, 0x00
.section .bss
- ; frmExVramMan_
- .global UNK_021CCD48
-UNK_021CCD48: ; 0x021CCD48
+ .global frmExVramMan_
+frmExVramMan_: ; 0x021CCD48
.space 0x4
.section .text
- ; NNS_GfdSetFrmTexVramState
- arm_func_start FUN_020AE8CC
-FUN_020AE8CC: ; 0x020AE8CC
+ arm_func_start NNS_GfdSetFrmTexVramState
+NNS_GfdSetFrmTexVramState: ; 0x020AE8CC
stmdb sp!, {lr}
sub sp, sp, #0x4
mov lr, #0x0
- ldr r3, _020AE914 ; =UNK_021064E4
+ ldr r3, _020AE914 ; =vramRegions_
mov r12, lr
mov r2, #0x1
_020AE8E4:
@@ -80,16 +59,15 @@ _020AE8E4:
add sp, sp, #0x4
ldmia sp!, {pc}
.balign 4
-_020AE914: .word UNK_021064E4
- arm_func_end FUN_020AE8CC
+_020AE914: .word vramRegions_
+ arm_func_end NNS_GfdSetFrmTexVramState
- ; NNS_GfdGetFrmTexVramState
- arm_func_start FUN_020AE918
-FUN_020AE918: ; 0x020AE918
+ arm_func_start NNS_GfdGetFrmTexVramState
+NNS_GfdGetFrmTexVramState: ; 0x020AE918
stmdb sp!, {lr}
sub sp, sp, #0x4
mov lr, #0x0
- ldr ip, _020AE960 ; =UNK_021064E4
+ ldr ip, _020AE960 ; =vramRegions_
mov r3, lr
mov r2, #0x1
_020AE930:
@@ -106,19 +84,17 @@ _020AE930:
add sp, sp, #0x4
ldmia sp!, {pc}
.balign 4
-_020AE960: .word UNK_021064E4
- arm_func_end FUN_020AE918
+_020AE960: .word vramRegions_
+ arm_func_end NNS_GfdGetFrmTexVramState
- ; _end
- arm_func_start FUN_020AE964
-FUN_020AE964: ; 0x020AE964
+ arm_func_start NNS_GfdFreeFrmTexVram
+NNS_GfdFreeFrmTexVram: ; 0x020AE964
mov r0, #0x0
bx lr
- arm_func_end FUN_020AE964
+ arm_func_end NNS_GfdFreeFrmTexVram
- ; NNS_GfdAllocFrmTexVram
- arm_func_start FUN_020AE96C
-FUN_020AE96C: ; 0x020AE96C
+ arm_func_start NNS_GfdAllocFrmTexVram
+NNS_GfdAllocFrmTexVram: ; 0x020AE96C
stmdb sp!, {r4-r10,lr}
cmp r0, #0x0
moveq r7, #0x10
@@ -132,9 +108,9 @@ FUN_020AE96C: ; 0x020AE96C
beq _020AEA5C
mov lr, r7, lsr #0x1
mov r6, #0x0
- ldr r2, _020AEAE0 ; =UNK_02106514
- ldr r3, _020AEAE4 ; =UNK_021064FC
- ldr ip, _020AEAE8 ; =UNK_021064C8
+ ldr r2, _020AEAE0 ; =vramRegions_ + 0x30
+ ldr r3, _020AEAE4 ; =vramRegions_ + 0x18
+ ldr ip, _020AEAE8 ; =tex4x4SearchArray_
mov r0, r6
_020AE9B0:
ldr r5, [r12, r6, lsl #0x2]
@@ -186,7 +162,7 @@ _020AEA48:
mov r0, #0x0
b _020AEAB8
_020AEA5C:
- ldr r3, _020AEAEC ; =UNK_021064D0
+ ldr r3, _020AEAEC ; =texNrmSearchArray_
mov r5, #0x0
_020AEA64:
ldr r4, [r3, r5, lsl #0x2]
@@ -223,22 +199,21 @@ _020AEAB8:
ldmia sp!, {r4-r10,pc}
.balign 4
_020AEADC: .word 0x0007FFF0
-_020AEAE0: .word UNK_02106514
-_020AEAE4: .word UNK_021064FC
-_020AEAE8: .word UNK_021064C8
-_020AEAEC: .word UNK_021064D0
+_020AEAE0: .word vramRegions_ + 0x30
+_020AEAE4: .word vramRegions_ + 0x18
+_020AEAE8: .word tex4x4SearchArray_
+_020AEAEC: .word texNrmSearchArray_
_020AEAF0: .word 0x0000FFFF
- arm_func_end FUN_020AE96C
+ arm_func_end NNS_GfdAllocFrmTexVram
- ; NNS_GfdResetFrmTexVramState
- arm_func_start FUN_020AEAF4
-FUN_020AEAF4: ; 0x020AEAF4
+ arm_func_start NNS_GfdResetFrmTexVramState
+NNS_GfdResetFrmTexVramState: ; 0x020AEAF4
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
- ldr r0, _020AEB68 ; =UNK_021CCD48
+ ldr r0, _020AEB68 ; =frmExVramMan_
mov r6, #0x0
ldrh r7, [r0, #0x0]
- ldr r5, _020AEB6C ; =UNK_021064E4
+ ldr r5, _020AEB6C ; =vramRegions_
mov lr, r6
cmp r7, #0x1
addhi r7, r7, #0x1
@@ -264,13 +239,12 @@ _020AEB2C:
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
.balign 4
-_020AEB68: .word UNK_021CCD48
-_020AEB6C: .word UNK_021064E4
- arm_func_end FUN_020AEAF4
+_020AEB68: .word frmExVramMan_
+_020AEB6C: .word vramRegions_
+ arm_func_end NNS_GfdResetFrmTexVramState
- ; NNS_GfdInitFrmTexVramManager
- arm_func_start FUN_020AEB70
-FUN_020AEB70: ; 0x020AEB70
+ arm_func_start NNS_GfdInitFrmTexVramManager
+NNS_GfdInitFrmTexVramManager: ; 0x020AEB70
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r0
@@ -283,7 +257,7 @@ FUN_020AEB70: ; 0x020AEB70
mov r2, #0x2
mov r3, #0x0
str r12, [sp, #0x0]
- bl FUN_020AEC10
+ bl NNSi_GfdSetTexNrmSearchArray
b _020AEBC4
_020AEBA8:
mov r12, #0x1
@@ -292,40 +266,39 @@ _020AEBA8:
mov r2, #0x0
mov r3, #0x2
str r12, [sp, #0x0]
- bl FUN_020AEC10
+ bl NNSi_GfdSetTexNrmSearchArray
_020AEBC4:
- ldr r0, _020AEBFC ; =UNK_021CCD48
+ ldr r0, _020AEBFC ; =frmExVramMan_
strh r5, [r0, #0x0]
- bl FUN_020AEAF4
+ bl NNS_GfdResetFrmTexVramState
cmp r4, #0x0
addeq sp, sp, #0x4
ldmeqia sp!, {r4-r5,pc}
- ldr r3, _020AEC00 ; =FUN_020AE96C
- ldr r1, _020AEC04 ; =UNK_021064B8
- ldr r2, _020AEC08 ; =FUN_020AE964
- ldr r0, _020AEC0C ; =UNK_021064BC
+ ldr r3, _020AEC00 ; =NNS_GfdAllocFrmTexVram
+ ldr r1, _020AEC04 ; =NNS_GfdDefaultFuncAllocTexVram
+ ldr r2, _020AEC08 ; =NNS_GfdFreeFrmTexVram
+ ldr r0, _020AEC0C ; =NNS_GfdDefaultFuncFreeTexVram
str r3, [r1, #0x0]
str r2, [r0, #0x0]
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
.balign 4
-_020AEBFC: .word UNK_021CCD48
-_020AEC00: .word FUN_020AE96C
-_020AEC04: .word UNK_021064B8
-_020AEC08: .word FUN_020AE964
-_020AEC0C: .word UNK_021064BC
- arm_func_end FUN_020AEB70
+_020AEBFC: .word frmExVramMan_
+_020AEC00: .word NNS_GfdAllocFrmTexVram
+_020AEC04: .word NNS_GfdDefaultFuncAllocTexVram
+_020AEC08: .word NNS_GfdFreeFrmTexVram
+_020AEC0C: .word NNS_GfdDefaultFuncFreeTexVram
+ arm_func_end NNS_GfdInitFrmTexVramManager
- ; NNSi_GfdSetTexNrmSearchArray
- arm_func_start FUN_020AEC10
-FUN_020AEC10: ; 0x020AEC10
+ arm_func_start NNSi_GfdSetTexNrmSearchArray
+NNSi_GfdSetTexNrmSearchArray: ; 0x020AEC10
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
ldr lr, [sp, #0x18]
- ldr r6, _020AEC58 ; =UNK_021064E4
+ ldr r6, _020AEC58 ; =vramRegions_
mov r12, #0x18
mla r7, r0, r12, r6
- ldr r0, _020AEC5C ; =UNK_021064D0
+ ldr r0, _020AEC5C ; =texNrmSearchArray_
mla r5, r1, r12, r6
mla r4, r2, r12, r6
mla r2, r3, r12, r6
@@ -338,7 +311,6 @@ FUN_020AEC10: ; 0x020AEC10
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
.balign 4
-_020AEC58: .word UNK_021064E4
-_020AEC5C: .word UNK_021064D0
- arm_func_end FUN_020AEC10
-
+_020AEC58: .word vramRegions_
+_020AEC5C: .word texNrmSearchArray_
+ arm_func_end NNSi_GfdSetTexNrmSearchArray
diff --git a/arm9/asm/NNS_GFD_gfd_linkedlistp.s b/arm9/asm/NNS_GFD_gfd_linkedlistp.s
index 4ef85974..dd1af2f9 100644
--- a/arm9/asm/NNS_GFD_gfd_linkedlistp.s
+++ b/arm9/asm/NNS_GFD_gfd_linkedlistp.s
@@ -3,47 +3,38 @@
.section .bss
- ; mgr_
- .global UNK_021CCD88
-UNK_021CCD88: ; 0x021CCD88
- .space 0x4
-
- ; mgr_ + 0x4
- .global UNK_021CCD8C
-UNK_021CCD8C: ; 0x021CCD8C
- .space 0x10
+mgr_: ; 0x021CCD88
+ .space 0x14
.section .text
- ; NNS_GfdResetLnkPlttVramState
- arm_func_start FUN_020AFA30
-FUN_020AFA30: ; 0x020AFA30
+ arm_func_start NNS_GfdResetLnkPlttVramState
+NNS_GfdResetLnkPlttVramState: ; 0x020AFA30
stmdb sp!, {lr}
sub sp, sp, #0x4
- ldr r0, _020AFA78 ; =UNK_021CCD88
+ ldr r0, _020AFA78 ; =mgr_
ldr r1, [r0, #0x10]
ldr r0, [r0, #0xc]
mov r1, r1, lsr #0x4
- bl FUN_020AF64C
- ldr r1, _020AFA78 ; =UNK_021CCD88
+ bl NNSi_GfdInitLnkVramBlockPool
+ ldr r1, _020AFA78 ; =mgr_
str r0, [r1, #0x4]
mov r0, r1
- bl FUN_020AF698
- ldr r0, _020AFA78 ; =UNK_021CCD88
- ldr r1, _020AFA7C ; =UNK_021CCD8C
+ bl NNSi_GfdInitLnkVramMan
+ ldr r0, _020AFA78 ; =mgr_
+ ldr r1, _020AFA7C ; =mgr_ + 0x4
ldr r3, [r0, #0x8]
mov r2, #0x0
- bl FUN_020AF5E0
+ bl NNSi_GfdAddNewFreeBlock
add sp, sp, #0x4
ldmia sp!, {pc}
.balign 4
-_020AFA78: .word UNK_021CCD88
-_020AFA7C: .word UNK_021CCD8C
- arm_func_end FUN_020AFA30
+_020AFA78: .word mgr_
+_020AFA7C: .word mgr_ + 0x4
+ arm_func_end NNS_GfdResetLnkPlttVramState
- ; NNS_GfdFreeLnkPlttVram
- arm_func_start FUN_020AFA80
-FUN_020AFA80: ; 0x020AFA80
+ arm_func_start NNS_GfdFreeLnkPlttVram
+NNS_GfdFreeLnkPlttVram: ; 0x020AFA80
stmdb sp!, {lr}
sub sp, sp, #0x4
mov r1, #0x10000
@@ -52,11 +43,11 @@ FUN_020AFA80: ; 0x020AFA80
and r2, r0, r2
and r12, r0, r1
mov r3, r2, lsr #0x10
- ldr r0, _020AFACC ; =UNK_021CCD88
- ldr r1, _020AFAD0 ; =UNK_021CCD8C
+ ldr r0, _020AFACC ; =mgr_
+ ldr r1, _020AFAD0 ; =mgr_ + 0x4
mov r2, r12, lsl #0x3
mov r3, r3, lsl #0x3
- bl FUN_020AF334
+ bl NNSi_GfdFreeLnkVram
cmp r0, #0x0
moveq r0, #0x1
movne r0, #0x0
@@ -64,13 +55,12 @@ FUN_020AFA80: ; 0x020AFA80
ldmia sp!, {pc}
.balign 4
_020AFAC8: .word 0x0000FFFF
-_020AFACC: .word UNK_021CCD88
-_020AFAD0: .word UNK_021CCD8C
- arm_func_end FUN_020AFA80
+_020AFACC: .word mgr_
+_020AFAD0: .word mgr_ + 0x4
+ arm_func_end NNS_GfdFreeLnkPlttVram
- ; NNS_GfdAllocLnkPlttVram
- arm_func_start FUN_020AFAD4
-FUN_020AFAD4: ; 0x020AFAD4
+ arm_func_start NNS_GfdAllocLnkPlttVram
+NNS_GfdAllocLnkPlttVram: ; 0x020AFAD4
stmdb sp!, {r4,lr}
sub sp, sp, #0x8
cmp r0, #0x0
@@ -85,31 +75,31 @@ FUN_020AFAD4: ; 0x020AFAD4
cmp r1, #0x0
beq _020AFB50
mov r12, #0x8
- ldr r0, _020AFB9C ; =UNK_021CCD88
- ldr r1, _020AFBA0 ; =UNK_021CCD8C
+ ldr r0, _020AFB9C ; =mgr_
+ ldr r1, _020AFBA0 ; =mgr_ + 0x4
add r2, sp, #0x4
mov r3, r4
str r12, [sp, #0x0]
- bl FUN_020AF488
+ bl NNSi_GfdAllocLnkVramAligned
ldr r2, [sp, #0x4]
add r1, r2, r4
cmp r1, #0x10000
bls _020AFB6C
- ldr r0, _020AFB9C ; =UNK_021CCD88
- ldr r1, _020AFBA0 ; =UNK_021CCD8C
+ ldr r0, _020AFB9C ; =mgr_
+ ldr r1, _020AFBA0 ; =mgr_ + 0x4
mov r3, r4
- bl FUN_020AF334
+ bl NNSi_GfdFreeLnkVram
add sp, sp, #0x8
mov r0, #0x0
ldmia sp!, {r4,pc}
_020AFB50:
- ldr r0, _020AFB9C ; =UNK_021CCD88
+ ldr r0, _020AFB9C ; =mgr_
mov r12, #0x10
- ldr r1, _020AFBA0 ; =UNK_021CCD8C
+ ldr r1, _020AFBA0 ; =mgr_ + 0x4
add r2, sp, #0x4
mov r3, r4
str r12, [sp, #0x0]
- bl FUN_020AF488
+ bl NNSi_GfdAllocLnkVramAligned
_020AFB6C:
cmp r0, #0x0
addeq sp, sp, #0x8
@@ -124,42 +114,39 @@ _020AFB6C:
ldmia sp!, {r4,pc}
.balign 4
_020AFB98: .word 0x0007FFF8
-_020AFB9C: .word UNK_021CCD88
-_020AFBA0: .word UNK_021CCD8C
+_020AFB9C: .word mgr_
+_020AFBA0: .word mgr_ + 0x4
_020AFBA4: .word 0x0000FFFF
- arm_func_end FUN_020AFAD4
+ arm_func_end NNS_GfdAllocLnkPlttVram
- ; NNS_GfdInitLnkPlttVramManager
- arm_func_start FUN_020AFBA8
-FUN_020AFBA8: ; 0x020AFBA8
+ arm_func_start NNS_GfdInitLnkPlttVramManager
+NNS_GfdInitLnkPlttVramManager: ; 0x020AFBA8
stmdb sp!, {r4,lr}
- ldr ip, _020AFBE8 ; =UNK_021CCD88
+ ldr ip, _020AFBE8 ; =mgr_
mov r4, r3
str r0, [r12, #0x8]
str r1, [r12, #0xc]
str r2, [r12, #0x10]
- bl FUN_020AFA30
+ bl NNS_GfdResetLnkPlttVramState
cmp r4, #0x0
ldmeqia sp!, {r4,pc}
- ldr r3, _020AFBEC ; =FUN_020AFAD4
- ldr r1, _020AFBF0 ; =UNK_021064C0
- ldr r2, _020AFBF4 ; =FUN_020AFA80
- ldr r0, _020AFBF8 ; =UNK_021064C4
+ ldr r3, _020AFBEC ; =NNS_GfdAllocLnkPlttVram
+ ldr r1, _020AFBF0 ; =NNS_GfdDefaultFuncAllocPlttVram
+ ldr r2, _020AFBF4 ; =NNS_GfdFreeLnkPlttVram
+ ldr r0, _020AFBF8 ; =NNS_GfdDefaultFuncFreePlttVram
str r3, [r1, #0x0]
str r2, [r0, #0x0]
ldmia sp!, {r4,pc}
.balign 4
-_020AFBE8: .word UNK_021CCD88
-_020AFBEC: .word FUN_020AFAD4
-_020AFBF0: .word UNK_021064C0
-_020AFBF4: .word FUN_020AFA80
-_020AFBF8: .word UNK_021064C4
- arm_func_end FUN_020AFBA8
+_020AFBE8: .word mgr_
+_020AFBEC: .word NNS_GfdAllocLnkPlttVram
+_020AFBF0: .word NNS_GfdDefaultFuncAllocPlttVram
+_020AFBF4: .word NNS_GfdFreeLnkPlttVram
+_020AFBF8: .word NNS_GfdDefaultFuncFreePlttVram
+ arm_func_end NNS_GfdInitLnkPlttVramManager
- ; _end
- arm_func_start FUN_020AFBFC
-FUN_020AFBFC: ; 0x020AFBFC
+ arm_func_start NNS_GfdGetLnkPlttVramManagerWorkSize
+NNS_GfdGetLnkPlttVramManagerWorkSize: ; 0x020AFBFC
mov r0, r0, lsl #0x4
bx lr
- arm_func_end FUN_020AFBFC
-
+ arm_func_end NNS_GfdGetLnkPlttVramManagerWorkSize
diff --git a/arm9/asm/NNS_GFD_gfd_linkedlistt.s b/arm9/asm/NNS_GFD_gfd_linkedlistt.s
index 1c611a0e..6522bf3b 100644
--- a/arm9/asm/NNS_GFD_gfd_linkedlistt.s
+++ b/arm9/asm/NNS_GFD_gfd_linkedlistt.s
@@ -3,45 +3,31 @@
.section .rodata
- ; @7929
- .global UNK_020FF864
-UNK_020FF864: ; 0x020FF864
+ .global __LOCAL_LABEL__$7929
+__LOCAL_LABEL__$7929: ; 0x020FF864
.byte 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.section .bss
- ; mgr_
- .global UNK_021CCD6C
-UNK_021CCD6C: ; 0x021CCD6C
- .space 0x4
-
- ; mgr_ + 0x4
- .global UNK_021CCD70
-UNK_021CCD70: ; 0x021CCD70
- .space 0x4
-
- ; mgr_ + 0x8
- .global UNK_021CCD74
-UNK_021CCD74: ; 0x021CCD74
- .space 0x14
+mgr_: ; 0x021CCD6C
+ .space 0x1C
.section .text
- ; NNS_GfdResetLnkTexVramState
- arm_func_start FUN_020AF6A4
-FUN_020AF6A4: ; 0x020AF6A4
+ arm_func_start NNS_GfdResetLnkTexVramState
+NNS_GfdResetLnkTexVramState: ; 0x020AF6A4
stmdb sp!, {r4-r6,lr}
sub sp, sp, #0x30
- ldr r6, _020AF884 ; =UNK_020FF864
+ ldr r6, _020AF884 ; =__LOCAL_LABEL__$7929
add r5, sp, #0x0
ldmia r6!, {r0-r3}
mov r12, r5
stmia r5!, {r0-r3}
ldmia r6!, {r0-r3}
stmia r5!, {r0-r3}
- ldr r4, _020AF888 ; =UNK_021CCD6C
+ ldr r4, _020AF888 ; =mgr_
ldmia r6, {r0-r3}
stmia r5, {r0-r3}
ldr lr, [r4, #0x10]
@@ -100,78 +86,77 @@ _020AF790:
cmp r3, #0x4
add r5, r5, #0xc
blo _020AF758
- ldr r0, _020AF888 ; =UNK_021CCD6C
- bl FUN_020AF698
- ldr r0, _020AF88C ; =UNK_021CCD70
- bl FUN_020AF698
- ldr r0, _020AF888 ; =UNK_021CCD6C
+ ldr r0, _020AF888 ; =mgr_
+ bl NNSi_GfdInitLnkVramMan
+ ldr r0, _020AF88C ; =mgr_ + 0x4
+ bl NNSi_GfdInitLnkVramMan
+ ldr r0, _020AF888 ; =mgr_
ldr r1, [r0, #0x18]
ldr r0, [r0, #0x14]
mov r1, r1, lsr #0x4
- bl FUN_020AF64C
+ bl NNSi_GfdInitLnkVramBlockPool
ldr r3, [sp, #0x8]
- ldr r1, _020AF888 ; =UNK_021CCD6C
+ ldr r1, _020AF888 ; =mgr_
cmp r3, #0x0
str r0, [r1, #0x8]
beq _020AF7E8
- ldr r0, _020AF88C ; =UNK_021CCD70
- ldr r1, _020AF890 ; =UNK_021CCD74
+ ldr r0, _020AF88C ; =mgr_ + 0x4
+ ldr r1, _020AF890 ; =mgr_ + 0x8
mov r2, #0x0
- bl FUN_020AF5E0
+ bl NNSi_GfdAddNewFreeBlock
_020AF7E8:
ldr r3, [sp, #0x4]
ldr r2, [sp, #0x8]
cmp r3, #0x0
beq _020AF804
- ldr r0, _020AF888 ; =UNK_021CCD6C
- ldr r1, _020AF890 ; =UNK_021CCD74
- bl FUN_020AF5E0
+ ldr r0, _020AF888 ; =mgr_
+ ldr r1, _020AF890 ; =mgr_ + 0x8
+ bl NNSi_GfdAddNewFreeBlock
_020AF804:
ldr r3, [sp, #0x20]
cmp r3, #0x0
beq _020AF820
- ldr r0, _020AF88C ; =UNK_021CCD70
- ldr r1, _020AF890 ; =UNK_021CCD74
+ ldr r0, _020AF88C ; =mgr_ + 0x4
+ ldr r1, _020AF890 ; =mgr_ + 0x8
mov r2, #0x40000
- bl FUN_020AF5E0
+ bl NNSi_GfdAddNewFreeBlock
_020AF820:
ldr r3, [sp, #0x1c]
ldr r0, [sp, #0x20]
cmp r3, #0x0
add r2, r0, #0x40000
beq _020AF840
- ldr r0, _020AF888 ; =UNK_021CCD6C
- ldr r1, _020AF890 ; =UNK_021CCD74
- bl FUN_020AF5E0
+ ldr r0, _020AF888 ; =mgr_
+ ldr r1, _020AF890 ; =mgr_ + 0x8
+ bl NNSi_GfdAddNewFreeBlock
_020AF840:
ldr r3, [sp, #0x28]
cmp r3, #0x0
beq _020AF85C
- ldr r0, _020AF888 ; =UNK_021CCD6C
- ldr r1, _020AF890 ; =UNK_021CCD74
+ ldr r0, _020AF888 ; =mgr_
+ ldr r1, _020AF890 ; =mgr_ + 0x8
mov r2, #0x60000
- bl FUN_020AF5E0
+ bl NNSi_GfdAddNewFreeBlock
_020AF85C:
ldr r3, [sp, #0x10]
cmp r3, #0x0
addeq sp, sp, #0x30
ldmeqia sp!, {r4-r6,pc}
- ldr r0, _020AF888 ; =UNK_021CCD6C
- ldr r1, _020AF890 ; =UNK_021CCD74
+ ldr r0, _020AF888 ; =mgr_
+ ldr r1, _020AF890 ; =mgr_ + 0x8
add r2, r4, #0x20000
- bl FUN_020AF5E0
+ bl NNSi_GfdAddNewFreeBlock
add sp, sp, #0x30
ldmia sp!, {r4-r6,pc}
.balign 4
-_020AF884: .word UNK_020FF864
-_020AF888: .word UNK_021CCD6C
-_020AF88C: .word UNK_021CCD70
-_020AF890: .word UNK_021CCD74
- arm_func_end FUN_020AF6A4
+_020AF884: .word __LOCAL_LABEL__$7929
+_020AF888: .word mgr_
+_020AF88C: .word mgr_ + 0x4
+_020AF890: .word mgr_ + 0x8
+ arm_func_end NNS_GfdResetLnkTexVramState
- ; NNS_GfdFreeLnkTexVram
- arm_func_start FUN_020AF894
-FUN_020AF894: ; 0x020AF894
+ arm_func_start NNS_GfdFreeLnkTexVram
+NNS_GfdFreeLnkTexVram: ; 0x020AF894
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr r2, _020AF908 ; =0x7FFF0000
@@ -186,14 +171,14 @@ FUN_020AF894: ; 0x020AF894
beq _020AF8FC
cmp r0, #0x0
beq _020AF8DC
- ldr r0, _020AF910 ; =UNK_021CCD70
- ldr r1, _020AF914 ; =UNK_021CCD74
- bl FUN_020AF334
+ ldr r0, _020AF910 ; =mgr_ + 0x4
+ ldr r1, _020AF914 ; =mgr_ + 0x8
+ bl NNSi_GfdFreeLnkVram
b _020AF8E8
_020AF8DC:
- ldr r0, _020AF918 ; =UNK_021CCD6C
- ldr r1, _020AF914 ; =UNK_021CCD74
- bl FUN_020AF334
+ ldr r0, _020AF918 ; =mgr_
+ ldr r1, _020AF914 ; =mgr_ + 0x8
+ bl NNSi_GfdFreeLnkVram
_020AF8E8:
cmp r0, #0x0
movne r0, #0x0
@@ -207,14 +192,13 @@ _020AF8FC:
.balign 4
_020AF908: .word 0x7FFF0000
_020AF90C: .word 0x0000FFFF
-_020AF910: .word UNK_021CCD70
-_020AF914: .word UNK_021CCD74
-_020AF918: .word UNK_021CCD6C
- arm_func_end FUN_020AF894
+_020AF910: .word mgr_ + 0x4
+_020AF914: .word mgr_ + 0x8
+_020AF918: .word mgr_
+ arm_func_end NNS_GfdFreeLnkTexVram
- ; NNS_GfdAllocLnkTexVram
- arm_func_start FUN_020AF91C
-FUN_020AF91C: ; 0x020AF91C
+ arm_func_start NNS_GfdAllocLnkTexVram
+NNS_GfdAllocLnkTexVram: ; 0x020AF91C
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
cmp r0, #0x0
@@ -229,18 +213,18 @@ FUN_020AF91C: ; 0x020AF91C
ldmcsia sp!, {r4-r5,pc}
cmp r4, #0x0
beq _020AF96C
- ldr r0, _020AF9B4 ; =UNK_021CCD70
- ldr r1, _020AF9B8 ; =UNK_021CCD74
+ ldr r0, _020AF9B4 ; =mgr_ + 0x4
+ ldr r1, _020AF9B8 ; =mgr_ + 0x8
add r2, sp, #0x0
mov r3, r5
- bl FUN_020AF5C4
+ bl NNSi_GfdAllocLnkVram
b _020AF980
_020AF96C:
- ldr r0, _020AF9BC ; =UNK_021CCD6C
- ldr r1, _020AF9B8 ; =UNK_021CCD74
+ ldr r0, _020AF9BC ; =mgr_
+ ldr r1, _020AF9B8 ; =mgr_ + 0x8
add r2, sp, #0x0
mov r3, r5
- bl FUN_020AF5C4
+ bl NNSi_GfdAllocLnkVram
_020AF980:
cmp r0, #0x0
addeq sp, sp, #0x4
@@ -256,47 +240,44 @@ _020AF980:
ldmia sp!, {r4-r5,pc}
.balign 4
_020AF9B0: .word 0x0007FFF0
-_020AF9B4: .word UNK_021CCD70
-_020AF9B8: .word UNK_021CCD74
-_020AF9BC: .word UNK_021CCD6C
+_020AF9B4: .word mgr_ + 0x4
+_020AF9B8: .word mgr_ + 0x8
+_020AF9BC: .word mgr_
_020AF9C0: .word 0x0000FFFF
- arm_func_end FUN_020AF91C
+ arm_func_end NNS_GfdAllocLnkTexVram
- ; NNS_GfdInitLnkTexVramManager
- arm_func_start FUN_020AF9C4
-FUN_020AF9C4: ; 0x020AF9C4
+ arm_func_start NNS_GfdInitLnkTexVramManager
+NNS_GfdInitLnkTexVramManager: ; 0x020AF9C4
stmdb sp!, {lr}
sub sp, sp, #0x4
- ldr ip, _020AFA14 ; =UNK_021CCD6C
+ ldr ip, _020AFA14 ; =mgr_
str r0, [r12, #0xc]
str r1, [r12, #0x10]
str r2, [r12, #0x14]
str r3, [r12, #0x18]
- bl FUN_020AF6A4
+ bl NNS_GfdResetLnkTexVramState
ldr r0, [sp, #0x8]
cmp r0, #0x0
addeq sp, sp, #0x4
ldmeqia sp!, {pc}
- ldr r3, _020AFA18 ; =FUN_020AF91C
- ldr r1, _020AFA1C ; =UNK_021064B8
- ldr r2, _020AFA20 ; =FUN_020AF894
- ldr r0, _020AFA24 ; =UNK_021064BC
+ ldr r3, _020AFA18 ; =NNS_GfdAllocLnkTexVram
+ ldr r1, _020AFA1C ; =NNS_GfdDefaultFuncAllocTexVram
+ ldr r2, _020AFA20 ; =NNS_GfdFreeLnkTexVram
+ ldr r0, _020AFA24 ; =NNS_GfdDefaultFuncFreeTexVram
str r3, [r1, #0x0]
str r2, [r0, #0x0]
add sp, sp, #0x4
ldmia sp!, {pc}
.balign 4
-_020AFA14: .word UNK_021CCD6C
-_020AFA18: .word FUN_020AF91C
-_020AFA1C: .word UNK_021064B8
-_020AFA20: .word FUN_020AF894
-_020AFA24: .word UNK_021064BC
- arm_func_end FUN_020AF9C4
+_020AFA14: .word mgr_
+_020AFA18: .word NNS_GfdAllocLnkTexVram
+_020AFA1C: .word NNS_GfdDefaultFuncAllocTexVram
+_020AFA20: .word NNS_GfdFreeLnkTexVram
+_020AFA24: .word NNS_GfdDefaultFuncFreeTexVram
+ arm_func_end NNS_GfdInitLnkTexVramManager
- ; _end
- arm_func_start FUN_020AFA28
-FUN_020AFA28: ; 0x020AFA28
+ arm_func_start NNS_GfdGetLnkTexVramManagerWorkSize
+NNS_GfdGetLnkTexVramManagerWorkSize: ; 0x020AFA28
mov r0, r0, lsl #0x4
bx lr
- arm_func_end FUN_020AFA28
-
+ arm_func_end NNS_GfdGetLnkTexVramManagerWorkSize
diff --git a/arm9/asm/NNS_GFD_gfd_plttvramman.s b/arm9/asm/NNS_GFD_gfd_plttvramman.s
index d1a9c3cc..c869a9a1 100644
--- a/arm9/asm/NNS_GFD_gfd_plttvramman.s
+++ b/arm9/asm/NNS_GFD_gfd_plttvramman.s
@@ -3,29 +3,24 @@
.section .data
- ; NNS_GfdDefaultFuncAllocPlttVram
- .global UNK_021064C0
-UNK_021064C0: ; 0x021064C0
- .word FUN_020AE8C4
+ .global NNS_GfdDefaultFuncAllocPlttVram
+NNS_GfdDefaultFuncAllocPlttVram: ; 0x021064C0
+ .word AllocPlttVram_
- ; NNS_GfdDefaultFuncFreePlttVram
- .global UNK_021064C4
-UNK_021064C4: ; 0x021064C4
- .word FUN_020AE8BC
+ .global NNS_GfdDefaultFuncFreePlttVram
+NNS_GfdDefaultFuncFreePlttVram: ; 0x021064C4
+ .word FreePlttVram_
.section .text
- ; _end
- arm_func_start FUN_020AE8BC
-FUN_020AE8BC: ; 0x020AE8BC
+ arm_func_start FreePlttVram_
+FreePlttVram_: ; 0x020AE8BC
mvn r0, #0x0
bx lr
- arm_func_end FUN_020AE8BC
+ arm_func_end FreePlttVram_
- ; _end
- arm_func_start FUN_020AE8C4
-FUN_020AE8C4: ; 0x020AE8C4
+ arm_func_start AllocPlttVram_
+AllocPlttVram_: ; 0x020AE8C4
mov r0, #0x0
bx lr
- arm_func_end FUN_020AE8C4
-
+ arm_func_end AllocPlttVram_
diff --git a/arm9/asm/NNS_GFD_gfd_texvramman.s b/arm9/asm/NNS_GFD_gfd_texvramman.s
index e647619d..d2f6c88f 100644
--- a/arm9/asm/NNS_GFD_gfd_texvramman.s
+++ b/arm9/asm/NNS_GFD_gfd_texvramman.s
@@ -3,29 +3,24 @@
.section .data
- ; NNS_GfdDefaultFuncAllocTexVram
- .global UNK_021064B8
-UNK_021064B8: ; 0x021064B8
- .word FUN_020AE8B4
+ .global NNS_GfdDefaultFuncAllocTexVram
+NNS_GfdDefaultFuncAllocTexVram: ; 0x021064B8
+ .word AllocTexVram_
- ; NNS_GfdDefaultFuncFreeTexVram
- .global UNK_021064BC
-UNK_021064BC: ; 0x021064BC
- .word FUN_020AE8AC
+ .global NNS_GfdDefaultFuncFreeTexVram
+NNS_GfdDefaultFuncFreeTexVram: ; 0x021064BC
+ .word FreeTexVram_
.section .text
- ; _end
- arm_func_start FUN_020AE8AC
-FUN_020AE8AC: ; 0x020AE8AC
+ arm_func_start FreeTexVram_
+FreeTexVram_: ; 0x020AE8AC
mvn r0, #0x0
bx lr
- arm_func_end FUN_020AE8AC
+ arm_func_end FreeTexVram_
- ; _end
- arm_func_start FUN_020AE8B4
-FUN_020AE8B4: ; 0x020AE8B4
+ arm_func_start AllocTexVram_
+AllocTexVram_: ; 0x020AE8B4
mov r0, #0x0
bx lr
- arm_func_end FUN_020AE8B4
-
+ arm_func_end AllocTexVram_
diff --git a/arm9/asm/NNS_GFD_gfd_vramtransfe.s b/arm9/asm/NNS_GFD_gfd_vramtransfe.s
index 86c62841..9e3a8863 100644
--- a/arm9/asm/NNS_GFD_gfd_vramtransfe.s
+++ b/arm9/asm/NNS_GFD_gfd_vramtransfe.s
@@ -3,81 +3,78 @@
.section .rodata
- ; transFunc$7934
- .global UNK_020FF7D4
-UNK_020FF7D4: ; 0x020FF7D4
- .word FUN_020AF2B4
- .word FUN_020AF288
- .word FUN_020AF25C
- .word FUN_020AF230
- .word GX_LoadBG0Char_2
- .word GX_LoadBG1Char_2
- .word GX_LoadBG2Char_2
- .word GX_LoadBG3Char_2
- .word GX_LoadBG0Scr_2
- .word GX_LoadBG1Scr_2
- .word GX_LoadBG2Scr_2
- .word GX_LoadBG3Scr_2
- .word GX_LoadBG2Scr_3
- .word GX_LoadBG3Scr_3
- .word GX_LoadOBJPltt_2
- .word GX_LoadBGPltt_2
- .word FUN_020AF174
- .word FUN_020AF148
- .word GX_LoadOAM_2
- .word GX_LoadOBJ_2
- .word GXS_LoadBG0Char_2
- .word GXS_LoadBG1Char_2
- .word GXS_LoadBG2Char_2
- .word GXS_LoadBG3Char_2
- .word GXS_LoadBG0Scr_2
- .word GXS_LoadBG1Scr_2
- .word GXS_LoadBG2Scr_2
- .word GXS_LoadBG3Scr_2
- .word GXS_LoadBG2Scr_3
- .word GXS_LoadBG3Scr_3
- .word GXS_LoadOBJPltt_2
- .word GXS_LoadBGPltt_2
- .word FUN_020AF074
- .word FUN_020AF048
- .word GXS_LoadOAM_2
- .word GXS_LoadOBJ_2
-
+ .global transFunc$7934
+transFunc$7934: ; 0x020FF7D4
+ .word DoTransfer3dTex
+ .word DoTransfer3dTexPltt
+ .word DoTransfer3dClearImageColor
+ .word DoTransfer3dClearImageDepth
+ .word DoTransfer2dBG0CharMain
+ .word DoTransfer2dBG1CharMain
+ .word DoTransfer2dBG2CharMain
+ .word DoTransfer2dBG3CharMain
+ .word DoTransfer2dBG0ScrMain
+ .word DoTransfer2dBG1ScrMain
+ .word DoTransfer2dBG2ScrMain
+ .word DoTransfer2dBG3ScrMain
+ .word DoTransfer2dBG2BmpMain
+ .word DoTransfer2dBG3BmpMain
+ .word DoTransfer2dObjPlttMain
+ .word DoTransfer2dBGPlttMain
+ .word DoTransfer2dObjExtPlttMain
+ .word DoTransfer2dBGExtPlttMain
+ .word DoTransfer2dObjOamMain
+ .word DoTransfer2dObjCharMain
+ .word DoTransfer2dBG0CharSub
+ .word DoTransfer2dBG1CharSub
+ .word DoTransfer2dBG2CharSub
+ .word DoTransfer2dBG3CharSub
+ .word DoTransfer2dBG0ScrSub
+ .word DoTransfer2dBG1ScrSub
+ .word DoTransfer2dBG2ScrSub
+ .word DoTransfer2dBG3ScrSub
+ .word DoTransfer2dBG2BmpSub
+ .word DoTransfer2dBG3BmpSub
+ .word DoTransfer2dObjPlttSub
+ .word DoTransfer2dBGPlttSub
+ .word DoTransfer2dObjExtPlttSub
+ .word DoTransfer2dBGExtPlttSub
+ .word DoTransfer2dObjOamSub
+ .word DoTransfer2dObjCharSub
; const initializer
+
.section .bss
- ; s_VramTransferManager
- .global UNK_021CCD58
-UNK_021CCD58: ; 0x021CCD58
+ .global s_VramTransferManager
+s_VramTransferManager: ; 0x021CCD58
.space 0x14
.section .text
- ; NNS_GfdRegisterNewVramTransferTask
- arm_func_start FUN_020AEE40
-FUN_020AEE40: ; 0x020AEE40
+ arm_func_start NNS_GfdRegisterNewVramTransferTask
+NNS_GfdRegisterNewVramTransferTask: ; 0x020AEE40
stmdb sp!, {r4-r9,lr}
sub sp, sp, #0x4
- ldr r5, _020AEEB4 ; =UNK_021CCD58
+ ldr r5, _020AEEB4 ; =s_VramTransferManager
mov r9, r0
mov r0, r5
mov r8, r1
mov r7, r2
mov r6, r3
- bl FUN_020AF2F4
+ bl IsVramTransferTaskQueueFull_
cmp r0, #0x0
addne sp, sp, #0x4
movne r0, #0x0
ldmneia sp!, {r4-r9,pc}
mov r0, r5
- bl FUN_020AEF78
+ bl NNSi_GfdGetEndVramTransferTaskQueue
mov r4, r0
str r9, [r4, #0x0]
str r7, [r4, #0x4]
str r8, [r4, #0x8]
mov r0, r5
str r6, [r4, #0xc]
- bl FUN_020AEF98
+ bl NNSi_GfdPushVramTransferTaskQueue
ldr r2, [r5, #0x10]
ldr r1, [r4, #0xc]
mov r0, #0x1
@@ -86,116 +83,109 @@ FUN_020AEE40: ; 0x020AEE40
add sp, sp, #0x4
ldmia sp!, {r4-r9,pc}
.balign 4
-_020AEEB4: .word UNK_021CCD58
- arm_func_end FUN_020AEE40
+_020AEEB4: .word s_VramTransferManager
+ arm_func_end NNS_GfdRegisterNewVramTransferTask
- ; NNS_GfdDoVramTransfer
- arm_func_start FUN_020AEEB8
-FUN_020AEEB8: ; 0x020AEEB8
+ arm_func_start NNS_GfdDoVramTransfer
+NNS_GfdDoVramTransfer: ; 0x020AEEB8
stmdb sp!, {r4-r6,lr}
- ldr r6, _020AEF18 ; =UNK_021CCD58
+ ldr r6, _020AEF18 ; =s_VramTransferManager
mov r0, r6
- bl FUN_020AEF88
+ bl NNSi_GfdGetFrontVramTransferTaskQueue
mov r5, r0
mov r0, r6
- bl FUN_020AEF3C
+ bl NNSi_GfdPopVramTransferTaskQueue
cmp r0, #0x0
ldmeqia sp!, {r4-r6,pc}
add r4, r6, #0x10
_020AEEE0:
mov r0, r5
- bl FUN_020AEFF0
+ bl DoTransfer_
ldr r2, [r4, #0x0]
ldr r1, [r5, #0xc]
mov r0, r6
sub r1, r2, r1
str r1, [r4, #0x0]
- bl FUN_020AEF88
+ bl NNSi_GfdGetFrontVramTransferTaskQueue
mov r5, r0
mov r0, r6
- bl FUN_020AEF3C
+ bl NNSi_GfdPopVramTransferTaskQueue
cmp r0, #0x0
bne _020AEEE0
ldmia sp!, {r4-r6,pc}
.balign 4
-_020AEF18: .word UNK_021CCD58
- arm_func_end FUN_020AEEB8
+_020AEF18: .word s_VramTransferManager
+ arm_func_end NNS_GfdDoVramTransfer
- ; NNS_GfdInitVramTransferManager
- arm_func_start FUN_020AEF1C
-FUN_020AEF1C: ; 0x020AEF1C
- ldr r2, _020AEF34 ; =UNK_021CCD58
- ldr ip, _020AEF38 ; =FUN_020AEFD4
+ arm_func_start NNS_GfdInitVramTransferManager
+NNS_GfdInitVramTransferManager: ; 0x020AEF1C
+ ldr r2, _020AEF34 ; =s_VramTransferManager
+ ldr ip, _020AEF38 ; =ResetTaskQueue_
str r0, [r2, #0x0]
mov r0, r2
str r1, [r2, #0x4]
bx r12
.balign 4
-_020AEF34: .word UNK_021CCD58
-_020AEF38: .word FUN_020AEFD4
- arm_func_end FUN_020AEF1C
+_020AEF34: .word s_VramTransferManager
+_020AEF38: .word ResetTaskQueue_
+ arm_func_end NNS_GfdInitVramTransferManager
- ; _end
- arm_func_start FUN_020AEF3C
-FUN_020AEF3C: ; 0x020AEF3C
+ arm_func_start NNSi_GfdPopVramTransferTaskQueue
+NNSi_GfdPopVramTransferTaskQueue: ; 0x020AEF3C
stmdb sp!, {r4,lr}
mov r4, r0
- bl FUN_020AF2E0
+ bl IsVramTransferTaskQueueEmpty_
cmp r0, #0x0
movne r0, #0x0
ldmneia sp!, {r4,pc}
ldrh r1, [r4, #0x8]
mov r0, r4
- bl FUN_020AF30C
+ bl GetNextIndex_
strh r0, [r4, #0x8]
ldrh r1, [r4, #0xc]
mov r0, #0x1
sub r1, r1, #0x1
strh r1, [r4, #0xc]
ldmia sp!, {r4,pc}
- arm_func_end FUN_020AEF3C
+ arm_func_end NNSi_GfdPopVramTransferTaskQueue
- ; _end
- arm_func_start FUN_020AEF78
-FUN_020AEF78: ; 0x020AEF78
+ arm_func_start NNSi_GfdGetEndVramTransferTaskQueue
+NNSi_GfdGetEndVramTransferTaskQueue: ; 0x020AEF78
ldrh r1, [r0, #0xa]
ldr r0, [r0, #0x0]
add r0, r0, r1, lsl #0x4
bx lr
- arm_func_end FUN_020AEF78
+ arm_func_end NNSi_GfdGetEndVramTransferTaskQueue
- ; _end
- arm_func_start FUN_020AEF88
-FUN_020AEF88: ; 0x020AEF88
+ arm_func_start NNSi_GfdGetFrontVramTransferTaskQueue
+NNSi_GfdGetFrontVramTransferTaskQueue: ; 0x020AEF88
ldrh r1, [r0, #0x8]
ldr r0, [r0, #0x0]
add r0, r0, r1, lsl #0x4
bx lr
- arm_func_end FUN_020AEF88
+ arm_func_end NNSi_GfdGetFrontVramTransferTaskQueue
- ; _end
- arm_func_start FUN_020AEF98
-FUN_020AEF98: ; 0x020AEF98
+ arm_func_start NNSi_GfdPushVramTransferTaskQueue
+NNSi_GfdPushVramTransferTaskQueue: ; 0x020AEF98
stmdb sp!, {r4,lr}
mov r4, r0
- bl FUN_020AF2F4
+ bl IsVramTransferTaskQueueFull_
cmp r0, #0x0
movne r0, #0x0
ldmneia sp!, {r4,pc}
ldrh r1, [r4, #0xa]
mov r0, r4
- bl FUN_020AF30C
+ bl GetNextIndex_
strh r0, [r4, #0xa]
ldrh r1, [r4, #0xc]
mov r0, #0x1
add r1, r1, #0x1
strh r1, [r4, #0xc]
ldmia sp!, {r4,pc}
- arm_func_end FUN_020AEF98
+ arm_func_end NNSi_GfdPushVramTransferTaskQueue
- ; _end
- arm_func_start FUN_020AEFD4
-FUN_020AEFD4: ; 0x020AEFD4
+ arm_func_start ResetTaskQueue_
+ResetTaskQueue_: ; 0x020AEFD4
mov r2, #0x0
strh r2, [r0, #0xa]
ldrh r1, [r0, #0xa]
@@ -203,16 +193,15 @@ FUN_020AEFD4: ; 0x020AEFD4
strh r2, [r0, #0xc]
str r2, [r0, #0x10]
bx lr
- arm_func_end FUN_020AEFD4
+ arm_func_end ResetTaskQueue_
- ; DoTransfer_
- arm_func_start FUN_020AEFF0
-FUN_020AEFF0: ; 0x020AEFF0
+ arm_func_start DoTransfer_
+DoTransfer_: ; 0x020AEFF0
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r0
ldr r3, [r5, #0x0]
- ldr r2, _020AF02C ; =UNK_020FF7D4
+ ldr r2, _020AF02C ; =transFunc$7934
ldr r0, [r5, #0x4]
ldr r1, [r5, #0xc]
ldr r4, [r2, r3, lsl #0x2]
@@ -224,28 +213,25 @@ FUN_020AEFF0: ; 0x020AEFF0
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
.balign 4
-_020AF02C: .word UNK_020FF7D4
- arm_func_end FUN_020AEFF0
-
-GXS_LoadOBJ_2:
+_020AF02C: .word transFunc$7934
+ arm_func_end DoTransfer_
+DoTransfer2dObjCharSub:
ldr ip, _020AF038 ; =GXS_LoadOBJ
bx r12
.balign 4
_020AF038: .word GXS_LoadOBJ
- arm_func_end GXS_LoadOBJ_2
+ arm_func_end DoTransfer2dObjCharSub
- ; DoTransfer2dObjOamSub
- arm_func_start GXS_LoadOAM_2
-GXS_LoadOAM_2: ; 0x020AF03C
+ arm_func_start DoTransfer2dObjOamSub
+DoTransfer2dObjOamSub: ; 0x020AF03C
ldr ip, _020AF044 ; =GXS_LoadOAM
bx r12
.balign 4
_020AF044: .word GXS_LoadOAM
- arm_func_end GXS_LoadOAM_2
+ arm_func_end DoTransfer2dObjOamSub
- ; _end
- arm_func_start FUN_020AF048
-FUN_020AF048: ; 0x020AF048
+ arm_func_start DoTransfer2dBGExtPlttSub
+DoTransfer2dBGExtPlttSub: ; 0x020AF048
stmdb sp!, {r4-r6,lr}
mov r6, r0
mov r5, r1
@@ -257,11 +243,10 @@ FUN_020AF048: ; 0x020AF048
bl GXS_LoadBGExtPltt
bl GXS_EndLoadBGExtPltt
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020AF048
+ arm_func_end DoTransfer2dBGExtPlttSub
- ; _end
- arm_func_start FUN_020AF074
-FUN_020AF074: ; 0x020AF074
+ arm_func_start DoTransfer2dObjExtPlttSub
+DoTransfer2dObjExtPlttSub: ; 0x020AF074
stmdb sp!, {r4-r6,lr}
mov r6, r0
mov r5, r1
@@ -273,137 +258,122 @@ FUN_020AF074: ; 0x020AF074
bl GXS_LoadOBJExtPltt
bl GXS_EndLoadOBJExtPltt
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020AF074
+ arm_func_end DoTransfer2dObjExtPlttSub
- ; DoTransfer2dBGPlttSub
- arm_func_start GXS_LoadBGPltt_2
-GXS_LoadBGPltt_2: ; 0x020AF0A0
+ arm_func_start DoTransfer2dBGPlttSub
+DoTransfer2dBGPlttSub: ; 0x020AF0A0
ldr ip, _020AF0A8 ; =GXS_LoadBGPltt
bx r12
.balign 4
_020AF0A8: .word GXS_LoadBGPltt
- arm_func_end GXS_LoadBGPltt_2
+ arm_func_end DoTransfer2dBGPlttSub
- ; DoTransfer2dObjPlttSub
- arm_func_start GXS_LoadOBJPltt_2
-GXS_LoadOBJPltt_2: ; 0x020AF0AC
+ arm_func_start DoTransfer2dObjPlttSub
+DoTransfer2dObjPlttSub: ; 0x020AF0AC
ldr ip, _020AF0B4 ; =GXS_LoadOBJPltt
bx r12
.balign 4
_020AF0B4: .word GXS_LoadOBJPltt
- arm_func_end GXS_LoadOBJPltt_2
+ arm_func_end DoTransfer2dObjPlttSub
- ; DoTransfer2dBG3BmpSub
- arm_func_start GXS_LoadBG3Scr_3
-GXS_LoadBG3Scr_3: ; 0x020AF0B8
+ arm_func_start DoTransfer2dBG3BmpSub
+DoTransfer2dBG3BmpSub: ; 0x020AF0B8
ldr ip, _020AF0C0 ; =GXS_LoadBG3Scr
bx r12
.balign 4
_020AF0C0: .word GXS_LoadBG3Scr
- arm_func_end GXS_LoadBG3Scr_3
+ arm_func_end DoTransfer2dBG3BmpSub
- ; DoTransfer2dBG2BmpSub
- arm_func_start GXS_LoadBG2Scr_3
-GXS_LoadBG2Scr_3: ; 0x020AF0C4
+ arm_func_start DoTransfer2dBG2BmpSub
+DoTransfer2dBG2BmpSub: ; 0x020AF0C4
ldr ip, _020AF0CC ; =GXS_LoadBG2Scr
bx r12
.balign 4
_020AF0CC: .word GXS_LoadBG2Scr
- arm_func_end GXS_LoadBG2Scr_3
+ arm_func_end DoTransfer2dBG2BmpSub
- ; DoTransfer2dBG3ScrSub
- arm_func_start GXS_LoadBG3Scr_2
-GXS_LoadBG3Scr_2: ; 0x020AF0D0
+ arm_func_start DoTransfer2dBG3ScrSub
+DoTransfer2dBG3ScrSub: ; 0x020AF0D0
ldr ip, _020AF0D8 ; =GXS_LoadBG3Scr
bx r12
.balign 4
_020AF0D8: .word GXS_LoadBG3Scr
- arm_func_end GXS_LoadBG3Scr_2
+ arm_func_end DoTransfer2dBG3ScrSub
- ; DoTransfer2dBG2ScrSub
- arm_func_start GXS_LoadBG2Scr_2
-GXS_LoadBG2Scr_2: ; 0x020AF0DC
+ arm_func_start DoTransfer2dBG2ScrSub
+DoTransfer2dBG2ScrSub: ; 0x020AF0DC
ldr ip, _020AF0E4 ; =GXS_LoadBG2Scr
bx r12
.balign 4
_020AF0E4: .word GXS_LoadBG2Scr
- arm_func_end GXS_LoadBG2Scr_2
+ arm_func_end DoTransfer2dBG2ScrSub
- ; DoTransfer2dBG1ScrSub
- arm_func_start GXS_LoadBG1Scr_2
-GXS_LoadBG1Scr_2: ; 0x020AF0E8
+ arm_func_start DoTransfer2dBG1ScrSub
+DoTransfer2dBG1ScrSub: ; 0x020AF0E8
ldr ip, _020AF0F0 ; =GXS_LoadBG1Scr
bx r12
.balign 4
_020AF0F0: .word GXS_LoadBG1Scr
- arm_func_end GXS_LoadBG1Scr_2
+ arm_func_end DoTransfer2dBG1ScrSub
- ; DoTransfer2dBG0ScrSub
- arm_func_start GXS_LoadBG0Scr_2
-GXS_LoadBG0Scr_2: ; 0x020AF0F4
+ arm_func_start DoTransfer2dBG0ScrSub
+DoTransfer2dBG0ScrSub: ; 0x020AF0F4
ldr ip, _020AF0FC ; =GXS_LoadBG0Scr
bx r12
.balign 4
_020AF0FC: .word GXS_LoadBG0Scr
- arm_func_end GXS_LoadBG0Scr_2
+ arm_func_end DoTransfer2dBG0ScrSub
- ; DoTransfer2dBG3CharSub
- arm_func_start GXS_LoadBG3Char_2
-GXS_LoadBG3Char_2: ; 0x020AF100
+ arm_func_start DoTransfer2dBG3CharSub
+DoTransfer2dBG3CharSub: ; 0x020AF100
ldr ip, _020AF108 ; =GXS_LoadBG3Char
bx r12
.balign 4
_020AF108: .word GXS_LoadBG3Char
- arm_func_end GXS_LoadBG3Char_2
+ arm_func_end DoTransfer2dBG3CharSub
- ; DoTransfer2dBG2CharSub
- arm_func_start GXS_LoadBG2Char_2
-GXS_LoadBG2Char_2: ; 0x020AF10C
+ arm_func_start DoTransfer2dBG2CharSub
+DoTransfer2dBG2CharSub: ; 0x020AF10C
ldr ip, _020AF114 ; =GXS_LoadBG2Char
bx r12
.balign 4
_020AF114: .word GXS_LoadBG2Char
- arm_func_end GXS_LoadBG2Char_2
+ arm_func_end DoTransfer2dBG2CharSub
- ; DoTransfer2dBG1CharSub
- arm_func_start GXS_LoadBG1Char_2
-GXS_LoadBG1Char_2: ; 0x020AF118
+ arm_func_start DoTransfer2dBG1CharSub
+DoTransfer2dBG1CharSub: ; 0x020AF118
ldr ip, _020AF120 ; =GXS_LoadBG1Char
bx r12
.balign 4
_020AF120: .word GXS_LoadBG1Char
- arm_func_end GXS_LoadBG1Char_2
+ arm_func_end DoTransfer2dBG1CharSub
- ; DoTransfer2dBG0CharSub
- arm_func_start GXS_LoadBG0Char_2
-GXS_LoadBG0Char_2: ; 0x020AF124
+ arm_func_start DoTransfer2dBG0CharSub
+DoTransfer2dBG0CharSub: ; 0x020AF124
ldr ip, _020AF12C ; =GXS_LoadBG0Char
bx r12
.balign 4
_020AF12C: .word GXS_LoadBG0Char
- arm_func_end GXS_LoadBG0Char_2
+ arm_func_end DoTransfer2dBG0CharSub
- ; DoTransfer2dObjCharMain
- arm_func_start GX_LoadOBJ_2
-GX_LoadOBJ_2: ; 0x020AF130
+ arm_func_start DoTransfer2dObjCharMain
+DoTransfer2dObjCharMain: ; 0x020AF130
ldr ip, _020AF138 ; =GX_LoadOBJ
bx r12
.balign 4
_020AF138: .word GX_LoadOBJ
- arm_func_end GX_LoadOBJ_2
+ arm_func_end DoTransfer2dObjCharMain
- ; DoTransfer2dObjOamMain
- arm_func_start GX_LoadOAM_2
-GX_LoadOAM_2: ; 0x020AF13C
+ arm_func_start DoTransfer2dObjOamMain
+DoTransfer2dObjOamMain: ; 0x020AF13C
ldr ip, _020AF144 ; =GX_LoadOAM
bx r12
.balign 4
_020AF144: .word GX_LoadOAM
- arm_func_end GX_LoadOAM_2
+ arm_func_end DoTransfer2dObjOamMain
- ; _end
- arm_func_start FUN_020AF148
-FUN_020AF148: ; 0x020AF148
+ arm_func_start DoTransfer2dBGExtPlttMain
+DoTransfer2dBGExtPlttMain: ; 0x020AF148
stmdb sp!, {r4-r6,lr}
mov r6, r0
mov r5, r1
@@ -415,11 +385,10 @@ FUN_020AF148: ; 0x020AF148
bl GX_LoadBGExtPltt
bl GX_EndLoadBGExtPltt
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020AF148
+ arm_func_end DoTransfer2dBGExtPlttMain
- ; _end
- arm_func_start FUN_020AF174
-FUN_020AF174: ; 0x020AF174
+ arm_func_start DoTransfer2dObjExtPlttMain
+DoTransfer2dObjExtPlttMain: ; 0x020AF174
stmdb sp!, {r4-r6,lr}
mov r6, r0
mov r5, r1
@@ -431,119 +400,106 @@ FUN_020AF174: ; 0x020AF174
bl GX_LoadOBJExtPltt
bl GX_EndLoadOBJExtPltt
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020AF174
+ arm_func_end DoTransfer2dObjExtPlttMain
- ; DoTransfer2dBGPlttMain
- arm_func_start GX_LoadBGPltt_2
-GX_LoadBGPltt_2: ; 0x020AF1A0
+ arm_func_start DoTransfer2dBGPlttMain
+DoTransfer2dBGPlttMain: ; 0x020AF1A0
ldr ip, _020AF1A8 ; =GX_LoadBGPltt
bx r12
.balign 4
_020AF1A8: .word GX_LoadBGPltt
- arm_func_end GX_LoadBGPltt_2
+ arm_func_end DoTransfer2dBGPlttMain
- ; DoTransfer2dObjPlttMain
- arm_func_start GX_LoadOBJPltt_2
-GX_LoadOBJPltt_2: ; 0x020AF1AC
+ arm_func_start DoTransfer2dObjPlttMain
+DoTransfer2dObjPlttMain: ; 0x020AF1AC
ldr ip, _020AF1B4 ; =GX_LoadOBJPltt
bx r12
.balign 4
_020AF1B4: .word GX_LoadOBJPltt
- arm_func_end GX_LoadOBJPltt_2
+ arm_func_end DoTransfer2dObjPlttMain
- ; DoTransfer2dBG3BmpMain
- arm_func_start GX_LoadBG3Scr_3
-GX_LoadBG3Scr_3: ; 0x020AF1B8
+ arm_func_start DoTransfer2dBG3BmpMain
+DoTransfer2dBG3BmpMain: ; 0x020AF1B8
ldr ip, _020AF1C0 ; =GX_LoadBG3Scr
bx r12
.balign 4
_020AF1C0: .word GX_LoadBG3Scr
- arm_func_end GX_LoadBG3Scr_3
+ arm_func_end DoTransfer2dBG3BmpMain
- ; DoTransfer2dBG2BmpMain
- arm_func_start GX_LoadBG2Scr_3
-GX_LoadBG2Scr_3: ; 0x020AF1C4
+ arm_func_start DoTransfer2dBG2BmpMain
+DoTransfer2dBG2BmpMain: ; 0x020AF1C4
ldr ip, _020AF1CC ; =GX_LoadBG2Scr
bx r12
.balign 4
_020AF1CC: .word GX_LoadBG2Scr
- arm_func_end GX_LoadBG2Scr_3
+ arm_func_end DoTransfer2dBG2BmpMain
- ; DoTransfer2dBG3ScrMain
- arm_func_start GX_LoadBG3Scr_2
-GX_LoadBG3Scr_2: ; 0x020AF1D0
+ arm_func_start DoTransfer2dBG3ScrMain
+DoTransfer2dBG3ScrMain: ; 0x020AF1D0
ldr ip, _020AF1D8 ; =GX_LoadBG3Scr
bx r12
.balign 4
_020AF1D8: .word GX_LoadBG3Scr
- arm_func_end GX_LoadBG3Scr_2
+ arm_func_end DoTransfer2dBG3ScrMain
- ; DoTransfer2dBG2ScrMain
- arm_func_start GX_LoadBG2Scr_2
-GX_LoadBG2Scr_2: ; 0x020AF1DC
+ arm_func_start DoTransfer2dBG2ScrMain
+DoTransfer2dBG2ScrMain: ; 0x020AF1DC
ldr ip, _020AF1E4 ; =GX_LoadBG2Scr
bx r12
.balign 4
_020AF1E4: .word GX_LoadBG2Scr
- arm_func_end GX_LoadBG2Scr_2
+ arm_func_end DoTransfer2dBG2ScrMain
- ; DoTransfer2dBG1ScrMain
- arm_func_start GX_LoadBG1Scr_2
-GX_LoadBG1Scr_2: ; 0x020AF1E8
+ arm_func_start DoTransfer2dBG1ScrMain
+DoTransfer2dBG1ScrMain: ; 0x020AF1E8
ldr ip, _020AF1F0 ; =GX_LoadBG1Scr
bx r12
.balign 4
_020AF1F0: .word GX_LoadBG1Scr
- arm_func_end GX_LoadBG1Scr_2
+ arm_func_end DoTransfer2dBG1ScrMain
- ; DoTransfer2dBG0ScrMain
- arm_func_start GX_LoadBG0Scr_2
-GX_LoadBG0Scr_2: ; 0x020AF1F4
+ arm_func_start DoTransfer2dBG0ScrMain
+DoTransfer2dBG0ScrMain: ; 0x020AF1F4
ldr ip, _020AF1FC ; =GX_LoadBG0Scr
bx r12
.balign 4
_020AF1FC: .word GX_LoadBG0Scr
- arm_func_end GX_LoadBG0Scr_2
+ arm_func_end DoTransfer2dBG0ScrMain
- ; DoTransfer2dBG3CharMain
- arm_func_start GX_LoadBG3Char_2
-GX_LoadBG3Char_2: ; 0x020AF200
+ arm_func_start DoTransfer2dBG3CharMain
+DoTransfer2dBG3CharMain: ; 0x020AF200
ldr ip, _020AF208 ; =GX_LoadBG3Char
bx r12
.balign 4
_020AF208: .word GX_LoadBG3Char
- arm_func_end GX_LoadBG3Char_2
+ arm_func_end DoTransfer2dBG3CharMain
- ; DoTransfer2dBG2CharMain
- arm_func_start GX_LoadBG2Char_2
-GX_LoadBG2Char_2: ; 0x020AF20C
+ arm_func_start DoTransfer2dBG2CharMain
+DoTransfer2dBG2CharMain: ; 0x020AF20C
ldr ip, _020AF214 ; =GX_LoadBG2Char
bx r12
.balign 4
_020AF214: .word GX_LoadBG2Char
- arm_func_end GX_LoadBG2Char_2
+ arm_func_end DoTransfer2dBG2CharMain
- ; DoTransfer2dBG1CharMain
- arm_func_start GX_LoadBG1Char_2
-GX_LoadBG1Char_2: ; 0x020AF218
+ arm_func_start DoTransfer2dBG1CharMain
+DoTransfer2dBG1CharMain: ; 0x020AF218
ldr ip, _020AF220 ; =GX_LoadBG1Char
bx r12
.balign 4
_020AF220: .word GX_LoadBG1Char
- arm_func_end GX_LoadBG1Char_2
+ arm_func_end DoTransfer2dBG1CharMain
- ; DoTransfer2dBG0CharMain
- arm_func_start GX_LoadBG0Char_2
-GX_LoadBG0Char_2: ; 0x020AF224
+ arm_func_start DoTransfer2dBG0CharMain
+DoTransfer2dBG0CharMain: ; 0x020AF224
ldr ip, _020AF22C ; =GX_LoadBG0Char
bx r12
.balign 4
_020AF22C: .word GX_LoadBG0Char
- arm_func_end GX_LoadBG0Char_2
+ arm_func_end DoTransfer2dBG0CharMain
- ; _end
- arm_func_start FUN_020AF230
-FUN_020AF230: ; 0x020AF230
+ arm_func_start DoTransfer3dClearImageDepth
+DoTransfer3dClearImageDepth: ; 0x020AF230
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r0
@@ -555,11 +511,10 @@ FUN_020AF230: ; 0x020AF230
bl GX_EndLoadClearImage
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
- arm_func_end FUN_020AF230
+ arm_func_end DoTransfer3dClearImageDepth
- ; _end
- arm_func_start FUN_020AF25C
-FUN_020AF25C: ; 0x020AF25C
+ arm_func_start DoTransfer3dClearImageColor
+DoTransfer3dClearImageColor: ; 0x020AF25C
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r0
@@ -571,11 +526,10 @@ FUN_020AF25C: ; 0x020AF25C
bl GX_EndLoadClearImage
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
- arm_func_end FUN_020AF25C
+ arm_func_end DoTransfer3dClearImageColor
- ; _end
- arm_func_start FUN_020AF288
-FUN_020AF288: ; 0x020AF288
+ arm_func_start DoTransfer3dTexPltt
+DoTransfer3dTexPltt: ; 0x020AF288
stmdb sp!, {r4-r6,lr}
mov r6, r0
mov r5, r1
@@ -587,11 +541,10 @@ FUN_020AF288: ; 0x020AF288
bl GX_LoadTexPltt
bl GX_EndLoadTexPltt
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020AF288
+ arm_func_end DoTransfer3dTexPltt
- ; _end
- arm_func_start FUN_020AF2B4
-FUN_020AF2B4: ; 0x020AF2B4
+ arm_func_start DoTransfer3dTex
+DoTransfer3dTex: ; 0x020AF2B4
stmdb sp!, {r4-r6,lr}
mov r6, r0
mov r5, r1
@@ -603,32 +556,29 @@ FUN_020AF2B4: ; 0x020AF2B4
bl GX_LoadTex
bl GX_EndLoadTex
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020AF2B4
+ arm_func_end DoTransfer3dTex
- ; _end
- arm_func_start FUN_020AF2E0
-FUN_020AF2E0: ; 0x020AF2E0
+ arm_func_start IsVramTransferTaskQueueEmpty_
+IsVramTransferTaskQueueEmpty_: ; 0x020AF2E0
ldrh r0, [r0, #0xc]
cmp r0, #0x0
moveq r0, #0x1
movne r0, #0x0
bx lr
- arm_func_end FUN_020AF2E0
+ arm_func_end IsVramTransferTaskQueueEmpty_
- ; _end
- arm_func_start FUN_020AF2F4
-FUN_020AF2F4: ; 0x020AF2F4
+ arm_func_start IsVramTransferTaskQueueFull_
+IsVramTransferTaskQueueFull_: ; 0x020AF2F4
ldrh r1, [r0, #0xc]
ldr r0, [r0, #0x4]
cmp r1, r0
moveq r0, #0x1
movne r0, #0x0
bx lr
- arm_func_end FUN_020AF2F4
+ arm_func_end IsVramTransferTaskQueueFull_
- ; _end
- arm_func_start FUN_020AF30C
-FUN_020AF30C: ; 0x020AF30C
+ arm_func_start GetNextIndex_
+GetNextIndex_: ; 0x020AF30C
stmdb sp!, {lr}
sub sp, sp, #0x4
mov r2, r0
@@ -639,5 +589,4 @@ FUN_020AF30C: ; 0x020AF30C
mov r0, r0, lsr #0x10
add sp, sp, #0x4
ldmia sp!, {pc}
- arm_func_end FUN_020AF30C
-
+ arm_func_end GetNextIndex_
diff --git a/arm9/asm/NNS_GFD_gfdi_linkedlist.s b/arm9/asm/NNS_GFD_gfdi_linkedlist.s
index 793cbf04..125a146e 100644
--- a/arm9/asm/NNS_GFD_gfdi_linkedlist.s
+++ b/arm9/asm/NNS_GFD_gfdi_linkedlist.s
@@ -3,9 +3,8 @@
.section .text
- ; _end
- arm_func_start FUN_020AF334
-FUN_020AF334: ; 0x020AF334
+ arm_func_start NNSi_GfdFreeLnkVram
+NNSi_GfdFreeLnkVram: ; 0x020AF334
stmdb sp!, {r4-r6,lr}
sub sp, sp, #0x10
add r3, r2, r3
@@ -95,11 +94,10 @@ _020AF418:
mov r0, #0x1
add sp, sp, #0x10
ldmia sp!, {r4-r6,pc}
- arm_func_end FUN_020AF334
+ arm_func_end NNSi_GfdFreeLnkVram
- ; _end
- arm_func_start FUN_020AF488
-FUN_020AF488: ; 0x020AF488
+ arm_func_start NNSi_GfdAllocLnkVramAligned
+NNSi_GfdAllocLnkVramAligned: ; 0x020AF488
stmdb sp!, {r4-r10,lr}
ldr r4, [r0, #0x0]
ldr r9, [sp, #0x20]
@@ -185,23 +183,21 @@ _020AF5B8:
mov r0, #0x0
str r0, [r2, #0x0]
ldmia sp!, {r4-r10,pc}
- arm_func_end FUN_020AF488
+ arm_func_end NNSi_GfdAllocLnkVramAligned
- ; _end
- arm_func_start FUN_020AF5C4
-FUN_020AF5C4: ; 0x020AF5C4
+ arm_func_start NNSi_GfdAllocLnkVram
+NNSi_GfdAllocLnkVram: ; 0x020AF5C4
stmdb sp!, {lr}
sub sp, sp, #0x4
mov r12, #0x0
str r12, [sp, #0x0]
- bl FUN_020AF488
+ bl NNSi_GfdAllocLnkVramAligned
add sp, sp, #0x4
ldmia sp!, {pc}
- arm_func_end FUN_020AF5C4
+ arm_func_end NNSi_GfdAllocLnkVram
- ; _end
- arm_func_start FUN_020AF5E0
-FUN_020AF5E0: ; 0x020AF5E0
+ arm_func_start NNSi_GfdAddNewFreeBlock
+NNSi_GfdAddNewFreeBlock: ; 0x020AF5E0
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr lr, [r1, #0x0]
@@ -230,11 +226,10 @@ _020AF640:
mov r0, #0x0
add sp, sp, #0x4
ldmia sp!, {pc}
- arm_func_end FUN_020AF5E0
+ arm_func_end NNSi_GfdAddNewFreeBlock
- ; _end
- arm_func_start FUN_020AF64C
-FUN_020AF64C: ; 0x020AF64C
+ arm_func_start NNSi_GfdInitLnkVramBlockPool
+NNSi_GfdInitLnkVramBlockPool: ; 0x020AF64C
stmdb sp!, {r4,lr}
subs lr, r1, #0x1
mov r2, #0x0
@@ -256,13 +251,11 @@ _020AF684:
add r1, r0, r1, lsl #0x4
str r2, [r1, #-0x4]
ldmia sp!, {r4,pc}
- arm_func_end FUN_020AF64C
+ arm_func_end NNSi_GfdInitLnkVramBlockPool
- ; _end
- arm_func_start FUN_020AF698
-FUN_020AF698: ; 0x020AF698
+ arm_func_start NNSi_GfdInitLnkVramMan
+NNSi_GfdInitLnkVramMan: ; 0x020AF698
mov r1, #0x0
str r1, [r0, #0x0]
bx lr
- arm_func_end FUN_020AF698
-
+ arm_func_end NNSi_GfdInitLnkVramMan
diff --git a/arm9/asm/NNS_SND_capture.s b/arm9/asm/NNS_SND_capture.s
index a30a85f1..a4e04212 100644
--- a/arm9/asm/NNS_SND_capture.s
+++ b/arm9/asm/NNS_SND_capture.s
@@ -3,42 +3,36 @@
.section .bss
- ; sIsThreadCreated
- .global UNK_021D27A4
-UNK_021D27A4: ; 0x021D27A4
+ .global sIsThreadCreated
+sIsThreadCreated: ; 0x021D27A4
.space 0x4
- ; sCurEffectInfo
- .global UNK_021D27A8
-UNK_021D27A8: ; 0x021D27A8
+ .global sCurEffectInfo
+sCurEffectInfo: ; 0x021D27A8
.space 0x4
- ; sMesgQ
- .global UNK_021D27AC
-UNK_021D27AC: ; 0x021D27AC
+ .global sMesgQ
+sMesgQ: ; 0x021D27AC
.space 0x20
- ; sCapParam
- .global UNK_021D27CC
-UNK_021D27CC: ; 0x021D27CC
+ .global sCapParam
+sCapParam: ; 0x021D27CC
.space 0x54
- ; sEffectInfoBuffer
- .global UNK_021D2820
-UNK_021D2820: ; 0x021D2820
+ .global sEffectInfoBuffer
+sEffectInfoBuffer: ; 0x021D2820
.space 0xa0
.section .text
- ; AlarmCallback
- arm_func_start FUN_020C177C
-FUN_020C177C: ; 0x020C177C
+ local_arm_func_start AlarmCallback
+AlarmCallback: ; 0x020C177C
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r7, r0
ldr r4, [r7, #0x18]
ldr r0, [r7, #0x1c]
- ldr r1, _020C186C ; =UNK_021D27A4
+ ldr r1, _020C186C ; =sIsThreadCreated
mul r0, r4, r0
ldr r3, [r7, #0xc]
ldr r2, [r7, #0x10]
@@ -47,21 +41,21 @@ FUN_020C177C: ; 0x020C177C
cmp r1, #0x0
add r5, r2, r0
beq _020C180C
- ldr r2, _020C1870 ; =UNK_021D27A8
+ ldr r2, _020C1870 ; =sCurEffectInfo
mov r1, #0x14
ldr r2, [r2, #0x0]
- ldr r3, _020C1874 ; =UNK_021D2820
+ ldr r3, _020C1874 ; =sEffectInfoBuffer
mul r1, r2, r1
str r7, [r3, r1]
add r1, r3, r1
str r4, [r1, #0x4]
str r0, [r1, #0x8]
str r6, [r1, #0xc]
- ldr r0, _020C1878 ; =UNK_021D27AC
+ ldr r0, _020C1878 ; =sMesgQ
mov r2, #0x0
str r5, [r1, #0x10]
bl OS_SendMessage
- ldr r0, _020C1870 ; =UNK_021D27A8
+ ldr r0, _020C1870 ; =sCurEffectInfo
ldr r1, [r0, #0x0]
add r1, r1, #0x1
str r1, [r0, #0x0]
@@ -96,16 +90,15 @@ _020C1844:
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
.balign 4
-_020C186C: .word UNK_021D27A4
-_020C1870: .word UNK_021D27A8
-_020C1874: .word UNK_021D2820
-_020C1878: .word UNK_021D27AC
+_020C186C: .word sIsThreadCreated
+_020C1870: .word sCurEffectInfo
+_020C1874: .word sEffectInfoBuffer
+_020C1878: .word sMesgQ
- ; NNSi_SndCaptureEndSleep
- arm_func_start FUN_020C187C
-FUN_020C187C: ; 0x020C187C
+ arm_func_start NNSi_SndCaptureEndSleep
+NNSi_SndCaptureEndSleep: ; 0x020C187C
stmdb sp!, {r4,lr}
- ldr r4, _020C18F4 ; =UNK_021D27CC
+ ldr r4, _020C18F4 ; =sCapParam
ldr r0, [r4, #0x0]
cmp r0, #0x0
ldmeqia sp!, {r4,pc}
@@ -135,13 +128,12 @@ FUN_020C187C: ; 0x020C187C
bl SND_StartTimer
ldmia sp!, {r4,pc}
.balign 4
-_020C18F4: .word UNK_021D27CC
+_020C18F4: .word sCapParam
- ; NNSi_SndCaptureBeginSleep
- arm_func_start FUN_020C18F8
-FUN_020C18F8: ; 0x020C18F8
+ arm_func_start NNSi_SndCaptureBeginSleep
+NNSi_SndCaptureBeginSleep: ; 0x020C18F8
stmdb sp!, {r4,lr}
- ldr r3, _020C194C ; =UNK_021D27CC
+ ldr r3, _020C194C ; =sCapParam
ldr r0, [r3, #0x0]
cmp r0, #0x0
ldmeqia sp!, {r4,pc}
@@ -162,14 +154,13 @@ FUN_020C18F8: ; 0x020C18F8
bl SND_WaitForCommandProc
ldmia sp!, {r4,pc}
.balign 4
-_020C194C: .word UNK_021D27CC
+_020C194C: .word sCapParam
- ; NNSi_SndCaptureStop
- arm_func_start FUN_020C1950
-FUN_020C1950: ; 0x020C1950
+ arm_func_start NNSi_SndCaptureStop
+NNSi_SndCaptureStop: ; 0x020C1950
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
- ldr r4, _020C1A3C ; =UNK_021D27CC
+ ldr r4, _020C1A3C ; =sCapParam
ldr r0, [r4, #0x0]
cmp r0, #0x0
addeq sp, sp, #0x4
@@ -194,7 +185,7 @@ FUN_020C1950: ; 0x020C1950
bl SND_FlushCommand
mov r0, r5
bl SND_WaitForCommandProc
- ldr r6, _020C1A40 ; =UNK_021D27AC
+ ldr r6, _020C1A40 ; =sMesgQ
mov r5, #0x0
_020C19C4:
mov r0, r6
@@ -207,17 +198,17 @@ _020C19DC:
ldr r0, [r4, #0x28]
cmp r0, #0x0
beq _020C19EC
- bl FUN_020C0300
+ bl NNS_SndUnlockCapture
_020C19EC:
ldr r0, [r4, #0x20]
cmp r0, #0x0
beq _020C19FC
- bl FUN_020C0340
+ bl NNS_SndUnlockChannel
_020C19FC:
cmp r7, #0x0
beq _020C1A0C
ldr r0, [r4, #0x2c]
- bl FUN_020C029C
+ bl NNS_SndFreeAlarm
_020C1A0C:
ldr r0, [r4, #0x4]
cmp r0, #0x1
@@ -233,12 +224,11 @@ _020C1A2C:
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
.balign 4
-_020C1A3C: .word UNK_021D27CC
-_020C1A40: .word UNK_021D27AC
+_020C1A3C: .word sCapParam
+_020C1A40: .word sMesgQ
- ; NNSi_SndCaptureStart
- arm_func_start FUN_020C1A44
-FUN_020C1A44: ; 0x020C1A44
+ arm_func_start NNSi_SndCaptureStart
+NNSi_SndCaptureStart: ; 0x020C1A44
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x3c
mov r10, r3
@@ -252,7 +242,7 @@ FUN_020C1A44: ; 0x020C1A44
ldr r8, [sp, #0x74]
str r2, [sp, #0x2c]
mvn r6, #0x0
- ldr r4, _020C1D90 ; =UNK_021D27CC
+ ldr r4, _020C1D90 ; =sCapParam
bl DC_FlushRange
ldr r0, [sp, #0x20]
mov r1, r10
@@ -304,36 +294,36 @@ _020C1B00:
ldr r0, [sp, #0x84]
cmp r0, #0x0
beq _020C1B58
- bl FUN_020C02BC
+ bl NNS_SndAllocAlarm
movs r6, r0
addmi sp, sp, #0x3c
movmi r0, #0x0
ldmmiia sp!, {r4-r11,pc}
_020C1B58:
mov r0, #0x3
- bl FUN_020C031C
+ bl NNS_SndLockCapture
cmp r0, #0x0
bne _020C1B84
cmp r6, #0x0
blt _020C1B78
mov r0, r6
- bl FUN_020C029C
+ bl NNS_SndFreeAlarm
_020C1B78:
add sp, sp, #0x3c
mov r0, #0x0
ldmia sp!, {r4-r11,pc}
_020C1B84:
mov r0, #0xa
- bl FUN_020C0370
+ bl NNS_SndLockChannel
cmp r0, #0x0
bne _020C1BB8
cmp r6, #0x0
blt _020C1BA4
mov r0, r6
- bl FUN_020C029C
+ bl NNS_SndFreeAlarm
_020C1BA4:
mov r0, #0x3
- bl FUN_020C0300
+ bl NNS_SndUnlockCapture
add sp, sp, #0x3c
mov r0, #0x0
ldmia sp!, {r4-r11,pc}
@@ -392,7 +382,7 @@ _020C1BB8:
cmp r6, #0x0
blt _020C1CA8
ldr r2, [sp, #0x30]
- ldr r3, _020C1D98 ; =FUN_020C177C
+ ldr r3, _020C1D98 ; =AlarmCallback
mov r1, r2
mov r0, r6
add r1, r1, r5
@@ -448,27 +438,26 @@ _020C1CC8:
str r0, [r4, #0x38]
add r0, r4, #0x3c
str r8, [r4, #0x50]
- bl FUN_020C3E6C
+ bl NNSi_SndFaderInit
add r0, r4, #0x3c
mov r1, r8, lsl #0x8
mov r2, #0x1
- bl FUN_020C3E40
+ bl NNSi_SndFaderSet
mov r0, #0x0
str r0, [r4, #0x4c]
mov r0, #0x1
add sp, sp, #0x3c
ldmia sp!, {r4-r11,pc}
.balign 4
-_020C1D90: .word UNK_021D27CC
+_020C1D90: .word sCapParam
_020C1D94: .word 0x00FFB0FF
-_020C1D98: .word FUN_020C177C
+_020C1D98: .word AlarmCallback
- ; NNSi_SndCaptureMain
- arm_func_start FUN_020C1D9C
-FUN_020C1D9C: ; 0x020C1D9C
+ arm_func_start NNSi_SndCaptureMain
+NNSi_SndCaptureMain: ; 0x020C1D9C
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
- ldr r5, _020C1E34 ; =UNK_021D27CC
+ ldr r5, _020C1E34 ; =sCapParam
ldr r0, [r5, #0x0]
cmp r0, #0x0
addeq sp, sp, #0x4
@@ -479,20 +468,20 @@ FUN_020C1D9C: ; 0x020C1D9C
ldmneia sp!, {r4-r5,pc}
add r4, r5, #0x3c
mov r0, r4
- bl FUN_020C3DF4
+ bl NNSi_SndFaderUpdate
ldr r0, [r5, #0x4c]
cmp r0, #0x0
beq _020C1DFC
mov r0, r4
- bl FUN_020C3DDC
+ bl NNSi_SndFaderIsFinished
cmp r0, #0x0
beq _020C1DFC
- bl FUN_020C1950
+ bl NNSi_SndCaptureStop
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
_020C1DFC:
mov r0, r4
- bl FUN_020C3E0C
+ bl NNSi_SndFaderGet
ldr r1, [r5, #0x50]
mov r4, r0, asr #0x8
cmp r4, r1
@@ -506,36 +495,33 @@ _020C1DFC:
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
.balign 4
-_020C1E34: .word UNK_021D27CC
+_020C1E34: .word sCapParam
- ; NNSi_SndCaptureInit
- arm_func_start FUN_020C1E38
-FUN_020C1E38: ; 0x020C1E38
- ldr r1, _020C1E50 ; =UNK_021D27A4
+ arm_func_start NNSi_SndCaptureInit
+NNSi_SndCaptureInit: ; 0x020C1E38
+ ldr r1, _020C1E50 ; =sIsThreadCreated
mov r2, #0x0
- ldr r0, _020C1E54 ; =UNK_021D27CC
+ ldr r0, _020C1E54 ; =sCapParam
str r2, [r1, #0x0]
str r2, [r0, #0x0]
bx lr
.balign 4
-_020C1E50: .word UNK_021D27A4
-_020C1E54: .word UNK_021D27CC
+_020C1E50: .word sIsThreadCreated
+_020C1E54: .word sCapParam
- ; NNS_SndCaptureIsActive
- arm_func_start FUN_020C1E58
-FUN_020C1E58: ; 0x020C1E58
- ldr r0, _020C1E64 ; =UNK_021D27CC
+ arm_func_start NNS_SndCaptureIsActive
+NNS_SndCaptureIsActive: ; 0x020C1E58
+ ldr r0, _020C1E64 ; =sCapParam
ldr r0, [r0, #0x0]
bx lr
.balign 4
-_020C1E64: .word UNK_021D27CC
+_020C1E64: .word sCapParam
- ; NNS_SndCaptureStopEffect
- arm_func_start FUN_020C1E68
-FUN_020C1E68: ; 0x020C1E68
+ arm_func_start NNS_SndCaptureStopEffect
+NNS_SndCaptureStopEffect: ; 0x020C1E68
stmdb sp!, {lr}
sub sp, sp, #0x4
- ldr r0, _020C1EA0 ; =UNK_021D27CC
+ ldr r0, _020C1EA0 ; =sCapParam
ldr r1, [r0, #0x0]
cmp r1, #0x0
addeq sp, sp, #0x4
@@ -544,23 +530,22 @@ FUN_020C1E68: ; 0x020C1E68
cmp r0, #0x1
addne sp, sp, #0x4
ldmneia sp!, {pc}
- bl FUN_020C1950
+ bl NNSi_SndCaptureStop
add sp, sp, #0x4
ldmia sp!, {pc}
.balign 4
-_020C1EA0: .word UNK_021D27CC
+_020C1EA0: .word sCapParam
- ; NNS_SndCaptureStartEffect
- arm_func_start FUN_020C1EA4
-FUN_020C1EA4: ; 0x020C1EA4
+ arm_func_start NNS_SndCaptureStartEffect
+NNS_SndCaptureStartEffect: ; 0x020C1EA4
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x2c
mov r5, r0
mov r4, r1
mov r7, r2
mov r6, r3
- bl FUN_020C1E68
- ldr r0, _020C1F50 ; =UNK_021D27CC
+ bl NNS_SndCaptureStopEffect
+ ldr r0, _020C1F50 ; =sCapParam
ldr r0, [r0, #0x0]
cmp r0, #0x0
addne sp, sp, #0x2c
@@ -593,17 +578,16 @@ FUN_020C1EA4: ; 0x020C1EA4
mov r3, r4, lsr #0x1
add r2, r5, r4, lsr #0x1
str r12, [sp, #0x28]
- bl FUN_020C1A44
+ bl NNSi_SndCaptureStart
add sp, sp, #0x2c
ldmia sp!, {r4-r7,pc}
.balign 4
-_020C1F50: .word UNK_021D27CC
+_020C1F50: .word sCapParam
- ; NNS_SndCaptureStopReverb
- arm_func_start FUN_020C1F54
-FUN_020C1F54: ; 0x020C1F54
+ arm_func_start NNS_SndCaptureStopReverb
+NNS_SndCaptureStopReverb: ; 0x020C1F54
stmdb sp!, {r4,lr}
- ldr r4, _020C1FA0 ; =UNK_021D27CC
+ ldr r4, _020C1FA0 ; =sCapParam
mov r2, r0
ldr r0, [r4, #0x0]
cmp r0, #0x0
@@ -613,24 +597,23 @@ FUN_020C1F54: ; 0x020C1F54
ldmneia sp!, {r4,pc}
cmp r2, #0x0
bne _020C1F88
- bl FUN_020C1950
+ bl NNSi_SndCaptureStop
ldmia sp!, {r4,pc}
_020C1F88:
add r0, r4, #0x3c
mov r1, #0x0
- bl FUN_020C3E40
+ bl NNSi_SndFaderSet
mov r0, #0x1
str r0, [r4, #0x4c]
ldmia sp!, {r4,pc}
.balign 4
-_020C1FA0: .word UNK_021D27CC
+_020C1FA0: .word sCapParam
- ; NNS_SndCaptureSetReverbVolume
- arm_func_start FUN_020C1FA4
-FUN_020C1FA4: ; 0x020C1FA4
+ arm_func_start NNS_SndCaptureSetReverbVolume
+NNS_SndCaptureSetReverbVolume: ; 0x020C1FA4
stmdb sp!, {lr}
sub sp, sp, #0x4
- ldr r3, _020C1FEC ; =UNK_021D27CC
+ ldr r3, _020C1FEC ; =sCapParam
mov r12, r0
ldr r0, [r3, #0x0]
mov r2, r1
@@ -643,15 +626,14 @@ FUN_020C1FA4: ; 0x020C1FA4
ldmneia sp!, {pc}
add r0, r3, #0x3c
mov r1, r12, lsl #0x8
- bl FUN_020C3E40
+ bl NNSi_SndFaderSet
add sp, sp, #0x4
ldmia sp!, {pc}
.balign 4
-_020C1FEC: .word UNK_021D27CC
+_020C1FEC: .word sCapParam
- ; NNS_SndCaptureStartReverb
- arm_func_start FUN_020C1FF0
-FUN_020C1FF0: ; 0x020C1FF0
+ arm_func_start NNS_SndCaptureStartReverb
+NNS_SndCaptureStartReverb: ; 0x020C1FF0
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x2c
mov r5, r0
@@ -659,8 +641,8 @@ FUN_020C1FF0: ; 0x020C1FF0
mov r4, r1
mov r7, r2
mov r6, r3
- bl FUN_020C1F54
- ldr r0, _020C2098 ; =UNK_021D27CC
+ bl NNS_SndCaptureStopReverb
+ ldr r0, _020C2098 ; =sCapParam
ldr r0, [r0, #0x0]
cmp r0, #0x0
addne sp, sp, #0x2c
@@ -691,9 +673,8 @@ FUN_020C1FF0: ; 0x020C1FF0
mov r3, r4, lsr #0x1
add r2, r5, r4, lsr #0x1
str r0, [sp, #0x28]
- bl FUN_020C1A44
+ bl NNSi_SndCaptureStart
add sp, sp, #0x2c
ldmia sp!, {r4-r7,pc}
.balign 4
-_020C2098: .word UNK_021D27CC
-
+_020C2098: .word sCapParam
diff --git a/arm9/asm/NNS_SND_fader.s b/arm9/asm/NNS_SND_fader.s
index b36093a2..938456a9 100644
--- a/arm9/asm/NNS_SND_fader.s
+++ b/arm9/asm/NNS_SND_fader.s
@@ -3,9 +3,8 @@
.section .text
- ; _end
- arm_func_start FUN_020C3DDC
-FUN_020C3DDC: ; 0x020C3DDC
+ arm_func_start NNSi_SndFaderIsFinished
+NNSi_SndFaderIsFinished: ; 0x020C3DDC
ldr r1, [r0, #0x8]
ldr r0, [r0, #0xc]
cmp r1, r0
@@ -13,9 +12,8 @@ FUN_020C3DDC: ; 0x020C3DDC
movlt r0, #0x0
bx lr
- ; _end
- arm_func_start FUN_020C3DF4
-FUN_020C3DF4: ; 0x020C3DF4
+ arm_func_start NNSi_SndFaderUpdate
+NNSi_SndFaderUpdate: ; 0x020C3DF4
ldr r2, [r0, #0x8]
ldr r1, [r0, #0xc]
cmp r2, r1
@@ -23,9 +21,8 @@ FUN_020C3DF4: ; 0x020C3DF4
strlt r1, [r0, #0x8]
bx lr
- ; _end
- arm_func_start FUN_020C3E0C
-FUN_020C3E0C: ; 0x020C3E0C
+ arm_func_start NNSi_SndFaderGet
+NNSi_SndFaderGet: ; 0x020C3E0C
stmdb sp!, {r4,lr}
ldr r1, [r0, #0xc]
ldr r2, [r0, #0x8]
@@ -40,14 +37,13 @@ FUN_020C3E0C: ; 0x020C3E0C
add r0, r4, r0
ldmia sp!, {r4,pc}
- ; _end
- arm_func_start FUN_020C3E40
-FUN_020C3E40: ; 0x020C3E40
+ arm_func_start NNSi_SndFaderSet
+NNSi_SndFaderSet: ; 0x020C3E40
stmdb sp!, {r4-r6,lr}
mov r6, r0
mov r5, r1
mov r4, r2
- bl FUN_020C3E0C
+ bl NNSi_SndFaderGet
str r0, [r6, #0x0]
str r5, [r6, #0x4]
str r4, [r6, #0xc]
@@ -55,9 +51,8 @@ FUN_020C3E40: ; 0x020C3E40
str r0, [r6, #0x8]
ldmia sp!, {r4-r6,pc}
- ; _end
- arm_func_start FUN_020C3E6C
-FUN_020C3E6C: ; 0x020C3E6C
+ arm_func_start NNSi_SndFaderInit
+NNSi_SndFaderInit: ; 0x020C3E6C
mov r2, #0x0
str r2, [r0, #0x4]
ldr r1, [r0, #0x4]
diff --git a/arm9/asm/NNS_SND_heap.s b/arm9/asm/NNS_SND_heap.s
index 5d2efe32..554c6bab 100644
--- a/arm9/asm/NNS_SND_heap.s
+++ b/arm9/asm/NNS_SND_heap.s
@@ -3,9 +3,8 @@
.section .text
- ; _end
- arm_func_start FUN_020C2774
-FUN_020C2774: ; 0x020C2774
+ arm_func_start EraseSync
+EraseSync: ; 0x020C2774
stmdb sp!, {r4,lr}
bl SND_GetCurrentCommandTag
mov r4, r0
@@ -15,59 +14,55 @@ FUN_020C2774: ; 0x020C2774
bl SND_WaitForCommandProc
ldmia sp!, {r4,pc}
- ; _end
- arm_func_start FUN_020C2794
-FUN_020C2794: ; 0x020C2794
+ arm_func_start NewSection
+NewSection: ; 0x020C2794
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r0
ldr r0, [r5, #0x0]
mov r1, #0x14
mov r2, #0x4
- bl FUN_020AE638
+ bl NNS_FndAllocFromFrmHeapEx
movs r4, r0
addeq sp, sp, #0x4
moveq r0, #0x0
ldmeqia sp!, {r4-r5,pc}
- bl FUN_020C2818
+ bl InitHeapSection
mov r1, r4
add r0, r5, #0x4
- bl FUN_020ADBE8
+ bl NNS_FndAppendListObject
mov r0, #0x1
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
- ; _end
- arm_func_start FUN_020C27DC
-FUN_020C27DC: ; 0x020C27DC
+ arm_func_start InitHeap
+InitHeap: ; 0x020C27DC
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r0
mov r4, r1
add r0, r5, #0x4
mov r1, #0xc
- bl FUN_020ADC74
+ bl NNS_FndInitList
mov r0, r5
str r4, [r5, #0x0]
- bl FUN_020C2794
+ bl NewSection
cmp r0, #0x0
movne r0, #0x1
moveq r0, #0x0
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
- ; InitHeapSection
- arm_func_start FUN_020C2818
-FUN_020C2818: ; 0x020C2818
- ldr ip, _020C2824 ; =FUN_020ADC74
+ arm_func_start InitHeapSection
+InitHeapSection: ; 0x020C2818
+ ldr ip, _020C2824 ; =NNS_FndInitList
mov r1, #0x0
bx r12
.balign 4
-_020C2824: .word FUN_020ADC74
+_020C2824: .word NNS_FndInitList
- ; _end
- arm_func_start FUN_020C2828
-FUN_020C2828: ; 0x020C2828
+ arm_func_start NNS_SndHeapLoadState
+NNS_SndHeapLoadState: ; 0x020C2828
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x4
mov r7, #0x0
@@ -75,7 +70,7 @@ FUN_020C2828: ; 0x020C2828
mov r10, r0
mov r6, r7
bne _020C2850
- bl FUN_020C29C0
+ bl NNS_SndHeapClear
add sp, sp, #0x4
ldmia sp!, {r4-r11,pc}
_020C2850:
@@ -88,10 +83,10 @@ _020C2850:
_020C2868:
mov r0, r5
mov r1, r11
- bl FUN_020ADA84
+ bl NNS_FndGetPrevListObject
mov r1, r7
mov r8, r0
- bl FUN_020ADA84
+ bl NNS_FndGetPrevListObject
movs r7, r0
beq _020C28C0
_020C2888:
@@ -107,58 +102,56 @@ _020C2888:
_020C28AC:
mov r0, r8
mov r1, r7
- bl FUN_020ADA84
+ bl NNS_FndGetPrevListObject
movs r7, r0
bne _020C2888
_020C28C0:
mov r0, r5
mov r1, r8
- bl FUN_020ADAB0
+ bl NNS_FndRemoveListObject
ldrh r0, [r10, #0xc]
cmp r9, r0
blt _020C2868
_020C28D8:
ldr r0, [r10, #0x0]
mov r1, r9
- bl FUN_020AE554
+ bl NNS_FndFreeByStateToFrmHeap
cmp r6, #0x0
beq _020C28F0
- bl FUN_020C2774
+ bl EraseSync
_020C28F0:
ldrh r1, [r10, #0xc]
ldr r0, [r10, #0x0]
- bl FUN_020AE5B0
+ bl NNS_FndRecordStateForFrmHeap
mov r0, r10
- bl FUN_020C2794
+ bl NewSection
add sp, sp, #0x4
ldmia sp!, {r4-r11,pc}
- ; _end
- arm_func_start FUN_020C290C
-FUN_020C290C: ; 0x020C290C
+ arm_func_start NNS_SndHeapSaveState
+NNS_SndHeapSaveState: ; 0x020C290C
stmdb sp!, {r4,lr}
mov r4, r0
ldrh r1, [r4, #0xc]
ldr r0, [r4, #0x0]
- bl FUN_020AE5B0
+ bl NNS_FndRecordStateForFrmHeap
cmp r0, #0x0
mvneq r0, #0x0
ldmeqia sp!, {r4,pc}
mov r0, r4
- bl FUN_020C2794
+ bl NewSection
cmp r0, #0x0
ldrneh r0, [r4, #0xc]
subne r0, r0, #0x1
ldmneia sp!, {r4,pc}
ldr r0, [r4, #0x0]
mov r1, #0x0
- bl FUN_020AE554
+ bl NNS_FndFreeByStateToFrmHeap
mvn r0, #0x0
ldmia sp!, {r4,pc}
- ; _end
- arm_func_start SDATi_AllocAndInitChunk
-SDATi_AllocAndInitChunk: ; 0x020C2958
+ arm_func_start NNS_SndHeapAlloc
+NNS_SndHeapAlloc: ; 0x020C2958
stmdb sp!, {r4-r8,lr}
mov r7, r1
mov r8, r0
@@ -169,32 +162,31 @@ SDATi_AllocAndInitChunk: ; 0x020C2958
add r1, r1, #0x20
mov r2, #0x20
mov r5, r3
- bl FUN_020AE638 // some allocator?
+ bl NNS_FndAllocFromFrmHeapEx // some allocator?
movs r4, r0
moveq r0, #0x0
ldmeqia sp!, {r4-r8,pc}
add r0, r8, #0x4
mov r1, #0x0
- bl FUN_020ADA84
+ bl NNS_FndGetPrevListObject
str r7, [r4, #0x8]
str r6, [r4, #0xc]
ldr r2, [sp, #0x18]
str r5, [r4, #0x10]
mov r1, r4
str r2, [r4, #0x14]
- bl FUN_020ADBE8
+ bl NNS_FndAppendListObject
add r0, r4, #0x20
ldmia sp!, {r4-r8,pc}
- ; _end
- arm_func_start FUN_020C29C0
-FUN_020C29C0: ; 0x020C29C0
+ arm_func_start NNS_SndHeapClear
+NNS_SndHeapClear: ; 0x020C29C0
stmdb sp!, {r4-r10,lr}
mov r8, r0
mov r5, #0x0
mov r1, r5
add r0, r8, #0x4
- bl FUN_020ADA84
+ bl NNS_FndGetPrevListObject
movs r7, r0
beq _020C2A58
add r9, r8, #0x4
@@ -203,7 +195,7 @@ FUN_020C29C0: ; 0x020C29C0
_020C29EC:
mov r0, r7
mov r1, r4
- bl FUN_020ADA84
+ bl NNS_FndGetPrevListObject
movs r6, r0
beq _020C2A38
_020C2A00:
@@ -219,43 +211,41 @@ _020C2A00:
_020C2A24:
mov r0, r7
mov r1, r6
- bl FUN_020ADA84
+ bl NNS_FndGetPrevListObject
movs r6, r0
bne _020C2A00
_020C2A38:
mov r0, r9
mov r1, r7
- bl FUN_020ADAB0
+ bl NNS_FndRemoveListObject
mov r0, r9
mov r1, r4
- bl FUN_020ADA84
+ bl NNS_FndGetPrevListObject
movs r7, r0
bne _020C29EC
_020C2A58:
ldr r0, [r8, #0x0]
mov r1, #0x3
- bl FUN_020AE600
+ bl NNS_FndFreeToFrmHeap
cmp r5, #0x0
beq _020C2A70
- bl FUN_020C2774
+ bl EraseSync
_020C2A70:
mov r0, r8
- bl FUN_020C2794
+ bl NewSection
ldmia sp!, {r4-r10,pc}
- ; _end
- arm_func_start FUN_020C2A7C
-FUN_020C2A7C: ; 0x020C2A7C
+ arm_func_start NNS_SndHeapDestroy
+NNS_SndHeapDestroy: ; 0x020C2A7C
stmdb sp!, {r4,lr}
mov r4, r0
- bl FUN_020C29C0
+ bl NNS_SndHeapClear
ldr r0, [r4, #0x0]
- bl thunk_FUN_020adc8c_2
+ bl NNS_FndDestroyFrmHeap
ldmia sp!, {r4,pc}
- ; _end
- arm_func_start FUN_020C2A94
-FUN_020C2A94: ; 0x020C2A94
+ arm_func_start NNS_SndHeapCreate
+NNS_SndHeapCreate: ; 0x020C2A94
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
add r2, r0, #0x3
@@ -273,21 +263,20 @@ FUN_020C2A94: ; 0x020C2A94
add r0, r5, #0x10
sub r1, r1, #0x10
mov r2, #0x0
- bl FUN_020AE684
+ bl NNS_FndCreateFrmHeapEx
movs r4, r0
addeq sp, sp, #0x4
moveq r0, #0x0
ldmeqia sp!, {r4-r5,pc}
mov r0, r5
mov r1, r4
- bl FUN_020C27DC
+ bl InitHeap
cmp r0, #0x0
addne sp, sp, #0x4
movne r0, r5
ldmneia sp!, {r4-r5,pc}
mov r0, r4
- bl thunk_FUN_020adc8c_2
+ bl NNS_FndDestroyFrmHeap
mov r0, #0x0
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
-
diff --git a/arm9/asm/NNS_SND_main.s b/arm9/asm/NNS_SND_main.s
index 94817a22..4cbe3d65 100644
--- a/arm9/asm/NNS_SND_main.s
+++ b/arm9/asm/NNS_SND_main.s
@@ -3,46 +3,39 @@
.section .bss
- ; sCurDriverInfo
- .global UNK_021D1C8C
-UNK_021D1C8C: ; 0x021D1C8C
+ .global sCurDriverInfo
+sCurDriverInfo: ; 0x021D1C8C
.space 0x4
- ; sDriverInfoFirstFlag
- .global UNK_021D1C90
-UNK_021D1C90: ; 0x021D1C90
+ .global sDriverInfoFirstFlag
+sDriverInfoFirstFlag: ; 0x021D1C90
.space 0x4
- ; initialized$8127
- .global UNK_021D1C94
-UNK_021D1C94: ; 0x021D1C94
+ .global initialized$8127
+initialized$8127: ; 0x021D1C94
.space 0x4
- ; sPreSleepCallback
- .global UNK_021D1C98
-UNK_021D1C98: ; 0x021D1C98
+ .global sPreSleepCallback
+sPreSleepCallback: ; 0x021D1C98
.space 0xc
- ; sPostSleepCallback
- .global UNK_021D1CA4
-UNK_021D1CA4: ; 0x021D1CA4
+ .global sPostSleepCallback
+sPostSleepCallback: ; 0x021D1CA4
.space 0xc
.section .text
- ; EndSleep
- arm_func_start FUN_020C0130
-FUN_020C0130: ; 0x020C0130
- ldr ip, _020C0138 ; =FUN_020C187C
+ local_arm_func_start EndSleep
+EndSleep: ; 0x020C0130
+ ldr ip, _020C0138 ; =NNSi_SndCaptureEndSleep
bx r12
.balign 4
-_020C0138: .word FUN_020C187C
+_020C0138: .word NNSi_SndCaptureEndSleep
- ; _end
- arm_func_start FUN_020C013C
-FUN_020C013C: ; 0x020C013C
+ local_arm_func_start BeginSleep
+BeginSleep: ; 0x020C013C
stmdb sp!, {r4,lr}
- bl FUN_020C18F8
+ bl NNSi_SndCaptureBeginSleep
mov r0, #0x0
mov r1, r0
mov r2, r0
@@ -56,9 +49,8 @@ FUN_020C013C: ; 0x020C013C
bl SND_WaitForCommandProc
ldmia sp!, {r4,pc}
- ; _end
- arm_func_start FUN_020C0174
-FUN_020C0174: ; 0x020C0174
+ arm_func_start NNS_SndSetMonoFlag
+NNS_SndSetMonoFlag: ; 0x020C0174
stmdb sp!, {lr}
sub sp, sp, #0x4
cmp r0, #0x0
@@ -72,9 +64,8 @@ _020C0194:
add sp, sp, #0x4
ldmia sp!, {pc}
- ; _end
- arm_func_start FUN_020C01A0
-FUN_020C01A0: ; 0x020C01A0
+ arm_func_start NNS_SndMain
+NNS_SndMain: ; 0x020C01A0
stmdb sp!, {r4,lr}
mov r4, #0x0
_020C01A8:
@@ -82,19 +73,18 @@ _020C01A8:
bl SND_RecvCommandReply
cmp r0, #0x0
bne _020C01A8
- bl FUN_020C0BA0
- bl FUN_020C1D9C
- bl FUN_020C3C88
+ bl NNSi_SndPlayerMain
+ bl NNSi_SndCaptureMain
+ bl NNSi_SndArcStrmMain
mov r0, #0x0
bl SND_FlushCommand
ldmia sp!, {r4,pc}
- ; NNS_SndInit
- arm_func_start SDAT_Init
-SDAT_Init: ; 0x020C01D0
+ arm_func_start NNS_SndInit
+NNS_SndInit: ; 0x020C01D0
stmdb sp!, {lr}
sub sp, sp, #0x4
- ldr r0, _020C0254 ; =UNK_021D1C94
+ ldr r0, _020C0254 ; =initialized$8127
ldr r1, [r0, #0x0]
cmp r1, #0x0
addne sp, sp, #0x4
@@ -102,35 +92,34 @@ SDAT_Init: ; 0x020C01D0
mov r1, #0x1
str r1, [r0, #0x0]
bl SND_Init
- ldr ip, _020C0258 ; =FUN_020C013C
- ldr r0, _020C025C ; =UNK_021D1C98
+ ldr ip, _020C0258 ; =BeginSleep
+ ldr r0, _020C025C ; =sPreSleepCallback
mov r3, #0x0
- ldr r1, _020C0260 ; =UNK_021D1CA4
- ldr r2, _020C0264 ; =FUN_020C0130
+ ldr r1, _020C0260 ; =sPostSleepCallback
+ ldr r2, _020C0264 ; =EndSleep
str r12, [r0, #0x0]
str r3, [r0, #0x4]
str r2, [r1, #0x0]
str r3, [r1, #0x4]
bl PM_PrependPreSleepCallback
- ldr r0, _020C0260 ; =UNK_021D1CA4
+ ldr r0, _020C0260 ; =sPostSleepCallback
bl PM_AppendPostSleepCallback
- bl FUN_020C0270
- bl FUN_020C1E38
- bl FUN_020C0D20
- ldr r1, _020C0268 ; =UNK_021D1C8C
+ bl NNSi_SndInitResourceMgr
+ bl NNSi_SndCaptureInit
+ bl NNSi_SndPlayerInit
+ ldr r1, _020C0268 ; =sCurDriverInfo
mvn r3, #0x0
- ldr r0, _020C026C ; =UNK_021D1C90
+ ldr r0, _020C026C ; =sDriverInfoFirstFlag
mov r2, #0x1
strb r3, [r1, #0x0]
str r2, [r0, #0x0]
add sp, sp, #0x4
ldmia sp!, {pc}
.balign 4
-_020C0254: .word UNK_021D1C94
-_020C0258: .word FUN_020C013C
-_020C025C: .word UNK_021D1C98
-_020C0260: .word UNK_021D1CA4
-_020C0264: .word FUN_020C0130
-_020C0268: .word UNK_021D1C8C
-_020C026C: .word UNK_021D1C90
-
+_020C0254: .word initialized$8127
+_020C0258: .word BeginSleep
+_020C025C: .word sPreSleepCallback
+_020C0260: .word sPostSleepCallback
+_020C0264: .word EndSleep
+_020C0268: .word sCurDriverInfo
+_020C026C: .word sDriverInfoFirstFlag
diff --git a/arm9/asm/NNS_SND_player.s b/arm9/asm/NNS_SND_player.s
index 557afb1b..caaf345e 100644
--- a/arm9/asm/NNS_SND_player.s
+++ b/arm9/asm/NNS_SND_player.s
@@ -3,51 +3,26 @@
.section .bss
- ; sFreeList
- .global UNK_021D1DFC
-UNK_021D1DFC: ; 0x021D1DFC
+ .global sFreeList
+sFreeList: ; 0x021D1DFC
.space 0xc
- ; sPrioList
- .global UNK_021D1E08
-UNK_021D1E08: ; 0x021D1E08
+ .global sPrioList
+sPrioList: ; 0x021D1E08
.space 0xc
- ; sSeqPlayer
- .global UNK_021D1E14
-UNK_021D1E14: ; 0x021D1E14
+ .global sSeqPlayer
+sSeqPlayer: ; 0x021D1E14
.space 0x440
- ; sPlayer
- .global UNK_021D2254
-UNK_021D2254: ; 0x021D2254
- .space 0x8
-
- ; sPlayer + 0x8
- .global UNK_021D225C
-UNK_021D225C: ; 0x021D225C
- .space 0x10
-
- ; sPlayer + 0x18
- .global UNK_021D226C
-UNK_021D226C: ; 0x021D226C
- .space 0x4
-
- ; sPlayer + 0x1C
- .global UNK_021D2270
-UNK_021D2270: ; 0x021D2270
- .space 0x4
-
- ; sPlayer + 0x20
- .global UNK_021D2274
-UNK_021D2274: ; 0x021D2274
- .space 0x460
+ .global sPlayer
+sPlayer: ; 0x021D2254
+ .space 0x480
.section .text
- ; SetPlayerPriority
- arm_func_start FUN_020C06CC
-FUN_020C06CC: ; 0x020C06CC
+ arm_func_start SetPlayerPriority
+SetPlayerPriority: ; 0x020C06CC
stmdb sp!, {r4-r6,lr}
mov r6, r0
ldr r4, [r6, #0x4]
@@ -56,54 +31,52 @@ FUN_020C06CC: ; 0x020C06CC
beq _020C06F8
mov r0, r4
mov r1, r6
- bl FUN_020ADAB0
+ bl NNS_FndRemoveListObject
mov r0, #0x0
str r0, [r6, #0x4]
_020C06F8:
- ldr r0, _020C0728 ; =UNK_021D1E08
+ ldr r0, _020C0728 ; =sPrioList
mov r1, r6
- bl FUN_020ADAB0
+ bl NNS_FndRemoveListObject
strb r5, [r6, #0x3d]
cmp r4, #0x0
beq _020C071C
mov r0, r4
mov r1, r6
- bl FUN_020C0910
+ bl InsertPlayerList
_020C071C:
mov r0, r6
- bl FUN_020C08B4
+ bl InsertPrioList
ldmia sp!, {r4-r6,pc}
.balign 4
-_020C0728: .word UNK_021D1E08
+_020C0728: .word sPrioList
- ; PlayerHeapDisposeCallback
- arm_func_start FUN_020C072C
-FUN_020C072C: ; 0x020C072C
+ arm_func_start PlayerHeapDisposeCallback
+PlayerHeapDisposeCallback: ; 0x020C072C
stmdb sp!, {r4,lr}
mov r4, r0
ldr r0, [r4, #0x8]
cmp r0, #0x0
ldmeqia sp!, {r4,pc}
- bl FUN_020C2A7C
+ bl NNS_SndHeapDestroy
ldr r1, [r4, #0xc]
cmp r1, #0x0
movne r0, #0x0
strne r0, [r1, #0x8]
ldmneia sp!, {r4,pc}
ldr r1, [r4, #0x10]
- ldr r2, _020C0778 ; =UNK_021D2254
+ ldr r2, _020C0778 ; =sPlayer
mov r0, #0x24
mla r0, r1, r0, r2
mov r1, r4
add r0, r0, #0xc
- bl FUN_020ADAB0
+ bl NNS_FndRemoveListObject
ldmia sp!, {r4,pc}
.balign 4
-_020C0778: .word UNK_021D2254
+_020C0778: .word sPlayer
- ; ShutdownPlayer
- arm_func_start FUN_020C077C
-FUN_020C077C: ; 0x020C077C
+ local_arm_func_start ShutdownPlayer
+ShutdownPlayer: ; 0x020C077C
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r4, r0
@@ -115,71 +88,69 @@ FUN_020C077C: ; 0x020C077C
ldr r5, [r4, #0x4]
mov r1, r4
mov r0, r5
- bl FUN_020ADAB0
+ bl NNS_FndRemoveListObject
mov r0, #0x0
str r0, [r4, #0x4]
ldr r1, [r4, #0x8]
cmp r1, #0x0
beq _020C07D8
add r0, r5, #0xc
- bl FUN_020ADBE8
+ bl NNS_FndAppendListObject
ldr r0, [r4, #0x8]
mov r1, #0x0
str r1, [r0, #0xc]
str r1, [r4, #0x8]
_020C07D8:
- ldr r0, _020C0800 ; =UNK_021D1E08
+ ldr r0, _020C0800 ; =sPrioList
mov r1, r4
- bl FUN_020ADAB0
- ldr r0, _020C0804 ; =UNK_021D1DFC
+ bl NNS_FndRemoveListObject
+ ldr r0, _020C0804 ; =sFreeList
mov r1, r4
- bl FUN_020ADBE8
+ bl NNS_FndAppendListObject
mov r0, #0x0
strb r0, [r4, #0x2c]
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
.balign 4
-_020C0800: .word UNK_021D1E08
-_020C0804: .word UNK_021D1DFC
+_020C0800: .word sPrioList
+_020C0804: .word sFreeList
- ; AllocSeqPlayer
- arm_func_start FUN_020C0808
-FUN_020C0808: ; 0x020C0808
+ arm_func_start AllocSeqPlayer
+AllocSeqPlayer: ; 0x020C0808
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r0
- ldr r0, _020C0874 ; =UNK_021D1DFC
+ ldr r0, _020C0874 ; =sFreeList
mov r1, #0x0
- bl FUN_020ADA98
+ bl NNS_FndGetNextListObject
movs r4, r0
bne _020C0850
- ldr r0, _020C0878 ; =UNK_021D1E08
+ ldr r0, _020C0878 ; =sPrioList
mov r1, #0x0
- bl FUN_020ADA98
+ bl NNS_FndGetNextListObject
mov r4, r0
ldrb r1, [r4, #0x3d]
cmp r5, r1
addlt sp, sp, #0x4
movlt r0, #0x0
ldmltia sp!, {r4-r5,pc}
- bl FUN_020C087C
+ bl ForceStopSeq
_020C0850:
- ldr r0, _020C0874 ; =UNK_021D1DFC
+ ldr r0, _020C0874 ; =sFreeList
mov r1, r4
- bl FUN_020ADAB0
+ bl NNS_FndRemoveListObject
mov r0, r4
strb r5, [r4, #0x3d]
- bl FUN_020C08B4
+ bl InsertPrioList
mov r0, r4
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
.balign 4
-_020C0874: .word UNK_021D1DFC
-_020C0878: .word UNK_021D1E08
+_020C0874: .word sFreeList
+_020C0878: .word sPrioList
- ; ForceStopSeq
- arm_func_start FUN_020C087C
-FUN_020C087C: ; 0x020C087C
+ arm_func_start ForceStopSeq
+ForceStopSeq: ; 0x020C087C
stmdb sp!, {r4,lr}
mov r4, r0
ldrb r0, [r4, #0x2c]
@@ -192,50 +163,48 @@ _020C089C:
ldrb r0, [r4, #0x3c]
bl SND_StopSeq
mov r0, r4
- bl FUN_020C077C
+ bl ShutdownPlayer
ldmia sp!, {r4,pc}
.balign 4
_020C08B0: .word 0xFFFFFD2D
- ; InsertPrioList
- arm_func_start FUN_020C08B4
-FUN_020C08B4: ; 0x020C08B4
+ arm_func_start InsertPrioList
+InsertPrioList: ; 0x020C08B4
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r0
- ldr r0, _020C090C ; =UNK_021D1E08
+ ldr r0, _020C090C ; =sPrioList
mov r1, #0x0
- bl FUN_020ADA98
+ bl NNS_FndGetNextListObject
movs r1, r0
beq _020C08F8
- ldr r4, _020C090C ; =UNK_021D1E08
+ ldr r4, _020C090C ; =sPrioList
_020C08D8:
ldrb r2, [r5, #0x3d]
ldrb r0, [r1, #0x3d]
cmp r2, r0
blo _020C08F8
mov r0, r4
- bl FUN_020ADA98
+ bl NNS_FndGetNextListObject
movs r1, r0
bne _020C08D8
_020C08F8:
- ldr r0, _020C090C ; =UNK_021D1E08
+ ldr r0, _020C090C ; =sPrioList
mov r2, r5
- bl FUN_020ADB18
+ bl NNS_FndInsertListObject
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
.balign 4
-_020C090C: .word UNK_021D1E08
+_020C090C: .word sPrioList
- ; _end
- arm_func_start FUN_020C0910
-FUN_020C0910: ; 0x020C0910
+ arm_func_start InsertPlayerList
+InsertPlayerList: ; 0x020C0910
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r4, r1
mov r1, #0x0
mov r5, r0
- bl FUN_020ADA98
+ bl NNS_FndGetNextListObject
movs r1, r0
beq _020C0950
_020C0930:
@@ -244,20 +213,19 @@ _020C0930:
cmp r2, r0
blo _020C0950
mov r0, r5
- bl FUN_020ADA98
+ bl NNS_FndGetNextListObject
movs r1, r0
bne _020C0930
_020C0950:
mov r0, r5
mov r2, r4
- bl FUN_020ADB18
+ bl NNS_FndInsertListObject
str r5, [r4, #0x4]
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
- ; _end
- arm_func_start FUN_020C0968
-FUN_020C0968: ; 0x020C0968
+ arm_func_start InitPlayer
+InitPlayer: ; 0x020C0968
stmdb sp!, {r4,lr}
mov r4, r0
mov r0, #0x0
@@ -270,42 +238,40 @@ FUN_020C0968: ; 0x020C0968
strb r1, [r4, #0x40]
add r0, r4, #0x1c
strb r1, [r4, #0x41]
- bl FUN_020C3E6C
+ bl NNSi_SndFaderInit
add r0, r4, #0x1c
mov r1, #0x7f00
mov r2, #0x1
- bl FUN_020C3E40
+ bl NNSi_SndFaderSet
ldmia sp!, {r4,pc}
- ; NNSi_SndPlayerAllocHeap
- arm_func_start FUN_020C09B0
-FUN_020C09B0: ; 0x020C09B0
+ arm_func_start NNSi_SndPlayerAllocHeap
+NNSi_SndPlayerAllocHeap: ; 0x020C09B0
stmdb sp!, {r4-r6,lr}
- ldr r3, _020C0A00 ; =UNK_021D2254
+ ldr r3, _020C0A00 ; =sPlayer
mov r2, #0x24
mla r5, r0, r2, r3
mov r6, r1
add r0, r5, #0xc
mov r1, #0x0
- bl FUN_020ADA98
+ bl NNS_FndGetNextListObject
movs r4, r0
moveq r0, #0x0
ldmeqia sp!, {r4-r6,pc}
mov r1, r4
add r0, r5, #0xc
- bl FUN_020ADAB0
+ bl NNS_FndRemoveListObject
str r6, [r4, #0xc]
str r4, [r6, #0x8]
ldr r0, [r4, #0x8]
- bl FUN_020C29C0
+ bl NNS_SndHeapClear
ldr r0, [r4, #0x8]
ldmia sp!, {r4-r6,pc}
.balign 4
-_020C0A00: .word UNK_021D2254
+_020C0A00: .word sPlayer
- ; _end
- arm_func_start FUN_020C0A04
-FUN_020C0A04: ; 0x020C0A04
+ arm_func_start NNSi_SndPlayerPause
+NNSi_SndPlayerPause: ; 0x020C0A04
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
movs r5, r0
@@ -322,9 +288,8 @@ FUN_020C0A04: ; 0x020C0A04
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
- ; _end
- arm_func_start FUN_020C0A40
-FUN_020C0A40: ; 0x020C0A40
+ arm_func_start NNSi_SndPlayerStopSeq
+NNSi_SndPlayerStopSeq: ; 0x020C0A40
stmdb sp!, {r4,lr}
movs r4, r0
mov r2, r1
@@ -334,22 +299,21 @@ FUN_020C0A40: ; 0x020C0A40
ldmeqia sp!, {r4,pc}
cmp r2, #0x0
bne _020C0A6C
- bl FUN_020C087C
+ bl ForceStopSeq
ldmia sp!, {r4,pc}
_020C0A6C:
add r0, r4, #0x1c
mov r1, #0x0
- bl FUN_020C3E40
+ bl NNSi_SndFaderSet
mov r0, r4
mov r1, #0x0
- bl FUN_020C06CC
+ bl SetPlayerPriority
mov r0, #0x2
strb r0, [r4, #0x2c]
ldmia sp!, {r4,pc}
- ; NNSi_SndPlayerStartSeq
- arm_func_start FUN_020C0A90
-FUN_020C0A90: ; 0x020C0A90
+ arm_func_start NNSi_SndPlayerStartSeq
+NNSi_SndPlayerStartSeq: ; 0x020C0A90
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r0
@@ -364,7 +328,7 @@ FUN_020C0A90: ; 0x020C0A90
bl SND_SetTrackAllocatableChannel
_020C0AC0:
mov r0, r5
- bl FUN_020C0968
+ bl InitPlayer
bl SND_GetCurrentCommandTag
str r0, [r5, #0x30]
mov r0, #0x1
@@ -375,20 +339,18 @@ _020C0AC0:
.balign 4
_020C0AE4: .word 0x0000FFFF
- ; NNSi_SndPlayerFreeSeqPlayer
- arm_func_start thunk_FUN_020c077c
-thunk_FUN_020c077c: ; 0x020C0AE8
- ldr ip, _020C0AF0 ; =FUN_020C077C
+ arm_func_start NNSi_SndPlayerFreeSeqPlayer
+NNSi_SndPlayerFreeSeqPlayer: ; 0x020C0AE8
+ ldr ip, _020C0AF0 ; =ShutdownPlayer
bx r12
.balign 4
-_020C0AF0: .word FUN_020C077C
+_020C0AF0: .word ShutdownPlayer
- ; NNSi_SndPlayerAllocSeqPlayer
- arm_func_start FUN_020C0AF4
-FUN_020C0AF4: ; 0x020C0AF4
+ arm_func_start NNSi_SndPlayerAllocSeqPlayer
+NNSi_SndPlayerAllocSeqPlayer: ; 0x020C0AF4
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
- ldr ip, _020C0B9C ; =UNK_021D2254
+ ldr ip, _020C0B9C ; =sPlayer
mov r3, #0x24
mov r4, r0
ldr r5, [r4, #0x0]
@@ -396,7 +358,7 @@ FUN_020C0AF4: ; 0x020C0AF4
mov r7, r2
cmp r5, #0x0
beq _020C0B20
- bl FUN_020C0F68
+ bl NNS_SndHandleReleaseSeq
_020C0B20:
ldrh r1, [r6, #0x8]
ldr r0, [r6, #0x18]
@@ -404,7 +366,7 @@ _020C0B20:
blo _020C0B64
mov r0, r6
mov r1, #0x0
- bl FUN_020ADA98
+ bl NNS_FndGetNextListObject
cmp r0, #0x0
addeq sp, sp, #0x4
moveq r0, #0x0
@@ -414,35 +376,34 @@ _020C0B20:
addlt sp, sp, #0x4
movlt r0, #0x0
ldmltia sp!, {r4-r7,pc}
- bl FUN_020C087C
+ bl ForceStopSeq
_020C0B64:
mov r0, r7
- bl FUN_020C0808
+ bl AllocSeqPlayer
movs r5, r0
addeq sp, sp, #0x4
moveq r0, #0x0
ldmeqia sp!, {r4-r7,pc}
mov r0, r6
mov r1, r5
- bl FUN_020C0910
+ bl InsertPlayerList
str r4, [r5, #0x0]
mov r0, r5
str r5, [r4, #0x0]
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
.balign 4
-_020C0B9C: .word UNK_021D2254
+_020C0B9C: .word sPlayer
- ; NNSi_SndPlayerMain
- arm_func_start FUN_020C0BA0
-FUN_020C0BA0: ; 0x020C0BA0
+ arm_func_start NNSi_SndPlayerMain
+NNSi_SndPlayerMain: ; 0x020C0BA0
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0xc
bl SND_GetPlayerStatus
str r0, [sp, #0x0]
- ldr r0, _020C0D14 ; =UNK_021D1E08
+ ldr r0, _020C0D14 ; =sPrioList
mov r1, #0x0
- bl FUN_020ADA98
+ bl NNS_FndGetNextListObject
movs r10, r0
addeq sp, sp, #0xc
ldmeqia sp!, {r4-r11,pc}
@@ -453,9 +414,9 @@ FUN_020C0BA0: ; 0x020C0BA0
mov r5, #0x1
mov r11, #0x0
_020C0BE0:
- ldr r0, _020C0D14 ; =UNK_021D1E08
+ ldr r0, _020C0D14 ; =sPrioList
mov r1, r10
- bl FUN_020ADA98
+ bl NNS_FndGetNextListObject
ldrb r1, [r10, #0x2d]
mov r9, r0
cmp r1, #0x0
@@ -474,11 +435,11 @@ _020C0C0C:
ands r0, r0, r1
bne _020C0C38
mov r0, r10
- bl FUN_020C077C
+ bl ShutdownPlayer
b _020C0D00
_020C0C38:
add r0, r10, #0x1c
- bl FUN_020C3DF4
+ bl NNSi_SndFaderUpdate
ldr r0, [r10, #0x4]
ldrb r2, [r10, #0x41]
ldrb r1, [r10, #0x40]
@@ -490,7 +451,7 @@ _020C0C38:
ldrsh r8, [r4, r3]
ldrsh r7, [r4, r2]
ldrsh r6, [r4, r1]
- bl FUN_020C3E0C
+ bl NNSi_SndFaderGet
mov r0, r0, asr #0x8
mov r2, r0, lsl #0x1
add r1, r7, r8
@@ -518,11 +479,11 @@ _020C0CC4:
cmp r0, #0x2
bne _020C0CE8
add r0, r10, #0x1c
- bl FUN_020C3DDC
+ bl NNSi_SndFaderIsFinished
cmp r0, #0x0
beq _020C0CE8
mov r0, r10
- bl FUN_020C087C
+ bl ForceStopSeq
_020C0CE8:
ldrb r0, [r10, #0x2f]
cmp r0, #0x0
@@ -537,35 +498,34 @@ _020C0D00:
add sp, sp, #0xc
ldmia sp!, {r4-r11,pc}
.balign 4
-_020C0D14: .word UNK_021D1E08
+_020C0D14: .word sPrioList
_020C0D18: .word SNDi_DecibelTable
_020C0D1C: .word 0x00007FFF
- ; NNSi_SndPlayerInit
- arm_func_start FUN_020C0D20
-FUN_020C0D20: ; 0x020C0D20
+ arm_func_start NNSi_SndPlayerInit
+NNSi_SndPlayerInit: ; 0x020C0D20
stmdb sp!, {r4-r10,lr}
- ldr r0, _020C0DC4 ; =UNK_021D1E08
+ ldr r0, _020C0DC4 ; =sPrioList
mov r1, #0x14
- bl FUN_020ADC74
- ldr r0, _020C0DC8 ; =UNK_021D1DFC
+ bl NNS_FndInitList
+ ldr r0, _020C0DC8 ; =sFreeList
mov r1, #0x14
- bl FUN_020ADC74
- ldr r6, _020C0DCC ; =UNK_021D1E14
+ bl NNS_FndInitList
+ ldr r6, _020C0DCC ; =sSeqPlayer
mov r7, #0x0
- ldr r4, _020C0DC8 ; =UNK_021D1DFC
+ ldr r4, _020C0DC8 ; =sFreeList
mov r5, r7
_020C0D4C:
strb r5, [r6, #0x2c]
mov r0, r4
mov r1, r6
strb r7, [r6, #0x3c]
- bl FUN_020ADBE8
+ bl NNS_FndAppendListObject
add r7, r7, #0x1
cmp r7, #0x10
add r6, r6, #0x44
blt _020C0D4C
- ldr sl, _020C0DD0 ; =UNK_021D2254
+ ldr sl, _020C0DD0 ; =sPlayer
mov r9, #0x0
mov r7, r9
mov r4, r9
@@ -575,10 +535,10 @@ _020C0D4C:
_020C0D8C:
mov r0, r10
mov r1, r8
- bl FUN_020ADC74
+ bl NNS_FndInitList
mov r1, r7
add r0, r10, #0xc
- bl FUN_020ADC74
+ bl NNS_FndInitList
strb r6, [r10, #0x20]
str r5, [r10, #0x18]
add r9, r9, #0x1
@@ -588,14 +548,13 @@ _020C0D8C:
blt _020C0D8C
ldmia sp!, {r4-r10,pc}
.balign 4
-_020C0DC4: .word UNK_021D1E08
-_020C0DC8: .word UNK_021D1DFC
-_020C0DCC: .word UNK_021D1E14
-_020C0DD0: .word UNK_021D2254
-
- ; _end
- arm_func_start FUN_020C0DD4
-FUN_020C0DD4: ; 0x020C0DD4
+_020C0DC4: .word sPrioList
+_020C0DC8: .word sFreeList
+_020C0DCC: .word sSeqPlayer
+_020C0DD0: .word sPlayer
+
+ arm_func_start NNS_SndPlayerGetTick
+NNS_SndPlayerGetTick: ; 0x020C0DD4
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr r1, [r0, #0x0]
@@ -613,9 +572,8 @@ FUN_020C0DD4: ; 0x020C0DD4
add sp, sp, #0x4
ldmia sp!, {pc}
- ; _end
- arm_func_start FUN_020C0E14
-FUN_020C0E14: ; 0x020C0E14
+ arm_func_start NNS_SndPlayerGetSeqNo
+NNS_SndPlayerGetSeqNo: ; 0x020C0E14
ldr r1, [r0, #0x0]
cmp r1, #0x0
mvneq r0, #0x0
@@ -626,9 +584,8 @@ FUN_020C0E14: ; 0x020C0E14
ldreqh r0, [r1, #0x38]
bx lr
- ; _end
- arm_func_start FUN_020C0E38
-FUN_020C0E38: ; 0x020C0E38
+ arm_func_start NNS_SndPlayerSetSeqArcNo
+NNS_SndPlayerSetSeqArcNo: ; 0x020C0E38
ldr r12, [r0, #0x0]
cmp r12, #0x0
bxeq lr
@@ -640,9 +597,8 @@ FUN_020C0E38: ; 0x020C0E38
strh r2, [r0, #0x3a]
bx lr
- ; _end
- arm_func_start FUN_020C0E60
-FUN_020C0E60: ; 0x020C0E60
+ arm_func_start NNS_SndPlayerSetSeqNo
+NNS_SndPlayerSetSeqNo: ; 0x020C0E60
ldr r3, [r0, #0x0]
cmp r3, #0x0
movne r2, #0x1
@@ -651,9 +607,8 @@ FUN_020C0E60: ; 0x020C0E60
strneh r1, [r0, #0x38]
bx lr
- ; _end
- arm_func_start FUN_020C0E7C
-FUN_020C0E7C: ; 0x020C0E7C
+ arm_func_start NNS_SndPlayerSetTrackPan
+NNS_SndPlayerSetTrackPan: ; 0x020C0E7C
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr r0, [r0, #0x0]
@@ -665,9 +620,8 @@ FUN_020C0E7C: ; 0x020C0E7C
add sp, sp, #0x4
ldmia sp!, {pc}
- ; _end
- arm_func_start FUN_020C0EA4
-FUN_020C0EA4: ; 0x020C0EA4
+ arm_func_start NNS_SndPlayerSetTrackPitch
+NNS_SndPlayerSetTrackPitch: ; 0x020C0EA4
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr r0, [r0, #0x0]
@@ -679,9 +633,8 @@ FUN_020C0EA4: ; 0x020C0EA4
add sp, sp, #0x4
ldmia sp!, {pc}
- ; _end
- arm_func_start FUN_020C0ECC
-FUN_020C0ECC: ; 0x020C0ECC
+ arm_func_start NNS_SndPlayerSetChannelPriority
+NNS_SndPlayerSetChannelPriority: ; 0x020C0ECC
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr r0, [r0, #0x0]
@@ -693,9 +646,8 @@ FUN_020C0ECC: ; 0x020C0ECC
add sp, sp, #0x4
ldmia sp!, {pc}
- ; _end
- arm_func_start FUN_020C0EF4
-FUN_020C0EF4: ; 0x020C0EF4
+ arm_func_start NNS_SndPlayerMoveVolume
+NNS_SndPlayerMoveVolume: ; 0x020C0EF4
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr r3, [r0, #0x0]
@@ -708,40 +660,36 @@ FUN_020C0EF4: ; 0x020C0EF4
ldmeqia sp!, {pc}
add r0, r3, #0x1c
mov r1, r1, lsl #0x8
- bl FUN_020C3E40
+ bl NNSi_SndFaderSet
add sp, sp, #0x4
ldmia sp!, {pc}
- ; _end
- arm_func_start FUN_020C0F30
-FUN_020C0F30: ; 0x020C0F30
+ arm_func_start NNS_SndPlayerSetInitialVolume
+NNS_SndPlayerSetInitialVolume: ; 0x020C0F30
ldr r0, [r0, #0x0]
cmp r0, #0x0
strneb r1, [r0, #0x40]
bx lr
- ; _end
- arm_func_start FUN_020C0F40
-FUN_020C0F40: ; 0x020C0F40
+ arm_func_start NNS_SndPlayerSetVolume
+NNS_SndPlayerSetVolume: ; 0x020C0F40
ldr r0, [r0, #0x0]
cmp r0, #0x0
strneb r1, [r0, #0x41]
bx lr
- ; NNS_SndPlayerCountPlayingSeqByPlayerNo
- arm_func_start FUN_020C0F50
-FUN_020C0F50: ; 0x020C0F50
+ arm_func_start NNS_SndPlayerCountPlayingSeqByPlayerNo
+NNS_SndPlayerCountPlayingSeqByPlayerNo: ; 0x020C0F50
mov r1, #0x24
mul r1, r0, r1
- ldr r0, _020C0F64 ; =UNK_021D225C
+ ldr r0, _020C0F64 ; =sPlayer + 0x8
ldrh r0, [r0, r1]
bx lr
.balign 4
-_020C0F64: .word UNK_021D225C
+_020C0F64: .word sPlayer + 0x8
- ; _end
- arm_func_start FUN_020C0F68
-FUN_020C0F68: ; 0x020C0F68
+ arm_func_start NNS_SndHandleReleaseSeq
+NNS_SndHandleReleaseSeq: ; 0x020C0F68
ldr r2, [r0, #0x0]
cmp r2, #0x0
movne r1, #0x0
@@ -749,27 +697,24 @@ FUN_020C0F68: ; 0x020C0F68
strne r1, [r0, #0x0]
bx lr
- ; _end
- arm_func_start FUN_020C0F80
-FUN_020C0F80: ; 0x020C0F80
+ arm_func_start NNS_SndHandleInit
+NNS_SndHandleInit: ; 0x020C0F80
mov r1, #0x0
str r1, [r0, #0x0]
bx lr
- ; NNS_SndPlayerPause
- arm_func_start FUN_020C0F8C
-FUN_020C0F8C: ; 0x020C0F8C
- ldr ip, _020C0F98 ; =FUN_020C0A04
+ arm_func_start NNS_SndPlayerPause
+NNS_SndPlayerPause: ; 0x020C0F8C
+ ldr ip, _020C0F98 ; =NNSi_SndPlayerPause
ldr r0, [r0, #0x0]
bx r12
.balign 4
-_020C0F98: .word FUN_020C0A04
+_020C0F98: .word NNSi_SndPlayerPause
- ; NNS_SndPlayerStopSeqAll
- arm_func_start FUN_020C0F9C
-FUN_020C0F9C: ; 0x020C0F9C
+ arm_func_start NNS_SndPlayerStopSeqAll
+NNS_SndPlayerStopSeqAll: ; 0x020C0F9C
stmdb sp!, {r4-r6,lr}
- ldr r4, _020C0FD8 ; =UNK_021D1E14
+ ldr r4, _020C0FD8 ; =sSeqPlayer
mov r6, r0
mov r5, #0x0
_020C0FAC:
@@ -778,7 +723,7 @@ _020C0FAC:
beq _020C0FC4
mov r0, r4
mov r1, r6
- bl FUN_020C0A40
+ bl NNSi_SndPlayerStopSeq
_020C0FC4:
add r5, r5, #0x1
cmp r5, #0x10
@@ -786,14 +731,13 @@ _020C0FC4:
blt _020C0FAC
ldmia sp!, {r4-r6,pc}
.balign 4
-_020C0FD8: .word UNK_021D1E14
+_020C0FD8: .word sSeqPlayer
- ; NNS_SndPlayerStopSeqBySeqNo
- arm_func_start FUN_020C0FDC
-FUN_020C0FDC: ; 0x020C0FDC
+ arm_func_start NNS_SndPlayerStopSeqBySeqNo
+NNS_SndPlayerStopSeqBySeqNo: ; 0x020C0FDC
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
- ldr r4, _020C103C ; =UNK_021D1E14
+ ldr r4, _020C103C ; =sSeqPlayer
mov r7, r0
mov r6, r1
mov r5, #0x0
@@ -809,7 +753,7 @@ _020C0FF4:
bne _020C1024
mov r0, r4
mov r1, r6
- bl FUN_020C0A40
+ bl NNSi_SndPlayerStopSeq
_020C1024:
add r5, r5, #0x1
cmp r5, #0x10
@@ -818,17 +762,16 @@ _020C1024:
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
.balign 4
-_020C103C: .word UNK_021D1E14
+_020C103C: .word sSeqPlayer
- ; NNS_SndPlayerStopSeqByPlayerNo
- arm_func_start FUN_020C1040
-FUN_020C1040: ; 0x020C1040
+ arm_func_start NNS_SndPlayerStopSeqByPlayerNo
+NNS_SndPlayerStopSeqByPlayerNo: ; 0x020C1040
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
- ldr r3, _020C109C ; =UNK_021D2254
+ ldr r3, _020C109C ; =sPlayer
mov r2, #0x24
mla r4, r0, r2, r3
- ldr r5, _020C10A0 ; =UNK_021D1E14
+ ldr r5, _020C10A0 ; =sSeqPlayer
mov r7, r1
mov r6, #0x0
_020C1060:
@@ -840,7 +783,7 @@ _020C1060:
bne _020C1084
mov r0, r5
mov r1, r7
- bl FUN_020C0A40
+ bl NNSi_SndPlayerStopSeq
_020C1084:
add r6, r6, #0x1
cmp r6, #0x10
@@ -849,31 +792,29 @@ _020C1084:
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
.balign 4
-_020C109C: .word UNK_021D2254
-_020C10A0: .word UNK_021D1E14
+_020C109C: .word sPlayer
+_020C10A0: .word sSeqPlayer
- ; NNS_SndPlayerStopSeq
- arm_func_start FUN_020C10A4
-FUN_020C10A4: ; 0x020C10A4
- ldr ip, _020C10B0 ; =FUN_020C0A40
+ arm_func_start NNS_SndPlayerStopSeq
+NNS_SndPlayerStopSeq: ; 0x020C10A4
+ ldr ip, _020C10B0 ; =NNSi_SndPlayerStopSeq
ldr r0, [r0, #0x0]
bx r12
.balign 4
-_020C10B0: .word FUN_020C0A40
+_020C10B0: .word NNSi_SndPlayerStopSeq
- ; NNS_SndPlayerCreateHeap
- arm_func_start FUN_020C10B4
-FUN_020C10B4: ; 0x020C10B4
+ arm_func_start NNS_SndPlayerCreateHeap
+NNS_SndPlayerCreateHeap: ; 0x020C10B4
stmdb sp!, {r4-r6,lr}
sub sp, sp, #0x8
mov r5, r2
mov r6, r0
mov r0, r1
mov r3, #0x0
- ldr r2, _020C1140 ; =FUN_020C072C
+ ldr r2, _020C1140 ; =PlayerHeapDisposeCallback
add r1, r5, #0x14
str r3, [sp, #0x0]
- bl SDATi_AllocAndInitChunk
+ bl NNS_SndHeapAlloc
movs r4, r0
addeq sp, sp, #0x8
moveq r0, #0x0
@@ -884,57 +825,53 @@ FUN_020C10B4: ; 0x020C10B4
mov r1, r5
add r0, r4, #0x14
str r2, [r4, #0x8]
- bl FUN_020C2A94
+ bl NNS_SndHeapCreate
cmp r0, #0x0
addeq sp, sp, #0x8
moveq r0, #0x0
ldmeqia sp!, {r4-r6,pc}
- ldr r2, _020C1144 ; =UNK_021D2254
+ ldr r2, _020C1144 ; =sPlayer
mov r1, #0x24
mla r2, r6, r1, r2
str r0, [r4, #0x8]
mov r1, r4
add r0, r2, #0xc
- bl FUN_020ADBE8
+ bl NNS_FndAppendListObject
mov r0, #0x1
add sp, sp, #0x8
ldmia sp!, {r4-r6,pc}
.balign 4
-_020C1140: .word FUN_020C072C
-_020C1144: .word UNK_021D2254
+_020C1140: .word PlayerHeapDisposeCallback
+_020C1144: .word sPlayer
- ; NNS_SndPlayerSetAllocatableChannel
- arm_func_start FUN_020C1148
-FUN_020C1148: ; 0x020C1148
+ arm_func_start NNS_SndPlayerSetAllocatableChannel
+NNS_SndPlayerSetAllocatableChannel: ; 0x020C1148
mov r2, #0x24
mul r2, r0, r2
- ldr r0, _020C115C ; =UNK_021D2270
+ ldr r0, _020C115C ; =sPlayer + 0x1C
str r1, [r0, r2]
bx lr
.balign 4
-_020C115C: .word UNK_021D2270
+_020C115C: .word sPlayer + 0x1C
- ; NNS_SndPlayerSetPlayableSeqCount
- arm_func_start FUN_020C1160
-FUN_020C1160: ; 0x020C1160
+ arm_func_start NNS_SndPlayerSetPlayableSeqCount
+NNS_SndPlayerSetPlayableSeqCount: ; 0x020C1160
mov r2, #0x24
mul r2, r0, r2
mov r0, r1, lsl #0x10
- ldr r1, _020C117C ; =UNK_021D226C
+ ldr r1, _020C117C ; =sPlayer + 0x18
mov r0, r0, lsr #0x10
str r0, [r1, r2]
bx lr
.balign 4
-_020C117C: .word UNK_021D226C
+_020C117C: .word sPlayer + 0x18
- ; NNS_SndPlayerSetPlayerVolume
- arm_func_start FUN_020C1180
-FUN_020C1180: ; 0x020C1180
+ arm_func_start NNS_SndPlayerSetPlayerVolume
+NNS_SndPlayerSetPlayerVolume: ; 0x020C1180
mov r2, #0x24
mul r2, r0, r2
- ldr r0, _020C1194 ; =UNK_021D2274
+ ldr r0, _020C1194 ; =sPlayer + 0x20
strb r1, [r0, r2]
bx lr
.balign 4
-_020C1194: .word UNK_021D2274
-
+_020C1194: .word sPlayer + 0x20
diff --git a/arm9/asm/NNS_SND_resource_mgr.s b/arm9/asm/NNS_SND_resource_mgr.s
index 482b8e81..944754cc 100644
--- a/arm9/asm/NNS_SND_resource_mgr.s
+++ b/arm9/asm/NNS_SND_resource_mgr.s
@@ -3,43 +3,38 @@
.section .bss
- ; sCaptureLock
- .global UNK_021D1CB0
-UNK_021D1CB0: ; 0x021D1CB0
+ .global sCaptureLock
+sCaptureLock: ; 0x021D1CB0
.space 0x4
- ; sAlarmLock
- .global UNK_021D1CB4
-UNK_021D1CB4: ; 0x021D1CB4
+ .global sAlarmLock
+sAlarmLock: ; 0x021D1CB4
.space 0x4
- ; sChannelLock
- .global UNK_021D1CB8
-UNK_021D1CB8: ; 0x021D1CB8
+ .global sChannelLock
+sChannelLock: ; 0x021D1CB8
.space 0x4
.section .text
- ; NNSi_SndInitResourceMgr
- arm_func_start FUN_020C0270
-FUN_020C0270: ; 0x020C0270
- ldr r2, _020C0290 ; =UNK_021D1CB8
+ arm_func_start NNSi_SndInitResourceMgr
+NNSi_SndInitResourceMgr: ; 0x020C0270
+ ldr r2, _020C0290 ; =sChannelLock
mov r3, #0x0
- ldr r1, _020C0294 ; =UNK_021D1CB0
- ldr r0, _020C0298 ; =UNK_021D1CB4
+ ldr r1, _020C0294 ; =sCaptureLock
+ ldr r0, _020C0298 ; =sAlarmLock
str r3, [r2, #0x0]
str r3, [r1, #0x0]
str r3, [r0, #0x0]
bx lr
.balign 4
-_020C0290: .word UNK_021D1CB8
-_020C0294: .word UNK_021D1CB0
-_020C0298: .word UNK_021D1CB4
+_020C0290: .word sChannelLock
+_020C0294: .word sCaptureLock
+_020C0298: .word sAlarmLock
- ; NNS_SndFreeAlarm
- arm_func_start FUN_020C029C
-FUN_020C029C: ; 0x020C029C
- ldr r1, _020C02B8 ; =UNK_021D1CB4
+ arm_func_start NNS_SndFreeAlarm
+NNS_SndFreeAlarm: ; 0x020C029C
+ ldr r1, _020C02B8 ; =sAlarmLock
mov r2, #0x1
mvn r0, r2, lsl r0
ldr r2, [r1, #0x0]
@@ -47,18 +42,17 @@ FUN_020C029C: ; 0x020C029C
str r0, [r1, #0x0]
bx lr
.balign 4
-_020C02B8: .word UNK_021D1CB4
+_020C02B8: .word sAlarmLock
- ; NNS_SndAllocAlarm
- arm_func_start FUN_020C02BC
-FUN_020C02BC: ; 0x020C02BC
- ldr r0, _020C02FC ; =UNK_021D1CB4
+ arm_func_start NNS_SndAllocAlarm
+NNS_SndAllocAlarm: ; 0x020C02BC
+ ldr r0, _020C02FC ; =sAlarmLock
mov r3, #0x1
ldr r2, [r0, #0x0]
mov r0, #0x0
_020C02CC:
ands r1, r2, r3
- ldreq r1, _020C02FC ; =UNK_021D1CB4
+ ldreq r1, _020C02FC ; =sAlarmLock
ldreq r2, [r1, #0x0]
orreq r2, r2, r3
streq r2, [r1, #0x0]
@@ -70,24 +64,22 @@ _020C02CC:
mvn r0, #0x0
bx lr
.balign 4
-_020C02FC: .word UNK_021D1CB4
+_020C02FC: .word sAlarmLock
- ; NNS_SndUnlockCapture
- arm_func_start FUN_020C0300
-FUN_020C0300: ; 0x020C0300
- ldr r1, _020C0318 ; =UNK_021D1CB0
+ arm_func_start NNS_SndUnlockCapture
+NNS_SndUnlockCapture: ; 0x020C0300
+ ldr r1, _020C0318 ; =sCaptureLock
mvn r0, r0
ldr r2, [r1, #0x0]
and r0, r2, r0
str r0, [r1, #0x0]
bx lr
.balign 4
-_020C0318: .word UNK_021D1CB0
+_020C0318: .word sCaptureLock
- ; NNS_SndLockCapture
- arm_func_start FUN_020C031C
-FUN_020C031C: ; 0x020C031C
- ldr r1, _020C033C ; =UNK_021D1CB0
+ arm_func_start NNS_SndLockCapture
+NNS_SndLockCapture: ; 0x020C031C
+ ldr r1, _020C033C ; =sCaptureLock
ldr r2, [r1, #0x0]
ands r3, r0, r2
movne r0, #0x0
@@ -96,45 +88,42 @@ FUN_020C031C: ; 0x020C031C
moveq r0, #0x1
bx lr
.balign 4
-_020C033C: .word UNK_021D1CB0
+_020C033C: .word sCaptureLock
- ; NNS_SndUnlockChannel
- arm_func_start FUN_020C0340
-FUN_020C0340: ; 0x020C0340
+ arm_func_start NNS_SndUnlockChannel
+NNS_SndUnlockChannel: ; 0x020C0340
stmdb sp!, {r4,lr}
movs r4, r0
ldmeqia sp!, {r4,pc}
mov r1, #0x0
bl SND_UnlockChannel
- ldr r0, _020C036C ; =UNK_021D1CB8
+ ldr r0, _020C036C ; =sChannelLock
mvn r1, r4
ldr r2, [r0, #0x0]
and r1, r2, r1
str r1, [r0, #0x0]
ldmia sp!, {r4,pc}
.balign 4
-_020C036C: .word UNK_021D1CB8
+_020C036C: .word sChannelLock
- ; NNS_SndLockChannel
- arm_func_start FUN_020C0370
-FUN_020C0370: ; 0x020C0370
+ arm_func_start NNS_SndLockChannel
+NNS_SndLockChannel: ; 0x020C0370
stmdb sp!, {r4,lr}
movs r4, r0
moveq r0, #0x1
ldmeqia sp!, {r4,pc}
- ldr r1, _020C03B4 ; =UNK_021D1CB8
+ ldr r1, _020C03B4 ; =sChannelLock
ldr r1, [r1, #0x0]
ands r1, r4, r1
movne r0, #0x0
ldmneia sp!, {r4,pc}
mov r1, #0x0
bl SND_LockChannel
- ldr r1, _020C03B4 ; =UNK_021D1CB8
+ ldr r1, _020C03B4 ; =sChannelLock
mov r0, #0x1
ldr r2, [r1, #0x0]
orr r2, r2, r4
str r2, [r1, #0x0]
ldmia sp!, {r4,pc}
.balign 4
-_020C03B4: .word UNK_021D1CB8
-
+_020C03B4: .word sChannelLock
diff --git a/arm9/asm/NNS_SND_seqdata.s b/arm9/asm/NNS_SND_seqdata.s
index 86a4217c..60cf2420 100644
--- a/arm9/asm/NNS_SND_seqdata.s
+++ b/arm9/asm/NNS_SND_seqdata.s
@@ -3,9 +3,8 @@
.section .text
- ; _end
- arm_func_start FUN_020C3D9C
-FUN_020C3D9C: ; 0x020C3D9C
+ arm_func_start NNSi_SndSeqArcGetSeqInfo
+NNSi_SndSeqArcGetSeqInfo: ; 0x020C3D9C
cmp r1, #0x0
movlt r0, #0x0
bxlt lr
@@ -22,4 +21,3 @@ FUN_020C3D9C: ; 0x020C3D9C
add r0, r3, r2
moveq r0, #0x0
bx lr
-
diff --git a/arm9/asm/NNS_SND_sndarc.s b/arm9/asm/NNS_SND_sndarc.s
index 1f781631..aa46de46 100644
--- a/arm9/asm/NNS_SND_sndarc.s
+++ b/arm9/asm/NNS_SND_sndarc.s
@@ -3,50 +3,44 @@
.section .bss
- ; sCurrent
- .global UNK_021D28C0
-UNK_021D28C0: ; 0x021D28C0
+ .global sCurrent
+sCurrent: ; 0x021D28C0
.space 0x4
.section .text
- ; _end
- arm_func_start SDATi_SymbDtor
-SDATi_SymbDtor: ; 0x020C209C
+ arm_func_start SymbolDisposeCallback
+SymbolDisposeCallback: ; 0x020C209C
mov r0, #0x0
str r0, [r2, #0x88]
bx lr
- ; _end
- arm_func_start SDATi_FatDtor
-SDATi_FatDtor: ; 0x020C20A8
+ arm_func_start FatDisposeCallback
+FatDisposeCallback: ; 0x020C20A8
mov r0, #0x0
str r0, [r2, #0x84]
bx lr
- ; _end
- arm_func_start SDATi_InfoDtor
-SDATi_InfoDtor: ; 0x020C20B4
+ arm_func_start InfoDisposeCallback
+InfoDisposeCallback: ; 0x020C20B4
mov r0, #0x0
str r0, [r2, #0x8c]
bx lr
- ; NNS_SndArcSetFileAddress
- arm_func_start FUN_020C20C0
-FUN_020C20C0: ; 0x020C20C0
- ldr r2, _020C20D8 ; =UNK_021D28C0
+ arm_func_start NNS_SndArcSetFileAddress
+NNS_SndArcSetFileAddress: ; 0x020C20C0
+ ldr r2, _020C20D8 ; =sCurrent
ldr r2, [r2, #0x0]
ldr r2, [r2, #0x84]
add r0, r2, r0, lsl #0x4
str r1, [r0, #0x14]
bx lr
.balign 4
-_020C20D8: .word UNK_021D28C0
+_020C20D8: .word sCurrent
- ; NNS_SndArcGetFileAddress
- arm_func_start FUN_020C20DC
-FUN_020C20DC: ; 0x020C20DC
- ldr r1, _020C2100 ; =UNK_021D28C0
+ arm_func_start NNS_SndArcGetFileAddress
+NNS_SndArcGetFileAddress: ; 0x020C20DC
+ ldr r1, _020C2100 ; =sCurrent
ldr r1, [r1, #0x0]
ldr r2, [r1, #0x84]
ldr r1, [r2, #0x8]
@@ -56,13 +50,12 @@ FUN_020C20DC: ; 0x020C20DC
ldrcc r0, [r0, #0x14]
bx lr
.balign 4
-_020C2100: .word UNK_021D28C0
+_020C2100: .word sCurrent
- ; NNS_SndArcReadFile
- arm_func_start FUN_020C2104
-FUN_020C2104: ; 0x020C2104
+ arm_func_start NNS_SndArcReadFile
+NNS_SndArcReadFile: ; 0x020C2104
stmdb sp!, {r4-r6,lr}
- ldr r4, _020C2178 ; =UNK_021D28C0
+ ldr r4, _020C2178 ; =sCurrent
mov r5, r2
ldr r4, [r4, #0x0]
mov r6, r1
@@ -91,12 +84,11 @@ FUN_020C2104: ; 0x020C2104
bl FS_ReadFile
ldmia sp!, {r4-r6,pc}
.balign 4
-_020C2178: .word UNK_021D28C0
+_020C2178: .word sCurrent
- ; NNS_SndArcGetFileSize
- arm_func_start FUN_020C217C
-FUN_020C217C: ; 0x020C217C
- ldr r1, _020C21A0 ; =UNK_021D28C0
+ arm_func_start NNS_SndArcGetFileSize
+NNS_SndArcGetFileSize: ; 0x020C217C
+ ldr r1, _020C21A0 ; =sCurrent
ldr r1, [r1, #0x0]
ldr r2, [r1, #0x84]
ldr r1, [r2, #0x8]
@@ -106,12 +98,11 @@ FUN_020C217C: ; 0x020C217C
ldrcc r0, [r0, #0x10]
bx lr
.balign 4
-_020C21A0: .word UNK_021D28C0
+_020C21A0: .word sCurrent
- ; NNS_SndArcGetGroupInfo
- arm_func_start FUN_020C21A4
-FUN_020C21A4: ; 0x020C21A4
- ldr r1, _020C2204 ; =UNK_021D28C0
+ arm_func_start NNS_SndArcGetGroupInfo
+NNS_SndArcGetGroupInfo: ; 0x020C21A4
+ ldr r1, _020C2204 ; =sCurrent
ldr r3, [r1, #0x0]
ldr r2, [r3, #0x8c]
ldr r1, [r2, #0x1c]
@@ -136,12 +127,11 @@ FUN_020C21A4: ; 0x020C21A4
addne r0, r0, r1
bx lr
.balign 4
-_020C2204: .word UNK_021D28C0
+_020C2204: .word sCurrent
- ; NNS_SndArcGetPlayerInfo
- arm_func_start FUN_020C2208
-FUN_020C2208: ; 0x020C2208
- ldr r1, _020C2268 ; =UNK_021D28C0
+ arm_func_start NNS_SndArcGetPlayerInfo
+NNS_SndArcGetPlayerInfo: ; 0x020C2208
+ ldr r1, _020C2268 ; =sCurrent
ldr r3, [r1, #0x0]
ldr r2, [r3, #0x8c]
ldr r1, [r2, #0x18]
@@ -166,12 +156,11 @@ FUN_020C2208: ; 0x020C2208
addne r0, r0, r1
bx lr
.balign 4
-_020C2268: .word UNK_021D28C0
+_020C2268: .word sCurrent
- ; NNS_SndArcGetWaveArcInfo
- arm_func_start FUN_020C226C
-FUN_020C226C: ; 0x020C226C
- ldr r1, _020C22CC ; =UNK_021D28C0
+ arm_func_start NNS_SndArcGetWaveArcInfo
+NNS_SndArcGetWaveArcInfo: ; 0x020C226C
+ ldr r1, _020C22CC ; =sCurrent
ldr r3, [r1, #0x0]
ldr r2, [r3, #0x8c]
ldr r1, [r2, #0x14]
@@ -196,12 +185,11 @@ FUN_020C226C: ; 0x020C226C
addne r0, r0, r1
bx lr
.balign 4
-_020C22CC: .word UNK_021D28C0
+_020C22CC: .word sCurrent
- ; NNS_SndArcGetBankInfo
- arm_func_start FUN_020C22D0
-FUN_020C22D0: ; 0x020C22D0
- ldr r1, _020C2330 ; =UNK_021D28C0
+ arm_func_start NNS_SndArcGetBankInfo
+NNS_SndArcGetBankInfo: ; 0x020C22D0
+ ldr r1, _020C2330 ; =sCurrent
ldr r3, [r1, #0x0]
ldr r2, [r3, #0x8c]
ldr r1, [r2, #0x10]
@@ -226,12 +214,11 @@ FUN_020C22D0: ; 0x020C22D0
addne r0, r0, r1
bx lr
.balign 4
-_020C2330: .word UNK_021D28C0
+_020C2330: .word sCurrent
- ; NNS_SndArcGetSeqArcInfo
- arm_func_start FUN_020C2334
-FUN_020C2334: ; 0x020C2334
- ldr r1, _020C2394 ; =UNK_021D28C0
+ arm_func_start NNS_SndArcGetSeqArcInfo
+NNS_SndArcGetSeqArcInfo: ; 0x020C2334
+ ldr r1, _020C2394 ; =sCurrent
ldr r3, [r1, #0x0]
ldr r2, [r3, #0x8c]
ldr r1, [r2, #0xc]
@@ -256,12 +243,11 @@ FUN_020C2334: ; 0x020C2334
addne r0, r0, r1
bx lr
.balign 4
-_020C2394: .word UNK_021D28C0
+_020C2394: .word sCurrent
- ; NNS_SndArcGetSeqInfo
- arm_func_start FUN_020C2398
-FUN_020C2398: ; 0x020C2398
- ldr r1, _020C23F8 ; =UNK_021D28C0
+ arm_func_start NNS_SndArcGetSeqInfo
+NNS_SndArcGetSeqInfo: ; 0x020C2398
+ ldr r1, _020C23F8 ; =sCurrent
ldr r3, [r1, #0x0]
ldr r2, [r3, #0x8c]
ldr r1, [r2, #0x8]
@@ -286,43 +272,39 @@ FUN_020C2398: ; 0x020C2398
addne r0, r0, r1
bx lr
.balign 4
-_020C23F8: .word UNK_021D28C0
+_020C23F8: .word sCurrent
- ; _end
- arm_func_start FUN_020C23FC
-FUN_020C23FC: ; 0x020C23FC
+ arm_func_start NNS_SndArcGetSeqParam
+NNS_SndArcGetSeqParam: ; 0x020C23FC
stmdb sp!, {lr}
sub sp, sp, #0x4
- bl FUN_020C2398
+ bl NNS_SndArcGetSeqInfo
cmp r0, #0x0
moveq r0, #0x0
addne r0, r0, #0x4
add sp, sp, #0x4
ldmia sp!, {pc}
- ; NNS_SndArcGetCurrent
- arm_func_start FUN_020C241C
-FUN_020C241C: ; 0x020C241C
- ldr r0, _020C2428 ; =UNK_021D28C0
+ arm_func_start NNS_SndArcGetCurrent
+NNS_SndArcGetCurrent: ; 0x020C241C
+ ldr r0, _020C2428 ; =sCurrent
ldr r0, [r0, #0x0]
bx lr
.balign 4
-_020C2428: .word UNK_021D28C0
+_020C2428: .word sCurrent
- ; NNS_SndArcSetCurrent
- arm_func_start FUN_020C242C
-FUN_020C242C: ; 0x020C242C
- ldr r1, _020C2440 ; =UNK_021D28C0
+ arm_func_start NNS_SndArcSetCurrent
+NNS_SndArcSetCurrent: ; 0x020C242C
+ ldr r1, _020C2440 ; =sCurrent
ldr r2, [r1, #0x0]
str r0, [r1, #0x0]
mov r0, r2
bx lr
.balign 4
-_020C2440: .word UNK_021D28C0
+_020C2440: .word sCurrent
- ; NNS_SndArcInitOnMemory
- arm_func_start FUN_020C2444
-FUN_020C2444: ; 0x020C2444
+ arm_func_start NNS_SndArcInitOnMemory
+NNS_SndArcInitOnMemory: ; 0x020C2444
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r0
@@ -369,14 +351,13 @@ _020C24BC:
blo _020C24BC
_020C24F0:
mov r1, #0x0
- ldr r0, _020C2508 ; =UNK_021D28C0
+ ldr r0, _020C2508 ; =sCurrent
str r1, [r5, #0x30]
str r5, [r0, #0x0]
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
.balign 4
-_020C2508: .word UNK_021D28C0
-
+_020C2508: .word sCurrent
SDATi_ReadHeaders:
stmdb sp!, {r4-r6,lr}
sub sp, sp, #0x8
@@ -404,10 +385,10 @@ SDATi_ReadHeaders:
mov r0, #0x0
str r0, [sp, #0x0]
ldr r1, [r6, #0x1c]
- ldr r2, _020C26EC ; =SDATi_InfoDtor
+ ldr r2, _020C26EC ; =InfoDisposeCallback
mov r0, r5
mov r3, r6
- bl SDATi_AllocAndInitChunk
+ bl NNS_SndHeapAlloc
str r0, [r6, #0x8c]
ldr r0, [r6, #0x8c]
cmp r0, #0x0
@@ -434,10 +415,10 @@ SDATi_ReadHeaders:
mov r0, #0x0
str r0, [sp, #0x0]
ldr r1, [r6, #0x24]
- ldr r2, _020C26F0 ; =SDATi_FatDtor
+ ldr r2, _020C26F0 ; =FatDisposeCallback
mov r0, r5
mov r3, r6
- bl SDATi_AllocAndInitChunk
+ bl NNS_SndHeapAlloc
str r0, [r6, #0x84]
ldr r0, [r6, #0x84]
cmp r0, #0x0
@@ -467,11 +448,11 @@ SDATi_ReadHeaders:
cmp r1, #0x0
beq _020C26E0
mov r4, #0x0
- ldr r2, _020C26F4 ; =SDATi_SymbDtor
+ ldr r2, _020C26F4 ; =SymbolDisposeCallback
mov r0, r5
mov r3, r6
str r4, [sp, #0x0]
- bl SDATi_AllocAndInitChunk
+ bl NNS_SndHeapAlloc
str r0, [r6, #0x88]
ldr r0, [r6, #0x88]
cmp r0, #0x0
@@ -500,13 +481,12 @@ _020C26E0:
add sp, sp, #0x8
ldmia sp!, {r4-r6,pc}
.balign 4
-_020C26EC: .word SDATi_InfoDtor
-_020C26F0: .word SDATi_FatDtor
-_020C26F4: .word SDATi_SymbDtor
+_020C26EC: .word InfoDisposeCallback
+_020C26F0: .word FatDisposeCallback
+_020C26F4: .word SymbolDisposeCallback
- ; NNS_SndArcInit
- arm_func_start SDAT_Open
-SDAT_Open: ; 0x020C26F8
+ arm_func_start NNS_SndArcInit
+NNS_SndArcInit: ; 0x020C26F8
; r0: &sSoundDataBuffer
; r1: char* filename
; r2: (&sSoundDataBuffer)->unk_0090
@@ -538,9 +518,8 @@ SDAT_Open: ; 0x020C26F8
str r3, [r6, #0x30]
bl SDATi_ReadHeaders
cmp r0, #0x0
- ldrne r0, _020C2770 ; =UNK_021D28C0
+ ldrne r0, _020C2770 ; =sCurrent
strne r6, [r0, #0x0]
ldmia sp!, {r4-r6,pc}
.balign 4
-_020C2770: .word UNK_021D28C0
-
+_020C2770: .word sCurrent
diff --git a/arm9/asm/NNS_SND_sndarc_loader.s b/arm9/asm/NNS_SND_sndarc_loader.s
index 918a296b..26636305 100644
--- a/arm9/asm/NNS_SND_sndarc_loader.s
+++ b/arm9/asm/NNS_SND_sndarc_loader.s
@@ -3,16 +3,14 @@
.section .bss
- ; waveArcHeader$8213
- .global UNK_021D28C4
-UNK_021D28C4: ; 0x021D28C4
+ .global waveArcHeader$8213
+waveArcHeader$8213: ; 0x021D28C4
.space 0x3c
.section .text
- ; _end
- arm_func_start FUN_020C2B1C
-FUN_020C2B1C: ; 0x020C2B1C
+ arm_func_start LoadSingleWaves
+LoadSingleWaves: ; 0x020C2B1C
stmdb sp!, {r4-r10,lr}
sub sp, sp, #0x20
mov r8, r0
@@ -49,7 +47,7 @@ _020C2B80:
mov r0, r8
mov r2, r5
mov r3, r4
- bl FUN_020C2BE0
+ bl LoadSingleWave
cmp r0, #0x0
addeq sp, sp, #0x20
moveq r0, #0x0
@@ -66,9 +64,8 @@ _020C2BD4:
add sp, sp, #0x20
ldmia sp!, {r4-r10,pc}
- ; LoadSingleWave
- arm_func_start FUN_020C2BE0
-FUN_020C2BE0: ; 0x020C2BE0
+ arm_func_start LoadSingleWave
+LoadSingleWave: ; 0x020C2BE0
stmdb sp!, {r4-r9,lr}
sub sp, sp, #0x4
mov r7, r0
@@ -95,12 +92,12 @@ FUN_020C2BE0: ; 0x020C2BE0
addeq sp, sp, #0x4
moveq r0, #0x0
ldmeqia sp!, {r4-r9,pc}
- ldr r2, _020C2CBC ; =FUN_020C2CC0
+ ldr r2, _020C2CBC ; =SingleWaveDisposeCallback
mov r0, r4
mov r3, r7
add r1, r9, #0x20
str r6, [sp, #0x0]
- bl SDATi_AllocAndInitChunk
+ bl NNS_SndHeapAlloc
movs r4, r0
addeq sp, sp, #0x4
moveq r0, #0x0
@@ -109,7 +106,7 @@ FUN_020C2BE0: ; 0x020C2BE0
mov r1, r4
mov r2, r9
mov r3, r8
- bl FUN_020C2104
+ bl NNS_SndArcReadFile
cmp r9, r0
addne sp, sp, #0x4
movne r0, #0x0
@@ -125,11 +122,10 @@ FUN_020C2BE0: ; 0x020C2BE0
add sp, sp, #0x4
ldmia sp!, {r4-r9,pc}
.balign 4
-_020C2CBC: .word FUN_020C2CC0
+_020C2CBC: .word SingleWaveDisposeCallback
- ; _end
- arm_func_start FUN_020C2CC0
-FUN_020C2CC0: ; 0x020C2CC0
+ arm_func_start SingleWaveDisposeCallback
+SingleWaveDisposeCallback: ; 0x020C2CC0
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r5, r2
@@ -152,28 +148,26 @@ _020C2CFC:
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
- ; _end
- arm_func_start FUN_020C2D10
-FUN_020C2D10: ; 0x020C2D10
+ arm_func_start WaveArcTableDisposeCallback
+WaveArcTableDisposeCallback: ; 0x020C2D10
stmdb sp!, {r4,lr}
mov r1, r2
mov r4, r0
mov r2, r3
- bl FUN_020C2DD0
+ bl DisposeCallback
mov r0, r4
bl SND_DestroyWaveArc
ldmia sp!, {r4,pc}
- ; _end
- arm_func_start FUN_020C2D30
-FUN_020C2D30: ; 0x020C2D30
+ arm_func_start WaveArcDisposeCallback
+WaveArcDisposeCallback: ; 0x020C2D30
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r4, r1
mov r1, r2
mov r5, r0
mov r2, r3
- bl FUN_020C2DD0
+ bl DisposeCallback
mov r0, r5
add r1, r5, r4
bl SND_InvalidateWaveData
@@ -182,16 +176,15 @@ FUN_020C2D30: ; 0x020C2D30
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
- ; _end
- arm_func_start FUN_020C2D68
-FUN_020C2D68: ; 0x020C2D68
+ arm_func_start BankDisposeCallback
+BankDisposeCallback: ; 0x020C2D68
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r4, r1
mov r1, r2
mov r5, r0
mov r2, r3
- bl FUN_020C2DD0
+ bl DisposeCallback
mov r0, r5
add r1, r5, r4
bl SND_InvalidateBankData
@@ -200,25 +193,23 @@ FUN_020C2D68: ; 0x020C2D68
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
- ; _end
- arm_func_start FUN_020C2DA0
-FUN_020C2DA0: ; 0x020C2DA0
+ arm_func_start SeqDisposeCallback
+SeqDisposeCallback: ; 0x020C2DA0
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r4, r1
mov r1, r2
mov r5, r0
mov r2, r3
- bl FUN_020C2DD0
+ bl DisposeCallback
mov r0, r5
add r1, r5, r4
bl SND_InvalidateSeqData
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
- ; _end
- arm_func_start FUN_020C2DD0
-FUN_020C2DD0: ; 0x020C2DD0
+ arm_func_start DisposeCallback
+DisposeCallback: ; 0x020C2DD0
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
movs r5, r1
@@ -229,44 +220,43 @@ FUN_020C2DD0: ; 0x020C2DD0
bl OS_DisableInterrupts
mov r4, r0
mov r0, r5
- bl FUN_020C242C
+ bl NNS_SndArcSetCurrent
mov r5, r0
mov r0, r6
- bl FUN_020C20DC
+ bl NNS_SndArcGetFileAddress
cmp r7, r0
bne _020C2E1C
mov r0, r6
mov r1, #0x0
- bl FUN_020C20C0
+ bl NNS_SndArcSetFileAddress
_020C2E1C:
mov r0, r5
- bl FUN_020C242C
+ bl NNS_SndArcSetCurrent
mov r0, r4
bl OS_RestoreInterrupts
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
- ; LoadWaveArcTable
- arm_func_start FUN_020C2E34
-FUN_020C2E34: ; 0x020C2E34
+ arm_func_start LoadWaveArcTable
+LoadWaveArcTable: ; 0x020C2E34
stmdb sp!, {r4-r9,lr}
sub sp, sp, #0x4
mov r9, r0
mov r8, r1
mov r7, r2
- bl FUN_020C20DC
+ bl NNS_SndArcGetFileAddress
movs r6, r0
bne _020C2F40
- ldr r1, _020C2F4C ; =UNK_021D28C4
+ ldr r1, _020C2F4C ; =waveArcHeader$8213
mov r0, r9
mov r2, #0x3c
mov r3, #0x0
- bl FUN_020C2104
+ bl NNS_SndArcReadFile
cmp r0, #0x3c
addne sp, sp, #0x4
movne r0, #0x0
ldmneia sp!, {r4-r9,pc}
- ldr r0, _020C2F4C ; =UNK_021D28C4
+ ldr r0, _020C2F4C ; =waveArcHeader$8213
cmp r8, #0x0
ldr r0, [r0, #0x38]
addeq sp, sp, #0x4
@@ -278,14 +268,14 @@ FUN_020C2E34: ; 0x020C2E34
cmp r7, #0x0
moveq r3, #0x0
beq _020C2EB0
- bl FUN_020C241C
+ bl NNS_SndArcGetCurrent
mov r3, r0
_020C2EB0:
- ldr r2, _020C2F50 ; =FUN_020C2D10
+ ldr r2, _020C2F50 ; =WaveArcTableDisposeCallback
mov r0, r8
add r1, r5, #0x20
str r9, [sp, #0x0]
- bl SDATi_AllocAndInitChunk
+ bl NNS_SndHeapAlloc
movs r6, r0
addeq sp, sp, #0x4
moveq r0, #0x0
@@ -294,7 +284,7 @@ _020C2EB0:
mov r1, r6
add r2, r4, #0x3c
mov r3, #0x0
- bl FUN_020C2104
+ bl NNS_SndArcReadFile
add r1, r4, #0x3c
cmp r0, r1
addne sp, sp, #0x4
@@ -316,37 +306,36 @@ _020C2EB0:
beq _020C2F40
mov r0, r9
mov r1, r6
- bl FUN_020C20C0
+ bl NNS_SndArcSetFileAddress
_020C2F40:
mov r0, r6
add sp, sp, #0x4
ldmia sp!, {r4-r9,pc}
.balign 4
-_020C2F4C: .word UNK_021D28C4
-_020C2F50: .word FUN_020C2D10
+_020C2F4C: .word waveArcHeader$8213
+_020C2F50: .word WaveArcTableDisposeCallback
- ; LoadWaveArc
- arm_func_start FUN_020C2F54
-FUN_020C2F54: ; 0x020C2F54
+ arm_func_start LoadWaveArc
+LoadWaveArc: ; 0x020C2F54
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r7, r0
mov r6, r1
mov r5, r2
- bl FUN_020C20DC
+ bl NNS_SndArcGetFileAddress
movs r4, r0
bne _020C2FBC
cmp r5, #0x0
moveq r2, #0x0
beq _020C2F88
- bl FUN_020C241C
+ bl NNS_SndArcGetCurrent
mov r2, r0
_020C2F88:
- ldr r1, _020C2FC8 ; =FUN_020C2D30
+ ldr r1, _020C2FC8 ; =WaveArcDisposeCallback
mov r0, r7
mov r3, r7
str r6, [sp, #0x0]
- bl FUN_020C3134
+ bl NNSi_SndArcLoadFile
mov r4, r0
cmp r5, #0x0
beq _020C2FBC
@@ -354,36 +343,35 @@ _020C2F88:
beq _020C2FBC
mov r0, r7
mov r1, r4
- bl FUN_020C20C0
+ bl NNS_SndArcSetFileAddress
_020C2FBC:
mov r0, r4
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
.balign 4
-_020C2FC8: .word FUN_020C2D30
+_020C2FC8: .word WaveArcDisposeCallback
- ; LoadBank
- arm_func_start FUN_020C2FCC
-FUN_020C2FCC: ; 0x020C2FCC
+ arm_func_start LoadBank
+LoadBank: ; 0x020C2FCC
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r7, r0
mov r6, r1
mov r5, r2
- bl FUN_020C20DC
+ bl NNS_SndArcGetFileAddress
movs r4, r0
bne _020C3034
cmp r5, #0x0
moveq r2, #0x0
beq _020C3000
- bl FUN_020C241C
+ bl NNS_SndArcGetCurrent
mov r2, r0
_020C3000:
- ldr r1, _020C3040 ; =FUN_020C2D68
+ ldr r1, _020C3040 ; =BankDisposeCallback
mov r0, r7
mov r3, r7
str r6, [sp, #0x0]
- bl FUN_020C3134
+ bl NNSi_SndArcLoadFile
mov r4, r0
cmp r5, #0x0
beq _020C3034
@@ -391,36 +379,35 @@ _020C3000:
beq _020C3034
mov r0, r7
mov r1, r4
- bl FUN_020C20C0
+ bl NNS_SndArcSetFileAddress
_020C3034:
mov r0, r4
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
.balign 4
-_020C3040: .word FUN_020C2D68
+_020C3040: .word BankDisposeCallback
- ; LoadSeqArc
- arm_func_start FUN_020C3044
-FUN_020C3044: ; 0x020C3044
+ arm_func_start LoadSeqArc
+LoadSeqArc: ; 0x020C3044
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r7, r0
mov r6, r1
mov r5, r2
- bl FUN_020C20DC
+ bl NNS_SndArcGetFileAddress
movs r4, r0
bne _020C30AC
cmp r5, #0x0
moveq r2, #0x0
beq _020C3078
- bl FUN_020C241C
+ bl NNS_SndArcGetCurrent
mov r2, r0
_020C3078:
- ldr r1, _020C30B8 ; =FUN_020C2DA0
+ ldr r1, _020C30B8 ; =SeqDisposeCallback
mov r0, r7
mov r3, r7
str r6, [sp, #0x0]
- bl FUN_020C3134
+ bl NNSi_SndArcLoadFile
mov r4, r0
cmp r5, #0x0
beq _020C30AC
@@ -428,36 +415,35 @@ _020C3078:
beq _020C30AC
mov r0, r7
mov r1, r4
- bl FUN_020C20C0
+ bl NNS_SndArcSetFileAddress
_020C30AC:
mov r0, r4
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
.balign 4
-_020C30B8: .word FUN_020C2DA0
+_020C30B8: .word SeqDisposeCallback
- ; LoadSeq
- arm_func_start FUN_020C30BC
-FUN_020C30BC: ; 0x020C30BC
+ arm_func_start LoadSeq
+LoadSeq: ; 0x020C30BC
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r7, r0
mov r6, r1
mov r5, r2
- bl FUN_020C20DC
+ bl NNS_SndArcGetFileAddress
movs r4, r0
bne _020C3124
cmp r5, #0x0
moveq r2, #0x0
beq _020C30F0
- bl FUN_020C241C
+ bl NNS_SndArcGetCurrent
mov r2, r0
_020C30F0:
- ldr r1, _020C3130 ; =FUN_020C2DA0
+ ldr r1, _020C3130 ; =SeqDisposeCallback
mov r0, r7
mov r3, r7
str r6, [sp, #0x0]
- bl FUN_020C3134
+ bl NNSi_SndArcLoadFile
mov r4, r0
cmp r5, #0x0
beq _020C3124
@@ -465,24 +451,23 @@ _020C30F0:
beq _020C3124
mov r0, r7
mov r1, r4
- bl FUN_020C20C0
+ bl NNS_SndArcSetFileAddress
_020C3124:
mov r0, r4
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
.balign 4
-_020C3130: .word FUN_020C2DA0
+_020C3130: .word SeqDisposeCallback
- ; _end
- arm_func_start FUN_020C3134
-FUN_020C3134: ; 0x020C3134
+ arm_func_start NNSi_SndArcLoadFile
+NNSi_SndArcLoadFile: ; 0x020C3134
stmdb sp!, {r4-r8,lr}
sub sp, sp, #0x8
mov r8, r0
mov r7, r1
mov r6, r2
mov r4, r3
- bl FUN_020C217C
+ bl NNS_SndArcGetFileSize
movs r5, r0
addeq sp, sp, #0x8
moveq r0, #0x0
@@ -496,7 +481,7 @@ FUN_020C3134: ; 0x020C3134
mov r3, r6
add r1, r5, #0x20
str r4, [sp, #0x0]
- bl SDATi_AllocAndInitChunk
+ bl NNS_SndHeapAlloc
movs r4, r0
addeq sp, sp, #0x8
moveq r0, #0x0
@@ -505,7 +490,7 @@ FUN_020C3134: ; 0x020C3134
mov r1, r4
mov r2, r5
mov r3, #0x0
- bl FUN_020C2104
+ bl NNS_SndArcReadFile
cmp r5, r0
addne sp, sp, #0x8
movne r0, #0x0
@@ -517,14 +502,13 @@ FUN_020C3134: ; 0x020C3134
add sp, sp, #0x8
ldmia sp!, {r4-r8,pc}
- ; _end
- arm_func_start FUN_020C31D4
-FUN_020C31D4: ; 0x020C31D4
+ arm_func_start NNSi_SndArcLoadWaveArc
+NNSi_SndArcLoadWaveArc: ; 0x020C31D4
stmdb sp!, {r4-r6,lr}
mov r6, r1
mov r5, r2
mov r4, r3
- bl FUN_020C226C
+ bl NNS_SndArcGetWaveArcInfo
cmp r0, #0x0
moveq r0, #0x5
ldmeqia sp!, {r4-r6,pc}
@@ -538,7 +522,7 @@ FUN_020C31D4: ; 0x020C31D4
mov r0, r0, lsl #0x8
mov r2, r4
mov r0, r0, lsr #0x8
- bl FUN_020C2E34
+ bl LoadWaveArcTable
b _020C323C
_020C3224:
ldr r0, [r0, #0x0]
@@ -546,7 +530,7 @@ _020C3224:
mov r0, r0, lsl #0x8
mov r2, r4
mov r0, r0, lsr #0x8
- bl FUN_020C2F54
+ bl LoadWaveArc
_020C323C:
cmp r0, #0x0
bne _020C325C
@@ -556,7 +540,7 @@ _020C324C:
ldr r0, [r0, #0x0]
mov r0, r0, lsl #0x8
mov r0, r0, lsr #0x8
- bl FUN_020C20DC
+ bl NNS_SndArcGetFileAddress
_020C325C:
ldr r1, [sp, #0x10]
cmp r1, #0x0
@@ -564,15 +548,14 @@ _020C325C:
mov r0, #0x0
ldmia sp!, {r4-r6,pc}
- ; NNSi_SndArcLoadBank
- arm_func_start FUN_020C3270
-FUN_020C3270: ; 0x020C3270
+ arm_func_start NNSi_SndArcLoadBank
+NNSi_SndArcLoadBank: ; 0x020C3270
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0xc
mov r10, r1
mov r9, r2
mov r11, r3
- bl FUN_020C22D0
+ bl NNS_SndArcGetBankInfo
movs r8, r0
addeq sp, sp, #0xc
moveq r0, #0x4
@@ -582,7 +565,7 @@ FUN_020C3270: ; 0x020C3270
ldr r0, [r8, #0x0]
mov r1, r9
mov r2, r11
- bl FUN_020C2FCC
+ bl LoadBank
movs r7, r0
bne _020C32D0
add sp, sp, #0xc
@@ -590,7 +573,7 @@ FUN_020C3270: ; 0x020C3270
ldmia sp!, {r4-r11,pc}
_020C32C4:
ldr r0, [r8, #0x0]
- bl FUN_020C20DC
+ bl NNS_SndArcGetFileAddress
mov r7, r0
_020C32D0:
and r5, r10, #0x4
@@ -601,7 +584,7 @@ _020C32D8:
ldr r1, _020C33B4 ; =0x0000FFFF
cmp r0, r1
beq _020C3390
- bl FUN_020C226C
+ bl NNS_SndArcGetWaveArcInfo
movs r4, r0
addeq sp, sp, #0xc
moveq r0, #0x5
@@ -613,7 +596,7 @@ _020C32D8:
mov r1, r10
mov r2, r9
mov r3, r11
- bl FUN_020C31D4
+ bl NNSi_SndArcLoadWaveArc
cmp r0, #0x0
addne sp, sp, #0xc
ldmneia sp!, {r4-r11,pc}
@@ -629,7 +612,7 @@ _020C32D8:
mov r1, r7
mov r2, r6
mov r3, r3, lsr #0x8
- bl FUN_020C2B1C
+ bl LoadSingleWaves
cmp r0, #0x0
addeq sp, sp, #0xc
moveq r0, #0x9
@@ -656,14 +639,13 @@ _020C3390:
.balign 4
_020C33B4: .word 0x0000FFFF
- ; _end
- arm_func_start FUN_020C33B8
-FUN_020C33B8: ; 0x020C33B8
+ arm_func_start NNSi_SndArcLoadSeqArc
+NNSi_SndArcLoadSeqArc: ; 0x020C33B8
stmdb sp!, {r4-r6,lr}
mov r6, r1
mov r5, r2
mov r4, r3
- bl FUN_020C2334
+ bl NNS_SndArcGetSeqArcInfo
cmp r0, #0x0
moveq r0, #0x3
ldmeqia sp!, {r4-r6,pc}
@@ -672,14 +654,14 @@ FUN_020C33B8: ; 0x020C33B8
ldr r0, [r0, #0x0]
mov r1, r5
mov r2, r4
- bl FUN_020C3044
+ bl LoadSeqArc
cmp r0, #0x0
bne _020C3408
mov r0, #0x7
ldmia sp!, {r4-r6,pc}
_020C3400:
ldr r0, [r0, #0x0]
- bl FUN_020C20DC
+ bl NNS_SndArcGetFileAddress
_020C3408:
ldr r1, [sp, #0x10]
cmp r1, #0x0
@@ -687,15 +669,14 @@ _020C3408:
mov r0, #0x0
ldmia sp!, {r4-r6,pc}
- ; _end
- arm_func_start FUN_020C341C
-FUN_020C341C: ; 0x020C341C
+ arm_func_start NNSi_SndArcLoadSeq
+NNSi_SndArcLoadSeq: ; 0x020C341C
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
mov r7, r1
mov r6, r2
mov r5, r3
- bl FUN_020C2398
+ bl NNS_SndArcGetSeqInfo
movs r4, r0
addeq sp, sp, #0x4
moveq r0, #0x2
@@ -706,7 +687,7 @@ FUN_020C341C: ; 0x020C341C
mov r1, r7
mov r2, r6
mov r3, r5
- bl FUN_020C3270
+ bl NNSi_SndArcLoadBank
cmp r0, #0x0
addne sp, sp, #0x4
ldmneia sp!, {r4-r7,pc}
@@ -715,7 +696,7 @@ FUN_020C341C: ; 0x020C341C
ldr r0, [r4, #0x0]
mov r1, r6
mov r2, r5
- bl FUN_020C30BC
+ bl LoadSeq
cmp r0, #0x0
bne _020C34A0
add sp, sp, #0x4
@@ -723,7 +704,7 @@ FUN_020C341C: ; 0x020C341C
ldmia sp!, {r4-r7,pc}
_020C3498:
ldr r0, [r4, #0x0]
- bl FUN_020C20DC
+ bl NNS_SndArcGetFileAddress
_020C34A0:
ldr r1, [sp, #0x18]
cmp r1, #0x0
@@ -732,13 +713,12 @@ _020C34A0:
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
- ; _end
- arm_func_start FUN_020C34B8
-FUN_020C34B8: ; 0x020C34B8
+ arm_func_start NNSi_SndArcLoadGroup
+NNSi_SndArcLoadGroup: ; 0x020C34B8
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0xc
mov r9, r1
- bl FUN_020C21A4
+ bl NNS_SndArcGetGroupInfo
movs r8, r0
addeq sp, sp, #0xc
moveq r0, #0x1
@@ -769,7 +749,7 @@ _020C3520:
ldr r0, [r6, #0x4]
mov r2, r9
mov r3, r4
- bl FUN_020C341C
+ bl NNSi_SndArcLoadSeq
cmp r0, #0x0
beq _020C35C0
add sp, sp, #0xc
@@ -780,7 +760,7 @@ _020C3548:
ldr r0, [r6, #0x4]
mov r2, r9
mov r3, r4
- bl FUN_020C33B8
+ bl NNSi_SndArcLoadSeqArc
cmp r0, #0x0
beq _020C35C0
add sp, sp, #0xc
@@ -791,7 +771,7 @@ _020C3570:
ldr r0, [r6, #0x4]
mov r2, r9
mov r3, r4
- bl FUN_020C3270
+ bl NNSi_SndArcLoadBank
cmp r0, #0x0
beq _020C35C0
add sp, sp, #0xc
@@ -803,7 +783,7 @@ _020C3598:
ldrb r1, [r6, #0x1]
ldr r0, [r6, #0x4]
mov r3, r4
- bl FUN_020C31D4
+ bl NNSi_SndArcLoadWaveArc
cmp r0, #0x0
addne sp, sp, #0xc
ldmneia sp!, {r4-r11,pc}
@@ -818,24 +798,22 @@ _020C35D4:
add sp, sp, #0xc
ldmia sp!, {r4-r11,pc}
- ; _end
- arm_func_start FUN_020C35E0
-FUN_020C35E0: ; 0x020C35E0
+ arm_func_start NNS_SndArcLoadSeqEx
+NNS_SndArcLoadSeqEx: ; 0x020C35E0
stmdb sp!, {lr}
sub sp, sp, #0x4
mov r12, #0x0
mov r3, #0x1
str r12, [sp, #0x0]
- bl FUN_020C341C
+ bl NNSi_SndArcLoadSeq
cmp r0, #0x0
moveq r0, #0x1
movne r0, #0x0
add sp, sp, #0x4
ldmia sp!, {pc}
- ; _end
- arm_func_start FUN_020C360C
-FUN_020C360C: ; 0x020C360C
+ arm_func_start NNS_SndArcLoadWaveArc
+NNS_SndArcLoadWaveArc: ; 0x020C360C
stmdb sp!, {lr}
sub sp, sp, #0x4
mov r2, r1
@@ -843,16 +821,15 @@ FUN_020C360C: ; 0x020C360C
mov r1, #0xff
mov r3, #0x1
str r12, [sp, #0x0]
- bl FUN_020C31D4
+ bl NNSi_SndArcLoadWaveArc
cmp r0, #0x0
moveq r0, #0x1
movne r0, #0x0
add sp, sp, #0x4
ldmia sp!, {pc}
- ; _end
- arm_func_start FUN_020C3640
-FUN_020C3640: ; 0x020C3640
+ arm_func_start NNS_SndArcLoadBank
+NNS_SndArcLoadBank: ; 0x020C3640
stmdb sp!, {lr}
sub sp, sp, #0x4
mov r2, r1
@@ -860,16 +837,15 @@ FUN_020C3640: ; 0x020C3640
mov r1, #0xff
mov r3, #0x1
str r12, [sp, #0x0]
- bl FUN_020C3270
+ bl NNSi_SndArcLoadBank
cmp r0, #0x0
moveq r0, #0x1
movne r0, #0x0
add sp, sp, #0x4
ldmia sp!, {pc}
- ; _end
- arm_func_start FUN_020C3674
-FUN_020C3674: ; 0x020C3674
+ arm_func_start NNS_SndArcLoadSeq
+NNS_SndArcLoadSeq: ; 0x020C3674
stmdb sp!, {lr}
sub sp, sp, #0x4
mov r2, r1
@@ -877,22 +853,20 @@ FUN_020C3674: ; 0x020C3674
mov r1, #0xff
mov r3, #0x1
str r12, [sp, #0x0]
- bl FUN_020C341C
+ bl NNSi_SndArcLoadSeq
cmp r0, #0x0
moveq r0, #0x1
movne r0, #0x0
add sp, sp, #0x4
ldmia sp!, {pc}
- ; _end
- arm_func_start FUN_020C36A8
-FUN_020C36A8: ; 0x020C36A8
+ arm_func_start NNS_SndArcLoadGroup
+NNS_SndArcLoadGroup: ; 0x020C36A8
stmdb sp!, {lr}
sub sp, sp, #0x4
- bl FUN_020C34B8
+ bl NNSi_SndArcLoadGroup
cmp r0, #0x0
moveq r0, #0x1
movne r0, #0x0
add sp, sp, #0x4
ldmia sp!, {pc}
-
diff --git a/arm9/asm/NNS_SND_sndarc_player.s b/arm9/asm/NNS_SND_sndarc_player.s
index 8657cdfc..c043967b 100644
--- a/arm9/asm/NNS_SND_sndarc_player.s
+++ b/arm9/asm/NNS_SND_sndarc_player.s
@@ -3,9 +3,8 @@
.section .text
- ; _end
- arm_func_start FUN_020C36C8
-FUN_020C36C8: ; 0x020C36C8
+ arm_func_start StartSeqArc
+StartSeqArc: ; 0x020C36C8
stmdb sp!, {r4-r8,lr}
sub sp, sp, #0x8
mov r7, r2
@@ -13,25 +12,25 @@ FUN_020C36C8: ; 0x020C36C8
ldr r6, [sp, #0x20]
mov r4, r0
mov r8, r1
- bl FUN_020C0AF4
+ bl NNSi_SndPlayerAllocSeqPlayer
movs r5, r0
addeq sp, sp, #0x8
moveq r0, #0x0
ldmeqia sp!, {r4-r8,pc}
mov r0, r8
mov r1, r5
- bl FUN_020C09B0
+ bl NNSi_SndPlayerAllocHeap
add r12, sp, #0x4
mov r2, r0
mov r0, r7
mov r1, #0x6
mov r3, #0x0
str r12, [sp, #0x0]
- bl FUN_020C3270
+ bl NNSi_SndArcLoadBank
cmp r0, #0x0
beq _020C373C
mov r0, r5
- bl thunk_FUN_020c077c
+ bl NNSi_SndPlayerFreeSeqPlayer
add sp, sp, #0x8
mov r0, #0x0
ldmia sp!, {r4-r8,pc}
@@ -42,24 +41,23 @@ _020C373C:
ldr r3, [sp, #0x4]
mov r0, r5
add r1, r12, r1
- bl FUN_020C0A90
+ bl NNSi_SndPlayerStartSeq
ldrb r1, [r6, #0x6]
mov r0, r4
- bl FUN_020C0F30
+ bl NNS_SndPlayerSetInitialVolume
ldrb r1, [r6, #0x7]
mov r0, r4
- bl FUN_020C0ECC
+ bl NNS_SndPlayerSetChannelPriority
ldr r1, [sp, #0x28]
ldr r2, [sp, #0x2c]
mov r0, r4
- bl FUN_020C0E38
+ bl NNS_SndPlayerSetSeqArcNo
mov r0, #0x1
add sp, sp, #0x8
ldmia sp!, {r4-r8,pc}
- ; _end
- arm_func_start FUN_020C378C
-FUN_020C378C: ; 0x020C378C
+ arm_func_start StartSeq
+StartSeq: ; 0x020C378C
stmdb sp!, {r4-r8,lr}
sub sp, sp, #0x10
mov r8, r2
@@ -67,14 +65,14 @@ FUN_020C378C: ; 0x020C378C
ldr r5, [sp, #0x28]
mov r6, r0
mov r7, r1
- bl FUN_020C0AF4
+ bl NNSi_SndPlayerAllocSeqPlayer
movs r4, r0
addeq sp, sp, #0x10
moveq r0, #0x0
ldmeqia sp!, {r4-r8,pc}
mov r0, r7
mov r1, r4
- bl FUN_020C09B0
+ bl NNSi_SndPlayerAllocHeap
mov r7, r0
add r12, sp, #0x8
mov r0, r8
@@ -82,11 +80,11 @@ FUN_020C378C: ; 0x020C378C
mov r1, #0x6
mov r3, #0x0
str r12, [sp, #0x0]
- bl FUN_020C3270
+ bl NNSi_SndArcLoadBank
cmp r0, #0x0
beq _020C3804
mov r0, r4
- bl thunk_FUN_020c077c
+ bl NNSi_SndPlayerFreeSeqPlayer
add sp, sp, #0x10
mov r0, #0x0
ldmia sp!, {r4-r8,pc}
@@ -97,11 +95,11 @@ _020C3804:
mov r1, #0x1
mov r3, #0x0
str r12, [sp, #0x0]
- bl FUN_020C341C
+ bl NNSi_SndArcLoadSeq
cmp r0, #0x0
beq _020C383C
mov r0, r4
- bl thunk_FUN_020c077c
+ bl NNSi_SndPlayerFreeSeqPlayer
add sp, sp, #0x10
mov r0, #0x0
ldmia sp!, {r4-r8,pc}
@@ -112,42 +110,41 @@ _020C383C:
mov r0, r4
add r1, r2, r1
mov r2, #0x0
- bl FUN_020C0A90
+ bl NNSi_SndPlayerStartSeq
ldrb r1, [r5, #0x6]
mov r0, r6
- bl FUN_020C0F30
+ bl NNS_SndPlayerSetInitialVolume
ldrb r1, [r5, #0x7]
mov r0, r6
- bl FUN_020C0ECC
+ bl NNS_SndPlayerSetChannelPriority
ldr r1, [sp, #0x2c]
mov r0, r6
- bl FUN_020C0E60
+ bl NNS_SndPlayerSetSeqNo
mov r0, #0x1
add sp, sp, #0x10
ldmia sp!, {r4-r8,pc}
- ; _end
- arm_func_start FUN_020C3888
-FUN_020C3888: ; 0x020C3888
+ arm_func_start NNS_SndArcPlayerStartSeqArc
+NNS_SndArcPlayerStartSeqArc: ; 0x020C3888
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x14
mov r6, r1
mov r7, r0
mov r0, r6
mov r5, r2
- bl FUN_020C2334
+ bl NNS_SndArcGetSeqArcInfo
cmp r0, #0x0
addeq sp, sp, #0x14
moveq r0, #0x0
ldmeqia sp!, {r4-r7,pc}
ldr r0, [r0, #0x0]
- bl FUN_020C20DC
+ bl NNS_SndArcGetFileAddress
movs r4, r0
addeq sp, sp, #0x14
moveq r0, #0x0
ldmeqia sp!, {r4-r7,pc}
mov r1, r5
- bl FUN_020C3D9C
+ bl NNSi_SndSeqArcGetSeqInfo
cmp r0, #0x0
addeq sp, sp, #0x14
moveq r0, #0x0
@@ -160,13 +157,12 @@ FUN_020C3888: ; 0x020C3888
ldrh r2, [r0, #0x4]
ldrb r3, [r0, #0x8]
mov r0, r7
- bl FUN_020C36C8
+ bl StartSeqArc
add sp, sp, #0x14
ldmia sp!, {r4-r7,pc}
- ; _end
- arm_func_start FUN_020C3910
-FUN_020C3910: ; 0x020C3910
+ arm_func_start NNS_SndArcPlayerStartSeqEx
+NNS_SndArcPlayerStartSeqEx: ; 0x020C3910
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0xc
mov r7, r0
@@ -174,7 +170,7 @@ FUN_020C3910: ; 0x020C3910
mov r6, r1
mov r5, r2
mov r4, r3
- bl FUN_020C2398
+ bl NNS_SndArcGetSeqInfo
cmp r0, #0x0
addeq sp, sp, #0xc
moveq r0, #0x0
@@ -192,19 +188,18 @@ FUN_020C3910: ; 0x020C3910
mov r1, r6
mov r3, r4
str r12, [sp, #0x4]
- bl FUN_020C378C
+ bl StartSeq
add sp, sp, #0xc
ldmia sp!, {r4-r7,pc}
- ; _end
- arm_func_start FUN_020C3980
-FUN_020C3980: ; 0x020C3980
+ arm_func_start NNS_SndArcPlayerStartSeq
+NNS_SndArcPlayerStartSeq: ; 0x020C3980
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0xc
mov r4, r1
mov r5, r0
mov r0, r4
- bl FUN_020C2398
+ bl NNS_SndArcGetSeqInfo
cmp r0, #0x0
addeq sp, sp, #0xc
moveq r0, #0x0
@@ -215,29 +210,28 @@ FUN_020C3980: ; 0x020C3980
ldrh r2, [r0, #0x4]
ldrb r3, [r0, #0x8]
mov r0, r5
- bl FUN_020C378C
+ bl StartSeq
add sp, sp, #0xc
ldmia sp!, {r4-r5,pc}
- ; _end
- arm_func_start FUN_020C39CC
-FUN_020C39CC: ; 0x020C39CC
+ arm_func_start NNS_SndArcPlayerSetup
+NNS_SndArcPlayerSetup: ; 0x020C39CC
stmdb sp!, {r4-r8,lr}
mov r6, r0
- bl FUN_020C241C
+ bl NNS_SndArcGetCurrent
mov r5, #0x0
mov r7, r5
_020C39E0:
mov r0, r5
- bl FUN_020C2208
+ bl NNS_SndArcGetPlayerInfo
movs r4, r0
beq _020C3A58
ldrb r1, [r4, #0x0]
mov r0, r5
- bl FUN_020C1160
+ bl NNS_SndPlayerSetPlayableSeqCount
ldrh r1, [r4, #0x2]
mov r0, r5
- bl FUN_020C1148
+ bl NNS_SndPlayerSetAllocatableChannel
ldr r0, [r4, #0x4]
cmp r0, #0x0
beq _020C3A58
@@ -251,7 +245,7 @@ _020C3A2C:
ldr r2, [r4, #0x4]
mov r0, r5
mov r1, r6
- bl FUN_020C10B4
+ bl NNS_SndPlayerCreateHeap
cmp r0, #0x0
moveq r0, #0x0
ldmeqia sp!, {r4-r8,pc}
@@ -265,4 +259,3 @@ _020C3A58:
blt _020C39E0
mov r0, #0x1
ldmia sp!, {r4-r8,pc}
-
diff --git a/arm9/asm/NNS_SND_sndarc_stream.s b/arm9/asm/NNS_SND_sndarc_stream.s
index 8b6ad0b9..1962bdcc 100644
--- a/arm9/asm/NNS_SND_sndarc_stream.s
+++ b/arm9/asm/NNS_SND_sndarc_stream.s
@@ -3,54 +3,43 @@
.section .bss
- ; sPrepareThread
- .global UNK_021D2900
-UNK_021D2900: ; 0x021D2900
+ .global sPrepareThread
+sPrepareThread: ; 0x021D2900
.space 0x4
- ; sFreeCommandList
- .global UNK_021D2904
-UNK_021D2904: ; 0x021D2904
- .space 0x4d4
+ .global sFreeCommandList
+sFreeCommandList: ; 0x021D2904
+ .space 0xC
+ ; sStrmThread
+ .global sStrmThread
+sStrmThread: ; 0x021D2910
+ .space 0x4EC
- ; sFreeCommandList + 0x4D4
- .global UNK_021D2DD8
-UNK_021D2DD8: ; 0x021D2DD8
- .space 0x18
-
- ; sFreeCommandList + 0x4EC
- .global UNK_021D2DF0
-UNK_021D2DF0: ; 0x021D2DF0
- .space 0xc
-
- ; sStrmPlayer
- .global UNK_021D2DFC
-UNK_021D2DFC: ; 0x021D2DFC
+ .global sStrmPlayer
+sStrmPlayer: ; 0x021D2DFC
.space 0x5c0
.section .text
- ; FreeCommandBuffer
- arm_func_start FUN_020C3A6C
-FUN_020C3A6C: ; 0x020C3A6C
+ arm_func_start FreeCommandBuffer
+FreeCommandBuffer: ; 0x020C3A6C
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r0
bl OS_DisableInterrupts
mov r4, r0
- ldr r0, _020C3A9C ; =UNK_021D2904
+ ldr r0, _020C3A9C ; =sFreeCommandList
mov r1, r5
- bl FUN_020ADBE8
+ bl NNS_FndAppendListObject
mov r0, r4
bl OS_RestoreInterrupts
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
.balign 4
-_020C3A9C: .word UNK_021D2904
+_020C3A9C: .word sFreeCommandList
- ; _end
- arm_func_start FUN_020C3AA0
-FUN_020C3AA0: ; 0x020C3AA0
+ arm_func_start RemoveCommandByPlayer
+RemoveCommandByPlayer: ; 0x020C3AA0
stmdb sp!, {r4-r8,lr}
mov r8, r0
mov r7, r1
@@ -58,22 +47,22 @@ FUN_020C3AA0: ; 0x020C3AA0
mov r6, r0
mov r0, r8
mov r1, #0x0
- bl FUN_020ADA98
+ bl NNS_FndGetNextListObject
movs r5, r0
beq _020C3B04
_020C3AC8:
mov r0, r8
mov r1, r5
- bl FUN_020ADA98
+ bl NNS_FndGetNextListObject
ldr r1, [r5, #0x8]
mov r4, r0
cmp r1, r7
bne _020C3AF8
mov r0, r8
mov r1, r5
- bl FUN_020ADAB0
+ bl NNS_FndRemoveListObject
mov r0, r5
- bl FUN_020C3A6C
+ bl FreeCommandBuffer
_020C3AF8:
mov r5, r4
cmp r4, #0x0
@@ -83,9 +72,8 @@ _020C3B04:
bl OS_RestoreInterrupts
ldmia sp!, {r4-r8,pc}
- ; _end
- arm_func_start FUN_020C3B10
-FUN_020C3B10: ; 0x020C3B10
+ arm_func_start FreeChannel
+FreeChannel: ; 0x020C3B10
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr r1, [r0, #0x120]
@@ -98,49 +86,47 @@ FUN_020C3B10: ; 0x020C3B10
cmp r1, #0x0
addne sp, sp, #0x4
ldmneia sp!, {pc}
- bl FUN_020C1674
+ bl NNS_SndStrmFreeChannel
add sp, sp, #0x4
ldmia sp!, {pc}
- ; ShutdownPlayer
- arm_func_start FUN_020C3B4C
-FUN_020C3B4C: ; 0x020C3B4C
+ local_arm_func_start ShutdownPlayer
+ShutdownPlayer: ; 0x020C3B4C
stmdb sp!, {r4,lr}
mov r4, r0
ldr r1, [r4, #0x110]
mov r1, r1, lsl #0x1f
movs r1, r1, asr #0x1f
ldmeqia sp!, {r4,pc}
- bl FUN_020C3B10
+ bl FreeChannel
ldr r1, [r4, #0x164]
mov r0, r4
blx r1
- ldr r0, _020C3BA8 ; =UNK_021D2DF0
+ ldr r0, _020C3BA8 ; =sStrmThread + 0x4E0
mov r1, r4
- bl FUN_020C3AA0
- ldr r0, _020C3BAC ; =UNK_021D2900
+ bl RemoveCommandByPlayer
+ ldr r0, _020C3BAC ; =sPrepareThread
ldr r0, [r0, #0x0]
cmp r0, #0x0
beq _020C3B9C
mov r1, r4
add r0, r0, #0x4e0
- bl FUN_020C3AA0
+ bl RemoveCommandByPlayer
_020C3B9C:
mov r0, r4
- bl FUN_020C3C4C
+ bl FreePlayer
ldmia sp!, {r4,pc}
.balign 4
-_020C3BA8: .word UNK_021D2DF0
-_020C3BAC: .word UNK_021D2900
+_020C3BA8: .word sStrmThread + 0x4E0
+_020C3BAC: .word sPrepareThread
- ; ForceStopStrm
- arm_func_start FUN_020C3BB0
-FUN_020C3BB0: ; 0x020C3BB0
+ local_arm_func_start ForceStopStrm
+ForceStopStrm: ; 0x020C3BB0
stmdb sp!, {r4,lr}
mov r4, r0
- ldr r0, _020C3C40 ; =UNK_021D2DD8
+ ldr r0, _020C3C40 ; =sStrmThread + 0x4C8
bl OS_LockMutex
- ldr r0, _020C3C44 ; =UNK_021D2900
+ ldr r0, _020C3C44 ; =sPrepareThread
ldr r1, [r0, #0x0]
cmp r1, #0x0
beq _020C3BDC
@@ -153,7 +139,7 @@ _020C3BDC:
movs r0, r0, asr #0x1f
beq _020C3BF4
mov r0, r4
- bl FUN_020C1430
+ bl NNS_SndStrmStop
_020C3BF4:
ldr r0, [r4, #0x110]
mov r0, r0, lsl #0x1f
@@ -164,10 +150,10 @@ _020C3BF4:
blx r1
_020C3C10:
mov r0, r4
- bl FUN_020C3B4C
- ldr r0, _020C3C40 ; =UNK_021D2DD8
+ bl ShutdownPlayer
+ ldr r0, _020C3C40 ; =sStrmThread + 0x4C8
bl OS_UnlockMutex
- ldr r0, _020C3C44 ; =UNK_021D2900
+ ldr r0, _020C3C44 ; =sPrepareThread
ldr r1, [r0, #0x0]
cmp r1, #0x0
ldmeqia sp!, {r4,pc}
@@ -176,13 +162,12 @@ _020C3C10:
bl OS_UnlockMutex
ldmia sp!, {r4,pc}
.balign 4
-_020C3C40: .word UNK_021D2DD8
-_020C3C44: .word UNK_021D2900
+_020C3C40: .word sStrmThread + 0x4C8
+_020C3C44: .word sPrepareThread
_020C3C48: .word 0x000004C8
- ; _end
- arm_func_start FUN_020C3C4C
-FUN_020C3C4C: ; 0x020C3C4C
+ arm_func_start FreePlayer
+FreePlayer: ; 0x020C3C4C
ldr r2, [r0, #0x14c]
cmp r2, #0x0
movne r1, #0x0
@@ -199,12 +184,11 @@ FUN_020C3C4C: ; 0x020C3C4C
str r1, [r0, #0x110]
bx lr
- ; NNSi_SndArcStrmMain
- arm_func_start FUN_020C3C88
-FUN_020C3C88: ; 0x020C3C88
+ arm_func_start NNSi_SndArcStrmMain
+NNSi_SndArcStrmMain: ; 0x020C3C88
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
- ldr r5, _020C3D94 ; =UNK_021D2DFC
+ ldr r5, _020C3D94 ; =sStrmPlayer
mov r7, #0x0
ldr r4, _020C3D98 ; =SNDi_DecibelTable
_020C3C9C:
@@ -216,7 +200,7 @@ _020C3C9C:
cmp r0, #0x0
bne _020C3CC4
mov r0, r5
- bl FUN_020C3BB0
+ bl ForceStopStrm
b _020C3D7C
_020C3CC4:
mov r0, r1, lsl #0x1d
@@ -226,7 +210,7 @@ _020C3CC4:
cmp r0, #0x0
beq _020C3CFC
mov r0, r5
- bl FUN_020C1458
+ bl NNS_SndStrmStart
ldr r0, [r5, #0x110]
orr r0, r0, #0x2
str r0, [r5, #0x110]
@@ -239,12 +223,12 @@ _020C3CFC:
movs r0, r0, asr #0x1f
beq _020C3D7C
add r0, r5, #0xe8
- bl FUN_020C3DF4
+ bl NNSi_SndFaderUpdate
ldr r1, [r5, #0x154]
add r0, r5, #0xe8
mov r1, r1, lsl #0x1
ldrsh r6, [r4, r1]
- bl FUN_020C3E0C
+ bl NNSi_SndFaderGet
mov r0, r0, asr #0x8
mov r0, r0, lsl #0x1
ldrsh r1, [r4, r0]
@@ -254,7 +238,7 @@ _020C3CFC:
beq _020C3D54
mov r0, r5
mov r1, r6
- bl FUN_020C13C4
+ bl NNS_SndStrmSetVolume
str r6, [r5, #0x158]
_020C3D54:
ldr r0, [r5, #0x110]
@@ -262,11 +246,11 @@ _020C3D54:
movs r0, r0, asr #0x1f
beq _020C3D7C
add r0, r5, #0xe8
- bl FUN_020C3DDC
+ bl NNSi_SndFaderIsFinished
cmp r0, #0x0
beq _020C3D7C
mov r0, r5
- bl FUN_020C3BB0
+ bl ForceStopStrm
_020C3D7C:
add r7, r7, #0x1
cmp r7, #0x4
@@ -275,6 +259,5 @@ _020C3D7C:
add sp, sp, #0x4
ldmia sp!, {r4-r7,pc}
.balign 4
-_020C3D94: .word UNK_021D2DFC
+_020C3D94: .word sStrmPlayer
_020C3D98: .word SNDi_DecibelTable
-
diff --git a/arm9/asm/NNS_SND_stream.s b/arm9/asm/NNS_SND_stream.s
index 752fcab0..53432742 100644
--- a/arm9/asm/NNS_SND_stream.s
+++ b/arm9/asm/NNS_SND_stream.s
@@ -3,31 +3,26 @@
.section .bss
- ; bInitialized$7761
- .global UNK_021D26D4
-UNK_021D26D4: ; 0x021D26D4
+ .global bInitialized$7761
+bInitialized$7761: ; 0x021D26D4
.space 0x4
- ; sStrmList
- .global UNK_021D26D8
-UNK_021D26D8: ; 0x021D26D8
+ .global sStrmList
+sStrmList: ; 0x021D26D8
.space 0xc
- ; buffer$7877
- .global UNK_021D26E4
-UNK_021D26E4: ; 0x021D26E4
+ .global buffer$7877
+buffer$7877: ; 0x021D26E4
.space 0x40
- ; sStrmChannel
- .global UNK_021D2724
-UNK_021D2724: ; 0x021D2724
+ .global sStrmChannel
+sStrmChannel: ; 0x021D2724
.space 0x80
.section .text
- ; _end
- arm_func_start FUN_020C1198
-FUN_020C1198: ; 0x020C1198
+ local_arm_func_start EndSleep
+EndSleep: ; 0x020C1198
stmdb sp!, {r4-r6,lr}
mov r4, r0
ldr r0, [r4, #0x24]
@@ -43,7 +38,7 @@ _020C11C0:
mov r6, r0
mov r0, r4
mov r1, r5
- bl FUN_020C1254
+ bl StrmCallback
mov r0, r6
bl OS_RestoreInterrupts
ldr r0, [r4, #0x38]
@@ -59,9 +54,8 @@ _020C11E8:
bl SND_StartTimer
ldmia sp!, {r4-r6,pc}
- ; _end
- arm_func_start FUN_020C1208
-FUN_020C1208: ; 0x020C1208
+ local_arm_func_start BeginSleep
+BeginSleep: ; 0x020C1208
stmdb sp!, {r4,lr}
ldr r1, [r0, #0x24]
mov r1, r1, lsl #0x1e
@@ -82,9 +76,8 @@ FUN_020C1208: ; 0x020C1208
bl SND_WaitForCommandProc
ldmia sp!, {r4,pc}
- ; StrmCallback
- arm_func_start FUN_020C1254
-FUN_020C1254: ; 0x020C1254
+ arm_func_start StrmCallback
+StrmCallback: ; 0x020C1254
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0xc
mov r5, r0
@@ -99,8 +92,8 @@ FUN_020C1254: ; 0x020C1254
cmp r1, #0x0
mov r12, #0x0
ble _020C12B8
- ldr r2, _020C1300 ; =UNK_021D2724
- ldr r0, _020C1304 ; =UNK_021D26E4
+ ldr r2, _020C1300 ; =sStrmChannel
+ ldr r0, _020C1304 ; =buffer$7877
_020C1294:
add r1, r5, r12
ldrb r1, [r1, #0x4c]
@@ -113,7 +106,7 @@ _020C1294:
blt _020C1294
_020C12B8:
ldr r0, [r5, #0x20]
- ldr r2, _020C1304 ; =UNK_021D26E4
+ ldr r2, _020C1304 ; =buffer$7877
str r0, [sp, #0x0]
ldr r12, [r5, #0x34]
mov r0, r4
@@ -131,38 +124,35 @@ _020C12B8:
add sp, sp, #0xc
ldmia sp!, {r4-r5,pc}
.balign 4
-_020C1300: .word UNK_021D2724
-_020C1304: .word UNK_021D26E4
+_020C1300: .word sStrmChannel
+_020C1304: .word buffer$7877
- ; AlarmCallback
- arm_func_start FUN_020C1308
-FUN_020C1308: ; 0x020C1308
- ldr ip, _020C1314 ; =FUN_020C1254
+ local_arm_func_start AlarmCallback
+AlarmCallback: ; 0x020C1308
+ ldr ip, _020C1314 ; =StrmCallback
mov r1, #0x1
bx r12
.balign 4
-_020C1314: .word FUN_020C1254
+_020C1314: .word StrmCallback
- ; ShutdownStrm
- arm_func_start FUN_020C1318
-FUN_020C1318: ; 0x020C1318
+ arm_func_start ShutdownStrm
+ShutdownStrm: ; 0x020C1318
stmdb sp!, {r4,lr}
mov r4, r0
ldr r0, [r4, #0x40]
- bl FUN_020C029C
- ldr r0, _020C1344 ; =UNK_021D26D8
+ bl NNS_SndFreeAlarm
+ ldr r0, _020C1344 ; =sStrmList
mov r1, r4
- bl FUN_020ADAB0
+ bl NNS_FndRemoveListObject
ldr r0, [r4, #0x24]
bic r0, r0, #0x1
str r0, [r4, #0x24]
ldmia sp!, {r4,pc}
.balign 4
-_020C1344: .word UNK_021D26D8
+_020C1344: .word sStrmList
- ; _end
- arm_func_start FUN_020C1348
-FUN_020C1348: ; 0x020C1348
+ local_arm_func_start ForceStopStrm
+ForceStopStrm: ; 0x020C1348
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r4, r0
@@ -192,13 +182,12 @@ FUN_020C1348: ; 0x020C1348
bl SND_WaitForCommandProc
_020C13B4:
mov r0, r4
- bl FUN_020C1318
+ bl ShutdownStrm
add sp, sp, #0x4
ldmia sp!, {r4-r5,pc}
- ; NNS_SndStrmSetVolume
- arm_func_start FUN_020C13C4
-FUN_020C13C4: ; 0x020C13C4
+ arm_func_start NNS_SndStrmSetVolume
+NNS_SndStrmSetVolume: ; 0x020C13C4
stmdb sp!, {r4-r8,lr}
mov r7, r0
str r1, [r7, #0x3c]
@@ -206,7 +195,7 @@ FUN_020C13C4: ; 0x020C13C4
mov r5, #0x0
cmp r0, #0x0
ldmleia sp!, {r4-r8,pc}
- ldr r4, _020C142C ; =UNK_021D2724
+ ldr r4, _020C142C ; =sStrmChannel
mov r8, #0x1
_020C13E8:
add r0, r7, r5
@@ -227,11 +216,10 @@ _020C13E8:
blt _020C13E8
ldmia sp!, {r4-r8,pc}
.balign 4
-_020C142C: .word UNK_021D2724
+_020C142C: .word sStrmChannel
- ; _end
- arm_func_start FUN_020C1430
-FUN_020C1430: ; 0x020C1430
+ arm_func_start NNS_SndStrmStop
+NNS_SndStrmStop: ; 0x020C1430
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr r1, [r0, #0x24]
@@ -239,13 +227,12 @@ FUN_020C1430: ; 0x020C1430
movs r1, r1, asr #0x1f
addeq sp, sp, #0x4
ldmeqia sp!, {pc}
- bl FUN_020C1348
+ bl ForceStopStrm
add sp, sp, #0x4
ldmia sp!, {pc}
- ; _end
- arm_func_start FUN_020C1458
-FUN_020C1458: ; 0x020C1458
+ arm_func_start NNS_SndStrmStart
+NNS_SndStrmStart: ; 0x020C1458
stmdb sp!, {r4,lr}
mov r4, r0
ldr r0, [r4, #0x40]
@@ -268,9 +255,8 @@ FUN_020C1458: ; 0x020C1458
str r0, [r4, #0x24]
ldmia sp!, {r4,pc}
- ; NNS_SndStrmSetup
- arm_func_start FUN_020C14AC
-FUN_020C14AC: ; 0x020C14AC
+ arm_func_start NNS_SndStrmSetup
+NNS_SndStrmSetup: ; 0x020C14AC
stmdb sp!, {r4-r11,lr}
sub sp, sp, #0x24
mov r10, r0
@@ -283,7 +269,7 @@ FUN_020C14AC: ; 0x020C14AC
mov r4, r3
str r1, [sp, #0x4c]
beq _020C14E0
- bl FUN_020C1430
+ bl NNS_SndStrmStop
_020C14E0:
ldr r0, [sp, #0x4c]
ldr r2, [r10, #0x48]
@@ -303,7 +289,7 @@ _020C14E0:
ldr r1, [sp, #0x4c]
bl _u32_div_f
str r0, [sp, #0x1c]
- bl FUN_020C02BC
+ bl NNS_SndAllocAlarm
str r0, [r10, #0x40]
ldr r0, [r10, #0x40]
cmp r0, #0x0
@@ -316,7 +302,7 @@ _020C14E0:
ble _020C15D4
ldr r0, [sp, #0x48]
mov r7, r0, lsl #0x5
- ldr r6, _020C1668 ; =UNK_021D2724
+ ldr r6, _020C1668 ; =sStrmChannel
mov r5, r8
mov r4, #0x7f
mov r11, #0x40
@@ -351,12 +337,12 @@ _020C15D4:
str r10, [sp, #0x0]
ldr r1, [sp, #0x1c]
ldr r0, [r10, #0x40]
- ldr r3, _020C166C ; =FUN_020C1308
+ ldr r3, _020C166C ; =AlarmCallback
mov r2, r1
bl SND_SetupAlarm
- ldr r0, _020C1670 ; =UNK_021D26D8
+ ldr r0, _020C1670 ; =sStrmList
mov r1, r10
- bl FUN_020ADBE8
+ bl NNS_FndAppendListObject
ldr r0, [sp, #0x4c]
str r9, [r10, #0x20]
str r0, [r10, #0x2c]
@@ -377,7 +363,7 @@ _020C15D4:
mov r0, r10
mov r1, #0x0
str r2, [r10, #0x2c]
- bl FUN_020C1254
+ bl StrmCallback
ldr r1, [sp, #0x4c]
mov r0, r4
str r1, [r10, #0x2c]
@@ -386,27 +372,25 @@ _020C15D4:
add sp, sp, #0x24
ldmia sp!, {r4-r11,pc}
.balign 4
-_020C1668: .word UNK_021D2724
-_020C166C: .word FUN_020C1308
-_020C1670: .word UNK_021D26D8
+_020C1668: .word sStrmChannel
+_020C166C: .word AlarmCallback
+_020C1670: .word sStrmList
- ; _end
- arm_func_start FUN_020C1674
-FUN_020C1674: ; 0x020C1674
+ arm_func_start NNS_SndStrmFreeChannel
+NNS_SndStrmFreeChannel: ; 0x020C1674
stmdb sp!, {r4,lr}
mov r4, r0
ldr r0, [r4, #0x44]
cmp r0, #0x0
ldmeqia sp!, {r4,pc}
- bl FUN_020C0340
+ bl NNS_SndUnlockChannel
mov r0, #0x0
str r0, [r4, #0x44]
str r0, [r4, #0x48]
ldmia sp!, {r4,pc}
- ; _end
- arm_func_start FUN_020C169C
-FUN_020C169C: ; 0x020C169C
+ arm_func_start NNS_SndStrmAllocChannel
+NNS_SndStrmAllocChannel: ; 0x020C169C
stmdb sp!, {r4-r6,lr}
mov r5, r1
mov r4, #0x0
@@ -426,7 +410,7 @@ _020C16BC:
blt _020C16BC
_020C16DC:
mov r0, r4
- bl FUN_020C0370
+ bl NNS_SndLockChannel
cmp r0, #0x0
moveq r0, #0x0
strne r5, [r6, #0x48]
@@ -434,24 +418,23 @@ _020C16DC:
movne r0, #0x1
ldmia sp!, {r4-r6,pc}
- ; NNS_SndStrmInit
- arm_func_start FUN_020C16FC
-FUN_020C16FC: ; 0x020C16FC
+ arm_func_start NNS_SndStrmInit
+NNS_SndStrmInit: ; 0x020C16FC
stmdb sp!, {r4,lr}
- ldr r1, _020C176C ; =UNK_021D26D4
+ ldr r1, _020C176C ; =bInitialized$7761
mov r4, r0
ldr r0, [r1, #0x0]
cmp r0, #0x0
bne _020C172C
- ldr r0, _020C1770 ; =UNK_021D26D8
+ ldr r0, _020C1770 ; =sStrmList
mov r1, #0x0
- bl FUN_020ADC74
- ldr r0, _020C176C ; =UNK_021D26D4
+ bl NNS_FndInitList
+ ldr r0, _020C176C ; =bInitialized$7761
mov r1, #0x1
str r1, [r0, #0x0]
_020C172C:
- ldr r1, _020C1774 ; =FUN_020C1208
- ldr r0, _020C1778 ; =FUN_020C1198
+ ldr r1, _020C1774 ; =BeginSleep
+ ldr r0, _020C1778 ; =EndSleep
str r1, [r4, #0x8]
str r4, [r4, #0xc]
str r0, [r4, #0x14]
@@ -467,8 +450,7 @@ _020C172C:
str r0, [r4, #0x24]
ldmia sp!, {r4,pc}
.balign 4
-_020C176C: .word UNK_021D26D4
-_020C1770: .word UNK_021D26D8
-_020C1774: .word FUN_020C1208
-_020C1778: .word FUN_020C1198
-
+_020C176C: .word bInitialized$7761
+_020C1770: .word sStrmList
+_020C1774: .word BeginSleep
+_020C1778: .word EndSleep
diff --git a/arm9/asm/NNS_SND_waveout.s b/arm9/asm/NNS_SND_waveout.s
index 4d5a536d..b3c6591f 100644
--- a/arm9/asm/NNS_SND_waveout.s
+++ b/arm9/asm/NNS_SND_waveout.s
@@ -3,16 +3,14 @@
.section .bss
- ; sWaveOut
- .global UNK_021D1CBC
-UNK_021D1CBC: ; 0x021D1CBC
+ .global sWaveOut
+sWaveOut: ; 0x021D1CBC
.space 0x140
.section .text
- ; _end
- arm_func_start FUN_020C03B8
-FUN_020C03B8: ; 0x020C03B8
+ arm_func_start NNS_SndWaveOutIsPlaying
+NNS_SndWaveOutIsPlaying: ; 0x020C03B8
stmdb sp!, {r4,lr}
mov r4, r0
ldr r0, [r4, #0x8]
@@ -40,9 +38,8 @@ _020C03F8:
streq r0, [r4, #0x8]
ldmia sp!, {r4,pc}
- ; _end
- arm_func_start FUN_020C041C
-FUN_020C041C: ; 0x020C041C
+ arm_func_start NNS_SndWaveOutSetPan
+NNS_SndWaveOutSetPan: ; 0x020C041C
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr r2, [r0, #0x8]
@@ -56,9 +53,8 @@ FUN_020C041C: ; 0x020C041C
add sp, sp, #0x4
ldmia sp!, {pc}
- ; NNS_SndWaveOutSetSpeed
- arm_func_start FUN_020C044C
-FUN_020C044C: ; 0x020C044C
+ arm_func_start NNS_SndWaveOutSetSpeed
+NNS_SndWaveOutSetSpeed: ; 0x020C044C
stmdb sp!, {r4-r5,lr}
sub sp, sp, #0x4
mov r5, r0
@@ -98,9 +94,8 @@ _020C04B8:
_020C04D4: .word 0xD87F8000
_020C04D8: .word 0x0000FFFF
- ; _end
- arm_func_start FUN_020C04DC
-FUN_020C04DC: ; 0x020C04DC
+ arm_func_start NNS_SndWaveOutSetVolume
+NNS_SndWaveOutSetVolume: ; 0x020C04DC
stmdb sp!, {lr}
sub sp, sp, #0x4
ldr r2, [r0, #0x8]
@@ -115,9 +110,8 @@ FUN_020C04DC: ; 0x020C04DC
add sp, sp, #0x4
ldmia sp!, {pc}
- ; _end
- arm_func_start FUN_020C0510
-FUN_020C0510: ; 0x020C0510
+ arm_func_start NNS_SndWaveOutStop
+NNS_SndWaveOutStop: ; 0x020C0510
stmdb sp!, {r4,lr}
mov r4, r0
ldr r0, [r4, #0x8]
@@ -134,9 +128,8 @@ FUN_020C0510: ; 0x020C0510
str r0, [r4, #0x8]
ldmia sp!, {r4,pc}
- ; NNS_SndWaveOutStart
- arm_func_start FUN_020C054C
-FUN_020C054C: ; 0x020C054C
+ arm_func_start NNS_SndWaveOutStart
+NNS_SndWaveOutStart: ; 0x020C054C
stmdb sp!, {r4-r9,lr}
sub sp, sp, #0x1c
movs r8, r1
@@ -215,36 +208,33 @@ _020C05E0:
_020C0668: .word 0xD87F8000
_020C066C: .word 0x0000FFFF
- ; NNS_SndWaveOutFreeChannel
- arm_func_start FUN_020C0670
-FUN_020C0670: ; 0x020C0670
+ arm_func_start NNS_SndWaveOutFreeChannel
+NNS_SndWaveOutFreeChannel: ; 0x020C0670
ldr r0, [r0, #0x0]
mov r1, #0x1
- ldr ip, _020C0684 ; =FUN_020C0340
+ ldr ip, _020C0684 ; =NNS_SndUnlockChannel
mov r0, r1, lsl r0
bx r12
.balign 4
-_020C0684: .word FUN_020C0340
+_020C0684: .word NNS_SndUnlockChannel
- ; NNS_SndWaveOutAllocChannel
- arm_func_start FUN_020C0688
-FUN_020C0688: ; 0x020C0688
+ arm_func_start NNS_SndWaveOutAllocChannel
+NNS_SndWaveOutAllocChannel: ; 0x020C0688
stmdb sp!, {r4,lr}
mov r4, r0
mov r0, #0x1
mov r0, r0, lsl r4
- bl FUN_020C0370
+ bl NNS_SndLockChannel
cmp r0, #0x0
moveq r0, #0x0
ldmeqia sp!, {r4,pc}
mov r0, #0x14
mul r0, r4, r0
- ldr r2, _020C06C8 ; =UNK_021D1CBC
+ ldr r2, _020C06C8 ; =sWaveOut
mov r1, #0x0
str r4, [r2, r0]
add r0, r2, r0
str r1, [r0, #0x8]
ldmia sp!, {r4,pc}
.balign 4
-_020C06C8: .word UNK_021D1CBC
-
+_020C06C8: .word sWaveOut
diff --git a/arm9/asm/macros/function.inc b/arm9/asm/macros/function.inc
index 6b9e5f40..3323f53e 100644
--- a/arm9/asm/macros/function.inc
+++ b/arm9/asm/macros/function.inc
@@ -4,6 +4,11 @@
.arm
.endm
+ .macro local_arm_func_start name
+ .balign 4, 0
+ .arm
+ .endm
+
.macro arm_func_end name
.size \name, .-\name
.endm
diff --git a/arm9/asm/unk_020040F4.s b/arm9/asm/unk_020040F4.s
index e2418c14..5e62cb80 100644
--- a/arm9/asm/unk_020040F4.s
+++ b/arm9/asm/unk_020040F4.s
@@ -922,7 +922,7 @@ _02004800:
add r0, r4, #0x0
bl FUN_02003FF4
add r1, r5, #0x0
- bl FUN_020C0F8C
+ bl NNS_SndPlayerPause
strb r5, [r6, #0x0]
_0200480E:
pop {r4-r6, pc}
@@ -948,7 +948,7 @@ FUN_02004828: ; 0x02004828
bl FUN_02003FF4
add r1, r5, #0x0
add r2, r4, #0x0
- bl FUN_020C0EF4
+ bl NNS_SndPlayerMoveVolume
pop {r3-r5, pc}
thumb_func_start FUN_0200483C
@@ -964,7 +964,7 @@ _02004844:
_0200484A:
bl FUN_02003FF4
add r1, r4, #0x0
- bl FUN_020C0F30
+ bl NNS_SndPlayerSetInitialVolume
pop {r4, pc}
.balign 4
@@ -972,7 +972,7 @@ _0200484A:
FUN_02004858: ; 0x02004858
push {r3-r5, lr}
add r5, r1, #0x0
- bl FUN_020C23FC
+ bl NNS_SndArcGetSeqParam
cmp r5, #0x1
beq _02004868
cmp r5, #0x8
@@ -1018,7 +1018,7 @@ FUN_020048A0: ; 0x020048A0
add r1, r5, #0x0
add r3, r2, #0x0
str r4, [sp, #0x0]
- bl FUN_020C3910
+ bl NNS_SndArcPlayerStartSeqEx
pop {r3-r5, pc}
.balign 4
@@ -1030,7 +1030,7 @@ FUN_020048BC: ; 0x020048BC
bl ErrorHandling
_020048C6:
add r0, r4, #0x0
- bl FUN_020C0F50
+ bl NNS_SndPlayerCountPlayingSeqByPlayerNo
pop {r4, pc}
.balign 4
@@ -1042,7 +1042,7 @@ FUN_020048D0: ; 0x020048D0
mov r0, #0xff
pop {r3, pc}
_020048DA:
- bl FUN_020C23FC
+ bl NNS_SndArcGetSeqParam
cmp r0, #0x0
bne _020048E6
mov r0, #0xff
@@ -1054,22 +1054,22 @@ _020048E6:
thumb_func_start FUN_020048EC
FUN_020048EC: ; 0x020048EC
- ldr r3, _020048F0 ; =FUN_020C0E14
+ ldr r3, _020048F0 ; =NNS_SndPlayerGetSeqNo
bx r3
.balign 4
-_020048F0: .word FUN_020C0E14
+_020048F0: .word NNS_SndPlayerGetSeqNo
thumb_func_start FUN_020048F4
FUN_020048F4: ; 0x020048F4
push {r3, lr}
bl FUN_02004900
- bl FUN_020C22D0
+ bl NNS_SndArcGetBankInfo
pop {r3, pc}
thumb_func_start FUN_02004900
FUN_02004900: ; 0x02004900
push {r3, lr}
- bl FUN_020C23FC
+ bl NNS_SndArcGetSeqParam
cmp r0, #0x0
bne _0200490E
mov r0, #0x0
@@ -1166,7 +1166,7 @@ _020049A8:
bl FUN_02003D38
add r4, r0, #0x0
add r0, r5, #0x0
- bl FUN_020C0688
+ bl NNS_SndWaveOutAllocChannel
str r0, [r4, #0x0]
cmp r0, #0x0
bne _020049CA
@@ -1187,7 +1187,7 @@ _020049D6:
bl FUN_02003D38
add r6, r0, #0x0
add r0, r5, #0x0
- bl FUN_020C0688
+ bl NNS_SndWaveOutAllocChannel
str r0, [r6, #0x0]
cmp r0, #0x0
bne _020049F4
@@ -1230,7 +1230,7 @@ _02004A2A:
add r0, r5, #0x0
bl FUN_02004930
ldr r0, [r0, #0x0]
- bl FUN_020C0670
+ bl NNS_SndWaveOutFreeChannel
mov r0, #0x0
strb r0, [r6, #0x0]
pop {r4-r6, pc}
@@ -1244,7 +1244,7 @@ _02004A4C:
add r0, r5, #0x0
bl FUN_02004930
ldr r0, [r0, #0x0]
- bl FUN_020C0670
+ bl NNS_SndWaveOutFreeChannel
mov r0, #0x0
strb r0, [r4, #0x0]
pop {r4-r6, pc}
@@ -1276,7 +1276,7 @@ FUN_02004A6C: ; 0x02004A6C
ldr r2, [r3, #0x8]
ldr r0, [r0, #0x0]
ldr r3, [r3, #0xc]
- bl FUN_020C054C
+ bl NNS_SndWaveOutStart
add r5, r0, #0x0
bne _02004AA4
add r0, r4, #0x0
@@ -1292,7 +1292,7 @@ FUN_02004AAC: ; 0x02004AAC
push {r3, lr}
bl FUN_02004930
ldr r0, [r0, #0x0]
- bl FUN_020C0510
+ bl NNS_SndWaveOutStop
pop {r3, pc}
.balign 4
@@ -1301,7 +1301,7 @@ FUN_02004ABC: ; 0x02004ABC
push {r3, lr}
bl FUN_02004930
ldr r0, [r0, #0x0]
- bl FUN_020C03B8
+ bl NNS_SndWaveOutIsPlaying
pop {r3, pc}
.balign 4
@@ -1316,7 +1316,7 @@ _02004AD6:
bl FUN_02004930
ldr r0, [r0, #0x0]
add r1, r4, #0x0
- bl FUN_020C041C
+ bl NNS_SndWaveOutSetPan
pop {r4, pc}
thumb_func_start FUN_02004AE4
@@ -1326,7 +1326,7 @@ FUN_02004AE4: ; 0x02004AE4
bl FUN_02004930
ldr r0, [r0, #0x0]
add r1, r4, #0x0
- bl FUN_020C044C
+ bl NNS_SndWaveOutSetSpeed
pop {r4, pc}
.balign 4
@@ -1346,14 +1346,14 @@ FUN_02004AF8: ; 0x02004AF8
bl _s32_div_f
add r1, r0, #0x0
ldr r0, [r4, #0x0]
- bl FUN_020C04DC
+ bl NNS_SndWaveOutSetVolume
pop {r3-r5, pc}
_02004B20:
add r0, r4, #0x0
bl FUN_02004930
ldr r0, [r0, #0x0]
add r1, r5, #0x0
- bl FUN_020C04DC
+ bl NNS_SndWaveOutSetVolume
pop {r3-r5, pc}
thumb_func_start FUN_02004B30
@@ -1375,7 +1375,7 @@ FUN_02004B30: ; 0x02004B30
bl ErrorHandling
_02004B54:
add r0, r6, #0x0
- bl FUN_020C226C
+ bl NNS_SndArcGetWaveArcInfo
add r7, r0, #0x0
bne _02004B68
bl ErrorHandling
@@ -1386,7 +1386,7 @@ _02004B68:
ldr r0, [r7, #0x0]
lsl r0, r0, #0x8
lsr r0, r0, #0x8
- bl FUN_020C217C
+ bl NNS_SndArcGetFileSize
add r6, r0, #0x0
bne _02004B80
bl ErrorHandling
@@ -1416,7 +1416,7 @@ _02004B9C:
lsr r0, r0, #0x8
add r2, r6, #0x0
mov r3, #0x0
- bl FUN_020C2104
+ bl NNS_SndArcReadFile
mov r1, #0x0
mvn r1, r1
cmp r0, r1
@@ -1518,10 +1518,10 @@ _02004C76:
thumb_func_start FUN_02004C78
FUN_02004C78: ; 0x02004C78
- ldr r3, _02004C7C ; =FUN_020C1E58
+ ldr r3, _02004C7C ; =NNS_SndCaptureIsActive
bx r3
.balign 4
-_02004C7C: .word FUN_020C1E58
+_02004C7C: .word NNS_SndCaptureIsActive
thumb_func_start FUN_02004C80
FUN_02004C80: ; 0x02004C80
@@ -1537,23 +1537,23 @@ FUN_02004C80: ; 0x02004C80
mov r2, #0x0
lsl r3, r3, #0x6
str r4, [sp, #0x0]
- bl FUN_020C1FF0
+ bl NNS_SndCaptureStartReverb
add sp, #0x4
pop {r3-r4, pc}
thumb_func_start FUN_02004CA4
FUN_02004CA4: ; 0x02004CA4
- ldr r3, _02004CA8 ; =FUN_020C1F54
+ ldr r3, _02004CA8 ; =NNS_SndCaptureStopReverb
bx r3
.balign 4
-_02004CA8: .word FUN_020C1F54
+_02004CA8: .word NNS_SndCaptureStopReverb
thumb_func_start FUN_02004CAC
FUN_02004CAC: ; 0x02004CAC
- ldr r3, _02004CB0 ; =FUN_020C1FA4
+ ldr r3, _02004CB0 ; =NNS_SndCaptureSetReverbVolume
bx r3
.balign 4
-_02004CB0: .word FUN_020C1FA4
+_02004CB0: .word NNS_SndCaptureSetReverbVolume
thumb_func_start FUN_02004CB4
FUN_02004CB4: ; 0x02004CB4
@@ -1579,7 +1579,7 @@ FUN_02004CB4: ; 0x02004CB4
ldr r3, _02004CF8 ; =0x000055F0
add r0, r4, #0x0
mov r2, #0x0
- bl FUN_020C1EA4
+ bl NNS_SndCaptureStartEffect
add sp, #0xc
pop {r3-r4, pc}
nop
@@ -1588,10 +1588,10 @@ _02004CF8: .word 0x000055F0
thumb_func_start FUN_02004CFC
FUN_02004CFC: ; 0x02004CFC
- ldr r3, _02004D00 ; =FUN_020C1E68
+ ldr r3, _02004D00 ; =NNS_SndCaptureStopEffect
bx r3
.balign 4
-_02004D00: .word FUN_020C1E68
+_02004D00: .word NNS_SndCaptureStopEffect
thumb_func_start FUN_02004D04
FUN_02004D04: ; 0x02004D04
@@ -1619,7 +1619,7 @@ FUN_02004D20: ; 0x02004D20
bl FUN_02003FF4
add r1, r5, #0x0
add r2, r4, #0x0
- bl FUN_020C0EA4
+ bl NNS_SndPlayerSetTrackPitch
pop {r3-r5, pc}
thumb_func_start FUN_02004D34
@@ -1642,14 +1642,14 @@ FUN_02004D4C: ; 0x02004D4C
bl FUN_02003FF4
add r1, r5, #0x0
add r2, r4, #0x0
- bl FUN_020C0E7C
+ bl NNS_SndPlayerSetTrackPan
pop {r3-r5, pc}
thumb_func_start FUN_02004D60
FUN_02004D60: ; 0x02004D60
push {r4, lr}
add r4, r0, #0x0
- bl FUN_020C0174
+ bl NNS_SndSetMonoFlag
ldr r0, _02004D70 ; =UNK_021C3DD8
str r4, [r0, #0x0]
pop {r4, pc}
@@ -1866,7 +1866,7 @@ FUN_02004ED0: ; 0x02004ED0
_02004EF0:
mov r0, #0x1
_02004EF2:
- bl FUN_020C226C
+ bl NNS_SndArcGetWaveArcInfo
cmp r0, #0x0
bne _02004F02
bl ErrorHandling
@@ -1876,7 +1876,7 @@ _02004F02:
ldr r0, [r0, #0x0]
lsl r0, r0, #0x8
lsr r0, r0, #0x8
- bl FUN_020C20DC
+ bl NNS_SndArcGetFileAddress
cmp r0, #0x0
bne _02004F18
bl ErrorHandling
@@ -1928,7 +1928,7 @@ _02004F62:
FUN_02004F64: ; 0x02004F64
push {r3, lr}
bl FUN_02003FF4
- bl FUN_020C0DD4
+ bl NNS_SndPlayerGetTick
pop {r3, pc}
thumb_func_start FUN_02004F70
@@ -2216,12 +2216,12 @@ _0200515A:
thumb_func_start FUN_02005160
FUN_02005160: ; 0x02005160
- ldr r3, _02005168 ; =FUN_020C1148
+ ldr r3, _02005168 ; =NNS_SndPlayerSetAllocatableChannel
add r1, r0, #0x0
mov r0, #0x7
bx r3
.balign 4
-_02005168: .word FUN_020C1148
+_02005168: .word NNS_SndPlayerSetAllocatableChannel
thumb_func_start FUN_0200516C
FUN_0200516C: ; 0x0200516C
@@ -2282,7 +2282,7 @@ _020051E8: .word 0x0000047E
thumb_func_start FUN_020051EC
FUN_020051EC: ; 0x020051EC
- ldr r3, _020051F0 ; =FUN_020C1180
+ ldr r3, _020051F0 ; =NNS_SndPlayerSetPlayerVolume
bx r3
.balign 4
-_020051F0: .word FUN_020C1180
+_020051F0: .word NNS_SndPlayerSetPlayerVolume
diff --git a/arm9/asm/unk_020051F4.s b/arm9/asm/unk_020051F4.s
index ccb8d272..12b0c8cb 100644
--- a/arm9/asm/unk_020051F4.s
+++ b/arm9/asm/unk_020051F4.s
@@ -12,7 +12,7 @@ FUN_020051F4: ; 0x020051F4
add r4, r0, #0x0
bl FUN_02003FF4
add r1, r5, #0x0
- bl FUN_020C3980
+ bl NNS_SndArcPlayerStartSeq
add r6, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
@@ -90,7 +90,7 @@ FUN_02005288: ; 0x02005288
add r0, r4, #0x0
bl FUN_02003FF4
add r1, r5, #0x0
- bl FUN_020C3980
+ bl NNS_SndArcPlayerStartSeq
pop {r3-r5, pc}
.balign 4
@@ -123,7 +123,7 @@ FUN_020052B8: ; 0x020052B8
add r0, r6, #0x0
add r3, r1, #0x0
str r5, [sp, #0x0]
- bl FUN_020C3910
+ bl NNS_SndArcPlayerStartSeqEx
add sp, #0x4
pop {r3-r6, pc}
.balign 4
@@ -152,7 +152,7 @@ _0200532A:
mov r0, #0x7
bl FUN_02003FF4
add r1, r5, #0x0
- bl FUN_020C3980
+ bl NNS_SndArcPlayerStartSeq
add r4, r0, #0x0
add r0, r5, #0x0
bl FUN_02004110
@@ -165,14 +165,14 @@ _0200532A:
FUN_02005350: ; 0x02005350
push {r4, lr}
add r4, r0, #0x0
- bl FUN_020C0FDC
+ bl NNS_SndPlayerStopSeqBySeqNo
add r0, r4, #0x0
bl FUN_020048D0
cmp r0, #0xff
beq _0200536E
bl FUN_02004018
bl FUN_02003FF4
- bl FUN_020C0F68
+ bl NNS_SndHandleReleaseSeq
_0200536E:
bl FUN_02005374
pop {r4, pc}
@@ -270,7 +270,7 @@ FUN_0200541C: ; 0x0200541C
bl FUN_02003D38
add r4, r0, #0x0
mov r0, #0x0
- bl FUN_020C0F9C
+ bl NNS_SndPlayerStopSeqAll
ldrb r0, [r5, #0x0]
cmp r0, #0x1
bne _02005440
@@ -299,7 +299,7 @@ FUN_02005454: ; 0x02005454
mov r0, #0x7
bl FUN_02003FF4
mov r1, #0x0
- bl FUN_020C10A4
+ bl NNS_SndPlayerStopSeq
bl FUN_02005374
mov r5, #0x0
add r4, r5, #0x0
@@ -351,7 +351,7 @@ FUN_020054C8: ; 0x020054C8
add r4, r0, #0x0
bl FUN_02003FF4
add r1, r5, #0x0
- bl FUN_020C3980
+ bl NNS_SndArcPlayerStartSeq
add r6, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
@@ -362,10 +362,10 @@ FUN_020054C8: ; 0x020054C8
thumb_func_start FUN_020054F0
FUN_020054F0: ; 0x020054F0
- ldr r3, _020054F4 ; =FUN_020C0FDC
+ ldr r3, _020054F4 ; =NNS_SndPlayerStopSeqBySeqNo
bx r3
.balign 4
-_020054F4: .word FUN_020C0FDC
+_020054F4: .word NNS_SndPlayerStopSeqBySeqNo
thumb_func_start FUN_020054F8
FUN_020054F8: ; 0x020054F8
@@ -373,7 +373,7 @@ FUN_020054F8: ; 0x020054F8
add r4, r1, #0x0
bl FUN_02003FF4
add r1, r4, #0x0
- bl FUN_020C10A4
+ bl NNS_SndPlayerStopSeq
pop {r4, pc}
thumb_func_start FUN_02005508
@@ -411,7 +411,7 @@ FUN_02005530: ; 0x02005530
bl FUN_02003FF4
add r1, r5, #0x0
add r2, r4, #0x0
- bl FUN_020C0E7C
+ bl NNS_SndPlayerSetTrackPan
pop {r3-r5, pc}
thumb_func_start FUN_0200554C
@@ -428,7 +428,7 @@ _0200555C:
bl FUN_02003FF4
add r1, r7, #0x0
add r2, r6, #0x0
- bl FUN_020C0E7C
+ bl NNS_SndPlayerSetTrackPan
add r5, r5, #0x1
cmp r5, #0x4
blt _0200555C
@@ -483,7 +483,7 @@ _020055BC:
sub r1, r1, #0x3
add r2, r5, #0x0
add r3, r1, #0x0
- bl FUN_020C3910
+ bl NNS_SndArcPlayerStartSeqEx
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x1
@@ -497,7 +497,7 @@ _020055E8:
sub r1, r1, #0x3
add r2, r5, #0x0
add r3, r1, #0x0
- bl FUN_020C3910
+ bl NNS_SndArcPlayerStartSeqEx
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x8
@@ -525,11 +525,11 @@ FUN_02005614: ; 0x02005614
mov r0, #0x1
bl FUN_02003FF4
add r1, r5, #0x0
- bl FUN_020C10A4
+ bl NNS_SndPlayerStopSeq
mov r0, #0x8
bl FUN_02003FF4
add r1, r5, #0x0
- bl FUN_020C10A4
+ bl NNS_SndPlayerStopSeq
ldrb r0, [r6, #0x0]
cmp r0, #0x1
bne _02005658
@@ -1239,7 +1239,7 @@ _02005C48:
mov r0, #0x2
bl FUN_02003FF4
add r1, r5, #0x0
- bl FUN_020C3980
+ bl NNS_SndArcPlayerStartSeq
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x2
@@ -1279,7 +1279,7 @@ FUN_02005CA0: ; 0x02005CA0
mov r0, #0x2
bl FUN_02003FF4
add r1, r4, #0x0
- bl FUN_020C10A4
+ bl NNS_SndPlayerStopSeq
mov r0, #0x6
bl FUN_02004748
bl FUN_02003F64
diff --git a/arm9/asm/unk_02006864.s b/arm9/asm/unk_02006864.s
index 5bd62750..75adbe92 100644
--- a/arm9/asm/unk_02006864.s
+++ b/arm9/asm/unk_02006864.s
@@ -5,8 +5,8 @@
.global UNK_020ECB98
UNK_020ECB98: ; 0x020ECB98
- .word FUN_020B1768
- .word FUN_020B1528
+ .word NNS_G2dLoadImage1DMapping
+ .word NNS_G2dLoadImage2DMapping
.global UNK_020ECBA0
UNK_020ECBA0: ; 0x020ECBA0
@@ -14,7 +14,7 @@ UNK_020ECBA0: ; 0x020ECBA0
.global UNK_020ECBA8
UNK_020ECBA8: ; 0x020ECBA8
- .word FUN_020B1768, FUN_020B1528
+ .word NNS_G2dLoadImage1DMapping, NNS_G2dLoadImage2DMapping
.global UNK_020ECBB0
UNK_020ECBB0: ; 0x020ECBB0
@@ -38,7 +38,7 @@ FUN_0200687C: ; 0x0200687C
add r7, r0, #0x0
beq _020068C2
add r1, sp, #0x4
- bl FUN_020B0030
+ bl NNS_G2dGetUnpackedBGCharacterData
cmp r0, #0x0
beq _020068BC
cmp r4, #0x0
@@ -78,7 +78,7 @@ FUN_020068C8: ; 0x020068C8
add r7, r0, #0x0
beq _0200692C
add r1, sp, #0x4
- bl FUN_020B0180
+ bl NNS_G2dGetUnpackedScreenData
cmp r0, #0x0
beq _02006926
cmp r4, #0x0
@@ -147,7 +147,7 @@ FUN_02006948: ; 0x02006948
cmp r0, #0x0
beq _02006A2A
add r1, sp, #0x8
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
cmp r0, #0x0
beq _02006A24
ldr r0, [sp, #0x8]
@@ -262,7 +262,7 @@ FUN_02006A34: ; 0x02006A34
add r7, r0, #0x0
beq _02006A80
add r1, sp, #0x4
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
cmp r0, #0x0
beq _02006A7A
cmp r4, #0x0
@@ -306,11 +306,11 @@ FUN_02006A8C: ; 0x02006A8C
add r6, r0, #0x0
beq _02006AE0
add r1, sp, #0x4
- bl FUN_020B00F0
+ bl NNS_G2dGetUnpackedPaletteCompressInfo
add r7, r0, #0x0
add r0, r6, #0x0
add r1, sp, #0x8
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
cmp r0, #0x0
beq _02006ADA
cmp r7, #0x0
@@ -321,14 +321,14 @@ FUN_02006A8C: ; 0x02006A8C
ldr r0, [sp, #0x8]
ldr r1, [sp, #0x4]
add r3, r5, #0x0
- bl FUN_020B10E8
+ bl NNS_G2dLoadPaletteEx
b _02006ADA
_02006ACE:
ldr r0, [sp, #0x8]
ldr r3, [sp, #0x24]
add r1, r4, #0x0
add r2, r5, #0x0
- bl FUN_020B1240
+ bl NNS_G2dLoadPalette
_02006ADA:
add r0, r6, #0x0
bl FreeToHeap
@@ -349,7 +349,7 @@ FUN_02006AE4: ; 0x02006AE4
ldr r4, _02006B30 ; =0x00000000
beq _02006B28
add r1, sp, #0x4
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
cmp r0, #0x0
beq _02006B22
ldr r1, [sp, #0x18]
@@ -391,7 +391,7 @@ FUN_02006B38: ; 0x02006B38
add r4, r0, #0x0
beq _02006B9E
add r1, sp, #0x4
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
cmp r0, #0x0
beq _02006B98
ldr r1, [sp, #0x18]
@@ -453,7 +453,7 @@ FUN_02006BB0: ; 0x02006BB0
add r5, r0, #0x0
beq _02006BD6
add r1, r4, #0x0
- bl FUN_020B0030
+ bl NNS_G2dGetUnpackedBGCharacterData
cmp r0, #0x0
bne _02006BD6
add r0, r5, #0x0
@@ -476,7 +476,7 @@ FUN_02006BDC: ; 0x02006BDC
add r5, r0, #0x0
beq _02006C02
add r1, r4, #0x0
- bl FUN_020B0180
+ bl NNS_G2dGetUnpackedScreenData
cmp r0, #0x0
bne _02006C02
add r0, r5, #0x0
@@ -498,7 +498,7 @@ FUN_02006C08: ; 0x02006C08
add r4, r0, #0x0
beq _02006C2C
add r1, r5, #0x0
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
cmp r0, #0x0
bne _02006C2C
add r0, r4, #0x0
@@ -520,7 +520,7 @@ FUN_02006C30: ; 0x02006C30
add r5, r0, #0x0
beq _02006C56
add r1, r4, #0x0
- bl FUN_020AFEB8
+ bl NNS_G2dGetUnpackedCellBank
cmp r0, #0x0
bne _02006C56
add r0, r5, #0x0
@@ -543,7 +543,7 @@ FUN_02006C5C: ; 0x02006C5C
add r5, r0, #0x0
beq _02006C82
add r1, r4, #0x0
- bl thunk_FUN_020afda0_2
+ bl NNS_G2dGetUnpackedAnimBank
cmp r0, #0x0
bne _02006C82
add r0, r5, #0x0
diff --git a/arm9/asm/unk_02006D98.s b/arm9/asm/unk_02006D98.s
index c1e95596..4b0a737d 100644
--- a/arm9/asm/unk_02006D98.s
+++ b/arm9/asm/unk_02006D98.s
@@ -144,7 +144,7 @@ _02006E12:
add r5, #0x98
cmp r6, #0x4
blt _02006E12
- bl FUN_020B02C8
+ bl NNS_G2dSetupSoftwareSpriteCamera
ldr r2, _02006EC8 ; =0x000002E3
mov r0, #0x0
strb r0, [r4, r2]
@@ -155,7 +155,7 @@ _02006E12:
bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0xc
str r0, [sp, #0x4]
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
ldr r0, [sp, #0xc]
mov r1, #0xaf
ldr r0, [r0, #0x4]
@@ -235,7 +235,7 @@ FUN_02006ED4: ; 0x02006ED4
bl FUN_020082A8
add r0, r5, #0x0
bl FUN_020086F4
- bl FUN_020BB394
+ bl NNS_G3dGeFlushBuffer
mov r6, #0x9f
mov r0, #0x0
ldr r4, _02007250 ; =0x04000444
@@ -295,7 +295,7 @@ _02006F48:
add r1, #0x24
blx r2
_02006F56:
- bl FUN_020BB394
+ bl NNS_G3dGeFlushBuffer
ldr r0, _02007258 ; =0x000002E3
ldrb r0, [r5, r0]
cmp r0, #0x1
@@ -505,7 +505,7 @@ _02006F7E:
add r2, r3, r2
asr r1, r1, #0x10
mov r3, r12
- bl FUN_020B0250
+ bl NNS_G2dDrawSpriteFast
b _02007174
_02007104:
mov r0, #0x34
@@ -562,7 +562,7 @@ _02007104:
lsl r1, r1, #0x10
asr r1, r1, #0x10
add r2, r6, r2
- bl FUN_020B0250
+ bl NNS_G2dDrawSpriteFast
_02007174:
add r0, r4, #0x0
add r0, #0x6c
@@ -725,7 +725,7 @@ _0200727C:
lsl r1, r1, #0x10
ldr r2, _020072E0 ; =0xFFFFFC18
asr r1, r1, #0x10
- bl FUN_020B0250
+ bl NNS_G2dDrawSpriteFast
_020072BC:
ldr r0, [sp, #0x14]
add r4, #0x98
@@ -2884,7 +2884,7 @@ FUN_020081C4: ; 0x020081C4
strb r1, [r4, r0]
sub r0, #0x81
add r0, r4, r0
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
mov r3, #0xae
lsl r3, r3, #0x2
mov r1, #0x20
@@ -2910,7 +2910,7 @@ FUN_020081C4: ; 0x020081C4
ldr r1, [r4, r1]
mov r2, #0x0
add r3, r4, r3
- bl FUN_020B1528
+ bl NNS_G2dLoadImage2DMapping
_02008212:
ldr r0, _02008258 ; =0x000002E2
ldrb r1, [r4, r0]
@@ -2920,7 +2920,7 @@ _02008212:
strb r1, [r4, r0]
sub r0, #0x5e
add r0, r4, r0
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
mov r3, #0xaa
lsl r3, r3, #0x2
add r0, r3, #0x0
@@ -2941,7 +2941,7 @@ _02008212:
add r0, r4, r0
mov r2, #0x0
add r3, r4, r3
- bl FUN_020B1240
+ bl NNS_G2dLoadPalette
_02008252:
pop {r4, pc}
.balign 4
@@ -3037,7 +3037,7 @@ _020082CC:
bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0x58
str r0, [sp, #0x4c]
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
ldr r0, [sp, #0x58]
mov r1, #0xaf
ldr r0, [r0, #0x4]
@@ -3600,7 +3600,7 @@ _02008706:
bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0x18
str r0, [sp, #0x10]
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
ldr r0, [sp, #0x18]
mov r7, #0x0
ldr r1, [r0, #0x0]
@@ -3646,7 +3646,7 @@ _0200874A:
bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0x18
str r0, [sp, #0x4]
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
ldr r0, [sp, #0x18]
mov r7, #0xad
ldr r0, [r0, #0xc]
diff --git a/arm9/asm/unk_02008DEC.s b/arm9/asm/unk_02008DEC.s
index 1b0161ae..b05df5ca 100644
--- a/arm9/asm/unk_02008DEC.s
+++ b/arm9/asm/unk_02008DEC.s
@@ -1457,7 +1457,7 @@ FUN_0200986C: ; 0x0200986C
add r4, r0, #0x0
add r0, r6, #0x0
add r1, r4, #0x0
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
str r5, [r4, #0x4]
add r0, r4, #0x0
pop {r4-r6, pc}
@@ -1475,7 +1475,7 @@ FUN_0200988C: ; 0x0200988C
add r4, r0, #0x0
add r0, r7, #0x0
add r1, r4, #0x0
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
str r5, [r4, #0x4]
str r6, [r4, #0x8]
add r0, r4, #0x0
@@ -1492,7 +1492,7 @@ FUN_020098B0: ; 0x020098B0
add r4, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
- bl FUN_020AFEB8
+ bl NNS_G2dGetUnpackedCellBank
add r0, r4, #0x0
pop {r3-r5, pc}
.balign 4
@@ -1507,7 +1507,7 @@ FUN_020098CC: ; 0x020098CC
add r4, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
- bl thunk_FUN_020afda0_2
+ bl NNS_G2dGetUnpackedAnimBank
add r0, r4, #0x0
pop {r3-r5, pc}
.balign 4
@@ -1522,7 +1522,7 @@ FUN_020098E8: ; 0x020098E8
add r4, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
- bl FUN_020AFFD8
+ bl NNS_G2dGetUnpackedMultiCellBank
add r0, r4, #0x0
pop {r3-r5, pc}
.balign 4
@@ -1537,7 +1537,7 @@ FUN_02009904: ; 0x02009904
add r4, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
- bl thunk_FUN_020afda0
+ bl NNS_G2dGetUnpackedMCAnimBank
add r0, r4, #0x0
pop {r3-r5, pc}
.balign 4
@@ -2266,7 +2266,7 @@ FUN_02009E88: ; 0x02009E88
mov r1, #0x0
bl FUN_02009E54
add r1, r4, #0x0
- bl FUN_020B19C4
+ bl NNS_G2dGetImagePaletteLocation
mov r1, #0x0
mvn r1, r1
cmp r0, r1
diff --git a/arm9/asm/unk_02009EAC.s b/arm9/asm/unk_02009EAC.s
index a6a7e7d7..2c51446b 100644
--- a/arm9/asm/unk_02009EAC.s
+++ b/arm9/asm/unk_02009EAC.s
@@ -95,7 +95,7 @@ _02009F1C:
lsl r2, r4, #0x10
lsr r1, r1, #0x10
lsr r2, r2, #0x10
- bl FUN_020B0E34
+ bl NNS_G2dGetNewOamManagerInstance
cmp r0, #0x0
bne _02009F48
bl ErrorHandling
@@ -118,7 +118,7 @@ _02009F48:
lsr r1, r1, #0x10
lsr r2, r2, #0x10
lsr r3, r3, #0x10
- bl FUN_020B0E34
+ bl NNS_G2dGetNewOamManagerInstance
cmp r0, #0x0
bne _02009F78
bl ErrorHandling
@@ -135,11 +135,11 @@ FUN_02009F80: ; 0x02009F80
ldr r0, [r0, #0x0]
cmp r0, #0x0
beq _02009F98
- bl FUN_020B0870
+ bl NNS_G2dApplyAndResetOamManagerBuffer
ldr r0, _02009F9C ; =UNK_021C4670
ldr r0, [r0, #0x0]
add r0, #0x1c
- bl FUN_020B0870
+ bl NNS_G2dApplyAndResetOamManagerBuffer
_02009F98:
pop {r3, pc}
nop
@@ -264,7 +264,7 @@ FUN_0200A074: ; 0x0200A074
add r2, r1, #0x0
ldr r0, [r0, #0x0]
add r1, r3, #0x0
- bl FUN_020B0C7C
+ bl NNS_G2dEntryOamManagerOamWithAffineIdx
add r4, r0, #0x0
bne _0200A08C
bl ErrorHandling
@@ -283,7 +283,7 @@ FUN_0200A094: ; 0x0200A094
ldr r0, [r0, #0x0]
add r1, r3, #0x0
add r0, #0x1c
- bl FUN_020B0C7C
+ bl NNS_G2dEntryOamManagerOamWithAffineIdx
add r4, r0, #0x0
bne _0200A0AE
bl ErrorHandling
@@ -299,7 +299,7 @@ FUN_0200A0B8: ; 0x0200A0B8
add r1, r0, #0x0
ldr r0, _0200A0D4 ; =UNK_021C4670
ldr r0, [r0, #0x0]
- bl FUN_020B0BB0
+ bl NNS_G2dEntryOamManagerAffine
add r4, r0, #0x0
ldr r0, _0200A0D8 ; =0x0000FFFE
cmp r4, r0
@@ -319,7 +319,7 @@ FUN_0200A0DC: ; 0x0200A0DC
ldr r0, _0200A0FC ; =UNK_021C4670
ldr r0, [r0, #0x0]
add r0, #0x1c
- bl FUN_020B0BB0
+ bl NNS_G2dEntryOamManagerAffine
add r4, r0, #0x0
ldr r0, _0200A100 ; =0x0000FFFE
cmp r4, r0
diff --git a/arm9/asm/unk_0200BB14.s b/arm9/asm/unk_0200BB14.s
index 04f67c6e..7a041be2 100644
--- a/arm9/asm/unk_0200BB14.s
+++ b/arm9/asm/unk_0200BB14.s
@@ -90,7 +90,7 @@ _0200BB8A:
ldr r1, [r5, #0x0]
add r0, r7, #0x0
bl FUN_0201E00C
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
ldr r0, [r5, #0x8]
cmp r0, #0x1
bne _0200BBD6
diff --git a/arm9/asm/unk_0200CABC.s b/arm9/asm/unk_0200CABC.s
index 27b27a76..bf4889d8 100644
--- a/arm9/asm/unk_0200CABC.s
+++ b/arm9/asm/unk_0200CABC.s
@@ -1084,7 +1084,7 @@ FUN_0200D300: ; 0x0200D300
bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0x18
str r0, [sp, #0x14]
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
add r2, sp, #0x20
ldr r1, [sp, #0x18]
ldrb r2, [r2, #0x10]
@@ -2574,7 +2574,7 @@ FUN_0200DEF4: ; 0x0200DEF4
bl FUN_02009C5C
mov r1, #0x1
str r0, [sp, #0x4]
- bl FUN_020B1A14
+ bl NNS_G2dGetImageLocation
mov r1, #0x19
add r7, r0, #0x0
add r0, r4, #0x0
@@ -2601,7 +2601,7 @@ FUN_0200DEF4: ; 0x0200DEF4
ldr r1, [sp, #0x4]
bl FUN_02009E54
mov r1, #0x1
- bl FUN_020B19C4
+ bl NNS_G2dGetImagePaletteLocation
add r5, r0, #0x0
add r0, r4, #0x0
mov r1, #0x20
diff --git a/arm9/asm/unk_02011744.s b/arm9/asm/unk_02011744.s
index fc5c7b32..ff9364c9 100644
--- a/arm9/asm/unk_02011744.s
+++ b/arm9/asm/unk_02011744.s
@@ -870,7 +870,7 @@ _02011D52:
beq _02011D92
_02011D68:
add r0, r5, #0x0
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
str r7, [sp, #0x0]
ldr r0, [sp, #0x30]
str r6, [sp, #0x4]
diff --git a/arm9/asm/unk_02012004.s b/arm9/asm/unk_02012004.s
index 042302c6..e43e4bb2 100644
--- a/arm9/asm/unk_02012004.s
+++ b/arm9/asm/unk_02012004.s
@@ -82,7 +82,7 @@ FUN_02012044: ; 0x02012044
_02012054:
add r0, r4, #0x0
add r1, r5, #0x0
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
add r6, r0, #0x0
cmp r5, #0x0
bne _02012066
@@ -309,7 +309,7 @@ FUN_020121E8: ; 0x020121E8
_02012204:
ldr r0, [sp, #0x20]
add r1, sp, #0x2c
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
cmp r0, #0x0
bne _02012214
bl ErrorHandling
@@ -649,7 +649,7 @@ FUN_02012470: ; 0x02012470
bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0x0
add r5, r0, #0x0
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
cmp r0, #0x1
beq _0201249C
bl ErrorHandling
diff --git a/arm9/asm/unk_02012CC8.s b/arm9/asm/unk_02012CC8.s
index 781d1d6d..2961eba7 100644
--- a/arm9/asm/unk_02012CC8.s
+++ b/arm9/asm/unk_02012CC8.s
@@ -1,7 +1,7 @@
.include "asm/macros.inc"
.include "global.inc"
- .extern UNK_021CED64
+ .extern NNS_G3dGlb
.section .rodata
@@ -205,7 +205,7 @@ FUN_02012DE4: ; 0x02012DE4
beq _02012E02
add r0, r5, #0x0
add r0, #0x58
- bl FUN_020AE8CC
+ bl NNS_GfdSetFrmTexVramState
b _02012E22
_02012E02:
mov r0, #0x2
@@ -218,7 +218,7 @@ _02012E0E:
ldr r0, [r4, #0x58]
cmp r0, #0x0
beq _02012E1A
- bl FUN_020AF894
+ bl NNS_GfdFreeLnkTexVram
str r7, [r4, #0x58]
_02012E1A:
add r6, r6, #0x1
@@ -234,7 +234,7 @@ _02012E22:
beq _02012E38
add r0, r5, #0x0
add r0, #0x98
- bl FUN_020AEC7C
+ bl NNS_GfdSetFrmPlttVramState
b _02012E60
_02012E38:
mov r0, #0x8
@@ -249,7 +249,7 @@ _02012E44:
ldr r0, [r0, #0x0]
cmp r0, #0x0
beq _02012E58
- bl FUN_020AFA80
+ bl NNS_GfdFreeLnkPlttVram
add r0, r4, #0x0
add r0, #0x98
str r7, [r0, #0x0]
@@ -766,7 +766,7 @@ _020131B2:
beq _020131C8
add r0, r5, #0x0
add r0, #0x58
- bl FUN_020AE918
+ bl NNS_GfdGetFrmTexVramState
b _020131DE
_020131C8:
mov r0, #0x2
@@ -787,7 +787,7 @@ _020131DE:
beq _020131EE
add r0, r5, #0x0
add r0, #0x98
- bl FUN_020AEC98
+ bl NNS_GfdGetFrmPlttVramState
b _02013208
_020131EE:
mov r0, #0x8
@@ -952,19 +952,19 @@ FUN_02013300: ; 0x02013300
bl FUN_0201EB8C
bl FUN_0201EBA4
_0201331C:
- bl FUN_020B849C
+ bl NNS_G3dGlbFlushP
ldr r0, [r4, #0x0]
- ldr r1, _02013338 ; =UNK_021CED64
+ ldr r1, _02013338 ; =NNS_G3dGlb + 0x4C
bl FUN_0208AD80
ldr r0, [r4, #0x20]
cmp r0, #0x0
beq _02013332
bl FUN_0201EB98
_02013332:
- bl FUN_020B849C
+ bl NNS_G3dGlbFlushP
pop {r4, pc}
.balign 4
-_02013338: .word UNK_021CED64
+_02013338: .word NNS_G3dGlb + 0x4C
thumb_func_start FUN_0201333C
FUN_0201333C: ; 0x0201333C
diff --git a/arm9/asm/unk_02013CD4.s b/arm9/asm/unk_02013CD4.s
index f4fc4db4..330a8c95 100644
--- a/arm9/asm/unk_02013CD4.s
+++ b/arm9/asm/unk_02013CD4.s
@@ -1,11 +1,11 @@
.include "asm/macros.inc"
.include "global.inc"
- .extern UNK_021064C0
+ .extern NNS_GfdDefaultFuncAllocPlttVram
.extern FX_SinCosTable_
- .extern UNK_021064B8
- .extern UNK_021064C4
- .extern UNK_021064BC
+ .extern NNS_GfdDefaultFuncAllocTexVram
+ .extern NNS_GfdDefaultFuncFreePlttVram
+ .extern NNS_GfdDefaultFuncFreeTexVram
.text
@@ -141,7 +141,7 @@ _02013DC6:
thumb_func_start FUN_02013DD4
FUN_02013DD4: ; 0x02013DD4
push {r4, lr}
- ldr r1, _02013DE8 ; =UNK_021064BC
+ ldr r1, _02013DE8 ; =NNS_GfdDefaultFuncFreeTexVram
add r4, r0, #0x0
ldr r0, [r4, #0x0]
ldr r1, [r1, #0x0]
@@ -150,7 +150,7 @@ FUN_02013DD4: ; 0x02013DD4
bl FUN_02013F50
pop {r4, pc}
.balign 4
-_02013DE8: .word UNK_021064BC
+_02013DE8: .word NNS_GfdDefaultFuncFreeTexVram
thumb_func_start FUN_02013DEC
FUN_02013DEC: ; 0x02013DEC
@@ -204,7 +204,7 @@ _02013E36:
thumb_func_start FUN_02013E44
FUN_02013E44: ; 0x02013E44
push {r4, lr}
- ldr r1, _02013E58 ; =UNK_021064C4
+ ldr r1, _02013E58 ; =NNS_GfdDefaultFuncFreePlttVram
add r4, r0, #0x0
ldr r0, [r4, #0x0]
ldr r1, [r1, #0x0]
@@ -213,7 +213,7 @@ FUN_02013E44: ; 0x02013E44
bl FUN_02013F5C
pop {r4, pc}
.balign 4
-_02013E58: .word UNK_021064C4
+_02013E58: .word NNS_GfdDefaultFuncFreePlttVram
thumb_func_start FUN_02013E5C
FUN_02013E5C: ; 0x02013E5C
@@ -401,21 +401,21 @@ _02013F4C: .word 0x00007FFF
thumb_func_start FUN_02013F50
FUN_02013F50: ; 0x02013F50
- ldr r3, _02013F58 ; =FUN_020B1A24
+ ldr r3, _02013F58 ; =NNS_G2dInitImageProxy
mov r1, #0x0
stmia r0!, {r1}
bx r3
.balign 4
-_02013F58: .word FUN_020B1A24
+_02013F58: .word NNS_G2dInitImageProxy
thumb_func_start FUN_02013F5C
FUN_02013F5C: ; 0x02013F5C
- ldr r3, _02013F64 ; =FUN_020B19DC
+ ldr r3, _02013F64 ; =NNS_G2dInitImagePaletteProxy
mov r1, #0x0
stmia r0!, {r1}
bx r3
.balign 4
-_02013F64: .word FUN_020B19DC
+_02013F64: .word NNS_G2dInitImagePaletteProxy
thumb_func_start FUN_02013F68
FUN_02013F68: ; 0x02013F68
@@ -585,7 +585,7 @@ _02014076:
thumb_func_start FUN_0201407C
FUN_0201407C: ; 0x0201407C
push {r3, lr}
- ldr r3, _0201408C ; =UNK_021064B8
+ ldr r3, _0201408C ; =NNS_GfdDefaultFuncAllocTexVram
mov r1, #0x0
ldr r0, [r0, #0x10]
ldr r3, [r3, #0x0]
@@ -593,12 +593,12 @@ FUN_0201407C: ; 0x0201407C
blx r3
pop {r3, pc}
.balign 4
-_0201408C: .word UNK_021064B8
+_0201408C: .word NNS_GfdDefaultFuncAllocTexVram
thumb_func_start FUN_02014090
FUN_02014090: ; 0x02014090
push {r3, lr}
- ldr r3, _020140A0 ; =UNK_021064C0
+ ldr r3, _020140A0 ; =NNS_GfdDefaultFuncAllocPlttVram
mov r1, #0x0
ldr r3, [r3, #0x0]
lsl r0, r0, #0x5
@@ -606,7 +606,7 @@ FUN_02014090: ; 0x02014090
blx r3
pop {r3, pc}
.balign 4
-_020140A0: .word UNK_021064C0
+_020140A0: .word NNS_GfdDefaultFuncAllocPlttVram
thumb_func_start FUN_020140A4
FUN_020140A4: ; 0x020140A4
@@ -615,7 +615,7 @@ FUN_020140A4: ; 0x020140A4
add r3, r2, #0x0
lsr r1, r1, #0xd
mov r2, #0x0
- bl FUN_020B1528
+ bl NNS_G2dLoadImage2DMapping
pop {r3, pc}
thumb_func_start FUN_020140B4
@@ -632,7 +632,7 @@ FUN_020140B4: ; 0x020140B4
str r2, [r5, #0x8]
lsr r1, r1, #0xd
mov r2, #0x0
- bl FUN_020B1240
+ bl NNS_G2dLoadPalette
str r4, [r5, #0x8]
pop {r3-r5, pc}
.balign 4
@@ -781,7 +781,7 @@ _02014172:
str r4, [sp, #0x10]
ldrsh r3, [r5, r3]
add r1, r0, #0x0
- bl FUN_020B0250
+ bl NNS_G2dDrawSpriteFast
ldr r0, _02014214 ; =0x04000448
mov r1, #0x1
str r1, [r0, #0x0]
@@ -868,14 +868,14 @@ _0201424C:
ldr r0, [r5, #0x4]
mov r1, #0x0
add r0, r0, #0x4
- bl FUN_020B1A14
+ bl NNS_G2dGetImageLocation
add r1, r0, #0x0
add r0, r7, #0x0
bl FUN_02013F14
ldr r0, [r5, #0x8]
mov r1, #0x0
add r0, r0, #0x4
- bl FUN_020B19C4
+ bl NNS_G2dGetImagePaletteLocation
add r1, r0, #0x0
add r0, r7, #0x0
bl FUN_02013F18
diff --git a/arm9/asm/unk_02016B94.s b/arm9/asm/unk_02016B94.s
index 0a68dea2..5d6f0073 100644
--- a/arm9/asm/unk_02016B94.s
+++ b/arm9/asm/unk_02016B94.s
@@ -8797,7 +8797,7 @@ FUN_0201AB28: ; 0x0201AB28
bl FUN_020161A4
add r1, sp, #0x0
str r0, [r4, #0x0]
- bl FUN_020B0030
+ bl NNS_G2dGetUnpackedBGCharacterData
ldr r0, [sp, #0x0]
add sp, #0x4
pop {r3-r4, pc}
@@ -8812,7 +8812,7 @@ FUN_0201AB44: ; 0x0201AB44
bl FUN_020161A4
add r1, sp, #0x0
str r0, [r4, #0x0]
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
ldr r0, [sp, #0x0]
add sp, #0x4
pop {r3-r4, pc}
diff --git a/arm9/asm/unk_0201B1A8.s b/arm9/asm/unk_0201B1A8.s
index 05245bc6..28308d53 100644
--- a/arm9/asm/unk_0201B1A8.s
+++ b/arm9/asm/unk_0201B1A8.s
@@ -1,12 +1,12 @@
.include "asm/macros.inc"
.include "global.inc"
- .extern UNK_021CED98
- .extern UNK_021CEDD4
- .extern UNK_021064C0
- .extern UNK_021064B8
- .extern UNK_021064C4
- .extern UNK_021064BC
+ .extern NNS_G3dGlb
+ .extern NNS_G3dGlb
+ .extern NNS_GfdDefaultFuncAllocPlttVram
+ .extern NNS_GfdDefaultFuncAllocTexVram
+ .extern NNS_GfdDefaultFuncFreePlttVram
+ .extern NNS_GfdDefaultFuncFreeTexVram
.section .bss
@@ -23,7 +23,7 @@ FUN_0201B1A8: ; 0x0201B1A8
add r4, r2, #0x0
bl FUN_020161A4
str r0, [r5, #0x0]
- bl FUN_020BC0FC
+ bl NNS_G3dGetTex
cmp r0, #0x0
beq _0201B1D2
bl FUN_0201B254
@@ -33,10 +33,10 @@ FUN_0201B1A8: ; 0x0201B1A8
ldr r1, [r0, #0x8]
bl DC_FlushRange
ldr r0, [r5, #0x0]
- bl FUN_020BB59C
+ bl NNS_G3dResDefaultSetup
_0201B1D2:
ldr r0, [r5, #0x0]
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
ldrh r1, [r0, #0xe]
add r1, r0, r1
ldr r1, [r1, #0xc]
@@ -50,7 +50,7 @@ FUN_0201B1E4: ; 0x0201B1E4
add r5, r1, #0x0
add r4, r0, #0x0
ldr r0, [r5, #0x0]
- bl FUN_020BC0FC
+ bl NNS_G3dGetTex
cmp r0, #0x0
beq _0201B20A
bl FUN_0201B254
@@ -60,10 +60,10 @@ FUN_0201B1E4: ; 0x0201B1E4
ldr r1, [r0, #0x8]
bl DC_FlushRange
ldr r0, [r5, #0x0]
- bl FUN_020BB59C
+ bl NNS_G3dResDefaultSetup
_0201B20A:
ldr r0, [r5, #0x0]
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
ldrh r1, [r0, #0xe]
add r1, r0, r1
ldr r1, [r1, #0xc]
@@ -81,7 +81,7 @@ FUN_0201B21C: ; 0x0201B21C
bl FUN_0201B1A8
ldr r1, [r4, #0x0]
add r0, r5, #0x0
- bl FUN_020B80B4
+ bl NNS_G3dRenderObjInit
pop {r3-r5, pc}
thumb_func_start FUN_0201B234
@@ -98,7 +98,7 @@ FUN_0201B234: ; 0x0201B234
_0201B24A:
ldr r1, [r4, #0x0]
add r0, r5, #0x0
- bl FUN_020B80B4
+ bl NNS_G3dRenderObjInit
pop {r3-r5, pc}
thumb_func_start FUN_0201B254
@@ -125,24 +125,24 @@ FUN_0201B26C: ; 0x0201B26C
add r0, r1, #0x0
add r4, r2, #0x0
add r6, r3, #0x0
- bl FUN_020B8474
- ldr r1, _0201B2A0 ; =UNK_021CEDD4
+ bl NNS_G3dGlbSetBaseTrans
+ ldr r1, _0201B2A0 ; =NNS_G3dGlb + 0xBC
add r0, r4, #0x0
bl MI_Copy36B
- ldr r1, _0201B2A4 ; =UNK_021CED98
+ ldr r1, _0201B2A4 ; =NNS_G3dGlb + 0x80
mov r0, #0xa4
ldr r2, [r1, #0x7c]
bic r2, r0
add r0, r6, #0x0
str r2, [r1, #0x7c]
- bl FUN_020B844C
- bl FUN_020B849C
+ bl NNS_G3dGlbSetBaseScale
+ bl NNS_G3dGlbFlushP
add r0, r5, #0x0
- bl FUN_020BAC98
+ bl NNS_G3dDraw
pop {r4-r6, pc}
nop
-_0201B2A0: .word UNK_021CEDD4
-_0201B2A4: .word UNK_021CED98
+_0201B2A0: .word NNS_G3dGlb + 0xBC
+_0201B2A4: .word NNS_G3dGlb + 0x80
thumb_func_start FUN_0201B2A8
FUN_0201B2A8: ; 0x0201B2A8
@@ -151,28 +151,28 @@ FUN_0201B2A8: ; 0x0201B2A8
add r0, r1, #0x0
add r4, r2, #0x0
add r6, r3, #0x0
- bl FUN_020B8474
- ldr r1, _0201B2E4 ; =UNK_021CEDD4
+ bl NNS_G3dGlbSetBaseTrans
+ ldr r1, _0201B2E4 ; =NNS_G3dGlb + 0xBC
add r0, r4, #0x0
bl MI_Copy36B
- ldr r1, _0201B2E8 ; =UNK_021CED98
+ ldr r1, _0201B2E8 ; =NNS_G3dGlb + 0x80
mov r0, #0xa4
ldr r2, [r1, #0x7c]
bic r2, r0
str r2, [r1, #0x7c]
add r0, r6, #0x0
- bl FUN_020B844C
- bl FUN_020B849C
+ bl NNS_G3dGlbSetBaseScale
+ bl NNS_G3dGlbFlushP
mov r1, #0x0
ldr r0, [r5, #0x4]
add r2, r1, #0x0
mov r3, #0x1
- bl FUN_020BAFB8
- bl FUN_020BB394
+ bl NNS_G3dDraw1Mat1Shp
+ bl NNS_G3dGeFlushBuffer
pop {r4-r6, pc}
.balign 4
-_0201B2E4: .word UNK_021CEDD4
-_0201B2E8: .word UNK_021CED98
+_0201B2E4: .word NNS_G3dGlb + 0xBC
+_0201B2E8: .word NNS_G3dGlb + 0x80
thumb_func_start FUN_0201B2EC
FUN_0201B2EC: ; 0x0201B2EC
@@ -269,11 +269,11 @@ _0201B3A4: .word FUN_020223BC
FUN_0201B3A8: ; 0x0201B3A8
push {r4, lr}
add r4, r1, #0x0
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
cmp r4, #0x0
beq _0201B3BE
add r1, r4, #0x0
- bl FUN_020B7790
+ bl NNS_G3dBindMdlSet
mov r0, #0x1
pop {r4, pc}
_0201B3BE:
@@ -299,17 +299,17 @@ _0201B3D2:
str r1, [sp, #0x0]
cmp r5, #0x0
beq _0201B4D0
- bl FUN_020B7E1C
+ bl NNS_G3dTexGetRequiredSize
add r6, r0, #0x0
add r0, r5, #0x0
- bl FUN_020B7E10
+ bl NNS_G3dTex4x4GetRequiredSize
add r4, r0, #0x0
add r0, r5, #0x0
- bl FUN_020B7CE4
+ bl NNS_G3dPlttGetRequiredSize
str r0, [sp, #0xc]
cmp r6, #0x0
beq _0201B412
- ldr r3, _0201B4D8 ; =UNK_021064B8
+ ldr r3, _0201B4D8 ; =NNS_GfdDefaultFuncAllocTexVram
mov r1, #0x0
ldr r3, [r3, #0x0]
add r0, r6, #0x0
@@ -325,7 +325,7 @@ _0201B412:
_0201B414:
cmp r4, #0x0
beq _0201B42E
- ldr r3, _0201B4D8 ; =UNK_021064B8
+ ldr r3, _0201B4D8 ; =NNS_GfdDefaultFuncAllocTexVram
add r0, r4, #0x0
ldr r3, [r3, #0x0]
mov r1, #0x1
@@ -342,7 +342,7 @@ _0201B430:
ldr r0, [sp, #0xc]
cmp r0, #0x0
beq _0201B450
- ldr r3, _0201B4DC ; =UNK_021064C0
+ ldr r3, _0201B4DC ; =NNS_GfdDefaultFuncAllocPlttVram
mov r1, #0x2
ldrh r2, [r5, #0x20]
lsl r1, r1, #0xe
@@ -361,7 +361,7 @@ _0201B452:
ldr r0, [sp, #0x8]
cmp r0, #0x0
bne _0201B46E
- ldr r1, _0201B4E0 ; =UNK_021064BC
+ ldr r1, _0201B4E0 ; =NNS_GfdDefaultFuncFreeTexVram
add r0, r7, #0x0
ldr r1, [r1, #0x0]
blx r1
@@ -376,7 +376,7 @@ _0201B46E:
ldr r0, [sp, #0x4]
cmp r0, #0x0
bne _0201B48A
- ldr r1, _0201B4E0 ; =UNK_021064BC
+ ldr r1, _0201B4E0 ; =NNS_GfdDefaultFuncFreeTexVram
add r0, r6, #0x0
ldr r1, [r1, #0x0]
blx r1
@@ -391,7 +391,7 @@ _0201B48A:
ldr r0, [sp, #0x0]
cmp r0, #0x0
bne _0201B4A6
- ldr r1, _0201B4E4 ; =UNK_021064C4
+ ldr r1, _0201B4E4 ; =NNS_GfdDefaultFuncFreePlttVram
add r0, r4, #0x0
ldr r1, [r1, #0x0]
blx r1
@@ -406,25 +406,25 @@ _0201B4A6:
add r0, r5, #0x0
add r1, r7, #0x0
add r2, r6, #0x0
- bl FUN_020B7DFC
+ bl NNS_G3dTexSetTexKey
add r0, r5, #0x0
add r1, r4, #0x0
- bl FUN_020B7CDC
+ bl NNS_G3dPlttSetPlttKey
ldr r1, [r5, #0x4]
add r0, r5, #0x0
bl DC_FlushRange
add r0, r5, #0x0
mov r1, #0x1
- bl FUN_020B7D28
+ bl NNS_G3dTexLoad
add r0, r5, #0x0
mov r1, #0x1
- bl FUN_020B7C78
+ bl NNS_G3dPlttLoad
_0201B4D0:
mov r0, #0x1
add sp, #0x10
pop {r3-r7, pc}
nop
-_0201B4D8: .word UNK_021064B8
-_0201B4DC: .word UNK_021064C0
-_0201B4E0: .word UNK_021064BC
-_0201B4E4: .word UNK_021064C4
+_0201B4D8: .word NNS_GfdDefaultFuncAllocTexVram
+_0201B4DC: .word NNS_GfdDefaultFuncAllocPlttVram
+_0201B4E0: .word NNS_GfdDefaultFuncFreeTexVram
+_0201B4E4: .word NNS_GfdDefaultFuncFreePlttVram
diff --git a/arm9/asm/unk_0201B6D0.s b/arm9/asm/unk_0201B6D0.s
index b65b3870..1d795e17 100644
--- a/arm9/asm/unk_0201B6D0.s
+++ b/arm9/asm/unk_0201B6D0.s
@@ -1,8 +1,8 @@
.include "asm/macros.inc"
.include "global.inc"
- .extern UNK_021CEDD4
- .extern UNK_021CED98
+ .extern NNS_G3dGlb
+ .extern NNS_G3dGlb
.text
@@ -38,22 +38,22 @@ FUN_0201B6D0: ; 0x0201B6D0
ldrsh r3, [r4, r3]
bl FUN_0201B808
add r0, sp, #0x1c
- bl FUN_020B8474
- ldr r1, _0201B764 ; =UNK_021CEDD4
+ bl NNS_G3dGlbSetBaseTrans
+ ldr r1, _0201B764 ; =NNS_G3dGlb + 0xBC
add r0, r5, #0x0
bl MI_Copy36B
- ldr r1, _0201B768 ; =UNK_021CED98
+ ldr r1, _0201B768 ; =NNS_G3dGlb + 0x80
mov r0, #0xa4
ldr r2, [r1, #0x7c]
bic r2, r0
add r0, r7, #0x0
str r2, [r1, #0x7c]
- bl FUN_020B844C
- bl FUN_020B849C
+ bl NNS_G3dGlbSetBaseScale
+ bl NNS_G3dGlbFlushP
mov r1, #0x0
mov r0, #0x11
add r2, r1, #0x0
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
ldr r0, [r4, #0x24]
add r1, sp, #0x10
str r0, [sp, #0x10]
@@ -61,7 +61,7 @@ FUN_0201B6D0: ; 0x0201B6D0
str r0, [sp, #0x18]
mov r0, #0x1b
mov r2, #0x3
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
add r0, sp, #0x28
bl FUN_0201B82C
add r4, r0, #0x0
@@ -69,13 +69,13 @@ FUN_0201B6D0: ; 0x0201B6D0
mov r0, #0x12
add r1, sp, #0xc
str r2, [sp, #0xc]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
add r0, r4, #0x0
add sp, #0x34
pop {r4-r7, pc}
.balign 4
-_0201B764: .word UNK_021CEDD4
-_0201B768: .word UNK_021CED98
+_0201B764: .word NNS_G3dGlb + 0xBC
+_0201B768: .word NNS_G3dGlb + 0x80
thumb_func_start FUN_0201B76C
FUN_0201B76C: ; 0x0201B76C
@@ -97,12 +97,12 @@ FUN_0201B76C: ; 0x0201B76C
add r2, r0, #0x0
bl FUN_0201B808
add r0, r5, #0x0
- bl FUN_020B8474
- bl FUN_020B849C
+ bl NNS_G3dGlbSetBaseTrans
+ bl NNS_G3dGlbFlushP
mov r1, #0x0
mov r0, #0x11
add r2, r1, #0x0
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
ldr r0, [r4, #0x10]
lsl r2, r0, #0xc
ldr r0, [r4, #0xc]
@@ -115,7 +115,7 @@ FUN_0201B76C: ; 0x0201B76C
mov r0, #0x1b
add r1, sp, #0x10
mov r2, #0x3
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
add r0, sp, #0x1c
bl FUN_0201B82C
add r4, r0, #0x0
@@ -123,7 +123,7 @@ FUN_0201B76C: ; 0x0201B76C
mov r0, #0x12
add r1, sp, #0xc
str r2, [sp, #0xc]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
add r0, r4, #0x0
add sp, #0x28
pop {r3-r5, pc}
@@ -183,22 +183,22 @@ FUN_0201B82C: ; 0x0201B82C
mov r0, #0x29
add r1, sp, #0x4
str r2, [sp, #0x8]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
mov r0, #0x0
str r0, [sp, #0x0]
mov r0, #0x40
add r1, sp, #0x0
mov r2, #0x1
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
mov r1, #0x0
mov r0, #0x41
add r2, r1, #0x0
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
mov r0, #0x70
add r1, r4, #0x0
mov r2, #0x3
- bl FUN_020BB1C0
- bl FUN_020BB394
+ bl NNS_G3dGeBufferOP_N
+ bl NNS_G3dGeFlushBuffer
add r4, sp, #0x8
_0201B86A:
add r0, r4, #0x0
diff --git a/arm9/asm/unk_0201C24C.s b/arm9/asm/unk_0201C24C.s
index 36817113..9e5cd227 100644
--- a/arm9/asm/unk_0201C24C.s
+++ b/arm9/asm/unk_0201C24C.s
@@ -43,7 +43,7 @@ _0201C272:
ldr r1, [r1, #0x0]
ldr r0, [r1, #0x8]
ldr r1, [r1, #0x0]
- bl FUN_020AEF1C
+ bl NNS_GfdInitVramTransferManager
pop {r3-r5, pc}
nop
_0201C298: .word UNK_021C5934
@@ -102,7 +102,7 @@ _0201C2FA:
add r1, r4, #0x0
add r2, r6, #0x0
add r3, r7, #0x0
- bl FUN_020AEE40
+ bl NNS_GfdRegisterNewVramTransferTask
pop {r3-r7, pc}
.balign 4
_0201C308: .word UNK_021C5934
@@ -114,7 +114,7 @@ FUN_0201C30C: ; 0x0201C30C
ldr r0, [r0, #0x0]
cmp r0, #0x0
beq _0201C322
- bl FUN_020AEEB8
+ bl NNS_GfdDoVramTransfer
ldr r0, _0201C324 ; =UNK_021C5934
mov r1, #0x0
ldr r0, [r0, #0x0]
@@ -135,7 +135,7 @@ FUN_0201C328: ; 0x0201C328
ldr r2, _0201C344 ; =FUN_0201C358
add r1, r4, #0x0
add r5, r0, #0x0
- bl FUN_020B4568
+ bl NNS_G2dInitCellTransferStateManager
add r0, r5, #0x0
pop {r3-r5, pc}
.balign 4
@@ -143,10 +143,10 @@ _0201C344: .word FUN_0201C358
thumb_func_start FUN_0201C348
FUN_0201C348: ; 0x0201C348
- ldr r3, _0201C34C ; =FUN_020B442C
+ ldr r3, _0201C34C ; =NNS_G2dUpdateCellTransferStateManager
bx r3
.balign 4
-_0201C34C: .word FUN_020B442C
+_0201C34C: .word NNS_G2dUpdateCellTransferStateManager
thumb_func_start FUN_0201C350
FUN_0201C350: ; 0x0201C350
diff --git a/arm9/asm/unk_0201C360.s b/arm9/asm/unk_0201C360.s
index 5f8ccb52..078b3ee3 100644
--- a/arm9/asm/unk_0201C360.s
+++ b/arm9/asm/unk_0201C360.s
@@ -321,7 +321,7 @@ FUN_0201C578: ; 0x0201C578
add r0, r4, #0x0
add r0, #0x3c
add r1, sp, #0x0
- bl FUN_020BC2A0
+ bl NNS_G3dGetResDataByName
add r1, r0, #0x0
bne _0201C598
add sp, #0x10
@@ -397,7 +397,7 @@ FUN_0201C5FC: ; 0x0201C5FC
add r0, r4, #0x0
add r0, #0x3c
add r1, sp, #0x0
- bl FUN_020BC2A0
+ bl NNS_G3dGetResDataByName
add r1, r0, #0x0
add r0, r4, #0x0
bl FUN_0201C5A4
diff --git a/arm9/asm/unk_0201D040.s b/arm9/asm/unk_0201D040.s
index ba8c7b75..ab0c07c9 100644
--- a/arm9/asm/unk_0201D040.s
+++ b/arm9/asm/unk_0201D040.s
@@ -858,11 +858,11 @@ FUN_0201D690: ; 0x0201D690
add r1, #0x3c
strb r2, [r1, #0x0]
str r2, [r0, #0x40]
- ldr r3, _0201D6B0 ; =FUN_020B1A24
+ ldr r3, _0201D6B0 ; =NNS_G2dInitImageProxy
add r0, #0x10
bx r3
nop
-_0201D6B0: .word FUN_020B1A24
+_0201D6B0: .word NNS_G2dInitImageProxy
thumb_func_start FUN_0201D6B4
FUN_0201D6B4: ; 0x0201D6B4
@@ -1277,7 +1277,7 @@ FUN_0201D9B0: ; 0x0201D9B0
push {r4, lr}
add r4, r0, #0x0
add r0, #0x10
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
ldr r1, [r4, #0x4]
cmp r1, #0x3
beq _0201D9C8
@@ -1325,13 +1325,13 @@ _0201DA04:
add r5, #0x10
add r2, r4, #0x0
add r3, r5, #0x0
- bl FUN_020B1528
+ bl NNS_G2dLoadImage2DMapping
b _0201DA20
_0201DA16:
add r5, #0x10
add r2, r4, #0x0
add r3, r5, #0x0
- bl FUN_020B1768
+ bl NNS_G2dLoadImage1DMapping
_0201DA20:
cmp r4, #0x1
bne _0201DA2C
@@ -1351,7 +1351,7 @@ FUN_0201DA38: ; 0x0201DA38
push {r4, lr}
add r4, r0, #0x0
add r0, #0x10
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
ldr r1, [r4, #0x4]
cmp r1, #0x3
beq _0201DA50
@@ -1394,7 +1394,7 @@ _0201DA88:
add r5, #0x10
add r2, r4, #0x0
add r3, r5, #0x0
- bl FUN_020B1340
+ bl NNS_G2dLoadImageVramTransfer
cmp r4, #0x1
bne _0201DAA0
mov r0, #0x1
@@ -1932,7 +1932,7 @@ FUN_0201DE4C: ; 0x0201DE4C
beq _0201DE8A
add r0, r4, #0x0
add r0, #0x10
- bl FUN_020B1A14
+ bl NNS_G2dGetImageLocation
ldr r1, _0201DECC ; =UNK_021C5994
ldr r2, [r1, #0x0]
ldr r1, [r2, #0x1c]
@@ -1958,7 +1958,7 @@ _0201DE8A:
beq _0201DEC4
add r0, r4, #0x0
add r0, #0x10
- bl FUN_020B1A14
+ bl NNS_G2dGetImageLocation
ldr r1, _0201DECC ; =UNK_021C5994
ldr r2, [r1, #0x0]
ldr r1, [r2, #0x20]
diff --git a/arm9/asm/unk_0201E00C.s b/arm9/asm/unk_0201E00C.s
index 744cbe95..ae49b439 100644
--- a/arm9/asm/unk_0201E00C.s
+++ b/arm9/asm/unk_0201E00C.s
@@ -378,7 +378,7 @@ _0201E2A4:
_0201E2A6:
cmp r4, #0x0
beq _0201E2B6
- bl FUN_020B19C4
+ bl NNS_G2dGetImagePaletteLocation
add r1, r4, #0x0
bl _u32_div_f
pop {r4, pc}
@@ -434,7 +434,7 @@ FUN_0201E2F8: ; 0x0201E2F8
str r0, [r4, #0xc]
add r4, #0x10
add r0, r4, #0x0
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
pop {r4, pc}
thumb_func_start FUN_0201E314
@@ -675,7 +675,7 @@ FUN_0201E4BC: ; 0x0201E4BC
push {r4, lr}
add r4, r0, #0x0
add r0, #0x10
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
ldr r0, [r4, #0x4]
mov r2, #0x1
tst r0, r2
@@ -684,7 +684,7 @@ FUN_0201E4BC: ; 0x0201E4BC
ldr r0, [r4, #0x0]
ldr r1, [r4, #0x24]
add r3, #0x10
- bl FUN_020B1240
+ bl NNS_G2dLoadPalette
_0201E4DA:
ldr r0, [r4, #0x4]
mov r2, #0x2
@@ -694,7 +694,7 @@ _0201E4DA:
ldr r1, [r4, #0x28]
add r4, #0x10
add r3, r4, #0x0
- bl FUN_020B1240
+ bl NNS_G2dLoadPalette
_0201E4EE:
pop {r4, pc}
diff --git a/arm9/asm/unk_0201E7D8.s b/arm9/asm/unk_0201E7D8.s
index 4f183c7e..32f01a13 100644
--- a/arm9/asm/unk_0201E7D8.s
+++ b/arm9/asm/unk_0201E7D8.s
@@ -1,13 +1,13 @@
.include "asm/macros.inc"
.include "global.inc"
- .extern UNK_021CED98
- .extern UNK_021CEF64
- .extern UNK_021CED20
+ .extern NNS_G3dGlb
+ .extern NNS_G3dGlb
+ .extern NNS_G3dGlb
.extern FX_SinCosTable_
- .extern UNK_021CEF58
- .extern UNK_021CEF70
- .extern UNK_021CED64
+ .extern NNS_G3dGlb
+ .extern NNS_G3dGlb
+ .extern NNS_G3dGlb
.section .data
@@ -576,7 +576,7 @@ FUN_0201EBA4: ; 0x0201EBA4
str r0, [r3, #0x0]
_0201EBEE:
ldr r0, _0201EC40 ; =UNK_021C59A4
- ldr r5, _0201EC44 ; =UNK_021CEF58
+ ldr r5, _0201EC44 ; =NNS_G3dGlb + 0x240
ldr r4, [r0, #0x0]
add r3, r4, #0x0
add r2, r4, #0x0
@@ -588,26 +588,26 @@ _0201EBEE:
add r2, #0x2c
str r0, [r5, #0x0]
add r6, r2, #0x0
- ldr r5, _0201EC48 ; =UNK_021CEF64
+ ldr r5, _0201EC48 ; =NNS_G3dGlb + 0x24C
ldmia r6!, {r0-r1}
stmia r5!, {r0-r1}
ldr r0, [r6, #0x0]
add r3, #0x20
str r0, [r5, #0x0]
add r6, r3, #0x0
- ldr r5, _0201EC4C ; =UNK_021CEF70
+ ldr r5, _0201EC4C ; =NNS_G3dGlb + 0x258
ldmia r6!, {r0-r1}
stmia r5!, {r0-r1}
ldr r0, [r6, #0x0]
add r1, r2, #0x0
str r0, [r5, #0x0]
- ldr r0, _0201EC50 ; =UNK_021CED64
+ ldr r0, _0201EC50 ; =NNS_G3dGlb + 0x4C
add r2, r3, #0x0
str r0, [sp, #0x0]
add r0, r4, #0x0
mov r3, #0x0
bl G3i_LookAt_
- ldr r1, _0201EC54 ; =UNK_021CED98
+ ldr r1, _0201EC54 ; =NNS_G3dGlb + 0x80
mov r0, #0xe8
ldr r2, [r1, #0x7c]
bic r2, r0
@@ -617,11 +617,11 @@ _0201EC3A:
pop {r3-r6, pc}
nop
_0201EC40: .word UNK_021C59A4
-_0201EC44: .word UNK_021CEF58
-_0201EC48: .word UNK_021CEF64
-_0201EC4C: .word UNK_021CEF70
-_0201EC50: .word UNK_021CED64
-_0201EC54: .word UNK_021CED98
+_0201EC44: .word NNS_G3dGlb + 0x240
+_0201EC48: .word NNS_G3dGlb + 0x24C
+_0201EC4C: .word NNS_G3dGlb + 0x258
+_0201EC50: .word NNS_G3dGlb + 0x4C
+_0201EC54: .word NNS_G3dGlb + 0x80
thumb_func_start FUN_0201EC58
FUN_0201EC58: ; 0x0201EC58
@@ -882,14 +882,14 @@ FUN_0201EE2C: ; 0x0201EE2C
str r0, [sp, #0x4]
mov r0, #0x0
str r0, [sp, #0x8]
- ldr r0, _0201EEE4 ; =UNK_021CED20
+ ldr r0, _0201EEE4 ; =NNS_G3dGlb + 0x8
str r0, [sp, #0xc]
ldr r0, [r5, #0x0]
ldr r1, [r5, #0x4]
ldr r2, [r5, #0x8]
ldr r3, [r5, #0xc]
bl G3i_PerspectiveW_
- ldr r1, _0201EEE8 ; =UNK_021CED98
+ ldr r1, _0201EEE8 ; =NNS_G3dGlb + 0x80
mov r0, #0x50
ldr r2, [r1, #0x7c]
add r5, #0x44
@@ -939,12 +939,12 @@ _0201EE6C:
lsl r0, r6, #0x1
str r0, [sp, #0x8]
str r2, [sp, #0xc]
- ldr r0, _0201EEE4 ; =UNK_021CED20
+ ldr r0, _0201EEE4 ; =NNS_G3dGlb + 0x8
neg r2, r3
str r0, [sp, #0x10]
add r0, r4, #0x0
bl G3i_OrthoW_
- ldr r1, _0201EEE8 ; =UNK_021CED98
+ ldr r1, _0201EEE8 ; =NNS_G3dGlb + 0x80
mov r0, #0x50
ldr r2, [r1, #0x7c]
add r5, #0x44
@@ -958,8 +958,8 @@ _0201EE6C:
add sp, #0x14
pop {r3-r6, pc}
nop
-_0201EEE4: .word UNK_021CED20
-_0201EEE8: .word UNK_021CED98
+_0201EEE4: .word NNS_G3dGlb + 0x8
+_0201EEE8: .word NNS_G3dGlb + 0x80
_0201EEEC: .word UNK_02105BB8
thumb_func_start FUN_0201EEF0
diff --git a/arm9/asm/unk_0201F06C.s b/arm9/asm/unk_0201F06C.s
index c032ba64..84b32634 100644
--- a/arm9/asm/unk_0201F06C.s
+++ b/arm9/asm/unk_0201F06C.s
@@ -2,10 +2,10 @@
.include "global.inc"
.extern FX_SinCosTable_
- .extern UNK_021064C0
- .extern UNK_021064B8
- .extern UNK_021064BC
- .extern UNK_021064C4
+ .extern NNS_GfdDefaultFuncAllocPlttVram
+ .extern NNS_GfdDefaultFuncAllocTexVram
+ .extern NNS_GfdDefaultFuncFreeTexVram
+ .extern NNS_GfdDefaultFuncFreePlttVram
.section .rodata
@@ -569,18 +569,18 @@ FUN_0201F454: ; 0x0201F454
add r4, r1, #0x0
add r6, r2, #0x0
add r7, r3, #0x0
- bl FUN_020B7E1C
+ bl NNS_G3dTexGetRequiredSize
str r0, [sp, #0x8]
add r0, r5, #0x0
- bl FUN_020B7E10
+ bl NNS_G3dTex4x4GetRequiredSize
str r0, [sp, #0x4]
add r0, r5, #0x0
- bl FUN_020B7CE4
+ bl NNS_G3dPlttGetRequiredSize
str r0, [sp, #0x0]
ldr r0, [sp, #0x8]
cmp r0, #0x0
beq _0201F492
- ldr r3, _0201F4E4 ; =UNK_021064B8
+ ldr r3, _0201F4E4 ; =NNS_GfdDefaultFuncAllocTexVram
mov r1, #0x0
ldr r3, [r3, #0x0]
add r2, r1, #0x0
@@ -597,7 +597,7 @@ _0201F496:
ldr r0, [sp, #0x4]
cmp r0, #0x0
beq _0201F4B2
- ldr r3, _0201F4E4 ; =UNK_021064B8
+ ldr r3, _0201F4E4 ; =NNS_GfdDefaultFuncAllocTexVram
mov r1, #0x1
ldr r3, [r3, #0x0]
mov r2, #0x0
@@ -614,7 +614,7 @@ _0201F4B6:
ldr r0, [sp, #0x0]
cmp r0, #0x0
beq _0201F4DA
- ldr r3, _0201F4E8 ; =UNK_021064C0
+ ldr r3, _0201F4E8 ; =NNS_GfdDefaultFuncAllocPlttVram
mov r1, #0x2
ldrh r2, [r5, #0x20]
lsl r1, r1, #0xe
@@ -635,17 +635,17 @@ _0201F4DE:
add sp, #0xc
pop {r4-r7, pc}
nop
-_0201F4E4: .word UNK_021064B8
-_0201F4E8: .word UNK_021064C0
+_0201F4E4: .word NNS_GfdDefaultFuncAllocTexVram
+_0201F4E8: .word NNS_GfdDefaultFuncAllocPlttVram
thumb_func_start FUN_0201F4EC
FUN_0201F4EC: ; 0x0201F4EC
push {r3-r5, lr}
add r5, r0, #0x0
add r4, r3, #0x0
- bl FUN_020B7CF0
+ bl NNS_G3dTexReleaseTexKey
add r0, r5, #0x0
- bl FUN_020B7C58
+ bl NNS_G3dPlttReleasePlttKey
str r0, [r4, #0x0]
pop {r3-r5, pc}
@@ -656,14 +656,14 @@ FUN_0201F500: ; 0x0201F500
ldr r1, [r2, #0x0]
ldr r2, [r3, #0x0]
add r5, r0, #0x0
- bl FUN_020B7DFC
+ bl NNS_G3dTexSetTexKey
ldr r1, [sp, #0x10]
add r0, r5, #0x0
ldr r1, [r1, #0x0]
- bl FUN_020B7CDC
+ bl NNS_G3dPlttSetPlttKey
add r0, r4, #0x0
add r1, r5, #0x0
- bl FUN_020B7790
+ bl NNS_G3dBindMdlSet
pop {r3-r5, pc}
.balign 4
@@ -675,28 +675,28 @@ FUN_0201F524: ; 0x0201F524
add r4, r2, #0x0
cmp r0, #0x0
beq _0201F536
- ldr r1, _0201F550 ; =UNK_021064BC
+ ldr r1, _0201F550 ; =NNS_GfdDefaultFuncFreeTexVram
ldr r1, [r1, #0x0]
blx r1
_0201F536:
ldr r0, [r5, #0x0]
cmp r0, #0x0
beq _0201F542
- ldr r1, _0201F550 ; =UNK_021064BC
+ ldr r1, _0201F550 ; =NNS_GfdDefaultFuncFreeTexVram
ldr r1, [r1, #0x0]
blx r1
_0201F542:
ldr r0, [r4, #0x0]
cmp r0, #0x0
beq _0201F54E
- ldr r1, _0201F554 ; =UNK_021064C4
+ ldr r1, _0201F554 ; =NNS_GfdDefaultFuncFreePlttVram
ldr r1, [r1, #0x0]
blx r1
_0201F54E:
pop {r3-r5, pc}
.balign 4
-_0201F550: .word UNK_021064BC
-_0201F554: .word UNK_021064C4
+_0201F550: .word NNS_GfdDefaultFuncFreeTexVram
+_0201F554: .word NNS_GfdDefaultFuncFreePlttVram
thumb_func_start FUN_0201F558
FUN_0201F558: ; 0x0201F558
@@ -713,22 +713,22 @@ _0201F568:
mov r0, #0x0
pop {r3-r7, pc}
_0201F56E:
- bl FUN_020B7E1C
+ bl NNS_G3dTexGetRequiredSize
str r0, [sp, #0x0]
add r0, r4, #0x0
- bl FUN_020B7E10
+ bl NNS_G3dTex4x4GetRequiredSize
str r0, [sp, #0x4]
add r0, r4, #0x0
- bl FUN_020B7CE4
+ bl NNS_G3dPlttGetRequiredSize
add r4, r0, #0x0
add r0, r5, #0x0
- bl FUN_020B7E1C
+ bl NNS_G3dTexGetRequiredSize
add r6, r0, #0x0
add r0, r5, #0x0
- bl FUN_020B7E10
+ bl NNS_G3dTex4x4GetRequiredSize
add r7, r0, #0x0
add r0, r5, #0x0
- bl FUN_020B7CE4
+ bl NNS_G3dPlttGetRequiredSize
ldr r1, [sp, #0x0]
cmp r1, r6
bne _0201F5AA
@@ -780,7 +780,7 @@ FUN_0201F5D4: ; 0x0201F5D4
add r0, r5, #0x0
ldr r1, [r5, #0x7c]
add r0, #0x24
- bl FUN_020B80B4
+ bl NNS_G3dRenderObjInit
add r0, r5, #0x0
add r0, #0xa8
ldrb r0, [r0, #0x0]
@@ -882,7 +882,7 @@ FUN_0201F69C: ; 0x0201F69C
add r0, r5, #0x0
ldr r1, [r5, #0x7c]
add r0, #0x24
- bl FUN_020B80B4
+ bl NNS_G3dRenderObjInit
add r0, r4, #0x0
bl FUN_0201FBCC
add r5, #0x84
@@ -1602,7 +1602,7 @@ FUN_0201FB9C: ; 0x0201FB9C
add r5, r2, #0x0
bl FUN_0201FC90
add r7, r0, #0x0
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
add r4, r0, #0x0
ldrh r0, [r4, #0xe]
add r0, r4, r0
@@ -1612,7 +1612,7 @@ FUN_0201FB9C: ; 0x0201FB9C
cmp r5, #0x0
beq _0201FBC6
add r0, r7, #0x0
- bl FUN_020BC0FC
+ bl NNS_G3dGetTex
str r0, [r5, #0x0]
_0201FBC6:
add r0, r4, #0x0
@@ -1724,7 +1724,7 @@ FUN_0201FC70: ; 0x0201FC70
sub sp, #0xc
add r4, r0, #0x0
ldr r0, [r4, #0x78]
- bl FUN_020B772C
+ bl NNS_G3dReleaseMdlSet
add r4, #0x80
ldr r0, [r4, #0x0]
add r1, sp, #0x4
@@ -1828,7 +1828,7 @@ _0201FD0C:
ldr r0, [r4, r1]
add r1, r1, #0x4
add r1, r4, r1
- bl thunk_FUN_020afda0_2
+ bl NNS_G2dGetUnpackedAnimBank
mov r0, #0x12
mov r1, #0x1
lsl r0, r0, #0x4
@@ -2002,10 +2002,10 @@ FUN_0201FE6C: ; 0x0201FE6C
bl memset
add r0, r4, #0x0
add r0, #0xb4
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
add r0, r4, #0x0
add r0, #0xd8
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
mov r0, #0x0
str r0, [r4, #0x30]
pop {r4, pc}
@@ -2072,7 +2072,7 @@ _0201FEA6:
add r1, r4, #0x0
add r1, #0x26
ldrb r1, [r1, #0x0]
- bl FUN_020B502C
+ bl NNS_G2dSetRndCoreAffineOverwriteMode
add r0, r4, #0x0
add r0, #0x27
ldrb r2, [r0, #0x0]
@@ -2084,7 +2084,7 @@ _0201FEA6:
mov r3, #0x2
and r1, r2
and r2, r3
- bl FUN_020B4F38
+ bl NNS_G2dSetRndCoreFlipMode
add r0, r4, #0x0
mov r2, #0x1
add r0, #0x34
@@ -2193,13 +2193,13 @@ _0201FFE4:
ldr r1, [r1, #0x0]
add r0, #0xb4
add r4, #0x40
- bl FUN_020B1A14
+ bl NNS_G2dGetImageLocation
mov r1, #0x0
mvn r1, r1
cmp r0, r1
beq _0202000E
ldr r0, [r4, #0x5c]
- bl FUN_020B4358
+ bl NNS_G2dFreeCellTransferStateHandle
_0202000E:
add r0, r5, #0x0
add r0, #0xec
@@ -2409,11 +2409,11 @@ _0202014A:
lsl r1, r1, #0x10
ldr r0, [r4, #0x4]
lsr r1, r1, #0x10
- bl FUN_020AFC04
+ bl NNS_G2dGetAnimSequenceByIdx
add r1, r0, #0x0
add r0, r4, #0x0
add r0, #0x8
- bl FUN_020B1EE4
+ bl NNS_G2dSetCellAnimationSequence
mov r0, #0x1
str r0, [r4, #0x10]
pop {r4, pc}
@@ -2422,11 +2422,11 @@ _02020168:
add r4, #0x40
ldr r0, [r4, #0x6c]
add r1, r3, #0x0
- bl FUN_020AFC04
+ bl NNS_G2dGetAnimSequenceByIdx
add r1, r0, #0x0
add r0, r4, #0x0
add r0, #0x8
- bl FUN_020B242C
+ bl NNS_G2dSetAnimSequenceToMCAnimation
mov r0, #0x1
str r0, [r4, #0x10]
pop {r4, pc}
@@ -2459,7 +2459,7 @@ _020201A8:
add r5, #0x40
add r0, r5, #0x0
add r0, #0x8
- bl FUN_020B0448
+ bl NNS_G2dResetAnimCtrlState
mov r0, #0x1
str r0, [r5, #0x10]
add r0, r4, #0x0
@@ -2471,7 +2471,7 @@ _020201C2:
add r5, #0x40
add r0, r5, #0x0
add r0, #0x8
- bl FUN_020B0448
+ bl NNS_G2dResetAnimCtrlState
mov r0, #0x1
str r0, [r5, #0x10]
add r0, r4, #0x0
@@ -2499,12 +2499,12 @@ FUN_020201E4: ; 0x020201E4
_020201F4:
add r0, #0x40
add r0, #0x8
- bl FUN_020B1EC4
+ bl NNS_G2dTickCellAnimation
pop {r3, pc}
_020201FE:
add r0, #0x40
add r0, #0x8
- bl FUN_020B224C
+ bl NNS_G2dTickMCAnimation
pop {r3, pc}
thumb_func_start FUN_02020208
@@ -2520,22 +2520,22 @@ FUN_02020208: ; 0x02020208
_02020218:
add r0, #0x40
add r0, #0x8
- bl FUN_020B1EA4
+ bl NNS_G2dSetCellAnimationCurrentFrame
pop {r3, pc}
_02020222:
add r0, #0x40
add r0, #0x8
- bl FUN_020B2194
+ bl NNS_G2dSetMCAnimationCurrentFrame
pop {r3, pc}
thumb_func_start FUN_0202022C
FUN_0202022C: ; 0x0202022C
- ldr r3, _02020234 ; =FUN_020B04FC
+ ldr r3, _02020234 ; =NNS_G2dGetAnimCtrlCurrentFrame
add r0, #0x40
add r0, #0x8
bx r3
.balign 4
-_02020234: .word FUN_020B04FC
+_02020234: .word NNS_G2dGetAnimCtrlCurrentFrame
thumb_func_start FUN_02020238
FUN_02020238: ; 0x02020238
@@ -2969,12 +2969,12 @@ FUN_0202050C: ; 0x0202050C
add r4, #0x40
ldr r0, [r4, #0x4]
mov r1, #0x0
- bl FUN_020AFC04
+ bl NNS_G2dGetAnimSequenceByIdx
add r4, #0x8
add r1, r0, #0x0
ldr r2, [r5, #0x40]
add r0, r4, #0x0
- bl FUN_020B1F80
+ bl NNS_G2dInitCellAnimation
pop {r3-r5, pc}
.balign 4
@@ -2986,22 +2986,22 @@ FUN_0202052C: ; 0x0202052C
add r4, r6, #0x0
add r4, #0x40
add r5, r0, #0x0
- bl FUN_020B43A4
+ bl NNS_G2dGetNewCellTransferStateHandle
str r0, [r4, #0x5c]
ldr r0, [r4, #0x4]
mov r1, #0x0
ldr r5, [r5, #0x4]
- bl FUN_020AFC04
+ bl NNS_G2dGetAnimSequenceByIdx
str r0, [sp, #0x18]
add r0, r6, #0x0
add r0, #0xb4
mov r1, #0x1
- bl FUN_020B1A14
+ bl NNS_G2dGetImageLocation
add r7, r0, #0x0
add r0, r6, #0x0
add r0, #0xb4
mov r1, #0x2
- bl FUN_020B1A14
+ bl NNS_G2dGetImageLocation
mov r1, #0x0
mvn r1, r1
str r1, [sp, #0x0]
@@ -3018,7 +3018,7 @@ FUN_0202052C: ; 0x0202052C
ldr r2, [r6, #0x40]
ldr r3, [r4, #0x5c]
add r0, #0x8
- bl FUN_020B1EFC
+ bl NNS_G2dInitCellAnimationVramTransfered
add sp, #0x1c
pop {r4-r7, pc}
@@ -3032,10 +3032,10 @@ FUN_02020588: ; 0x02020588
ldr r0, [r4, #0x6c]
add r7, r1, #0x0
mov r1, #0x0
- bl FUN_020AFC04
+ bl NNS_G2dGetAnimSequenceByIdx
str r0, [sp, #0xc]
ldr r0, [r4, #0x68]
- bl FUN_020B23D8
+ bl NNS_G2dGetMCBankNumNodesRequired
add r6, r0, #0x0
mov r1, #0x28
add r0, r7, #0x0
@@ -3058,11 +3058,11 @@ FUN_02020588: ; 0x02020588
ldr r1, [r4, #0x70]
ldr r2, [r4, #0x74]
add r0, #0x8
- bl FUN_020B20C8
+ bl NNS_G2dInitMCAnimation
add r4, #0x8
ldr r1, [sp, #0xc]
add r0, r4, #0x0
- bl FUN_020B242C
+ bl NNS_G2dSetAnimSequenceToMCAnimation
add sp, #0x10
pop {r3-r7, pc}
.balign 4
@@ -3087,7 +3087,7 @@ _02020600:
_02020602:
cmp r4, #0x0
beq _02020612
- bl FUN_020B19C4
+ bl NNS_G2dGetImagePaletteLocation
add r1, r4, #0x0
bl _u32_div_f
pop {r4, pc}
@@ -3115,19 +3115,19 @@ FUN_02020618: ; 0x02020618
ldr r0, [r5, r0]
add r1, #0xb4
add r2, #0xd8
- bl thunk_FUN_020b5040
+ bl NNS_G2dSetRendererImageProxy
mov r0, #0x45
lsl r0, r0, #0x2
ldr r0, [r5, r0]
- bl FUN_020B326C
- bl FUN_020B2B58
+ bl NNS_G2dBeginRendering
+ bl NNS_G2dPushMtx
add r1, r4, #0x0
mov r0, #0x45
add r1, #0x26
lsl r0, r0, #0x2
ldrb r1, [r1, #0x0]
ldr r0, [r5, r0]
- bl FUN_020B502C
+ bl NNS_G2dSetRndCoreAffineOverwriteMode
add r0, r4, #0x0
add r0, #0x26
ldrb r0, [r0, #0x0]
@@ -3143,7 +3143,7 @@ FUN_02020618: ; 0x02020618
mov r3, #0x2
and r1, r2
and r2, r3
- bl FUN_020B4F38
+ bl NNS_G2dSetRndCoreFlipMode
b _0202068E
_02020680:
mov r0, #0x45
@@ -3151,12 +3151,12 @@ _02020680:
mov r1, #0x0
ldr r0, [r5, r0]
add r2, r1, #0x0
- bl FUN_020B4F38
+ bl NNS_G2dSetRndCoreFlipMode
_0202068E:
ldr r0, [sp, #0x0]
ldr r1, [sp, #0x4]
ldr r2, [sp, #0x8]
- bl FUN_020B2A08
+ bl NNS_G2dTranslate
add r0, r4, #0x0
add r0, #0x26
ldrb r0, [r0, #0x0]
@@ -3165,11 +3165,11 @@ _0202068E:
ldr r0, [r4, #0xc]
ldr r1, [r4, #0x10]
ldr r2, [r4, #0x14]
- bl FUN_020B2A08
+ bl NNS_G2dTranslate
ldr r0, [r4, #0x18]
ldr r1, [r4, #0x1c]
ldr r2, [r4, #0x20]
- bl FUN_020B28B4
+ bl NNS_G2dScale
ldrh r0, [r4, #0x24]
ldr r2, _02020770 ; =FX_SinCosTable_
asr r0, r0, #0x4
@@ -3179,14 +3179,14 @@ _0202068E:
lsl r1, r1, #0x1
ldrsh r0, [r2, r0]
ldrsh r1, [r2, r1]
- bl FUN_020B2794
+ bl NNS_G2dRotZ
ldr r0, [r4, #0xc]
ldr r1, [r4, #0x10]
ldr r2, [r4, #0x14]
neg r0, r0
neg r1, r1
neg r2, r2
- bl FUN_020B2A08
+ bl NNS_G2dTranslate
_020206DC:
add r0, r4, #0x0
add r0, #0x28
@@ -3249,16 +3249,16 @@ _0202074E:
add r4, #0x40
add r4, #0x8
add r0, r4, #0x0
- bl FUN_020B317C
+ bl NNS_G2dDrawCellAnimation
b _02020764
_0202075A:
add r4, #0x40
add r4, #0x8
add r0, r4, #0x0
- bl FUN_020B2D9C
+ bl NNS_G2dDrawMultiCellAnimation
_02020764:
- bl FUN_020B2B08
- bl FUN_020B31F0
+ bl NNS_G2dPopMtx
+ bl NNS_G2dEndRendering
add sp, #0xc
pop {r3-r6, pc}
.balign 4
diff --git a/arm9/asm/unk_02020C44.s b/arm9/asm/unk_02020C44.s
index c1870c5a..4c6cb725 100644
--- a/arm9/asm/unk_02020C44.s
+++ b/arm9/asm/unk_02020C44.s
@@ -1,10 +1,10 @@
.include "asm/macros.inc"
.include "global.inc"
- .extern UNK_021064B8
- .extern UNK_021064C0
- .extern UNK_021064C4
- .extern UNK_021064BC
+ .extern NNS_GfdDefaultFuncAllocTexVram
+ .extern NNS_GfdDefaultFuncAllocPlttVram
+ .extern NNS_GfdDefaultFuncFreePlttVram
+ .extern NNS_GfdDefaultFuncFreeTexVram
.text
@@ -488,7 +488,7 @@ _02020FA4:
ldr r0, [r4, #0x4]
cmp r0, #0x0
beq _02020FB8
- ldr r1, _02020FE8 ; =UNK_021064BC
+ ldr r1, _02020FE8 ; =NNS_GfdDefaultFuncFreeTexVram
ldr r1, [r1, #0x0]
blx r1
cmp r0, #0x0
@@ -498,7 +498,7 @@ _02020FB8:
ldr r0, [r4, #0x8]
cmp r0, #0x0
beq _02020FCC
- ldr r1, _02020FE8 ; =UNK_021064BC
+ ldr r1, _02020FE8 ; =NNS_GfdDefaultFuncFreeTexVram
ldr r1, [r1, #0x0]
blx r1
cmp r0, #0x0
@@ -508,7 +508,7 @@ _02020FCC:
ldr r0, [r4, #0xc]
cmp r0, #0x0
beq _02020FE0
- ldr r1, _02020FEC ; =UNK_021064C4
+ ldr r1, _02020FEC ; =NNS_GfdDefaultFuncFreePlttVram
ldr r1, [r1, #0x0]
blx r1
cmp r0, #0x0
@@ -519,8 +519,8 @@ _02020FE0:
bl FUN_0202120C
pop {r3-r5, pc}
.balign 4
-_02020FE8: .word UNK_021064BC
-_02020FEC: .word UNK_021064C4
+_02020FE8: .word NNS_GfdDefaultFuncFreeTexVram
+_02020FEC: .word NNS_GfdDefaultFuncFreePlttVram
thumb_func_start FUN_02020FF0
FUN_02020FF0: ; 0x02020FF0
@@ -842,7 +842,7 @@ FUN_02021220: ; 0x02021220
push {r3, lr}
ldr r0, [r0, #0x0]
bl FUN_02020E0C
- bl FUN_020BC0FC
+ bl NNS_G3dGetTex
pop {r3, pc}
.balign 4
@@ -858,7 +858,7 @@ FUN_02021230: ; 0x02021230
_02021240:
ldr r0, [r0, #0x10]
_02021242:
- bl FUN_020BC0FC
+ bl NNS_G3dGetTex
pop {r3, pc}
thumb_func_start FUN_02021248
@@ -869,17 +869,17 @@ FUN_02021248: ; 0x02021248
str r1, [sp, #0x0]
str r2, [sp, #0x4]
str r3, [sp, #0x8]
- bl FUN_020B7E1C
+ bl NNS_G3dTexGetRequiredSize
add r7, r0, #0x0
add r0, r5, #0x0
- bl FUN_020B7E10
+ bl NNS_G3dTex4x4GetRequiredSize
add r6, r0, #0x0
add r0, r5, #0x0
- bl FUN_020B7CE4
+ bl NNS_G3dPlttGetRequiredSize
add r4, r0, #0x0
cmp r7, #0x0
beq _0202127E
- ldr r3, _020212B0 ; =UNK_021064B8
+ ldr r3, _020212B0 ; =NNS_GfdDefaultFuncAllocTexVram
mov r1, #0x0
ldr r3, [r3, #0x0]
add r0, r7, #0x0
@@ -890,7 +890,7 @@ FUN_02021248: ; 0x02021248
_0202127E:
cmp r6, #0x0
beq _02021292
- ldr r3, _020212B0 ; =UNK_021064B8
+ ldr r3, _020212B0 ; =NNS_GfdDefaultFuncAllocTexVram
add r0, r6, #0x0
ldr r3, [r3, #0x0]
mov r1, #0x1
@@ -901,7 +901,7 @@ _0202127E:
_02021292:
cmp r4, #0x0
beq _020212AC
- ldr r3, _020212B4 ; =UNK_021064C0
+ ldr r3, _020212B4 ; =NNS_GfdDefaultFuncAllocPlttVram
mov r1, #0x2
ldrh r2, [r5, #0x20]
lsl r1, r1, #0xe
@@ -916,8 +916,8 @@ _020212AC:
add sp, #0xc
pop {r4-r7, pc}
.balign 4
-_020212B0: .word UNK_021064B8
-_020212B4: .word UNK_021064C0
+_020212B0: .word NNS_GfdDefaultFuncAllocTexVram
+_020212B4: .word NNS_GfdDefaultFuncAllocPlttVram
thumb_func_start FUN_020212B8
FUN_020212B8: ; 0x020212B8
@@ -933,10 +933,10 @@ FUN_020212B8: ; 0x020212B8
bl DC_FlushRange
add r0, r4, #0x0
mov r1, #0x1
- bl FUN_020B7D28
+ bl NNS_G3dTexLoad
add r0, r4, #0x0
mov r1, #0x1
- bl FUN_020B7C78
+ bl NNS_G3dPlttLoad
pop {r4, pc}
.balign 4
@@ -945,10 +945,10 @@ FUN_020212E4: ; 0x020212E4
push {r3-r5, lr}
add r5, r0, #0x0
add r4, r3, #0x0
- bl FUN_020B7DFC
+ bl NNS_G3dTexSetTexKey
add r0, r5, #0x0
add r1, r4, #0x0
- bl FUN_020B7CDC
+ bl NNS_G3dPlttSetPlttKey
pop {r3-r5, pc}
thumb_func_start FUN_020212F8
@@ -958,9 +958,9 @@ FUN_020212F8: ; 0x020212F8
add r4, r0, #0x0
add r1, sp, #0x4
add r2, sp, #0x0
- bl FUN_020B7CF0
+ bl NNS_G3dTexReleaseTexKey
add r0, r4, #0x0
- bl FUN_020B7C58
+ bl NNS_G3dPlttReleasePlttKey
add sp, #0x8
pop {r4, pc}
@@ -986,7 +986,7 @@ FUN_02021310: ; 0x02021310
FUN_02021334: ; 0x02021334
push {r3-r5, lr}
add r5, r0, #0x0
- bl FUN_020BC0FC
+ bl NNS_G3dGetTex
add r4, r0, #0x0
bne _02021344
bl ErrorHandling
diff --git a/arm9/asm/unk_0202134C.s b/arm9/asm/unk_0202134C.s
index 30aa1d51..b45f4e91 100644
--- a/arm9/asm/unk_0202134C.s
+++ b/arm9/asm/unk_0202134C.s
@@ -8,7 +8,7 @@ FUN_0202134C: ; 0x0202134C
push {r3-r5, lr}
add r5, r0, #0x0
add r4, r1, #0x0
- bl FUN_020B33A0
+ bl NNS_G2dInitRenderer
add r5, #0x80
str r4, [r5, #0x0]
pop {r3-r5, pc}
@@ -20,7 +20,7 @@ FUN_0202135C: ; 0x0202135C
add r4, r1, #0x0
add r6, r2, #0x0
add r7, r3, #0x0
- bl FUN_020B3334
+ bl NNS_G2dInitRenderSurface
add r2, r5, #0x0
ldmia r4!, {r0-r1}
stmia r2!, {r0-r1}
@@ -36,7 +36,7 @@ FUN_0202135C: ; 0x0202135C
cmp r0, #0x0
beq _0202138C
add r1, r5, #0x0
- bl FUN_020B3390
+ bl NNS_G2dAddRendererTargetSurface
_0202138C:
pop {r3-r7, pc}
.balign 4
diff --git a/arm9/asm/unk_02022318.s b/arm9/asm/unk_02022318.s
index cf87cdb9..9564742c 100644
--- a/arm9/asm/unk_02022318.s
+++ b/arm9/asm/unk_02022318.s
@@ -15,7 +15,7 @@ FUN_02022318: ; 0x02022318
bl AllocFromHeap
add r4, r0, #0x0
str r6, [r4, #0x0]
- bl FUN_020BB7F4
+ bl NNS_G3dInit
bl G3X_InitMtxStack
mov r1, #0x2
ldr r0, _020223B8 ; =0x04000540
@@ -23,7 +23,7 @@ FUN_02022318: ; 0x02022318
str r1, [r0, #0x0]
bne _02022364
lsl r0, r5, #0x7
- bl FUN_020AFA28
+ bl NNS_GfdGetLnkTexVramManagerWorkSize
add r6, r0, #0x0
ldr r0, [r4, #0x0]
add r1, r6, #0x0
@@ -35,20 +35,20 @@ FUN_02022318: ; 0x02022318
lsl r0, r5, #0x11
mov r1, #0x0
add r3, r6, #0x0
- bl FUN_020AF9C4
+ bl NNS_GfdInitLnkTexVramManager
b _0202236E
_02022364:
lsl r0, r5, #0x10
lsr r0, r0, #0x10
mov r1, #0x1
- bl FUN_020AEB70
+ bl NNS_GfdInitFrmTexVramManager
_0202236E:
ldr r0, [sp, #0x4]
cmp r0, #0x0
bne _02022398
ldr r0, [sp, #0x20]
lsl r0, r0, #0x8
- bl FUN_020AFBFC
+ bl NNS_GfdGetLnkPlttVramManagerWorkSize
add r5, r0, #0x0
ldr r0, [r4, #0x0]
add r1, r5, #0x0
@@ -59,14 +59,14 @@ _0202236E:
lsl r0, r0, #0xd
add r2, r5, #0x0
mov r3, #0x1
- bl FUN_020AFBA8
+ bl NNS_GfdInitLnkPlttVramManager
b _020223A4
_02022398:
ldr r0, [sp, #0x20]
mov r1, #0x1
lsl r0, r0, #0x1d
lsr r0, r0, #0x10
- bl FUN_020AEB70
+ bl NNS_GfdInitFrmTexVramManager
_020223A4:
ldr r0, [sp, #0x24]
cmp r0, #0x0
diff --git a/arm9/asm/unk_02033B68.s b/arm9/asm/unk_02033B68.s
index 39125d06..9e204377 100644
--- a/arm9/asm/unk_02033B68.s
+++ b/arm9/asm/unk_02033B68.s
@@ -333,7 +333,7 @@ FUN_02033D3C: ; 0x02033D3C
bl DC_FlushRange
ldr r0, [sp, #0x4]
add r1, sp, #0x0
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
cmp r5, #0x1
bne _02033D80
ldr r0, [sp, #0x0]
@@ -386,7 +386,7 @@ _02033DC8:
bl DC_FlushRange
ldr r0, [sp, #0x4]
add r1, sp, #0x0
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
cmp r5, #0x1
bne _02033DF0
mov r0, #0x1
diff --git a/arm9/asm/unk_020607D4.s b/arm9/asm/unk_020607D4.s
index 45fc311a..c017c561 100644
--- a/arm9/asm/unk_020607D4.s
+++ b/arm9/asm/unk_020607D4.s
@@ -556,7 +556,7 @@ _02060BF6:
add r0, r4, #0x0
bl MOD05_021F4BD0
ldr r0, [r0, #0x0]
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
ldrh r1, [r0, #0xe]
add r2, sp, #0x20
mov r3, #0x0
diff --git a/arm9/asm/unk_0206DE24.s b/arm9/asm/unk_0206DE24.s
index 0bc45eb2..32d784c4 100644
--- a/arm9/asm/unk_0206DE24.s
+++ b/arm9/asm/unk_0206DE24.s
@@ -1,8 +1,8 @@
.include "asm/macros.inc"
.include "global.inc"
- .extern UNK_021064C0
- .extern UNK_021064B8
+ .extern NNS_GfdDefaultFuncAllocPlttVram
+ .extern NNS_GfdDefaultFuncAllocTexVram
.text
@@ -128,14 +128,14 @@ _0206DF14: .word 0x04000580
thumb_func_start FUN_0206DF18
FUN_0206DF18: ; 0x0206DF18
push {r3-r5, lr}
- ldr r3, _0206DF50 ; =UNK_021064B8
+ ldr r3, _0206DF50 ; =NNS_GfdDefaultFuncAllocTexVram
mov r0, #0x2
mov r1, #0x0
ldr r3, [r3, #0x0]
lsl r0, r0, #0xe
add r2, r1, #0x0
blx r3
- ldr r3, _0206DF54 ; =UNK_021064C0
+ ldr r3, _0206DF54 ; =NNS_GfdDefaultFuncAllocPlttVram
mov r1, #0x0
add r4, r0, #0x0
ldr r3, [r3, #0x0]
@@ -154,8 +154,8 @@ _0206DF48:
bl FUN_02012CC8
pop {r3-r5, pc}
nop
-_0206DF50: .word UNK_021064B8
-_0206DF54: .word UNK_021064C0
+_0206DF50: .word NNS_GfdDefaultFuncAllocTexVram
+_0206DF54: .word NNS_GfdDefaultFuncAllocPlttVram
thumb_func_start FUN_0206DF58
FUN_0206DF58: ; 0x0206DF58
@@ -165,7 +165,7 @@ FUN_0206DF58: ; 0x0206DF58
cmp r0, #0x0
ble _0206DF6E
bl FUN_020222AC
- bl FUN_020B02C8
+ bl NNS_G2dSetupSoftwareSpriteCamera
_0206DF6E:
bl FUN_02013388
mov r0, #0x1
@@ -176,7 +176,7 @@ _0206DF6E:
thumb_func_start FUN_0206DF7C
FUN_0206DF7C: ; 0x0206DF7C
push {r4, lr}
- ldr r3, _0206DF94 ; =UNK_021064B8
+ ldr r3, _0206DF94 ; =NNS_GfdDefaultFuncAllocTexVram
mov r2, #0x0
ldr r3, [r3, #0x0]
blx r3
@@ -186,12 +186,12 @@ FUN_0206DF7C: ; 0x0206DF7C
lsr r0, r0, #0xd
pop {r4, pc}
nop
-_0206DF94: .word UNK_021064B8
+_0206DF94: .word NNS_GfdDefaultFuncAllocTexVram
thumb_func_start FUN_0206DF98
FUN_0206DF98: ; 0x0206DF98
push {r4, lr}
- ldr r3, _0206DFB0 ; =UNK_021064C0
+ ldr r3, _0206DFB0 ; =NNS_GfdDefaultFuncAllocPlttVram
mov r2, #0x0
ldr r3, [r3, #0x0]
blx r3
@@ -201,7 +201,7 @@ FUN_0206DF98: ; 0x0206DF98
lsr r0, r0, #0xd
pop {r4, pc}
nop
-_0206DFB0: .word UNK_021064C0
+_0206DFB0: .word NNS_GfdDefaultFuncAllocPlttVram
thumb_func_start FUN_0206DFB4
FUN_0206DFB4: ; 0x0206DFB4
diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s
index 1a62b92b..a50d92bf 100644
--- a/arm9/asm/unk_0206F3FC.s
+++ b/arm9/asm/unk_0206F3FC.s
@@ -1274,7 +1274,7 @@ FUN_0206FD24: ; 0x0206FD24
bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0x10
add r4, r0, #0x0
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
ldr r2, [sp, #0x10]
mov r0, #0x3
ldr r1, [r2, #0xc]
@@ -6204,7 +6204,7 @@ FUN_020724D4: ; 0x020724D4
bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0xc
str r0, [sp, #0x8]
- bl FUN_020B0180
+ bl NNS_G2dGetUnpackedScreenData
ldr r0, [sp, #0xc]
mov r4, #0x0
str r0, [sp, #0x4]
diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s
index 16a7190f..703233b3 100644
--- a/arm9/asm/unk_020772F0.s
+++ b/arm9/asm/unk_020772F0.s
@@ -2418,7 +2418,7 @@ FUN_02078140: ; 0x02078140
push {r4-r7, lr}
sub sp, #0x14
add r5, r0, #0x0
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0x0
str r0, [sp, #0x0]
mov r1, #0x80
diff --git a/arm9/asm/unk_020799E8.s b/arm9/asm/unk_020799E8.s
index 7f35d1a7..9227ca82 100644
--- a/arm9/asm/unk_020799E8.s
+++ b/arm9/asm/unk_020799E8.s
@@ -264,7 +264,7 @@ FUN_02079B60: ; 0x02079B60
_02079B9A:
add r0, r7, #0x0
add r1, sp, #0x10
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
cmp r4, #0x0
bne _02079BAE
ldr r0, [sp, #0x10]
@@ -286,7 +286,7 @@ _02079BAE:
_02079BC6:
add r0, r7, #0x0
add r1, sp, #0xc
- bl FUN_020B0180
+ bl NNS_G2dGetUnpackedScreenData
cmp r4, #0x0
bne _02079BDA
ldr r0, [sp, #0xc]
@@ -322,7 +322,7 @@ _02079BF8:
_02079C10:
add r0, r7, #0x0
add r1, sp, #0x8
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
cmp r4, #0x0
bne _02079C24
ldr r0, [sp, #0x8]
@@ -363,6 +363,6 @@ FUN_02079C40: ; 0x02079C40
bl NARC_ReadWholeMember
add r0, r4, #0x0
add r1, r7, #0x0
- bl FUN_020B0180
+ bl NNS_G2dGetUnpackedScreenData
add r0, r4, #0x0
pop {r3-r7, pc}
diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s
index 617a122a..625807ae 100644
--- a/arm9/asm/unk_02079C70.s
+++ b/arm9/asm/unk_02079C70.s
@@ -2750,7 +2750,7 @@ _0207B256:
bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0xc
add r4, r0, #0x0
- bl FUN_020B0180
+ bl NNS_G2dGetUnpackedScreenData
mov r3, #0x0
str r3, [sp, #0x0]
mov r0, #0x20
diff --git a/arm9/asm/unk_0207EF6C.s b/arm9/asm/unk_0207EF6C.s
index 8fcaed0c..e4e29259 100644
--- a/arm9/asm/unk_0207EF6C.s
+++ b/arm9/asm/unk_0207EF6C.s
@@ -99,7 +99,7 @@ UNK_020FB6E6: ; 0x020FB6E6
FUN_0207EF6C: ; 0x0207EF6C
push {r3-r4, lr}
sub sp, #0x4
- bl FUN_020BB7F4
+ bl NNS_G3dInit
bl G3X_Init
bl G3X_InitMtxStack
ldr r0, _0207EFEC ; =0x04000060
@@ -183,16 +183,16 @@ FUN_0207F008: ; 0x0207F008
mov r0, #0x2
str r0, [r2, #0x0]
str r3, [r1, #0x0]
- bl FUN_020B849C
+ bl NNS_G3dGlbFlushP
mov r0, #0xb7
lsl r0, r0, #0x2
add r0, r4, r0
bl FUN_0207F108
- bl FUN_020B849C
+ bl NNS_G3dGlbFlushP
add r0, r4, #0x0
bl FUN_0207F1A4
_0207F046:
- bl FUN_020B02C8
+ bl NNS_G2dSetupSoftwareSpriteCamera
mov r0, #0xae
lsl r0, r0, #0x2
ldr r0, [r4, r0]
diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s
index 94945259..7ae62351 100644
--- a/arm9/asm/unk_02086414.s
+++ b/arm9/asm/unk_02086414.s
@@ -1,8 +1,8 @@
.include "asm/macros.inc"
.include "global.inc"
- .extern UNK_021064B8
- .extern UNK_021064C0
+ .extern NNS_GfdDefaultFuncAllocTexVram
+ .extern NNS_GfdDefaultFuncAllocPlttVram
.section .rodata
@@ -217,14 +217,14 @@ _02086508: .word 0x04000580
thumb_func_start FUN_0208650C
FUN_0208650C: ; 0x0208650C
push {r3-r5, lr}
- ldr r3, _02086544 ; =UNK_021064B8
+ ldr r3, _02086544 ; =NNS_GfdDefaultFuncAllocTexVram
mov r0, #0x2
mov r1, #0x0
ldr r3, [r3, #0x0]
lsl r0, r0, #0xe
add r2, r1, #0x0
blx r3
- ldr r3, _02086548 ; =UNK_021064C0
+ ldr r3, _02086548 ; =NNS_GfdDefaultFuncAllocPlttVram
mov r1, #0x0
add r4, r0, #0x0
ldr r3, [r3, #0x0]
@@ -243,8 +243,8 @@ _0208653C:
bl FUN_02012CC8
pop {r3-r5, pc}
nop
-_02086544: .word UNK_021064B8
-_02086548: .word UNK_021064C0
+_02086544: .word NNS_GfdDefaultFuncAllocTexVram
+_02086548: .word NNS_GfdDefaultFuncAllocPlttVram
thumb_func_start FUN_0208654C
FUN_0208654C: ; 0x0208654C
@@ -400,7 +400,7 @@ FUN_02086698: ; 0x02086698
cmp r0, #0x0
ble _020866AE
bl FUN_020222AC
- bl FUN_020B02C8
+ bl NNS_G2dSetupSoftwareSpriteCamera
_020866AE:
bl FUN_02013388
mov r0, #0x1
@@ -845,7 +845,7 @@ FUN_020869F0: ; 0x020869F0
thumb_func_start FUN_02086A48
FUN_02086A48: ; 0x02086A48
push {r4, lr}
- ldr r3, _02086A60 ; =UNK_021064B8
+ ldr r3, _02086A60 ; =NNS_GfdDefaultFuncAllocTexVram
mov r2, #0x0
ldr r3, [r3, #0x0]
blx r3
@@ -855,12 +855,12 @@ FUN_02086A48: ; 0x02086A48
lsr r0, r0, #0xd
pop {r4, pc}
nop
-_02086A60: .word UNK_021064B8
+_02086A60: .word NNS_GfdDefaultFuncAllocTexVram
thumb_func_start FUN_02086A64
FUN_02086A64: ; 0x02086A64
push {r4, lr}
- ldr r3, _02086A7C ; =UNK_021064C0
+ ldr r3, _02086A7C ; =NNS_GfdDefaultFuncAllocPlttVram
mov r2, #0x0
ldr r3, [r3, #0x0]
blx r3
@@ -870,7 +870,7 @@ FUN_02086A64: ; 0x02086A64
lsr r0, r0, #0xd
pop {r4, pc}
nop
-_02086A7C: .word UNK_021064C0
+_02086A7C: .word NNS_GfdDefaultFuncAllocPlttVram
thumb_func_start FUN_02086A80
FUN_02086A80: ; 0x02086A80
diff --git a/arm9/asm/unk_0208AC14.s b/arm9/asm/unk_0208AC14.s
index 058f8c32..2f1ab9a6 100644
--- a/arm9/asm/unk_0208AC14.s
+++ b/arm9/asm/unk_0208AC14.s
@@ -2,8 +2,8 @@
.include "global.inc"
.extern FX_SinCosTable_
- .extern UNK_021064B8
- .extern UNK_021064C0
+ .extern NNS_GfdDefaultFuncAllocTexVram
+ .extern NNS_GfdDefaultFuncAllocPlttVram
.section .data
.global UNK_02106158
@@ -773,7 +773,7 @@ _0208B60C:
FUN_0208B630: ; 0x0208B630
stmdb sp!, {lr}
sub sp, sp, #0x4
- ldr r3, _0208B660 ; =UNK_021064C0
+ ldr r3, _0208B660 ; =NNS_GfdDefaultFuncAllocPlttVram
mov r2, #0x0
ldr r3, [r3, #0x0]
blx r3
@@ -784,14 +784,14 @@ FUN_0208B630: ; 0x0208B630
ldmia sp!, {lr}
bx lr
.balign 4
-_0208B660: .word UNK_021064C0
+_0208B660: .word NNS_GfdDefaultFuncAllocPlttVram
_0208B664: .word 0x0000FFFF
arm_func_start FUN_0208B668
FUN_0208B668: ; 0x0208B668
stmdb sp!, {lr}
sub sp, sp, #0x4
- ldr r3, _0208B698 ; =UNK_021064B8
+ ldr r3, _0208B698 ; =NNS_GfdDefaultFuncAllocTexVram
mov r2, #0x0
ldr r3, [r3, #0x0]
blx r3
@@ -802,7 +802,7 @@ FUN_0208B668: ; 0x0208B668
ldmia sp!, {lr}
bx lr
.balign 4
-_0208B698: .word UNK_021064B8
+_0208B698: .word NNS_GfdDefaultFuncAllocTexVram
_0208B69C: .word 0x0000FFFF
arm_func_start FUN_0208B6A0
diff --git a/arm9/global.inc b/arm9/global.inc
index f2731c79..f389ad93 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -5572,229 +5572,229 @@
.extern VCT_Main
.extern VCT_Cleanup
.extern VCT_Init
-.extern FUN_020ADA84
-.extern FUN_020ADA98
-.extern FUN_020ADAB0
-.extern FUN_020ADB18
-.extern FUN_020ADBE8
-.extern FUN_020ADC74
-.extern FUN_020ADDC0
-.extern FUN_020ADDC8
-.extern FUN_020ADDF0
-.extern FUN_020ADE2C
-.extern FUN_020AE554
-.extern FUN_020AE5B0
-.extern FUN_020AE600
-.extern FUN_020AE638
-.extern FUN_020AE684
-.extern FUN_020AE82C
-.extern FUN_020AE84C
-.extern FUN_020AE868
-.extern FUN_020AE8CC
-.extern FUN_020AE918
-.extern FUN_020AEAF4
-.extern FUN_020AEB70
-.extern FUN_020AEC60
-.extern FUN_020AEC7C
-.extern FUN_020AEC98
-.extern FUN_020AEDF4
-.extern FUN_020AEE40
-.extern FUN_020AEEB8
-.extern FUN_020AEF1C
-.extern FUN_020AF2E0
-.extern FUN_020AF2F4
-.extern FUN_020AF30C
-.extern FUN_020AF6A4
-.extern FUN_020AF894
-.extern FUN_020AF9C4
-.extern FUN_020AFA28
-.extern FUN_020AFA30
-.extern FUN_020AFA80
-.extern FUN_020AFBA8
-.extern FUN_020AFBFC
-.extern FUN_020AFC04
-.extern FUN_020AFEB8
-.extern FUN_020AFFD8
-.extern FUN_020B0030
-.extern FUN_020B0088
-.extern FUN_020B00F0
-.extern FUN_020B0138
-.extern FUN_020B0180
-.extern FUN_020B0250
-.extern FUN_020B02C8
-.extern FUN_020B0448
-.extern FUN_020B04FC
-.extern FUN_020B0830
-.extern FUN_020B0870
-.extern FUN_020B0888
-.extern FUN_020B0BB0
-.extern FUN_020B0C7C
-.extern FUN_020B0D58
-.extern FUN_020B0E34
-.extern FUN_020B0FC0
-.extern FUN_020B10E8
-.extern FUN_020B1240
-.extern FUN_020B1340
-.extern FUN_020B1528
-.extern FUN_020B1768
-.extern FUN_020B19C4
-.extern FUN_020B19DC
-.extern FUN_020B1A14
-.extern FUN_020B1A1C
-.extern FUN_020B1A24
-.extern FUN_020B1AF8
-.extern FUN_020B1EA4
-.extern FUN_020B1EC4
-.extern FUN_020B1EE4
-.extern FUN_020B1EFC
-.extern FUN_020B1F80
-.extern FUN_020B20C8
-.extern FUN_020B2194
-.extern FUN_020B224C
-.extern FUN_020B23D8
-.extern FUN_020B242C
-.extern FUN_020B2794
-.extern FUN_020B28B4
-.extern FUN_020B2A08
-.extern FUN_020B2B08
-.extern FUN_020B2B58
-.extern FUN_020B2D9C
-.extern FUN_020B317C
-.extern FUN_020B31F0
-.extern FUN_020B326C
-.extern FUN_020B3334
-.extern FUN_020B3390
-.extern FUN_020B33A0
-.extern FUN_020B4358
-.extern FUN_020B43A4
-.extern FUN_020B442C
-.extern FUN_020B4568
-.extern FUN_020B4F38
-.extern FUN_020B502C
-.extern FUN_020B5C88
-.extern FUN_020B5CE4
-.extern FUN_020B5D3C
-.extern FUN_020B5E50
-.extern FUN_020B6180
-.extern FUN_020B6240
-.extern FUN_020B62F8
-.extern FUN_020B6388
-.extern FUN_020B63CC
-.extern FUN_020B7168
-.extern FUN_020B7218
-.extern FUN_020B772C
-.extern FUN_020B7790
-.extern FUN_020B7C58
-.extern FUN_020B7C78
-.extern FUN_020B7CDC
-.extern FUN_020B7CE4
-.extern FUN_020B7CF0
-.extern FUN_020B7D28
-.extern FUN_020B7DFC
-.extern FUN_020B7E10
-.extern FUN_020B7E1C
-.extern FUN_020B7E28
-.extern FUN_020B7EFC
-.extern FUN_020B80B4
-.extern FUN_020B8110
-.extern FUN_020B8344
-.extern FUN_020B8390
-.extern FUN_020B83BC
-.extern FUN_020B83E0
-.extern FUN_020B8404
-.extern FUN_020B8418
-.extern FUN_020B844C
-.extern FUN_020B8474
-.extern FUN_020B849C
-.extern FUN_020BAC98
-.extern FUN_020BAFB8
-.extern FUN_020BB1C0
-.extern FUN_020BB394
-.extern FUN_020BB408
-.extern FUN_020BB59C
-.extern FUN_020BB7F4
-.extern FUN_020BB8D0
-.extern FUN_020BB8F4
-.extern FUN_020BB934
-.extern FUN_020BB974
-.extern FUN_020BB9B4
-.extern FUN_020BB9F4
-.extern FUN_020BBA34
-.extern FUN_020BBA74
-.extern FUN_020BBAB4
-.extern FUN_020BBAF4
-.extern FUN_020BBB34
-.extern FUN_020BBB74
-.extern FUN_020BBBB4
-.extern FUN_020BBBF4
-.extern FUN_020BBC34
-.extern FUN_020BC02C
-.extern FUN_020BC094
-.extern FUN_020BC0FC
-.extern FUN_020BC13C
-.extern FUN_020BC2A0
-.extern FUN_020BC4C8
-.extern FUN_020C0174
-.extern FUN_020C01A0
-.extern SDAT_Init
-.extern FUN_020C03B8
-.extern FUN_020C041C
-.extern FUN_020C044C
-.extern FUN_020C04DC
-.extern FUN_020C0510
-.extern FUN_020C054C
-.extern FUN_020C0670
-.extern FUN_020C0688
-.extern FUN_020C0DD4
-.extern FUN_020C0E14
-.extern FUN_020C0E7C
-.extern FUN_020C0EA4
-.extern FUN_020C0EF4
-.extern FUN_020C0F30
-.extern FUN_020C0F40
-.extern FUN_020C0F50
-.extern FUN_020C0F68
-.extern FUN_020C0F80
-.extern FUN_020C0F8C
-.extern FUN_020C0F9C
-.extern FUN_020C0FDC
-.extern FUN_020C1040
-.extern FUN_020C10A4
-.extern FUN_020C1148
-.extern FUN_020C1180
-.extern FUN_020C13C4
-.extern FUN_020C1430
-.extern FUN_020C1458
-.extern FUN_020C14AC
-.extern FUN_020C1674
-.extern FUN_020C169C
-.extern FUN_020C16FC
-.extern FUN_020C1E58
-.extern FUN_020C1E68
-.extern FUN_020C1EA4
-.extern FUN_020C1F54
-.extern FUN_020C1FA4
-.extern FUN_020C1FF0
-.extern FUN_020C20DC
-.extern FUN_020C2104
-.extern FUN_020C217C
-.extern FUN_020C226C
-.extern FUN_020C22D0
-.extern FUN_020C23FC
-.extern FUN_020C2444
-.extern SDAT_Open
-.extern FUN_020C2828
-.extern FUN_020C290C
-.extern FUN_020C2A94
-.extern FUN_020C35E0
-.extern FUN_020C360C
-.extern FUN_020C3640
-.extern FUN_020C3674
-.extern FUN_020C36A8
-.extern FUN_020C3888
-.extern FUN_020C3910
-.extern FUN_020C3980
-.extern FUN_020C39CC
+.extern NNS_FndGetPrevListObject
+.extern NNS_FndGetNextListObject
+.extern NNS_FndRemoveListObject
+.extern NNS_FndInsertListObject
+.extern NNS_FndAppendListObject
+.extern NNS_FndInitList
+.extern NNS_FndGetSizeForMBlockExpHeap
+.extern NNS_FndGetTotalFreeSizeForExpHeap
+.extern NNS_FndFreeToExpHeap
+.extern NNS_FndResizeForMBlockExpHeap
+.extern NNS_FndFreeByStateToFrmHeap
+.extern NNS_FndRecordStateForFrmHeap
+.extern NNS_FndFreeToFrmHeap
+.extern NNS_FndAllocFromFrmHeapEx
+.extern NNS_FndCreateFrmHeapEx
+.extern NNS_FndInitAllocatorForExpHeap
+.extern NNS_FndFreeToAllocator
+.extern NNS_FndAllocFromAllocator
+.extern NNS_GfdSetFrmTexVramState
+.extern NNS_GfdGetFrmTexVramState
+.extern NNS_GfdResetFrmTexVramState
+.extern NNS_GfdInitFrmTexVramManager
+.extern NNS_GfdResetFrmPlttVramState
+.extern NNS_GfdSetFrmPlttVramState
+.extern NNS_GfdGetFrmPlttVramState
+.extern NNS_GfdInitFrmPlttVramManager
+.extern NNS_GfdRegisterNewVramTransferTask
+.extern NNS_GfdDoVramTransfer
+.extern NNS_GfdInitVramTransferManager
+.extern IsVramTransferTaskQueueEmpty_
+.extern IsVramTransferTaskQueueFull_
+.extern GetNextIndex_
+.extern NNS_GfdResetLnkTexVramState
+.extern NNS_GfdFreeLnkTexVram
+.extern NNS_GfdInitLnkTexVramManager
+.extern NNS_GfdGetLnkTexVramManagerWorkSize
+.extern NNS_GfdResetLnkPlttVramState
+.extern NNS_GfdFreeLnkPlttVram
+.extern NNS_GfdInitLnkPlttVramManager
+.extern NNS_GfdGetLnkPlttVramManagerWorkSize
+.extern NNS_G2dGetAnimSequenceByIdx
+.extern NNS_G2dGetUnpackedCellBank
+.extern NNS_G2dGetUnpackedMultiCellBank
+.extern NNS_G2dGetUnpackedBGCharacterData
+.extern NNS_G2dGetUnpackedCharacterData
+.extern NNS_G2dGetUnpackedPaletteCompressInfo
+.extern NNS_G2dGetUnpackedPaletteData
+.extern NNS_G2dGetUnpackedScreenData
+.extern NNS_G2dDrawSpriteFast
+.extern NNS_G2dSetupSoftwareSpriteCamera
+.extern NNS_G2dResetAnimCtrlState
+.extern NNS_G2dGetAnimCtrlCurrentFrame
+.extern NNS_G2dGetOamManagerOamCapacity
+.extern NNS_G2dApplyAndResetOamManagerBuffer
+.extern NNS_G2dResetOamManagerBuffer
+.extern NNS_G2dEntryOamManagerAffine
+.extern NNS_G2dEntryOamManagerOamWithAffineIdx
+.extern NNS_G2dEntryOamManagerOam
+.extern NNS_G2dGetNewOamManagerInstance
+.extern NNS_G2dInitOamManagerModule
+.extern NNS_G2dLoadPaletteEx
+.extern NNS_G2dLoadPalette
+.extern NNS_G2dLoadImageVramTransfer
+.extern NNS_G2dLoadImage2DMapping
+.extern NNS_G2dLoadImage1DMapping
+.extern NNS_G2dGetImagePaletteLocation
+.extern NNS_G2dInitImagePaletteProxy
+.extern NNS_G2dGetImageLocation
+.extern NNS_G2dSetImageLocation
+.extern NNS_G2dInitImageProxy
+.extern NNS_G2dMakeCellToOams
+.extern NNS_G2dSetCellAnimationCurrentFrame
+.extern NNS_G2dTickCellAnimation
+.extern NNS_G2dSetCellAnimationSequence
+.extern NNS_G2dInitCellAnimationVramTransfered
+.extern NNS_G2dInitCellAnimation
+.extern NNS_G2dInitMCAnimation
+.extern NNS_G2dSetMCAnimationCurrentFrame
+.extern NNS_G2dTickMCAnimation
+.extern NNS_G2dGetMCBankNumNodesRequired
+.extern NNS_G2dSetAnimSequenceToMCAnimation
+.extern NNS_G2dRotZ
+.extern NNS_G2dScale
+.extern NNS_G2dTranslate
+.extern NNS_G2dPopMtx
+.extern NNS_G2dPushMtx
+.extern NNS_G2dDrawMultiCellAnimation
+.extern NNS_G2dDrawCellAnimation
+.extern NNS_G2dEndRendering
+.extern NNS_G2dBeginRendering
+.extern NNS_G2dInitRenderSurface
+.extern NNS_G2dAddRendererTargetSurface
+.extern NNS_G2dInitRenderer
+.extern NNS_G2dFreeCellTransferStateHandle
+.extern NNS_G2dGetNewCellTransferStateHandle
+.extern NNS_G2dUpdateCellTransferStateManager
+.extern NNS_G2dInitCellTransferStateManager
+.extern NNS_G2dSetRndCoreFlipMode
+.extern NNS_G2dSetRndCoreAffineOverwriteMode
+.extern NNS_G2dFontGetCharWidthsFromIndex
+.extern NNS_G2dFontFindGlyphIndex
+.extern NNS_G2dFontInitUTF16
+.extern NNS_G2dArrangeOBJ1D
+.extern NNSi_G2dCalcRequiredOBJ
+.extern NNS_G2dMapScrToCharText
+.extern NNS_G2dCharCanvasInitForOBJ1D
+.extern NNS_G2dCharCanvasInitForBG
+.extern NNS_G2dCharCanvasDrawChar
+.extern NNSi_G2dTextCanvasDrawTextRect
+.extern NNSi_G2dTextCanvasDrawText
+.extern NNS_G3dReleaseMdlSet
+.extern NNS_G3dBindMdlSet
+.extern NNS_G3dPlttReleasePlttKey
+.extern NNS_G3dPlttLoad
+.extern NNS_G3dPlttSetPlttKey
+.extern NNS_G3dPlttGetRequiredSize
+.extern NNS_G3dTexReleaseTexKey
+.extern NNS_G3dTexLoad
+.extern NNS_G3dTexSetTexKey
+.extern NNS_G3dTex4x4GetRequiredSize
+.extern NNS_G3dTexGetRequiredSize
+.extern NNS_G3dRenderObjRemoveAnmObj
+.extern NNS_G3dRenderObjAddAnmObj
+.extern NNS_G3dRenderObjInit
+.extern NNS_G3dAnmObjInit
+.extern NNS_G3dGlbGetInvV
+.extern NNS_G3dGlbPolygonAttr
+.extern NNS_G3dGlbMaterialColorSpecEmi
+.extern NNS_G3dGlbMaterialColorDiffAmb
+.extern NNS_G3dGlbLightColor
+.extern NNS_G3dGlbLightVector
+.extern NNS_G3dGlbSetBaseScale
+.extern NNS_G3dGlbSetBaseTrans
+.extern NNS_G3dGlbFlushP
+.extern NNS_G3dDraw
+.extern NNS_G3dDraw1Mat1Shp
+.extern NNS_G3dGeBufferOP_N
+.extern NNS_G3dGeFlushBuffer
+.extern NNS_G3dWorldPosToScrPos
+.extern NNS_G3dResDefaultSetup
+.extern NNS_G3dInit
+.extern NNS_G3dAllocAnmObj
+.extern NNS_G3dMdlSetMdlXLDepthUpdateAll
+.extern NNS_G3dMdlSetMdlFarClipAll
+.extern NNS_G3dMdlSetMdl1DotAll
+.extern NNS_G3dMdlSetMdlDepthTestCondAll
+.extern NNS_G3dMdlSetMdlFogEnableFlagAll
+.extern NNS_G3dMdlSetMdlAlphaAll
+.extern NNS_G3dMdlSetMdlPolygonIDAll
+.extern NNS_G3dMdlSetMdlCullModeAll
+.extern NNS_G3dMdlSetMdlPolygonModeAll
+.extern NNS_G3dMdlSetMdlLightEnableFlagAll
+.extern NNS_G3dMdlSetMdlEmiAll
+.extern NNS_G3dMdlSetMdlSpecAll
+.extern NNS_G3dMdlSetMdlAmbAll
+.extern NNS_G3dMdlSetMdlDiffAll
+.extern NNSi_G3dModifyPolygonAttrMask
+.extern NNSi_G3dModifyMatFlag
+.extern NNS_G3dGetTex
+.extern NNS_G3dGetMdlSet
+.extern NNS_G3dGetResDataByName
+.extern NNS_G3dGetAnmByIdx
+.extern NNS_SndSetMonoFlag
+.extern NNS_SndMain
+.extern NNS_SndInit
+.extern NNS_SndWaveOutIsPlaying
+.extern NNS_SndWaveOutSetPan
+.extern NNS_SndWaveOutSetSpeed
+.extern NNS_SndWaveOutSetVolume
+.extern NNS_SndWaveOutStop
+.extern NNS_SndWaveOutStart
+.extern NNS_SndWaveOutFreeChannel
+.extern NNS_SndWaveOutAllocChannel
+.extern NNS_SndPlayerGetTick
+.extern NNS_SndPlayerGetSeqNo
+.extern NNS_SndPlayerSetTrackPan
+.extern NNS_SndPlayerSetTrackPitch
+.extern NNS_SndPlayerMoveVolume
+.extern NNS_SndPlayerSetInitialVolume
+.extern NNS_SndPlayerSetVolume
+.extern NNS_SndPlayerCountPlayingSeqByPlayerNo
+.extern NNS_SndHandleReleaseSeq
+.extern NNS_SndHandleInit
+.extern NNS_SndPlayerPause
+.extern NNS_SndPlayerStopSeqAll
+.extern NNS_SndPlayerStopSeqBySeqNo
+.extern NNS_SndPlayerStopSeqByPlayerNo
+.extern NNS_SndPlayerStopSeq
+.extern NNS_SndPlayerSetAllocatableChannel
+.extern NNS_SndPlayerSetPlayerVolume
+.extern NNS_SndStrmSetVolume
+.extern NNS_SndStrmStop
+.extern NNS_SndStrmStart
+.extern NNS_SndStrmSetup
+.extern NNS_SndStrmFreeChannel
+.extern NNS_SndStrmAllocChannel
+.extern NNS_SndStrmInit
+.extern NNS_SndCaptureIsActive
+.extern NNS_SndCaptureStopEffect
+.extern NNS_SndCaptureStartEffect
+.extern NNS_SndCaptureStopReverb
+.extern NNS_SndCaptureSetReverbVolume
+.extern NNS_SndCaptureStartReverb
+.extern NNS_SndArcGetFileAddress
+.extern NNS_SndArcReadFile
+.extern NNS_SndArcGetFileSize
+.extern NNS_SndArcGetWaveArcInfo
+.extern NNS_SndArcGetBankInfo
+.extern NNS_SndArcGetSeqParam
+.extern NNS_SndArcInitOnMemory
+.extern NNS_SndArcInit
+.extern NNS_SndHeapLoadState
+.extern NNS_SndHeapSaveState
+.extern NNS_SndHeapCreate
+.extern NNS_SndArcLoadSeqEx
+.extern NNS_SndArcLoadWaveArc
+.extern NNS_SndArcLoadBank
+.extern NNS_SndArcLoadSeq
+.extern NNS_SndArcLoadGroup
+.extern NNS_SndArcPlayerStartSeqArc
+.extern NNS_SndArcPlayerStartSeqEx
+.extern NNS_SndArcPlayerStartSeq
+.extern NNS_SndArcPlayerSetup
.extern FUN_020C5D8C
.extern FUN_020C5E04
.extern FUN_020C6034
@@ -8191,8 +8191,8 @@
.extern UNK_020FB764
.extern UNK_020FD144
.extern UNK_020FD6D4
-.extern UNK_021064B8
-.extern UNK_021064C0
+.extern NNS_GfdDefaultFuncAllocTexVram
+.extern NNS_GfdDefaultFuncAllocPlttVram
.extern gMain
.extern UNK_021C8ECC
.extern UNK_021C8ED0
@@ -8238,12 +8238,8 @@
.extern UNK_020FF3D4
.extern FX_SinCosTable_
.extern UNK_02105BB8
-.extern UNK_021064BC
-.extern UNK_021064C4
-.extern UNK_021CED20
-.extern UNK_021CED98
-.extern UNK_021CEDD4
-.extern UNK_021CEF70
+.extern NNS_GfdDefaultFuncFreeTexVram
+.extern NNS_GfdDefaultFuncFreePlttVram
.extern UnloadOverlayByID
.extern VEC_Add
.extern VEC_CrossProduct
@@ -8465,16 +8461,16 @@
.extern sys_exit
.extern sys_readc
.extern sys_writec
-.extern tempName_NNS_FndAllocFromExpHeapEx
-.extern tempName_NNS_FndCreateExpHeapEx
+.extern NNS_FndAllocFromExpHeapEx
+.extern NNS_FndCreateExpHeapEx
.extern DWC_ClearDirtyFlag
.extern DWC_CreateUserData
-.extern thunk_FUN_020adc8c
-.extern thunk_FUN_020adc8c_2
-.extern thunk_FUN_020ae84c
-.extern thunk_FUN_020afda0
-.extern thunk_FUN_020afda0_2
-.extern thunk_FUN_020b5040
+.extern NNS_FndDestroyExpHeap
+.extern NNS_FndDestroyFrmHeap
+.extern NNS_G3dFreeAnmObj
+.extern NNS_G2dGetUnpackedMCAnimBank
+.extern NNS_G2dGetUnpackedAnimBank
+.extern NNS_G2dSetRendererImageProxy
.extern vsnprintf
.extern vsscanf
.extern vswprintf
@@ -8499,8 +8495,8 @@
.extern DWCi_BACKUPlWriteAll
.extern DWCi_BM_SetWiFiInfo
.extern DWC_Auth_CheckWiFiIDNeedCreate
-.extern UNK_021064B8
-.extern UNK_021064C0
+.extern NNS_GfdDefaultFuncAllocTexVram
+.extern NNS_GfdDefaultFuncAllocPlttVram
.extern MOD18_0224CA58
.extern MOD18_0223DFB4
.extern MOD18_02245FA0
@@ -8520,160 +8516,152 @@
.extern FUN_020254A0
.extern FUN_020254B4
.extern FUN_02041464
-.extern FUN_020AFE8C
-.extern FUN_020B0438
-.extern FUN_020B04C0
-.extern FUN_020B0518
-.extern FUN_020B0534
-.extern FUN_020B06E0
-.extern FUN_020B1A68
-.extern FUN_020B1A78
-.extern FUN_020B1A98
-.extern FUN_020B1AB4
-.extern FUN_020B4400
-.extern FUN_020B45F0
-.extern UNK_020FF894
-.extern UNK_020FF8AC
-.extern FUN_020B10BC
-.extern FUN_020B10C4
-.extern FUN_020B10CC
-.extern FUN_020B76B0
-.extern FUN_020B7558
-.extern FUN_020B7718
-.extern FUN_020AFF34
-.extern FUN_020B0408
-.extern FUN_020B1AD4
-.extern FUN_020B01F8
-.extern FUN_020B01B0
+.extern NNS_G2dGetCellDataByIdx
+.extern NNS_G2dBindAnimCtrl
+.extern NNS_G2dInitAnimCtrl
+.extern NNS_G2dSetAnimCtrlCurrentFrame
+.extern NNS_G2dTickAnimCtrl
+.extern NNS_G2dGetAnimCtrlCurrentElement
+.extern NNSi_G2dSrtcInitControl
+.extern NNSi_G2dSrtcSetSRTScale
+.extern NNSi_G2dSrtcSetSRTRotZ
+.extern NNSi_G2dSrtcSetTrans
+.extern NNS_G2dSetCellTransferStateRequested
+.extern NNSi_G2dInitCellTransferState
+.extern NNSi_objSizeHTbl
+.extern NNSi_objSizeWTbl
+.extern NNSi_G2dGetVramLocation
+.extern NNSi_G2dSetVramLocation
+.extern NNSi_G2dInitializeVRamLocation
+.extern NNSi_G2dBitReaderRead
+.extern NNSi_G2dGetUnpackedFont
+.extern NNSi_G2dSplitCharUTF16
+.extern NNS_G2dGetMultiCellDataByIdx
+.extern NNSi_G2dIsAnimCtrlLoopAnim
+.extern NNSi_G2dInitializeNode
+.extern NNS_G2dFindBinaryBlock
+.extern NNSi_G2dUnpackUserExCellAttrBank
.extern GXi_DmaId
-.extern FUN_020B10B0
-.extern FUN_020B423C
-.extern FUN_020B4948
-.extern FUN_020B4958
-.extern FUN_020B4968
-.extern FUN_020B497C
-.extern FUN_020B4BF4
-.extern FUN_020B4CDC
-.extern FUN_020B4DA0
-.extern FUN_020B4E0C
-.extern FUN_020B4F74
-.extern FUN_020B4F88
-.extern FUN_020B4F9C
-.extern FUN_020B4FA4
-.extern FUN_020B4FAC
-.extern FUN_020B4FC4
-.extern FUN_020B5034
-.extern FUN_020B5040
-.extern FUN_020B504C
-.extern FUN_020B19A8
-.extern FUN_020B19FC
-.extern FUN_020B469C
-.extern FUN_020B46B4
-.extern FUN_020B5ABC
-.extern FUN_020B5B54
-.extern FUN_020B5BC8
-.extern FUN_020BB2B0
-.extern UNK_02106620
-.extern FUN_020BDA70
-.extern FUN_020BDAB4
-.extern FUN_020BDB40
-.extern FUN_020BDC0C
-.extern FUN_020BDF38
-.extern FUN_020BDF84
-.extern FUN_020BE334
-.extern FUN_020BE4F0
-.extern FUN_020BE5A0
-.extern FUN_020BE5E0
-.extern FUN_020BE62C
-.extern FUN_020BE668
-.extern FUN_020BE6E4
-.extern FUN_020BECEC
-.extern FUN_020BEE3C
-.extern FUN_020BEF10
-.extern FUN_020BF0D4
-.extern FUN_020BF2FC
-.extern FUN_020BF42C
-.extern FUN_020BFA9C
-.extern UNK_02106594
-.extern UNK_021065AC
-.extern UNK_021065B0
-.extern UNK_021065B4
-.extern UNK_021065B8
-.extern UNK_021065BC
-.extern UNK_021CEF7C
-.extern UNK_021CFD8C
-.extern UNK_021CFD90
-.extern UNK_021CFD94
-.extern FUN_020B81B0
-.extern UNK_0210659C
-.extern FUN_020BC14C
-.extern UNK_021065A8
-.extern UNK_021065A0
-.extern FUN_020BC42C
-.extern FUN_020BC4A8
-.extern FUN_020BC4B8
-.extern UNK_021065A4
-.extern UNK_02106598
-.extern FUN_020B8264
-.extern FUN_020B82A4
-.extern FUN_020BB824
-.extern UNK_02106608
-.extern UNK_02106614
-.extern UNK_021CED18
-.extern UNK_021CED64
-.extern UNK_021CEDF8
-.extern UNK_021CFD80
-.extern UNK_021CFD84
-.extern UNK_021CFD88
-.extern FUN_020B8200
-.extern FUN_020B84D8
-.extern FUN_020AF334
-.extern FUN_020AF488
-.extern FUN_020AF5E0
-.extern FUN_020AF64C
-.extern FUN_020AF698
-.extern FUN_020AF5C4
-.extern FUN_020C029C
-.extern FUN_020C02BC
-.extern FUN_020C0300
-.extern FUN_020C031C
-.extern FUN_020C0340
-.extern FUN_020C0370
-.extern FUN_020C3DDC
-.extern FUN_020C3DF4
-.extern FUN_020C3E0C
-.extern FUN_020C3E40
-.extern FUN_020C3E6C
-.extern FUN_020C2CC0
-.extern FUN_020C0270
-.extern FUN_020C0BA0
-.extern FUN_020C0D20
-.extern FUN_020C187C
-.extern FUN_020C18F8
-.extern FUN_020C1D9C
-.extern FUN_020C1E38
-.extern FUN_020C3C88
-.extern FUN_020C29C0
-.extern FUN_020C2A7C
-.extern SDATi_AllocAndInitChunk
-.extern SNDi_DecibelTable
-.extern FUN_020C20C0
-.extern FUN_020C21A4
-.extern FUN_020C2334
-.extern FUN_020C2398
-.extern FUN_020C241C
-.extern FUN_020C242C
-.extern FUN_020C2B1C
-.extern FUN_020C09B0
-.extern FUN_020C0A90
-.extern FUN_020C0AF4
-.extern FUN_020C0E38
-.extern FUN_020C0E60
-.extern FUN_020C0ECC
-.extern FUN_020C10B4
-.extern FUN_020C1160
-.extern FUN_020C2208
-.extern FUN_020C3270
-.extern FUN_020C341C
-.extern FUN_020C3D9C
-.extern thunk_FUN_020c077c
+.extern NNS_G2dGetPaletteTableValue
+.extern NNSi_G2dMtxConcat32
+.extern NNSi_G2dGetOamSoftEmuAutoZOffsetStep
+.extern NNSi_G2dSetOamSoftEmuAutoZOffsetStep
+.extern NNSi_G2dResetOamSoftEmuAutoZOffset
+.extern NNSi_G2dSetOamSoftEmuAutoZOffsetFlag
+.extern NNS_G2dRndCoreDrawCellVramTransfer
+.extern NNS_G2dRndCoreDrawCell
+.extern NNS_G2dRndCoreEndRendering
+.extern NNS_G2dRndCoreBeginRendering
+.extern NNS_G2dIsRndCoreFlipV
+.extern NNS_G2dIsRndCoreFlipH
+.extern NNS_G2dSetRndCoreSurface
+.extern NNS_G2dSetRndCore3DSoftSpriteZvalue
+.extern NNS_G2dSetRndCoreCurrentMtx2D
+.extern NNS_G2dSetRndCoreCurrentMtx3D
+.extern NNS_G2dSetRndCoreOamRegisterFunc
+.extern NNS_G2dSetRndCoreImageProxy
+.extern NNS_G2dInitRndCore
+.extern NNS_G2dIsImagePaletteReadyToUse
+.extern NNS_G2dIsImageReadyToUse
+.extern NNSi_G2dGetCellTransferState
+.extern NNS_G2dDrawOneOam3DDirectWithPosFast
+.extern NNSi_G2dFontGetTextRect
+.extern NNSi_G2dFontGetTextHeight
+.extern NNSi_G2dFontGetStringWidth
+.extern NNS_G3dGeSendDL
+.extern NNS_G3dSendTexSRT_FuncArray
+.extern NNSi_G3dAnmCalcNsBca
+.extern NNSi_G3dAnmObjInitNsBca
+.extern NNSi_G3dAnmCalcNsBma
+.extern NNSi_G3dAnmObjInitNsBma
+.extern NNSi_G3dAnmCalcNsBta
+.extern NNSi_G3dAnmObjInitNsBta
+.extern NNSi_G3dAnmCalcNsBtp
+.extern NNSi_G3dAnmObjInitNsBtp
+.extern NNSi_G3dAnmCalcNsBva
+.extern NNSi_G3dAnmObjInitNsBva
+.extern NNSi_G3dGetJointScaleBasic
+.extern NNSi_G3dSendJointSRTBasic
+.extern NNSi_G3dSendTexSRTMaya
+.extern NNSi_G3dGetJointScaleMaya
+.extern NNSi_G3dSendJointSRTMaya
+.extern NNSi_G3dSendTexSRTSi3d
+.extern NNSi_G3dGetJointScaleSi3d
+.extern NNSi_G3dSendJointSRTSi3d
+.extern NNSi_G3dSendTexSRT3dsMax
+.extern NNSi_G3dSendTexSRTXsi
+.extern NNS_G3dAnmFmtNum
+.extern NNS_G3dFuncBlendVisDefault
+.extern NNS_G3dFuncBlendJntDefault
+.extern NNS_G3dFuncBlendMatDefault
+.extern NNS_G3dAnmObjInitFuncArray
+.extern NNS_G3dRS
+.extern NNS_G3dAnmObjCalcSizeRequired
+.extern NNS_G3dFuncAnmJntNsBcaDefault
+.extern NNS_G3dGetResDictIdxByName
+.extern NNS_G3dFuncAnmMatNsBmaDefault
+.extern NNS_G3dFuncAnmMatNsBtaDefault
+.extern NNSi_G3dGetTexPatAnmFV
+.extern NNSi_G3dGetTexPatAnmPlttNameByIdx
+.extern NNSi_G3dGetTexPatAnmTexNameByIdx
+.extern NNS_G3dFuncAnmMatNsBtpDefault
+.extern NNS_G3dFuncAnmVisNsBvaDefault
+.extern NNS_G3dGlbGetInvWV
+.extern NNS_G3dGlbGetWV
+.extern NNS_G3dGetCurrentMtx
+.extern NNS_G3dSendJointSRT_FuncArray
+.extern NNS_G3dGetJointScale_FuncArray
+.extern NNS_G3dGlb
+.extern NNS_G3dGlbGetViewPort
+.extern NNS_G3dGlbInit
+.extern NNSi_GfdFreeLnkVram
+.extern NNSi_GfdAllocLnkVramAligned
+.extern NNSi_GfdAddNewFreeBlock
+.extern NNSi_GfdInitLnkVramBlockPool
+.extern NNSi_GfdInitLnkVramMan
+.extern NNSi_GfdAllocLnkVram
+.extern NNS_SndFreeAlarm
+.extern NNS_SndAllocAlarm
+.extern NNS_SndUnlockCapture
+.extern NNS_SndLockCapture
+.extern NNS_SndUnlockChannel
+.extern NNS_SndLockChannel
+.extern NNSi_SndFaderIsFinished
+.extern NNSi_SndFaderUpdate
+.extern NNSi_SndFaderGet
+.extern NNSi_SndFaderSet
+.extern NNS_G3dRSOnGlb
+.extern NNSi_SndFaderInit
+.extern SingleWaveDisposeCallback
+.extern NNSi_SndInitResourceMgr
+.extern NNSi_SndPlayerMain
+.extern NNSi_SndPlayerInit
+.extern NNSi_SndCaptureEndSleep
+.extern NNSi_SndCaptureBeginSleep
+.extern NNSi_SndCaptureMain
+.extern NNSi_SndCaptureInit
+.extern NNSi_SndArcStrmMain
+.extern NNS_SndHeapClear
+.extern NNS_SndHeapDestroy
+.extern NNS_SndHeapAlloc
+.extern SNDi_DecibelTable
+.extern NNS_SndArcSetFileAddress
+.extern NNS_SndArcGetGroupInfo
+.extern NNS_SndArcGetSeqArcInfo
+.extern NNS_SndArcGetSeqInfo
+.extern NNS_SndArcGetCurrent
+.extern NNS_SndArcSetCurrent
+.extern LoadSingleWaves
+.extern NNSi_SndPlayerAllocHeap
+.extern NNSi_SndPlayerStartSeq
+.extern NNSi_SndPlayerAllocSeqPlayer
+.extern NNS_SndPlayerSetSeqArcNo
+.extern NNS_SndPlayerSetSeqNo
+.extern NNS_SndPlayerSetChannelPriority
+.extern NNS_SndPlayerCreateHeap
+.extern NNS_SndPlayerSetPlayableSeqCount
+.extern NNS_SndArcGetPlayerInfo
+.extern NNSi_SndArcLoadBank
+.extern NNSi_SndArcLoadSeq
+.extern NNSi_SndSeqArcGetSeqInfo
+.extern NNSi_SndPlayerFreeSeqPlayer
diff --git a/arm9/modules/04/asm/thumb_04.s b/arm9/modules/04/asm/thumb_04.s
index 12374ec5..db78d4fc 100644
--- a/arm9/modules/04/asm/thumb_04.s
+++ b/arm9/modules/04/asm/thumb_04.s
@@ -61,7 +61,7 @@ _021D74F2:
bic r0, r1
mov r1, #0x2b
lsl r1, r1, #0xc
- bl tempName_NNS_FndCreateExpHeapEx
+ bl NNS_FndCreateExpHeapEx
ldr r1, _021D7644 ; =UNK04_0220FBC0
ldr r3, _021D7654 ; =0x00001F08
ldr r2, [r1]
@@ -195,7 +195,7 @@ MOD04_021D7660: ; 0x021D7660
beq _021D7698
ldr r0, _021D76A4 ; =0x00001F08
ldr r0, [r1, r0]
- bl thunk_FUN_020adc8c
+ bl NNS_FndDestroyExpHeap
ldr r0, _021D76A0 ; =UNK04_0220FBC0
ldr r1, _021D76A8 ; =0x00001F54
ldr r2, [r0]
@@ -1130,7 +1130,7 @@ MOD04_021D7DA8: ; 0x021D7DA8
ldr r0, _021D7DE8 ; =0x00001F08
ldr r0, [r1, r0]
add r1, r5, #0
- bl tempName_NNS_FndAllocFromExpHeapEx
+ bl NNS_FndAllocFromExpHeapEx
add r5, r0, #0
bne _021D7DD8
mov r0, #1
@@ -1160,7 +1160,7 @@ MOD04_021D7DEC: ; 0x021D7DEC
ldr r0, _021D7E14 ; =0x00001F08
ldr r0, [r1, r0]
add r1, r5, #0
- bl FUN_020ADDF0
+ bl NNS_FndFreeToExpHeap
add r0, r4, #0
bl OS_RestoreInterrupts
_021D7E0C:
@@ -2347,12 +2347,12 @@ _021D86CE:
str r1, [r2, r0]
mov r0, #1
bl FUN_020AA770
- bl SDAT_Init
+ bl NNS_SndInit
ldr r0, _021D8718 ; =UNK04_0220FBC8
ldr r1, [r0, #4]
ldr r0, _021D8728 ; =0x00003504
add r0, r1, r0
- bl FUN_020C16FC
+ bl NNS_SndStrmInit
ldr r1, _021D8718 ; =UNK04_0220FBC8
mov r0, #0
ldr r2, [r1, #4]
@@ -2887,13 +2887,13 @@ _021D8ACA:
ldr r0, [r5, #4]
add r2, sp, #0x10
add r0, r0, r3
- bl FUN_020C169C
+ bl NNS_SndStrmAllocChannel
add r0, r5, #0
ldr r1, [r0, #4]
ldr r0, _021D8BDC ; =0x00003504
add r0, r1, r0
mov r1, #0
- bl FUN_020C13C4
+ bl NNS_SndStrmSetVolume
mov r0, #0x41
str r0, [sp]
mov r0, #2
@@ -2914,7 +2914,7 @@ _021D8ACA:
add r2, r3, r2
mov r1, #1
lsl r3, r7, #1
- bl FUN_020C14AC
+ bl NNS_SndStrmSetup
ldr r2, _021D8BCC ; =UNK04_0220FBC8
ldr r1, _021D8BE4 ; =0x000034F8
ldr r0, [r2, #4]
@@ -2975,14 +2975,14 @@ _021D8BEC: .word 0x000034FC
thumb_func_start MOD04_021D8BF0
MOD04_021D8BF0: ; 0x021D8BF0
ldr r0, _021D8BFC ; =UNK04_0220FBC8
- ldr r3, _021D8C00 ; =FUN_020C1458
+ ldr r3, _021D8C00 ; =NNS_SndStrmStart
ldr r1, [r0, #4]
ldr r0, _021D8C04 ; =0x00003504
add r0, r1, r0
bx r3
.align 2, 0
_021D8BFC: .word UNK04_0220FBC8
-_021D8C00: .word FUN_020C1458
+_021D8C00: .word NNS_SndStrmStart
_021D8C04: .word 0x00003504
thumb_func_start MOD04_021D8C08
@@ -3052,12 +3052,12 @@ MOD04_021D8C6C: ; 0x021D8C6C
ldr r1, [r0, #4]
ldr r0, _021D8CC4 ; =0x00003504
add r0, r1, r0
- bl FUN_020C1430
+ bl NNS_SndStrmStop
ldr r0, _021D8CBC ; =UNK04_0220FBC8
ldr r1, [r0, #4]
ldr r0, _021D8CC4 ; =0x00003504
add r0, r1, r0
- bl FUN_020C1674
+ bl NNS_SndStrmFreeChannel
bl VCT_Cleanup
ldr r1, _021D8CBC ; =UNK04_0220FBC8
mov r0, #0x35
diff --git a/arm9/modules/05/asm/mod05_021D74E0.s b/arm9/modules/05/asm/mod05_021D74E0.s
index e66ad6aa..ec0e0a0e 100644
--- a/arm9/modules/05/asm/mod05_021D74E0.s
+++ b/arm9/modules/05/asm/mod05_021D74E0.s
@@ -727,7 +727,7 @@ MOD05_021D7B10: ; 0x021D7B10
MOD05_021D7B38: ; 0x021D7B38
push {lr}
sub sp, #0x14
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r1, #0x7c
@@ -826,7 +826,7 @@ MOD05_021D7BE0: ; 0x021D7BE0
ldr r0, [r0]
ldr r1, [r4, #0x2c]
bl MOD05_021E805C
- ldr r5, _021D7C98 ; =UNK_021CED20
+ ldr r5, _021D7C98 ; =NNS_G3dGlb + 0x8
add r3, sp, #0x40
mov r2, #8
_021D7C0E:
@@ -859,29 +859,29 @@ _021D7C1C:
orr r2, r0
add r0, r1, r2
str r0, [sp, #0x38]
- ldr r1, _021D7C98 ; =UNK_021CED20
+ ldr r1, _021D7C98 ; =NNS_G3dGlb + 0x8
add r0, sp, #0
mov r2, #0x40
bl MIi_CpuCopyFast
- ldr r1, _021D7C9C ; =UNK_021CED98
+ ldr r1, _021D7C9C ; =NNS_G3dGlb + 0x80
mov r0, #0x50
ldr r2, [r1, #0x7c]
bic r2, r0
str r2, [r1, #0x7c]
- bl FUN_020B849C
+ bl NNS_G3dGlbFlushP
ldr r0, [r4, #0x3c]
bl MOD05_021E4BA0
bl FUN_0201F178
- ldr r1, _021D7C98 ; =UNK_021CED20
+ ldr r1, _021D7C98 ; =NNS_G3dGlb + 0x8
add r0, sp, #0x40
mov r2, #0x40
bl MIi_CpuCopyFast
- ldr r1, _021D7C9C ; =UNK_021CED98
+ ldr r1, _021D7C9C ; =NNS_G3dGlb + 0x80
mov r0, #0x50
ldr r2, [r1, #0x7c]
bic r2, r0
str r2, [r1, #0x7c]
- bl FUN_020B849C
+ bl NNS_G3dGlbFlushP
ldr r0, [r4, #4]
ldr r0, [r0, #4]
bl MOD05_021D7FD0
@@ -892,8 +892,8 @@ _021D7C1C:
add sp, #0x80
pop {r3, r4, r5, pc}
nop
-_021D7C98: .word UNK_021CED20
-_021D7C9C: .word UNK_021CED98
+_021D7C98: .word NNS_G3dGlb + 0x8
+_021D7C9C: .word NNS_G3dGlb + 0x80
_021D7CA0: .word UNK_02105BB8
thumb_func_start MOD05_021D7CA4
diff --git a/arm9/modules/05/asm/mod05_021D9A48.s b/arm9/modules/05/asm/mod05_021D9A48.s
index 2e5469f9..85ba30d1 100644
--- a/arm9/modules/05/asm/mod05_021D9A48.s
+++ b/arm9/modules/05/asm/mod05_021D9A48.s
@@ -82,7 +82,7 @@ _021D9ABE:
_021D9AD0:
add r0, r4, #0
mov r1, #0
- bl FUN_020BC4C8
+ bl NNS_G3dGetAnmByIdx
add r6, r0, #0
bne _021D9AE0
bl ErrorHandling
@@ -90,7 +90,7 @@ _021D9AE0:
ldr r0, [sp, #0x1c]
add r1, r6, #0
add r2, r7, #0
- bl FUN_020BB8D0
+ bl NNS_G3dAllocAnmObj
str r0, [r5]
cmp r5, #0
bne _021D9AF4
@@ -100,7 +100,7 @@ _021D9AF4:
ldr r3, [sp, #0x18]
add r1, r6, #0
add r2, r7, #0
- bl FUN_020B8110
+ bl NNS_G3dAnmObjInit
add r0, r4, #0
pop {r3, r4, r5, r6, r7, pc}
@@ -117,7 +117,7 @@ _021D9B0E:
mov r0, #0
pop {r3, pc}
_021D9B16:
- bl FUN_020B7E28
+ bl NNS_G3dRenderObjRemoveAnmObj
mov r0, #1
pop {r3, pc}
.balign 4, 0
@@ -571,7 +571,7 @@ _021D9E58:
add r1, r6, r1
ldr r0, [sp]
ldr r1, [r1, #0x10]
- bl FUN_020B7EFC
+ bl NNS_G3dRenderObjAddAnmObj
_021D9E6A:
add sp, #0x18
mov r0, #1
@@ -671,7 +671,7 @@ _021D9F12:
add r1, r4, r1
ldr r0, [sp, #0xc]
ldr r1, [r1, #0x10]
- bl FUN_020B7EFC
+ bl NNS_G3dRenderObjAddAnmObj
mov r0, #1
str r0, [sp]
b _021D9F32
@@ -709,7 +709,7 @@ _021D9F54:
bne _021D9F6E
ldr r1, [r5, #0x10]
add r0, r6, #0
- bl thunk_FUN_020ae84c
+ bl NNS_G3dFreeAnmObj
str r7, [r5, #0x10]
ldr r0, [r5, #0x24]
bl FreeToHeap
@@ -743,7 +743,7 @@ _021D9F90:
bne _021D9FAC
ldr r1, [r5]
add r0, r4, #0
- bl thunk_FUN_020ae84c
+ bl NNS_G3dFreeAnmObj
mov r0, #0
str r0, [r5]
ldr r0, [r5, #0x14]
@@ -1320,7 +1320,7 @@ _021DA360:
bl MOD05_021D9B04
ldr r0, [r6, #0x14]
ldr r1, [sp]
- bl FUN_020B7EFC
+ bl NNS_G3dRenderObjAddAnmObj
_021DA378:
add r0, r4, #1
lsl r0, r0, #0x18
diff --git a/arm9/modules/05/asm/mod05_021DB44C.s b/arm9/modules/05/asm/mod05_021DB44C.s
index 039db6a9..6da3dfc5 100644
--- a/arm9/modules/05/asm/mod05_021DB44C.s
+++ b/arm9/modules/05/asm/mod05_021DB44C.s
@@ -229,21 +229,21 @@ MOD05_021DB5EC: ; 0x021DB5EC
add r4, r0, #0
mov r1, #0
mov r2, #0x40
- bl FUN_020BC094
+ bl NNSi_G3dModifyMatFlag
add r0, r4, #0
mov r1, #0
mov r2, #0x80
- bl FUN_020BC094
+ bl NNSi_G3dModifyMatFlag
mov r2, #2
add r0, r4, #0
mov r1, #0
lsl r2, r2, #8
- bl FUN_020BC094
+ bl NNSi_G3dModifyMatFlag
mov r2, #1
add r0, r4, #0
mov r1, #0
lsl r2, r2, #0xa
- bl FUN_020BC094
+ bl NNSi_G3dModifyMatFlag
pop {r4, pc}
thumb_func_start MOD05_021DB61C
diff --git a/arm9/modules/05/asm/mod05_021DBABC.s b/arm9/modules/05/asm/mod05_021DBABC.s
index 0481b9eb..2c2bb7d6 100644
--- a/arm9/modules/05/asm/mod05_021DBABC.s
+++ b/arm9/modules/05/asm/mod05_021DBABC.s
@@ -51,7 +51,7 @@ _021DBAFA:
ldrsh r2, [r5, r2]
ldrsh r3, [r5, r3]
add r0, r4, #0
- bl FUN_020B8418
+ bl NNS_G3dGlbLightVector
_021DBB14:
add r1, r4, #4
mov r0, #1
@@ -60,7 +60,7 @@ _021DBB14:
beq _021DBB26
ldrh r1, [r6, #0x18]
add r0, r4, #0
- bl FUN_020B8404
+ bl NNS_G3dGlbLightColor
_021DBB26:
add r4, r4, #1
add r5, r5, #6
@@ -77,7 +77,7 @@ _021DBB26:
ldrh r0, [r0, #0x20]
ldrh r1, [r1, #0x22]
ldr r2, [r2, #0x28]
- bl FUN_020B83E0
+ bl NNS_G3dGlbMaterialColorDiffAmb
_021DBB48:
mov r0, #3
lsl r0, r0, #0xa
@@ -89,7 +89,7 @@ _021DBB48:
ldrh r0, [r0, #0x24]
ldrh r1, [r1, #0x26]
ldr r2, [r2, #0x2c]
- bl FUN_020B83BC
+ bl NNS_G3dGlbMaterialColorSpecEmi
_021DBB60:
mov r0, #1
lsl r0, r0, #0xc
@@ -109,7 +109,7 @@ _021DBB60:
ldr r0, [r0, #0x30]
ldr r2, [r2, #0x38]
ldr r3, [r3, #0x3c]
- bl FUN_020B8390
+ bl NNS_G3dGlbPolygonAttr
_021DBB88:
add sp, #0xc
pop {r4, r5, r6, r7, pc}
@@ -126,7 +126,7 @@ MOD05_021DBB8C: ; 0x021DBB8C
beq _021DBBA4
ldrh r1, [r5, #0x20]
add r0, r6, #0
- bl FUN_020BBC34
+ bl NNS_G3dMdlSetMdlDiffAll
_021DBBA4:
mov r0, #2
lsl r0, r0, #8
@@ -134,7 +134,7 @@ _021DBBA4:
beq _021DBBB4
ldrh r1, [r5, #0x22]
add r0, r6, #0
- bl FUN_020BBBF4
+ bl NNS_G3dMdlSetMdlAmbAll
_021DBBB4:
mov r0, #1
lsl r0, r0, #0xa
@@ -142,7 +142,7 @@ _021DBBB4:
beq _021DBBC4
ldrh r1, [r5, #0x24]
add r0, r6, #0
- bl FUN_020BBBB4
+ bl NNS_G3dMdlSetMdlSpecAll
_021DBBC4:
mov r0, #2
lsl r0, r0, #0xa
@@ -150,7 +150,7 @@ _021DBBC4:
beq _021DBBD4
ldrh r1, [r5, #0x26]
add r0, r6, #0
- bl FUN_020BBB74
+ bl NNS_G3dMdlSetMdlEmiAll
_021DBBD4:
mov r0, #1
lsl r0, r0, #0xc
@@ -158,7 +158,7 @@ _021DBBD4:
beq _021DBBE4
ldr r1, [r5, #0x30]
add r0, r6, #0
- bl FUN_020BBB34
+ bl NNS_G3dMdlSetMdlLightEnableFlagAll
_021DBBE4:
mov r0, #2
lsl r0, r0, #0xc
@@ -166,7 +166,7 @@ _021DBBE4:
beq _021DBBF4
ldr r1, [r5, #0x34]
add r0, r6, #0
- bl FUN_020BBAF4
+ bl NNS_G3dMdlSetMdlPolygonModeAll
_021DBBF4:
mov r0, #1
lsl r0, r0, #0xe
@@ -174,7 +174,7 @@ _021DBBF4:
beq _021DBC04
ldr r1, [r5, #0x38]
add r0, r6, #0
- bl FUN_020BBAB4
+ bl NNS_G3dMdlSetMdlCullModeAll
_021DBC04:
mov r0, #2
lsl r0, r0, #0xe
@@ -182,7 +182,7 @@ _021DBC04:
beq _021DBC14
ldr r1, [r5, #0x3c]
add r0, r6, #0
- bl FUN_020BBA74
+ bl NNS_G3dMdlSetMdlPolygonIDAll
_021DBC14:
mov r0, #1
lsl r0, r0, #0x10
@@ -190,7 +190,7 @@ _021DBC14:
beq _021DBC24
ldr r1, [r5, #0x40]
add r0, r6, #0
- bl FUN_020BBA34
+ bl NNS_G3dMdlSetMdlAlphaAll
_021DBC24:
mov r1, #2
lsl r1, r1, #0x10
@@ -201,7 +201,7 @@ _021DBC24:
lsr r1, r1, #2
add r0, r6, #0
and r1, r2
- bl FUN_020BB9F4
+ bl NNS_G3dMdlSetMdlFogEnableFlagAll
_021DBC3A:
mov r1, #1
lsl r1, r1, #0x12
@@ -212,7 +212,7 @@ _021DBC3A:
lsr r1, r1, #4
add r0, r6, #0
and r1, r2
- bl FUN_020BB9B4
+ bl NNS_G3dMdlSetMdlDepthTestCondAll
_021DBC50:
mov r1, #2
lsl r1, r1, #0x12
@@ -223,7 +223,7 @@ _021DBC50:
lsr r1, r1, #6
add r0, r6, #0
and r1, r2
- bl FUN_020BB974
+ bl NNS_G3dMdlSetMdl1DotAll
_021DBC66:
mov r1, #1
lsl r1, r1, #0x14
@@ -234,7 +234,7 @@ _021DBC66:
lsr r1, r1, #8
add r0, r6, #0
and r1, r2
- bl FUN_020BB934
+ bl NNS_G3dMdlSetMdlFarClipAll
_021DBC7C:
mov r1, #2
lsl r1, r1, #0x14
@@ -245,7 +245,7 @@ _021DBC7C:
lsr r1, r1, #0xa
add r0, r6, #0
and r1, r2
- bl FUN_020BB8F4
+ bl NNS_G3dMdlSetMdlXLDepthUpdateAll
_021DBC92:
pop {r4, r5, r6, pc}
@@ -268,7 +268,7 @@ MOD05_021DBC94: ; 0x021DBC94
ldrsh r1, [r5, r4]
ldrsh r2, [r2, r4]
ldrsh r3, [r3, r4]
- bl FUN_020B8418
+ bl NNS_G3dGlbLightVector
pop {r4, r5, r6, pc}
thumb_func_start MOD05_021DBCBC
@@ -280,7 +280,7 @@ MOD05_021DBCBC: ; 0x021DBCBC
strh r2, [r4, r3]
add r0, r1, #0
ldrh r1, [r4, r3]
- bl FUN_020B8404
+ bl NNS_G3dGlbLightColor
pop {r4, pc}
thumb_func_start MOD05_021DBCD0
diff --git a/arm9/modules/05/asm/mod05_021DBEF4.s b/arm9/modules/05/asm/mod05_021DBEF4.s
index 1d56d13e..f65de9d8 100644
--- a/arm9/modules/05/asm/mod05_021DBEF4.s
+++ b/arm9/modules/05/asm/mod05_021DBEF4.s
@@ -133,7 +133,7 @@ _021DBFA8:
str r0, [r1, r5]
add r0, r1, #0
ldr r0, [r0, r5]
- bl FUN_020BC0FC
+ bl NNS_G3dGetTex
add r1, r6, r5
str r0, [r1, #8]
add r0, r4, #0
diff --git a/arm9/modules/05/asm/mod05_021DC0B8.s b/arm9/modules/05/asm/mod05_021DC0B8.s
index 1714cbec..b637fb93 100644
--- a/arm9/modules/05/asm/mod05_021DC0B8.s
+++ b/arm9/modules/05/asm/mod05_021DC0B8.s
@@ -1220,7 +1220,7 @@ _021DC998:
str r2, [r1, r0]
ldr r1, [r4, #0xc]
add r0, r3, #4
- ldr r6, _021DCA38 ; =UNK_021CEF70
+ ldr r6, _021DCA38 ; =NNS_G3dGlb + 0x258
add r5, r1, r0
ldmia r6!, {r0, r1}
stmia r5!, {r0, r1}
@@ -1271,7 +1271,7 @@ _021DCA30:
pop {r4, r5, r6, pc}
.balign 4, 0
_021DCA34: .word 0x00000F48
-_021DCA38: .word UNK_021CEF70
+_021DCA38: .word NNS_G3dGlb + 0x258
_021DCA3C: .word 0x00000F58
_021DCA40: .word 0x0400000C
@@ -1897,7 +1897,7 @@ MOD05_021DCECC: ; 0x021DCECC
bl NARC_AllocAndReadWholeMember
add r1, sp, #0x14
str r0, [sp]
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
ldr r1, [sp, #0x14]
mov r0, #2
ldr r1, [r1, #0xc]
@@ -1934,7 +1934,7 @@ MOD05_021DCF14: ; 0x021DCF14
bl NARC_AllocAndReadWholeMember
add r1, sp, #0x14
str r0, [sp, #8]
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
ldr r3, [sp, #0x14]
mov r0, #0
str r0, [sp]
@@ -1985,7 +1985,7 @@ MOD05_021DCF68: ; 0x021DCF68
_021DCFA0:
ldr r0, [sp, #0x14]
add r1, sp, #0x18
- bl FUN_020B0180
+ bl NNS_G2dGetUnpackedScreenData
ldr r3, [sp, #0x18]
mov r0, #0
str r0, [sp]
@@ -2285,7 +2285,7 @@ MOD05_021DD180: ; 0x021DD180
ldr r0, [sp, #0xc]
lsl r1, r1, #0x12
bl FX_Div
- ldr r3, _021DD2B0 ; =UNK_021CEF70
+ ldr r3, _021DD2B0 ; =NNS_G3dGlb + 0x258
str r0, [sp, #0xc]
ldmia r3!, {r0, r1}
add r2, sp, #0x14
@@ -2391,7 +2391,7 @@ _021DD2A4:
add sp, #0x20
pop {r3, r4, r5, r6, r7, pc}
.balign 4, 0
-_021DD2B0: .word UNK_021CEF70
+_021DD2B0: .word NNS_G3dGlb + 0x258
_021DD2B4: .word 0x00000F4C
_021DD2B8: .word 0xFFFFF000
diff --git a/arm9/modules/05/asm/mod05_021E3444.s b/arm9/modules/05/asm/mod05_021E3444.s
index c8dbfb16..d8a13888 100644
--- a/arm9/modules/05/asm/mod05_021E3444.s
+++ b/arm9/modules/05/asm/mod05_021E3444.s
@@ -1652,7 +1652,7 @@ MOD05_021E40F0: ; 0x021E40F0
bl DC_FlushRange
add r0, r6, #0
mov r1, #1
- bl FUN_020B19C4
+ bl NNS_G2dGetImagePaletteLocation
add r1, r0, #0
add r0, r5, #0
add r2, r4, #0
@@ -1671,7 +1671,7 @@ MOD05_021E4118: ; 0x021E4118
bl DC_FlushRange
add r0, r6, #0
mov r1, #1
- bl FUN_020B1A14
+ bl NNS_G2dGetImageLocation
add r1, r0, #0
add r0, r5, #0
add r2, r4, #0
diff --git a/arm9/modules/05/asm/mod05_021E4AE4.s b/arm9/modules/05/asm/mod05_021E4AE4.s
index b05969ea..635d46f6 100644
--- a/arm9/modules/05/asm/mod05_021E4AE4.s
+++ b/arm9/modules/05/asm/mod05_021E4AE4.s
@@ -573,7 +573,7 @@ _021E4EC0:
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
@@ -969,7 +969,7 @@ MOD05_021E5198: ; 0x021E5198
ldr r0, [r4]
add r6, r1, #0
add r5, r2, #0
- bl FUN_020BC0FC
+ bl NNS_G3dGetTex
cmp r0, #0
beq _021E51C8
bl FUN_0201B254
@@ -979,13 +979,13 @@ MOD05_021E5198: ; 0x021E5198
ldr r1, [r0, #8]
bl DC_FlushRange
ldr r0, [r4]
- bl FUN_020BB59C
+ bl NNS_G3dResDefaultSetup
cmp r0, #0
bne _021E51C8
bl ErrorHandling
_021E51C8:
ldr r0, [r4]
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
ldrh r1, [r0, #0xe]
add r1, r0, r1
ldr r1, [r1, #0xc]
@@ -997,7 +997,7 @@ _021E51C8:
_021E51E0:
ldr r1, [r5]
add r0, r6, #0
- bl FUN_020B80B4
+ bl NNS_G3dRenderObjInit
pop {r4, r5, r6, pc}
.balign 4, 0
@@ -1038,7 +1038,7 @@ MOD05_021E5224: ; 0x021E5224
add r2, r3, #0
bl MOD05_021E4C6C
str r0, [r4]
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
str r0, [r4, #4]
ldrh r1, [r0, #0xe]
add r1, r0, r1
@@ -1046,7 +1046,7 @@ MOD05_021E5224: ; 0x021E5224
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 _021E525A
@@ -1071,17 +1071,17 @@ MOD05_021E5260: ; 0x021E5260
bl MOD05_021E4C6C
str r0, [r5]
mov r1, #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}
.balign 4, 0
diff --git a/arm9/modules/05/asm/mod05_021E55BC.s b/arm9/modules/05/asm/mod05_021E55BC.s
index 43186ebe..9c384261 100644
--- a/arm9/modules/05/asm/mod05_021E55BC.s
+++ b/arm9/modules/05/asm/mod05_021E55BC.s
@@ -207,7 +207,7 @@ _021E5716:
lsl r0, r0, #0xc
sub r0, r1, r0
str r0, [sp, #0x5c]
- bl FUN_020B8344
+ bl NNS_G3dGlbGetInvV
mov r2, #0
add r5, r0, #0
add r0, sp, #0x24
diff --git a/arm9/modules/05/asm/mod05_021E577C.s b/arm9/modules/05/asm/mod05_021E577C.s
index bf86c095..6ae8f9ed 100644
--- a/arm9/modules/05/asm/mod05_021E577C.s
+++ b/arm9/modules/05/asm/mod05_021E577C.s
@@ -186,7 +186,7 @@ _021E58B2:
lsl r0, r0, #0xc
sub r0, r1, r0
str r0, [sp, #0x5c]
- bl FUN_020B8344
+ bl NNS_G3dGlbGetInvV
mov r2, #0
add r5, r0, #0
add r0, sp, #0x24
diff --git a/arm9/modules/05/asm/mod05_021E5918.s b/arm9/modules/05/asm/mod05_021E5918.s
index 0322f00e..8459b021 100644
--- a/arm9/modules/05/asm/mod05_021E5918.s
+++ b/arm9/modules/05/asm/mod05_021E5918.s
@@ -188,7 +188,7 @@ _021E5A4E:
lsl r0, r0, #0xc
sub r0, r1, r0
str r0, [sp, #0x5c]
- bl FUN_020B8344
+ bl NNS_G3dGlbGetInvV
mov r2, #0
add r5, r0, #0
add r0, sp, #0x24
diff --git a/arm9/modules/05/asm/mod05_021E5AB4.s b/arm9/modules/05/asm/mod05_021E5AB4.s
index ff3779f5..3b0d6a5f 100644
--- a/arm9/modules/05/asm/mod05_021E5AB4.s
+++ b/arm9/modules/05/asm/mod05_021E5AB4.s
@@ -131,13 +131,13 @@ MOD05_021E5B80: ; 0x021E5B80
add r0, r4, #4
ldr r1, [r2, #0x18]
ldr r2, [r2, #0xc]
- bl FUN_020BB8D0
+ bl NNS_G3dAllocAnmObj
str r0, [r4]
ldr r3, [r5, #8]
ldr r1, [r3, #0x18]
ldr r2, [r3, #0xc]
ldr r3, [r3, #0x10]
- bl FUN_020B8110
+ bl NNS_G3dAnmObjInit
ldr r1, [r5, #8]
add r0, r4, #0
add r0, #0x18
@@ -146,7 +146,7 @@ MOD05_021E5B80: ; 0x021E5B80
add r0, r4, #0
ldr r1, [r4]
add r0, #0x18
- bl FUN_020B7EFC
+ bl NNS_G3dRenderObjAddAnmObj
add r0, r6, #0
add r1, sp, #0
bl FUN_0206477C
@@ -166,7 +166,7 @@ MOD05_021E5BF8: ; 0x021E5BF8
ldr r4, [r1]
ldr r1, [r4]
add r0, r4, #4
- bl thunk_FUN_020ae84c
+ bl NNS_G3dFreeAnmObj
add r0, r4, #0
bl MOD05_021E4C00
pop {r4, pc}
@@ -209,7 +209,7 @@ _021E5C40:
bne _021E5C40
ldr r0, [r5]
str r0, [r3]
- bl FUN_020B8344
+ bl NNS_G3dGlbGetInvV
mov r2, #0
add r5, r0, #0
add r0, sp, #0x24
diff --git a/arm9/modules/05/asm/mod05_021E5C8C.s b/arm9/modules/05/asm/mod05_021E5C8C.s
index ab321b6f..dc59dcec 100644
--- a/arm9/modules/05/asm/mod05_021E5C8C.s
+++ b/arm9/modules/05/asm/mod05_021E5C8C.s
@@ -129,13 +129,13 @@ MOD05_021E5D50: ; 0x021E5D50
add r0, r4, #4
ldr r1, [r2, #0x1c]
ldr r2, [r2, #0x10]
- bl FUN_020BB8D0
+ bl NNS_G3dAllocAnmObj
str r0, [r4]
ldr r3, [r5, #8]
ldr r1, [r3, #0x1c]
ldr r2, [r3, #0x10]
ldr r3, [r3, #0x14]
- bl FUN_020B8110
+ bl NNS_G3dAnmObjInit
ldr r1, [r5, #8]
add r0, r4, #0
add r0, #0x18
@@ -144,7 +144,7 @@ MOD05_021E5D50: ; 0x021E5D50
add r0, r4, #0
ldr r1, [r4]
add r0, #0x18
- bl FUN_020B7EFC
+ bl NNS_G3dRenderObjAddAnmObj
add r0, r6, #0
add r1, sp, #0
bl FUN_0206477C
@@ -164,7 +164,7 @@ MOD05_021E5DC8: ; 0x021E5DC8
ldr r4, [r1]
ldr r1, [r4]
add r0, r4, #4
- bl thunk_FUN_020ae84c
+ bl NNS_G3dFreeAnmObj
add r0, r4, #0
bl MOD05_021E4C00
pop {r4, pc}
diff --git a/arm9/modules/05/asm/mod05_021E5E10.s b/arm9/modules/05/asm/mod05_021E5E10.s
index e2e6814e..f5f3ef70 100644
--- a/arm9/modules/05/asm/mod05_021E5E10.s
+++ b/arm9/modules/05/asm/mod05_021E5E10.s
@@ -165,13 +165,13 @@ MOD05_021E5F18: ; 0x021E5F18
add r0, r4, #4
ldr r1, [r2, #0x18]
ldr r2, [r2, #0xc]
- bl FUN_020BB8D0
+ bl NNS_G3dAllocAnmObj
str r0, [r4]
ldr r3, [r5, #8]
ldr r1, [r3, #0x18]
ldr r2, [r3, #0xc]
ldr r3, [r3, #0x10]
- bl FUN_020B8110
+ bl NNS_G3dAnmObjInit
ldr r1, [r5, #8]
add r0, r4, #0
add r0, #0x18
@@ -180,7 +180,7 @@ MOD05_021E5F18: ; 0x021E5F18
add r0, r4, #0
ldr r1, [r4]
add r0, #0x18
- bl FUN_020B7EFC
+ bl NNS_G3dRenderObjAddAnmObj
add r0, r6, #0
add r1, sp, #0
bl FUN_0206477C
@@ -200,7 +200,7 @@ MOD05_021E5F90: ; 0x021E5F90
ldr r4, [r1]
ldr r1, [r4]
add r0, r4, #4
- bl thunk_FUN_020ae84c
+ bl NNS_G3dFreeAnmObj
add r0, r4, #0
bl MOD05_021E4C00
pop {r4, pc}
diff --git a/arm9/modules/05/asm/mod05_021E7C00.s b/arm9/modules/05/asm/mod05_021E7C00.s
index 2e968e4f..686fe698 100644
--- a/arm9/modules/05/asm/mod05_021E7C00.s
+++ b/arm9/modules/05/asm/mod05_021E7C00.s
@@ -448,14 +448,14 @@ MOD05_021E7F10: ; 0x021E7F10
add r4, r3, #0
bl MOD05_021F4BD0
ldr r0, [r0]
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
ldrh r1, [r0, #0xe]
add r1, r0, r1
ldr r1, [r1, #0xc]
add r1, r0, r1
add r0, r5, #0
str r1, [r4]
- bl FUN_020B80B4
+ bl NNS_G3dRenderObjInit
pop {r3, r4, r5, pc}
.balign 4, 0
@@ -466,18 +466,18 @@ MOD05_021E7F34: ; 0x021E7F34
add r0, r1, #0
add r4, r2, #0
add r5, r3, #0
- bl FUN_020B8474
- ldr r1, _021E7FB4 ; =UNK_021CEDD4
+ bl NNS_G3dGlbSetBaseTrans
+ ldr r1, _021E7FB4 ; =NNS_G3dGlb + 0xBC
add r0, r4, #0
bl MI_Copy36B
- ldr r1, _021E7FB8 ; =UNK_021CED98
+ ldr r1, _021E7FB8 ; =NNS_G3dGlb + 0x80
mov r0, #0xa4
ldr r2, [r1, #0x7c]
bic r2, r0
add r0, r5, #0
str r2, [r1, #0x7c]
- bl FUN_020B844C
- bl FUN_020B849C
+ bl NNS_G3dGlbSetBaseScale
+ bl NNS_G3dGlbFlushP
add r2, sp, #0
ldr r0, [sp, #0x1c]
ldr r1, [sp, #0x18]
@@ -511,7 +511,7 @@ _021E7F98:
ldrh r2, [r2, #2]
add r0, r7, #0
add r1, r5, #0
- bl FUN_020BAFB8
+ bl NNS_G3dDraw1Mat1Shp
add r0, r4, #1
lsl r0, r0, #0x18
lsr r4, r0, #0x18
@@ -522,8 +522,8 @@ _021E7F98:
_021E7FB0:
pop {r3, r4, r5, r6, r7, pc}
nop
-_021E7FB4: .word UNK_021CEDD4
-_021E7FB8: .word UNK_021CED98
+_021E7FB4: .word NNS_G3dGlb + 0xBC
+_021E7FB8: .word NNS_G3dGlb + 0x80
thumb_func_start MOD05_021E7FBC
MOD05_021E7FBC: ; 0x021E7FBC
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index fd20ac80..ebf46a48 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -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
@@ -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
@@ -14531,7 +14531,7 @@ _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
@@ -14547,7 +14547,7 @@ _021EF9CA:
_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]
@@ -14621,14 +14621,14 @@ MOD05_021EFA40: ; 0x021EFA40
bl ErrorHandling
_021EFA6A:
ldr r0, [r4]
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
ldrb r0, [r0, #9]
cmp r0, #1
beq _021EFA7A
bl ErrorHandling
_021EFA7A:
ldr r0, [r4]
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
ldrh r1, [r0, #0xe]
add r1, r0, r1
ldr r1, [r1, #0xc]
@@ -14638,7 +14638,7 @@ _021EFA7A:
_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
@@ -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
@@ -22303,7 +22303,7 @@ _021F3596:
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
@@ -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
@@ -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]
@@ -25137,7 +25137,7 @@ _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
@@ -26120,7 +26120,7 @@ MOD05_021F5268: ; 0x021F5268
add r2, r5, #0
bl UncompressFromNarc
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
@@ -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
@@ -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
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 62cd7742..9679d0e0 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -2393,7 +2393,7 @@ MOD06_0223A828: ; 0x0223A828
str r1, [r0]
mov r0, #0x11
add r2, r1, #0
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
add r4, #0x40
add r0, r4, #0
bl MOD06_0223A400
@@ -2401,7 +2401,7 @@ MOD06_0223A828: ; 0x0223A828
mov r0, #0x12
add r1, sp, #0
str r2, [sp]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
_0223A860:
add sp, #4
pop {r3, r4, pc}
@@ -23537,11 +23537,11 @@ MOD06_02244F84: ; 0x02244F84
add r7, r0, #0
add r0, r5, #0
mov r1, #1
- bl FUN_020B1A14
+ bl NNS_G2dGetImageLocation
str r0, [sp]
add r0, r7, #0
mov r1, #1
- bl FUN_020B19C4
+ bl NNS_G2dGetImagePaletteLocation
mov r1, #0x32
add r5, r0, #0
add r0, r4, #0
@@ -24040,7 +24040,7 @@ _02245392:
ldr r1, [r5, #0x2c]
bl MOD05_021F4BD0
ldr r0, [r0]
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
ldrh r1, [r0, #0xe]
add r1, r0, r1
ldr r1, [r1, #0xc]
@@ -28490,7 +28490,7 @@ MOD06_02247544: ; 0x02247544
bl NARC_AllocAndReadWholeMember
add r1, r5, #0
add r4, r0, #0
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
ldr r1, [r5]
mov r0, #3
ldr r1, [r1, #0xc]
@@ -28513,7 +28513,7 @@ MOD06_0224756C: ; 0x0224756C
bl NARC_AllocAndReadWholeMember
add r1, r4, #0
add r6, r0, #0
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
ldr r3, [r4]
mov r0, #0
str r0, [sp]
@@ -28551,7 +28551,7 @@ MOD06_022475A4: ; 0x022475A4
bl NARC_AllocAndReadWholeMember
add r1, r4, #0
add r6, r0, #0
- bl FUN_020B0180
+ bl NNS_G2dGetUnpackedScreenData
ldr r3, [r4]
add r0, r5, #0
add r2, r3, #0
@@ -28870,7 +28870,7 @@ MOD06_02247808: ; 0x02247808
bl FUN_020094F0
bl FUN_02009C5C
mov r1, #1
- bl FUN_020B1A14
+ bl NNS_G2dGetImageLocation
mov r1, #0x32
add r5, r0, #0
add r0, r4, #0
@@ -28923,7 +28923,7 @@ MOD06_02247860: ; 0x02247860
add r1, r6, #0
bl FUN_02009E54
mov r1, #1
- bl FUN_020B19C4
+ bl NNS_G2dGetImagePaletteLocation
add r5, r0, #0
add r0, r4, #0
mov r1, #0x20
@@ -32641,12 +32641,12 @@ MOD06_022494E4: ; 0x022494E4
ldr r0, [r5, r0]
mov r1, #1
lsl r2, r2, #0x10
- bl FUN_020BC02C
+ bl NNSi_G3dModifyPolygonAttrMask
mov r0, #0x49
lsl r0, r0, #2
ldr r0, [r5, r0]
add r1, r4, #0
- bl FUN_020BBA34
+ bl NNS_G3dMdlSetMdlAlphaAll
pop {r3, r4, r5, pc}
thumb_func_start MOD06_02249508
@@ -34087,10 +34087,10 @@ _0224A000:
ldr r0, [r4, #0x18]
mov r1, #1
lsl r2, r2, #0x10
- bl FUN_020BC02C
+ bl NNSi_G3dModifyPolygonAttrMask
ldr r0, [r4, #0x18]
ldr r1, [r4, #0xc]
- bl FUN_020BBA34
+ bl NNS_G3dMdlSetMdlAlphaAll
ldr r0, [r4, #0x14]
add r1, sp, #0x30
add r2, sp, #0
@@ -35048,13 +35048,13 @@ MOD06_0224A710: ; 0x0224A710
add r0, r4, #4
ldr r1, [r2, #0x18]
ldr r2, [r2, #0xc]
- bl FUN_020BB8D0
+ bl NNS_G3dAllocAnmObj
str r0, [r4]
ldr r3, [r5, #0x14]
ldr r1, [r3, #0x18]
ldr r2, [r3, #0xc]
ldr r3, [r3, #0x10]
- bl FUN_020B8110
+ bl NNS_G3dAnmObjInit
ldr r1, [r5, #0x14]
add r0, r4, #0
add r0, #0x18
@@ -35063,7 +35063,7 @@ MOD06_0224A710: ; 0x0224A710
add r0, r4, #0
ldr r1, [r4]
add r0, #0x18
- bl FUN_020B7EFC
+ bl NNS_G3dRenderObjAddAnmObj
ldr r0, [r5, #0x18]
bl FUN_02058448
str r0, [r5, #4]
@@ -35108,7 +35108,7 @@ MOD06_0224A7C8: ; 0x0224A7C8
ldr r4, [r1, #0x1c]
ldr r1, [r4]
add r0, r4, #4
- bl thunk_FUN_020ae84c
+ bl NNS_G3dFreeAnmObj
add r0, r4, #0
bl MOD05_021E4C00
pop {r4, pc}
@@ -36429,13 +36429,13 @@ MOD06_0224B188: ; 0x0224B188
add r0, r4, #4
ldr r1, [r2, #0x18]
ldr r2, [r2, #0xc]
- bl FUN_020BB8D0
+ bl NNS_G3dAllocAnmObj
str r0, [r4]
ldr r3, [r5, #8]
ldr r1, [r3, #0x18]
ldr r2, [r3, #0xc]
ldr r3, [r3, #0x10]
- bl FUN_020B8110
+ bl NNS_G3dAnmObjInit
ldr r1, [r5, #8]
add r0, r4, #0
add r0, #0x18
@@ -36444,7 +36444,7 @@ MOD06_0224B188: ; 0x0224B188
add r0, r4, #0
ldr r1, [r4]
add r0, #0x18
- bl FUN_020B7EFC
+ bl NNS_G3dRenderObjAddAnmObj
add r0, r6, #0
add r1, sp, #0
bl FUN_0206477C
@@ -36464,7 +36464,7 @@ MOD06_0224B200: ; 0x0224B200
ldr r4, [r1]
ldr r1, [r4]
add r0, r4, #4
- bl thunk_FUN_020ae84c
+ bl NNS_G3dFreeAnmObj
add r0, r4, #0
bl MOD05_021E4C00
pop {r4, pc}
@@ -36635,13 +36635,13 @@ MOD06_0224B324: ; 0x0224B324
add r0, r4, #4
ldr r1, [r2, #0x18]
ldr r2, [r2, #0xc]
- bl FUN_020BB8D0
+ bl NNS_G3dAllocAnmObj
str r0, [r4]
ldr r3, [r5, #8]
ldr r1, [r3, #0x18]
ldr r2, [r3, #0xc]
ldr r3, [r3, #0x10]
- bl FUN_020B8110
+ bl NNS_G3dAnmObjInit
ldr r1, [r5, #8]
add r0, r4, #0
add r0, #0x18
@@ -36650,7 +36650,7 @@ MOD06_0224B324: ; 0x0224B324
add r0, r4, #0
ldr r1, [r4]
add r0, #0x18
- bl FUN_020B7EFC
+ bl NNS_G3dRenderObjAddAnmObj
add r0, r6, #0
add r1, sp, #0
bl FUN_0206477C
@@ -36670,7 +36670,7 @@ MOD06_0224B39C: ; 0x0224B39C
ldr r4, [r1]
ldr r1, [r4]
add r0, r4, #4
- bl thunk_FUN_020ae84c
+ bl NNS_G3dFreeAnmObj
add r0, r4, #0
bl MOD05_021E4C00
pop {r4, pc}
@@ -38617,14 +38617,14 @@ _0224C328:
bl MOD05_021F4BD0
str r0, [sp, #0x18]
ldr r0, [r6]
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
ldrh r1, [r0, #0xe]
add r1, r0, r1
ldr r1, [r1, #0xc]
add r7, r0, r1
ldr r0, [sp, #0x18]
ldr r0, [r0]
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
ldrh r1, [r0, #0xe]
add r1, r0, r1
ldr r1, [r1, #0xc]
@@ -38901,7 +38901,7 @@ _0224C590:
ldr r1, [r5, #0x2c]
bl MOD05_021F4BD0
ldr r0, [r0]
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
ldrh r1, [r0, #0xe]
add r2, sp, #0x18
mov r3, #0
@@ -43012,7 +43012,7 @@ _0224E604:
ldr r1, [r6, #0x2c]
bl MOD05_021F4BD0
ldr r0, [r0]
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
ldrh r1, [r0, #0xe]
add r1, r0, r1
ldr r1, [r1, #0xc]
diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s
index 1110fa5c..e810c620 100644
--- a/arm9/modules/07/asm/module_07.s
+++ b/arm9/modules/07/asm/module_07.s
@@ -3155,7 +3155,7 @@ _0221380C: .word 0x00000B58
thumb_func_start MOD07_02213810
MOD07_02213810: ; 0x02213810
push {r4, lr}
- ldr r3, _02213830 ; =UNK_021064B8
+ ldr r3, _02213830 ; =NNS_GfdDefaultFuncAllocTexVram
mov r2, #0
ldr r3, [r3]
blx r3
@@ -3169,12 +3169,12 @@ _02213828:
lsr r0, r0, #0xd
pop {r4, pc}
nop
-_02213830: .word UNK_021064B8
+_02213830: .word NNS_GfdDefaultFuncAllocTexVram
thumb_func_start MOD07_02213834
MOD07_02213834: ; 0x02213834
push {r4, lr}
- ldr r3, _02213854 ; =UNK_021064C0
+ ldr r3, _02213854 ; =NNS_GfdDefaultFuncAllocPlttVram
mov r2, #1
ldr r3, [r3]
blx r3
@@ -3188,7 +3188,7 @@ _0221384C:
lsr r0, r0, #0xd
pop {r4, pc}
nop
-_02213854: .word UNK_021064C0
+_02213854: .word NNS_GfdDefaultFuncAllocPlttVram
thumb_func_start MOD07_02213858
MOD07_02213858: ; 0x02213858
@@ -3319,7 +3319,7 @@ MOD07_02213924: ; 0x02213924
bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0x10
add r4, r0, #0
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
ldr r2, [sp, #0x10]
mov r0, #3
ldr r1, [r2, #0xc]
diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s
index 8004f1a4..0ff32867 100644
--- a/arm9/modules/08/asm/module_08.s
+++ b/arm9/modules/08/asm/module_08.s
@@ -8063,7 +8063,7 @@ MOD08_02215A44: ; 0x02215A44
cmp r0, #0
ble _02215A62
bl FUN_020222AC
- bl FUN_020B02C8
+ bl NNS_G2dSetupSoftwareSpriteCamera
_02215A62:
bl FUN_02013388
_02215A66:
@@ -8072,7 +8072,7 @@ _02215A66:
thumb_func_start MOD08_02215A68
MOD08_02215A68: ; 0x02215A68
push {r4, lr}
- ldr r3, _02215A80 ; =UNK_021064B8
+ ldr r3, _02215A80 ; =NNS_GfdDefaultFuncAllocTexVram
mov r2, #0
ldr r3, [r3]
blx r3
@@ -8082,12 +8082,12 @@ MOD08_02215A68: ; 0x02215A68
lsr r0, r0, #0xd
pop {r4, pc}
nop
-_02215A80: .word UNK_021064B8
+_02215A80: .word NNS_GfdDefaultFuncAllocTexVram
thumb_func_start MOD08_02215A84
MOD08_02215A84: ; 0x02215A84
push {r4, lr}
- ldr r3, _02215A9C ; =UNK_021064C0
+ ldr r3, _02215A9C ; =NNS_GfdDefaultFuncAllocPlttVram
mov r2, #0
ldr r3, [r3]
blx r3
@@ -8097,7 +8097,7 @@ MOD08_02215A84: ; 0x02215A84
lsr r0, r0, #0xd
pop {r4, pc}
nop
-_02215A9C: .word UNK_021064C0
+_02215A9C: .word NNS_GfdDefaultFuncAllocPlttVram
thumb_func_start MOD08_02215AA0
MOD08_02215AA0: ; 0x02215AA0
diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s
index 63e3d1e0..a3085247 100644
--- a/arm9/modules/09/asm/module_09.s
+++ b/arm9/modules/09/asm/module_09.s
@@ -2185,7 +2185,7 @@ MOD09_02212F8C: ; 0x02212F8C
bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0x10
add r4, r0, #0
- bl FUN_020B0180
+ bl NNS_G2dGetUnpackedScreenData
ldr r1, [sp, #0x10]
add r0, r5, #0
add r1, #0xc
@@ -2199,7 +2199,7 @@ MOD09_02212F8C: ; 0x02212F8C
bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0x10
add r4, r0, #0
- bl FUN_020B0180
+ bl NNS_G2dGetUnpackedScreenData
ldr r1, [sp, #0x10]
add r0, r5, #0
add r1, #0xc
@@ -3409,7 +3409,7 @@ _02213976:
bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0xc
add r7, r0, #0
- bl FUN_020B0180
+ bl NNS_G2dGetUnpackedScreenData
mov r0, #0
str r0, [sp]
mov r0, #0x20
@@ -14010,7 +14010,7 @@ MOD09_022191C0: ; 0x022191C0
bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0x10
add r4, r0, #0
- bl FUN_020B0180
+ bl NNS_G2dGetUnpackedScreenData
ldr r1, [sp, #0x10]
add r0, r5, #0
add r1, #0xc
diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s
index 1bc8e471..42f3f754 100644
--- a/arm9/modules/11/asm/module_11_thumb1.s
+++ b/arm9/modules/11/asm/module_11_thumb1.s
@@ -3061,14 +3061,14 @@ _0222EFD8: .word FUN_020223BC
thumb_func_start MOD11_0222EFDC
MOD11_0222EFDC: ; 0x0222EFDC
push {r3, r4, r5, lr}
- ldr r3, _0222F014 ; =UNK_021064B8
+ ldr r3, _0222F014 ; =NNS_GfdDefaultFuncAllocTexVram
mov r0, #2
mov r1, #0
ldr r3, [r3]
lsl r0, r0, #0xe
add r2, r1, #0
blx r3
- ldr r3, _0222F018 ; =UNK_021064C0
+ ldr r3, _0222F018 ; =NNS_GfdDefaultFuncAllocPlttVram
mov r1, #0
add r4, r0, #0
ldr r3, [r3]
@@ -3087,8 +3087,8 @@ _0222F00C:
bl FUN_02012CC8
pop {r3, r4, r5, pc}
nop
-_0222F014: .word UNK_021064B8
-_0222F018: .word UNK_021064C0
+_0222F014: .word NNS_GfdDefaultFuncAllocTexVram
+_0222F018: .word NNS_GfdDefaultFuncAllocPlttVram
thumb_func_start MOD11_0222F01C
MOD11_0222F01C: ; 0x0222F01C
diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s
index 01de211a..7d0a23a3 100644
--- a/arm9/modules/12/asm/module_12.s
+++ b/arm9/modules/12/asm/module_12.s
@@ -744,14 +744,14 @@ MOD12_0222DC80: ; 0x0222DC80
thumb_func_start MOD12_0222DCAC
MOD12_0222DCAC: ; 0x0222DCAC
push {r3, r4, r5, lr}
- ldr r3, _0222DCE4 ; =UNK_021064B8
+ ldr r3, _0222DCE4 ; =NNS_GfdDefaultFuncAllocTexVram
mov r0, #2
mov r1, #0
ldr r3, [r3]
lsl r0, r0, #0xe
add r2, r1, #0
blx r3
- ldr r3, _0222DCE8 ; =UNK_021064C0
+ ldr r3, _0222DCE8 ; =NNS_GfdDefaultFuncAllocPlttVram
mov r1, #0
add r4, r0, #0
ldr r3, [r3]
@@ -770,8 +770,8 @@ _0222DCDC:
bl FUN_02012CC8
pop {r3, r4, r5, pc}
nop
-_0222DCE4: .word UNK_021064B8
-_0222DCE8: .word UNK_021064C0
+_0222DCE4: .word NNS_GfdDefaultFuncAllocTexVram
+_0222DCE8: .word NNS_GfdDefaultFuncAllocPlttVram
thumb_func_start MOD12_0222DCEC
MOD12_0222DCEC: ; 0x0222DCEC
@@ -3999,14 +3999,14 @@ MOD12_0222F6B4: ; 0x0222F6B4
thumb_func_start MOD12_0222F6E0
MOD12_0222F6E0: ; 0x0222F6E0
push {r3, r4, r5, lr}
- ldr r3, _0222F718 ; =UNK_021064B8
+ ldr r3, _0222F718 ; =NNS_GfdDefaultFuncAllocTexVram
mov r0, #2
mov r1, #0
ldr r3, [r3]
lsl r0, r0, #0xe
add r2, r1, #0
blx r3
- ldr r3, _0222F71C ; =UNK_021064C0
+ ldr r3, _0222F71C ; =NNS_GfdDefaultFuncAllocPlttVram
mov r1, #0
add r4, r0, #0
ldr r3, [r3]
@@ -4025,8 +4025,8 @@ _0222F710:
bl FUN_02012CC8
pop {r3, r4, r5, pc}
nop
-_0222F718: .word UNK_021064B8
-_0222F71C: .word UNK_021064C0
+_0222F718: .word NNS_GfdDefaultFuncAllocTexVram
+_0222F71C: .word NNS_GfdDefaultFuncAllocPlttVram
thumb_func_start MOD12_0222F720
MOD12_0222F720: ; 0x0222F720
@@ -6350,7 +6350,7 @@ MOD12_02230A40: ; 0x02230A40
thumb_func_start MOD12_02230A60
MOD12_02230A60: ; 0x02230A60
push {r4, lr}
- ldr r3, _02230A78 ; =UNK_021064B8
+ ldr r3, _02230A78 ; =NNS_GfdDefaultFuncAllocTexVram
mov r2, #0
ldr r3, [r3]
blx r3
@@ -6360,12 +6360,12 @@ MOD12_02230A60: ; 0x02230A60
lsr r0, r0, #0xd
pop {r4, pc}
nop
-_02230A78: .word UNK_021064B8
+_02230A78: .word NNS_GfdDefaultFuncAllocTexVram
thumb_func_start MOD12_02230A7C
MOD12_02230A7C: ; 0x02230A7C
push {r4, lr}
- ldr r3, _02230A94 ; =UNK_021064C0
+ ldr r3, _02230A94 ; =NNS_GfdDefaultFuncAllocPlttVram
mov r2, #0
ldr r3, [r3]
blx r3
@@ -6375,7 +6375,7 @@ MOD12_02230A7C: ; 0x02230A7C
lsr r0, r0, #0xd
pop {r4, pc}
nop
-_02230A94: .word UNK_021064C0
+_02230A94: .word NNS_GfdDefaultFuncAllocPlttVram
thumb_func_start MOD12_02230A98
MOD12_02230A98: ; 0x02230A98
@@ -42062,14 +42062,14 @@ _02241B08: .word 0x00000133
thumb_func_start MOD12_02241B0C
MOD12_02241B0C: ; 0x02241B0C
push {r3, r4, r5, lr}
- ldr r3, _02241B44 ; =UNK_021064B8
+ ldr r3, _02241B44 ; =NNS_GfdDefaultFuncAllocTexVram
mov r0, #2
mov r1, #0
ldr r3, [r3]
lsl r0, r0, #0xe
add r2, r1, #0
blx r3
- ldr r3, _02241B48 ; =UNK_021064C0
+ ldr r3, _02241B48 ; =NNS_GfdDefaultFuncAllocPlttVram
mov r1, #0
add r4, r0, #0
ldr r3, [r3]
@@ -42088,8 +42088,8 @@ _02241B3C:
bl FUN_02012CC8
pop {r3, r4, r5, pc}
nop
-_02241B44: .word UNK_021064B8
-_02241B48: .word UNK_021064C0
+_02241B44: .word NNS_GfdDefaultFuncAllocTexVram
+_02241B48: .word NNS_GfdDefaultFuncAllocPlttVram
thumb_func_start MOD12_02241B4C
MOD12_02241B4C: ; 0x02241B4C
diff --git a/arm9/modules/13/asm/module_13_arm2.s b/arm9/modules/13/asm/module_13_arm2.s
index 0e89d90f..5aee0b46 100644
--- a/arm9/modules/13/asm/module_13_arm2.s
+++ b/arm9/modules/13/asm/module_13_arm2.s
@@ -25937,27 +25937,27 @@ _022341D8: .word 0x0000A001
arm_func_start MOD13_022341DC
MOD13_022341DC: ; 0x022341DC
- ldr ip, _022341E4 ; =FUN_020C01A0
+ ldr ip, _022341E4 ; =NNS_SndMain
bx ip
.align 2, 0
-_022341E4: .word FUN_020C01A0
+_022341E4: .word NNS_SndMain
arm_func_start MOD13_022341E8
MOD13_022341E8: ; 0x022341E8
ldr r0, _02234200 ; =0x02243154
- ldr ip, _02234204 ; =FUN_020C10A4
+ ldr ip, _02234204 ; =NNS_SndPlayerStopSeq
ldr r0, [r0]
mov r1, #0
add r0, r0, #0x90
bx ip
.align 2, 0
_02234200: .word MOD13_02243154
-_02234204: .word FUN_020C10A4
+_02234204: .word NNS_SndPlayerStopSeq
arm_func_start MOD13_02234208
MOD13_02234208: ; 0x02234208
ldr r2, _02234224 ; =0x02243154
- ldr ip, _02234228 ; =FUN_020C0EA4
+ ldr ip, _02234228 ; =NNS_SndPlayerSetTrackPitch
ldr r3, [r2]
mov r2, r1
mov r1, r0
@@ -25965,32 +25965,32 @@ MOD13_02234208: ; 0x02234208
bx ip
.align 2, 0
_02234224: .word MOD13_02243154
-_02234228: .word FUN_020C0EA4
+_02234228: .word NNS_SndPlayerSetTrackPitch
arm_func_start MOD13_0223422C
MOD13_0223422C: ; 0x0223422C
ldr r2, _02234244 ; =0x02243154
mov r1, r0
ldr r0, [r2]
- ldr ip, _02234248 ; =FUN_020C0F40
+ ldr ip, _02234248 ; =NNS_SndPlayerSetVolume
add r0, r0, #0x90
bx ip
.align 2, 0
_02234244: .word MOD13_02243154
-_02234248: .word FUN_020C0F40
+_02234248: .word NNS_SndPlayerSetVolume
arm_func_start MOD13_0223424C
MOD13_0223424C: ; 0x0223424C
ldr r1, _02234268 ; =0x02243154
mov r2, r0
ldr r0, [r1]
- ldr ip, _0223426C ; =FUN_020C3888
+ ldr ip, _0223426C ; =NNS_SndArcPlayerStartSeqArc
mov r1, #0
add r0, r0, #0x90
bx ip
.align 2, 0
_02234268: .word MOD13_02243154
-_0223426C: .word FUN_020C3888
+_0223426C: .word NNS_SndArcPlayerStartSeqArc
arm_func_start MOD13_02234270
MOD13_02234270: ; 0x02234270
@@ -26024,17 +26024,17 @@ MOD13_022342A0: ; 0x022342A0
ldr r1, _0223432C ; =0x02243154
ldr r1, [r1]
str r0, [r1, #0x94]
- bl SDAT_Init
+ bl NNS_SndInit
ldr r0, _0223432C ; =0x02243154
ldr r0, [r0]
ldr r1, [r0, #0x94]
- bl FUN_020C2444
+ bl NNS_SndArcInitOnMemory
mov r0, #0
- bl FUN_020C39CC
+ bl NNS_SndArcPlayerSetup
ldr r0, _0223432C ; =0x02243154
ldr r0, [r0]
add r0, r0, #0x90
- bl FUN_020C0F80
+ bl NNS_SndHandleInit
mov r0, #0
ldr r1, _02234334 ; =MOD13_022341DC
mov r2, r0
@@ -33219,7 +33219,7 @@ MOD13_0223A440: ; 0x0223A440
str r1, [sp, #0xc]
ldrb r1, [r4, #0x36]
ldrb r2, [r4, #0x37]
- bl FUN_020B5E50
+ bl NNS_G2dArrangeOBJ1D
add sp, sp, #0x10
ldmia sp!, {r4, r5, r6, r7, r8, pc}
@@ -33245,7 +33245,7 @@ MOD13_0223A4F0: ; 0x0223A4F0
str lr, [sp, #8]
add r0, r0, #0x20
str ip, [sp, #0xc]
- bl FUN_020B7168
+ bl NNSi_G2dTextCanvasDrawTextRect
add sp, sp, #0x14
ldmia sp!, {pc}
@@ -33271,14 +33271,14 @@ _0223A564:
ldr r0, [r0]
add r5, r0, r4
mov r0, r5
- bl FUN_020B5CE4
+ bl NNS_G2dFontFindGlyphIndex
mov r1, r0
ldr r0, _0223A5EC ; =0x0000FFFF
cmp r1, r0
ldreq r0, [r5]
ldreqh r1, [r0, #2]
mov r0, r5
- bl FUN_020B5C88
+ bl NNS_G2dFontGetCharWidthsFromIndex
ldrh r1, [r5, #8]
ldrh r2, [r7]
ldr r3, [sp, #8]
@@ -33319,7 +33319,7 @@ MOD13_0223A5F0: ; 0x0223A5F0
mla r1, ip, r3, lr
mov r3, r2
mov r2, r4
- bl FUN_020B63CC
+ bl NNS_G2dCharCanvasDrawChar
add sp, sp, #8
ldmia sp!, {r4, pc}
.align 2, 0
@@ -33334,7 +33334,7 @@ MOD13_0223A634: ; 0x0223A634
str lr, [sp]
add r0, r0, #0x20
str ip, [sp, #4]
- bl FUN_020B7218
+ bl NNSi_G2dTextCanvasDrawText
add sp, sp, #0xc
ldmia sp!, {pc}
@@ -33504,7 +33504,7 @@ _0223A88C:
mov r0, r6
mov r2, r4
mov r3, r5
- bl FUN_020B6388
+ bl NNS_G2dCharCanvasInitForBG
ldr r1, _0223A954 ; =0x022431A4
mov r0, #0xc
ldr r2, [r1]
@@ -33533,7 +33533,7 @@ _0223A8E0:
str r7, [sp, #8]
mov r4, #0xf
str r4, [sp, #0xc]
- bl FUN_020B6240
+ bl NNS_G2dMapScrToCharText
mov r0, r6
mov r1, #0
bl MOD13_0223A4D8
@@ -33601,7 +33601,7 @@ MOD13_0223A9A4: ; 0x0223A9A4
mov r0, r6
strh r1, [r4, #0x34]
mov r1, r5
- bl FUN_020B6180
+ bl NNSi_G2dCalcRequiredOBJ
ldr r1, [sp, #0x20]
cmp r7, #1
str r0, [r1]
@@ -33614,7 +33614,7 @@ MOD13_0223A9A4: ; 0x0223A9A4
mov r2, r6
mov r3, r5
add r1, ip, r7, lsl #7
- bl FUN_020B62F8
+ bl NNS_G2dCharCanvasInitForOBJ1D
ldr r2, [r4, #0x18]
mov r0, r4
mov r1, #0
@@ -33694,7 +33694,7 @@ _0223AB20:
add r0, r2, r8, lsl #2
ldr r1, [r0, #0x78c]
add r0, r2, r7
- bl FUN_020B5D3C
+ bl NNS_G2dFontInitUTF16
add r8, r8, #1
cmp r8, #2
add r7, r7, #0xc
@@ -34004,7 +34004,7 @@ MOD13_0223AF48: ; 0x0223AF48
ldr r0, _0223AF8C ; =0x022431A8
mov r1, r5
ldr r0, [r0]
- bl FUN_020ADDF0
+ bl NNS_FndFreeToExpHeap
mov r0, r4
bl OS_EnableIrqMask
add sp, sp, #4
@@ -34026,7 +34026,7 @@ MOD13_0223AF90: ; 0x0223AF90
ldmeqia sp!, {r4, r5, pc}
ldr r0, _0223AFDC ; =0x022431A8
ldr r0, [r0]
- bl FUN_020ADDF0
+ bl NNS_FndFreeToExpHeap
mov r0, r4
bl OS_EnableIrqMask
mov r0, #0
@@ -34060,7 +34060,7 @@ MOD13_0223B004: ; 0x0223B004
ldr r0, [r1]
mov r1, r6
mov r2, r5
- bl tempName_NNS_FndAllocFromExpHeapEx
+ bl NNS_FndAllocFromExpHeapEx
movs r5, r0
bne _0223B03C
bl OS_Terminate
@@ -34078,7 +34078,7 @@ MOD13_0223B050: ; 0x0223B050
sub sp, sp, #4
ldr r0, _0223B078 ; =0x022431A8
ldr r0, [r0]
- bl thunk_FUN_020adc8c
+ bl NNS_FndDestroyExpHeap
ldr r0, _0223B078 ; =0x022431A8
mov r1, #0
str r1, [r0]
@@ -34097,7 +34097,7 @@ MOD13_0223B07C: ; 0x0223B07C
mov r0, r4
mov r1, #0x40000
mov r2, #0
- bl tempName_NNS_FndCreateExpHeapEx
+ bl NNS_FndCreateExpHeapEx
ldr r1, _0223B0B8 ; =0x022431A8
cmp r0, #0
str r0, [r1]
diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s
index 3a321743..b95ab0d6 100644
--- a/arm9/modules/14/asm/module_14.s
+++ b/arm9/modules/14/asm/module_14.s
@@ -10519,7 +10519,7 @@ _021DC79C:
mov r1, #0x10
orr r1, r2
str r1, [r0]
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r2, #0x80
@@ -10547,7 +10547,7 @@ _021DC79C:
mov r0, #0x51
lsl r0, r0, #2
add r0, r4, r0
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
mov r0, #0xa
str r0, [sp]
mov r0, #0x51
@@ -10765,7 +10765,7 @@ MOD14_021DCA0C: ; 0x021DCA0C
bl MOD14_021DDEF4
bl G3X_ResetMtxStack
bl G3X_ResetMtxStack_2
- bl FUN_020B02C8
+ bl NNS_G2dSetupSoftwareSpriteCamera
mov r0, #0x56
lsl r0, r0, #2
ldr r0, [r4, r0]
@@ -13079,7 +13079,7 @@ _021DDC74: .word 0x0000B22C
thumb_func_start MOD14_021DDC78
MOD14_021DDC78: ; 0x021DDC78
push {r3, lr}
- bl FUN_020BB7F4
+ bl NNS_G3dInit
bl G3X_InitMtxStack
mov r0, #1
add r1, r0, #0
@@ -13815,7 +13815,7 @@ MOD14_021DE1D0: ; 0x021DE1D0
cmp r0, #0
beq _021DE268
add r1, sp, #0x14
- bl FUN_020B0030
+ bl NNS_G2dGetUnpackedBGCharacterData
cmp r0, #0
beq _021DE262
mov r0, #0xa
@@ -13895,7 +13895,7 @@ MOD14_021DE278: ; 0x021DE278
cmp r0, #0
beq _021DE2DC
add r1, sp, #8
- bl FUN_020B0180
+ bl NNS_G2dGetUnpackedScreenData
ldr r0, _021DE2E4 ; =0x00005984
mov r1, #3
ldr r0, [r5, r0]
@@ -15793,7 +15793,7 @@ MOD14_021DF144: ; 0x021DF144
sub sp, #0x38
add r4, r0, #0
add r0, #0x24
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
mov r3, #0
str r3, [sp]
mov r2, #1
@@ -18635,7 +18635,7 @@ MOD14_021E078C: ; 0x021E078C
add r4, r1, #0
add r6, r2, #0
str r3, [sp, #8]
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
bl FUN_0206B888
add r1, r0, #0
mov r0, #0xa
@@ -18656,10 +18656,10 @@ MOD14_021E078C: ; 0x021E078C
cmp r0, #0
beq _021E0818
add r0, sp, #0x18
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
ldr r0, [sp, #0xc]
add r1, sp, #0x10
- bl FUN_020B00F0
+ bl NNS_G2dGetUnpackedPaletteCompressInfo
ldr r2, [sp, #0x14]
add r7, r0, #0
ldr r0, [r2, #0xc]
@@ -18678,14 +18678,14 @@ MOD14_021E078C: ; 0x021E078C
ldr r1, [sp, #0x10]
mov r2, #0xc0
mov r3, #1
- bl FUN_020B10E8
+ bl NNS_G2dLoadPaletteEx
b _021E0812
_021E0806:
ldr r0, [sp, #0x14]
mov r1, #0xc0
mov r2, #1
add r3, sp, #0x18
- bl FUN_020B1240
+ bl NNS_G2dLoadPalette
_021E0812:
ldr r0, [sp, #0xc]
bl FreeToHeap
@@ -18805,7 +18805,7 @@ MOD14_021E08E4: ; 0x021E08E4
_021E08F4:
add r0, r5, #4
str r6, [r5]
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
add r0, r4, #0
add r5, #0x34
sub r4, r4, #1
@@ -18913,7 +18913,7 @@ MOD14_021E0940: ; 0x021E0940
bl GetBoxMonData
strh r0, [r4, #0x2e]
add r0, r4, #4
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
add r0, r5, #0
add r0, #0x4c
str r0, [sp]
@@ -18926,7 +18926,7 @@ MOD14_021E0940: ; 0x021E0940
add r0, r5, #0
add r0, #0x4c
add r1, sp, #0x1c
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
mov r2, #1
lsl r2, r2, #0x1a
ldr r1, [r2]
@@ -18942,7 +18942,7 @@ MOD14_021E0940: ; 0x021E0940
ldr r1, [sp, #0x60]
ldr r0, [sp, #0x1c]
lsl r1, r1, #5
- bl FUN_020B1768
+ bl NNS_G2dLoadImage1DMapping
add r0, r4, #4
str r0, [sp, #0x20]
ldr r0, [sp, #0x5c]
@@ -19031,10 +19031,10 @@ MOD14_021E0A60: ; 0x021E0A60
bl GetBoxMonData
strh r0, [r4, #0x2e]
add r0, r4, #4
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
ldr r0, [sp, #0x58]
add r1, sp, #0x18
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
mov r2, #1
lsl r2, r2, #0x1a
ldr r1, [r2]
@@ -19050,7 +19050,7 @@ MOD14_021E0A60: ; 0x021E0A60
ldr r1, [sp, #0x6c]
ldr r0, [sp, #0x18]
lsl r1, r1, #5
- bl FUN_020B1768
+ bl NNS_G2dLoadImage1DMapping
add r0, r4, #4
str r0, [sp, #0x1c]
ldr r0, [sp, #0x68]
@@ -19160,7 +19160,7 @@ MOD14_021E0BBC: ; 0x021E0BBC
cmp r0, #0
beq _021E0C18
add r0, r4, #4
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
add r0, r5, #0
add r0, #0x4c
str r0, [sp]
@@ -19173,7 +19173,7 @@ MOD14_021E0BBC: ; 0x021E0BBC
add r5, #0x4c
add r0, r5, #0
add r1, sp, #4
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
mov r2, #1
lsl r2, r2, #0x1a
ldr r1, [r2]
@@ -19188,7 +19188,7 @@ MOD14_021E0BBC: ; 0x021E0BBC
str r1, [r0, #0x10]
ldr r0, [sp, #4]
lsl r1, r6, #5
- bl FUN_020B1768
+ bl NNS_G2dLoadImage1DMapping
ldr r0, [r4]
add r1, r4, #4
bl FUN_02020334
@@ -19309,7 +19309,7 @@ MOD14_021E0CCC: ; 0x021E0CCC
sub sp, #0x38
add r4, r0, #0
add r0, #0x18
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
mov r3, #0
mov r0, #0x9d
str r3, [sp]
@@ -19705,7 +19705,7 @@ MOD14_021E0FA8: ; 0x021E0FA8
add r4, r5, #0
_021E0FE0:
add r0, sp, #0x44
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
mov r0, #0
str r0, [sp]
mov r0, #1
@@ -19758,7 +19758,7 @@ _021E103E:
cmp r0, #2
blo _021E0FE0
add r0, sp, #0x44
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
mov r3, #0
mov r0, #0xb9
str r3, [sp]
@@ -21925,7 +21925,7 @@ _021E211E:
ldr r2, [sp, #0x14]
ldr r3, [sp, #0x48]
lsl r1, r1, #5
- bl FUN_020B1768
+ bl NNS_G2dLoadImage1DMapping
add sp, #0x34
pop {r4, r5, r6, r7, pc}
_021E2132:
@@ -22053,7 +22053,7 @@ MOD14_021E21E4: ; 0x021E21E4
pop {r4, r5, r6, pc}
_021E2214:
add r0, sp, #4
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
add r0, sp, #4
str r0, [sp]
add r0, r5, #0
@@ -22100,7 +22100,7 @@ MOD14_021E223C: ; 0x021E223C
mov r5, #0x20
_021E227C:
add r0, sp, #0x1c
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
add r0, sp, #0x1c
str r0, [sp]
ldr r2, [sp, #8]
@@ -22987,7 +22987,7 @@ MOD14_021E2940: ; 0x021E2940
add r0, sp, #0x30
bl MOD14_021DDDB4
add r0, sp, #0xc
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
lsl r0, r4, #0x10
lsr r0, r0, #0x10
mov r1, #1
@@ -23012,7 +23012,7 @@ MOD14_021E2940: ; 0x021E2940
mov r1, #0xbe
ldr r0, [sp, #8]
lsl r1, r1, #8
- bl FUN_020B1768
+ bl NNS_G2dLoadImage1DMapping
lsl r0, r4, #0x10
lsr r0, r0, #0x10
mov r1, #2
@@ -24714,7 +24714,7 @@ MOD14_021E3664: ; 0x021E3664
add r4, r0, #0
bl MOD14_021E36FC
add r0, sp, #0x14
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
mov r3, #0
str r3, [sp]
mov r0, #2
@@ -24829,7 +24829,7 @@ MOD14_021E36FC: ; 0x021E36FC
str r0, [r1]
add r0, r4, #0
add r0, #0x18
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
mov r0, #0xa
str r0, [sp]
add r4, #0x18
@@ -25553,7 +25553,7 @@ _021E3CB2:
str r0, [sp, #0x10]
_021E3CC2:
add r0, sp, #0x14
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
add r0, sp, #0x14
str r0, [sp]
add r0, r7, #0
@@ -25752,7 +25752,7 @@ MOD14_021E3E1C: ; 0x021E3E1C
bl MOD14_021DC484
str r0, [sp, #0x14]
add r0, sp, #0x18
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
mov r3, #0
str r3, [sp]
mov r0, #2
@@ -27198,12 +27198,12 @@ MOD14_021E4890: ; 0x021E4890
add r5, r6, #0
_021E48EA:
add r0, sp, #0x10
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
ldr r0, [sp, #0xc]
ldr r1, [r4]
mov r2, #1
add r3, sp, #0x10
- bl FUN_020B1768
+ bl NNS_G2dLoadImage1DMapping
mov r0, #0
str r0, [sp]
mov r0, #1
@@ -29425,7 +29425,7 @@ MOD14_021E5A08: ; 0x021E5A08
mov r3, #0
bl FUN_02006930
add r0, sp, #0x48
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
mov r3, #0
str r3, [sp]
mov r0, #2
@@ -29583,11 +29583,11 @@ _021E5BA0:
add r0, r0, r6
str r0, [r4, #0x18]
add r0, sp, #0x34
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
ldr r2, [r4, #0x18]
add r0, sp, #0x34
mov r1, #2
- bl FUN_020B1A1C
+ bl NNS_G2dSetImageLocation
ldr r0, _021E5BFC ; =0x04001000
mov r2, #0
ldr r1, [r0]
@@ -29711,7 +29711,7 @@ MOD14_021E5C68: ; 0x021E5C68
add r0, r5, #0
add r0, #0xe8
add r1, sp, #4
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
ldr r0, [sp, #4]
mov r1, #2
ldr r0, [r0, #0x14]
diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s
index cd1cb9eb..bd42feb3 100644
--- a/arm9/modules/15/asm/module_15.s
+++ b/arm9/modules/15/asm/module_15.s
@@ -2592,7 +2592,7 @@ MOD15_021D87F8: ; 0x021D87F8
bl FUN_02015F1C
str r5, [r4, #0x18]
str r6, [r4, #0x1c]
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r1, #0x80
@@ -2925,19 +2925,19 @@ MOD15_021D8AB4: ; 0x021D8AB4
mov r0, #0x66
lsl r0, r0, #2
add r0, r4, r0
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
mov r0, #0x6b
lsl r0, r0, #2
add r0, r4, r0
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
mov r0, #0x15
lsl r0, r0, #4
add r0, r4, r0
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
mov r0, #0x5d
lsl r0, r0, #2
add r0, r4, r0
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
mov r3, #0
str r3, [sp]
mov r2, #1
@@ -7801,9 +7801,9 @@ MOD15_021DB154: ; 0x021DB154
sub sp, #0x4c
add r4, r0, #0
add r0, sp, #0x38
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
add r0, sp, #0x14
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
mov r0, #0x23
str r0, [sp]
add r0, sp, #0x38
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s
index e5c8bf91..4588def6 100644
--- a/arm9/modules/16/asm/module_16.s
+++ b/arm9/modules/16/asm/module_16.s
@@ -1996,7 +1996,7 @@ MOD16_021D8424: ; 0x021D8424
push {r4, r5, lr}
sub sp, #0x24
add r4, r0, #0
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r1, #0x80
@@ -2053,7 +2053,7 @@ _021D849C: .word 0x000019FC
thumb_func_start MOD16_021D84A0
MOD16_021D84A0: ; 0x021D84A0
push {r3, lr}
- bl FUN_020BB7F4
+ bl NNS_G3dInit
bl G3X_InitMtxStack
ldr r0, _021D8500 ; =0x04000060
ldr r2, _021D8504 ; =0xFFFFCFFD
@@ -2089,11 +2089,11 @@ MOD16_021D84A0: ; 0x021D84A0
str r0, [r1, #0x40]
mov r0, #1
add r1, r0, #0
- bl FUN_020AEB70
+ bl NNS_GfdInitFrmTexVramManager
mov r0, #1
lsl r0, r0, #0xe
mov r1, #1
- bl FUN_020AEDF4
+ bl NNS_GfdInitFrmPlttVramManager
pop {r3, pc}
.align 2, 0
_021D8500: .word 0x04000060
@@ -2106,8 +2106,8 @@ _021D8510: .word 0xBFFF0000
thumb_func_start MOD16_021D8514
MOD16_021D8514: ; 0x021D8514
push {r3, lr}
- bl FUN_020AEAF4
- bl FUN_020AEC60
+ bl NNS_GfdResetFrmTexVramState
+ bl NNS_GfdResetFrmPlttVramState
pop {r3, pc}
thumb_func_end MOD16_021D8514
@@ -2313,7 +2313,7 @@ MOD16_021D86B4: ; 0x021D86B4
lsl r0, r0, #2
ldr r0, [r4, r0]
bl FUN_0201FDEC
- bl FUN_020B02C8
+ bl NNS_G2dSetupSoftwareSpriteCamera
mov r0, #0x55
lsl r0, r0, #2
ldr r0, [r4, r0]
@@ -3182,7 +3182,7 @@ MOD16_021D8CB4: ; 0x021D8CB4
add r7, r0, #0
beq _021D8CF6
add r1, sp, #4
- bl FUN_020B0030
+ bl NNS_G2dGetUnpackedBGCharacterData
cmp r0, #0
beq _021D8CF0
cmp r4, #0
@@ -3220,7 +3220,7 @@ MOD16_021D8CFC: ; 0x021D8CFC
add r7, r0, #0
beq _021D8D42
add r1, sp, #0
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
cmp r0, #0
beq _021D8D3C
cmp r4, #0
@@ -3258,7 +3258,7 @@ MOD16_021D8D48: ; 0x021D8D48
add r4, r0, #0
beq _021D8D6A
add r1, r5, #0
- bl FUN_020B0180
+ bl NNS_G2dGetUnpackedScreenData
cmp r0, #0
bne _021D8D6A
add r0, r4, #0
@@ -3280,7 +3280,7 @@ MOD16_021D8D70: ; 0x021D8D70
add r4, r0, #0
beq _021D8D92
add r1, r5, #0
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
cmp r0, #0
bne _021D8D92
add r0, r4, #0
@@ -3302,7 +3302,7 @@ MOD16_021D8D98: ; 0x021D8D98
add r4, r0, #0
beq _021D8DBA
add r1, r5, #0
- bl FUN_020B0030
+ bl NNS_G2dGetUnpackedBGCharacterData
cmp r0, #0
bne _021D8DBA
add r0, r4, #0
@@ -3545,14 +3545,14 @@ MOD16_021D8F9C: ; 0x021D8F9C
mov r1, #0x55
lsl r1, r1, #2
str r0, [r5, r1]
- ldr r3, _021D9030 ; =UNK_021064B8
+ ldr r3, _021D9030 ; =NNS_GfdDefaultFuncAllocTexVram
mov r0, #2
mov r1, #0
ldr r3, [r3]
lsl r0, r0, #0xe
add r2, r1, #0
blx r3
- ldr r3, _021D9034 ; =UNK_021064C0
+ ldr r3, _021D9034 ; =NNS_GfdDefaultFuncAllocPlttVram
add r4, r0, #0
ldr r3, [r3]
mov r0, #0x80
@@ -3607,8 +3607,8 @@ _021D9004:
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
nop
-_021D9030: .word UNK_021064B8
-_021D9034: .word UNK_021064C0
+_021D9030: .word NNS_GfdDefaultFuncAllocTexVram
+_021D9034: .word NNS_GfdDefaultFuncAllocPlttVram
_021D9038: .word 0x7FFF0000
_021D903C: .word 0xFFFF0000
_021D9040: .word MOD16_021FF490
@@ -49737,7 +49737,7 @@ MOD16_021EE5D0: ; 0x021EE5D0
bl FUN_02003974
ldr r0, [sp, #4]
mov r1, #1
- bl FUN_020B19C4
+ bl NNS_G2dGetImagePaletteLocation
add r2, r5, #0
add r2, #0xbc
add r1, r0, #0
@@ -49762,7 +49762,7 @@ MOD16_021EE5D0: ; 0x021EE5D0
bl FUN_02003974
ldr r0, [sp, #8]
mov r1, #1
- bl FUN_020B19C4
+ bl NNS_G2dGetImagePaletteLocation
add r5, #0xc0
add r1, r0, #0
ldr r2, [r5]
diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s
index 5d834cfa..234719b2 100644
--- a/arm9/modules/17/asm/module_17.s
+++ b/arm9/modules/17/asm/module_17.s
@@ -508,7 +508,7 @@ MOD17_021D786C: ; 0x021D786C
push {r4, lr}
add r4, r0, #0
bl FUN_020222AC
- bl FUN_020B02C8
+ bl NNS_G2dSetupSoftwareSpriteCamera
ldr r0, [r4, #0x1c]
cmp r0, #0
beq _021D7884
@@ -768,7 +768,7 @@ MOD17_021D7A2C: ; 0x021D7A2C
lsl r5, r5, #2
add r0, r6, #0
add r1, r1, r5
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
ldr r0, [r4, #0x30]
ldr r0, [r0, r5]
pop {r4, r5, r6, pc}
@@ -1046,7 +1046,7 @@ MOD17_021D7C28: ; 0x021D7C28
add r6, r2, #0
ldr r7, [sp, #0x18]
str r1, [r0]
- bl FUN_020B02C8
+ bl NNS_G2dSetupSoftwareSpriteCamera
ldr r1, _021D7CB0 ; =0x04000470
lsl r0, r4, #0xc
str r0, [r1]
@@ -1173,7 +1173,7 @@ _021D7D24: .word MOD17_021DE32C
thumb_func_start MOD17_021D7D28
MOD17_021D7D28: ; 0x021D7D28
push {r3, lr}
- bl FUN_020BB7F4
+ bl NNS_G3dInit
bl G3X_InitMtxStack
mov r0, #1
add r1, r0, #0
@@ -1218,11 +1218,11 @@ MOD17_021D7D28: ; 0x021D7D28
str r0, [r2]
str r1, [r2, #0x40]
mov r1, #1
- bl FUN_020AEB70
+ bl NNS_GfdInitFrmTexVramManager
mov r0, #1
lsl r0, r0, #0xe
mov r1, #1
- bl FUN_020AEDF4
+ bl NNS_GfdInitFrmPlttVramManager
pop {r3, pc}
.align 2, 0
_021D7D9C: .word 0x04000008
@@ -1253,7 +1253,7 @@ MOD17_021D7DB0: ; 0x021D7DB0
mov r0, #0x10
orr r0, r1
str r0, [r2]
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
bl GX_DisableEngineALayers
bl GX_DisableEngineBLayers
mov r0, #0x1f
@@ -1272,8 +1272,8 @@ _021D7DFC: .word 0xFFCFFFEF
thumb_func_start MOD17_021D7E00
MOD17_021D7E00: ; 0x021D7E00
push {r3, lr}
- bl FUN_020AEAF4
- bl FUN_020AEC60
+ bl NNS_GfdResetFrmTexVramState
+ bl NNS_GfdResetFrmPlttVramState
pop {r3, pc}
thumb_func_end MOD17_021D7E00
@@ -1282,7 +1282,7 @@ MOD17_021D7E0C: ; 0x021D7E0C
push {r3, lr}
bl GX_DisableEngineALayers
bl GX_DisableEngineBLayers
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
pop {r3, pc}
thumb_func_end MOD17_021D7E0C
@@ -1658,7 +1658,7 @@ MOD17_021D80CC: ; 0x021D80CC
bl FUN_0201E00C
bl FUN_0201D168
bl FUN_0201E0BC
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r1, #0x7c
@@ -1787,7 +1787,7 @@ _021D81C6:
ldr r1, [r6, #8]
add r0, r4, #0
add r1, r1, #4
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
ldr r1, [r7]
ldr r0, [r6, #8]
str r1, [r0]
@@ -1851,7 +1851,7 @@ _021D822A:
ldr r0, [sp, #0xc]
add r1, r1, r6
add r1, r1, #4
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
ldr r0, [r5, #8]
add r0, r0, r6
ldr r0, [r0, #4]
@@ -1914,13 +1914,13 @@ MOD17_021D82E4: ; 0x021D82E4
add r6, r3, #0
bl FUN_02006D98
str r0, [r5, #0x20]
- ldr r3, _021D833C ; =UNK_021064B8
+ ldr r3, _021D833C ; =NNS_GfdDefaultFuncAllocTexVram
mov r1, #0
ldr r3, [r3]
add r0, r4, #0
add r2, r1, #0
blx r3
- ldr r3, _021D8340 ; =UNK_021064C0
+ ldr r3, _021D8340 ; =NNS_GfdDefaultFuncAllocPlttVram
add r4, r0, #0
ldr r3, [r3]
add r0, r6, #0
@@ -1948,8 +1948,8 @@ MOD17_021D82E4: ; 0x021D82E4
str r0, [r5, #0x24]
pop {r4, r5, r6, pc}
nop
-_021D833C: .word UNK_021064B8
-_021D8340: .word UNK_021064C0
+_021D833C: .word NNS_GfdDefaultFuncAllocTexVram
+_021D8340: .word NNS_GfdDefaultFuncAllocPlttVram
_021D8344: .word 0x7FFF0000
_021D8348: .word 0xFFFF0000
thumb_func_end MOD17_021D82E4
@@ -8916,7 +8916,7 @@ MOD17_021DB700: ; 0x021DB700
bl UncompressFromNarc
add r1, sp, #0x10
add r6, r0, #0
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
ldr r0, [sp, #0x10]
ldr r0, [r0, #0x14]
bl FUN_02008A74
@@ -13727,7 +13727,7 @@ _021DDAC6:
add r1, r1, r5
add r0, r7, #0
add r1, r1, #4
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
ldr r0, [sp, #4]
ldr r1, [r0]
ldr r0, [r4]
@@ -13758,7 +13758,7 @@ _021DDB1E:
ldr r1, [r4, #8]
add r0, r5, #0
add r1, r1, #4
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
ldr r0, [sp, #4]
ldr r1, [r0]
ldr r0, [r4, #8]
@@ -13875,7 +13875,7 @@ MOD17_021DDC30: ; 0x021DDC30
bl OverlayManager_GetData
add r5, r0, #0
bl FUN_020222AC
- bl FUN_020B02C8
+ bl NNS_G2dSetupSoftwareSpriteCamera
ldr r0, [r5, #0x10]
bl MOD17_021DD518
mov r0, #0
diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s
index 86075a84..d90cf62c 100644
--- a/arm9/modules/18/asm/module_18.s
+++ b/arm9/modules/18/asm/module_18.s
@@ -5780,7 +5780,7 @@ MOD18_0223C37C: ; 0x0223C37C
ldr r1, [r0]
ldr r0, _0223C56C ; =0x000009EB
strb r2, [r1, r0]
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r1, #0x7c
@@ -21387,7 +21387,7 @@ _02243B16:
str r0, [sp, #0x24]
add r0, sp, #0x1c
add r1, sp, #0x18
- bl FUN_020BB408
+ bl NNS_G3dWorldPosToScrPos
ldr r0, [sp, #0x18]
lsl r0, r0, #0xc
str r0, [sp, #0x1c]
diff --git a/arm9/modules/20/asm/module_20.s b/arm9/modules/20/asm/module_20.s
index 317de1aa..6b339173 100644
--- a/arm9/modules/20/asm/module_20.s
+++ b/arm9/modules/20/asm/module_20.s
@@ -1223,7 +1223,7 @@ MOD20_02252C5C: ; 0x02252C5C
lsl r0, r0, #4
str r7, [r4, r0]
ldr r0, [r4, r0]
- bl FUN_020B0888
+ bl NNS_G2dResetOamManagerBuffer
mov r0, #0x15
lsl r0, r0, #4
ldr r0, [r4, r0]
@@ -3062,7 +3062,7 @@ _02253A4E:
bl NARC_ReadFromMember
add r0, r7, #0
add r1, sp, #0x20
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
ldr r0, [sp, #0x20]
add r1, r5, #0
ldr r0, [r0, #0x14]
@@ -3239,7 +3239,7 @@ MOD20_02253BA4: ; 0x02253BA4
str r7, [r4]
str r5, [r4, #0x18]
add r0, r7, #0
- bl FUN_020B0830
+ bl NNS_G2dGetOamManagerOamCapacity
strh r0, [r4, #0x10]
ldrh r1, [r4, #0x10]
add r0, r5, #0
@@ -3354,7 +3354,7 @@ _02253C96:
mov r1, #2
add r0, #8
lsl r1, r1, #0xc
- bl FUN_020B1EC4
+ bl NNS_G2dTickCellAnimation
add r0, r4, #0
add r0, #0x86
ldrb r0, [r0]
@@ -3391,7 +3391,7 @@ _02253CAE:
ldr r2, [r4, #0x34]
add r0, r5, #0
lsr r1, r1, #0x10
- bl FUN_020B1AF8
+ bl NNS_G2dMakeCellToOams
b _02253D86
_02253CEE:
ldr r0, [r4, #0x6c]
@@ -3452,7 +3452,7 @@ _02253D62:
ldr r0, [sp, #0xc]
ldr r1, [r4, #0x6c]
ldr r0, [r0]
- bl FUN_020B0BB0
+ bl NNS_G2dEntryOamManagerAffine
add r1, sp, #0x18
str r1, [sp]
str r0, [sp, #4]
@@ -3464,7 +3464,7 @@ _02253D62:
ldr r3, [r4, #0x6c]
add r0, r5, #0
lsr r1, r1, #0x10
- bl FUN_020B1AF8
+ bl NNS_G2dMakeCellToOams
_02253D86:
ldr r1, [sp, #0x10]
sub r1, r1, r0
@@ -3569,7 +3569,7 @@ _02253E38:
lsl r2, r2, #0xd
ldr r0, [r0]
lsr r2, r2, #0x10
- bl FUN_020B0D58
+ bl NNS_G2dEntryOamManagerOam
_02253E52:
add sp, #0x20
pop {r3, r4, r5, r6, r7, pc}
@@ -3607,12 +3607,12 @@ MOD20_02253E74: ; 0x02253E74
ldr r0, [r6, #0xc]
str r0, [r4, #4]
ldrh r1, [r5, #8]
- bl FUN_020AFC04
+ bl NNS_G2dGetAnimSequenceByIdx
add r1, r0, #0
add r0, r4, #0
ldr r2, [r4]
add r0, #8
- bl FUN_020B1F80
+ bl NNS_G2dInitCellAnimation
ldr r1, [r5]
ldr r0, [r5, #4]
str r1, [r4, #0x64]
@@ -3686,12 +3686,12 @@ MOD20_02253F28: ; 0x02253F28
lsl r1, r1, #0x10
ldr r0, [r4, #4]
lsr r1, r1, #0x10
- bl FUN_020AFC04
+ bl NNS_G2dGetAnimSequenceByIdx
add r1, r0, #0
add r0, r4, #0
ldr r2, [r4]
add r0, #8
- bl FUN_020B1F80
+ bl NNS_G2dInitCellAnimation
pop {r4, pc}
thumb_func_end MOD20_02253F28
@@ -3820,7 +3820,7 @@ MOD20_02253FBC: ; 0x02253FBC
beq _0225400E
add r1, r5, #0
add r1, #8
- bl FUN_020AFEB8
+ bl NNS_G2dGetUnpackedCellBank
cmp r0, #0
bne _02253FFC
mov r0, #0
@@ -3829,7 +3829,7 @@ _02253FFC:
ldr r0, [r5, #4]
add r5, #0xc
add r1, r5, #0
- bl thunk_FUN_020afda0
+ bl NNS_G2dGetUnpackedMCAnimBank
cmp r0, #0
bne _0225400E
mov r0, #0
diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s
index 7d7fa32a..0bb87572 100644
--- a/arm9/modules/27/asm/module_27.s
+++ b/arm9/modules/27/asm/module_27.s
@@ -1015,7 +1015,7 @@ _02254FFC:
bl NARC_ReadFromMember
ldr r0, [sp, #0x18]
add r1, sp, #0x20
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
ldr r0, [sp, #0x20]
mov r1, #2
ldr r0, [r0, #0x14]
diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s
index 618309d1..07792caf 100644
--- a/arm9/modules/28/asm/module_28.s
+++ b/arm9/modules/28/asm/module_28.s
@@ -670,7 +670,7 @@ _02254D24:
bl NARC_AllocAndReadWholeMember
add r1, sp, #0x2c
str r0, [sp, #0x20]
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
ldr r0, [sp, #0x2c]
mov r1, #1
ldr r0, [r0, #0x14]
diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s
index f49ce02c..67dd59d4 100644
--- a/arm9/modules/53/asm/module_53.s
+++ b/arm9/modules/53/asm/module_53.s
@@ -898,7 +898,7 @@ MOD53_021D7C84: ; 0x021D7C84
push {r4, r5, r6, r7, lr}
sub sp, #0x14
add r5, r0, #0
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r1, #0x7e
diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s
index 1131a268..0469af07 100644
--- a/arm9/modules/54/asm/module_54.s
+++ b/arm9/modules/54/asm/module_54.s
@@ -819,7 +819,7 @@ MOD54_021D7BBC: ; 0x021D7BBC
push {r4, r5, r6, r7, lr}
sub sp, #0x14
add r6, r0, #0
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r1, #0x7e
diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s
index c221c2d0..d9a9cad6 100644
--- a/arm9/modules/55/asm/module_55.s
+++ b/arm9/modules/55/asm/module_55.s
@@ -865,7 +865,7 @@ MOD55_021D7C20: ; 0x021D7C20
push {r4, r5, r6, r7, lr}
sub sp, #0x14
add r5, r0, #0
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r1, #0x7e
@@ -4013,7 +4013,7 @@ _021D9570: .word MOD55_021DA314
thumb_func_start MOD55_021D9574
MOD55_021D9574: ; 0x021D9574
push {r3, lr}
- bl FUN_020BB7F4
+ bl NNS_G3dInit
bl G3X_InitMtxStack
mov r0, #1
add r1, r0, #0
@@ -4807,7 +4807,7 @@ MOD55_021D9C50: ; 0x021D9C50
add r4, r1, #0
bl G3X_ResetMtxStack
bl G3X_ResetMtxStack_2
- bl FUN_020B02C8
+ bl NNS_G2dSetupSoftwareSpriteCamera
add r0, r5, #0
add r0, #0xdc
ldr r0, [r0]
@@ -4862,7 +4862,7 @@ MOD55_021D9CC4: ; 0x021D9CC4
add r4, r1, #0
bl G3X_ResetMtxStack
bl G3X_ResetMtxStack_2
- bl FUN_020B02C8
+ bl NNS_G2dSetupSoftwareSpriteCamera
add r0, r5, #0
add r0, #0xdc
ldr r0, [r0]
diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s
index 8626dac2..e9abf575 100644
--- a/arm9/modules/56/asm/module_56.s
+++ b/arm9/modules/56/asm/module_56.s
@@ -1085,7 +1085,7 @@ MOD56_022126E0: ; 0x022126E0
push {r4, r5, r6, r7, lr}
sub sp, #0x14
add r6, r0, #0
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r1, #0x7e
diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s
index 463396ab..4f7db66f 100644
--- a/arm9/modules/57/asm/module_57.s
+++ b/arm9/modules/57/asm/module_57.s
@@ -1022,7 +1022,7 @@ _021D7D4C:
ldr r0, [r4, r1]
add r1, r1, #4
add r1, r4, r1
- bl FUN_020B0030
+ bl NNS_G2dGetUnpackedBGCharacterData
cmp r0, #0
bne _021D7D60
bl ErrorHandling
@@ -1076,7 +1076,7 @@ _021D7DBC:
ldr r0, [r4, r1]
add r1, r1, #4
add r1, r4, r1
- bl FUN_020B0030
+ bl NNS_G2dGetUnpackedBGCharacterData
cmp r0, #0
bne _021D7DD0
bl ErrorHandling
@@ -3573,7 +3573,7 @@ MOD57_021D9184: ; 0x021D9184
sub sp, #0x3c
add r7, r0, #0
bl MOD57_021D9578
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r1, #0x80
@@ -3709,7 +3709,7 @@ _021D9290:
beq _021D92CA
ldr r1, [sp, #0x18]
add r1, r1, r6
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
cmp r0, #0
bne _021D92CE
mov r0, #0x1e
@@ -4024,7 +4024,7 @@ _021D9536:
ldr r0, [r1, r0]
bl FUN_02020354
mov r1, #1
- bl FUN_020B19C4
+ bl NNS_G2dGetImagePaletteLocation
str r0, [sp]
lsl r0, r4, #5
str r0, [sp, #4]
diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s
index 7f3bd998..b47aeeba 100644
--- a/arm9/modules/58/asm/module_58.s
+++ b/arm9/modules/58/asm/module_58.s
@@ -715,7 +715,7 @@ MOD58_021DA044: ; 0x021DA044
push {r4, r5, r6, r7, lr}
sub sp, #0x14
add r5, r0, #0
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r1, #0x7e
diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s
index fa7752a8..8c6d04fc 100644
--- a/arm9/modules/60/asm/module_60.s
+++ b/arm9/modules/60/asm/module_60.s
@@ -403,7 +403,7 @@ MOD60_021D77D4: ; 0x021D77D4
str r0, [r4, #0x10]
_021D7804:
bl FUN_0200BC30
- bl FUN_020AEEB8
+ bl NNS_GfdDoVramTransfer
ldr r0, [r4, #0x14]
bl FUN_0201AB60
ldr r3, _021D782C ; =0x027E0000
@@ -688,7 +688,7 @@ MOD60_021D7A40: ; 0x021D7A40
bl NARC_ReadWholeMember
add r0, r6, #0
add r1, sp, #0x20
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
ldr r3, [sp, #0x20]
mov r1, #0
str r1, [sp]
@@ -719,7 +719,7 @@ MOD60_021D7A40: ; 0x021D7A40
bl NARC_ReadWholeMember
add r0, r6, #0
add r1, sp, #0x1c
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
ldr r1, [sp, #0x1c]
mov r0, #0
ldr r1, [r1, #0xc]
@@ -748,7 +748,7 @@ MOD60_021D7A40: ; 0x021D7A40
add r1, r5, #0
ldr r0, [r5, #0x24]
add r1, #0x28
- bl FUN_020B0180
+ bl NNS_G2dGetUnpackedScreenData
add r0, r4, #0
bl NARC_dtor
mov r3, #0
diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s
index 54af7ce1..ed9e0e05 100644
--- a/arm9/modules/61/asm/module_61.s
+++ b/arm9/modules/61/asm/module_61.s
@@ -737,7 +737,7 @@ _021D7A7A:
beq _021D7A88
bl FUN_0200BC30
_021D7A88:
- bl FUN_020AEEB8
+ bl NNS_GfdDoVramTransfer
ldr r0, [r4, #0x18]
bl FUN_0201AB60
ldr r3, _021D7AA0 ; =0x027E0000
@@ -1087,7 +1087,7 @@ MOD61_021D7CE8: ; 0x021D7CE8
bl NARC_ReadWholeMember
add r0, r7, #0
add r1, sp, #0x28
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
ldr r3, [sp, #0x28]
mov r0, #0
str r0, [sp]
@@ -1119,7 +1119,7 @@ MOD61_021D7CE8: ; 0x021D7CE8
bl NARC_ReadWholeMember
add r0, r4, #0
add r1, sp, #0x24
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
ldr r2, [sp, #0x24]
mov r0, #4
ldr r1, [r2, #0xc]
@@ -1253,7 +1253,7 @@ _021D7E00:
add r1, r5, #0
ldr r0, [r5, #0x34]
add r1, #0x3c
- bl FUN_020B0180
+ bl NNS_G2dGetUnpackedScreenData
mov r0, #0x4f
mov r1, #0x24
bl GetNarcMemberSizeByIdPair
@@ -1268,7 +1268,7 @@ _021D7E00:
add r1, r5, #0
ldr r0, [r5, #0x38]
add r1, #0x40
- bl FUN_020B0180
+ bl NNS_G2dGetUnpackedScreenData
add r0, r6, #0
bl NARC_dtor
mov r3, #0
diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s
index f1eb2a70..3d0ee0fd 100644
--- a/arm9/modules/62/asm/module_62.s
+++ b/arm9/modules/62/asm/module_62.s
@@ -1815,14 +1815,14 @@ _0222E35C: .word 0x04000580
thumb_func_start MOD62_0222E360
MOD62_0222E360: ; 0x0222E360
push {r3, r4, r5, lr}
- ldr r3, _0222E398 ; =UNK_021064B8
+ ldr r3, _0222E398 ; =NNS_GfdDefaultFuncAllocTexVram
mov r0, #2
mov r1, #0
ldr r3, [r3]
lsl r0, r0, #0xe
add r2, r1, #0
blx r3
- ldr r3, _0222E39C ; =UNK_021064C0
+ ldr r3, _0222E39C ; =NNS_GfdDefaultFuncAllocPlttVram
mov r1, #0
add r4, r0, #0
ldr r3, [r3]
@@ -1841,8 +1841,8 @@ _0222E390:
bl FUN_02012CC8
pop {r3, r4, r5, pc}
nop
-_0222E398: .word UNK_021064B8
-_0222E39C: .word UNK_021064C0
+_0222E398: .word NNS_GfdDefaultFuncAllocTexVram
+_0222E39C: .word NNS_GfdDefaultFuncAllocPlttVram
thumb_func_end MOD62_0222E360
thumb_func_start MOD62_0222E3A0
@@ -1853,7 +1853,7 @@ MOD62_0222E3A0: ; 0x0222E3A0
cmp r0, #0
ble _0222E3B6
bl FUN_020222AC
- bl FUN_020B02C8
+ bl NNS_G2dSetupSoftwareSpriteCamera
_0222E3B6:
bl FUN_02013388
mov r0, #1
diff --git a/arm9/modules/63/asm/mod63_021D74E0.s b/arm9/modules/63/asm/mod63_021D74E0.s
index 11daacd0..ab30c4e0 100644
--- a/arm9/modules/63/asm/mod63_021D74E0.s
+++ b/arm9/modules/63/asm/mod63_021D74E0.s
@@ -519,24 +519,24 @@ MOD63_021D78BC: ; 0x021D78BC
bl FUN_0201B234
ldr r0, [r5, #0x60]
mov r1, #0
- bl FUN_020BC4C8
+ bl NNS_G3dGetAnmByIdx
add r4, r0, #0
add r0, r5, #0
ldr r2, [r5, #0x58]
add r0, #0x68
add r1, r4, #0
- bl FUN_020BB8D0
+ bl NNS_G3dAllocAnmObj
str r0, [r5, #0x64]
ldr r0, [r5, #0x5c]
- bl FUN_020BC0FC
+ bl NNS_G3dGetTex
add r3, r0, #0
ldr r0, [r5, #0x64]
ldr r2, [r5, #0x58]
add r1, r4, #0
- bl FUN_020B8110
+ bl NNS_G3dAnmObjInit
ldr r1, [r5, #0x64]
add r0, r5, #4
- bl FUN_020B7EFC
+ bl NNS_G3dRenderObjAddAnmObj
add r4, r5, #0
add r6, sp, #0xc
mov r3, #0
@@ -579,7 +579,7 @@ MOD63_021D7970: ; 0x021D7970
add r4, r0, #0
ldr r1, [r4, #0x64]
add r0, #0x68
- bl thunk_FUN_020ae84c
+ bl NNS_G3dFreeAnmObj
ldr r0, [r4, #0x60]
bl FreeToHeap
ldr r0, [r4, #0x5c]
@@ -1006,10 +1006,10 @@ _021D7C52:
ldrsh r2, [r5, r2]
ldrsh r3, [r5, r3]
mov r0, #0
- bl FUN_020B8418
+ bl NNS_G3dGlbLightVector
ldr r1, _021D7D68 ; =0x00007FFF
mov r0, #0
- bl FUN_020B8404
+ bl NNS_G3dGlbLightColor
ldr r3, _021D7D6C ; =0x0000010E
mov r0, #1
add r2, r3, #2
@@ -1017,10 +1017,10 @@ _021D7C52:
add r3, r3, #4
ldrsh r2, [r5, r2]
ldrsh r3, [r5, r3]
- bl FUN_020B8418
+ bl NNS_G3dGlbLightVector
ldr r1, _021D7D68 ; =0x00007FFF
mov r0, #1
- bl FUN_020B8404
+ bl NNS_G3dGlbLightColor
ldr r2, _021D7D60 ; =0x04000060
ldr r0, _021D7D64 ; =0xFFFFCFFF
ldrh r1, [r2]
@@ -1770,7 +1770,7 @@ _021D8272:
str r1, [r0]
ldr r1, _021D835C ; =0x00007FFF
mov r0, #1
- bl FUN_020B8404
+ bl NNS_G3dGlbLightColor
add r0, r5, #0
add r1, r4, #0
add r0, #0xa8
@@ -2260,7 +2260,7 @@ _021D86B2:
lsl r1, r1, #0x10
mov r0, #1
lsr r1, r1, #0x10
- bl FUN_020B8404
+ bl NNS_G3dGlbLightColor
pop {r4, pc}
.align 2, 0
_021D86DC: .word 0x00000116
diff --git a/arm9/modules/63/asm/mod63_021D8890.s b/arm9/modules/63/asm/mod63_021D8890.s
index e501157b..ccd31d01 100644
--- a/arm9/modules/63/asm/mod63_021D8890.s
+++ b/arm9/modules/63/asm/mod63_021D8890.s
@@ -417,14 +417,14 @@ MOD63_021D8BD8: ; 0x021D8BD8
add r3, r1, #0
bl FUN_02022318
str r0, [r4, #0x10]
- ldr r3, _021D8C18 ; =UNK_021064B8
+ ldr r3, _021D8C18 ; =NNS_GfdDefaultFuncAllocTexVram
mov r0, #2
mov r1, #0
ldr r3, [r3]
lsl r0, r0, #0xe
add r2, r1, #0
blx r3
- ldr r3, _021D8C1C ; =UNK_021064C0
+ ldr r3, _021D8C1C ; =NNS_GfdDefaultFuncAllocPlttVram
mov r0, #0x80
ldr r3, [r3]
mov r1, #0
@@ -434,8 +434,8 @@ MOD63_021D8BD8: ; 0x021D8BD8
pop {r4, pc}
nop
_021D8C14: .word MOD63_021D8C20
-_021D8C18: .word UNK_021064B8
-_021D8C1C: .word UNK_021064C0
+_021D8C18: .word NNS_GfdDefaultFuncAllocTexVram
+_021D8C1C: .word NNS_GfdDefaultFuncAllocPlttVram
thumb_func_end MOD63_021D8BD8
thumb_func_start MOD63_021D8C20
@@ -1565,11 +1565,11 @@ _021D950C:
asr r1, r1, #0x10
asr r2, r2, #0x10
asr r3, r3, #0x10
- bl FUN_020B8418
+ bl NNS_G3dGlbLightVector
lsl r1, r4, #1
ldrh r1, [r7, r1]
add r0, r4, #0
- bl FUN_020B8404
+ bl NNS_G3dGlbLightColor
add r0, r4, #1
lsl r0, r0, #0x18
lsr r4, r0, #0x18
@@ -1578,11 +1578,11 @@ _021D950C:
ldr r0, _021D9594 ; =0x00004210
ldr r1, _021D9598 ; =0x0000318A
mov r2, #0
- bl FUN_020B83E0
+ bl NNS_G3dGlbMaterialColorDiffAmb
ldr r0, _021D959C ; =0x00004A52
ldr r1, _021D95A0 ; =0x000039CE
mov r2, #0
- bl FUN_020B83BC
+ bl NNS_G3dGlbMaterialColorSpecEmi
mov r0, #0x1f
str r0, [sp]
mov r0, #2
@@ -1592,7 +1592,7 @@ _021D950C:
mov r0, #0xd
mov r2, #2
add r3, r1, #0
- bl FUN_020B8390
+ bl NNS_G3dGlbPolygonAttr
ldr r0, _021D95A4 ; =MOD63_021D8CB0
add r1, r5, #0
bl Main_SetVBlankIntrCB
@@ -1767,7 +1767,7 @@ _021D96C6:
beq _021D96F4
ldr r1, [sp, #0x14]
add r1, r1, r7
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
cmp r0, #0
bne _021D96F8
ldr r0, [r6, #0x2c]
@@ -1912,7 +1912,7 @@ MOD63_021D9810: ; 0x021D9810
mov r2, #0x4c
bl AllocAndReadWholeNarcMemberByIdPair
str r0, [r5, #0x3c]
- bl FUN_020BC0FC
+ bl NNS_G3dGetTex
str r0, [r5, #0x40]
bl FUN_0201B3C4
cmp r0, #0
@@ -1965,7 +1965,7 @@ _021D9890:
add r0, r5, r6
add r0, #0x9c
ldr r0, [r0]
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
ldrb r0, [r0, #9]
cmp r0, #1
beq _021D98A4
@@ -1974,7 +1974,7 @@ _021D98A4:
add r0, r5, r6
add r0, #0x9c
ldr r0, [r0]
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
ldrh r1, [r0, #0xe]
add r1, r0, r1
ldr r1, [r1, #0xc]
@@ -1985,29 +1985,29 @@ _021D98BC:
ldr r0, [sp, #0x10]
add r1, r4, #0
add r0, r0, r6
- bl FUN_020B80B4
+ bl NNS_G3dRenderObjInit
add r0, r4, #0
mov r1, #0
mov r2, #0x40
- bl FUN_020BC094
+ bl NNSi_G3dModifyMatFlag
add r0, r4, #0
mov r1, #0
mov r2, #0x80
- bl FUN_020BC094
+ bl NNSi_G3dModifyMatFlag
mov r2, #2
add r0, r4, #0
mov r1, #0
lsl r2, r2, #8
- bl FUN_020BC094
+ bl NNSi_G3dModifyMatFlag
mov r2, #1
add r0, r4, #0
mov r1, #0
lsl r2, r2, #0xa
- bl FUN_020BC094
+ bl NNSi_G3dModifyMatFlag
add r0, r4, #0
mov r1, #0
mov r2, #0xf
- bl FUN_020BC02C
+ bl NNSi_G3dModifyPolygonAttrMask
add r0, r7, #1
lsl r0, r0, #0x18
lsr r7, r0, #0x18
@@ -3038,7 +3038,7 @@ MOD63_021DA158: ; 0x021DA158
beq _021DA18E
add r1, r4, #0
add r1, #0x14
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
cmp r0, #0
bne _021DA192
ldr r0, [r4, #0x14]
diff --git a/arm9/modules/63/asm/mod63_021DA640.s b/arm9/modules/63/asm/mod63_021DA640.s
index 6095d832..5bcdfbd2 100644
--- a/arm9/modules/63/asm/mod63_021DA640.s
+++ b/arm9/modules/63/asm/mod63_021DA640.s
@@ -108,7 +108,7 @@ MOD63_021DA6E8: ; 0x021DA6E8
orr r0, r1
str r0, [r2]
bl MOD63_021DA640
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r1, #0x80
@@ -876,7 +876,7 @@ MOD63_021DAD18: ; 0x021DAD18
add r6, r2, #0
bl FUN_02020354
mov r1, #1
- bl FUN_020B19C4
+ bl NNS_G2dGetImagePaletteLocation
add r7, r0, #0
cmp r6, #0
bne _021DAD44
diff --git a/arm9/modules/63/asm/mod63_021DAE5C.s b/arm9/modules/63/asm/mod63_021DAE5C.s
index 52b453e2..77623c5c 100644
--- a/arm9/modules/63/asm/mod63_021DAE5C.s
+++ b/arm9/modules/63/asm/mod63_021DAE5C.s
@@ -239,7 +239,7 @@ MOD63_021DAFEC: ; 0x021DAFEC
orr r0, r1
str r0, [r3]
bl MOD63_021DAE5C
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r1, #0x80
diff --git a/arm9/modules/63/src/mod63_021DB450.c b/arm9/modules/63/src/mod63_021DB450.c
index 6f9e7036..84461fe1 100644
--- a/arm9/modules/63/src/mod63_021DB450.c
+++ b/arm9/modules/63/src/mod63_021DB450.c
@@ -5,8 +5,8 @@
#include "mod63_021DB450.h"
//todo resolve to static code
-extern u32 (*UNK_021064B8)(u32 param0, u32 param1, u32 param2);
-extern u32 (*UNK_021064C0)(u32 param0, u32 param1, u32 param2);
+extern u32 (*NNS_GfdDefaultFuncAllocTexVram)(u32 param0, u32 param1, u32 param2);
+extern u32 (*NNS_GfdDefaultFuncAllocPlttVram)(u32 param0, u32 param1, u32 param2);
extern void FUN_0201327C(u32 param0);
extern void FUN_020132BC(u32 param0);
@@ -29,7 +29,7 @@ extern void FUN_020072E8(struct UnkStruct63_021DB450 *);
extern void FUN_020081C4(struct UnkStruct63_021DB450 *);
extern void FUN_020222AC(void);
-extern void FUN_020B02C8(void);
+extern void NNS_G2dSetupSoftwareSpriteCamera(void);
extern u32 FUN_02006ED4(struct UnkStruct63_021DB450 *);
extern void FUN_020222B4(u32, u32);
@@ -50,7 +50,7 @@ const struct UnkStruct63_021DBEF0 MOD63_021DBEF0[3];
THUMB_FUNC u32 MOD63_021DB450(u32 param0, u32 param1)
{
- u32 res0 = (UNK_021064B8)(param0, param1, 0);
+ u32 res0 = (NNS_GfdDefaultFuncAllocTexVram)(param0, param1, 0);
FUN_0201327C(res0);
GF_ASSERT(res0);
return (u32)((u16)res0 * 8);
@@ -58,7 +58,7 @@ THUMB_FUNC u32 MOD63_021DB450(u32 param0, u32 param1)
THUMB_FUNC u32 MOD63_021DB474(u32 param0, u32 param1)
{
- u32 res0 = (UNK_021064C0)(param0, param1, 1);
+ u32 res0 = (NNS_GfdDefaultFuncAllocPlttVram)(param0, param1, 1);
GF_ASSERT(res0);
FUN_020132BC(res0);
return (u32)((u16)res0 * 8);
@@ -114,7 +114,7 @@ THUMB_FUNC void MOD63_021DB5A8(UnkStruct63_021DB450 *param0)
return;
}
FUN_020222AC();
- FUN_020B02C8();
+ NNS_G2dSetupSoftwareSpriteCamera();
(void)FUN_02006ED4(param0->field_00);
MOD63_021DB934();
FUN_020222B4(1, 0);
diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s
index 41a37952..fa1d5be3 100644
--- a/arm9/modules/64/asm/module_64.s
+++ b/arm9/modules/64/asm/module_64.s
@@ -416,7 +416,7 @@ MOD64_021D785C: ; 0x021D785C
push {r4, r5, lr}
sub sp, #0x24
add r4, r0, #0
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r1, #0x80
@@ -456,7 +456,7 @@ MOD64_021D78B4: ; 0x021D78B4
push {r3, r4, lr}
sub sp, #4
add r4, r0, #0
- bl FUN_020BB7F4
+ bl NNS_G3dInit
bl G3X_InitMtxStack
ldr r0, _021D7940 ; =0x04000060
ldr r1, _021D7944 ; =0xFFFFCFFD
@@ -511,11 +511,11 @@ _021D7900:
str r0, [r1, #0x40]
mov r0, #1
add r1, r0, #0
- bl FUN_020AEB70
+ bl NNS_GfdInitFrmTexVramManager
mov r0, #1
lsl r0, r0, #0xe
mov r1, #1
- bl FUN_020AEDF4
+ bl NNS_GfdInitFrmPlttVramManager
add sp, #4
pop {r3, r4, pc}
.align 2, 0
@@ -533,8 +533,8 @@ _021D7960: .word 0xBFFF0000
thumb_func_start MOD64_021D7964
MOD64_021D7964: ; 0x021D7964
push {r3, lr}
- bl FUN_020AEAF4
- bl FUN_020AEC60
+ bl NNS_GfdResetFrmTexVramState
+ bl NNS_GfdResetFrmPlttVramState
pop {r3, pc}
thumb_func_end MOD64_021D7964
@@ -741,13 +741,13 @@ MOD64_021D7B04: ; 0x021D7B04
mov r1, #2
lsl r1, r1, #8
str r0, [r5, r1]
- ldr r3, _021D7BA4 ; =UNK_021064B8
+ ldr r3, _021D7BA4 ; =NNS_GfdDefaultFuncAllocTexVram
lsl r0, r1, #6
mov r1, #0
ldr r3, [r3]
add r2, r1, #0
blx r3
- ldr r3, _021D7BA8 ; =UNK_021064C0
+ ldr r3, _021D7BA8 ; =NNS_GfdDefaultFuncAllocPlttVram
add r4, r0, #0
ldr r3, [r3]
mov r0, #0x80
@@ -808,8 +808,8 @@ _021D7B8E:
blt _021D7B8E
pop {r3, r4, r5, r6, r7, pc}
nop
-_021D7BA4: .word UNK_021064B8
-_021D7BA8: .word UNK_021064C0
+_021D7BA4: .word NNS_GfdDefaultFuncAllocTexVram
+_021D7BA8: .word NNS_GfdDefaultFuncAllocPlttVram
_021D7BAC: .word 0x7FFF0000
_021D7BB0: .word 0xFFFF0000
thumb_func_end MOD64_021D7B04
@@ -1059,7 +1059,7 @@ MOD64_021D7D7C: ; 0x021D7D7C
mov r0, #0x52
bl UncompressFromNarc
str r0, [r4, #0x54]
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
str r0, [r4, #0x58]
ldrh r1, [r0, #0xe]
add r1, r0, r1
@@ -1067,7 +1067,7 @@ MOD64_021D7D7C: ; 0x021D7D7C
add r0, r0, r1
str r0, [r4, #0x5c]
ldr r0, [r4, #0x54]
- bl FUN_020BC0FC
+ bl NNS_G3dGetTex
str r0, [r4, #0x60]
bl FUN_0201B3C4
ldr r0, [r4, #0x54]
@@ -1075,7 +1075,7 @@ MOD64_021D7D7C: ; 0x021D7D7C
bl FUN_0201B3A8
ldr r1, [r4, #0x5c]
add r0, r4, #0
- bl FUN_020B80B4
+ bl NNS_G3dRenderObjInit
add sp, #4
pop {r3, r4, pc}
thumb_func_end MOD64_021D7D7C
@@ -1094,20 +1094,20 @@ MOD64_021D7DC0: ; 0x021D7DC0
bl UncompressFromNarc
str r0, [r4, #0x64]
mov r1, #0
- bl FUN_020BC4C8
+ bl NNS_G3dGetAnmByIdx
str r0, [r4, #0x68]
ldr r1, [r4, #0x68]
ldr r2, [r4, #0x5c]
add r0, r5, #0
- bl FUN_020BB8D0
+ bl NNS_G3dAllocAnmObj
str r0, [r4, #0x6c]
ldr r1, [r4, #0x68]
ldr r2, [r4, #0x5c]
ldr r3, [r4, #0x60]
- bl FUN_020B8110
+ bl NNS_G3dAnmObjInit
ldr r1, [r4, #0x6c]
add r0, r4, #0
- bl FUN_020B7EFC
+ bl NNS_G3dRenderObjAddAnmObj
add sp, #4
pop {r3, r4, r5, r6, pc}
.align 2, 0
@@ -1128,7 +1128,7 @@ _021D7E14:
beq _021D7E28
ldr r1, [r5, #0x6c]
add r0, r4, #0
- bl thunk_FUN_020ae84c
+ bl NNS_G3dFreeAnmObj
ldr r0, [r5, #0x64]
bl FreeToHeap
_021D7E28:
@@ -1442,18 +1442,18 @@ MOD64_021D8058: ; 0x021D8058
ldr r2, _021D809C ; =0xFFFFF000
add r1, r0, #0
add r3, r0, #0
- bl FUN_020B8418
+ bl NNS_G3dGlbLightVector
ldr r1, _021D80A0 ; =0x00007FFF
mov r0, #0
- bl FUN_020B8404
+ bl NNS_G3dGlbLightColor
ldr r0, _021D80A0 ; =0x00007FFF
mov r2, #0
add r1, r0, #0
- bl FUN_020B83E0
+ bl NNS_G3dGlbMaterialColorDiffAmb
ldr r0, _021D80A0 ; =0x00007FFF
mov r2, #0
add r1, r0, #0
- bl FUN_020B83BC
+ bl NNS_G3dGlbMaterialColorSpecEmi
mov r0, #0x26
lsl r0, r0, #4
mov r4, #0
@@ -1634,9 +1634,9 @@ MOD64_021D81D8: ; 0x021D81D8
mov r1, #0
mov r0, #0x11
add r2, r1, #0
- bl FUN_020BB1C0
- bl FUN_020BB394
- bl FUN_020B02C8
+ bl NNS_G3dGeBufferOP_N
+ bl NNS_G3dGeFlushBuffer
+ bl NNS_G2dSetupSoftwareSpriteCamera
mov r0, #2
lsl r0, r0, #8
ldr r0, [r4, r0]
@@ -1648,11 +1648,11 @@ MOD64_021D81D8: ; 0x021D81D8
mov r0, #0x12
add r1, sp, #4
str r2, [sp, #4]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
mov r1, #0
mov r0, #0x11
add r2, r1, #0
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
bl FUN_0201EBA4
add r0, r4, #0
bl MOD64_021D8058
@@ -1660,7 +1660,7 @@ MOD64_021D81D8: ; 0x021D81D8
mov r0, #0x12
add r1, sp, #0
str r2, [sp]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
mov r0, #0
add r1, r0, #0
bl FUN_020222B4
diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s
index b3f219dc..e9e1ed78 100644
--- a/arm9/modules/65/asm/module_65.s
+++ b/arm9/modules/65/asm/module_65.s
@@ -5301,7 +5301,7 @@ MOD65_021D9E98: ; 0x021D9E98
mov r2, #0x1c
add r5, r0, #0
bl MI_CpuFill8
- bl FUN_020BB7F4
+ bl NNS_G3dInit
bl G3X_Init
bl G3X_InitMtxStack
ldr r0, _021D9F34 ; =0x04000060
@@ -5388,8 +5388,8 @@ MOD65_021D9F50: ; 0x021D9F50
mov r0, #2
str r0, [r2]
str r3, [r1]
- bl FUN_020B849C
- bl FUN_020B02C8
+ bl NNS_G3dGlbFlushP
+ bl NNS_G2dSetupSoftwareSpriteCamera
ldr r0, [r4, #4]
bl FUN_02006ED4
ldr r0, _021D9F88 ; =0x04000540
diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s
index 0dda816f..2fc19d08 100644
--- a/arm9/modules/66/asm/module_66.s
+++ b/arm9/modules/66/asm/module_66.s
@@ -138,7 +138,7 @@ MOD66_021D75C8: ; 0x021D75C8
beq _021D75DE
blx r1
_021D75DE:
- bl FUN_020AEEB8
+ bl NNS_GfdDoVramTransfer
add r0, r4, #0
bl MOD66_021D9220
ldr r0, [r4, #0x28]
diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s
index ca1a771a..b62037b8 100644
--- a/arm9/modules/69/asm/module_69.s
+++ b/arm9/modules/69/asm/module_69.s
@@ -686,7 +686,7 @@ MOD69_0222DB2C: ; 0x0222DB2C
mov r1, #0
mov r0, #0x11
add r2, r1, #0
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
ldr r0, _0222DB98 ; =0x00001B38
ldr r0, [r4, r0]
bl MOD69_0222F11C
@@ -694,11 +694,11 @@ MOD69_0222DB2C: ; 0x0222DB2C
mov r0, #0x12
add r1, sp, #4
str r2, [sp, #4]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
mov r1, #0
mov r0, #0x11
add r2, r1, #0
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
ldr r0, _0222DB9C ; =0x00001B3C
ldr r0, [r4, r0]
bl MOD69_0222F63C
@@ -706,7 +706,7 @@ MOD69_0222DB2C: ; 0x0222DB2C
mov r0, #0x12
add r1, sp, #0
str r2, [sp]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
ldr r0, _0222DBA0 ; =0x04000540
mov r1, #1
str r1, [r0]
@@ -921,7 +921,7 @@ MOD69_0222DD54: ; 0x0222DD54
push {r3, r4, lr}
sub sp, #4
add r4, r0, #0
- bl FUN_020BB7F4
+ bl NNS_G3dInit
bl G3X_InitMtxStack
ldr r0, _0222DDE4 ; =0x04000060
ldr r2, _0222DDE8 ; =0xFFFFCFFD
@@ -957,11 +957,11 @@ MOD69_0222DD54: ; 0x0222DD54
str r0, [r1, #0x40]
mov r0, #1
add r1, r0, #0
- bl FUN_020AEB70
+ bl NNS_GfdInitFrmTexVramManager
mov r0, #1
lsl r0, r0, #0xe
mov r1, #1
- bl FUN_020AEDF4
+ bl NNS_GfdInitFrmPlttVramManager
mov r0, #1
add r1, r0, #0
bl GX_EngineAToggleLayers
@@ -1071,7 +1071,7 @@ MOD69_0222DE98: ; 0x0222DE98
push {r3, r4, lr}
sub sp, #0x1c
add r4, r0, #0
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r1, #0x80
@@ -1193,19 +1193,19 @@ _0222DF72:
str r0, [sp, #0x34]
_0222DF98:
add r0, sp, #0x5c
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
add r0, sp, #0x48
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
ldr r0, [sp, #0x44]
add r1, r7, #0
mov r2, #1
add r3, sp, #0x5c
- bl FUN_020B1768
+ bl NNS_G2dLoadImage1DMapping
ldr r0, [sp, #0x40]
add r1, r6, #0
mov r2, #1
add r3, sp, #0x48
- bl FUN_020B1240
+ bl NNS_G2dLoadPalette
ldr r0, [sp, #0x20]
add r0, r0, #1
str r0, [sp, #0x94]
@@ -1333,20 +1333,20 @@ _0222DF98:
b _0222DF98
_0222E0D4:
add r0, sp, #0x5c
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
add r0, sp, #0x48
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
mov r1, #0x96
ldr r0, [sp, #0x44]
lsl r1, r1, #8
mov r2, #1
add r3, sp, #0x5c
- bl FUN_020B1768
+ bl NNS_G2dLoadImage1DMapping
ldr r0, [sp, #0x40]
mov r1, #0xc0
mov r2, #1
add r3, sp, #0x48
- bl FUN_020B1240
+ bl NNS_G2dLoadPalette
ldr r0, [sp, #0x14]
ldr r0, [r0, #0xc]
ldr r0, [r0]
@@ -2169,7 +2169,7 @@ _0222E77E:
str r0, [r3]
add r0, r4, #0
add r0, #0x48
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
mov r3, #0x19
add r0, r4, #0
lsl r3, r3, #8
@@ -2179,7 +2179,7 @@ _0222E77E:
add r0, #0x48
mov r1, #1
add r2, r2, r3
- bl FUN_020B1A1C
+ bl NNS_G2dSetImageLocation
ldr r0, _0222E7BC ; =MOD69_0222E7C0
add r1, r4, #0
mov r2, #0
diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s
index eb5ef973..f6d3dc58 100644
--- a/arm9/modules/70/asm/module_70.s
+++ b/arm9/modules/70/asm/module_70.s
@@ -407,7 +407,7 @@ MOD70_021D77CC: ; 0x021D77CC
mov r0, #0x3d
bl FUN_02016B94
str r0, [r4, #0x10]
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r1, #0x80
@@ -1462,19 +1462,19 @@ MOD70_021D7FF8: ; 0x021D7FF8
add r7, r4, #0
_021D8050:
add r0, sp, #0x2c
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
add r0, sp, #0x18
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
ldr r0, [sp, #0x14]
add r1, r4, #0
mov r2, #1
add r3, sp, #0x2c
- bl FUN_020B1768
+ bl NNS_G2dLoadImage1DMapping
ldr r0, [sp, #0x10]
add r1, r7, #0
mov r2, #1
add r3, sp, #0x18
- bl FUN_020B1240
+ bl NNS_G2dLoadPalette
ldr r0, [r6]
lsl r0, r0, #0xc
str r0, [sp, #0x58]
diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s
index d5c1ec6f..b9d99cf4 100644
--- a/arm9/modules/71/asm/module_71.s
+++ b/arm9/modules/71/asm/module_71.s
@@ -2224,7 +2224,7 @@ MOD71_0222E884: ; 0x0222E884
add r6, r0, #0
beq _0222E8D6
add r1, sp, #4
- bl FUN_020B0180
+ bl NNS_G2dGetUnpackedScreenData
cmp r0, #0
beq _0222E8D0
ldr r0, [sp, #0x1c]
@@ -2449,7 +2449,7 @@ MOD71_0222EA68: ; 0x0222EA68
push {r4, r5, r6, r7, lr}
sub sp, #0x14
add r5, r0, #0
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r1, #0x7f
diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s
index bfb0199d..f00d35cf 100644
--- a/arm9/modules/73/asm/module_73.s
+++ b/arm9/modules/73/asm/module_73.s
@@ -2366,9 +2366,9 @@ MOD73_021D8858: ; 0x021D8858
mov r1, #0
mov r0, #0x11
add r2, r1, #0
- bl FUN_020BB1C0
- bl FUN_020BB394
- bl FUN_020B02C8
+ bl NNS_G3dGeBufferOP_N
+ bl NNS_G3dGeFlushBuffer
+ bl NNS_G2dSetupSoftwareSpriteCamera
mov r0, #0xaf
lsl r0, r0, #2
ldr r0, [r4, r0]
@@ -2380,7 +2380,7 @@ _021D8882:
mov r0, #0x12
add r1, sp, #0
str r2, [sp]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
mov r0, #0
add r1, r0, #0
bl FUN_020222B4
@@ -2595,7 +2595,7 @@ MOD73_021D8A18: ; 0x021D8A18
push {r4, r5, lr}
sub sp, #0x24
add r4, r0, #0
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r1, #0x80
@@ -2754,7 +2754,7 @@ _021D8B3A:
MOD73_021D8B4C: ; 0x021D8B4C
push {r3, r4, lr}
sub sp, #4
- bl FUN_020BB7F4
+ bl NNS_G3dInit
bl G3X_InitMtxStack
ldr r0, _021D8BB8 ; =0x04000060
ldr r2, _021D8BBC ; =0xFFFFCFFD
@@ -2793,11 +2793,11 @@ MOD73_021D8B4C: ; 0x021D8B4C
str r0, [r2]
str r1, [r2, #0x40]
mov r1, #1
- bl FUN_020AEB70
+ bl NNS_GfdInitFrmTexVramManager
mov r0, #2
lsl r0, r0, #0xe
mov r1, #1
- bl FUN_020AEDF4
+ bl NNS_GfdInitFrmPlttVramManager
add sp, #4
pop {r3, r4, pc}
nop
@@ -2812,8 +2812,8 @@ _021D8BCC: .word 0xBFFF0000
thumb_func_start MOD73_021D8BD0
MOD73_021D8BD0: ; 0x021D8BD0
push {r3, lr}
- bl FUN_020AEAF4
- bl FUN_020AEC60
+ bl NNS_GfdResetFrmTexVramState
+ bl NNS_GfdResetFrmPlttVramState
pop {r3, pc}
thumb_func_end MOD73_021D8BD0
diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s
index 0189a34d..651527c1 100644
--- a/arm9/modules/74/asm/module_74.s
+++ b/arm9/modules/74/asm/module_74.s
@@ -341,7 +341,7 @@ MOD74_021D7784: ; 0x021D7784
push {r4, lr}
add r4, r0, #0
bl MOD74_021D82E8
- bl FUN_020AEEB8
+ bl NNS_GfdDoVramTransfer
ldr r0, [r4, #0x10]
bl FUN_0201AB60
ldr r3, _021D77A4 ; =0x027E0000
diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s
index 82294cbf..f84a1de7 100644
--- a/arm9/modules/75/asm/module_75.s
+++ b/arm9/modules/75/asm/module_75.s
@@ -7834,7 +7834,7 @@ MOD75_021EA950: ; 0x021EA950
bl NARC_AllocAndReadWholeMember
add r1, r5, #0
add r4, r0, #0
- bl FUN_020B0030
+ bl NNS_G2dGetUnpackedBGCharacterData
add r0, r4, #0
pop {r3, r4, r5, pc}
thumb_func_end MOD75_021EA950
@@ -8587,7 +8587,7 @@ MOD75_021EAF54: ; 0x021EAF54
bl NARC_AllocAndReadWholeMember
add r1, r5, #0
add r4, r0, #0
- bl FUN_020B0030
+ bl NNS_G2dGetUnpackedBGCharacterData
add r0, r4, #0
pop {r3, r4, r5, pc}
thumb_func_end MOD75_021EAF54
diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s
index cafcb158..bdbf644f 100644
--- a/arm9/modules/77/asm/module_77.s
+++ b/arm9/modules/77/asm/module_77.s
@@ -2554,7 +2554,7 @@ MOD77_021D89F4: ; 0x021D89F4
asr r1, r1, #0x10
asr r2, r2, #0x10
asr r3, r3, #0x10
- bl FUN_020B8418
+ bl NNS_G3dGlbLightVector
pop {r4, pc}
nop
_021D8A28: .word 0x0000C2DC
diff --git a/arm9/modules/78/asm/module_78.s b/arm9/modules/78/asm/module_78.s
index 5d9f4625..7fc7439a 100644
--- a/arm9/modules/78/asm/module_78.s
+++ b/arm9/modules/78/asm/module_78.s
@@ -66,13 +66,13 @@ _021D7558:
ldrsh r2, [r3, r7]
ldrsh r3, [r3, r6]
add r0, r4, #0
- bl FUN_020B8418
+ bl NNS_G3dGlbLightVector
ldr r2, [r5, #4]
lsl r1, r4, #1
add r1, r2, r1
ldrh r1, [r1, #0x18]
add r0, r4, #0
- bl FUN_020B8404
+ bl NNS_G3dGlbLightColor
add r0, r4, #1
lsl r0, r0, #0x18
lsr r4, r0, #0x18
@@ -82,12 +82,12 @@ _021D7558:
ldrh r0, [r2, #0x20]
ldrh r1, [r2, #0x22]
ldr r2, [r2, #0x28]
- bl FUN_020B83E0
+ bl NNS_G3dGlbMaterialColorDiffAmb
ldr r2, [r5, #4]
ldrh r0, [r2, #0x24]
ldrh r1, [r2, #0x26]
ldr r2, [r2, #0x2c]
- bl FUN_020B83BC
+ bl NNS_G3dGlbMaterialColorSpecEmi
ldr r3, [r5, #4]
ldr r0, [r3, #0x40]
str r0, [sp]
@@ -97,7 +97,7 @@ _021D7558:
ldr r1, [r3, #0x34]
ldr r2, [r3, #0x38]
ldr r3, [r3, #0x3c]
- bl FUN_020B8390
+ bl NNS_G3dGlbPolygonAttr
mov r0, #0
mov r1, #0x48
bl FUN_02079A70
@@ -243,7 +243,7 @@ _021D76C8:
add r1, #0x80
ldr r1, [r1]
add r0, r7, #0
- bl thunk_FUN_020ae84c
+ bl NNS_G3dFreeAnmObj
ldr r0, [r5, #0x60]
bl FreeToHeap
add r0, r4, #1
@@ -358,26 +358,26 @@ MOD78_021D778C: ; 0x021D778C
add r2, #0x5c
bl FUN_0201B234
ldr r0, [r5, #0x5c]
- bl FUN_020BC0FC
+ bl NNS_G3dGetTex
str r0, [sp, #4]
ldr r0, [r5, #0x58]
mov r1, #0
mov r2, #0x40
- bl FUN_020BC094
+ bl NNSi_G3dModifyMatFlag
ldr r0, [r5, #0x58]
mov r1, #0
mov r2, #0x80
- bl FUN_020BC094
+ bl NNSi_G3dModifyMatFlag
mov r2, #2
ldr r0, [r5, #0x58]
mov r1, #0
lsl r2, r2, #8
- bl FUN_020BC094
+ bl NNSi_G3dModifyMatFlag
mov r2, #1
ldr r0, [r5, #0x58]
mov r1, #0
lsl r2, r2, #0xa
- bl FUN_020BC094
+ bl NNSi_G3dModifyMatFlag
add r0, r5, #0
str r0, [sp, #8]
add r0, #0x70
@@ -402,12 +402,12 @@ _021D780E:
bl NARC_AllocAndReadWholeMember
str r0, [r4, #0x60]
mov r1, #0
- bl FUN_020BC4C8
+ bl NNS_G3dGetAnmByIdx
add r7, r0, #0
ldr r0, [sp, #8]
ldr r2, [r5, #0x58]
add r1, r7, #0
- bl FUN_020BB8D0
+ bl NNS_G3dAllocAnmObj
add r1, r4, #0
add r1, #0x80
str r0, [r1]
@@ -417,11 +417,11 @@ _021D780E:
ldr r2, [r5, #0x58]
ldr r3, [sp, #4]
add r1, r7, #0
- bl FUN_020B8110
+ bl NNS_G3dAnmObjInit
add r4, #0x80
ldr r1, [r4]
add r0, r5, #4
- bl FUN_020B7EFC
+ bl NNS_G3dRenderObjAddAnmObj
add r0, r6, #1
lsl r0, r0, #0x18
lsr r6, r0, #0x18
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index ea6a3c13..9abe50f0 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -1473,7 +1473,7 @@ _0222DFE4:
mov r1, #2
lsl r1, r1, #0x10
mov r2, #0
- bl tempName_NNS_FndCreateExpHeapEx
+ bl NNS_FndCreateExpHeapEx
str r0, [r4, #0x4c]
mov r0, #1
str r0, [r5]
@@ -1830,7 +1830,7 @@ MOD80_0222E3CC: ; 0x0222E3CC
push {r4, r5, r6, r7, lr}
sub sp, #0x1c
add r5, r0, #0
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r1, #0x7e
@@ -2269,7 +2269,7 @@ MOD80_0222E750: ; 0x0222E750
add r1, r5, #0
ldr r0, [r0]
add r2, r4, #0
- bl tempName_NNS_FndAllocFromExpHeapEx
+ bl NNS_FndAllocFromExpHeapEx
add r4, r0, #0
add r0, r6, #0
bl OS_RestoreInterrupts
@@ -2289,7 +2289,7 @@ MOD80_0222E778: ; 0x0222E778
ldr r0, _0222E798 ; =0x02237E24
add r1, r5, #0
ldr r0, [r0]
- bl FUN_020ADDF0
+ bl NNS_FndFreeToExpHeap
add r0, r4, #0
bl OS_RestoreInterrupts
_0222E794:
@@ -10717,7 +10717,7 @@ MOD80_02232BAC: ; 0x02232BAC
add r4, r0, #0
beq _02232BCE
add r1, r5, #0
- bl FUN_020B0030
+ bl NNS_G2dGetUnpackedBGCharacterData
cmp r0, #0
bne _02232BCE
add r0, r4, #0
diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s
index 8ea0a1a6..5074a352 100644
--- a/arm9/modules/81/asm/module_81.s
+++ b/arm9/modules/81/asm/module_81.s
@@ -106,7 +106,7 @@ _02237F0A:
lsl r1, r1, #2
str r0, [r4, r1]
_02237F22:
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #1
str r0, [sp]
mov r0, #0x7f
@@ -1479,7 +1479,7 @@ MOD81_02238940: ; 0x02238940
add r5, r0, #0
mov r0, #0x11
add r2, r1, #0
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
bl FUN_0201EBA4
ldr r0, [r5, #0x1c]
mov r6, #0
@@ -1504,7 +1504,7 @@ _02238976:
mov r0, #0x12
add r1, sp, #0
str r2, [sp]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
add sp, #4
pop {r3, r4, r5, r6, pc}
.align 2, 0
@@ -1579,7 +1579,7 @@ MOD81_02238988: ; 0x02238988
add r2, r0, #0
add r3, r0, #0
str r0, [sp, #4]
- bl FUN_020B8390
+ bl NNS_G3dGlbPolygonAttr
_02238A20:
add r1, r4, #0
add r0, r4, #4
@@ -1668,7 +1668,7 @@ MOD81_02238A84: ; 0x02238A84
ldr r0, [r4, r6]
cmp r0, #0
beq _02238B02
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
str r0, [r5, #0x58]
ldrh r1, [r0, #0xe]
add r1, r0, r1
@@ -1676,7 +1676,7 @@ MOD81_02238A84: ; 0x02238A84
add r0, r0, r1
str r0, [r5, #0x5c]
ldr r0, [r5]
- bl FUN_020BC0FC
+ bl NNS_G3dGetTex
str r0, [r5, #0x60]
bl FUN_0201B3C4
ldr r0, [r5]
@@ -1684,7 +1684,7 @@ MOD81_02238A84: ; 0x02238A84
bl FUN_0201B3A8
ldr r1, [r5, #0x5c]
add r0, r5, #4
- bl FUN_020B80B4
+ bl NNS_G3dRenderObjInit
ldr r0, [sp, #0x20]
mov r1, #0x1f
str r0, [r5, #0x68]
@@ -1777,13 +1777,13 @@ MOD81_02238B5C: ; 0x02238B5C
mov r2, #0x1f
mov r1, #0
lsl r2, r2, #0x10
- bl FUN_020BC02C
+ bl NNSi_G3dModifyPolygonAttrMask
pop {r3, pc}
_02238B76:
mov r2, #0x1f
mov r1, #1
lsl r2, r2, #0x10
- bl FUN_020BC02C
+ bl NNSi_G3dModifyPolygonAttrMask
pop {r3, pc}
.align 2, 0
thumb_func_end MOD81_02238B5C
@@ -1857,7 +1857,7 @@ MOD81_02238B8C: ; 0x02238B8C
mov r1, #0
mov r0, #0x11
add r2, r1, #0
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
bl FUN_0201EBA4
add r1, r4, #0
ldr r0, [r4, #0x5c]
@@ -1871,7 +1871,7 @@ MOD81_02238B8C: ; 0x02238B8C
mov r0, #0x12
add r1, sp, #0
str r2, [sp]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
add r0, r4, #0
add sp, #0x4c
pop {r3, r4, pc}
@@ -2123,9 +2123,9 @@ MOD81_02238DFC: ; 0x02238DFC
mov r1, #0
mov r0, #0x11
add r2, r1, #0
- bl FUN_020BB1C0
- bl FUN_020BB394
- bl FUN_020B02C8
+ bl NNS_G3dGeBufferOP_N
+ bl NNS_G3dGeFlushBuffer
+ bl NNS_G2dSetupSoftwareSpriteCamera
ldr r0, [r4, #0xc]
bl FUN_020081C4
ldr r0, [r4, #0xc]
@@ -2134,7 +2134,7 @@ MOD81_02238DFC: ; 0x02238DFC
str r2, [sp]
mov r0, #0x12
add r1, sp, #0
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
ldr r0, [r4, #0x5c]
bl MOD81_02238940
mov r0, #0
@@ -2694,7 +2694,7 @@ MOD81_022392D8: ; 0x022392D8
push {r3, r4, r5, r6, lr}
sub sp, #4
add r5, r0, #0
- bl FUN_020BB7F4
+ bl NNS_G3dInit
bl G3X_InitMtxStack
ldr r0, _02239380 ; =0x04000060
ldr r2, _02239384 ; =0xFFFFCFFD
@@ -2730,19 +2730,19 @@ MOD81_022392D8: ; 0x022392D8
str r0, [r1, #0x40]
mov r0, #1
add r1, r0, #0
- bl FUN_020AEB70
+ bl NNS_GfdInitFrmTexVramManager
mov r0, #1
lsl r0, r0, #0xe
mov r1, #1
- bl FUN_020AEDF4
- ldr r3, _02239394 ; =UNK_021064B8
+ bl NNS_GfdInitFrmPlttVramManager
+ ldr r3, _02239394 ; =NNS_GfdDefaultFuncAllocTexVram
mov r0, #1
mov r1, #0
ldr r3, [r3]
lsl r0, r0, #0xe
add r2, r1, #0
blx r3
- ldr r3, _02239398 ; =UNK_021064C0
+ ldr r3, _02239398 ; =NNS_GfdDefaultFuncAllocPlttVram
add r4, r0, #0
ldr r3, [r3]
mov r0, #0x80
@@ -2774,8 +2774,8 @@ _02239384: .word 0xFFFFCFFD
_02239388: .word 0x0000CFFB
_0223938C: .word 0x04000540
_02239390: .word 0xBFFF0000
-_02239394: .word UNK_021064B8
-_02239398: .word UNK_021064C0
+_02239394: .word NNS_GfdDefaultFuncAllocTexVram
+_02239398: .word NNS_GfdDefaultFuncAllocPlttVram
_0223939C: .word 0x7FFF0000
_022393A0: .word 0xFFFF0000
thumb_func_end MOD81_022392D8
@@ -2829,9 +2829,9 @@ MOD81_022393F4: ; 0x022393F4
mov r3, #8
bl MOD81_0223874C
add r0, sp, #0x5c
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
add r0, sp, #0x38
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
mov r3, #0
str r3, [sp]
mov r2, #1
@@ -3962,7 +3962,7 @@ MOD81_02239CDC: ; 0x02239CDC
push {r4, lr}
sub sp, #0x10
add r4, r0, #0
- bl FUN_020BB7F4
+ bl NNS_G3dInit
bl G3X_InitMtxStack
ldr r0, _02239DBC ; =0x04000060
ldr r1, _02239DC0 ; =0xFFFFCFFD
@@ -4006,11 +4006,11 @@ MOD81_02239CDC: ; 0x02239CDC
str r0, [r1, #0x40]
mov r0, #1
add r1, r0, #0
- bl FUN_020AEB70
+ bl NNS_GfdInitFrmTexVramManager
mov r0, #1
lsl r0, r0, #0xe
mov r1, #1
- bl FUN_020AEDF4
+ bl NNS_GfdInitFrmPlttVramManager
mov r0, #1
add r1, r0, #0
bl GX_EngineAToggleLayers
@@ -4099,9 +4099,9 @@ MOD81_02239E00: ; 0x02239E00
mov r3, #0xc
bl MOD81_0223874C
add r0, sp, #0x60
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
add r0, sp, #0x3c
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
mov r3, #0
str r3, [sp]
mov r2, #1
@@ -5879,7 +5879,7 @@ MOD81_0223ABD8: ; 0x0223ABD8
push {r3, r4, lr}
sub sp, #0x24
add r4, r0, #0
- bl FUN_020BB7F4
+ bl NNS_G3dInit
bl G3X_InitMtxStack
ldr r0, _0223ACAC ; =0x04000060
ldr r1, _0223ACB0 ; =0xFFFFCFFD
@@ -5923,11 +5923,11 @@ MOD81_0223ABD8: ; 0x0223ABD8
str r0, [r1, #0x40]
mov r0, #1
add r1, r0, #0
- bl FUN_020AEB70
+ bl NNS_GfdInitFrmTexVramManager
mov r0, #1
lsl r0, r0, #0xe
mov r1, #1
- bl FUN_020AEDF4
+ bl NNS_GfdInitFrmPlttVramManager
mov r0, #1
add r1, r0, #0
bl GX_EngineAToggleLayers
@@ -6006,9 +6006,9 @@ MOD81_0223ACE8: ; 0x0223ACE8
mov r3, #8
bl MOD81_0223874C
add r0, sp, #0x5c
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
add r0, sp, #0x38
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
mov r3, #0
str r3, [sp]
mov r2, #1
@@ -7391,7 +7391,7 @@ MOD81_0223B7E8: ; 0x0223B7E8
push {r3, r4, lr}
sub sp, #0x24
add r4, r0, #0
- bl FUN_020BB7F4
+ bl NNS_G3dInit
bl G3X_InitMtxStack
ldr r0, _0223B8C8 ; =0x04000060
ldr r1, _0223B8CC ; =0xFFFFCFFD
@@ -7435,11 +7435,11 @@ MOD81_0223B7E8: ; 0x0223B7E8
str r0, [r1, #0x40]
mov r0, #1
add r1, r0, #0
- bl FUN_020AEB70
+ bl NNS_GfdInitFrmTexVramManager
mov r0, #1
lsl r0, r0, #0xe
mov r1, #1
- bl FUN_020AEDF4
+ bl NNS_GfdInitFrmPlttVramManager
mov r0, #1
add r1, r0, #0
bl GX_EngineAToggleLayers
@@ -7525,9 +7525,9 @@ MOD81_0223B908: ; 0x0223B908
mov r3, #8
bl MOD81_0223874C
add r0, sp, #0x5c
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
add r0, sp, #0x38
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
mov r3, #0
str r3, [sp]
mov r2, #1
@@ -8643,7 +8643,7 @@ MOD81_0223C1DC: ; 0x0223C1DC
push {r4, lr}
sub sp, #0x10
add r4, r0, #0
- bl FUN_020BB7F4
+ bl NNS_G3dInit
bl G3X_InitMtxStack
ldr r0, _0223C2C0 ; =0x04000060
ldr r1, _0223C2C4 ; =0xFFFFCFFD
@@ -8687,11 +8687,11 @@ MOD81_0223C1DC: ; 0x0223C1DC
str r0, [r1, #0x40]
mov r0, #1
add r1, r0, #0
- bl FUN_020AEB70
+ bl NNS_GfdInitFrmTexVramManager
mov r0, #1
lsl r0, r0, #0xe
mov r1, #1
- bl FUN_020AEDF4
+ bl NNS_GfdInitFrmPlttVramManager
mov r0, #1
add r1, r0, #0
bl GX_EngineAToggleLayers
@@ -9177,9 +9177,9 @@ MOD81_0223C60C: ; 0x0223C60C
mov r1, #0
mov r0, #0x11
add r2, r1, #0
- bl FUN_020BB1C0
- bl FUN_020BB394
- bl FUN_020B02C8
+ bl NNS_G3dGeBufferOP_N
+ bl NNS_G3dGeFlushBuffer
+ bl NNS_G2dSetupSoftwareSpriteCamera
ldr r0, [r4, #0x10]
bl FUN_020081C4
ldr r0, [r4, #0x10]
@@ -9188,7 +9188,7 @@ MOD81_0223C60C: ; 0x0223C60C
str r2, [sp]
mov r0, #0x12
add r1, sp, #0
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
ldr r0, [r4, #0x60]
cmp r0, #0
beq _0223C64A
@@ -9746,7 +9746,7 @@ MOD81_0223CAC4: ; 0x0223CAC4
push {r3, r4, r5, r6, lr}
sub sp, #4
add r5, r0, #0
- bl FUN_020BB7F4
+ bl NNS_G3dInit
bl G3X_InitMtxStack
ldr r0, _0223CB6C ; =0x04000060
ldr r2, _0223CB70 ; =0xFFFFCFFD
@@ -9782,19 +9782,19 @@ MOD81_0223CAC4: ; 0x0223CAC4
str r0, [r1, #0x40]
mov r0, #1
add r1, r0, #0
- bl FUN_020AEB70
+ bl NNS_GfdInitFrmTexVramManager
mov r0, #1
lsl r0, r0, #0xe
mov r1, #1
- bl FUN_020AEDF4
- ldr r3, _0223CB80 ; =UNK_021064B8
+ bl NNS_GfdInitFrmPlttVramManager
+ ldr r3, _0223CB80 ; =NNS_GfdDefaultFuncAllocTexVram
mov r0, #1
mov r1, #0
ldr r3, [r3]
lsl r0, r0, #0xe
add r2, r1, #0
blx r3
- ldr r3, _0223CB84 ; =UNK_021064C0
+ ldr r3, _0223CB84 ; =NNS_GfdDefaultFuncAllocPlttVram
add r4, r0, #0
ldr r3, [r3]
mov r0, #0x80
@@ -9826,8 +9826,8 @@ _0223CB70: .word 0xFFFFCFFD
_0223CB74: .word 0x0000CFFB
_0223CB78: .word 0x04000540
_0223CB7C: .word 0xBFFF0000
-_0223CB80: .word UNK_021064B8
-_0223CB84: .word UNK_021064C0
+_0223CB80: .word NNS_GfdDefaultFuncAllocTexVram
+_0223CB84: .word NNS_GfdDefaultFuncAllocPlttVram
_0223CB88: .word 0x7FFF0000
_0223CB8C: .word 0xFFFF0000
thumb_func_end MOD81_0223CAC4
@@ -9881,9 +9881,9 @@ MOD81_0223CBE0: ; 0x0223CBE0
mov r3, #8
bl MOD81_0223874C
add r0, sp, #0x5c
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
add r0, sp, #0x38
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
mov r3, #0
str r3, [sp]
mov r2, #1
diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s
index 6af5c444..7b00d33a 100644
--- a/arm9/modules/82/asm/module_82.s
+++ b/arm9/modules/82/asm/module_82.s
@@ -715,7 +715,7 @@ _0222DA48:
mov r1, #2
lsl r1, r1, #0x10
mov r2, #0
- bl tempName_NNS_FndCreateExpHeapEx
+ bl NNS_FndCreateExpHeapEx
str r0, [r4, #0x28]
mov r0, #1
str r0, [r5]
@@ -984,7 +984,7 @@ MOD82_0222DD54: ; 0x0222DD54
push {r4, r5, r6, r7, lr}
sub sp, #0x14
add r6, r0, #0
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r1, #0x7e
@@ -1256,7 +1256,7 @@ MOD82_0222DF74: ; 0x0222DF74
add r1, r5, #0
ldr r0, [r0, #4]
add r2, r4, #0
- bl tempName_NNS_FndAllocFromExpHeapEx
+ bl NNS_FndAllocFromExpHeapEx
add r4, r0, #0
add r0, r6, #0
bl OS_RestoreInterrupts
@@ -1276,7 +1276,7 @@ MOD82_0222DF9C: ; 0x0222DF9C
ldr r0, _0222DFBC ; =0x0222FC0C
add r1, r5, #0
ldr r0, [r0, #4]
- bl FUN_020ADDF0
+ bl NNS_FndFreeToExpHeap
add r0, r4, #0
bl OS_RestoreInterrupts
_0222DFB8:
diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s
index 233b529a..f067a6f1 100644
--- a/arm9/modules/83/asm/module_83.s
+++ b/arm9/modules/83/asm/module_83.s
@@ -9385,7 +9385,7 @@ MOD83_022320D8: ; 0x022320D8
bl UncompressFromNarc
add r1, sp, #4
add r7, r0, #0
- bl FUN_020B0180
+ bl NNS_G2dGetUnpackedScreenData
ldr r0, _02232114 ; =0x0000299C
ldr r2, [sp, #4]
lsl r1, r4, #0x18
@@ -15684,7 +15684,7 @@ MOD83_022350EC: ; 0x022350EC
push {r4, r5, r6, r7, lr}
sub sp, #0x14
add r6, r0, #0
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r1, #0x7e
@@ -15971,7 +15971,7 @@ MOD83_022352FC: ; 0x022352FC
bl ReadWholeNarcMemberByIdPair
add r0, r4, #0
add r1, r7, #0
- bl FUN_020B0030
+ bl NNS_G2dGetUnpackedBGCharacterData
cmp r0, #0
bne _02235330
add r0, r4, #0
@@ -15994,7 +15994,7 @@ MOD83_02235334: ; 0x02235334
bl NARC_ReadWholeMember
add r0, r4, #0
add r1, r5, #0
- bl FUN_020B0030
+ bl NNS_G2dGetUnpackedBGCharacterData
pop {r4, r5, r6, pc}
.align 2, 0
thumb_func_end MOD83_02235334
@@ -23333,7 +23333,7 @@ MOD83_02238B4C: ; 0x02238B4C
push {r4, r5, r6, r7, lr}
sub sp, #0x14
ldr r6, _02238BB4 ; =MOD83_0223BC30
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r1, #0x7e
@@ -24223,7 +24223,7 @@ MOD83_022391EC: ; 0x022391EC
bl UncompressFromNarc
add r1, sp, #0x14
str r0, [sp, #0x10]
- bl FUN_020B0180
+ bl NNS_G2dGetUnpackedScreenData
ldr r2, [sp, #0x14]
mov r3, #6
add r0, r5, #0
diff --git a/arm9/modules/84/asm/module_84_thumb1.s b/arm9/modules/84/asm/module_84_thumb1.s
index ae3f7c4a..2f29a2a9 100644
--- a/arm9/modules/84/asm/module_84_thumb1.s
+++ b/arm9/modules/84/asm/module_84_thumb1.s
@@ -55,7 +55,7 @@ _021D7516:
str r0, [r4, #0x18]
mov r0, #0
str r0, [r4, #0x1c]
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r1, #0x80
@@ -727,7 +727,7 @@ MOD84_021D7AB8: ; 0x021D7AB8
thumb_func_start MOD84_021D7AC8
MOD84_021D7AC8: ; 0x021D7AC8
push {r3, lr}
- bl FUN_020BB7F4
+ bl NNS_G3dInit
bl G3X_InitMtxStack
ldr r0, _021D7B3C ; =0x04000060
ldr r2, _021D7B40 ; =0xFFFFCFFD
@@ -761,11 +761,11 @@ MOD84_021D7AC8: ; 0x021D7AC8
str r0, [r1, #0x40]
mov r0, #1
add r1, r0, #0
- bl FUN_020AEB70
+ bl NNS_GfdInitFrmTexVramManager
mov r0, #1
lsl r0, r0, #0xe
mov r1, #1
- bl FUN_020AEDF4
+ bl NNS_GfdInitFrmPlttVramManager
mov r0, #1
add r1, r0, #0
bl GX_EngineAToggleLayers
@@ -899,7 +899,7 @@ MOD84_021D7BC8: ; 0x021D7BC8
add r0, #0x98
strh r1, [r0]
ldr r0, [r4]
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
str r0, [r4, #0x5c]
ldrh r1, [r0, #0xe]
add r1, r0, r1
@@ -907,7 +907,7 @@ MOD84_021D7BC8: ; 0x021D7BC8
add r0, r0, r1
str r0, [r4, #0x60]
ldr r0, [r4]
- bl FUN_020BC0FC
+ bl NNS_G3dGetTex
str r0, [r4, #0x64]
bl FUN_0201B3C4
ldr r0, [r4]
@@ -916,7 +916,7 @@ MOD84_021D7BC8: ; 0x021D7BC8
add r0, r4, #0
ldr r1, [r4, #0x60]
add r0, #8
- bl FUN_020B80B4
+ bl NNS_G3dRenderObjInit
mov r2, #0
str r2, [sp]
add r0, sp, #8
@@ -937,22 +937,22 @@ MOD84_021D7BC8: ; 0x021D7BC8
bl FUN_02016B20
ldr r0, [r4, #4]
mov r1, #0
- bl FUN_020BC4C8
+ bl NNS_G3dGetAnmByIdx
add r5, r0, #0
add r0, r4, #0
ldr r2, [r4, #0x60]
add r0, #0x6c
add r1, r5, #0
- bl FUN_020BB8D0
+ bl NNS_G3dAllocAnmObj
str r0, [r4, #0x68]
ldr r2, [r4, #0x60]
ldr r3, [r4, #0x64]
add r1, r5, #0
- bl FUN_020B8110
+ bl NNS_G3dAnmObjInit
add r0, r4, #0
ldr r1, [r4, #0x68]
add r0, #8
- bl FUN_020B7EFC
+ bl NNS_G3dRenderObjAddAnmObj
add r0, r4, #0
mov r1, #0
add r0, #0x9c
@@ -981,7 +981,7 @@ MOD84_021D7CD4: ; 0x021D7CD4
add r0, r4, #0
ldr r1, [r4, #0x68]
add r0, #0x6c
- bl thunk_FUN_020ae84c
+ bl NNS_G3dFreeAnmObj
ldr r0, [r4, #4]
bl FreeToHeap
_021D7CF0:
@@ -1002,7 +1002,7 @@ MOD84_021D7CFC: ; 0x021D7CFC
mov r1, #0
mov r0, #0x11
add r2, r1, #0
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
bl FUN_0201EBA4
add r4, #0x38
add r0, sp, #0x28
@@ -1098,7 +1098,7 @@ _021D7DBA:
mov r0, #0x12
add r1, sp, #0
str r2, [sp]
- bl FUN_020BB1C0
+ bl NNS_G3dGeBufferOP_N
mov r0, #0
mov r1, #1
bl FUN_020222B4
@@ -1168,7 +1168,7 @@ _021D7E08:
add r0, #0x98
strh r1, [r0]
ldr r0, [r4]
- bl FUN_020BC13C
+ bl NNS_G3dGetMdlSet
str r0, [r4, #0x5c]
ldrh r1, [r0, #0xe]
add r1, r0, r1
@@ -1176,7 +1176,7 @@ _021D7E08:
add r0, r0, r1
str r0, [r4, #0x60]
ldr r0, [r4]
- bl FUN_020BC0FC
+ bl NNS_G3dGetTex
str r0, [r4, #0x64]
bl FUN_0201B3C4
ldr r0, [r4]
@@ -1185,22 +1185,22 @@ _021D7E08:
add r0, r4, #0
ldr r1, [r4, #0x60]
add r0, #8
- bl FUN_020B80B4
+ bl NNS_G3dRenderObjInit
_021D7E9A:
ldr r0, [r4, #4]
cmp r0, #0
beq _021D7ED0
mov r1, #0
- bl FUN_020BC4C8
+ bl NNS_G3dGetAnmByIdx
add r1, r0, #0
ldr r0, [r4, #0x68]
ldr r2, [r4, #0x60]
ldr r3, [r4, #0x64]
- bl FUN_020B8110
+ bl NNS_G3dAnmObjInit
add r0, r4, #0
ldr r1, [r4, #0x68]
add r0, #8
- bl FUN_020B7EFC
+ bl NNS_G3dRenderObjAddAnmObj
add r0, r4, #0
mov r1, #0
add r0, #0x9c
@@ -1227,27 +1227,27 @@ MOD84_021D7EDC: ; 0x021D7EDC
mov r0, #0x82
lsl r0, r0, #2
add r0, r5, r0
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
mov r0, #0x8b
lsl r0, r0, #2
add r0, r5, r0
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
mov r0, #0x25
lsl r0, r0, #4
add r0, r5, r0
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
mov r0, #0x9d
lsl r0, r0, #2
add r0, r5, r0
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
mov r0, #0xa2
lsl r0, r0, #2
add r0, r5, r0
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
mov r0, #0xa7
lsl r0, r0, #2
add r0, r5, r0
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
ldr r0, [r5, #0x18]
ldr r0, [r0]
cmp r0, #1
diff --git a/arm9/modules/84/asm/module_84_thumb2.s b/arm9/modules/84/asm/module_84_thumb2.s
index 82d292c6..6a42cff9 100644
--- a/arm9/modules/84/asm/module_84_thumb2.s
+++ b/arm9/modules/84/asm/module_84_thumb2.s
@@ -1836,10 +1836,10 @@ _021D8ECE:
_021D8EF2:
add r0, r4, #0
add r0, #0x10
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
add r0, r4, #0
add r0, #0x34
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
mov r2, #0
str r2, [sp]
mov r0, #1
@@ -1922,12 +1922,12 @@ _021D8F86:
lsr r7, r5, #1
_021D8FA6:
add r0, r4, #0
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
ldr r0, [sp, #0x20]
add r1, r5, #0
mov r2, #1
add r3, r4, #0
- bl FUN_020B1768
+ bl NNS_G2dLoadImage1DMapping
add r6, r6, #1
add r4, #0x24
add r5, r5, r7
@@ -3164,7 +3164,7 @@ _021D995A:
str r0, [r4, #0x48]
add r0, r4, #0
add r0, #0x10
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
mov r2, #0
str r2, [sp]
mov r0, #1
@@ -3181,7 +3181,7 @@ _021D995A:
bl FUN_02006AE4
add r0, r4, #0
add r0, #0x34
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
mov r0, #0x4b
str r0, [sp]
add r0, r4, #0
@@ -4259,10 +4259,10 @@ _021DA1E2:
str r0, [r4, #0x54]
add r0, r4, #0
add r0, #0x1c
- bl FUN_020B1A24
+ bl NNS_G2dInitImageProxy
add r0, r4, #0
add r0, #0x40
- bl FUN_020B19DC
+ bl NNS_G2dInitImagePaletteProxy
mov r2, #0
str r2, [sp]
mov r0, #1
diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s
index a7798340..bad84718 100644
--- a/arm9/modules/85/asm/module_85.s
+++ b/arm9/modules/85/asm/module_85.s
@@ -570,7 +570,7 @@ MOD85_021D797C: ; 0x021D797C
ldr r1, _021D7B1C ; =0x00000448
add r5, r0, #0
add r1, r4, r1
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
ldr r1, _021D7B1C ; =0x00000448
mov r2, #0x1a
ldr r1, [r4, r1]
@@ -588,7 +588,7 @@ MOD85_021D797C: ; 0x021D797C
ldr r1, _021D7B20 ; =0x00000444
add r5, r0, #0
add r1, r4, r1
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
ldr r0, _021D7B20 ; =0x00000444
mov r1, #0
ldr r3, [r4, r0]
@@ -609,7 +609,7 @@ MOD85_021D797C: ; 0x021D797C
lsl r1, r1, #6
add r1, r4, r1
add r5, r0, #0
- bl FUN_020B0180
+ bl NNS_G2dGetUnpackedScreenData
mov r0, #0x11
lsl r0, r0, #6
ldr r3, [r4, r0]
@@ -633,7 +633,7 @@ MOD85_021D797C: ; 0x021D797C
ldr r1, _021D7B20 ; =0x00000444
add r5, r0, #0
add r1, r4, r1
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
ldr r0, _021D7B20 ; =0x00000444
mov r1, #0
ldr r3, [r4, r0]
@@ -654,7 +654,7 @@ MOD85_021D797C: ; 0x021D797C
lsl r1, r1, #6
add r1, r4, r1
add r5, r0, #0
- bl FUN_020B0180
+ bl NNS_G2dGetUnpackedScreenData
mov r0, #0x11
lsl r0, r0, #6
ldr r3, [r4, r0]
@@ -678,7 +678,7 @@ MOD85_021D797C: ; 0x021D797C
ldr r1, _021D7B1C ; =0x00000448
add r5, r0, #0
add r1, r4, r1
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
ldr r1, _021D7B1C ; =0x00000448
mov r2, #0x1a
ldr r1, [r4, r1]
@@ -696,7 +696,7 @@ MOD85_021D797C: ; 0x021D797C
ldr r1, _021D7B20 ; =0x00000444
add r5, r0, #0
add r1, r4, r1
- bl FUN_020B0088
+ bl NNS_G2dGetUnpackedCharacterData
ldr r0, _021D7B20 ; =0x00000444
mov r1, #0
ldr r3, [r4, r0]
@@ -717,7 +717,7 @@ MOD85_021D797C: ; 0x021D797C
lsl r1, r1, #6
add r1, r4, r1
add r5, r0, #0
- bl FUN_020B0180
+ bl NNS_G2dGetUnpackedScreenData
mov r0, #0x11
lsl r0, r0, #6
ldr r3, [r4, r0]
@@ -933,7 +933,7 @@ MOD85_021D7CB0: ; 0x021D7CB0
push {r3, r4, lr}
sub sp, #0x1c
add r4, r0, #0
- bl FUN_020B0FC0
+ bl NNS_G2dInitOamManagerModule
mov r0, #0
str r0, [sp]
mov r1, #0x80
@@ -8587,7 +8587,7 @@ MOD85_021DB494: ; 0x021DB494
bl MOD85_021D8144
add r1, sp, #0
add r6, r0, #0
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
ldr r0, [sp]
mov r1, #1
add r2, r4, #4
@@ -8627,7 +8627,7 @@ MOD85_021DB494: ; 0x021DB494
bl MOD85_021D8144
add r1, sp, #0
add r6, r0, #0
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
add r2, r4, #0
ldr r0, [sp]
mov r1, #0
@@ -8641,7 +8641,7 @@ MOD85_021DB494: ; 0x021DB494
bl MOD85_021D8144
add r1, sp, #0
add r6, r0, #0
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
add r2, r4, #0
ldr r0, [sp]
mov r1, #0
@@ -8655,7 +8655,7 @@ MOD85_021DB494: ; 0x021DB494
bl MOD85_021D8144
add r1, sp, #0
add r6, r0, #0
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
add r2, r4, #0
ldr r0, [sp]
mov r1, #0
@@ -8669,7 +8669,7 @@ MOD85_021DB494: ; 0x021DB494
bl MOD85_021D8144
add r1, sp, #0
add r6, r0, #0
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
mov r2, #0x51
lsl r2, r2, #2
ldr r0, [sp]
@@ -8684,7 +8684,7 @@ MOD85_021DB494: ; 0x021DB494
bl MOD85_021D8144
add r1, sp, #0
add r6, r0, #0
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
mov r2, #0x59
lsl r2, r2, #2
ldr r0, [sp]
@@ -8705,7 +8705,7 @@ MOD85_021DB494: ; 0x021DB494
bl MOD85_021D8144
add r1, sp, #0
add r5, r0, #0
- bl FUN_020B0138
+ bl NNS_G2dGetUnpackedPaletteData
mov r2, #0x69
lsl r2, r2, #2
ldr r0, [sp]
diff --git a/arm9/src/heap.c b/arm9/src/heap.c
index f28b4f88..7ae25c3b 100644
--- a/arm9/src/heap.c
+++ b/arm9/src/heap.c
@@ -3,14 +3,14 @@
#include "unk_02031734.h"
-extern void *tempName_NNS_FndCreateExpHeapEx(void *param0, u32 param1, u32 param2);
-extern void *tempName_NNS_FndAllocFromExpHeapEx(void *param0, u32 param1, s32 param2);
-extern void thunk_FUN_020adc8c();
-extern void FUN_020ADDF0(void *ptr1, void *ptr2);
-extern u32 FUN_020ADDC8(void *param0);
-extern void FUN_020AE82C(u32 param0, void *param1, u32 param2);
-extern u32 FUN_020ADDC0(void *param0);
-extern void FUN_020ADE2C(void *ptr1, void *ptr2, u32 param2);
+extern void *NNS_FndCreateExpHeapEx(void *param0, u32 param1, u32 param2);
+extern void *NNS_FndAllocFromExpHeapEx(void *param0, u32 param1, s32 param2);
+extern void NNS_FndDestroyExpHeap();
+extern void NNS_FndFreeToExpHeap(void *ptr1, void *ptr2);
+extern u32 NNS_FndGetTotalFreeSizeForExpHeap(void *param0);
+extern void NNS_FndInitAllocatorForExpHeap(u32 param0, void *param1, u32 param2);
+extern u32 NNS_FndGetSizeForMBlockExpHeap(void *param0);
+extern void NNS_FndResizeForMBlockExpHeap(void *ptr1, void *ptr2, u32 param2);
struct UnkStruct_020166C8 UNK_021C4D28;
@@ -68,7 +68,7 @@ THUMB_FUNC void FUN_020166C8(u32 *param0, u32 param1, u32 param2, u32 pre_size)
if (ptr != 0)
{
- UNK_021C4D28.unk00[r7] = tempName_NNS_FndCreateExpHeapEx(ptr, param0[0], 0);
+ UNK_021C4D28.unk00[r7] = NNS_FndCreateExpHeapEx(ptr, param0[0], 0);
UNK_021C4D28.unk10[r7] = (u8)r7;
}
else
@@ -143,13 +143,13 @@ THUMB_FUNC u32 FUN_02016834(u32 param0, u32 param1, u32 param2, s32 param3)
void *ptr2 = UNK_021C4D28.unk00[ptr[param0]];
if (ptr2 != 0)
{
- void *ptr3 = tempName_NNS_FndAllocFromExpHeapEx(ptr2, param2, param3);
+ void *ptr3 = NNS_FndAllocFromExpHeapEx(ptr2, param2, param3);
if (ptr3 != 0)
{
param3 = FUN_020167F4();
if (param3 >= 0)
{
- UNK_021C4D28.unk00[param3] = tempName_NNS_FndCreateExpHeapEx(ptr3, param2, 0);
+ UNK_021C4D28.unk00[param3] = NNS_FndCreateExpHeapEx(ptr3, param2, 0);
if (UNK_021C4D28.unk00[param3] != 0)
@@ -193,14 +193,14 @@ THUMB_FUNC void FUN_020168D0(u32 heap_id)
if (UNK_021C4D28.unk00[UNK_021C4D28.unk10[heap_id]] != 0)
{
- thunk_FUN_020adc8c();
+ NNS_FndDestroyExpHeap();
u8 index = UNK_021C4D28.unk10[heap_id];
void *ptr1 = UNK_021C4D28.unk04[index];
void *ptr2 = UNK_021C4D28.unk08[index];
if (ptr1 != 0 && ptr2 != 0)
{
- FUN_020ADDF0(ptr1, ptr2);
+ NNS_FndFreeToExpHeap(ptr1, ptr2);
}
else
{
@@ -221,7 +221,7 @@ THUMB_FUNC u32 *FUN_02016944(void *param0, u32 param1, s32 param2, u32 param3)
OSIntrMode intr_mode = OS_DisableInterrupts();
param1 += 16;
- u32 *ptr = (u32 *)tempName_NNS_FndAllocFromExpHeapEx(param0, param1, param2);
+ u32 *ptr = (u32 *)NNS_FndAllocFromExpHeapEx(param0, param1, param2);
OS_RestoreInterrupts(intr_mode);
if (ptr != 0)
@@ -301,7 +301,7 @@ void FreeToHeap(void *ptr)
UNK_021C4D28.unk0c[heap_id]--;
OSIntrMode intr_mode = OS_DisableInterrupts();
- FUN_020ADDF0(ptr2, ptr - 16);
+ NNS_FndFreeToExpHeap(ptr2, ptr - 16);
OS_RestoreInterrupts(intr_mode);
return;
}
@@ -322,7 +322,7 @@ void FreeToHeapExplicit(u32 param0, void *param1)
u8 heap_id = (u8)((u32 *)param1)[-1];
GF_ASSERT (heap_id == param0);
- FUN_020ADDF0(ptr, param1 - 16);
+ NNS_FndFreeToExpHeap(ptr, param1 - 16);
GF_ASSERT (UNK_021C4D28.unk0c[param0]);
UNK_021C4D28.unk0c[param0]--;
@@ -337,7 +337,7 @@ THUMB_FUNC u32 FUN_02016AF8(u32 param0)
if (param0 < UNK_021C4D28.unk14)
{
u8 index = UNK_021C4D28.unk10[param0];
- return FUN_020ADDC8(UNK_021C4D28.unk00[index]);
+ return NNS_FndGetTotalFreeSizeForExpHeap(UNK_021C4D28.unk00[index]);
}
ErrorHandling();
@@ -350,7 +350,7 @@ THUMB_FUNC void FUN_02016B20(u32 param0, u32 param1, u32 param2)
{
u8 index = UNK_021C4D28.unk10[param1];
- FUN_020AE82C(param0, UNK_021C4D28.unk00[index], param2);
+ NNS_FndInitAllocatorForExpHeap(param0, UNK_021C4D28.unk00[index], param2);
return;
}
@@ -362,13 +362,13 @@ THUMB_FUNC void FUN_02016B44(void *ptr, u32 param1)
GF_ASSERT (OS_GetProcMode() != OS_PROCMODE_IRQ);
param1 += 16;
- if (FUN_020ADDC0(ptr - 16) >= param1)
+ if (NNS_FndGetSizeForMBlockExpHeap(ptr - 16) >= param1)
{
u8 heap_id = (u8)((u32 *)ptr)[-1];
u8 index = UNK_021C4D28.unk10[heap_id];
- FUN_020ADE2C(UNK_021C4D28.unk00[index], ptr - 16, param1);
+ NNS_FndResizeForMBlockExpHeap(UNK_021C4D28.unk00[index], ptr - 16, param1);
return;
}
ErrorHandling();
diff --git a/arm9/src/sound.c b/arm9/src/sound.c
index a1e31bbd..35710f24 100644
--- a/arm9/src/sound.c
+++ b/arm9/src/sound.c
@@ -28,12 +28,12 @@ extern void FUN_02005CFC(void);
void InitSoundData(void * a0, struct Options * a1)
{
struct SoundData * sdat = GetSoundDataPointer();
- SDAT_Init();
+ NNS_SndInit();
FUN_020040C8();
FUN_02004064(sdat);
- sdat->unk_00090 = FUN_020C2A94(sdat->unk_00094, sizeof(sdat->unk_00094));
- SDAT_Open(&sdat->header, "data/sound/sound_data.sdat", sdat->unk_00090, 0);
- FUN_020C39CC(sdat->unk_00090);
+ sdat->unk_00090 = NNS_SndHeapCreate(sdat->unk_00094, sizeof(sdat->unk_00094));
+ NNS_SndArcInit(&sdat->header, "data/sound/sound_data.sdat", sdat->unk_00090, 0);
+ NNS_SndArcPlayerSetup(sdat->unk_00090);
FUN_02004088(sdat);
FUN_020040A4(sdat);
UNK_02107070[1] = 0;
@@ -51,7 +51,7 @@ void DoSoundUpdateFrame(void)
FUN_02003C40();
}
FUN_02005CFC();
- FUN_020C01A0();
+ NNS_SndMain();
}
void FUN_02003C40(void)
@@ -202,7 +202,7 @@ void * FUN_02003D38(u32 a0)
int FUN_02003F3C(int * a0)
{
struct SoundData * sdat = GetSoundDataPointer();
- int r4 = FUN_020C290C(sdat->unk_00090);
+ int r4 = NNS_SndHeapSaveState(sdat->unk_00090);
GF_ASSERT(r4 != -1);
if (a0 != NULL)
*a0 = r4;
@@ -212,37 +212,37 @@ int FUN_02003F3C(int * a0)
void FUN_02003F64(int a0)
{
struct SoundData * sdat = GetSoundDataPointer();
- FUN_020C2828(sdat->unk_00090, a0);
+ NNS_SndHeapLoadState(sdat->unk_00090, a0);
}
BOOL FUN_02003F78(u32 * a0)
{
struct SoundData * sdat = GetSoundDataPointer();
- return FUN_020C36A8(a0, sdat->unk_00090);
+ return NNS_SndArcLoadGroup(a0, sdat->unk_00090);
}
BOOL FUN_02003F90(u32 * a0)
{
struct SoundData * sdat = GetSoundDataPointer();
- return FUN_020C3674(a0, sdat->unk_00090);
+ return NNS_SndArcLoadSeq(a0, sdat->unk_00090);
}
BOOL FUN_02003FA8(u32 * a0, u32 * a1)
{
struct SoundData * sdat = GetSoundDataPointer();
- return FUN_020C35E0(a0, a1, sdat->unk_00090);
+ return NNS_SndArcLoadSeqEx(a0, a1, sdat->unk_00090);
}
BOOL FUN_02003FC4(u32 * a0)
{
struct SoundData * sdat = GetSoundDataPointer();
- return FUN_020C360C(a0, sdat->unk_00090);
+ return NNS_SndArcLoadWaveArc(a0, sdat->unk_00090);
}
BOOL FUN_02003FDC(u32 * a0)
{
struct SoundData * sdat = GetSoundDataPointer();
- return FUN_020C3640(a0, sdat->unk_00090);
+ return NNS_SndArcLoadBank(a0, sdat->unk_00090);
}
u32 * FUN_02003FF4(int a0)
@@ -295,7 +295,7 @@ void FUN_02004088(struct SoundData * sdat)
int i;
for (i = 0; i < 9; i++)
{
- FUN_020C0F80(&sdat->unk_BBC94[i]);
+ NNS_SndHandleInit(&sdat->unk_BBC94[i]);
}
}
@@ -315,7 +315,7 @@ void FUN_020040C8(void)
void FUN_020040DC(void)
{
- FUN_020C1040(7, 0);
+ NNS_SndPlayerStopSeqByPlayerNo(7, 0);
FUN_02003FF4(7);
- FUN_020C0F68();
+ NNS_SndHandleReleaseSeq();
}
diff --git a/include/sdat.h b/include/sdat.h
index 3ba8583c..db60e13e 100644
--- a/include/sdat.h
+++ b/include/sdat.h
@@ -28,20 +28,20 @@ struct SDATFileMgr
void * info_p;
};
-void SDAT_Init(void);
-void * FUN_020C2A94(void *, u32);
-void SDAT_Open(struct SDATFileMgr *, char *, void *, u32);
-void FUN_020C39CC(void *);
-void FUN_020C01A0(void);
-int FUN_020C290C(void *);
-void FUN_020C2828(void *, int);
-BOOL FUN_020C36A8(u32 *, void *);
-BOOL FUN_020C3674(u32 *, void *);
-BOOL FUN_020C35E0(u32 *, u32 *, void *);
-BOOL FUN_020C360C(u32 *, void *);
-BOOL FUN_020C3640(u32 *, void *);
-void FUN_020C0F80(u32 *);
-void FUN_020C1040(int, int);
-void FUN_020C0F68(void);
+void NNS_SndInit(void);
+void * NNS_SndHeapCreate(void *, u32);
+void NNS_SndArcInit(struct SDATFileMgr *, char *, void *, u32);
+void NNS_SndArcPlayerSetup(void *);
+void NNS_SndMain(void);
+int NNS_SndHeapSaveState(void *);
+void NNS_SndHeapLoadState(void *, int);
+BOOL NNS_SndArcLoadGroup(u32 *, void *);
+BOOL NNS_SndArcLoadSeq(u32 *, void *);
+BOOL NNS_SndArcLoadSeqEx(u32 *, u32 *, void *);
+BOOL NNS_SndArcLoadWaveArc(u32 *, void *);
+BOOL NNS_SndArcLoadBank(u32 *, void *);
+void NNS_SndHandleInit(u32 *);
+void NNS_SndPlayerStopSeqByPlayerNo(int, int);
+void NNS_SndHandleReleaseSeq(void);
#endif //GUARD_LIBSDAT_H