Rename libnns symbols

5 files changed, 41 insertions, 41 deletions

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);