summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/easy_chat.s6
-rw-r--r--asm/link.s6
-rw-r--r--asm/naming_screen.s4
-rwxr-xr-xasm/pokemon_storage_system.s4
-rw-r--r--asm/slot_machine.s8
-rw-r--r--asm/trainer_card.s8
-rwxr-xr-xasm/use_pokeblock.s10
7 files changed, 23 insertions, 23 deletions
diff --git a/asm/easy_chat.s b/asm/easy_chat.s
index 3a359c9fa..b7a35d964 100644
--- a/asm/easy_chat.s
+++ b/asm/easy_chat.s
@@ -3966,14 +3966,14 @@ _0811BFE0:
b _0811C124
.pool
_0811C044:
- ldr r1, =gUnknown_08DCBDD0
+ ldr r1, =gEasyChatWindow_Gfx
movs r0, 0
str r0, [sp]
movs r0, 0x3
movs r2, 0
movs r3, 0
bl copy_decompressed_tile_data_to_vram_autofree
- ldr r1, =gUnknown_08DCBF10
+ ldr r1, =gEasyChatWindow_Tilemap
movs r0, 0x3
movs r2, 0
movs r3, 0
@@ -5810,7 +5810,7 @@ sub_811CF04: @ 811CF04
sub_811CF64: @ 811CF64
push {r4,lr}
bl ResetPaletteFade
- ldr r0, =gUnknown_08DCBDB0
+ ldr r0, =gEasyChatMode_Pal
movs r1, 0
movs r2, 0x20
bl LoadPalette
diff --git a/asm/link.s b/asm/link.s
index a6e580d5c..a270c8f62 100644
--- a/asm/link.s
+++ b/asm/link.s
@@ -44695,11 +44695,11 @@ sub_80205B4: @ 80205B4
task_tutorial_story_unknown: @ 8020604
push {r4,r5,lr}
sub sp, 0x4
- ldr r0, =gUnknown_08DD4860
+ ldr r0, =gLinkMiscMenu_Pal
movs r1, 0
movs r2, 0x20
bl LoadPalette
- ldr r1, =gUnknown_08DD4880
+ ldr r1, =gLinkMiscMenu_Gfx
movs r0, 0
str r0, [sp]
movs r0, 0x2
@@ -44727,7 +44727,7 @@ task_tutorial_story_unknown: @ 8020604
movs r2, 0x8
bl CpuFastSet
_0802064E:
- ldr r1, =gUnknown_08DD4AB8
+ ldr r1, =gLinkMiscMenu_Tilemap
movs r0, 0x2
movs r2, 0
movs r3, 0
diff --git a/asm/naming_screen.s b/asm/naming_screen.s
index cded48783..07ec0662f 100644
--- a/asm/naming_screen.s
+++ b/asm/naming_screen.s
@@ -3712,7 +3712,7 @@ _080E4C4A:
thumb_func_start choose_name_or_words_screen_load_bg_tile_patterns
choose_name_or_words_screen_load_bg_tile_patterns: @ 80E4C54
push {r4-r6,lr}
- ldr r0, =gUnknown_08DD3838
+ ldr r0, =gNamingScreenMenu_Gfx
ldr r6, =gUnknown_02039F94
ldr r1, [r6]
ldr r4, =0x00001810
@@ -3760,7 +3760,7 @@ sub_80E4CB8: @ 80E4CB8
thumb_func_start choose_name_or_words_screen_apply_bg_pals
choose_name_or_words_screen_apply_bg_pals: @ 80E4CC8
push {lr}
- ldr r0, =gUnknown_08DD3778
+ ldr r0, =gNamingScreenMenu_Pal
movs r1, 0
movs r2, 0xC0
bl LoadPalette
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index 162f4b4e2..00a8b4d92 100755
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -5343,7 +5343,7 @@ sub_80CA044: @ 80CA044
movs r0, 0
movs r2, 0x4
bl InitBgsFromTemplates
- ldr r1, =gUnknown_08DD2FE8
+ ldr r1, =gPSSMenu_Gfx
movs r0, 0
str r0, [sp]
movs r0, 0x1
@@ -6104,7 +6104,7 @@ sub_80CA704: @ 80CA704
ldr r1, [r4]
adds r1, 0xB0
bl LZ77UnCompWram
- ldr r0, =gUnknown_08DD36A8
+ ldr r0, =gPSSMenu_Pal
movs r1, 0x10
movs r2, 0x20
bl LoadPalette
diff --git a/asm/slot_machine.s b/asm/slot_machine.s
index 24e755648..800b66a55 100644
--- a/asm/slot_machine.s
+++ b/asm/slot_machine.s
@@ -10588,7 +10588,7 @@ sub_812F7E4: @ 812F7E4
bl Alloc
adds r1, r0, 0
str r1, [r4]
- ldr r0, =gUnknown_08DD0050
+ ldr r0, =gSlotMachineReelTime_Gfx
bl LZDecompressWram
ldr r4, =gUnknown_0203AAD8
movs r0, 0xD8
@@ -10715,14 +10715,14 @@ sub_812F908: @ 812F908
bl Alloc
adds r1, r0, 0
str r1, [r4]
- ldr r0, =gUnknown_08DCDB30
+ ldr r0, =gSlotMachineMenu_Gfx
bl LZDecompressWram
ldr r1, [r4]
movs r0, 0x2
adds r2, r5, 0
movs r3, 0
bl LoadBgTiles
- ldr r0, =gUnknown_08DCDA90
+ ldr r0, =gSlotMachineMenu_Pal
movs r1, 0
movs r2, 0xA0
bl LoadPalette
@@ -10748,7 +10748,7 @@ sub_812F958: @ 812F958
thumb_func_start sub_812F968
sub_812F968: @ 812F968
push {lr}
- ldr r1, =gUnknown_08DCE770
+ ldr r1, =gSlotMachineMenu_Tilemap
movs r2, 0xA0
lsls r2, 3
movs r0, 0x2
diff --git a/asm/trainer_card.s b/asm/trainer_card.s
index 3c1b46dcc..ab1b199e7 100644
--- a/asm/trainer_card.s
+++ b/asm/trainer_card.s
@@ -601,12 +601,12 @@ _080C2C04:
ldrb r0, [r0]
cmp r0, 0
beq _080C2C28
- ldr r0, =gUnknown_08DD1AB8
+ ldr r0, =gEmeraldTrainerCard_Gfx
ldr r2, =0x000019a8
b _080C2C4A
.pool
_080C2C28:
- ldr r0, =gUnknown_08DD246C
+ ldr r0, =gFireRedTrainerCard_Gfx
ldr r2, =0x000019a8
b _080C2C4A
.pool
@@ -3317,7 +3317,7 @@ _080C4418:
ldrb r0, [r0]
cmp r0, 0
beq _080C447C
- ldr r1, =gUnknown_0856FAE4
+ ldr r1, =gEmeraldTrainerCardStarPals
ldr r3, =0x00000535
adds r0, r2, r3
ldrb r0, [r0]
@@ -3344,7 +3344,7 @@ _080C4418:
b _080C44B2
.pool
_080C447C:
- ldr r1, =gUnknown_0856FAF8
+ ldr r1, =gFireRedTrainerCardStarPals
ldr r3, =0x00000535
adds r0, r2, r3
ldrb r0, [r0]
diff --git a/asm/use_pokeblock.s b/asm/use_pokeblock.s
index b01f1eff4..60c11524a 100755
--- a/asm/use_pokeblock.s
+++ b/asm/use_pokeblock.s
@@ -2397,7 +2397,7 @@ _08167A74:
b _08167B7E
.pool
_08167A9C:
- ldr r0, =gUnknown_08DCCF7C
+ ldr r0, =gUsePokeblockGraph_Gfx
ldr r1, =gUnknown_0203BCA4
_08167AA0:
ldr r1, [r1]
@@ -2405,11 +2405,11 @@ _08167AA0:
b _08167B7E
.pool
_08167AB0:
- ldr r0, =gUnknown_08DCD81C
+ ldr r0, =gUsePokeblockGraph_Tilemap
ldr r1, =gUnknown_0203BCA0
ldr r1, [r1]
bl LZ77UnCompVram
- ldr r0, =gUnknown_08DCCF5C
+ ldr r0, =gUsePokeblockGraph_Pal
movs r1, 0x20
movs r2, 0x20
bl LoadPalette
@@ -2431,7 +2431,7 @@ _08167AEC:
ldr r1, [r0]
movs r0, 0x1
bl SetBgTilemapBuffer
- ldr r1, =gUnknown_08DCDA30
+ ldr r1, =gUsePokeblockNatureWin_Pal
movs r0, 0xC
str r0, [sp]
movs r0, 0x4
@@ -3259,7 +3259,7 @@ sub_8168248: @ 8168248
ldr r0, [r0]
str r0, [sp, 0x8]
str r1, [sp, 0xC]
- ldr r0, =gUnknown_08DCCBB8
+ ldr r0, =gUsePokeblockCondition_Gfx
str r0, [sp]
ldr r1, =0xffff0000
ldr r0, [sp, 0x4]