diff options
Diffstat (limited to 'arm9/modules/05/asm')
-rw-r--r-- | arm9/modules/05/asm/mod05_021D74E0.s | 20 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021D9A48.s | 18 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021DB44C.s | 8 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021DBABC.s | 42 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021DBEF4.s | 2 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021DC0B8.s | 14 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021E3444.s | 14 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021E4AE4.s | 20 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021E55BC.s | 2 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021E577C.s | 2 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021E5918.s | 2 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021E5AB4.s | 10 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021E5C8C.s | 8 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021E5E10.s | 8 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021E7C00.s | 20 | ||||
-rw-r--r-- | arm9/modules/05/asm/module_05.s | 80 |
16 files changed, 135 insertions, 135 deletions
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 |