diff options
Diffstat (limited to 'arm9/modules')
64 files changed, 695 insertions, 695 deletions
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 ea709996..d8a13888 100644 --- a/arm9/modules/05/asm/mod05_021E3444.s +++ b/arm9/modules/05/asm/mod05_021E3444.s @@ -1232,7 +1232,7 @@ MOD05_021E3DA0: ; 0x021E3DA0 bl MTX_Identity22_ add r0, sp, #8 ldrh r0, [r0, #0x14] - ldr r3, _021E3E0C ; =UNK_020FFA38 + ldr r3, _021E3E0C ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1271,7 +1271,7 @@ MOD05_021E3DA0: ; 0x021E3DA0 bl FUN_0200CA98 pop {r3, r4, r5, r6, r7, pc} nop -_021E3E0C: .word UNK_020FFA38 +_021E3E0C: .word FX_SinCosTable_ _021E3E10: .word MOD05_021E3D70 thumb_func_start MOD05_021E3E14 @@ -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 @@ -2286,7 +2286,7 @@ MOD05_021E45A0: ; 0x021E45A0 add r4, r1, #0 lsl r1, r0, #1 lsl r0, r1, #1 - ldr r2, _021E4680 ; =UNK_020FFA38 + ldr r2, _021E4680 ; =FX_SinCosTable_ add r1, r1, #1 lsl r1, r1, #1 ldrsh r0, [r2, r0] @@ -2297,7 +2297,7 @@ MOD05_021E45A0: ; 0x021E45A0 asr r0, r4, #4 lsl r1, r0, #1 lsl r0, r1, #1 - ldr r2, _021E4680 ; =UNK_020FFA38 + ldr r2, _021E4680 ; =FX_SinCosTable_ add r1, r1, #1 lsl r1, r1, #1 ldrsh r0, [r2, r0] @@ -2389,7 +2389,7 @@ _021E464C: add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 -_021E4680: .word UNK_020FFA38 +_021E4680: .word FX_SinCosTable_ _021E4684: .word 0x00000000 thumb_func_start MOD05_021E4688 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 13563cc2..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 @@ -15780,7 +15780,7 @@ _021F03A8: asr r0, r1, #4 lsl r3, r0, #1 lsl r1, r3, #1 - ldr r2, _021F0438 ; =UNK_020FFA38 + ldr r2, _021F0438 ; =FX_SinCosTable_ add r3, r3, #1 lsl r3, r3, #1 ldrsh r1, [r2, r1] @@ -15794,7 +15794,7 @@ _021F03A8: asr r0, r5, #4 lsl r2, r0, #1 lsl r1, r2, #1 - ldr r3, _021F0438 ; =UNK_020FFA38 + ldr r3, _021F0438 ; =FX_SinCosTable_ add r2, r2, #1 lsl r2, r2, #1 ldrsh r1, [r3, r1] @@ -15839,7 +15839,7 @@ _021F03A8: pop {r4, r5, r6, r7, pc} nop _021F0434: .word UNK05_021F8B6C -_021F0438: .word UNK_020FFA38 +_021F0438: .word FX_SinCosTable_ thumb_func_start MOD05_021F043C MOD05_021F043C: ; 0x021F043C @@ -15866,7 +15866,7 @@ MOD05_021F0454: ; 0x021F0454 bl FUN_0201F008 strh r0, [r5] ldrh r0, [r5] - ldr r2, _021F04F0 ; =UNK_020FFA38 + ldr r2, _021F04F0 ; =FX_SinCosTable_ asr r0, r0, #4 lsl r1, r0, #1 lsl r0, r1, #1 @@ -15909,7 +15909,7 @@ MOD05_021F0454: ; 0x021F0454 str r0, [r5, #0x1c] add r0, sp, #0 ldrh r0, [r0] - ldr r3, _021F04F0 ; =UNK_020FFA38 + ldr r3, _021F04F0 ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -15924,7 +15924,7 @@ MOD05_021F0454: ; 0x021F0454 add sp, #0x2c pop {r4, r5, pc} nop -_021F04F0: .word UNK_020FFA38 +_021F04F0: .word FX_SinCosTable_ _021F04F4: .word UNK05_021F8B78 thumb_func_start MOD05_021F04F8 @@ -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 @@ -26373,7 +26373,7 @@ MOD05_021F5430: ; 0x021F5430 add r0, r4, #0 add r0, #0x70 ldrh r0, [r0] - ldr r3, _021F54C8 ; =UNK_020FFA38 + ldr r3, _021F54C8 ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -26390,7 +26390,7 @@ MOD05_021F5430: ; 0x021F5430 add r0, r4, #0 add r0, #0x74 ldrh r0, [r0] - ldr r3, _021F54C8 ; =UNK_020FFA38 + ldr r3, _021F54C8 ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -26407,7 +26407,7 @@ MOD05_021F5430: ; 0x021F5430 add r0, r4, #0 add r0, #0x72 ldrh r0, [r0] - ldr r3, _021F54C8 ; =UNK_020FFA38 + ldr r3, _021F54C8 ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -26432,7 +26432,7 @@ _021F54C4: add sp, #0x48 pop {r4, pc} .balign 4, 0 -_021F54C8: .word UNK_020FFA38 +_021F54C8: .word FX_SinCosTable_ thumb_func_start MOD05_021F54CC MOD05_021F54CC: ; 0x021F54CC @@ -26471,17 +26471,17 @@ MOD05_021F54EC: ; 0x021F54EC add r0, r2, #0 mov r1, #0 add r6, r3, #0 - bl FUN_020BC4C8 + bl NNS_G3dGetAnmByIdx str r0, [r5, #4] ldr r1, [r5, #4] ldr r2, [r4, #8] add r0, r6, #0 - bl FUN_020BB8D0 + bl NNS_G3dAllocAnmObj str r0, [r5, #8] ldr r1, [r5, #4] ldr r2, [r4, #8] ldr r3, [r4, #0xc] - bl FUN_020B8110 + bl NNS_G3dAnmObjInit pop {r4, r5, r6, pc} thumb_func_start MOD05_021F5518 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 b6af83a9..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 @@ -12792,7 +12792,7 @@ _02217DA2: ldr r2, [r4, #0xc] asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _02217E2C ; =UNK_020FFA38 + ldr r0, _02217E2C ; =FX_SinCosTable_ asr r3, r2, #0x1f ldrsh r0, [r0, r1] asr r1, r0, #0x1f @@ -12813,7 +12813,7 @@ _02217DA2: lsl r0, r0, #1 add r0, r0, #1 lsl r1, r0, #1 - ldr r0, _02217E2C ; =UNK_020FFA38 + ldr r0, _02217E2C ; =FX_SinCosTable_ asr r3, r2, #0x1f ldrsh r0, [r0, r1] asr r1, r0, #0x1f @@ -12834,7 +12834,7 @@ _02217E26: mov r0, #0 pop {r4, pc} nop -_02217E2C: .word UNK_020FFA38 +_02217E2C: .word FX_SinCosTable_ thumb_func_start MOD08_02217E30 MOD08_02217E30: ; 0x02217E30 @@ -13221,7 +13221,7 @@ _022180CE: lsl r0, r0, #1 add r0, r0, #1 lsl r1, r0, #1 - ldr r0, _0221811C ; =UNK_020FFA38 + ldr r0, _0221811C ; =FX_SinCosTable_ asr r3, r2, #0x1f ldrsh r0, [r0, r1] asr r1, r0, #0x1f @@ -13242,7 +13242,7 @@ _02218116: mov r0, #0 pop {r4, pc} nop -_0221811C: .word UNK_020FFA38 +_0221811C: .word FX_SinCosTable_ thumb_func_start MOD08_02218120 MOD08_02218120: ; 0x02218120 @@ -38351,7 +38351,7 @@ _02224CA6: mul r0, r1 asr r0, r0, #4 lsl r0, r0, #2 - ldr r1, _02224D70 ; =UNK_020FFA38 + ldr r1, _02224D70 ; =FX_SinCosTable_ str r0, [sp, #0x18] add r1, r1, r0 mov r0, #2 @@ -38371,7 +38371,7 @@ _02224CA6: lsl r0, r1, #4 asr r6, r0, #0x10 mov r2, #3 - ldr r1, _02224D70 ; =UNK_020FFA38 + ldr r1, _02224D70 ; =FX_SinCosTable_ ldr r0, [sp, #0x18] lsl r2, r2, #0x10 ldrsh r0, [r1, r0] @@ -38437,7 +38437,7 @@ _02224D50: pop {r3, r4, r5, r6, r7, pc} nop _02224D6C: .word 0x00001555 -_02224D70: .word UNK_020FFA38 +_02224D70: .word FX_SinCosTable_ _02224D74: .word 0x00000000 _02224D78: .word MOD08_02224AF4 @@ -39693,7 +39693,7 @@ _022257C6: lsr r0, r0, #0x10 asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _0222586C ; =UNK_020FFA38 + ldr r0, _0222586C ; =FX_SinCosTable_ ldr r3, [r6, #0x14] ldrsh r0, [r0, r1] lsl r2, r2, #0xc @@ -39762,7 +39762,7 @@ _02225852: add sp, #8 pop {r3, r4, r5, r6, r7, pc} nop -_0222586C: .word UNK_020FFA38 +_0222586C: .word FX_SinCosTable_ _02225870: .word 0x00000132 _02225874: .word 0x00000000 _02225878: .word 0x00003FFF @@ -40033,7 +40033,7 @@ MOD08_02225A70: ; 0x02225A70 lsr r0, r0, #0x10 asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _02225B30 ; =UNK_020FFA38 + ldr r0, _02225B30 ; =FX_SinCosTable_ lsl r2, r2, #0xc ldrsh r0, [r0, r1] mov r3, #0 @@ -40096,7 +40096,7 @@ _02225B2A: add sp, #0xc pop {r4, r5, r6, r7, pc} .align 2, 0 -_02225B30: .word UNK_020FFA38 +_02225B30: .word FX_SinCosTable_ _02225B34: .word 0x00000000 _02225B38: .word 0x45800000 @@ -40407,7 +40407,7 @@ _02225D8C: lsr r0, r0, #0x10 asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _02225E0C ; =UNK_020FFA38 + ldr r0, _02225E0C ; =FX_SinCosTable_ asr r3, r2, #0x1f ldrsh r0, [r0, r1] asr r1, r0, #0x1f @@ -40459,7 +40459,7 @@ _02225E02: pop {r4, r5, r6, r7, pc} nop _02225E08: .word 0x00000199 -_02225E0C: .word UNK_020FFA38 +_02225E0C: .word FX_SinCosTable_ _02225E10: .word 0x00000000 thumb_func_start MOD08_02225E14 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 adc8e5c2..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 @@ -29023,7 +29023,7 @@ _021E4ACE: lsr r0, r0, #0x10 asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _021E4B10 ; =UNK_020FFA38 + ldr r0, _021E4B10 ; =FX_SinCosTable_ mov r2, #3 ldrsh r0, [r0, r1] lsl r2, r2, #0x10 @@ -29044,7 +29044,7 @@ _021E4ACE: pop {r3, pc} .align 2, 0 _021E4B0C: .word 0x00007FFF -_021E4B10: .word UNK_020FFA38 +_021E4B10: .word FX_SinCosTable_ thumb_func_end MOD16_021E4AC0 thumb_func_start MOD16_021E4B14 @@ -49298,7 +49298,7 @@ MOD16_021EE2A4: ; 0x021EE2A4 lsl r4, r0, #1 add r0, r4, #1 lsl r1, r0, #1 - ldr r0, _021EE354 ; =UNK_020FFA38 + ldr r0, _021EE354 ; =FX_SinCosTable_ mov r3, #0 ldrsh r0, [r0, r1] asr r1, r0, #0x1f @@ -49312,7 +49312,7 @@ MOD16_021EE2A4: ; 0x021EE2A4 lsr r5, r2, #0xc orr r5, r0 mov r2, #0xe - ldr r0, _021EE354 ; =UNK_020FFA38 + ldr r0, _021EE354 ; =FX_SinCosTable_ lsl r1, r4, #1 ldrsh r0, [r0, r1] lsl r2, r2, #0xe @@ -49364,7 +49364,7 @@ MOD16_021EE2A4: ; 0x021EE2A4 add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_021EE354: .word UNK_020FFA38 +_021EE354: .word FX_SinCosTable_ thumb_func_end MOD16_021EE2A4 thumb_func_start MOD16_021EE358 @@ -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 b96d5a98..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] @@ -1055,7 +1055,7 @@ MOD17_021D7C28: ; 0x021D7C28 mov r0, #0 str r0, [r1] ldr r0, [sp] - ldr r1, _021D7CB4 ; =UNK_020FFA38 + ldr r1, _021D7CB4 ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r0, r2, #1 @@ -1101,7 +1101,7 @@ _021D7CA0: nop _021D7CAC: .word 0x04000454 _021D7CB0: .word 0x04000470 -_021D7CB4: .word UNK_020FFA38 +_021D7CB4: .word FX_SinCosTable_ _021D7CB8: .word 0x0400046C _021D7CBC: .word 0x04000448 thumb_func_end MOD17_021D7C28 @@ -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 dccb0b7d..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 @@ -17178,7 +17178,7 @@ _02241A30: lsl r2, r2, #0xa asr r0, r0, #4 lsl r6, r0, #1 - ldr r0, _02241AAC ; =UNK_020FFA38 + ldr r0, _02241AAC ; =FX_SinCosTable_ lsl r1, r6, #1 ldrsh r0, [r0, r1] mov r3, #0 @@ -17194,7 +17194,7 @@ _02241A30: orr r4, r0 add r0, r6, #1 lsl r1, r0, #1 - ldr r0, _02241AAC ; =UNK_020FFA38 + ldr r0, _02241AAC ; =FX_SinCosTable_ mov r2, #0xa ldrsh r0, [r0, r1] lsl r2, r2, #0xa @@ -17233,7 +17233,7 @@ _02241AA8: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02241AAC: .word UNK_020FFA38 +_02241AAC: .word FX_SinCosTable_ _02241AB0: .word MOD18_022513A0 thumb_func_end MOD18_02241A04 @@ -17478,7 +17478,7 @@ _02241C70: ldr r2, [sp] asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _02241D34 ; =UNK_020FFA38 + ldr r0, _02241D34 ; =FX_SinCosTable_ asr r3, r2, #0x1f ldrsh r0, [r0, r1] asr r1, r0, #0x1f @@ -17504,7 +17504,7 @@ _02241C70: lsl r0, r0, #1 add r0, r0, #1 lsl r1, r0, #1 - ldr r0, _02241D34 ; =UNK_020FFA38 + ldr r0, _02241D34 ; =FX_SinCosTable_ ldrsh r0, [r0, r1] asr r1, r0, #0x1f bl _ll_mul @@ -17561,7 +17561,7 @@ _02241D24: .word MOD18_02241AB4 _02241D28: .word MOD18_022513A0 _02241D2C: .word 0x00000B3B _02241D30: .word 0x00000000 -_02241D34: .word UNK_020FFA38 +_02241D34: .word FX_SinCosTable_ thumb_func_end MOD18_02241AD0 thumb_func_start MOD18_02241D38 @@ -18343,7 +18343,7 @@ MOD18_02242320: ; 0x02242320 ldrh r0, [r2, r1] asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _022423AC ; =UNK_020FFA38 + ldr r0, _022423AC ; =FX_SinCosTable_ ldrsh r1, [r0, r1] mov r0, #1 lsl r0, r0, #0xc @@ -18373,7 +18373,7 @@ _022423A4: pop {r4, r5, pc} .align 2, 0 _022423A8: .word MOD18_022513A0 -_022423AC: .word UNK_020FFA38 +_022423AC: .word FX_SinCosTable_ thumb_func_end MOD18_02242320 thumb_func_start MOD18_022423B0 @@ -18529,7 +18529,7 @@ _022424D4: ldrh r0, [r4, #0x1c] asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _02242594 ; =UNK_020FFA38 + ldr r0, _02242594 ; =FX_SinCosTable_ ldrsh r1, [r0, r1] ldr r0, [r5, #0x48] sub r0, r0, r1 @@ -18538,7 +18538,7 @@ _022424D4: ldr r0, [r5, #0x44] asr r1, r1, #4 lsl r2, r1, #2 - ldr r1, _02242594 ; =UNK_020FFA38 + ldr r1, _02242594 ; =FX_SinCosTable_ add r2, r1, r2 mov r1, #2 ldrsh r1, [r2, r1] @@ -18616,7 +18616,7 @@ _02242584: .word 0x00000000 _02242588: .word MOD18_022500C0 _0224258C: .word 0x00000626 _02242590: .word MOD18_022513A0 -_02242594: .word UNK_020FFA38 +_02242594: .word FX_SinCosTable_ _02242598: .word 0x0000FFFF thumb_func_end MOD18_022423B0 @@ -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 ee93d317..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] @@ -3404,7 +3404,7 @@ _02253CEE: add r0, #0x8c ldrh r2, [r6, #0x10] ldrh r0, [r0] - ldr r1, _02253E58 ; =UNK_020FFA38 + ldr r1, _02253E58 ; =FX_SinCosTable_ add r0, r2, r0 lsl r0, r0, #0x10 lsr r0, r0, #0x10 @@ -3425,7 +3425,7 @@ _02253D20: beq _02253D3E asr r0, r0, #4 lsl r3, r0, #2 - ldr r1, _02253E58 ; =UNK_020FFA38 + ldr r1, _02253E58 ; =FX_SinCosTable_ ldr r0, [r4, #0x6c] add r2, r1, r3 ldrsh r1, [r1, r3] @@ -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,12 +3569,12 @@ _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} nop -_02253E58: .word UNK_020FFA38 +_02253E58: .word FX_SinCosTable_ _02253E5C: .word 0xDFFFFFFF _02253E60: .word 0xFFFFF3FF _02253E64: .word 0xFFFF0FFF @@ -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 ce90e965..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: @@ -1149,7 +1149,7 @@ MOD64_021D7E34: ; 0x021D7E34 add r0, r4, #0 add r0, #0x90 ldrh r0, [r0] - ldr r3, _021D7ECC ; =UNK_020FFA38 + ldr r3, _021D7ECC ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1166,7 +1166,7 @@ MOD64_021D7E34: ; 0x021D7E34 add r0, r4, #0 add r0, #0x92 ldrh r0, [r0] - ldr r3, _021D7ECC ; =UNK_020FFA38 + ldr r3, _021D7ECC ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1183,7 +1183,7 @@ MOD64_021D7E34: ; 0x021D7E34 add r0, r4, #0 add r0, #0x94 ldrh r0, [r0] - ldr r3, _021D7ECC ; =UNK_020FFA38 + ldr r3, _021D7ECC ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1211,7 +1211,7 @@ _021D7EC8: add sp, #0x48 pop {r4, pc} .align 2, 0 -_021D7ECC: .word UNK_020FFA38 +_021D7ECC: .word FX_SinCosTable_ thumb_func_end MOD64_021D7E34 thumb_func_start MOD64_021D7ED0 @@ -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 @@ -2795,7 +2795,7 @@ MOD64_021D8A90: ; 0x021D8A90 lsr r0, r0, #0x10 asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _021D8ADC ; =UNK_020FFA38 + ldr r0, _021D8ADC ; =FX_SinCosTable_ ldr r2, [r4, #4] ldrsh r0, [r0, r1] asr r3, r2, #0x1f @@ -2818,7 +2818,7 @@ MOD64_021D8A90: ; 0x021D8A90 pop {r4, pc} nop _021D8AD8: .word 0x0000FFFF -_021D8ADC: .word UNK_020FFA38 +_021D8ADC: .word FX_SinCosTable_ thumb_func_end MOD64_021D8A90 thumb_func_start MOD64_021D8AE0 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 d88f4eb8..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 @@ -3795,10 +3795,10 @@ _0222F408: mov r1, #1 bl G3B_LightVector ldrh r0, [r4, #0x28] - ldr r3, _0222F62C ; =UNK_020FFA38 + ldr r3, _0222F62C ; =FX_SinCosTable_ asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _0222F62C ; =UNK_020FFA38 + ldr r0, _0222F62C ; =FX_SinCosTable_ add r2, r0, r1 ldrsh r1, [r3, r1] mov r3, #2 @@ -3810,10 +3810,10 @@ _0222F408: add r1, r5, #0 bl MTX_Concat44 ldrh r0, [r4, #0x2a] - ldr r3, _0222F62C ; =UNK_020FFA38 + ldr r3, _0222F62C ; =FX_SinCosTable_ asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _0222F62C ; =UNK_020FFA38 + ldr r0, _0222F62C ; =FX_SinCosTable_ add r2, r0, r1 ldrsh r1, [r3, r1] mov r3, #2 @@ -3825,10 +3825,10 @@ _0222F408: add r1, r5, #0 bl MTX_Concat44 ldrh r0, [r4, #0x2c] - ldr r3, _0222F62C ; =UNK_020FFA38 + ldr r3, _0222F62C ; =FX_SinCosTable_ asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _0222F62C ; =UNK_020FFA38 + ldr r0, _0222F62C ; =FX_SinCosTable_ add r2, r0, r1 ldrsh r1, [r3, r1] mov r3, #2 @@ -3950,7 +3950,7 @@ _0222F61C: .word 0x0000019A _0222F620: .word 0x00002D6B _0222F624: .word 0x00000FFF _0222F628: .word 0xFFFFF001 -_0222F62C: .word UNK_020FFA38 +_0222F62C: .word FX_SinCosTable_ _0222F630: .word 0x00007FFF _0222F634: .word 0x00008D1C _0222F638: .word 0x0000151C 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 4a086c51..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 @@ -6738,7 +6738,7 @@ _021DA906: str r0, [sp, #0x6c] asr r0, r0, #0x1f lsl r3, r2, #1 - ldr r1, _021DAAA0 ; =UNK_020FFA38 + ldr r1, _021DAAA0 ; =FX_SinCosTable_ str r0, [sp, #0x70] ldr r0, [sp, #0xa8] ldrsh r6, [r1, r3] @@ -6904,7 +6904,7 @@ _021DA906: pop {r3, r4, r5, r6, r7, pc} nop _021DAA9C: .word MOD73_021DBE7C -_021DAAA0: .word UNK_020FFA38 +_021DAAA0: .word FX_SinCosTable_ _021DAAA4: .word 0x0000019A thumb_func_end MOD73_021DA8BC @@ -7130,7 +7130,7 @@ _021DABFC: lsl r4, r0, #1 add r0, r4, #1 lsl r1, r0, #1 - ldr r0, _021DAC98 ; =UNK_020FFA38 + ldr r0, _021DAC98 ; =FX_SinCosTable_ add r2, r6, #0 ldrsh r0, [r0, r1] add r3, r7, #0 @@ -7146,7 +7146,7 @@ _021DABFC: lsr r0, r0, #0xc orr r0, r1 str r0, [sp] - ldr r0, _021DAC98 ; =UNK_020FFA38 + ldr r0, _021DAC98 ; =FX_SinCosTable_ lsl r1, r4, #1 ldrsh r0, [r0, r1] add r2, r6, #0 @@ -7177,7 +7177,7 @@ _021DAC94: add sp, #0xc pop {r4, r5, r6, r7, pc} .align 2, 0 -_021DAC98: .word UNK_020FFA38 +_021DAC98: .word FX_SinCosTable_ thumb_func_end MOD73_021DABD0 thumb_func_start MOD73_021DAC9C @@ -7706,7 +7706,7 @@ MOD73_021DB020: ; 0x021DB020 asr r0, r0, #4 lsl r1, r0, #1 add r0, r1, #1 - ldr r7, _021DB124 ; =UNK_020FFA38 + ldr r7, _021DB124 ; =FX_SinCosTable_ lsl r0, r0, #1 ldrsh r3, [r7, r0] asr r6, r3, #0x1f @@ -7819,7 +7819,7 @@ _021DB112: add sp, #0x1c pop {r4, r5, r6, r7, pc} nop -_021DB124: .word UNK_020FFA38 +_021DB124: .word FX_SinCosTable_ _021DB128: .word 0x00000000 thumb_func_end MOD73_021DB020 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 4dce464f..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 @@ -2567,7 +2567,7 @@ MOD77_021D8A30: ; 0x021D8A30 sub sp, #0x24 add r4, r1, #0 ldr r1, [r4, #4] - ldr r3, _021D8AA4 ; =UNK_020FFA38 + ldr r3, _021D8AA4 ; =FX_SinCosTable_ lsl r1, r1, #0x10 lsr r1, r1, #0x10 asr r1, r1, #4 @@ -2580,7 +2580,7 @@ MOD77_021D8A30: ; 0x021D8A30 add r5, r0, #0 bl MTX_RotY33_ ldr r0, [r4] - ldr r3, _021D8AA4 ; =UNK_020FFA38 + ldr r3, _021D8AA4 ; =FX_SinCosTable_ lsl r0, r0, #0x10 lsr r0, r0, #0x10 asr r0, r0, #4 @@ -2597,7 +2597,7 @@ MOD77_021D8A30: ; 0x021D8A30 add r2, r5, #0 bl MTX_Concat33 ldr r0, [r4, #8] - ldr r3, _021D8AA4 ; =UNK_020FFA38 + ldr r3, _021D8AA4 ; =FX_SinCosTable_ lsl r0, r0, #0x10 lsr r0, r0, #0x10 asr r0, r0, #4 @@ -2616,7 +2616,7 @@ MOD77_021D8A30: ; 0x021D8A30 add sp, #0x24 pop {r4, r5, pc} nop -_021D8AA4: .word UNK_020FFA38 +_021D8AA4: .word FX_SinCosTable_ thumb_func_end MOD77_021D8A30 thumb_func_start MOD77_021D8AA8 @@ -2625,7 +2625,7 @@ MOD77_021D8AA8: ; 0x021D8AA8 sub sp, #0x24 add r4, r1, #0 ldr r1, [r4] - ldr r3, _021D8B1C ; =UNK_020FFA38 + ldr r3, _021D8B1C ; =FX_SinCosTable_ lsl r1, r1, #0x10 lsr r1, r1, #0x10 asr r1, r1, #4 @@ -2638,7 +2638,7 @@ MOD77_021D8AA8: ; 0x021D8AA8 add r5, r0, #0 bl MTX_RotY33_ ldr r0, [r4, #4] - ldr r3, _021D8B1C ; =UNK_020FFA38 + ldr r3, _021D8B1C ; =FX_SinCosTable_ neg r0, r0 lsl r0, r0, #0x10 lsr r0, r0, #0x10 @@ -2656,7 +2656,7 @@ MOD77_021D8AA8: ; 0x021D8AA8 add r2, r5, #0 bl MTX_Concat33 ldr r0, [r4, #8] - ldr r3, _021D8B1C ; =UNK_020FFA38 + ldr r3, _021D8B1C ; =FX_SinCosTable_ lsl r0, r0, #0x10 lsr r0, r0, #0x10 asr r0, r0, #4 @@ -2675,7 +2675,7 @@ MOD77_021D8AA8: ; 0x021D8AA8 add sp, #0x24 pop {r4, r5, pc} .align 2, 0 -_021D8B1C: .word UNK_020FFA38 +_021D8B1C: .word FX_SinCosTable_ thumb_func_end MOD77_021D8AA8 thumb_func_start MOD77_021D8B20 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 63312258..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 @@ -1520,7 +1520,7 @@ MOD81_02238988: ; 0x02238988 add r0, r4, #0 add r0, #0x80 ldrh r0, [r0] - ldr r3, _02238A34 ; =UNK_020FFA38 + ldr r3, _02238A34 ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1537,7 +1537,7 @@ MOD81_02238988: ; 0x02238988 add r0, r4, #0 add r0, #0x82 ldrh r0, [r0] - ldr r3, _02238A34 ; =UNK_020FFA38 + ldr r3, _02238A34 ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1554,7 +1554,7 @@ MOD81_02238988: ; 0x02238988 add r0, r4, #0 add r0, #0x84 ldrh r0, [r0] - ldr r3, _02238A34 ; =UNK_020FFA38 + ldr r3, _02238A34 ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -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 @@ -1591,7 +1591,7 @@ _02238A20: add sp, #0x50 pop {r4, pc} .align 2, 0 -_02238A34: .word UNK_020FFA38 +_02238A34: .word FX_SinCosTable_ thumb_func_end MOD81_02238988 thumb_func_start MOD81_02238A38 @@ -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 @@ -1806,7 +1806,7 @@ MOD81_02238B8C: ; 0x02238B8C add r0, r4, #0 add r0, #0x80 ldrh r0, [r0] - ldr r3, _02238C3C ; =UNK_020FFA38 + ldr r3, _02238C3C ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1823,7 +1823,7 @@ MOD81_02238B8C: ; 0x02238B8C add r0, r4, #0 add r0, #0x82 ldrh r0, [r0] - ldr r3, _02238C3C ; =UNK_020FFA38 + ldr r3, _02238C3C ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1840,7 +1840,7 @@ MOD81_02238B8C: ; 0x02238B8C add r0, r4, #0 add r0, #0x84 ldrh r0, [r0] - ldr r3, _02238C3C ; =UNK_020FFA38 + ldr r3, _02238C3C ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -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,12 +1871,12 @@ 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} .align 2, 0 -_02238C3C: .word UNK_020FFA38 +_02238C3C: .word FX_SinCosTable_ thumb_func_end MOD81_02238B8C thumb_func_start MOD81_02238C40 @@ -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 53dfe036..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 @@ -1010,7 +1010,7 @@ MOD84_021D7CFC: ; 0x021D7CFC add r0, r4, #0 add r0, #0x94 ldrh r0, [r0] - ldr r3, _021D7DF0 ; =UNK_020FFA38 + ldr r3, _021D7DF0 ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1027,7 +1027,7 @@ MOD84_021D7CFC: ; 0x021D7CFC add r0, r4, #0 add r0, #0x96 ldrh r0, [r0] - ldr r3, _021D7DF0 ; =UNK_020FFA38 + ldr r3, _021D7DF0 ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1044,7 +1044,7 @@ MOD84_021D7CFC: ; 0x021D7CFC add r0, r4, #0 add r0, #0x98 ldrh r0, [r0] - ldr r3, _021D7DF0 ; =UNK_020FFA38 + ldr r3, _021D7DF0 ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1098,14 +1098,14 @@ _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 add sp, #0x4c pop {r3, r4, pc} nop -_021D7DF0: .word UNK_020FFA38 +_021D7DF0: .word FX_SinCosTable_ thumb_func_end MOD84_021D7CFC thumb_func_start MOD84_021D7DF4 @@ -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] |