From d2f830f5aea7d24b1ef7ab0f043a44476cd19dcd Mon Sep 17 00:00:00 2001 From: Nomura <72407407+Nomura-RH@users.noreply.github.com> Date: Tue, 3 Jan 2023 09:30:11 +0100 Subject: [PATCH] Resolve pointers, part 6 --- Makefile | 2 +- asm/unk_02030EE0.s | 109 +++++++++++++++++++++++---------------------- asm/unk_0208694C.s | 3 +- asm/unk_020A05BC.s | 7 +-- asm/unk_020A19F0.s | 7 +-- asm/unk_020A1E30.s | 7 +-- asm/unk_020A2354.s | 7 +-- asm/unk_020A2418.s | 7 +-- asm/unk_020A2810.s | 31 +++++++------ asm/unk_020A4DE8.s | 8 ++-- asm/unk_020A5F6C.s | 8 ++-- asm/unk_020A6824.s | 10 ++--- asm/unk_020A6B84.s | 10 ++--- asm/unk_020C3790.s | 2 +- asm/unk_020C41D8.s | 4 +- 15 files changed, 117 insertions(+), 105 deletions(-) diff --git a/Makefile b/Makefile index ea038ce4a7..2c87bce57d 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ GAME_LANGUAGE := ENGLISH SECURE_CRC := 0xF8B8 GF_DEFINES := -DGAME_VERSION=$(GAME_VERSION) -DGAME_LANGUAGE=$(GAME_LANGUAGE) GF_DEFINES += -DPM_KEEP_ASSERTS -GLB_DEFINES := -DSDK_CW_FORCE_EXPORT_SUPPORT -DSDK_TS -DSDK_4M -DSDK_ARM9 -DSDK_CW -DSDK_FINALROM -DSDK_LINK_ISD -DNNS_FINALROM -D_NITRO -DSDK_CODE_ARM +GLB_DEFINES := -DSDK_CW_FORCE_EXPORT_SUPPORT -DSDK_TS -DSDK_4M -DSDK_ARM9 -DSDK_CW -DSDK_FINALROM -DSDK_LINK_ISD -DNNS_FINALROM -D_NITRO -DSDK_CODE_ARM DEFINES = $(GF_DEFINES) $(GLB_DEFINES) ALL_BUILDDIRS := $(BUILD_DIR)/lib diff --git a/asm/unk_02030EE0.s b/asm/unk_02030EE0.s index 56fa329b18..a395d5015d 100644 --- a/asm/unk_02030EE0.s +++ b/asm/unk_02030EE0.s @@ -1,6 +1,7 @@ .include "macros/function.inc" .include "include/unk_02030EE0.inc" + .extern Unk_021C07A8 .text @@ -14,7 +15,7 @@ sub_02030EE0: ; 0x02030EE0 str r0, [r2, r1] bx lr nop -_02030EEC: .word 0x021C07A8 +_02030EEC: .word Unk_021C07A8 _02030EF0: .word 0x00001310 thumb_func_end sub_02030EE0 @@ -32,7 +33,7 @@ sub_02030EF4: ; 0x02030EF4 _02030F06: bx lr ; .align 2, 0 -_02030F08: .word 0x021C07A8 +_02030F08: .word Unk_021C07A8 _02030F0C: .word 0x00001310 thumb_func_end sub_02030EF4 @@ -56,7 +57,7 @@ _02030F34: mov r0, #1 pop {r3, pc} ; .align 2, 0 -_02030F38: .word 0x021C07A8 +_02030F38: .word Unk_021C07A8 _02030F3C: .word sub_02030F40 thumb_func_end sub_02030F10 @@ -126,7 +127,7 @@ _02030FAC: strh r0, [r2, r1] pop {r4, pc} ; .align 2, 0 -_02030FC0: .word 0x021C07A8 +_02030FC0: .word Unk_021C07A8 _02030FC4: .word 0x00001310 _02030FC8: .word sub_02030FD0 _02030FCC: .word 0x0000132C @@ -256,7 +257,7 @@ _020310B2: _020310C0: pop {r4, r5, r6, pc} nop -_020310C4: .word 0x021C07A8 +_020310C4: .word Unk_021C07A8 _020310C8: .word 0x00001345 _020310CC: .word 0x00001343 _020310D0: .word 0x00001334 @@ -311,7 +312,7 @@ _02031130: add sp, #8 pop {r4, pc} nop -_02031138: .word 0x021C07A8 +_02031138: .word Unk_021C07A8 _0203113C: .word 0x00001310 _02031140: .word 0x00001304 _02031144: .word 0x00001020 @@ -364,7 +365,7 @@ _02031196: _0203119C: pop {r3, pc} nop -_020311A0: .word 0x021C07A8 +_020311A0: .word Unk_021C07A8 _020311A4: .word 0x00001314 thumb_func_end sub_0203114C @@ -507,7 +508,7 @@ _020312A6: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} nop -_020312AC: .word 0x021C07A8 +_020312AC: .word Unk_021C07A8 _020312B0: .word 0x00001308 _020312B4: .word 0x00001256 thumb_func_end sub_02031220 @@ -563,7 +564,7 @@ _02031318: mov r0, #1 pop {r4, r5, r6, pc} ; .align 2, 0 -_0203131C: .word 0x021C07A8 +_0203131C: .word Unk_021C07A8 thumb_func_end sub_020312B8 thumb_func_start sub_02031320 @@ -656,7 +657,7 @@ _020313CE: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} nop -_020313D4: .word 0x021C07A8 +_020313D4: .word Unk_021C07A8 _020313D8: .word 0x0000130C _020313DC: .word 0x000012E4 _020313E0: .word 0x000012E6 @@ -762,7 +763,7 @@ _0203149E: _020314AC: pop {r4, pc} nop -_020314B0: .word 0x021C07A8 +_020314B0: .word Unk_021C07A8 _020314B4: .word 0x00001310 _020314B8: .word 0x00001320 _020314BC: .word 0x0000130E @@ -785,7 +786,7 @@ _020314D2: mov r0, #1 pop {r3, pc} ; .align 2, 0 -_020314DC: .word 0x021C07A8 +_020314DC: .word Unk_021C07A8 _020314E0: .word 0x00001310 thumb_func_end sub_020314C0 @@ -831,7 +832,7 @@ _0203150E: _0203152E: pop {r3, pc} ; .align 2, 0 -_02031530: .word 0x021C07A8 +_02031530: .word Unk_021C07A8 _02031534: .word 0x0000130E thumb_func_end sub_02031500 @@ -881,7 +882,7 @@ _0203158E: add sp, #0x24 pop {pc} ; .align 2, 0 -_02031594: .word 0x021C07A8 +_02031594: .word Unk_021C07A8 _02031598: .word 0x00001310 _0203159C: .word 0x02100A18 _020315A0: .word sub_020315A8 @@ -976,7 +977,7 @@ _02031650: _0203165A: pop {r4, pc} ; .align 2, 0 -_0203165C: .word 0x021C07A8 +_0203165C: .word Unk_021C07A8 _02031660: .word 0x00001335 _02031664: .word 0x0000132C thumb_func_end sub_020315A8 @@ -1015,7 +1016,7 @@ _020316A2: add sp, #8 pop {r4, pc} ; .align 2, 0 -_020316A8: .word 0x021C07A8 +_020316A8: .word Unk_021C07A8 _020316AC: .word 0x00001304 _020316B0: .word 0x00001020 _020316B4: .word sub_020316B8 @@ -1071,7 +1072,7 @@ _0203170A: _02031710: pop {r3, pc} nop -_02031714: .word 0x021C07A8 +_02031714: .word Unk_021C07A8 _02031718: .word 0x00001314 thumb_func_end sub_020316B8 @@ -1225,7 +1226,7 @@ _0203182A: add sp, #0xc pop {r4, r5, r6, r7, pc} ; .align 2, 0 -_02031830: .word 0x021C07A8 +_02031830: .word Unk_021C07A8 _02031834: .word 0x00001304 _02031838: .word 0x0000FFFF _0203183C: .word sub_02031840 @@ -1294,7 +1295,7 @@ _02031898: _020318A4: pop {r3, pc} nop -_020318A8: .word 0x021C07A8 +_020318A8: .word Unk_021C07A8 _020318AC: .word 0x00001318 thumb_func_end sub_02031868 @@ -1323,7 +1324,7 @@ sub_020318D0: ; 0x020318D0 str r0, [r1, #8] bx lr ; .align 2, 0 -_020318D8: .word 0x021C07A8 +_020318D8: .word Unk_021C07A8 thumb_func_end sub_020318D0 thumb_func_start sub_020318DC @@ -1335,7 +1336,7 @@ sub_020318DC: ; 0x020318DC strh r1, [r0, #4] bx lr ; .align 2, 0 -_020318E8: .word 0x021C07A8 +_020318E8: .word Unk_021C07A8 thumb_func_end sub_020318DC thumb_func_start sub_020318EC @@ -1346,7 +1347,7 @@ sub_020318EC: ; 0x020318EC ldrh r0, [r1, r0] bx lr nop -_020318F8: .word 0x021C07A8 +_020318F8: .word Unk_021C07A8 _020318FC: .word 0x0000132E thumb_func_end sub_020318EC @@ -1376,7 +1377,7 @@ _02031918: pop {r3, r4} bx lr nop -_0203192C: .word 0x021C07A8 +_0203192C: .word Unk_021C07A8 _02031930: .word 0x0000132E thumb_func_end sub_02031900 @@ -1388,7 +1389,7 @@ sub_02031934: ; 0x02031934 ldr r0, [r1, r0] bx lr nop -_02031940: .word 0x021C07A8 +_02031940: .word Unk_021C07A8 _02031944: .word 0x00001310 thumb_func_end sub_02031934 @@ -1400,7 +1401,7 @@ sub_02031948: ; 0x02031948 ldr r0, [r1, r0] bx lr nop -_02031954: .word 0x021C07A8 +_02031954: .word Unk_021C07A8 _02031958: .word 0x00001330 thumb_func_end sub_02031948 @@ -1469,7 +1470,7 @@ _020319DC: pop {r3, r4, r5, pc} nop _020319E4: .word 0x027FFC3C -_020319E8: .word 0x021C07A8 +_020319E8: .word Unk_021C07A8 _020319EC: .word 0x00001338 _020319F0: .word 0x00010DCD _020319F4: .word 0x00003039 @@ -1596,7 +1597,7 @@ _02031ADA: _02031AE4: pop {r3, r4, r5, pc} nop -_02031AE8: .word 0x021C07A8 +_02031AE8: .word Unk_021C07A8 _02031AEC: .word 0x0000133E thumb_func_end sub_02031A74 @@ -1632,7 +1633,7 @@ sub_02031B04: ; 0x02031B04 ldrh r0, [r0, r1] pop {r3, pc} ; .align 2, 0 -_02031B28: .word 0x021C07A8 +_02031B28: .word Unk_021C07A8 _02031B2C: .word 0x0000133C thumb_func_end sub_02031B04 @@ -1710,7 +1711,7 @@ _02031BAE: pop {r4, r5, r6, r7} bx lr nop -_02031BB4: .word 0x021C07A8 +_02031BB4: .word Unk_021C07A8 _02031BB8: .word 0x00001338 _02031BBC: .word 0x00010DCD _02031BC0: .word 0x00003039 @@ -1785,7 +1786,7 @@ _02031C42: mov r0, #1 pop {r4, r5, r6, pc} nop -_02031C48: .word 0x021C07A8 +_02031C48: .word Unk_021C07A8 _02031C4C: .word 0x00001308 thumb_func_end sub_02031BC4 @@ -1847,7 +1848,7 @@ _02031CB0: mov r0, #1 pop {r4, pc} ; .align 2, 0 -_02031CB4: .word 0x021C07A8 +_02031CB4: .word Unk_021C07A8 _02031CB8: .word sub_02031CBC thumb_func_end sub_02031C70 @@ -1993,7 +1994,7 @@ _02031DC2: nop _02031DC8: .word sub_02031D00 _02031DCC: .word 0x0000FFFF -_02031DD0: .word 0x021C07A8 +_02031DD0: .word Unk_021C07A8 _02031DD4: .word 0x00001308 thumb_func_end sub_02031D04 @@ -2060,7 +2061,7 @@ _02031E50: nop _02031E58: .word sub_02031D00 _02031E5C: .word 0x0000FFFF -_02031E60: .word 0x021C07A8 +_02031E60: .word Unk_021C07A8 _02031E64: .word 0x00001308 _02031E68: .word 0x00001220 thumb_func_end sub_02031DD8 @@ -2086,7 +2087,7 @@ _02031E8C: _02031E8E: pop {r3, pc} ; .align 2, 0 -_02031E90: .word 0x021C07A8 +_02031E90: .word Unk_021C07A8 _02031E94: .word 0x00001318 _02031E98: .word sub_02031868 thumb_func_end sub_02031E6C @@ -2137,7 +2138,7 @@ _02031EDC: _02031EEA: pop {r3, pc} ; .align 2, 0 -_02031EEC: .word 0x021C07A8 +_02031EEC: .word Unk_021C07A8 _02031EF0: .word 0x00001310 thumb_func_end sub_02031ECC @@ -2196,7 +2197,7 @@ _02031F52: _02031F5E: pop {r3, pc} ; .align 2, 0 -_02031F60: .word 0x021C07A8 +_02031F60: .word Unk_021C07A8 _02031F64: .word 0x00001310 _02031F68: .word 0x00001314 thumb_func_end sub_02031EF4 @@ -2229,7 +2230,7 @@ sub_02031F90: ; 0x02031F90 ldrh r0, [r1, r0] bx lr nop -_02031F9C: .word 0x021C07A8 +_02031F9C: .word Unk_021C07A8 _02031FA0: .word 0x0000132C thumb_func_end sub_02031F90 @@ -2244,7 +2245,7 @@ sub_02031FA4: ; 0x02031FA4 _02031FB0: bx lr nop -_02031FB4: .word 0x021C07A8 +_02031FB4: .word Unk_021C07A8 _02031FB8: .word 0x00001334 thumb_func_end sub_02031FA4 @@ -2262,7 +2263,7 @@ _02031FCC: mov r0, #0 bx lr ; .align 2, 0 -_02031FD0: .word 0x021C07A8 +_02031FD0: .word Unk_021C07A8 _02031FD4: .word 0x00001310 thumb_func_end sub_02031FBC @@ -2280,7 +2281,7 @@ _02031FE8: mov r0, #0 bx lr ; .align 2, 0 -_02031FEC: .word 0x021C07A8 +_02031FEC: .word Unk_021C07A8 _02031FF0: .word 0x00001310 thumb_func_end sub_02031FD8 @@ -2298,7 +2299,7 @@ _02032004: mov r0, #0 bx lr ; .align 2, 0 -_02032008: .word 0x021C07A8 +_02032008: .word Unk_021C07A8 _0203200C: .word 0x00001310 thumb_func_end sub_02031FF4 @@ -2321,7 +2322,7 @@ _02032028: mov r0, #0 bx lr ; .align 2, 0 -_0203202C: .word 0x021C07A8 +_0203202C: .word Unk_021C07A8 _02032030: .word 0x00001310 thumb_func_end sub_02032010 @@ -2353,7 +2354,7 @@ _02032062: add sp, #8 pop {r4, r5, r6, pc} nop -_02032068: .word 0x021C07A8 +_02032068: .word Unk_021C07A8 _0203206C: .word 0x00001310 thumb_func_end sub_02032034 @@ -2370,7 +2371,7 @@ sub_02032070: ; 0x02032070 _02032080: bx lr nop -_02032084: .word 0x021C07A8 +_02032084: .word Unk_021C07A8 _02032088: .word 0x00001344 thumb_func_end sub_02032070 @@ -2398,7 +2399,7 @@ _020320B2: mov r0, #0 pop {r4, pc} nop -_020320B8: .word 0x021C07A8 +_020320B8: .word Unk_021C07A8 _020320BC: .word 0x00001344 _020320C0: .word sub_02032070 thumb_func_end sub_0203208C @@ -2422,7 +2423,7 @@ _020320DC: mov r0, #0 bx lr ; .align 2, 0 -_020320E0: .word 0x021C07A8 +_020320E0: .word Unk_021C07A8 _020320E4: .word 0x00001345 thumb_func_end sub_020320C4 @@ -2435,7 +2436,7 @@ sub_020320E8: ; 0x020320E8 strb r2, [r1, r0] bx lr ; .align 2, 0 -_020320F4: .word 0x021C07A8 +_020320F4: .word Unk_021C07A8 _020320F8: .word 0x00001345 thumb_func_end sub_020320E8 @@ -2447,7 +2448,7 @@ sub_020320FC: ; 0x020320FC str r0, [r2, r1] bx lr nop -_02032108: .word 0x021C07A8 +_02032108: .word Unk_021C07A8 _0203210C: .word 0x00001320 thumb_func_end sub_020320FC @@ -2459,7 +2460,7 @@ sub_02032110: ; 0x02032110 str r0, [r2, r1] bx lr nop -_0203211C: .word 0x021C07A8 +_0203211C: .word Unk_021C07A8 _02032120: .word 0x00001324 thumb_func_end sub_02032110 @@ -2471,7 +2472,7 @@ sub_02032124: ; 0x02032124 str r0, [r2, r1] bx lr nop -_02032130: .word 0x021C07A8 +_02032130: .word Unk_021C07A8 _02032134: .word 0x00001328 thumb_func_end sub_02032124 @@ -2483,7 +2484,7 @@ sub_02032138: ; 0x02032138 strb r0, [r2, r1] bx lr nop -_02032144: .word 0x021C07A8 +_02032144: .word Unk_021C07A8 _02032148: .word 0x00001342 thumb_func_end sub_02032138 @@ -2495,7 +2496,7 @@ sub_0203214C: ; 0x0203214C ldrb r0, [r1, r0] bx lr nop -_02032158: .word 0x021C07A8 +_02032158: .word Unk_021C07A8 _0203215C: .word 0x00001342 thumb_func_end sub_0203214C @@ -2507,7 +2508,7 @@ sub_02032160: ; 0x02032160 strb r0, [r2, r1] bx lr nop -_0203216C: .word 0x021C07A8 +_0203216C: .word Unk_021C07A8 _02032170: .word 0x00001343 thumb_func_end sub_02032160 @@ -2519,7 +2520,7 @@ sub_02032174: ; 0x02032174 strb r0, [r2, r1] bx lr nop -_02032180: .word 0x021C07A8 +_02032180: .word Unk_021C07A8 _02032184: .word 0x00001335 thumb_func_end sub_02032174 diff --git a/asm/unk_0208694C.s b/asm/unk_0208694C.s index 3e43e1d9ac..52642db972 100644 --- a/asm/unk_0208694C.s +++ b/asm/unk_0208694C.s @@ -1,6 +1,7 @@ .include "macros/function.inc" .include "include/unk_0208694C.inc" + .extern Unk_021C0A30 .text @@ -209,7 +210,7 @@ _02086B18: .word sub_02087190 _02086B1C: .word 0x000004C4 _02086B20: .word 0x021BF6DC _02086B24: .word 0x000004B8 -_02086B28: .word 0x021C0A30 +_02086B28: .word Unk_021C0A30 _02086B2C: .word 0x000005C4 thumb_func_end sub_0208694C diff --git a/asm/unk_020A05BC.s b/asm/unk_020A05BC.s index 892f9a690c..221686ec71 100644 --- a/asm/unk_020A05BC.s +++ b/asm/unk_020A05BC.s @@ -1,7 +1,8 @@ .include "macros/function.inc" .include "include/unk_020A05BC.inc" - + .extern Unk_021C3A38 + .extern Unk_021C3A38 .text @@ -209,7 +210,7 @@ _020A0864: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} bx lr ; .align 2, 0 -_020A08CC: .word 0x021C3A38 +_020A08CC: .word Unk_021C3A38 _020A08D0: .word 0x5EEDF715 _020A08D4: .word 0x1B0CB173 _020A08D8: .word 0x0000FFFF @@ -1080,7 +1081,7 @@ _020A1574: bx lr ; .align 2, 0 _020A15E8: .word 0x00000FFF -_020A15EC: .word 0x021C3A38 +_020A15EC: .word Unk_021C3A38 _020A15F0: .word 0x5EEDF715 _020A15F4: .word 0x1B0CB173 _020A15F8: .word 0x020F983C diff --git a/asm/unk_020A19F0.s b/asm/unk_020A19F0.s index fb6f2c3282..a19fe844cd 100644 --- a/asm/unk_020A19F0.s +++ b/asm/unk_020A19F0.s @@ -1,7 +1,8 @@ .include "macros/function.inc" .include "include/unk_020A19F0.inc" - + .extern Unk_021C3A38 + .extern Unk_021C3A38 .text @@ -144,7 +145,7 @@ _020A1B74: ldmia sp!, {r4, r5, r6, lr} bx lr ; .align 2, 0 -_020A1BC8: .word 0x021C3A38 +_020A1BC8: .word Unk_021C3A38 _020A1BCC: .word 0x5EEDF715 _020A1BD0: .word 0x1B0CB173 arm_func_end sub_020A1AF8 @@ -309,4 +310,4 @@ _020A1DE8: add sp, sp, #4 ldmia sp!, {r4, r5, lr} bx lr - arm_func_end sub_020A1DA0 \ No newline at end of file + arm_func_end sub_020A1DA0 diff --git a/asm/unk_020A1E30.s b/asm/unk_020A1E30.s index 23e069fdfa..946474876d 100644 --- a/asm/unk_020A1E30.s +++ b/asm/unk_020A1E30.s @@ -1,7 +1,8 @@ .include "macros/function.inc" .include "include/unk_020A1E30.inc" - + .extern Unk_021C3A38 + .extern Unk_021C3A38 .text @@ -276,7 +277,7 @@ SPL_020A213C: ; 0x020A213C ldmia sp!, {r4, r5, lr} bx lr ; .align 2, 0 -_020A21F8: .word 0x021C3A38 +_020A21F8: .word Unk_021C3A38 _020A21FC: .word 0x5EEDF715 _020A2200: .word 0x1B0CB173 arm_func_end SPL_020A213C @@ -296,4 +297,4 @@ SPL_020A2204: ; 0x020A2204 add r0, r1, r0 str r0, [r2, #8] bx lr - arm_func_end SPL_020A2204 \ No newline at end of file + arm_func_end SPL_020A2204 diff --git a/asm/unk_020A2354.s b/asm/unk_020A2354.s index d709801529..a517396498 100644 --- a/asm/unk_020A2354.s +++ b/asm/unk_020A2354.s @@ -1,7 +1,8 @@ .include "macros/function.inc" .include "include/unk_020A2354.inc" - + .extern Unk_021C3A38 + .extern Unk_021C3A38 .text @@ -29,7 +30,7 @@ sub_020A2354: ; 0x020A2354 ldmia sp!, {r4, lr} bx lr ; .align 2, 0 -_020A23A4: .word 0x021C3A38 +_020A23A4: .word Unk_021C3A38 _020A23A8: .word 0x5EEDF715 _020A23AC: .word 0x1B0CB173 arm_func_end sub_020A2354 @@ -60,7 +61,7 @@ sub_020A23B0: ; 0x020A23B0 ldmia sp!, {r4, lr} bx lr ; .align 2, 0 -_020A240C: .word 0x021C3A38 +_020A240C: .word Unk_021C3A38 _020A2410: .word 0x5EEDF715 _020A2414: .word 0x1B0CB173 arm_func_end sub_020A23B0 diff --git a/asm/unk_020A2418.s b/asm/unk_020A2418.s index 73d389004a..e5a03f070d 100644 --- a/asm/unk_020A2418.s +++ b/asm/unk_020A2418.s @@ -1,6 +1,7 @@ .include "macros/function.inc" .include "include/unk_020A2418.inc" + .extern Unk_021C3A3C .text @@ -162,7 +163,7 @@ _020A2630: mov r0, #1 ldmia sp!, {r4, r5, r6, r7, r8, pc} ; .align 2, 0 -_020A2640: .word 0x021C3A3C +_020A2640: .word Unk_021C3A3C _020A2644: .word 0x04000242 _020A2648: .word 0x04000243 _020A264C: .word WvrReceiveCallback @@ -229,7 +230,7 @@ _020A2718: mov r0, #1 ldmia sp!, {r4, r5, r6, pc} ; .align 2, 0 -_020A2728: .word 0x021C3A3C +_020A2728: .word Unk_021C3A3C _020A272C: .word WvrReceiveCallback _020A2730: .word WvrDummyAsyncCallback arm_func_end WVR_TerminateAsync @@ -294,7 +295,7 @@ _020A27E0: blx r4 ldmia sp!, {r4, r5, r6, pc} ; .align 2, 0 -_020A2808: .word 0x021C3A3C +_020A2808: .word Unk_021C3A3C arm_func_end WvrReceiveCallback arm_func_start WvrDummyAsyncCallback diff --git a/asm/unk_020A2810.s b/asm/unk_020A2810.s index c2dfd1bfb1..a9f1386e1c 100644 --- a/asm/unk_020A2810.s +++ b/asm/unk_020A2810.s @@ -1,6 +1,9 @@ .include "macros/function.inc" .include "include/unk_020A2810.inc" + .extern Unk_021C3A48 + .extern Unk_021C3A54 + .extern Unk_021C3A80 .text @@ -19,7 +22,7 @@ sub_020A2810: ; 0x020A2810 moveq r0, #0 ldmia sp!, {r3, pc} ; .align 2, 0 -_020A2838: .word 0x021C3A48 +_020A2838: .word Unk_021C3A48 arm_func_end sub_020A2810 arm_func_start sub_020A283C @@ -73,7 +76,7 @@ sub_020A283C: ; 0x020A283C bl MI_CpuCopy8 ldmia sp!, {r4, pc} ; .align 2, 0 -_020A28FC: .word 0x021C3A54 +_020A28FC: .word Unk_021C3A54 _020A2900: .word 0x000007FF _020A2904: .word 0x021C3A59 _020A2908: .word 0x021C3A5E @@ -139,9 +142,9 @@ _020A2994: moveq r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ; .align 2, 0 -_020A29E4: .word 0x021C3A48 +_020A29E4: .word Unk_021C3A48 _020A29E8: .word 0x0000A001 -_020A29EC: .word 0x021C3A54 +_020A29EC: .word Unk_021C3A54 arm_func_end sub_020A2914 arm_func_start sub_020A29F0 @@ -163,7 +166,7 @@ sub_020A29F0: ; 0x020A29F0 str r2, [r1, #8] ldmia sp!, {r4, pc} ; .align 2, 0 -_020A2A30: .word 0x021C3A48 +_020A2A30: .word Unk_021C3A48 arm_func_end sub_020A29F0 arm_func_start sub_020A2A34 @@ -179,7 +182,7 @@ sub_020A2A34: ; 0x020A2A34 moveq r0, #0 ldmia sp!, {r3, pc} ; .align 2, 0 -_020A2A5C: .word 0x021C3A48 +_020A2A5C: .word Unk_021C3A48 arm_func_end sub_020A2A34 arm_func_start sub_020A2A60 @@ -221,7 +224,7 @@ _020A2ABC: moveq r0, #0 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} ; .align 2, 0 -_020A2AE4: .word 0x021C3A48 +_020A2AE4: .word Unk_021C3A48 arm_func_end sub_020A2A60 arm_func_start sub_020A2AE8 @@ -265,7 +268,7 @@ _020A2B24: moveq r0, #0 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} ; .align 2, 0 -_020A2B78: .word 0x021C3A48 +_020A2B78: .word Unk_021C3A48 arm_func_end sub_020A2AE8 arm_func_start sub_020A2B7C @@ -276,7 +279,7 @@ sub_020A2B7C: ; 0x020A2B7C bx ip ; .align 2, 0 _020A2B8C: .word MI_CpuCopy8 -_020A2B90: .word 0x021C3A54 +_020A2B90: .word Unk_021C3A54 arm_func_end sub_020A2B7C arm_func_start sub_020A2B94 @@ -685,11 +688,11 @@ _020A3120: add sp, sp, #0x3c ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} ; .align 2, 0 -_020A312C: .word 0x021C3A80 +_020A312C: .word Unk_021C3A80 _020A3130: .word 0x01020000 _020A3134: .word 0x02002200 _020A3138: .word 0x03002100 -_020A313C: .word 0x021C3A48 +_020A313C: .word Unk_021C3A48 _020A3140: .word 0x000082EA arm_func_end sub_020A2CD8 @@ -847,7 +850,7 @@ sub_020A3308: ; 0x020A3308 ldrh r0, [r0] bx lr ; .align 2, 0 -_020A3334: .word 0x021C3A48 +_020A3334: .word Unk_021C3A48 arm_func_end sub_020A3308 arm_func_start sub_020A3338 @@ -898,7 +901,7 @@ sub_020A3338: ; 0x020A3338 add sp, sp, #8 ldmia sp!, {r4, pc} ; .align 2, 0 -_020A33EC: .word 0x021C3A54 +_020A33EC: .word Unk_021C3A54 _020A33F0: .word 0x021C3A5A _020A33F4: .word 0x021C3A60 arm_func_end sub_020A3338 @@ -908,7 +911,7 @@ sub_020A33F8: ; 0x020A33F8 ldr r0, _020A3400 ; =0x021C3A54 bx lr ; .align 2, 0 -_020A3400: .word 0x021C3A54 +_020A3400: .word Unk_021C3A54 arm_func_end sub_020A33F8 .rodata diff --git a/asm/unk_020A4DE8.s b/asm/unk_020A4DE8.s index b7a4ab1e94..a26efa5ee0 100644 --- a/asm/unk_020A4DE8.s +++ b/asm/unk_020A4DE8.s @@ -1,6 +1,8 @@ .include "macros/function.inc" .include "include/unk_020A4DE8.inc" + .extern Unk_021C3AA0 + .extern Unk_021C3AA4 .text @@ -51,7 +53,7 @@ FindListContainHeap: ; 0x020A4E50 mov r0, r4 ldmia sp!, {r4, pc} ; .align 2, 0 -_020A4E74: .word 0x021C3AA4 +_020A4E74: .word Unk_021C3AA4 arm_func_end FindListContainHeap arm_func_start NNSi_FndInitHeapHead @@ -87,8 +89,8 @@ _020A4ED8: bl NNS_FndAppendListObject ldmia sp!, {r4, pc} ; .align 2, 0 -_020A4EEC: .word 0x021C3AA0 -_020A4EF0: .word 0x021C3AA4 +_020A4EEC: .word Unk_021C3AA0 +_020A4EF0: .word Unk_021C3AA4 arm_func_end NNSi_FndInitHeapHead arm_func_start NNSi_FndFinalizeHeap diff --git a/asm/unk_020A5F6C.s b/asm/unk_020A5F6C.s index 3217449b5e..e1b62044de 100644 --- a/asm/unk_020A5F6C.s +++ b/asm/unk_020A5F6C.s @@ -467,9 +467,9 @@ NNS_GfdInitVramTransferManager: ; 0x020A6338 str r1, [r2, #4] bx ip ; .align 2, 0 -_020A6350: .word 0x021C3AC0 +_020A6350: .word Unk_021C3AC0 _020A6354: .word ResetTaskQueue_ -_020A6358: .word 0x021C3AC0 +_020A6358: .word Unk_021C3AC0 arm_func_end NNS_GfdInitVramTransferManager arm_func_start NNS_GfdDoVramTransfer @@ -499,7 +499,7 @@ _020A6380: bne _020A6380 ldmia sp!, {r3, r4, r5, pc} ; .align 2, 0 -_020A63B8: .word 0x021C3AC0 +_020A63B8: .word Unk_021C3AC0 arm_func_end NNS_GfdDoVramTransfer arm_func_start NNS_GfdRegisterNewVramTransferTask @@ -530,7 +530,7 @@ NNS_GfdRegisterNewVramTransferTask: ; 0x020A63BC str r1, [r5, #0x10] ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} ; .align 2, 0 -_020A6420: .word 0x021C3AC0 +_020A6420: .word Unk_021C3AC0 arm_func_end NNS_GfdRegisterNewVramTransferTask .rodata diff --git a/asm/unk_020A6824.s b/asm/unk_020A6824.s index 2dfb3086e1..7b4479c803 100644 --- a/asm/unk_020A6824.s +++ b/asm/unk_020A6824.s @@ -32,7 +32,7 @@ NNS_GfdInitLnkTexVramManager: ; 0x020A682C str r2, [r0, #0] ldmia sp!, {r3, pc} ; .align 2, 0 -_020A6870: .word 0x021C3AD4 +_020A6870: .word Unk_021C3AD4 _020A6874: .word NNS_GfdAllocLnkTexVram _020A6878: .word 0x02100DEC _020A687C: .word NNS_GfdFreeLnkTexVram @@ -79,7 +79,7 @@ _020A68DC: _020A6904: .word 0x0007FFF0 _020A6908: .word 0x021C3AD8 _020A690C: .word 0x021C3ADC -_020A6910: .word 0x021C3AD4 +_020A6910: .word Unk_021C3AD4 arm_func_end NNS_GfdAllocLnkTexVram arm_func_start NNS_GfdFreeLnkTexVram @@ -116,7 +116,7 @@ _020A6970: _020A6978: .word 0x7FFF0000 _020A697C: .word 0x021C3AD8 _020A6980: .word 0x021C3ADC -_020A6984: .word 0x021C3AD4 +_020A6984: .word Unk_021C3AD4 arm_func_end NNS_GfdFreeLnkTexVram arm_func_start NNS_GfdResetLnkTexVramState @@ -255,8 +255,8 @@ _020A6B50: ldmia sp!, {r4, pc} ; .align 2, 0 _020A6B70: .word 0x020F9600 -_020A6B74: .word 0x021C3AD4 -_020A6B78: .word 0x021C3AD4 +_020A6B74: .word Unk_021C3AD4 +_020A6B78: .word Unk_021C3AD4 _020A6B7C: .word 0x021C3AD8 _020A6B80: .word 0x021C3ADC arm_func_end NNS_GfdResetLnkTexVramState diff --git a/asm/unk_020A6B84.s b/asm/unk_020A6B84.s index 9763068363..de45637910 100644 --- a/asm/unk_020A6B84.s +++ b/asm/unk_020A6B84.s @@ -31,7 +31,7 @@ NNS_GfdInitLnkPlttVramManager: ; 0x020A6B8C str r2, [r0, #0] ldmia sp!, {r4, pc} ; .align 2, 0 -_020A6BCC: .word 0x021C3AF0 +_020A6BCC: .word Unk_021C3AF0 _020A6BD0: .word NNS_GfdAllocLnkPlttVram _020A6BD4: .word 0x02100DF4 _020A6BD8: .word NNS_GfdFreeLnkPlttVram @@ -92,7 +92,7 @@ _020A6C74: ldmia sp!, {r4, pc} ; .align 2, 0 _020A6CA0: .word 0x0007FFF8 -_020A6CA4: .word 0x021C3AF0 +_020A6CA4: .word Unk_021C3AF0 _020A6CA8: .word 0x021C3AF4 arm_func_end NNS_GfdAllocLnkPlttVram @@ -114,7 +114,7 @@ NNS_GfdFreeLnkPlttVram: ; 0x020A6CAC movne r0, #0 ldmia sp!, {r3, pc} ; .align 2, 0 -_020A6CE8: .word 0x021C3AF0 +_020A6CE8: .word Unk_021C3AF0 _020A6CEC: .word 0x021C3AF4 arm_func_end NNS_GfdFreeLnkPlttVram @@ -141,8 +141,8 @@ NNS_GfdResetLnkPlttVramState: ; 0x020A6CF0 bl NNSi_GfdMergeAllFreeBlocks ldmia sp!, {r3, pc} ; .align 2, 0 -_020A6D40: .word 0x021C3AF0 -_020A6D44: .word 0x021C3AF0 +_020A6D40: .word Unk_021C3AF0 +_020A6D44: .word Unk_021C3AF0 _020A6D48: .word 0x021C3AF4 arm_func_end NNS_GfdResetLnkPlttVramState diff --git a/asm/unk_020C3790.s b/asm/unk_020C3790.s index 3d52e3244c..255743a80a 100644 --- a/asm/unk_020C3790.s +++ b/asm/unk_020C3790.s @@ -143,7 +143,7 @@ _020C392C: .word 0x04000100 .global Unk_021CCFB4 Unk_021CCFB4: ; 0x021CCFB4 - .space 0x2 + .space 0x4 .global Unk_021CCFB8 Unk_021CCFB8: ; 0x021CCFB8 diff --git a/asm/unk_020C41D8.s b/asm/unk_020C41D8.s index 0db6e77b33..2f81df8ce5 100644 --- a/asm/unk_020C41D8.s +++ b/asm/unk_020C41D8.s @@ -1,7 +1,7 @@ .include "macros/function.inc" .include "include/unk_020C41D8.inc" - + .extern Unk_021CCFBC .text @@ -59,6 +59,6 @@ OS_GetLowEntropyData: ; 0x020C41D8 ; .align 2, 0 _020C4298: .word 0x04000006 _020C429C: .word 0x027FFC00 -_020C42A0: .word 0x021CCFBC +_020C42A0: .word Unk_021CCFBC _020C42A4: .word 0x04000600 arm_func_end OS_GetLowEntropyData \ No newline at end of file