summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_1.s10
-rw-r--r--asm/battle_7.s4
-rw-r--r--asm/battle_controller_linkopponent.s4
-rw-r--r--asm/battle_controller_linkpartner.s2
-rw-r--r--asm/battle_controller_opponent.s4
-rw-r--r--asm/battle_controller_player.s8
-rw-r--r--asm/battle_controller_player_partner.s4
-rw-r--r--asm/battle_controller_recorded_opponent.s2
-rw-r--r--asm/battle_controller_recorded_player.s4
-rw-r--r--asm/battle_controller_safari.s2
-rw-r--r--asm/battle_controller_wally.s4
-rw-r--r--asm/main_menu.s14
-rw-r--r--asm/reshow_battle_screen.s4
-rw-r--r--asm/rom_80A5C6C.s4
14 files changed, 35 insertions, 35 deletions
diff --git a/asm/battle_1.s b/asm/battle_1.s
index 636bafbea..d57f91d37 100644
--- a/asm/battle_1.s
+++ b/asm/battle_1.s
@@ -1547,7 +1547,7 @@ _080358E0:
.4byte _08035A40
.4byte _08035A70
_08035904:
- ldr r4, =gUnknown_0831ABA8
+ ldr r4, =gBattleTerrainTable
ldr r5, =gBattleTerrain
ldrb r1, [r5]
lsls r0, r1, 2
@@ -2632,7 +2632,7 @@ _08036350:
lsls r0, 24
cmp r0, 0
bne _0803639C
- ldr r4, =gUnknown_0831ABA8
+ ldr r4, =gBattleTerrainTable
ldr r5, =gBattleTerrain
ldrb r1, [r5]
lsls r0, r1, 2
@@ -2778,7 +2778,7 @@ _080364A8:
.4byte _08036510
.4byte _08036518
_080364CC:
- ldr r2, =gUnknown_0831ABA8
+ ldr r2, =gBattleTerrainTable
ldr r0, =gBattleTerrain
ldrb r1, [r0]
lsls r0, r1, 2
@@ -2888,7 +2888,7 @@ _080365B4:
.4byte _0803661C
.4byte _08036624
_080365D8:
- ldr r2, =gUnknown_0831ABA8
+ ldr r2, =gBattleTerrainTable
ldr r0, =gBattleTerrain
ldrb r1, [r0]
lsls r0, r1, 2
@@ -3003,7 +3003,7 @@ _080366C8:
.4byte _08036738
.4byte _08036740
_080366EC:
- ldr r2, =gUnknown_0831ABA8
+ ldr r2, =gBattleTerrainTable
ldr r0, =gBattleTerrain
ldrb r1, [r0]
lsls r0, r1, 2
diff --git a/asm/battle_7.s b/asm/battle_7.s
index 011559819..0b5ca514f 100644
--- a/asm/battle_7.s
+++ b/asm/battle_7.s
@@ -3365,7 +3365,7 @@ _0805EDE4:
adds r4, r1, 0
cmp r0, 0
beq _0805EE06
- ldr r0, =gUnknown_08305DCC
+ ldr r0, =gEnemyMonElevation
ldrh r1, [r3, 0x2]
adds r1, r0
ldrb r0, [r1]
@@ -3441,7 +3441,7 @@ sub_805EE54: @ 805EE54
beq _0805EE7E
adds r5, r0, 0
_0805EE7E:
- ldr r0, =gUnknown_08305DCC
+ ldr r0, =gEnemyMonElevation
adds r0, r5, r0
ldrb r0, [r0]
cmp r0, 0
diff --git a/asm/battle_controller_linkopponent.s b/asm/battle_controller_linkopponent.s
index 5a762a174..8ea32eca0 100644
--- a/asm/battle_controller_linkopponent.s
+++ b/asm/battle_controller_linkopponent.s
@@ -4283,7 +4283,7 @@ _0806694C:
bl sub_806A12C
ldr r6, =gUnknown_0202499C
mov r9, r7
- ldr r1, =gUnknown_083054E0
+ ldr r1, =gTrainerFrontPicCoords
mov r2, r8
lsls r0, r2, 2
adds r0, r1
@@ -4411,7 +4411,7 @@ _08066A76:
mov r0, r8
bl sub_806A12C
ldr r0, =gUnknown_0202499C
- ldr r2, =gUnknown_083054E0
+ ldr r2, =gTrainerFrontPicCoords
mov r3, r8
lsls r1, r3, 2
adds r1, r2
diff --git a/asm/battle_controller_linkpartner.s b/asm/battle_controller_linkpartner.s
index 3a1b21ed7..504ba6b5c 100644
--- a/asm/battle_controller_linkpartner.s
+++ b/asm/battle_controller_linkpartner.s
@@ -3706,7 +3706,7 @@ _0814D002:
bl sub_806A12C
ldr r6, =gUnknown_0202499C
mov r8, r7
- ldr r0, =gUnknown_08305D2C
+ ldr r0, =gTrainerBackPicCoords
lsls r4, 2
adds r4, r0
ldrb r0, [r4]
diff --git a/asm/battle_controller_opponent.s b/asm/battle_controller_opponent.s
index 69d4776d4..0910fc8e2 100644
--- a/asm/battle_controller_opponent.s
+++ b/asm/battle_controller_opponent.s
@@ -4339,7 +4339,7 @@ _080617CA:
bl sub_806A12C
ldr r6, =gUnknown_0202499C
mov r9, r7
- ldr r1, =gUnknown_083054E0
+ ldr r1, =gTrainerFrontPicCoords
mov r2, r8
lsls r0, r2, 2
adds r0, r1
@@ -4564,7 +4564,7 @@ _080619DE:
mov r0, r8
bl sub_806A12C
ldr r0, =gUnknown_0202499C
- ldr r2, =gUnknown_083054E0
+ ldr r2, =gTrainerFrontPicCoords
mov r3, r8
lsls r1, r3, 2
adds r1, r2
diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s
index 5f7e1b954..d3b29ffe8 100644
--- a/asm/battle_controller_player.s
+++ b/asm/battle_controller_player.s
@@ -7371,11 +7371,11 @@ _0805B5E0:
beq _0805B618
movs r0, 0x5A
mov r9, r0
- ldr r1, =gUnknown_083054E0
+ ldr r1, =gTrainerFrontPicCoords
b _0805B642
.pool
_0805B618:
- ldr r1, =gUnknown_08305D2C
+ ldr r1, =gTrainerBackPicCoords
lsls r0, r4, 2
adds r0, r1
ldrb r1, [r0]
@@ -7392,7 +7392,7 @@ _0805B618:
_0805B63C:
movs r0, 0x50
mov r9, r0
- ldr r1, =gUnknown_08305D2C
+ ldr r1, =gTrainerBackPicCoords
_0805B642:
lsls r0, r4, 2
adds r0, r1
@@ -7733,7 +7733,7 @@ _0805B926:
adds r0, r4, 0
bl sub_806A12C
ldr r0, =gUnknown_0202499C
- ldr r1, =gUnknown_08305D2C
+ ldr r1, =gTrainerBackPicCoords
lsls r4, 2
adds r4, r1
ldrb r1, [r4]
diff --git a/asm/battle_controller_player_partner.s b/asm/battle_controller_player_partner.s
index 784eacab1..32e3ac5d1 100644
--- a/asm/battle_controller_player_partner.s
+++ b/asm/battle_controller_player_partner.s
@@ -4182,7 +4182,7 @@ sub_81BD37C: @ 81BD37C
movs r4, 0x7
movs r0, 0x5A
mov r9, r0
- ldr r0, =gUnknown_08305D2C
+ ldr r0, =gTrainerBackPicCoords
ldrb r1, [r0, 0x1C]
b _081BD3BE
.pool
@@ -4193,7 +4193,7 @@ _081BD3A8:
lsrs r4, r0, 24
movs r0, 0x20
mov r9, r0
- ldr r1, =gUnknown_083054E0
+ ldr r1, =gTrainerFrontPicCoords
lsls r0, r4, 2
adds r0, r1
ldrb r1, [r0]
diff --git a/asm/battle_controller_recorded_opponent.s b/asm/battle_controller_recorded_opponent.s
index 90928e7d4..cde1bc128 100644
--- a/asm/battle_controller_recorded_opponent.s
+++ b/asm/battle_controller_recorded_opponent.s
@@ -4096,7 +4096,7 @@ _0818892C:
bl sub_806A12C
ldr r6, =gUnknown_0202499C
mov r9, r7
- ldr r1, =gUnknown_083054E0
+ ldr r1, =gTrainerFrontPicCoords
mov r2, r8
lsls r0, r2, 2
adds r0, r1
diff --git a/asm/battle_controller_recorded_player.s b/asm/battle_controller_recorded_player.s
index 534f34068..f24cf8c4a 100644
--- a/asm/battle_controller_recorded_player.s
+++ b/asm/battle_controller_recorded_player.s
@@ -4033,14 +4033,14 @@ _0818BD72:
beq _0818BD9C
movs r0, 0x5A
mov r9, r0
- ldr r1, =gUnknown_083054E0
+ ldr r1, =gTrainerFrontPicCoords
b _0818BD9E
.pool
_0818BD98:
movs r0, 0x50
mov r9, r0
_0818BD9C:
- ldr r1, =gUnknown_08305D2C
+ ldr r1, =gTrainerBackPicCoords
_0818BD9E:
lsls r0, r4, 2
adds r0, r1
diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s
index cc149ea4f..a8187d642 100644
--- a/asm/battle_controller_safari.s
+++ b/asm/battle_controller_safari.s
@@ -580,7 +580,7 @@ sub_8159800: @ 8159800
adds r0, r6, 0
bl sub_806A12C
ldr r0, =gUnknown_0202499C
- ldr r2, =gUnknown_08305D2C
+ ldr r2, =gTrainerBackPicCoords
ldr r1, [r4]
ldrb r1, [r1, 0x8]
lsls r1, 2
diff --git a/asm/battle_controller_wally.s b/asm/battle_controller_wally.s
index eab717466..9f3b4ce56 100644
--- a/asm/battle_controller_wally.s
+++ b/asm/battle_controller_wally.s
@@ -3039,7 +3039,7 @@ sub_8169EC8: @ 8169EC8
movs r0, 0x6
bl sub_806A12C
ldr r0, =gUnknown_0202499C
- ldr r1, =gUnknown_08305D2C
+ ldr r1, =gTrainerBackPicCoords
ldrb r1, [r1, 0x18]
movs r2, 0x8
subs r2, r1
@@ -3124,7 +3124,7 @@ dp01t_07_6_: @ 8169F94
movs r0, 0x6
bl sub_806A12C
ldr r0, =gUnknown_0202499C
- ldr r1, =gUnknown_08305D2C
+ ldr r1, =gTrainerBackPicCoords
ldrb r1, [r1, 0x18]
movs r2, 0x8
subs r2, r1
diff --git a/asm/main_menu.s b/asm/main_menu.s
index 40466ae1b..6194f0487 100644
--- a/asm/main_menu.s
+++ b/asm/main_menu.s
@@ -119,11 +119,11 @@ InitMainMenu: @ 802F6F4
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
bl ResetPaletteFade
- ldr r0, =gUnknown_082FF0A0
+ ldr r0, =gMainMenuBgPal
movs r1, 0
movs r2, 0x20
bl LoadPalette
- ldr r0, =gUnknown_082FF0C0
+ ldr r0, =gMainMenuTextPal
movs r1, 0xF0
movs r2, 0x20
bl LoadPalette
@@ -1914,7 +1914,7 @@ task_new_game_prof_birch_speech_1: @ 80307B0
movs r0, 0x54
movs r1, 0
bl SetGpuReg
- ldr r0, =gUnknown_082FED3C
+ ldr r0, =gBirchIntroShadowGfx
movs r1, 0xC0
lsls r1, 19
bl LZ77UnCompVram
@@ -3679,7 +3679,7 @@ new_game_prof_birch_speech_part2_start: @ 8031678
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
bl ResetPaletteFade
- ldr r0, =gUnknown_082FED3C
+ ldr r0, =gBirchIntroShadowGfx
adds r1, r4, 0
bl LZ77UnCompVram
ldr r0, =gUnknown_082FEEF0
@@ -3689,7 +3689,7 @@ new_game_prof_birch_speech_part2_start: @ 8031678
movs r1, 0
movs r2, 0x40
bl LoadPalette
- ldr r0, =gUnknown_082FF01A
+ ldr r0, =gUnknown_082FF018+2
movs r1, 0x1
movs r2, 0x10
bl LoadPalette
@@ -4459,11 +4459,11 @@ set_default_player_name: @ 8031DC4
adds r5, r1, 0
cmp r0, 0
bne _08031DE4
- ldr r1, =gUnknown_082FF128
+ ldr r1, =gMalePresetNames
b _08031DE6
.pool
_08031DE4:
- ldr r1, =gUnknown_082FF178
+ ldr r1, =gFemalePresetNames
_08031DE6:
lsls r0, r2, 2
adds r0, r1
diff --git a/asm/reshow_battle_screen.s b/asm/reshow_battle_screen.s
index 42ba43ec0..2066c37ed 100644
--- a/asm/reshow_battle_screen.s
+++ b/asm/reshow_battle_screen.s
@@ -618,7 +618,7 @@ _080A986C:
adds r0, r4, 0
bl sub_806A12C
ldr r6, =gUnknown_0202499C
- ldr r1, =gUnknown_08305D2C
+ ldr r1, =gTrainerBackPicCoords
ldr r0, [r5]
ldrb r0, [r0, 0x8]
lsls r0, 2
@@ -656,7 +656,7 @@ _080A98D0:
movs r0, 0x6
bl sub_806A12C
ldr r5, =gUnknown_0202499C
- ldr r0, =gUnknown_08305D2C
+ ldr r0, =gTrainerBackPicCoords
ldrb r0, [r0, 0x18]
movs r4, 0x8
subs r4, r0
diff --git a/asm/rom_80A5C6C.s b/asm/rom_80A5C6C.s
index 267045179..0f6f5a623 100644
--- a/asm/rom_80A5C6C.s
+++ b/asm/rom_80A5C6C.s
@@ -419,11 +419,11 @@ _080A5FE8:
lsls r0, 1
cmp r4, r0
bls _080A5FF8
- ldr r0, =gUnknown_08305DCC
+ ldr r0, =gEnemyMonElevation
b _080A5FFC
.pool
_080A5FF8:
- ldr r0, =gUnknown_08305DCC
+ ldr r0, =gEnemyMonElevation
adds r0, r7, r0
_080A5FFC:
ldrb r5, [r0]
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-25 03:57:42 +0000