From 6550bf3f044678db5f1e5fca2ff0dad37069016f Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 23 Aug 2020 13:44:43 -0500 Subject: [PATCH] Label map-related symbols --- asm/code_08000108.s | 16 ++++++++-------- asm/code_0801D79C.s | 16 ++++++++-------- asm/code_080526F8.s | 36 ++++++++++++++++++------------------ asm/code_0807B9B8.s | 18 +++++++++--------- asm/code_080A5574.s | 8 ++++---- asm/gyorgFemale.s | 6 +++--- data/data_08100CD4.s | 4 ++-- data/data_0811BD44.s | 2 +- linker.ld | 8 ++++---- src/sub_0807C998.c | 12 ++++++------ 10 files changed, 63 insertions(+), 63 deletions(-) diff --git a/asm/code_08000108.s b/asm/code_08000108.s index 2e6cc668..04c7b12a 100644 --- a/asm/code_08000108.s +++ b/asm/code_08000108.s @@ -140,13 +140,13 @@ _08000224: .4byte gUnk_08000228 gUnk_08000228:: .4byte gUnk_02025EB4 gUnk_0800022C:: - .4byte gUnk_0202AEB4 + .4byte gMetatileTypesBottom .4byte gUnk_02025EB4 - .4byte gUnk_0202AEB4 + .4byte gMetatileTypesBottom .4byte gUnk_0200B654 - .4byte gUnk_02010654 + .4byte gMetatileTypesTop .4byte gUnk_02025EB4 - .4byte gUnk_0202AEB4 + .4byte gMetatileTypesBottom gUnk_08000248:: .4byte gUnk_02027EB4 .4byte gUnk_02027EB4 @@ -154,13 +154,13 @@ gUnk_08000248:: .4byte gUnk_02027EB4 gUnk_08000258:: .4byte gUnk_02028EB4 - .4byte gUnk_0202AEB4 + .4byte gMetatileTypesBottom .4byte gUnk_02028EB4 - .4byte gUnk_0202AEB4 + .4byte gMetatileTypesBottom .4byte gUnk_0200E654 - .4byte gUnk_02010654 + .4byte gMetatileTypesTop .4byte gUnk_02028EB4 - .4byte gUnk_0202AEB4 + .4byte gMetatileTypesBottom gUnk_08000278:: .4byte gUnk_02030EB4 .4byte gUnk_02030EB4 diff --git a/asm/code_0801D79C.s b/asm/code_0801D79C.s index c6f9b660..0d7fa584 100644 --- a/asm/code_0801D79C.s +++ b/asm/code_0801D79C.s @@ -491,7 +491,7 @@ _0801DC26: ldr r3, [sp] cmp r0, #0 bne _0801DCA6 - ldr r0, _0801DC88 @ =gUnk_0811E214 + ldr r0, _0801DC88 @ =gAreas ldrb r2, [r6] lsls r2, r2, #2 adds r2, r2, r0 @@ -526,7 +526,7 @@ _0801DC26: b _0801DC9E .align 2, 0 _0801DC84: .4byte 0x000007FF -_0801DC88: .4byte gUnk_0811E214 +_0801DC88: .4byte gAreas _0801DC8C: ldrh r0, [r2] ands r0, r7 @@ -562,7 +562,7 @@ _0801DCAE: bl CheckGlobalFlag cmp r0, #0 bne _0801DD16 - ldr r0, _0801DD50 @ =gUnk_0811E214 + ldr r0, _0801DD50 @ =gAreas ldrb r2, [r6] lsls r2, r2, #2 adds r2, r2, r0 @@ -632,12 +632,12 @@ _0801DD42: pop {r4, r5, r6, r7, pc} .align 2, 0 _0801DD4C: .4byte gArea -_0801DD50: .4byte gUnk_0811E214 +_0801DD50: .4byte gAreas _0801DD54: .4byte gScreenTransition thumb_func_start sub_0801DD58 sub_0801DD58: @ 0x0801DD58 - ldr r2, _0801DD7C @ =gUnk_0811E214 + ldr r2, _0801DD7C @ =gAreas lsls r0, r0, #2 adds r0, r0, r2 lsls r2, r1, #2 @@ -656,7 +656,7 @@ sub_0801DD58: @ 0x0801DD58 strh r0, [r1, #6] bx lr .align 2, 0 -_0801DD7C: .4byte gUnk_0811E214 +_0801DD7C: .4byte gAreas _0801DD80: .4byte gArea _0801DD84: .4byte 0x0000085C @@ -770,7 +770,7 @@ _0801DE46: ldr r0, _0801DF04 @ =0x84000100 str r0, [r2, #8] ldr r0, [r2, #8] - ldr r0, _0801DF08 @ =gUnk_0811E214 + ldr r0, _0801DF08 @ =gAreas ldrb r2, [r4] lsls r2, r2, #2 adds r2, r2, r0 @@ -850,7 +850,7 @@ _0801DEF8: .4byte 0x040000D4 _0801DEFC: .4byte gUnk_08324AE4 _0801DF00: .4byte gUnk_02019EE0 _0801DF04: .4byte 0x84000100 -_0801DF08: .4byte gUnk_0811E214 +_0801DF08: .4byte gAreas _0801DF0C: .4byte 0x000007FF thumb_func_start sub_0801DF10 diff --git a/asm/code_080526F8.s b/asm/code_080526F8.s index 592d77e2..3d5e118a 100644 --- a/asm/code_080526F8.s +++ b/asm/code_080526F8.s @@ -742,7 +742,7 @@ _08052CA0: .4byte gPlayerEntity thumb_func_start sub_08052CA4 sub_08052CA4: @ 0x08052CA4 push {r4, lr} - ldr r4, _08052CC8 @ =gUnk_0811E214 + ldr r4, _08052CC8 @ =gAreas lsls r0, r0, #2 adds r0, r0, r4 lsls r4, r1, #2 @@ -759,13 +759,13 @@ sub_08052CA4: @ 0x08052CA4 strh r0, [r4, #0x22] pop {r4, pc} .align 2, 0 -_08052CC8: .4byte gUnk_0811E214 +_08052CC8: .4byte gAreas _08052CCC: .4byte gScreenTransition thumb_func_start sub_08052CD0 sub_08052CD0: @ 0x08052CD0 push {r4, lr} - ldr r4, _08052CF4 @ =gUnk_0811E214 + ldr r4, _08052CF4 @ =gAreas lsls r0, r0, #2 adds r0, r0, r4 lsls r4, r1, #2 @@ -782,7 +782,7 @@ sub_08052CD0: @ 0x08052CD0 strh r0, [r4, #0x1e] pop {r4, pc} .align 2, 0 -_08052CF4: .4byte gUnk_0811E214 +_08052CF4: .4byte gAreas _08052CF8: .4byte gScreenTransition thumb_func_start sub_08052CFC @@ -871,7 +871,7 @@ _08052DA4: .4byte 0x0000088C thumb_func_start sub_08052DA8 sub_08052DA8: @ 0x08052DA8 push {r4, r5, r6, r7, lr} - ldr r1, _08052DF8 @ =gUnk_0811E214 + ldr r1, _08052DF8 @ =gAreas ldr r0, _08052DFC @ =gRoomControls ldrb r0, [r0, #4] lsls r0, r0, #2 @@ -911,7 +911,7 @@ _08052DE8: str r0, [r1] pop {r4, r5, r6, r7, pc} .align 2, 0 -_08052DF8: .4byte gUnk_0811E214 +_08052DF8: .4byte gAreas _08052DFC: .4byte gRoomControls _08052E00: .4byte gUnk_02033ACC _08052E04: .4byte 0x0000FFFF @@ -930,7 +930,7 @@ sub_08052E10: @ 0x08052E10 strh r0, [r5] ldrh r0, [r1, #6] strh r0, [r5, #2] - ldr r4, _08052E74 @ =gUnk_0810246C + ldr r4, _08052E74 @ =gAreaTilesets lsls r2, r2, #2 adds r4, r2, r4 ldrh r0, [r1, #8] @@ -946,7 +946,7 @@ sub_08052E10: @ 0x08052E10 adds r0, r3, r0 ldr r0, [r0] str r0, [r5, #0xc] - ldr r0, _08052E7C @ =gUnk_0810309C + ldr r0, _08052E7C @ =gAreaMetatiles adds r0, r2, r0 ldr r0, [r0] str r0, [r5, #0x10] @@ -971,9 +971,9 @@ sub_08052E10: @ 0x08052E10 _08052E70: pop {r4, r5, pc} .align 2, 0 -_08052E74: .4byte gUnk_0810246C +_08052E74: .4byte gAreaTilesets _08052E78: .4byte gUnk_08107988 -_08052E7C: .4byte gUnk_0810309C +_08052E7C: .4byte gAreaMetatiles _08052E80: .4byte gUnk_080B755C _08052E84: .4byte gUnk_0813A7F0 _08052E88: .4byte gUnk_080D50FC @@ -1180,7 +1180,7 @@ sub_08052FF4: @ 0x08052FF4 movs r1, #0x20 bl _DmaZero str r5, [r5, #0x20] - ldr r0, _08053078 @ =gUnk_0811E214 + ldr r0, _08053078 @ =gAreas lsls r6, r6, #2 adds r0, r6, r0 lsls r2, r4, #2 @@ -1196,7 +1196,7 @@ sub_08052FF4: @ 0x08052FF4 strh r1, [r5] ldrh r1, [r0, #6] strh r1, [r5, #2] - ldr r1, _0805307C @ =gUnk_0810246C + ldr r1, _0805307C @ =gAreaTilesets adds r1, r6, r1 ldrh r0, [r0, #8] ldr r1, [r1] @@ -1210,7 +1210,7 @@ sub_08052FF4: @ 0x08052FF4 adds r2, r2, r0 ldr r0, [r2] str r0, [r5, #0xc] - ldr r0, _08053084 @ =gUnk_0810309C + ldr r0, _08053084 @ =gAreaMetatiles adds r0, r6, r0 ldr r0, [r0] str r0, [r5, #0x10] @@ -1223,10 +1223,10 @@ sub_08052FF4: @ 0x08052FF4 _0805306C: .4byte gRoomControls _08053070: .4byte gScreen _08053074: .4byte gUnk_020342CC -_08053078: .4byte gUnk_0811E214 -_0805307C: .4byte gUnk_0810246C +_08053078: .4byte gAreas +_0805307C: .4byte gAreaTilesets _08053080: .4byte gUnk_08107988 -_08053084: .4byte gUnk_0810309C +_08053084: .4byte gAreaMetatiles _08053088: .4byte gUnk_080B755C thumb_func_start sub_0805308C @@ -1533,7 +1533,7 @@ _080532E0: thumb_func_start sub_080532E4 sub_080532E4: @ 0x080532E4 - ldr r0, _08053318 @ =gUnk_0811E214 + ldr r0, _08053318 @ =gAreas movs r1, #0xb0 lsls r1, r1, #1 adds r0, r0, r1 @@ -1560,7 +1560,7 @@ sub_080532E4: @ 0x080532E4 strh r0, [r1, #0x1e] bx lr .align 2, 0 -_08053318: .4byte gUnk_0811E214 +_08053318: .4byte gAreas _0805331C: .4byte gScreenTransition thumb_func_start sub_08053320 diff --git a/asm/code_0807B9B8.s b/asm/code_0807B9B8.s index 7e0aeea9..97ec7f4d 100644 --- a/asm/code_0807B9B8.s +++ b/asm/code_0807B9B8.s @@ -286,9 +286,9 @@ sub_0807BBE4: @ 0x0807BBE4 mov r6, sb mov r5, r8 push {r5, r6, r7} - ldr r0, _0807BC28 @ =gUnk_0202AEB4 + ldr r0, _0807BC28 @ =gMetatileTypesBottom mov sl, r0 - ldr r0, _0807BC2C @ =gUnk_02010654 + ldr r0, _0807BC2C @ =gMetatileTypesTop mov sb, r0 ldr r5, _0807BC30 @ =0xFFFFB000 add r5, sl @@ -316,8 +316,8 @@ _0807BC14: add r0, ip b _0807BC4C .align 2, 0 -_0807BC28: .4byte gUnk_0202AEB4 -_0807BC2C: .4byte gUnk_02010654 +_0807BC28: .4byte gMetatileTypesBottom +_0807BC2C: .4byte gMetatileTypesTop _0807BC30: .4byte 0xFFFFB000 _0807BC34: .4byte 0xFFFFD000 _0807BC38: .4byte 0x00003FFF @@ -815,7 +815,7 @@ sub_0807BFD0: @ 0x0807BFD0 bl sub_0801B170 bl sub_0807BFA8 ldr r7, _0807C0B8 @ =0x0000FFFF - ldr r6, _0807C0BC @ =gUnk_0202AEB4 + ldr r6, _0807C0BC @ =gMetatileTypesBottom movs r0, #0x80 lsls r0, r0, #5 mov r8, r0 @@ -825,7 +825,7 @@ sub_0807BFD0: @ 0x0807BFD0 bl _DmaFill16 movs r5, #0 strh r5, [r6] - ldr r4, _0807C0C0 @ =gUnk_02010654 + ldr r4, _0807C0C0 @ =gMetatileTypesTop adds r0, r7, #0 adds r1, r4, #0 mov r2, r8 @@ -894,7 +894,7 @@ _0807C078: ble _0807C066 movs r2, #0x80 lsls r2, r2, #5 - ldr r5, _0807C0C0 @ =gUnk_02010654 + ldr r5, _0807C0C0 @ =gMetatileTypesTop adds r6, r5, r2 ldr r4, _0807C0B8 @ =0x0000FFFF adds r0, r4, #0 @@ -922,8 +922,8 @@ _0807C0A8: pop {r4, r5, r6, r7, pc} .align 2, 0 _0807C0B8: .4byte 0x0000FFFF -_0807C0BC: .4byte gUnk_0202AEB4 -_0807C0C0: .4byte gUnk_02010654 +_0807C0BC: .4byte gMetatileTypesBottom +_0807C0C0: .4byte gMetatileTypesTop _0807C0C4: .4byte gRoomControls _0807C0C8: .4byte gArea _0807C0CC: .4byte 0x0000085C diff --git a/asm/code_080A5574.s b/asm/code_080A5574.s index fa3d8dd2..f609214a 100644 --- a/asm/code_080A5574.s +++ b/asm/code_080A5574.s @@ -2632,7 +2632,7 @@ _080A6A26: bne _080A6A30 movs r2, #9 _080A6A30: - ldr r1, _080A6A40 @ =gUnk_0811E214 + ldr r1, _080A6A40 @ =gAreas lsls r0, r2, #2 adds r0, r0, r1 ldr r0, [r0] @@ -2640,7 +2640,7 @@ _080A6A30: subs r6, r6, r0 b _080A6A48 .align 2, 0 -_080A6A40: .4byte gUnk_0811E214 +_080A6A40: .4byte gAreas _080A6A44: ldr r0, _080A6A78 @ =0xFFFFFEF8 adds r7, r7, r0 @@ -3233,7 +3233,7 @@ sub_080A6EE0: @ 0x080A6EE0 adds r1, r1, r0 ldrh r3, [r1, #6] ldrh r4, [r1, #8] - ldr r0, _080A6F38 @ =gUnk_0811E214 + ldr r0, _080A6F38 @ =gAreas ldrb r2, [r1, #0xb] lsls r2, r2, #2 adds r2, r2, r0 @@ -3267,7 +3267,7 @@ sub_080A6EE0: @ 0x080A6EE0 pop {r4, r5, r6, pc} .align 2, 0 _080A6F34: .4byte gUnk_08128024 -_080A6F38: .4byte gUnk_0811E214 +_080A6F38: .4byte gAreas _080A6F3C: .4byte gUnk_03001010 thumb_func_start sub_080A6F40 diff --git a/asm/gyorgFemale.s b/asm/gyorgFemale.s index 04dfbde8..c7a2f7e0 100644 --- a/asm/gyorgFemale.s +++ b/asm/gyorgFemale.s @@ -505,7 +505,7 @@ sub_08046518: @ 0x08046518 mov r5, r8 push {r5, r6, r7} sub sp, #8 - ldr r1, _080465AC @ =gUnk_02010654 + ldr r1, _080465AC @ =gMetatileTypesTop ldr r2, _080465B0 @ =0xFFFFBCB0 adds r0, r1, r2 ldr r3, _080465B4 @ =0xFFFFECB0 @@ -541,7 +541,7 @@ _08046560: strh r0, [r4] ldrh r0, [r3] lsls r0, r0, #1 - ldr r7, _080465AC @ =gUnk_02010654 + ldr r7, _080465AC @ =gMetatileTypesTop adds r0, r0, r7 ldrh r1, [r0] ldr r0, [sp, #4] @@ -575,7 +575,7 @@ _08046560: mov sl, r5 pop {r4, r5, r6, r7, pc} .align 2, 0 -_080465AC: .4byte gUnk_02010654 +_080465AC: .4byte gMetatileTypesTop _080465B0: .4byte 0xFFFFBCB0 _080465B4: .4byte 0xFFFFECB0 _080465B8: .4byte 0x00006658 diff --git a/data/data_08100CD4.s b/data/data_08100CD4.s index 9db10a44..e5dab95e 100755 --- a/data/data_08100CD4.s +++ b/data/data_08100CD4.s @@ -916,7 +916,7 @@ gUnk_08102451:: @ 08102451 gUnk_08102468:: @ 08102468 .incbin "baserom.gba", 0x102468, 0x0000004 -gUnk_0810246C:: @ 0810246C +gAreaTilesets:: @ 0810246C .incbin "baserom.gba", 0x10246C, 0x0000048 gUnk_081024B4:: @ 081024B4 @@ -1126,7 +1126,7 @@ gUnk_0810303C:: @ 0810303C gUnk_0810306C:: @ 0810306C .incbin "baserom.gba", 0x10306C, 0x0000030 -gUnk_0810309C:: @ 0810309C +gAreaMetatiles:: @ 0810309C .incbin "baserom.gba", 0x10309C, 0x0000068 gUnk_08103104:: @ 08103104 diff --git a/data/data_0811BD44.s b/data/data_0811BD44.s index 5b69f1b4..69c6079b 100644 --- a/data/data_0811BD44.s +++ b/data/data_0811BD44.s @@ -463,7 +463,7 @@ gUnk_0811E1FC:: @ 0811E1FC gUnk_0811E208:: @ 0811E208 .incbin "baserom.gba", 0x11E208, 0x000000C -gUnk_0811E214:: @ 0811E214 +gAreas:: @ 0811E214 .incbin "baserom.gba", 0x11E214, 0x0000240 gUnk_0811E454:: @ 0811E454 diff --git a/linker.ld b/linker.ld index 46227a68..30f99a89 100644 --- a/linker.ld +++ b/linker.ld @@ -56,9 +56,9 @@ SECTIONS { . = 0x0000B654; gUnk_0200B654 = .; . = 0x0000D654; gUnk_0200D654 = .; . = 0x0000E654; gUnk_0200E654 = .; - . = 0x00010654; gUnk_02010654 = .; + . = 0x00010654; gMetatileTypesTop = .; . = 0x00011654; gUnk_02011654 = .; - . = 0x00012654; gUnk_02012654 = .; + . = 0x00012654; gMetatilesTop = .; . = 0x00016654; gUnk_02016654 = .; . = 0x00017654; gUnk_02017654 = .; . = 0x00017660; gUnk_02017660 = .; @@ -101,9 +101,9 @@ SECTIONS { . = 0x00025EB4; gUnk_02025EB4 = .; . = 0x00027EB4; gUnk_02027EB4 = .; . = 0x00028EB4; gUnk_02028EB4 = .; - . = 0x0002AEB4; gUnk_0202AEB4 = .; + . = 0x0002AEB4; gMetatileTypesBottom = .; . = 0x0002BEB4; gUnk_0202BEB4 = .; - . = 0x0002CEB4; gUnk_0202CEB4 = .; + . = 0x0002CEB4; gMetatilesBottom = .; . = 0x00030EB4; gUnk_02030EB4 = .; . = 0x00031EC0; gUnk_02031EC0 = .; . = 0x00032EC0; gUnk_02032EC0 = .; diff --git a/src/sub_0807C998.c b/src/sub_0807C998.c index bc31e322..77dff7bf 100644 --- a/src/sub_0807C998.c +++ b/src/sub_0807C998.c @@ -2,8 +2,8 @@ #include "entity.h" extern void sub_0807C960(); -extern u32 gUnk_0202CEB4; -extern u32 gUnk_02012654; +extern u16 gMetatilesBottom[]; +extern u16 gMetatilesTop[]; extern u8 gUnk_08324AE4; void sub_0807C960(void* dest, u32 offset) @@ -22,8 +22,8 @@ void sub_0807C960(void* dest, u32 offset) } void sub_0807C998(u32* a1) { - sub_0807C960(&gUnk_0202CEB4, a1[0]); - sub_0807C960(&gUnk_0202CEB4 - 0x800, a1[1]); - sub_0807C960(&gUnk_02012654, a1[2]); - sub_0807C960(&gUnk_02012654 - 0x800, a1[3]); + sub_0807C960(gMetatilesBottom, a1[0]); + sub_0807C960(gMetatilesBottom - 0x1000, a1[1]); + sub_0807C960(gMetatilesTop, a1[2]); + sub_0807C960(gMetatilesTop - 0x1000, a1[3]); } \ No newline at end of file