summaryrefslogtreecommitdiff
path: root/engine/menus
diff options
context:
space:
mode:
authorSatoMew <SatoMew@users.noreply.github.com>2020-11-29 20:17:29 +0000
committerSatoMew <SatoMew@users.noreply.github.com>2020-11-29 20:17:29 +0000
commit242b2e05cf30bc47a53167baf6bd3134d1f47d18 (patch)
tree83570d3571ff4eaa71de363f02b3ef16f26b0313 /engine/menus
parent6adbaefde14f5e9039aa42a6c96ce476a4107925 (diff)
Label and document hFFD7 more accurately
Diffstat (limited to 'engine/menus')
-rw-r--r--engine/menus/league_pc.asm6
-rw-r--r--engine/menus/pokedex.asm6
-rw-r--r--engine/menus/save.asm4
-rw-r--r--engine/menus/start_sub_menus.asm6
4 files changed, 11 insertions, 11 deletions
diff --git a/engine/menus/league_pc.asm b/engine/menus/league_pc.asm
index f2107c49..533454ad 100644
--- a/engine/menus/league_pc.asm
+++ b/engine/menus/league_pc.asm
@@ -6,10 +6,10 @@ PKMNLeaguePC:
push hl
ld a, [wUpdateSpritesEnabled]
push af
- ldh a, [hTilesetType]
+ ldh a, [hTileAnimations]
push af
xor a
- ldh [hTilesetType], a
+ ldh [hTileAnimations], a
ld [wSpriteFlipped], a
ld [wUpdateSpritesEnabled], a
ld [wHoFTeamIndex2], a
@@ -40,7 +40,7 @@ PKMNLeaguePC:
jr nz, .loop
.doneShowingTeams
pop af
- ldh [hTilesetType], a
+ ldh [hTileAnimations], a
pop af
ld [wUpdateSpritesEnabled], a
pop hl
diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm
index 5660ecfb..2af8d714 100644
--- a/engine/menus/pokedex.asm
+++ b/engine/menus/pokedex.asm
@@ -410,10 +410,10 @@ ShowPokedexDataInternal:
call RunPaletteCommand
pop af
ld [wd11e], a
- ldh a, [hTilesetType]
+ ldh a, [hTileAnimations]
push af
xor a
- ldh [hTilesetType], a
+ ldh [hTileAnimations], a
hlcoord 0, 0
ld de, 1
@@ -577,7 +577,7 @@ ShowPokedexDataInternal:
and A_BUTTON | B_BUTTON
jr z, .waitForButtonPress
pop af
- ldh [hTilesetType], a
+ ldh [hTileAnimations], a
call GBPalWhiteOut
call ClearScreen
call RunDefaultPaletteCommand
diff --git a/engine/menus/save.asm b/engine/menus/save.asm
index 45fed8a6..72c33d8e 100644
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -70,7 +70,7 @@ LoadSAV0:
ld bc, wSpriteDataEnd - wSpriteDataStart
call CopyData
ld a, [sTilesetType]
- ldh [hTilesetType], a
+ ldh [hTileAnimations], a
ld hl, sCurBoxData
ld de, wBoxDataStart
ld bc, wBoxDataEnd - wBoxDataStart
@@ -217,7 +217,7 @@ SaveSAVtoSRAM0:
ld de, sCurBoxData
ld bc, wBoxDataEnd - wBoxDataStart
call CopyData
- ldh a, [hTilesetType]
+ ldh a, [hTileAnimations]
ld [sTilesetType], a
ld hl, sPlayerName
ld bc, sMainDataCheckSum - sPlayerName
diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm
index 6a98a10c..c0448121 100644
--- a/engine/menus/start_sub_menus.asm
+++ b/engine/menus/start_sub_menus.asm
@@ -454,10 +454,10 @@ StartMenu_TrainerInfo::
call GBPalWhiteOut
call ClearScreen
call UpdateSprites
- ldh a, [hTilesetType]
+ ldh a, [hTileAnimations]
push af
xor a
- ldh [hTilesetType], a
+ ldh [hTileAnimations], a
call DrawTrainerInfo
predef DrawBadges ; draw badges
ld b, SET_PAL_TRAINER_CARD
@@ -471,7 +471,7 @@ StartMenu_TrainerInfo::
call ReloadMapData
call LoadGBPal
pop af
- ldh [hTilesetType], a
+ ldh [hTileAnimations], a
jp RedisplayStartMenu
; loads tile patterns and draws everything except for gym leader faces / badges