diff options
| author | Demki <mordbz@gmail.com> | 2020-04-24 19:32:27 +0300 |
|---|---|---|
| committer | Demki <mordbz@gmail.com> | 2020-04-24 19:32:27 +0300 |
| commit | adcf9a9db5bda045a363c1e29e0b8f786fd0745a (patch) | |
| tree | 28694a1938f6d1cf43c31506db5d5c56e85a949f | |
| parent | 4602fa7d806118f124a4ff5b56f4a5190b30d08c (diff) | |
clean up undefined_syms.txt and apply names
| -rw-r--r-- | asm/unk_020023C0.s | 68 | ||||
| -rw-r--r-- | asm/unk_02006864.s | 332 | ||||
| -rw-r--r-- | asm/unk_02046030.s | 40 | ||||
| -rw-r--r-- | asm/unk_0208AC14.s | 38 | ||||
| -rw-r--r-- | asm/unk_020AF030.s | 24 | ||||
| -rw-r--r-- | global.inc | 224 | ||||
| -rw-r--r-- | undefined_syms.txt | 314 |
7 files changed, 366 insertions, 674 deletions
diff --git a/asm/unk_020023C0.s b/asm/unk_020023C0.s index cd02d807..f826c6c3 100644 --- a/asm/unk_020023C0.s +++ b/asm/unk_020023C0.s @@ -2690,109 +2690,109 @@ _020037A6: ldr r0, [r4, #0x4] ldr r2, [r4, #0x8] mov r1, #0x0 - blx FUN_020C9550 + blx GX_LoadBGPltt_2 b _020038A4 _020037B2: ldr r0, [r4, #0x4] ldr r2, [r4, #0x8] mov r1, #0x0 - blx FUN_020C94E8 + blx GXS_LoadBGPltt_2 b _020038A4 _020037BE: ldr r0, [r4, #0x4] ldr r2, [r4, #0x8] mov r1, #0x0 - blx FUN_020C9480 + blx GX_LoadOBJPltt_2 b _020038A4 _020037CA: ldr r0, [r4, #0x4] ldr r2, [r4, #0x8] mov r1, #0x0 - blx FUN_020C9418 + blx GXS_LoadOBJPltt_2 b _020038A4 _020037D6: - blx FUN_020C8B10 + blx GX_BeginLoadBGExtPltt ldr r0, [r4, #0x4] ldr r2, [r4, #0x8] mov r1, #0x0 - blx FUN_020C8A90 - blx FUN_020C8A2C + blx GX_LoadBGExtPltt + blx GX_EndLoadBGExtPltt b _020038A4 _020037EA: - blx FUN_020C8B10 + blx GX_BeginLoadBGExtPltt ldr r0, [r4, #0x4] ldr r2, [r4, #0x8] add r1, r7, #0x0 - blx FUN_020C8A90 - blx FUN_020C8A2C + blx GX_LoadBGExtPltt + blx GX_EndLoadBGExtPltt b _020038A4 _020037FE: - blx FUN_020C8B10 + blx GX_BeginLoadBGExtPltt mov r1, #0x1 ldr r0, [r4, #0x4] ldr r2, [r4, #0x8] lsl r1, r1, #0xe - blx FUN_020C8A90 - blx FUN_020C8A2C + blx GX_LoadBGExtPltt + blx GX_EndLoadBGExtPltt b _020038A4 _02003814: - blx FUN_020C8B10 + blx GX_BeginLoadBGExtPltt mov r1, #0x6 ldr r0, [r4, #0x4] ldr r2, [r4, #0x8] lsl r1, r1, #0xc - blx FUN_020C8A90 - blx FUN_020C8A2C + blx GX_LoadBGExtPltt + blx GX_EndLoadBGExtPltt b _020038A4 _0200382A: - blx FUN_020C88CC + blx GXS_BeginLoadBGExtPltt ldr r0, [r4, #0x4] ldr r2, [r4, #0x8] mov r1, #0x0 - blx FUN_020C8858 - blx FUN_020C880C + blx GXS_LoadBGExtPltt + blx GXS_EndLoadBGExtPltt b _020038A4 _0200383E: - blx FUN_020C88CC + blx GXS_BeginLoadBGExtPltt ldr r0, [r4, #0x4] ldr r2, [r4, #0x8] add r1, r7, #0x0 - blx FUN_020C8858 - blx FUN_020C880C + blx GXS_LoadBGExtPltt + blx GXS_EndLoadBGExtPltt b _020038A4 _02003852: - blx FUN_020C88CC + blx GXS_BeginLoadBGExtPltt mov r1, #0x1 ldr r0, [r4, #0x4] ldr r2, [r4, #0x8] lsl r1, r1, #0xe - blx FUN_020C8858 - blx FUN_020C880C + blx GXS_LoadBGExtPltt + blx GXS_EndLoadBGExtPltt b _020038A4 _02003868: - blx FUN_020C88CC + blx GXS_BeginLoadBGExtPltt mov r1, #0x6 ldr r0, [r4, #0x4] ldr r2, [r4, #0x8] lsl r1, r1, #0xc - blx FUN_020C8858 - blx FUN_020C880C + blx GXS_LoadBGExtPltt + blx GXS_EndLoadBGExtPltt b _020038A4 _0200387E: - blx FUN_020C89BC + blx GX_BeginLoadOBJExtPltt ldr r0, [r4, #0x4] ldr r2, [r4, #0x8] mov r1, #0x0 - blx FUN_020C8948 - blx FUN_020C88F0 + blx GX_LoadOBJExtPltt + blx GX_EndLoadOBJExtPltt b _020038A4 _02003892: - blx FUN_020C87E8 + blx GXS_BeginLoadOBJExtPltt ldr r0, [r4, #0x4] ldr r2, [r4, #0x8] mov r1, #0x0 - blx FUN_020C8774 - blx FUN_020C8728 + blx GXS_LoadOBJExtPltt + blx GXS_EndLoadOBJExtPltt _020038A4: add r5, r5, #0x1 add r4, #0x14 diff --git a/asm/unk_02006864.s b/asm/unk_02006864.s index fc213a12..b2633b24 100644 --- a/asm/unk_02006864.s +++ b/asm/unk_02006864.s @@ -179,7 +179,7 @@ _0200699C: ; jump table (using 16-bit offset) .short _020069C6 - _0200699C - 2; case 6
.short _020069FA - _0200699C - 2; case 7
_020069AC:
- blx FUN_020C8B10
+ blx GX_BeginLoadBGExtPltt
ldr r0, [sp, #0x8]
ldr r3, _02006A30 ; =0x020ECBB0
lsl r4, r4, #0x2
@@ -188,10 +188,10 @@ _020069AC: add r1, r6, #0x0
add r2, r5, #0x0
blx r3
- blx FUN_020C8A2C
+ blx GX_EndLoadBGExtPltt
b _02006A24
_020069C6:
- blx FUN_020C88CC
+ blx GXS_BeginLoadBGExtPltt
ldr r0, [sp, #0x8]
ldr r3, _02006A30 ; =0x020ECBB0
lsl r4, r4, #0x2
@@ -200,10 +200,10 @@ _020069C6: add r1, r6, #0x0
add r2, r5, #0x0
blx r3
- blx FUN_020C880C
+ blx GXS_EndLoadBGExtPltt
b _02006A24
_020069E0:
- blx FUN_020C89BC
+ blx GX_BeginLoadOBJExtPltt
ldr r0, [sp, #0x8]
ldr r3, _02006A30 ; =0x020ECBB0
lsl r4, r4, #0x2
@@ -212,10 +212,10 @@ _020069E0: add r1, r6, #0x0
add r2, r5, #0x0
blx r3
- blx FUN_020C88F0
+ blx GX_EndLoadOBJExtPltt
b _02006A24
_020069FA:
- blx FUN_020C87E8
+ blx GXS_BeginLoadOBJExtPltt
ldr r0, [sp, #0x8]
ldr r3, _02006A30 ; =0x020ECBB0
lsl r4, r4, #0x2
@@ -224,7 +224,7 @@ _020069FA: add r1, r6, #0x0
add r2, r5, #0x0
blx r3
- blx FUN_020C8728
+ blx GXS_EndLoadOBJExtPltt
b _02006A24
_02006A14:
ldr r0, [sp, #0x8]
@@ -540,7 +540,7 @@ FUN_02006C5C: ; 0x02006C5C add r5, r0, #0x0
beq _02006C82
add r1, r4, #0x0
- blx FUN_020AFD94
+ blx thunk_FUN_020afda0_2
cmp r0, #0x0
bne _02006C82
add r0, r5, #0x0
@@ -969,7 +969,7 @@ _02006F7E: ldrsh r0, [r0, r1]
mov r1, #0x2
ldrsh r1, [r2, r1]
- blx FUN_020C8068
+ blx G3_RotX
ldrh r0, [r4, #0x3a]
asr r0, r0, #0x4
lsl r1, r0, #0x2
@@ -978,7 +978,7 @@ _02006F7E: ldrsh r0, [r0, r1]
mov r1, #0x2
ldrsh r1, [r2, r1]
- blx FUN_020C802C
+ blx G3_RotY
ldrh r0, [r4, #0x3c]
asr r0, r0, #0x4
lsl r1, r0, #0x2
@@ -987,7 +987,7 @@ _02006F7E: ldrsh r0, [r0, r1]
mov r1, #0x2
ldrsh r1, [r2, r1]
- blx FUN_020C7FF0
+ blx G3_RotZ
ldr r0, [r4, #0x28]
lsl r0, r0, #0xc
neg r1, r0
@@ -5035,10 +5035,10 @@ FUN_02008D44: ; 0x02008D44 beq _02008D98
b _02008DC4
_02008D5A:
- blx FUN_020C5DBC
+ blx GX_GetBankForOBJ
cmp r0, #0x40
beq _02008D6A
- blx FUN_020C5DBC
+ blx GX_GetBankForOBJ
cmp r0, #0x20
bne _02008D7A
_02008D6A:
@@ -5065,10 +5065,10 @@ _02008D8A: bl FUN_0201D194
pop {r4, pc}
_02008D98:
- blx FUN_020C5DBC
+ blx GX_GetBankForOBJ
cmp r0, #0x30
beq _02008DA8
- blx FUN_020C5DBC
+ blx GX_GetBankForOBJ
cmp r0, #0x50
bne _02008DB6
_02008DA8:
@@ -6608,7 +6608,7 @@ FUN_020098CC: ; 0x020098CC add r4, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
- blx FUN_020AFD94
+ blx thunk_FUN_020afda0_2
add r0, r4, #0x0
pop {r3-r5, pc}
.balign 4
@@ -6638,7 +6638,7 @@ FUN_02009904: ; 0x02009904 add r4, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
- blx FUN_020AFD88
+ blx thunk_FUN_020afda0
add r0, r4, #0x0
pop {r3-r5, pc}
.balign 4
@@ -7757,7 +7757,7 @@ _0200A166: ldrsh r2, [r5, r2]
ldr r0, _0200A198 ; =0x04000050
ldr r1, [r5, #0x0]
- blx FUN_020C74B8
+ blx G2x_SetBlendBrightness_
b _0200A18E
_0200A17C:
mov r0, #0x2
@@ -7767,7 +7767,7 @@ _0200A17C: ldrsh r2, [r5, r2]
ldr r0, _0200A19C ; =0x04001050
ldr r1, [r5, #0x0]
- blx FUN_020C74B8
+ blx G2x_SetBlendBrightness_
_0200A18E:
cmp r4, #0x1
bne _0200A196
@@ -7850,7 +7850,7 @@ FUN_0200A208: ; 0x0200A208 beq _0200A23A
ldr r0, _0200A264 ; =0x04000050
add r1, r4, #0x0
- blx FUN_020C74B8
+ blx G2x_SetBlendBrightness_
str r4, [sp, #0x0]
mov r0, #0x1
str r0, [sp, #0x4]
@@ -7867,7 +7867,7 @@ _0200A23A: ldr r0, _0200A26C ; =0x04001050
add r1, r4, #0x0
add r2, r6, #0x0
- blx FUN_020C74B8
+ blx G2x_SetBlendBrightness_
str r4, [sp, #0x0]
mov r0, #0x2
str r0, [sp, #0x4]
@@ -7896,7 +7896,7 @@ FUN_0200A274: ; 0x0200A274 beq _0200A28A
ldr r0, _0200A2A4 ; =0x04000050
add r2, r5, #0x0
- blx FUN_020C74B8
+ blx G2x_SetBlendBrightness_
_0200A28A:
mov r0, #0x2
tst r0, r4
@@ -7904,7 +7904,7 @@ _0200A28A: ldr r0, _0200A2A8 ; =0x04001050
add r1, r6, #0x0
add r2, r5, #0x0
- blx FUN_020C74B8
+ blx G2x_SetBlendBrightness_
_0200A29A:
add r0, r4, #0x0
bl FUN_0200A2D8
@@ -15859,7 +15859,7 @@ FUN_0200DEF4: ; 0x0200DEF4 add r0, r4, #0x0
add r1, r7, #0x0
lsl r2, r2, #0x8
- blx FUN_020C92F4
+ blx GX_LoadOBJ_2
add r0, r4, #0x0
bl FUN_02016A18
ldr r2, _0200DFC8 ; =0x00000162
@@ -15884,7 +15884,7 @@ FUN_0200DEF4: ; 0x0200DEF4 add r0, r4, #0x0
add r1, r5, #0x0
mov r2, #0x20
- blx FUN_020C9480
+ blx GX_LoadOBJPltt_2
add r0, r4, #0x0
bl FUN_02016A18
add sp, #0x28
@@ -16385,12 +16385,12 @@ FUN_0200E3BC: ; 0x0200E3BC bne _0200E3D2
mov r1, #0x0
mov r2, #0x2
- blx FUN_020C9550
+ blx GX_LoadBGPltt_2
b _0200E3DA
_0200E3D2:
mov r1, #0x0
mov r2, #0x2
- blx FUN_020C94E8
+ blx GXS_LoadBGPltt_2
_0200E3DA:
ldr r0, _0200E41C ; =0x021C4740
mov r1, #0x1
@@ -16430,11 +16430,11 @@ FUN_0200E420: ; 0x0200E420 add r0, sp, #0x8
mov r1, #0x0
mov r2, #0x2
- blx FUN_020C9550
+ blx GX_LoadBGPltt_2
add r0, sp, #0x8
mov r1, #0x0
mov r2, #0x2
- blx FUN_020C94E8
+ blx GXS_LoadBGPltt_2
pop {r3}
pop {r3}
add sp, #0x10
@@ -16446,11 +16446,11 @@ FUN_0200E440: ; 0x0200E440 cmp r0, #0x0
bne _0200E44E
ldr r0, _0200E458 ; =0x0400006C
- blx FUN_020C5978
+ blx GXx_SetMasterBrightness_
pop {r3, pc}
_0200E44E:
ldr r0, _0200E45C ; =0x0400106C
- blx FUN_020C5978
+ blx GXx_SetMasterBrightness_
pop {r3, pc}
nop
_0200E458: .word 0x0400006C
@@ -18095,13 +18095,13 @@ FUN_0200F0B4: ; 0x0200F0B4 ldr r2, _0200F0C8 ; =0x020FFA38
add r1, r1, #0x1
lsl r1, r1, #0x1
- ldr r3, _0200F0CC ; =FUN_020C50B8
+ ldr r3, _0200F0CC ; =FX_Div
ldrsh r0, [r2, r0]
ldrsh r1, [r2, r1]
bx r3
.balign 4
_0200F0C8: .word 0x020FFA38
-_0200F0CC: .word FUN_020C50B8
+_0200F0CC: .word FX_Div
thumb_func_start FUN_0200F0D0
FUN_0200F0D0: ; 0x0200F0D0
@@ -18178,7 +18178,7 @@ FUN_0200F14C: ; 0x0200F14C add r0, r4, r0
asr r0, r0, #0x1
lsl r0, r0, #0xc
- blx FUN_020C50B8
+ blx FX_Div
pop {r4, pc}
thumb_func_start FUN_0200F164
@@ -20316,7 +20316,7 @@ _020100FA: lsr r2, r2, #0xc
orr r2, r1
sub r0, r0, r2
- blx FUN_020C504C
+ blx FX_Sqrt
asr r2, r0, #0xc
ldr r0, [sp, #0x0]
sub r0, r0, r2
@@ -24121,7 +24121,7 @@ _02011DC6: add r0, r7, #0x0
add r1, r6, #0x0
add r2, r4, #0x0
- blx FUN_020C92F4
+ blx GX_LoadOBJ_2
mov r0, #0x1
str r6, [r5, #0x4]
lsl r0, r0, #0x1a
@@ -24132,7 +24132,7 @@ _02011E08: add r0, r7, #0x0
add r1, r6, #0x0
add r2, r4, #0x0
- blx FUN_020C9294
+ blx GXS_LoadOBJ_2
ldr r0, _02011E4C ; =0x04001000
str r6, [r5, #0x8]
ldr r1, [r0, #0x0]
@@ -29220,7 +29220,7 @@ _02014172: lsl r2, r2, #0x1
ldrsh r0, [r1, r0]
ldrsh r1, [r1, r2]
- blx FUN_020C7FF0
+ blx G3_RotZ
ldr r2, [r5, #0x10]
ldr r0, [r5, #0xc]
ldr r1, _02014210 ; =0x0400046C
@@ -30499,7 +30499,7 @@ FUN_02014B10: ; 0x02014B10 ldr r1, [r4, #0xc]
ldr r0, [r0, #0xc]
ldr r2, [r4, #0x10]
- blx FUN_020C9550
+ blx GX_LoadBGPltt_2
b _02014B44
_02014B34:
cmp r0, #0x4
@@ -30508,7 +30508,7 @@ _02014B34: ldr r1, [r4, #0xc]
ldr r0, [r0, #0xc]
ldr r2, [r4, #0x10]
- blx FUN_020C94E8
+ blx GXS_LoadBGPltt_2
_02014B44:
add r0, r5, #0x0
bl FUN_0200CAB4
@@ -33301,7 +33301,7 @@ FUN_02015F80: ; 0x02015F80 mov r0, #0x2
blx OS_DisableIrqMask
mov r0, #0x0
- blx FUN_020C5AF8
+ blx GX_HBlankIntr
b _02015FB4
_02015F9E:
ldr r0, [r2, #0x8]
@@ -33311,7 +33311,7 @@ _02015F9E: mov r0, #0x2
blx OS_EnableIrqMask
mov r0, #0x1
- blx FUN_020C5AF8
+ blx GX_HBlankIntr
_02015FB4:
ldr r1, _02015FC0 ; =0x04000208
ldrh r0, [r1, #0x0]
@@ -33367,7 +33367,7 @@ _02016010: .word 0x020EDB10 InitSystemForTheGame: ; 0x02016014
push {r3-r5, lr}
blx OS_Init
- blx FUN_020C5974
+ blx FX_Init
ldr r2, _02016124 ; =0x04000304
ldr r0, _02016128 ; =0xFFFFFDF1
ldrh r1, [r2, #0x0]
@@ -33375,7 +33375,7 @@ InitSystemForTheGame: ; 0x02016014 ldr r0, _0201612C ; =0x0000020E
orr r0, r1
strh r0, [r2, #0x0]
- blx FUN_020C5B28
+ blx GX_Init
blx OS_InitTick
bl FUN_02015FC8
mov r0, #0xa0
@@ -33422,7 +33422,7 @@ InitSystemForTheGame: ; 0x02016014 bl FUN_0201B580
ldr r1, _02016130 ; =0x021C48B8
str r0, [r1, #0x24]
- blx FUN_020C5A80
+ blx GX_DispOff
ldr r2, _02016134 ; =0x04001000
ldr r0, _02016138 ; =0xFFFEFFFF
ldr r1, [r2, #0x0]
@@ -33445,7 +33445,7 @@ InitSystemForTheGame: ; 0x02016014 ldrh r0, [r1, #0x0]
mov r0, #0x1
strh r0, [r1, #0x0]
- blx FUN_020C5AC8
+ blx GX_VBlankIntr
mov r0, #0x1
blx FS_Init
bl FUN_02022450
@@ -33489,14 +33489,14 @@ _02016144: .word 0x021C4918 InitGraphicMemory: ; 0x02016148
push {r3, lr}
ldr r0, _02016198 ; =0x000001FF
- blx FUN_020C63A8
+ blx GX_SetBankForLCDC
mov r1, #0x1a
mov r2, #0x29
mov r0, #0x0
lsl r1, r1, #0x16
lsl r2, r2, #0xe
blx MIi_CpuClearFast
- blx FUN_020C5E54
+ blx GX_DisableBankForLCDC
mov r1, #0x7
mov r2, #0x1
mov r0, #0xc0
@@ -34325,7 +34325,7 @@ _02016772: beq _0201678E
ldr r1, [r5, #0x0]
mov r2, #0x0
- blx FUN_020ADFE8
+ blx tempName_NNS_FndCreateExpHeapEx
ldr r1, _020167F0 ; =0x021C4D28
ldr r2, [r1, #0x0]
ldr r1, [sp, #0x0]
@@ -34463,7 +34463,7 @@ _0201684C: ldr r1, [sp, #0x0]
add r0, r6, #0x0
add r2, r7, #0x0
- blx FUN_020ADFA0
+ blx tempName_NNS_FndAllocFromExpHeapEx
str r0, [sp, #0x4]
cmp r0, #0x0
beq _020168B6
@@ -34474,7 +34474,7 @@ _0201684C: ldr r1, [sp, #0x0]
mov r2, #0x0
lsl r4, r7, #0x2
- blx FUN_020ADFE8
+ blx tempName_NNS_FndCreateExpHeapEx
ldr r1, _020168CC ; =0x021C4D28
ldr r2, [r1, #0x0]
str r0, [r2, r4]
@@ -34530,7 +34530,7 @@ _020168E0: ldr r0, [r1, r0]
cmp r0, #0x0
beq _0201693E
- blx FUN_020ADFDC
+ blx thunk_FUN_020adc8c
ldr r1, _02016940 ; =0x021C4D28
ldr r0, [r1, #0x10]
ldrb r0, [r0, r4]
@@ -34590,7 +34590,7 @@ _02016956: add r0, r5, #0x0
add r1, r4, #0x0
add r2, r7, #0x0
- blx FUN_020ADFA0
+ blx tempName_NNS_FndAllocFromExpHeapEx
add r4, r0, #0x0
ldr r0, [sp, #0x0]
blx OS_RestoreInterrupts
@@ -34916,9 +34916,9 @@ FUN_02016BBC: ; 0x02016BBC ldr r0, [r4, #0x0]
ldr r1, [r4, #0x4]
ldr r2, [r4, #0xc]
- blx FUN_020C59C0
+ blx GX_SetGraphicsMode
ldr r0, [r4, #0x8]
- blx FUN_020C59A4
+ blx GXS_SetGraphicsMode
mov r2, #0x1
lsl r2, r2, #0x1a
ldr r1, [r2, #0x0]
@@ -34944,12 +34944,12 @@ FUN_02016BF4: ; 0x02016BF4 ldr r0, [r2, #0x0]
ldr r1, [r2, #0x4]
ldr r2, [r2, #0xc]
- blx FUN_020C59C0
+ blx GX_SetGraphicsMode
bl FUN_0201E6D8
pop {r3, pc}
_02016C0C:
ldr r0, [r2, #0x8]
- blx FUN_020C59A4
+ blx GXS_SetGraphicsMode
bl FUN_0201E740
pop {r3, pc}
@@ -37134,7 +37134,7 @@ _02017BFC: ldr r0, [r4, #0x18]
str r0, [sp, #0x4]
ldr r0, _02017C5C ; =0x04000020
- blx FUN_020C74F8
+ blx G2x_SetBGyAffine_
add sp, #0x8
pop {r3-r5, pc}
_02017C14:
@@ -37146,7 +37146,7 @@ _02017C14: ldr r0, [r4, #0x18]
str r0, [sp, #0x4]
ldr r0, _02017C60 ; =0x04000030
- blx FUN_020C74F8
+ blx G2x_SetBGyAffine_
add sp, #0x8
pop {r3-r5, pc}
_02017C2C:
@@ -37158,7 +37158,7 @@ _02017C2C: ldr r0, [r4, #0x18]
str r0, [sp, #0x4]
ldr r0, _02017C64 ; =0x04001020
- blx FUN_020C74F8
+ blx G2x_SetBGyAffine_
add sp, #0x8
pop {r3-r5, pc}
_02017C44:
@@ -37170,7 +37170,7 @@ _02017C44: ldr r0, [r4, #0x18]
str r0, [sp, #0x4]
ldr r0, _02017C68 ; =0x04001030
- blx FUN_020C74F8
+ blx G2x_SetBGyAffine_
_02017C58:
add sp, #0x8
pop {r3-r5, pc}
@@ -37340,49 +37340,49 @@ _02017D9A: add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx FUN_020C922C
+ blx GX_LoadBG0Scr_2
pop {r3-r7, pc}
_02017DA6:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx FUN_020C915C
+ blx GX_LoadBG1Scr_2
pop {r3-r7, pc}
_02017DB2:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx FUN_020C908C
+ blx GX_LoadBG2Scr_3
pop {r3-r7, pc}
_02017DBE:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx FUN_020C8FBC
+ blx GX_LoadBG3Scr_3
pop {r3-r7, pc}
_02017DCA:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx FUN_020C91C4
+ blx GXS_LoadBG0Scr_2
pop {r3-r7, pc}
_02017DD6:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx FUN_020C90F4
+ blx GXS_LoadBG1Scr_2
pop {r3-r7, pc}
_02017DE2:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx FUN_020C9024
+ blx GXS_LoadBG2Scr_3
pop {r3-r7, pc}
_02017DEE:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx FUN_020C8F54
+ blx GXS_LoadBG3Scr_3
_02017DF8:
pop {r3-r7, pc}
.balign 4
@@ -37489,49 +37489,49 @@ _02017EB6: add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx FUN_020C8EEC
+ blx GX_LoadBG0Char_2
pop {r3-r7, pc}
_02017EC2:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx FUN_020C8E1C
+ blx GX_LoadBG1Char_2
pop {r3-r7, pc}
_02017ECE:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx FUN_020C8D4C
+ blx GX_LoadBG2Char_2
pop {r3-r7, pc}
_02017EDA:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx FUN_020C8C7C
+ blx GX_LoadBG3Char_2
pop {r3-r7, pc}
_02017EE6:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx FUN_020C8E84
+ blx GXS_LoadBG0Char_2
pop {r3-r7, pc}
_02017EF2:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx FUN_020C8DB4
+ blx GXS_LoadBG1Char_2
pop {r3-r7, pc}
_02017EFE:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx FUN_020C8CE4
+ blx GXS_LoadBG2Char_2
pop {r3-r7, pc}
_02017F0A:
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r6, #0x0
- blx FUN_020C8C14
+ blx GXS_LoadBG3Char_2
_02017F14:
pop {r3-r7, pc}
.balign 4
@@ -37629,13 +37629,13 @@ FUN_02017FB4: ; 0x02017FB4 add r0, r5, #0x0
add r1, r7, #0x0
add r2, r4, #0x0
- blx FUN_020C9550
+ blx GX_LoadBGPltt_2
pop {r3-r7, pc}
_02017FD6:
add r0, r5, #0x0
add r1, r7, #0x0
add r2, r4, #0x0
- blx FUN_020C94E8
+ blx GXS_LoadBGPltt_2
pop {r3-r7, pc}
.balign 4
@@ -38736,28 +38736,28 @@ _020187C2: ; jump table (using 16-bit offset) .short _020187F6 - _020187C2 - 2; case 6
.short _020187FC - _020187C2 - 2; case 7
_020187D2:
- blx FUN_020C7124
+ blx G2_GetBG0CharPtr
pop {r3, pc}
_020187D8:
- blx FUN_020C70D0
+ blx G2_GetBG1CharPtr
pop {r3, pc}
_020187DE:
- blx FUN_020C7058
+ blx G2_GetBG2CharPtr
pop {r3, pc}
_020187E4:
- blx FUN_020C6FB0
+ blx G2_GetBG3CharPtr
pop {r3, pc}
_020187EA:
- blx FUN_020C7104
+ blx G2S_GetBG0CharPtr
pop {r3, pc}
_020187F0:
- blx FUN_020C70B0
+ blx G2S_GetBG1CharPtr
pop {r3, pc}
_020187F6:
- blx FUN_020C7010
+ blx G2S_GetBG2CharPtr
pop {r3, pc}
_020187FC:
- blx FUN_020C6F60
+ blx G2S_GetBG3CharPtr
pop {r3, pc}
_02018802:
mov r0, #0x0
@@ -43889,7 +43889,7 @@ _0201ACEA: ldr r2, [r2, #0x0]
ldr r3, [r3, #0x0]
add r1, sp, #0x38
- blx FUN_020C74F8
+ blx G2x_SetBGyAffine_
_0201AD1E:
ldrh r1, [r4, #0x4]
mov r0, #0x8
@@ -43945,7 +43945,7 @@ _0201AD4E: ldr r2, [r2, #0x0]
ldr r3, [r3, #0x0]
add r1, sp, #0x28
- blx FUN_020C74F8
+ blx G2x_SetBGyAffine_
_0201AD8E:
ldrh r1, [r4, #0x4]
mov r0, #0x10
@@ -44035,7 +44035,7 @@ _0201AE04: ldr r2, [r4, r2]
ldr r3, [r4, r3]
add r1, sp, #0x18
- blx FUN_020C74F8
+ blx G2x_SetBGyAffine_
_0201AE3E:
ldrh r0, [r4, #0x4]
mov r3, #0x80
@@ -44090,7 +44090,7 @@ _0201AE72: ldr r2, [r4, r2]
ldr r3, [r4, r3]
add r1, sp, #0x8
- blx FUN_020C74F8
+ blx G2x_SetBGyAffine_
_0201AEAC:
add sp, #0x48
pop {r4, pc}
@@ -44712,13 +44712,13 @@ FUN_0201B314: ; 0x0201B314 add r1, r0, #0x0
add r2, r0, #0x0
add r3, r0, #0x0
- blx FUN_020C7C28
+ blx G3X_SetFog
mov r0, #0x0
ldr r2, _0201B38C ; =0x00007FFF
add r1, r0, #0x0
mov r3, #0x3f
str r0, [sp, #0x0]
- blx FUN_020C7B3C
+ blx G3X_SetClearColor
ldr r1, _0201B390 ; =0xBFFF0000
ldr r0, _0201B394 ; =0x04000580
str r1, [r0, #0x0]
@@ -45401,7 +45401,7 @@ FUN_0201B82C: ; 0x0201B82C add r4, sp, #0x8
_0201B86A:
add r0, r4, #0x0
- blx FUN_020C7A14
+ blx G3X_GetBoxTestResult
cmp r0, #0x0
bne _0201B86A
ldr r0, [sp, #0x8]
@@ -45928,7 +45928,7 @@ FUN_0201BBD0: ; 0x0201BBD0 str r0, [sp, #0x34]
add r0, sp, #0x2c
add r1, sp, #0x14
- blx FUN_020C5288
+ blx VEC_Normalize
mov r1, #0x0
ldr r0, [sp, #0x0]
str r1, [sp, #0x34]
@@ -45940,7 +45940,7 @@ FUN_0201BBD0: ; 0x0201BBD0 str r5, [sp, #0x2c]
str r4, [sp, #0x30]
str r6, [sp, #0x24]
- blx FUN_020C5600
+ blx VEC_Subtract
add r0, sp, #0x14
add r1, sp, #0x8
blx VEC_DotProduct
@@ -47550,10 +47550,10 @@ FUN_0201C7B0: ; 0x0201C7B0 sub sp, #0x30
add r4, r1, #0x0
add r1, sp, #0x24
- blx FUN_020C5288
+ blx VEC_Normalize
add r0, r4, #0x0
add r1, sp, #0x18
- blx FUN_020C5288
+ blx VEC_Normalize
ldr r0, [sp, #0x24]
ldr r4, [sp, #0x18]
str r0, [sp, #0x0]
@@ -47636,7 +47636,7 @@ _0201C862: pop {r3-r7, pc}
_0201C86A:
add r1, r5, #0x0
- blx FUN_020C5668
+ blx FX_Modf
add sp, #0x30
pop {r3-r7, pc}
.balign 4
@@ -47934,7 +47934,7 @@ FUN_0201CAA8: ; 0x0201CAA8 ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r5, r0, #0x0
- bl FUN_020C3F38
+ bl MTX_RotX33_
ldr r0, [r4, #0x4]
ldr r3, _0201CB1C ; =0x020FFA38
lsl r0, r0, #0x10
@@ -47947,11 +47947,11 @@ FUN_0201CAA8: ; 0x0201CAA8 ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #0x0
- bl FUN_020C3F54
+ bl MTX_RotY33_
add r0, r5, #0x0
add r1, sp, #0x0
add r2, r5, #0x0
- blx FUN_020C400C
+ blx MTX_Concat33
ldr r0, [r4, #0x8]
ldr r3, _0201CB1C ; =0x020FFA38
lsl r0, r0, #0x10
@@ -47964,11 +47964,11 @@ FUN_0201CAA8: ; 0x0201CAA8 ldrsh r1, [r3, r1]
ldrsh r2, [r3, r2]
add r0, sp, #0x0
- bl FUN_020C3F70
+ bl MTX_RotZ33_
add r0, r5, #0x0
add r1, sp, #0x0
add r2, r5, #0x0
- blx FUN_020C400C
+ blx MTX_Concat33
add sp, #0x24
pop {r4-r5, pc}
nop
@@ -47988,7 +47988,7 @@ FUN_0201CB20: ; 0x0201CB20 ldr r1, [r2, r1]
ldr r2, [r2, r3]
add r7, r0, #0x0
- bl FUN_020C3F38
+ bl MTX_RotX33_
lsl r1, r5, #0x2
ldr r3, _0201CB78 ; =0x020EDF50
add r5, #0x5a
@@ -47996,11 +47996,11 @@ FUN_0201CB20: ; 0x0201CB20 ldr r1, [r3, r1]
ldr r2, [r3, r2]
add r0, sp, #0x0
- bl FUN_020C3F54
+ bl MTX_RotY33_
add r0, r7, #0x0
add r1, sp, #0x0
add r2, r7, #0x0
- blx FUN_020C400C
+ blx MTX_Concat33
lsl r1, r4, #0x2
ldr r3, _0201CB78 ; =0x020EDF50
add r4, #0x5a
@@ -48008,11 +48008,11 @@ FUN_0201CB20: ; 0x0201CB20 ldr r1, [r3, r1]
ldr r2, [r3, r2]
add r0, sp, #0x0
- bl FUN_020C3F70
+ bl MTX_RotZ33_
add r0, r7, #0x0
add r1, sp, #0x0
add r2, r7, #0x0
- blx FUN_020C400C
+ blx MTX_Concat33
add sp, #0x24
pop {r4-r7, pc}
.balign 4
@@ -48033,7 +48033,7 @@ FUN_0201CB7C: ; 0x0201CB7C ldrsh r1, [r1, r2]
add r5, r3, #0x0
ldr r4, [sp, #0x18]
- blx FUN_020C50B8
+ blx FX_Div
add r2, r0, #0x0
asr r1, r6, #0x1f
add r0, r6, #0x0
@@ -48085,7 +48085,7 @@ FUN_0201CBEC: ; 0x0201CBEC mul r0, r2
add r0, r1, r0
lsl r0, r0, #0xc
- blx FUN_020C504C
+ blx FX_Sqrt
asr r0, r0, #0xc
pop {r3, pc}
.balign 4
@@ -50123,7 +50123,7 @@ _0201DAE4: .word 0x021C5994 thumb_func_start FUN_0201DAE8
FUN_0201DAE8: ; 0x0201DAE8
push {r3, lr}
- blx FUN_020C5DBC
+ blx GX_GetBankForOBJ
cmp r0, #0x30
bgt _0201DB18
bge _0201DB60
@@ -50224,7 +50224,7 @@ _0201DB90: ldr r0, [r0, #0x0]
str r1, [r0, #0x14]
_0201DB98:
- blx FUN_020C5D4C
+ blx GX_GetBankForSubOBJ
cmp r0, #0x0
beq _0201DBAE
cmp r0, #0x8
@@ -51463,7 +51463,7 @@ _0201E460: .word 0x021C5998 thumb_func_start FUN_0201E464
FUN_0201E464: ; 0x0201E464
push {r3, lr}
- blx FUN_020C5D9C
+ blx GX_GetBankForOBJExtPltt
cmp r0, #0x20
beq _0201E472
cmp r0, #0x40
@@ -51481,7 +51481,7 @@ _0201E47E: ldr r0, [r0, #0x0]
str r1, [r0, #0x1c]
_0201E486:
- blx FUN_020C5D2C
+ blx GX_GetBankForSubOBJExtPltt
mov r1, #0x1
lsl r1, r1, #0x8
cmp r0, r1
@@ -51767,36 +51767,36 @@ _0201E666: FUN_0201E66C: ; 0x0201E66C
push {r4, lr}
add r4, r0, #0x0
- blx FUN_020C611C
- blx FUN_020C60E4
- blx FUN_020C6070
+ blx GX_ResetBankForBG
+ blx GX_ResetBankForBGExtPltt
+ blx GX_ResetBankForSubBG
blx FUN_020C6034
- blx FUN_020C6108
- blx FUN_020C60C0
+ blx GX_ResetBankForOBJ
+ blx GX_ResetBankForOBJExtPltt
blx FUN_020C605C
- blx FUN_020C600C
- blx FUN_020C60AC
- blx FUN_020C6098
+ blx GX_ResetBankForSubOBJ
+ blx GX_ResetBankForTex
+ blx GX_ResetBankForTexPltt
ldr r0, [r4, #0x0]
- blx FUN_020C6BF0
+ blx GX_SetBankForBG
ldr r0, [r4, #0x4]
- blx FUN_020C6970
+ blx GX_SetBankForBGExtPltt
ldr r0, [r4, #0x8]
- blx FUN_020C62FC
+ blx GX_SetBankForSubBG
ldr r0, [r4, #0xc]
- blx FUN_020C61F4
+ blx GX_SetBankForSubBGExtPltt
ldr r0, [r4, #0x10]
- blx FUN_020C6A84
+ blx GX_SetBankForOBJ
ldr r0, [r4, #0x14]
- blx FUN_020C68B8
+ blx GX_SetBankForOBJExtPltt
ldr r0, [r4, #0x18]
- blx FUN_020C6280
+ blx GX_SetBankForSubOBJ
ldr r0, [r4, #0x1c]
- blx FUN_020C6168
+ blx GX_SetBankForSubOBJExtPltt
ldr r0, [r4, #0x20]
- blx FUN_020C66B4
+ blx GX_SetBankForTex
ldr r0, [r4, #0x24]
- blx FUN_020C65C0
+ blx GX_SetBankForTexPltt
pop {r4, pc}
.balign 4
@@ -51906,7 +51906,7 @@ _0201E784: .word 0xFFFFE0FF thumb_func_start FUN_0201E788
FUN_0201E788: ; 0x0201E788
push {r3, lr}
- blx FUN_020C5A34
+ blx GX_DispOn
ldr r2, _0201E79C ; =0x04001000
mov r0, #0x1
ldr r1, [r2, #0x0]
@@ -52051,7 +52051,7 @@ FUN_0201E7D8: ; 0x0201E7D8 add r5, #0x20
add r1, r5, #0x0
add r2, r0, #0x0
- blx FUN_020C5634
+ blx VEC_Add
pop {r3-r5, pc}
nop
_0201E8B4: .word 0x020FFA38
@@ -52162,7 +52162,7 @@ FUN_0201E8B8: ; 0x0201E8B8 add r5, #0x14
add r1, r5, #0x0
add r2, r0, #0x0
- blx FUN_020C5634
+ blx VEC_Add
pop {r3-r5, pc}
.balign 4
_0201E998: .word 0x020FFA38
@@ -52477,7 +52477,7 @@ FUN_0201EBA4: ; 0x0201EBA4 beq _0201EBEE
add r1, #0x48
add r2, sp, #0x10
- blx FUN_020C5600
+ blx VEC_Subtract
ldr r0, _0201EC40 ; =0x021C59A4
add r1, sp, #0x10
ldr r0, [r0, #0x0]
@@ -52531,7 +52531,7 @@ _0201EBEE: str r0, [sp, #0x0]
add r0, r4, #0x0
mov r3, #0x0
- blx FUN_020C80A4
+ blx G3i_LookAt_
ldr r1, _0201EC54 ; =0x021CED98
mov r0, #0xe8
ldr r2, [r1, #0x7c]
@@ -52719,9 +52719,9 @@ FUN_0201ED5C: ; 0x0201ED5C str r0, [r2, #0x0]
add r0, r6, #0x0
add r2, sp, #0x30
- blx FUN_020C5600
+ blx VEC_Subtract
add r0, sp, #0x30
- blx FUN_020C53C8
+ blx VEC_Mag
str r0, [r4, #0x38]
mov r6, #0x0
add r0, sp, #0x24
@@ -52813,7 +52813,7 @@ FUN_0201EE2C: ; 0x0201EE2C ldr r1, [r5, #0x4]
ldr r2, [r5, #0x8]
ldr r3, [r5, #0xc]
- blx FUN_020C8538
+ blx G3i_PerspectiveW_
ldr r1, _0201EEE8 ; =0x021CED98
mov r0, #0x50
ldr r2, [r1, #0x7c]
@@ -52830,7 +52830,7 @@ _0201EE6C: ldr r4, [r5, #0x38]
ldr r0, [r5, #0x0]
ldr r1, [r5, #0x4]
- blx FUN_020C50B8
+ blx FX_Div
asr r1, r0, #0x1f
asr r3, r4, #0x1f
add r2, r4, #0x0
@@ -52868,7 +52868,7 @@ _0201EE6C: neg r2, r3
str r0, [sp, #0x10]
add r0, r4, #0x0
- blx FUN_020C823C
+ blx G3i_OrthoW_
ldr r1, _0201EEE8 ; =0x021CED98
mov r0, #0x50
ldr r2, [r1, #0x7c]
@@ -52962,12 +52962,12 @@ FUN_0201EF70: ; 0x0201EF70 add r0, #0x14
add r1, r5, #0x0
add r2, r0, #0x0
- blx FUN_020C5634
+ blx VEC_Add
add r4, #0x20
add r0, r4, #0x0
add r1, r5, #0x0
add r2, r4, #0x0
- blx FUN_020C5634
+ blx VEC_Add
pop {r3-r5, pc}
thumb_func_start FUN_0201EF90
@@ -53489,7 +53489,7 @@ FUN_0201F318: ; 0x0201F318 bl ErrorHandling
_0201F324:
add r0, sp, #0x0
- blx FUN_020C3F14
+ blx MTX_Identity33_
add r0, r5, #0x0
add r0, #0xbc
ldr r4, [r0, #0x0]
@@ -54907,7 +54907,7 @@ _0201FD0C: ldr r0, [r4, r1]
add r1, r1, #0x4
add r1, r4, r1
- blx FUN_020AFD94
+ blx thunk_FUN_020afda0_2
mov r0, #0x12
mov r1, #0x1
lsl r0, r0, #0x4
@@ -55887,7 +55887,7 @@ FUN_020203CC: ; 0x020203CC add r0, r4, #0x0
mov r1, #0x0
lsl r2, r2, #0xa
- blx FUN_020C93BC
+ blx GX_LoadOAM_2
add r0, r4, #0x0
bl FUN_02016A18
pop {r4, pc}
@@ -55909,7 +55909,7 @@ FUN_02020404: ; 0x02020404 add r0, r4, #0x0
mov r1, #0x0
lsl r2, r2, #0xa
- blx FUN_020C9354
+ blx GXS_LoadOAM_2
add r0, r4, #0x0
bl FUN_02016A18
pop {r4, pc}
@@ -56194,7 +56194,7 @@ FUN_02020618: ; 0x02020618 ldr r0, [r5, r0]
add r1, #0xb4
add r2, #0xd8
- blx FUN_020B2780
+ blx thunk_FUN_020b5040
mov r0, #0x45
lsl r0, r0, #0x2
ldr r0, [r5, r0]
@@ -60152,10 +60152,10 @@ _020222A8: .word 0x021C59BC thumb_func_start FUN_020222AC
FUN_020222AC: ; 0x020222AC
- ldr r3, _020222B0 ; =FUN_020C7E0C
+ ldr r3, _020222B0 ; =G3X_ResetMtxStack_2
bx r3
.balign 4
-_020222B0: .word FUN_020C7E0C
+_020222B0: .word G3X_ResetMtxStack_2
thumb_func_start FUN_020222B4
FUN_020222B4: ; 0x020222B4
@@ -60243,7 +60243,7 @@ FUN_02022318: ; 0x02022318 add r4, r0, #0x0
str r6, [r4, #0x0]
blx FUN_020BB7F4
- blx FUN_020C7D28
+ blx G3X_InitMtxStack
mov r1, #0x2
ldr r0, _020223B8 ; =0x04000540
cmp r7, #0x0
@@ -60359,13 +60359,13 @@ FUN_020223D4: ; 0x020223D4 add r1, r0, #0x0
add r2, r0, #0x0
add r3, r0, #0x0
- blx FUN_020C7C28
+ blx G3X_SetFog
mov r0, #0x0
ldr r2, _02022444 ; =0x00007FFF
add r1, r0, #0x0
mov r3, #0x3f
str r0, [sp, #0x0]
- blx FUN_020C7B3C
+ blx G3X_SetClearColor
ldr r1, _02022448 ; =0xBFFF0000
ldr r0, _0202244C ; =0x04000580
str r1, [r0, #0x0]
@@ -98748,9 +98748,9 @@ FUN_0203380C: ; 0x0203380C bne _0203382A
ldr r1, _0203382C ; =0x4144414A
add r0, r4, #0x0
- blx FUN_02096FF4
+ blx thunk_FUN_02097190
add r0, r4, #0x0
- blx FUN_02096E90
+ blx thunk_FUN_02096e4c
_0203382A:
pop {r4, pc}
.balign 4
@@ -99234,7 +99234,7 @@ _02033C06: ldr r0, _02033CB4 ; =0x00300010
add r7, r1, #0x0
and r7, r0
- blx FUN_020C5DBC
+ blx GX_GetBankForOBJ
b _02033C2C
_02033C1E:
ldr r0, _02033CB8 ; =0x04001000
@@ -99242,7 +99242,7 @@ _02033C1E: ldr r0, _02033CB4 ; =0x00300010
add r7, r1, #0x0
and r7, r0
- blx FUN_020C5D4C
+ blx GX_GetBankForSubOBJ
_02033C2C:
cmp r7, #0x10
beq _02033C38
@@ -99423,14 +99423,14 @@ FUN_02033D3C: ; 0x02033D3C add r1, r4, #0x0
ldr r0, [r0, #0xc]
mov r2, #0x20
- blx FUN_020C9480
+ blx GX_LoadOBJPltt_2
b _02033D8C
_02033D80:
ldr r0, [sp, #0x0]
add r1, r4, #0x0
ldr r0, [r0, #0xc]
mov r2, #0x20
- blx FUN_020C9418
+ blx GXS_LoadOBJPltt_2
_02033D8C:
ldr r0, [sp, #0x4]
bl FUN_02016A18
@@ -99478,7 +99478,7 @@ _02033DC8: ldr r0, _02033E64 ; =0x00300010
add r4, r1, #0x0
and r4, r0
- blx FUN_020C5DBC
+ blx GX_GetBankForOBJ
b _02033E00
_02033DF0:
mov r0, #0x1
@@ -99487,7 +99487,7 @@ _02033DF0: ldr r0, _02033E64 ; =0x00300010
add r4, r1, #0x0
and r4, r0
- blx FUN_020C5DBC
+ blx GX_GetBankForOBJ
_02033E00:
cmp r4, #0x10
beq _02033E0C
@@ -99529,14 +99529,14 @@ _02033E34: mov r2, #0x2
ldr r0, [r0, #0x14]
lsl r2, r2, #0x8
- blx FUN_020C92F4
+ blx GX_LoadOBJ_2
b _02033E52
_02033E46:
ldr r0, [sp, #0x0]
mov r2, #0x2
ldr r0, [r0, #0x14]
lsl r2, r2, #0x8
- blx FUN_020C9294
+ blx GXS_LoadOBJ_2
_02033E52:
ldr r0, [sp, #0x4]
bl FUN_02016A18
diff --git a/asm/unk_02046030.s b/asm/unk_02046030.s index 7d95c5dd..edfe710f 100644 --- a/asm/unk_02046030.s +++ b/asm/unk_02046030.s @@ -10700,7 +10700,7 @@ FUN_0204B450: ; 0x0204B450 ldr r0, [r3, #0x0]
str r0, [r2, #0x0]
add r0, sp, #0x0
- blx FUN_020C3F14
+ blx MTX_Identity33_
ldr r0, [r5, #0x4]
add r1, r4, #0x0
ldr r0, [r0, #0x18]
@@ -84084,14 +84084,14 @@ FUN_0206DE4C: ; 0x0206DE4C mov r1, #0x0
mov r2, #0xe
mov r3, #0xb
- blx FUN_020C74DC
+ blx G2x_SetBlendAlpha_
mov r0, #0x8
str r0, [sp, #0x0]
ldr r0, _0206DE74 ; =0x04001050
mov r1, #0x0
mov r2, #0xe
mov r3, #0x7
- blx FUN_020C74DC
+ blx G2x_SetBlendAlpha_
pop {r3, pc}
.balign 4
_0206DE70: .word 0x04000050
@@ -84155,13 +84155,13 @@ FUN_0206DE94: ; 0x0206DE94 add r1, r0, #0x0
add r2, r0, #0x0
add r3, r0, #0x0
- blx FUN_020C7C28
+ blx G3X_SetFog
mov r0, #0x0
ldr r2, _0206DF0C ; =0x00007FFF
add r1, r0, #0x0
mov r3, #0x3f
str r0, [sp, #0x0]
- blx FUN_020C7B3C
+ blx G3X_SetClearColor
ldr r1, _0206DF10 ; =0xBFFF0000
ldr r0, _0206DF14 ; =0x04000580
str r1, [r0, #0x0]
@@ -102890,7 +102890,7 @@ FUN_020774B8: ; 0x020774B8 ldr r1, _020774E8 ; =0x000057E0
add r6, r3, #0x0
lsl r2, r2, #0x8
- blx FUN_020C92F4
+ blx GX_LoadOBJ_2
ldr r4, [r4, #0xc]
add r0, r5, #0x0
add r1, r6, #0x0
@@ -102900,7 +102900,7 @@ FUN_020774B8: ; 0x020774B8 add r0, r4, r0
mov r1, #0xc0
mov r2, #0x20
- blx FUN_020C9480
+ blx GX_LoadOBJPltt_2
pop {r4-r6, pc}
nop
_020774E8: .word 0x000057E0
@@ -106027,7 +106027,7 @@ _02078E52: add r0, sp, #0x0
mov r1, #0x3a
mov r2, #0x2
- blx FUN_020C9480
+ blx GX_LoadOBJPltt_2
pop {r3, pc}
thumb_func_start FUN_02078E7C
@@ -106220,7 +106220,7 @@ _02078FD0: add r0, r5, #0x0
lsl r2, r2, #0x8
lsl r1, r1, #0x5
- blx FUN_020C9294
+ blx GXS_LoadOBJ_2
add r0, r4, #0x1
lsl r0, r0, #0x10
lsr r4, r0, #0x10
@@ -106260,7 +106260,7 @@ _02079012: add r0, r7, #0x0
lsl r1, r1, #0x5
mov r2, #0x80
- blx FUN_020C9294
+ blx GXS_LoadOBJ_2
add r0, r5, #0x1
lsl r0, r0, #0x10
lsr r5, r0, #0x10
@@ -106854,7 +106854,7 @@ _02079470: mov r1, #0x0
mov r2, #0x7
str r3, [sp, #0x0]
- blx FUN_020C74DC
+ blx G2x_SetBlendAlpha_
mov r0, #0xd3
lsl r0, r0, #0x2
ldr r0, [r4, r0]
@@ -108459,7 +108459,7 @@ FUN_0207A188: ; 0x0207A188 mov r1, #0x1
mov r2, #0x1e
mov r3, #0x17
- blx FUN_020C74DC
+ blx G2x_SetBlendAlpha_
pop {r3, pc}
.balign 4
_0207A19C: .word 0x04000050
@@ -118029,8 +118029,8 @@ FUN_0207EF6C: ; 0x0207EF6C push {r3-r4, lr}
sub sp, #0x4
blx FUN_020BB7F4
- blx FUN_020C7E94
- blx FUN_020C7D28
+ blx G3X_Init
+ blx G3X_InitMtxStack
ldr r0, _0207EFEC ; =0x04000060
ldr r1, _0207EFF0 ; =0xFFFFCFFD
ldrh r2, [r0, #0x0]
@@ -118060,13 +118060,13 @@ FUN_0207EF6C: ; 0x0207EF6C add r1, r0, #0x0
add r2, r0, #0x0
add r3, r0, #0x0
- blx FUN_020C7C28
+ blx G3X_SetFog
mov r0, #0x0
ldr r2, _0207EFF8 ; =0x00007FFF
add r1, r0, #0x0
mov r3, #0x3f
str r0, [sp, #0x0]
- blx FUN_020C7B3C
+ blx G3X_SetClearColor
ldr r1, _0207EFFC ; =0x04000540
mov r0, #0x0
str r0, [r1, #0x0]
@@ -133167,14 +133167,14 @@ FUN_0208643C: ; 0x0208643C mov r1, #0x0
mov r2, #0xe
mov r3, #0xb
- blx FUN_020C74DC
+ blx G2x_SetBlendAlpha_
mov r0, #0x8
str r0, [sp, #0x0]
ldr r0, _02086464 ; =0x04001050
mov r1, #0x0
mov r2, #0xe
mov r3, #0x7
- blx FUN_020C74DC
+ blx G2x_SetBlendAlpha_
pop {r3, pc}
.balign 4
_02086460: .word 0x04000050
@@ -133239,13 +133239,13 @@ FUN_02086488: ; 0x02086488 add r1, r0, #0x0
add r2, r0, #0x0
add r3, r0, #0x0
- blx FUN_020C7C28
+ blx G3X_SetFog
mov r0, #0x0
ldr r2, _02086500 ; =0x00007FFF
add r1, r0, #0x0
mov r3, #0x3f
str r0, [sp, #0x0]
- blx FUN_020C7B3C
+ blx G3X_SetClearColor
ldr r1, _02086504 ; =0xBFFF0000
ldr r0, _02086508 ; =0x04000580
str r1, [r0, #0x0]
diff --git a/asm/unk_0208AC14.s b/asm/unk_0208AC14.s index 0b326bbe..d434188d 100644 --- a/asm/unk_0208AC14.s +++ b/asm/unk_0208AC14.s @@ -1824,12 +1824,12 @@ FUN_0208C4F4: ; 0x0208C4F4 bne _0208C5D4 add r1, sp, #0x90 add r0, r4, #0x14 - bl FUN_020C5288 + bl VEC_Normalize b _0208C604 _0208C5D4: add r1, sp, #0x90 add r0, r4, #0x8 - bl FUN_020C5288 + bl VEC_Normalize ldr r2, [sp, #0x90] ldr r1, [sp, #0x94] ldr r0, [sp, #0x98] @@ -2127,12 +2127,12 @@ FUN_0208C974: ; 0x0208C974 bne _0208CA50 add r1, sp, #0x90 add r0, r4, #0x14 - bl FUN_020C5288 + bl VEC_Normalize b _0208CA80 _0208CA50: add r1, sp, #0x90 add r0, r4, #0x8 - bl FUN_020C5288 + bl VEC_Normalize ldr r2, [sp, #0x90] ldr r1, [sp, #0x94] ldr r0, [sp, #0x98] @@ -2954,7 +2954,7 @@ _0208D5D4: _0208D678: add r0, sp, #0x18 mov r1, r0 - bl FUN_020C5288 + bl VEC_Normalize add r1, sp, #0x30 mov r0, r8 bl MI_Copy36B @@ -2972,7 +2972,7 @@ _0208D678: stmia r3, {r0-r2} mov r0, r3 mov r1, r3 - bl FUN_020C5288 + bl VEC_Normalize ldr r0, [r8, #0x20] ldr r1, [sp, #0x8] rsb r0, r0, #0x0 @@ -3118,7 +3118,7 @@ _0208D83C: _0208D900: add r0, sp, #0x18 mov r1, r0 - bl FUN_020C5288 + bl VEC_Normalize add r1, sp, #0x30 mov r0, r8 bl MI_Copy36B @@ -3136,7 +3136,7 @@ _0208D900: stmia r3, {r0-r2} mov r0, r3 mov r1, r3 - bl FUN_020C5288 + bl VEC_Normalize ldr r0, [r8, #0x20] ldr r1, [sp, #0x8] rsb r0, r0, #0x0 @@ -3406,7 +3406,7 @@ _0208DCB4: _0208DD58: add r0, sp, #0x18 mov r1, r0 - bl FUN_020C5288 + bl VEC_Normalize add r1, sp, #0x30 mov r0, r8 bl MI_Copy36B @@ -3424,7 +3424,7 @@ _0208DD58: stmia r3, {r0-r2} mov r0, r3 mov r1, r3 - bl FUN_020C5288 + bl VEC_Normalize ldr r0, [r8, #0x20] ldr r1, [sp, #0x8] rsb r0, r0, #0x0 @@ -3570,7 +3570,7 @@ _0208DF1C: _0208DFE0: add r0, sp, #0x18 mov r1, r0 - bl FUN_020C5288 + bl VEC_Normalize add r1, sp, #0x30 mov r0, r8 bl MI_Copy36B @@ -3588,7 +3588,7 @@ _0208DFE0: stmia r3, {r0-r2} mov r0, r3 mov r1, r3 - bl FUN_020C5288 + bl VEC_Normalize ldr r0, [r8, #0x20] ldr r1, [sp, #0x8] rsb r0, r0, #0x0 @@ -5302,7 +5302,7 @@ _0208F87C: add r0, sp, #0xb8 add r1, sp, #0xac str r2, [sp, #0xc0] - bl FUN_020C5288 + bl VEC_Normalize b _0208FA04 _0208F9C8: ldr r0, [r7, #0x8] @@ -5320,7 +5320,7 @@ _0208F9C8: _0208F9F8: add r0, r7, #0x8 add r1, sp, #0xac - bl FUN_020C5288 + bl VEC_Normalize _0208FA04: ldr r2, [sp, #0xac] ldr r1, [sp, #0x10] @@ -6273,7 +6273,7 @@ _020907AC: mov r2, r1, lsl #0x1 ldrsh r1, [r3, r12] ldrsh r2, [r3, r2] - blx FUN_020C3F38 + blx MTX_RotX33_ b _02090838 _020907DC: ldrh r1, [r0, #0x0] @@ -6286,7 +6286,7 @@ _020907DC: mov r2, r1, lsl #0x1 ldrsh r1, [r3, r12] ldrsh r2, [r3, r2] - blx FUN_020C3F54 + blx MTX_RotY33_ b _02090838 _0209080C: ldrh r1, [r0, #0x0] @@ -6299,7 +6299,7 @@ _0209080C: mov r2, r1, lsl #0x1 ldrsh r1, [r3, r12] ldrsh r2, [r3, r2] - blx FUN_020C3F70 + blx MTX_RotZ33_ _02090838: add r0, r4, #0x8 add r1, sp, #0x0 @@ -6522,7 +6522,7 @@ FUN_02090AF4: mov r2, r2, asr #0x8 str r2, [r0, #0x4] str lr, [r0, #0x8] - bl FUN_020C5288 + bl VEC_Normalize ldmia sp!, {r4,lr} bx lr .balign 4 @@ -6552,7 +6552,7 @@ FUN_02090B50: ; 0x02090B50 str r2, [r12, #0x0] mov r2, r2, asr #0x8 str r2, [r0, #0x8] - bl FUN_020C5288 + bl VEC_Normalize ldmia sp!, {r4,lr} bx lr .balign 4 diff --git a/asm/unk_020AF030.s b/asm/unk_020AF030.s index 10c6ffd8..80e6c2c0 100644 --- a/asm/unk_020AF030.s +++ b/asm/unk_020AF030.s @@ -5,10 +5,10 @@ arm_func_start GXS_LoadOBJ GXS_LoadOBJ: - ldr ip, _020AF038 ; =GXS_LoadOBJ2 + ldr ip, _020AF038 ; =GXS_LoadOBJ_2 bx r12 .balign 4 -_020AF038: .word GXS_LoadOBJ2 +_020AF038: .word GXS_LoadOBJ_2 arm_func_start GXS_LoadOAM GXS_LoadOAM: ; 0x020AF03C @@ -131,10 +131,10 @@ _020AF12C: .word GXS_LoadBG0Char_2 arm_func_start GX_LoadOBJ GX_LoadOBJ: ; 0x020AF130 - ldr ip, _020AF138 ; =GX_LoadOBJ2 + ldr ip, _020AF138 ; =GX_LoadOBJ_2 bx r12 .balign 4 -_020AF138: .word GX_LoadOBJ2 +_020AF138: .word GX_LoadOBJ_2 arm_func_start GX_LoadOAM GX_LoadOAM: ; 0x020AF13C @@ -3002,13 +3002,13 @@ _020B15D4: ldr r0, [r7, #0x14] ldr r2, [r7, #0x10] mov r1, r6 - bl GX_LoadOBJ2 + bl GX_LoadOBJ_2 b _020B15F8 _020B15E8: ldr r0, [r7, #0x14] ldr r2, [r7, #0x10] mov r1, r6 - bl GXS_LoadOBJ2 + bl GXS_LoadOBJ_2 _020B15F8: ldr r0, [r7, #0x8] cmp r0, #0x0 @@ -3196,13 +3196,13 @@ _020B1814: ldr r0, [r7, #0x14] ldr r2, [r7, #0x10] mov r1, r6 - bl GX_LoadOBJ2 + bl GX_LoadOBJ_2 b _020B1838 _020B1828: ldr r0, [r7, #0x14] ldr r2, [r7, #0x10] mov r1, r6 - bl GXS_LoadOBJ2 + bl GXS_LoadOBJ_2 _020B1838: ldr r0, [r7, #0x8] cmp r0, #0x0 @@ -31352,8 +31352,8 @@ _020C9278: .balign 4 _020C9290: .word 0x02106814 - arm_func_start GXS_LoadOBJ2 -GXS_LoadOBJ2: ; 0x020C9294 + arm_func_start GXS_LoadOBJ_2 +GXS_LoadOBJ_2: ; 0x020C9294 stmdb sp!, {r4,lr} ldr r3, _020C92F0 ; =0x02106814 mov r4, r0 @@ -31381,8 +31381,8 @@ _020C92D8: .balign 4 _020C92F0: .word 0x02106814 - arm_func_start GX_LoadOBJ2 -GX_LoadOBJ2: ; 0x020C92F4 + arm_func_start GX_LoadOBJ_2 +GX_LoadOBJ_2: ; 0x020C92F4 stmdb sp!, {r4,lr} ldr r3, _020C9350 ; =0x02106814 mov r4, r0 @@ -50,20 +50,20 @@ .extern FUN_02096CCC
.extern FUN_02096D2C
.extern FUN_02096DA0
-.extern FUN_02096E90
+.extern thunk_FUN_02096e4c
.extern FUN_02096F18
.extern FUN_02096F80
.extern FUN_02096FB0
-.extern FUN_02096FF4
+.extern thunk_FUN_02097190
.extern FUN_0209700C
.extern FUN_020973B4
.extern FUN_020ADDC0
.extern FUN_020ADDC8
.extern FUN_020ADDF0
.extern FUN_020ADE2C
-.extern FUN_020ADFA0
-.extern FUN_020ADFDC
-.extern FUN_020ADFE8
+.extern tempName_NNS_FndAllocFromExpHeapEx
+.extern thunk_FUN_020adc8c
+.extern tempName_NNS_FndCreateExpHeapEx
.extern FUN_020AE82C
.extern FUN_020AE8CC
.extern FUN_020AE918
@@ -80,8 +80,8 @@ .extern FUN_020AFBA8
.extern FUN_020AFBFC
.extern FUN_020AFC04
-.extern FUN_020AFD88
-.extern FUN_020AFD94
+.extern thunk_FUN_020afda0
+.extern thunk_FUN_020afda0_2
.extern FUN_020AFEB8
.extern FUN_020AFFD8
.extern FUN_020B0030
@@ -116,7 +116,7 @@ .extern FUN_020B224C
.extern FUN_020B23D8
.extern FUN_020B242C
-.extern FUN_020B2780
+.extern thunk_FUN_020b5040
.extern FUN_020B2794
.extern FUN_020B28B4
.extern FUN_020B2A08
@@ -212,113 +212,113 @@ .extern FUN_020C39CC
.extern FUN_020C3EA4
.extern FUN_020C3EB0
-.extern FUN_020C3F14
-.extern FUN_020C3F38
-.extern FUN_020C3F54
-.extern FUN_020C3F70
-.extern FUN_020C400C
-.extern FUN_020C504C
-.extern FUN_020C50B8
-.extern FUN_020C5288
-.extern FUN_020C53C8
+.extern MTX_Identity33_
+.extern MTX_RotX33_
+.extern MTX_RotY33_
+.extern MTX_RotZ33_
+.extern MTX_Concat33
+.extern FX_Sqrt
+.extern FX_Div
+.extern VEC_Normalize
+.extern VEC_Mag
.extern VEC_DotProduct
-.extern FUN_020C5600
-.extern FUN_020C5634
-.extern FUN_020C5668
-.extern FUN_020C5974
-.extern FUN_020C5978
-.extern FUN_020C59A4
-.extern FUN_020C59C0
-.extern FUN_020C5A34
-.extern FUN_020C5A80
-.extern FUN_020C5AC8
-.extern FUN_020C5AF8
-.extern FUN_020C5B28
-.extern FUN_020C5D2C
-.extern FUN_020C5D4C
-.extern FUN_020C5D9C
-.extern FUN_020C5DBC
-.extern FUN_020C5E54
-.extern FUN_020C600C
+.extern VEC_Subtract
+.extern VEC_Add
+.extern FX_Modf
+.extern FX_Init
+.extern GXx_SetMasterBrightness_
+.extern GXS_SetGraphicsMode
+.extern GX_SetGraphicsMode
+.extern GX_DispOn
+.extern GX_DispOff
+.extern GX_VBlankIntr
+.extern GX_HBlankIntr
+.extern GX_Init
+.extern GX_GetBankForSubOBJExtPltt
+.extern GX_GetBankForSubOBJ
+.extern GX_GetBankForOBJExtPltt
+.extern GX_GetBankForOBJ
+.extern GX_DisableBankForLCDC
+.extern GX_ResetBankForSubOBJ
.extern FUN_020C6034
.extern FUN_020C605C
-.extern FUN_020C6070
-.extern FUN_020C6098
-.extern FUN_020C60AC
-.extern FUN_020C60C0
-.extern FUN_020C60E4
-.extern FUN_020C6108
-.extern FUN_020C611C
-.extern FUN_020C6168
-.extern FUN_020C61F4
-.extern FUN_020C6280
-.extern FUN_020C62FC
-.extern FUN_020C63A8
-.extern FUN_020C65C0
-.extern FUN_020C66B4
-.extern FUN_020C68B8
-.extern FUN_020C6970
-.extern FUN_020C6A84
-.extern FUN_020C6BF0
-.extern FUN_020C6F60
-.extern FUN_020C6FB0
-.extern FUN_020C7010
-.extern FUN_020C7058
-.extern FUN_020C70B0
-.extern FUN_020C70D0
-.extern FUN_020C7104
-.extern FUN_020C7124
-.extern FUN_020C74B8
-.extern FUN_020C74DC
-.extern FUN_020C74F8
-.extern FUN_020C7A14
-.extern FUN_020C7B3C
-.extern FUN_020C7C28
-.extern FUN_020C7D28
-.extern FUN_020C7E0C
-.extern FUN_020C7E94
-.extern FUN_020C7FF0
-.extern FUN_020C802C
-.extern FUN_020C8068
-.extern FUN_020C80A4
-.extern FUN_020C823C
-.extern FUN_020C8538
-.extern FUN_020C8728
-.extern FUN_020C8774
-.extern FUN_020C87E8
-.extern FUN_020C880C
-.extern FUN_020C8858
-.extern FUN_020C88CC
-.extern FUN_020C88F0
-.extern FUN_020C8948
-.extern FUN_020C89BC
-.extern FUN_020C8A2C
-.extern FUN_020C8A90
-.extern FUN_020C8B10
-.extern FUN_020C8C14
-.extern FUN_020C8C7C
-.extern FUN_020C8CE4
-.extern FUN_020C8D4C
-.extern FUN_020C8DB4
-.extern FUN_020C8E1C
-.extern FUN_020C8E84
-.extern FUN_020C8EEC
-.extern FUN_020C8F54
-.extern FUN_020C8FBC
-.extern FUN_020C9024
-.extern FUN_020C908C
-.extern FUN_020C90F4
-.extern FUN_020C915C
-.extern FUN_020C91C4
-.extern FUN_020C922C
-.extern FUN_020C9294
-.extern FUN_020C92F4
-.extern FUN_020C9354
-.extern FUN_020C93BC
-.extern FUN_020C9418
-.extern FUN_020C9480
-.extern FUN_020C94E8
-.extern FUN_020C9550
+.extern GX_ResetBankForSubBG
+.extern GX_ResetBankForTexPltt
+.extern GX_ResetBankForTex
+.extern GX_ResetBankForOBJExtPltt
+.extern GX_ResetBankForBGExtPltt
+.extern GX_ResetBankForOBJ
+.extern GX_ResetBankForBG
+.extern GX_SetBankForSubOBJExtPltt
+.extern GX_SetBankForSubBGExtPltt
+.extern GX_SetBankForSubOBJ
+.extern GX_SetBankForSubBG
+.extern GX_SetBankForLCDC
+.extern GX_SetBankForTexPltt
+.extern GX_SetBankForTex
+.extern GX_SetBankForOBJExtPltt
+.extern GX_SetBankForBGExtPltt
+.extern GX_SetBankForOBJ
+.extern GX_SetBankForBG
+.extern G2S_GetBG3CharPtr
+.extern G2_GetBG3CharPtr
+.extern G2S_GetBG2CharPtr
+.extern G2_GetBG2CharPtr
+.extern G2S_GetBG1CharPtr
+.extern G2_GetBG1CharPtr
+.extern G2S_GetBG0CharPtr
+.extern G2_GetBG0CharPtr
+.extern G2x_SetBlendBrightness_
+.extern G2x_SetBlendAlpha_
+.extern G2x_SetBGyAffine_
+.extern G3X_GetBoxTestResult
+.extern G3X_SetClearColor
+.extern G3X_SetFog
+.extern G3X_InitMtxStack
+.extern G3X_ResetMtxStack_2
+.extern G3X_Init
+.extern G3_RotZ
+.extern G3_RotY
+.extern G3_RotX
+.extern G3i_LookAt_
+.extern G3i_OrthoW_
+.extern G3i_PerspectiveW_
+.extern GXS_EndLoadOBJExtPltt
+.extern GXS_LoadOBJExtPltt
+.extern GXS_BeginLoadOBJExtPltt
+.extern GXS_EndLoadBGExtPltt
+.extern GXS_LoadBGExtPltt
+.extern GXS_BeginLoadBGExtPltt
+.extern GX_EndLoadOBJExtPltt
+.extern GX_LoadOBJExtPltt
+.extern GX_BeginLoadOBJExtPltt
+.extern GX_EndLoadBGExtPltt
+.extern GX_LoadBGExtPltt
+.extern GX_BeginLoadBGExtPltt
+.extern GXS_LoadBG3Char_2
+.extern GX_LoadBG3Char_2
+.extern GXS_LoadBG2Char_2
+.extern GX_LoadBG2Char_2
+.extern GXS_LoadBG1Char_2
+.extern GX_LoadBG1Char_2
+.extern GXS_LoadBG0Char_2
+.extern GX_LoadBG0Char_2
+.extern GXS_LoadBG3Scr_3
+.extern GX_LoadBG3Scr_3
+.extern GXS_LoadBG2Scr_3
+.extern GX_LoadBG2Scr_3
+.extern GXS_LoadBG1Scr_2
+.extern GX_LoadBG1Scr_2
+.extern GXS_LoadBG0Scr_2
+.extern GX_LoadBG0Scr_2
+.extern GXS_LoadOBJ_2
+.extern GX_LoadOBJ_2
+.extern GXS_LoadOAM_2
+.extern GX_LoadOAM_2
+.extern GXS_LoadOBJPltt_2
+.extern GX_LoadOBJPltt_2
+.extern GXS_LoadBGPltt_2
+.extern GX_LoadBGPltt_2
.extern OS_WaitIrq
.extern OS_DisableIrqMask
.extern OS_EnableIrqMask
diff --git a/undefined_syms.txt b/undefined_syms.txt index 72314216..c30f31da 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -6,290 +6,7 @@ FUN_01FF84E4 = 0x01FF84E4; FUN_01FF8544 = 0x01FF8544; FUN_01FF857C = 0x01FF857C; FUN_01FF85F0 = 0x01FF85F0; -FUN_0208ACEC = 0x0208ACEC; -FUN_0208AD80 = 0x0208AD80; -FUN_0208AF80 = 0x0208AF80; -FUN_0208AF94 = 0x0208AF94; -FUN_0208AFA8 = 0x0208AFA8; -FUN_0208B05C = 0x0208B05C; -FUN_0208B128 = 0x0208B128; -FUN_0208B4A0 = 0x0208B4A0; -FUN_02090CC8 = 0x02090CC8; -FUN_02090DB8 = 0x02090DB8; -FUN_02096B14 = 0x02096B14; -FUN_02096B78 = 0x02096B78; -FUN_02096CCC = 0x02096CCC; -FUN_02096D2C = 0x02096D2C; -FUN_02096DA0 = 0x02096DA0; -FUN_02096E90 = 0x02096E90; -FUN_02096F18 = 0x02096F18; -FUN_02096F80 = 0x02096F80; -FUN_02096FB0 = 0x02096FB0; -FUN_02096FF4 = 0x02096FF4; -FUN_0209700C = 0x0209700C; -FUN_020973B4 = 0x020973B4; -FUN_020ADDC0 = 0x020ADDC0; -FUN_020ADDC8 = 0x020ADDC8; -FUN_020ADDF0 = 0x020ADDF0; -FUN_020ADE2C = 0x020ADE2C; -FUN_020ADFA0 = 0x020ADFA0; -FUN_020ADFDC = 0x020ADFDC; -FUN_020ADFE8 = 0x020ADFE8; -FUN_020AE82C = 0x020AE82C; -FUN_020AE8CC = 0x020AE8CC; -FUN_020AE918 = 0x020AE918; -FUN_020AEB70 = 0x020AEB70; -FUN_020AEC7C = 0x020AEC7C; -FUN_020AEC98 = 0x020AEC98; -FUN_020AEE40 = 0x020AEE40; -FUN_020AEEB8 = 0x020AEEB8; -FUN_020AEF1C = 0x020AEF1C; -FUN_020AF894 = 0x020AF894; -FUN_020AF9C4 = 0x020AF9C4; -FUN_020AFA28 = 0x020AFA28; -FUN_020AFA80 = 0x020AFA80; -FUN_020AFBA8 = 0x020AFBA8; -FUN_020AFBFC = 0x020AFBFC; -FUN_020AFC04 = 0x020AFC04; -FUN_020AFD88 = 0x020AFD88; -FUN_020AFD94 = 0x020AFD94; -FUN_020AFEB8 = 0x020AFEB8; -FUN_020AFFD8 = 0x020AFFD8; -FUN_020B0030 = 0x020B0030; -FUN_020B0088 = 0x020B0088; -FUN_020B00F0 = 0x020B00F0; -FUN_020B0138 = 0x020B0138; -FUN_020B0180 = 0x020B0180; -FUN_020B0250 = 0x020B0250; -FUN_020B02C8 = 0x020B02C8; -FUN_020B0448 = 0x020B0448; -FUN_020B0870 = 0x020B0870; -FUN_020B0BB0 = 0x020B0BB0; -FUN_020B0C7C = 0x020B0C7C; -FUN_020B0E34 = 0x020B0E34; -FUN_020B0FC0 = 0x020B0FC0; -FUN_020B10E8 = 0x020B10E8; -FUN_020B1240 = 0x020B1240; -FUN_020B1340 = 0x020B1340; -FUN_020B1528 = 0x020B1528; -FUN_020B1768 = 0x020B1768; -FUN_020B19C4 = 0x020B19C4; -FUN_020B19DC = 0x020B19DC; -FUN_020B1A14 = 0x020B1A14; -FUN_020B1A24 = 0x020B1A24; -FUN_020B1EA4 = 0x020B1EA4; -FUN_020B1EC4 = 0x020B1EC4; -FUN_020B1EE4 = 0x020B1EE4; -FUN_020B1EFC = 0x020B1EFC; -FUN_020B1F80 = 0x020B1F80; -FUN_020B20C8 = 0x020B20C8; -FUN_020B2194 = 0x020B2194; -FUN_020B224C = 0x020B224C; -FUN_020B23D8 = 0x020B23D8; -FUN_020B242C = 0x020B242C; -FUN_020B2780 = 0x020B2780; -FUN_020B2794 = 0x020B2794; -FUN_020B28B4 = 0x020B28B4; -FUN_020B2A08 = 0x020B2A08; -FUN_020B2B08 = 0x020B2B08; -FUN_020B2B58 = 0x020B2B58; -FUN_020B2D9C = 0x020B2D9C; -FUN_020B317C = 0x020B317C; -FUN_020B31F0 = 0x020B31F0; -FUN_020B326C = 0x020B326C; -FUN_020B3334 = 0x020B3334; -FUN_020B3390 = 0x020B3390; -FUN_020B33A0 = 0x020B33A0; -FUN_020B4358 = 0x020B4358; -FUN_020B43A4 = 0x020B43A4; -FUN_020B442C = 0x020B442C; -FUN_020B4568 = 0x020B4568; -FUN_020B4F38 = 0x020B4F38; -FUN_020B502C = 0x020B502C; -FUN_020B772C = 0x020B772C; -FUN_020B7790 = 0x020B7790; -FUN_020B7C58 = 0x020B7C58; -FUN_020B7C78 = 0x020B7C78; -FUN_020B7CDC = 0x020B7CDC; -FUN_020B7CE4 = 0x020B7CE4; -FUN_020B7CF0 = 0x020B7CF0; -FUN_020B7D28 = 0x020B7D28; -FUN_020B7DFC = 0x020B7DFC; -FUN_020B7E10 = 0x020B7E10; -FUN_020B7E1C = 0x020B7E1C; -FUN_020B80B4 = 0x020B80B4; -FUN_020B844C = 0x020B844C; -FUN_020B8474 = 0x020B8474; -FUN_020B849C = 0x020B849C; -FUN_020BAC98 = 0x020BAC98; -FUN_020BAFB8 = 0x020BAFB8; -FUN_020BB1C0 = 0x020BB1C0; -FUN_020BB394 = 0x020BB394; -FUN_020BB59C = 0x020BB59C; -FUN_020BB7F4 = 0x020BB7F4; -FUN_020BC0FC = 0x020BC0FC; -FUN_020BC13C = 0x020BC13C; -FUN_020BC2A0 = 0x020BC2A0; -FUN_020C0174 = 0x020C0174; -FUN_020C01A0 = 0x020C01A0; -FUN_020C01D0 = 0x020C01D0; -FUN_020C03B8 = 0x020C03B8; -FUN_020C041C = 0x020C041C; -FUN_020C044C = 0x020C044C; -FUN_020C04DC = 0x020C04DC; -FUN_020C0510 = 0x020C0510; -FUN_020C054C = 0x020C054C; -FUN_020C0670 = 0x020C0670; -FUN_020C0688 = 0x020C0688; -FUN_020C0DD4 = 0x020C0DD4; -FUN_020C0E14 = 0x020C0E14; -FUN_020C0E7C = 0x020C0E7C; -FUN_020C0EA4 = 0x020C0EA4; -FUN_020C0EF4 = 0x020C0EF4; -FUN_020C0F30 = 0x020C0F30; -FUN_020C0F50 = 0x020C0F50; -FUN_020C0F68 = 0x020C0F68; -FUN_020C0F80 = 0x020C0F80; -FUN_020C0F8C = 0x020C0F8C; -FUN_020C0F9C = 0x020C0F9C; -FUN_020C0FDC = 0x020C0FDC; -FUN_020C1040 = 0x020C1040; -FUN_020C10A4 = 0x020C10A4; -FUN_020C1148 = 0x020C1148; -FUN_020C1180 = 0x020C1180; -FUN_020C1E58 = 0x020C1E58; -FUN_020C1E68 = 0x020C1E68; -FUN_020C1EA4 = 0x020C1EA4; -FUN_020C1F54 = 0x020C1F54; -FUN_020C1FA4 = 0x020C1FA4; -FUN_020C1FF0 = 0x020C1FF0; -FUN_020C20DC = 0x020C20DC; -FUN_020C2104 = 0x020C2104; -FUN_020C217C = 0x020C217C; -FUN_020C226C = 0x020C226C; -FUN_020C22D0 = 0x020C22D0; -FUN_020C23FC = 0x020C23FC; -FUN_020C26F8 = 0x020C26F8; -FUN_020C2828 = 0x020C2828; -FUN_020C290C = 0x020C290C; -FUN_020C2A94 = 0x020C2A94; -FUN_020C35E0 = 0x020C35E0; -FUN_020C360C = 0x020C360C; -FUN_020C3640 = 0x020C3640; -FUN_020C3674 = 0x020C3674; -FUN_020C36A8 = 0x020C36A8; -FUN_020C3910 = 0x020C3910; -FUN_020C3980 = 0x020C3980; -FUN_020C39CC = 0x020C39CC; -FUN_020C3EA4 = 0x020C3EA4; -FUN_020C3EB0 = 0x020C3EB0; -FUN_020C3F14 = 0x020C3F14; -FUN_020C3F38 = 0x020C3F38; -FUN_020C3F54 = 0x020C3F54; -FUN_020C3F70 = 0x020C3F70; -FUN_020C400C = 0x020C400C; -FUN_020C504C = 0x020C504C; -FUN_020C50B8 = 0x020C50B8; -FUN_020C5288 = 0x020C5288; -FUN_020C53C8 = 0x020C53C8; -VEC_DotProduct = 0x020C5588; -FUN_020C5600 = 0x020C5600; -FUN_020C5634 = 0x020C5634; -FUN_020C5668 = 0x020C5668; -FUN_020C5974 = 0x020C5974; -FUN_020C5978 = 0x020C5978; -FUN_020C59A4 = 0x020C59A4; -FUN_020C59C0 = 0x020C59C0; -FUN_020C5A34 = 0x020C5A34; -FUN_020C5A80 = 0x020C5A80; -FUN_020C5AC8 = 0x020C5AC8; -FUN_020C5AF8 = 0x020C5AF8; -FUN_020C5B28 = 0x020C5B28; -FUN_020C5D2C = 0x020C5D2C; -FUN_020C5D4C = 0x020C5D4C; -FUN_020C5D9C = 0x020C5D9C; -FUN_020C5DBC = 0x020C5DBC; -FUN_020C5E54 = 0x020C5E54; -FUN_020C600C = 0x020C600C; -FUN_020C6034 = 0x020C6034; -FUN_020C605C = 0x020C605C; -FUN_020C6070 = 0x020C6070; -FUN_020C6098 = 0x020C6098; -FUN_020C60AC = 0x020C60AC; -FUN_020C60C0 = 0x020C60C0; -FUN_020C60E4 = 0x020C60E4; -FUN_020C6108 = 0x020C6108; -FUN_020C611C = 0x020C611C; -FUN_020C6168 = 0x020C6168; -FUN_020C61F4 = 0x020C61F4; -FUN_020C6280 = 0x020C6280; -FUN_020C62FC = 0x020C62FC; -FUN_020C63A8 = 0x020C63A8; -FUN_020C65C0 = 0x020C65C0; -FUN_020C66B4 = 0x020C66B4; -FUN_020C68B8 = 0x020C68B8; -FUN_020C6970 = 0x020C6970; -FUN_020C6A84 = 0x020C6A84; -FUN_020C6BF0 = 0x020C6BF0; -FUN_020C6F60 = 0x020C6F60; -FUN_020C6FB0 = 0x020C6FB0; -FUN_020C7010 = 0x020C7010; -FUN_020C7058 = 0x020C7058; -FUN_020C70B0 = 0x020C70B0; -FUN_020C70D0 = 0x020C70D0; -FUN_020C7104 = 0x020C7104; -FUN_020C7124 = 0x020C7124; -FUN_020C74B8 = 0x020C74B8; -FUN_020C74DC = 0x020C74DC; -FUN_020C74F8 = 0x020C74F8; -FUN_020C7A14 = 0x020C7A14; -FUN_020C7B3C = 0x020C7B3C; -FUN_020C7C28 = 0x020C7C28; -FUN_020C7D28 = 0x020C7D28; -FUN_020C7E0C = 0x020C7E0C; -FUN_020C7E94 = 0x020C7E94; -FUN_020C7FF0 = 0x020C7FF0; -FUN_020C802C = 0x020C802C; -FUN_020C8068 = 0x020C8068; -FUN_020C80A4 = 0x020C80A4; -FUN_020C823C = 0x020C823C; -FUN_020C8538 = 0x020C8538; -FUN_020C8728 = 0x020C8728; -FUN_020C8774 = 0x020C8774; -FUN_020C87E8 = 0x020C87E8; -FUN_020C880C = 0x020C880C; -FUN_020C8858 = 0x020C8858; -FUN_020C88CC = 0x020C88CC; -FUN_020C88F0 = 0x020C88F0; -FUN_020C8948 = 0x020C8948; -FUN_020C89BC = 0x020C89BC; -FUN_020C8A2C = 0x020C8A2C; -FUN_020C8A90 = 0x020C8A90; -FUN_020C8B10 = 0x020C8B10; -FUN_020C8C14 = 0x020C8C14; -FUN_020C8C7C = 0x020C8C7C; -FUN_020C8CE4 = 0x020C8CE4; -FUN_020C8D4C = 0x020C8D4C; -FUN_020C8DB4 = 0x020C8DB4; -FUN_020C8E1C = 0x020C8E1C; -FUN_020C8E84 = 0x020C8E84; -FUN_020C8EEC = 0x020C8EEC; -FUN_020C8F54 = 0x020C8F54; -FUN_020C8FBC = 0x020C8FBC; -FUN_020C9024 = 0x020C9024; -FUN_020C908C = 0x020C908C; -FUN_020C90F4 = 0x020C90F4; -FUN_020C915C = 0x020C915C; -FUN_020C91C4 = 0x020C91C4; -FUN_020C922C = 0x020C922C; -FUN_020C9294 = 0x020C9294; -FUN_020C92F4 = 0x020C92F4; -FUN_020C9354 = 0x020C9354; -FUN_020C93BC = 0x020C93BC; -FUN_020C9418 = 0x020C9418; -FUN_020C9480 = 0x020C9480; -FUN_020C94E8 = 0x020C94E8; -FUN_020C9550 = 0x020C9550; +FUN_02000B60 = 0x02000B60; gBacklightTop = 0x02106FA0; gBacklightTop_2 = 0x02106FA0; gUnknown2106FB8 = 0x02106FB8; @@ -428,6 +145,8 @@ FUN_021E856C = 0x021E856C; FUN_021E8588 = 0x021E8588; FUN_021E85E4 = 0x021E85E4; FUN_021E85FC = 0x021E85FC; +FUN_021EAE90 = 0x021EAE90; +FUN_021EB044 = 0x021EB044; FUN_021EC57C = 0x021EC57C; FUN_021EC71C = 0x021EC71C; FUN_021EC854 = 0x021EC854; @@ -736,30 +455,3 @@ FUN_022567E0 = 0x022567E0; SDK_AUTOLOAD_DTCM_START = 0x027E0000; SDK_STATIC_BSS_END = 0x021D74E0; gUnk027FFC20 = 0x027FFC20; -FUN_02000B60 = 0x02000B60; - -FUN_021EAE90 = 0x021EAE90; -FUN_021EB044 = 0x021EB044; - -FUN_020AF2E0 = 0x020AF2E0; -FUN_020AF2F4 = 0x020AF2F4; -FUN_020AF30C = 0x020AF30C; - -G3_LoadMtx43 = 0x020c7954; -G3_MultMtx43 = 0x020c7938; -MTX_Concat43 = 0x020c43d0; -MTX_MultVec33 = 0x020c3f88; -MTX_MultVec43 = 0x020c431c; -MTX_Scale43_ = 0x020c42c8; -VEC_CrossProduct = 0x020c549c; -VEC_Fx16CrossProduct = 0x020c5430; -VEC_Fx16DotProduct = 0x020c5538; -VEC_Fx16Normalize = 0x020c5134; - -GX_BeginLoadTex = 0x020c9a98; -GX_BeginLoadTexPltt = 0x020c987c; -GX_EndLoadTex = 0x020c98c4; -GX_EndLoadTexPltt = 0x020c97b0; -GX_LoadTex = 0x020c9934; -GX_LoadTexPltt = 0x020c9808; -MTX_Identity43_ = 0x020c426c; |