Merge last changes from pret

10 files changed, 13 insertions, 13 deletions

diff --git a/engine/menus/league_pc.asm b/engine/menus/league_pc.asm
index 999090ff..517f95d6 100755..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/main_menu.asm b/engine/menus/main_menu.asm
index ac2aa3c0..ac2aa3c0 100755..100644
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index 181978fc..181978fc 100755..100644
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
diff --git a/engine/menus/oaks_pc.asm b/engine/menus/oaks_pc.asm
index 7743e5df..7743e5df 100755..100644
--- a/engine/menus/oaks_pc.asm
+++ b/engine/menus/oaks_pc.asm
diff --git a/engine/menus/party_menu.asm b/engine/menus/party_menu.asm
index 2fdd9cd1..2fdd9cd1 100755..100644
--- a/engine/menus/party_menu.asm
+++ b/engine/menus/party_menu.asm
diff --git a/engine/menus/pc.asm b/engine/menus/pc.asm
index 4c340e7b..4c340e7b 100755..100644
--- a/engine/menus/pc.asm
+++ b/engine/menus/pc.asm
diff --git a/engine/menus/players_pc.asm b/engine/menus/players_pc.asm
index e896cfae..e896cfae 100755..100644
--- a/engine/menus/players_pc.asm
+++ b/engine/menus/players_pc.asm
diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm
index 2b41ab6b..c2e7de5a 100755..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
@@ -578,7 +578,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 aeb042e2..a01e767e 100755..100644
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -69,8 +69,8 @@ LoadSAV0:
 	ld de, wSpriteDataStart
 	ld bc, wSpriteDataEnd - wSpriteDataStart
 	call CopyData
-	ld a, [sTilesetType]
-	ldh [hTilesetType], a
+	ld a, [sTileAnimations]
+	ldh [hTileAnimations], a
 	ld hl, sCurBoxData
 	ld de, wBoxDataStart
 	ld bc, wBoxDataEnd - wBoxDataStart
@@ -217,8 +217,8 @@ SaveSAVtoSRAM0:
 	ld de, sCurBoxData
 	ld bc, wBoxDataEnd - wBoxDataStart
 	call CopyData
-	ldh a, [hTilesetType]
-	ld [sTilesetType], a
+	ldh a, [hTileAnimations]
+	ld [sTileAnimations], a
 	ld hl, sPlayerName
 	ld bc, sMainDataCheckSum - sPlayerName
 	call SAVCheckSum
diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm
index 72a6c8c5..115036e9 100755..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