diff options
| author | klektron <klektron@users.noreply.github.com> | 2021-01-03 17:31:10 +0100 |
|---|---|---|
| committer | klektron <klektron@users.noreply.github.com> | 2021-01-03 17:31:10 +0100 |
| commit | 779c7ddaa2613e41ce86e10893ee1b94ecc5b899 (patch) | |
| tree | 286b04873ddce3f576d02a4ad58c843686fb80df /engine | |
| parent | a20ca92534f9cc6922f40e5f736a22862754db4b (diff) | |
| parent | 21908ba30a8bae5c5e1c86b1164402ec95da0220 (diff) | |
Merge last changes from pret
Diffstat (limited to 'engine')
88 files changed, 44 insertions, 43 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 0673b518..0673b518 100755..100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 1ca4fa43..8869b4ae 100755..100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -51,7 +51,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: ldh [hWY], a ldh [rWY], a xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a ldh [hSCY], a dec a ld [wUpdateSpritesEnabled], a @@ -2013,18 +2013,19 @@ DisplayBattleMenu:: .menuselected ld [wTextBoxID], a call DisplayTextBoxID + ; handle menu input if it's not the old man tutorial ld a, [wBattleType] dec a - jp nz, .handleBattleMenuInput ; handle menu input if it's not the old man tutorial + jp nz, .handleBattleMenuInput ; the following happens for the old man tutorial - ; Temporarily save the player name in wGrassRate, - ; which is supposed to get overwritten when entering a - ; map with wild Pokémon. - ; Due to an oversight, the data may not get - ; overwritten (on Cinnabar and Route 21) and the infamous - ; Missingno. glitch can show up. + ; Temporarily save the player name in wLinkEnemyTrainerName. + ; Since wLinkEnemyTrainerName == wGrassRate, this affects wild encounters. + ; The wGrassRate byte and following wGrassMons buffer are supposed + ; to get overwritten when entering a map with wild Pokémon, + ; but an oversight prevents this in Cinnabar and Route 21, + ; so the infamous MissingNo. glitch can show up. ld hl, wPlayerName - ld de, wGrassRate + ld de, wLinkEnemyTrainerName ld bc, NAME_LENGTH call CopyData ld hl, .oldManName @@ -6275,7 +6276,7 @@ DoBattleTransitionAndInitBattleVariables: ldh [hAutoBGTransferEnabled], a ldh [hWY], a ldh [rWY], a - ldh [hTilesetType], a + ldh [hTileAnimations], a ld hl, wPlayerStatsToDouble ld [hli], a ld [hli], a @@ -6865,8 +6866,8 @@ _InitBattleCommon: ld [wLetterPrintingDelayFlags], a pop af ld [wMapPalOffset], a - ld a, [wSavedTilesetType] - ldh [hTilesetType], a + ld a, [wSavedTileAnimations] + ldh [hTileAnimations], a scf ret .emptyString diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm index ab556aca..ab556aca 100755..100644 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm diff --git a/engine/battle/init_battle_variables.asm b/engine/battle/init_battle_variables.asm index 0d403b55..dd9f9714 100644 --- a/engine/battle/init_battle_variables.asm +++ b/engine/battle/init_battle_variables.asm @@ -1,6 +1,6 @@ InitBattleVariables: - ldh a, [hTilesetType] - ld [wSavedTilesetType], a + ldh a, [hTileAnimations] + ld [wSavedTileAnimations], a xor a ld [wActionResultOrTookBattleTurn], a ld [wBattleResult], a diff --git a/engine/battle/misc.asm b/engine/battle/misc.asm index 33af6f6f..33af6f6f 100755..100644 --- a/engine/battle/misc.asm +++ b/engine/battle/misc.asm diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm index a0132a4f..a0132a4f 100755..100644 --- a/engine/battle/read_trainer_party.asm +++ b/engine/battle/read_trainer_party.asm diff --git a/engine/battle/safari_zone.asm b/engine/battle/safari_zone.asm index a61f402f..a61f402f 100755..100644 --- a/engine/battle/safari_zone.asm +++ b/engine/battle/safari_zone.asm diff --git a/engine/events/card_key.asm b/engine/events/card_key.asm index b052d3e2..b052d3e2 100755..100644 --- a/engine/events/card_key.asm +++ b/engine/events/card_key.asm diff --git a/engine/events/cinnabar_lab.asm b/engine/events/cinnabar_lab.asm index bccc95d1..bccc95d1 100755..100644 --- a/engine/events/cinnabar_lab.asm +++ b/engine/events/cinnabar_lab.asm diff --git a/engine/events/diploma.asm b/engine/events/diploma.asm index 410217d5..410217d5 100755..100644 --- a/engine/events/diploma.asm +++ b/engine/events/diploma.asm diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm index 8e871456..8e871456 100755..100644 --- a/engine/events/elevator.asm +++ b/engine/events/elevator.asm diff --git a/engine/events/evolve_trade.asm b/engine/events/evolve_trade.asm index 409925c1..409925c1 100755..100644 --- a/engine/events/evolve_trade.asm +++ b/engine/events/evolve_trade.asm diff --git a/engine/events/give_pokemon.asm b/engine/events/give_pokemon.asm index ef01ef99..ef01ef99 100755..100644 --- a/engine/events/give_pokemon.asm +++ b/engine/events/give_pokemon.asm diff --git a/engine/events/hidden_items.asm b/engine/events/hidden_items.asm index 97bb0b71..97bb0b71 100755..100644 --- a/engine/events/hidden_items.asm +++ b/engine/events/hidden_items.asm diff --git a/engine/events/in_game_trades.asm b/engine/events/in_game_trades.asm index c6951615..c6951615 100755..100644 --- a/engine/events/in_game_trades.asm +++ b/engine/events/in_game_trades.asm diff --git a/engine/events/oaks_aide.asm b/engine/events/oaks_aide.asm index f1801f5c..f1801f5c 100755..100644 --- a/engine/events/oaks_aide.asm +++ b/engine/events/oaks_aide.asm diff --git a/engine/events/pewter_guys.asm b/engine/events/pewter_guys.asm index 532fa4bf..532fa4bf 100755..100644 --- a/engine/events/pewter_guys.asm +++ b/engine/events/pewter_guys.asm diff --git a/engine/events/pokecenter.asm b/engine/events/pokecenter.asm index 97dbcd53..97dbcd53 100755..100644 --- a/engine/events/pokecenter.asm +++ b/engine/events/pokecenter.asm diff --git a/engine/events/pokedex_rating.asm b/engine/events/pokedex_rating.asm index c61253b7..c61253b7 100755..100644 --- a/engine/events/pokedex_rating.asm +++ b/engine/events/pokedex_rating.asm diff --git a/engine/events/pokemart.asm b/engine/events/pokemart.asm index c7cb8115..c7cb8115 100755..100644 --- a/engine/events/pokemart.asm +++ b/engine/events/pokemart.asm diff --git a/engine/events/prize_menu.asm b/engine/events/prize_menu.asm index c12e5188..c12e5188 100755..100644 --- a/engine/events/prize_menu.asm +++ b/engine/events/prize_menu.asm diff --git a/engine/events/saffron_guards.asm b/engine/events/saffron_guards.asm index bf30b8c5..bf30b8c5 100755..100644 --- a/engine/events/saffron_guards.asm +++ b/engine/events/saffron_guards.asm diff --git a/engine/events/starter_dex.asm b/engine/events/starter_dex.asm index 7cfe9af2..7cfe9af2 100755..100644 --- a/engine/events/starter_dex.asm +++ b/engine/events/starter_dex.asm diff --git a/engine/events/vending_machine.asm b/engine/events/vending_machine.asm index 37460c5b..37460c5b 100755..100644 --- a/engine/events/vending_machine.asm +++ b/engine/events/vending_machine.asm diff --git a/engine/gfx/hp_bar.asm b/engine/gfx/hp_bar.asm index b7bd97f2..b7bd97f2 100755..100644 --- a/engine/gfx/hp_bar.asm +++ b/engine/gfx/hp_bar.asm diff --git a/engine/gfx/load_pokedex_tiles.asm b/engine/gfx/load_pokedex_tiles.asm index a3f69171..a3f69171 100755..100644 --- a/engine/gfx/load_pokedex_tiles.asm +++ b/engine/gfx/load_pokedex_tiles.asm diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm index 16409640..16409640 100755..100644 --- a/engine/gfx/mon_icons.asm +++ b/engine/gfx/mon_icons.asm diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index a43c66ba..a43c66ba 100755..100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm diff --git a/engine/gfx/screen_effects.asm b/engine/gfx/screen_effects.asm index c7a68734..c7a68734 100755..100644 --- a/engine/gfx/screen_effects.asm +++ b/engine/gfx/screen_effects.asm diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index fb0bc847..fb0bc847 100755..100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm diff --git a/engine/items/itemfinder.asm b/engine/items/itemfinder.asm index 7c15d4bb..7c15d4bb 100755..100644 --- a/engine/items/itemfinder.asm +++ b/engine/items/itemfinder.asm diff --git a/engine/items/tm_prices.asm b/engine/items/tm_prices.asm index df9761bd..df9761bd 100755..100644 --- a/engine/items/tm_prices.asm +++ b/engine/items/tm_prices.asm diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index a11cd736..a11cd736 100755..100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm diff --git a/engine/items/tms.asm b/engine/items/tms.asm index ea7fbcad..ea7fbcad 100755..100644 --- a/engine/items/tms.asm +++ b/engine/items/tms.asm diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm index e630958b..e630958b 100755..100644 --- a/engine/items/town_map.asm +++ b/engine/items/town_map.asm diff --git a/engine/link/cable_club.asm b/engine/link/cable_club.asm index f2c1c5fc..f2c1c5fc 100755..100644 --- a/engine/link/cable_club.asm +++ b/engine/link/cable_club.asm diff --git a/engine/link/cable_club_npc.asm b/engine/link/cable_club_npc.asm index 594adf08..594adf08 100755..100644 --- a/engine/link/cable_club_npc.asm +++ b/engine/link/cable_club_npc.asm diff --git a/engine/math/multiply_divide.asm b/engine/math/multiply_divide.asm index 2fcda158..2fcda158 100755..100644 --- a/engine/math/multiply_divide.asm +++ b/engine/math/multiply_divide.asm diff --git a/engine/math/random.asm b/engine/math/random.asm index c8760157..c8760157 100755..100644 --- a/engine/math/random.asm +++ b/engine/math/random.asm 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 diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm index 0410de21..0410de21 100755..100644 --- a/engine/movie/credits.asm +++ b/engine/movie/credits.asm diff --git a/engine/movie/evolution.asm b/engine/movie/evolution.asm index cabe7254..77840556 100755..100644 --- a/engine/movie/evolution.asm +++ b/engine/movie/evolution.asm @@ -19,7 +19,7 @@ EvolveMon: call Delay3 xor a ldh [hAutoBGTransferEnabled], a - ldh [hTilesetType], a + ldh [hTileAnimations], a ld a, [wEvoOldSpecies] ld [wWholeScreenPaletteMonSpecies], a ld c, 0 diff --git a/engine/movie/hall_of_fame.asm b/engine/movie/hall_of_fame.asm index 07082cb5..f60ec811 100755..100644 --- a/engine/movie/hall_of_fame.asm +++ b/engine/movie/hall_of_fame.asm @@ -19,7 +19,7 @@ AnimateHallOfFame: call FillMemory xor a ld [wUpdateSpritesEnabled], a - ldh [hTilesetType], a + ldh [hTileAnimations], a ld [wSpriteFlipped], a ld [wLetterPrintingDelayFlags], a ; no delay ld [wHoFMonOrPlayer], a ; mon diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm index 9813d67c..9813d67c 100755..100644 --- a/engine/movie/intro.asm +++ b/engine/movie/intro.asm diff --git a/engine/movie/oak_speech/clear_save.asm b/engine/movie/oak_speech/clear_save.asm index d5c04e6e..d5c04e6e 100755..100644 --- a/engine/movie/oak_speech/clear_save.asm +++ b/engine/movie/oak_speech/clear_save.asm diff --git a/engine/movie/oak_speech/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm index 4b64f20d..93cdfaab 100755..100644 --- a/engine/movie/oak_speech/oak_speech.asm +++ b/engine/movie/oak_speech/oak_speech.asm @@ -52,7 +52,7 @@ OakSpeech: ld [wDestinationMap], a call SpecialWarpIn xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a ld a, [wd732] bit 1, a ; possibly a debug mode bit jp nz, .skipChoosingNames diff --git a/engine/movie/oak_speech/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm index 5371ae76..5371ae76 100755..100644 --- a/engine/movie/oak_speech/oak_speech2.asm +++ b/engine/movie/oak_speech/oak_speech2.asm diff --git a/engine/movie/splash.asm b/engine/movie/splash.asm index eede8ccb..eede8ccb 100755..100644 --- a/engine/movie/splash.asm +++ b/engine/movie/splash.asm diff --git a/engine/movie/title.asm b/engine/movie/title.asm index d24c58f9..8f3e0b4e 100755..100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -26,7 +26,7 @@ DisplayTitleScreen: ld a, $1 ldh [hAutoBGTransferEnabled], a xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a ldh [hSCX], a ld a, $40 ldh [hSCY], a diff --git a/engine/movie/title2.asm b/engine/movie/title2.asm index 315cf6b5..315cf6b5 100755..100644 --- a/engine/movie/title2.asm +++ b/engine/movie/title2.asm diff --git a/engine/movie/trade.asm b/engine/movie/trade.asm index bb06f231..bb06f231 100755..100644 --- a/engine/movie/trade.asm +++ b/engine/movie/trade.asm diff --git a/engine/movie/trade2.asm b/engine/movie/trade2.asm index 38ae741c..38ae741c 100755..100644 --- a/engine/movie/trade2.asm +++ b/engine/movie/trade2.asm diff --git a/engine/overworld/auto_movement.asm b/engine/overworld/auto_movement.asm index 9c078f08..9c078f08 100755..100644 --- a/engine/overworld/auto_movement.asm +++ b/engine/overworld/auto_movement.asm diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm index 6a92ccc0..6a92ccc0 100755..100644 --- a/engine/overworld/cut.asm +++ b/engine/overworld/cut.asm diff --git a/engine/overworld/cut2.asm b/engine/overworld/cut2.asm index 3d4a5905..3d4a5905 100755..100644 --- a/engine/overworld/cut2.asm +++ b/engine/overworld/cut2.asm diff --git a/engine/overworld/doors.asm b/engine/overworld/doors.asm index d38818fa..d38818fa 100755..100644 --- a/engine/overworld/doors.asm +++ b/engine/overworld/doors.asm diff --git a/engine/overworld/dust_smoke.asm b/engine/overworld/dust_smoke.asm index a20a0591..a20a0591 100755..100644 --- a/engine/overworld/dust_smoke.asm +++ b/engine/overworld/dust_smoke.asm diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm index fa404602..fa404602 100755..100644 --- a/engine/overworld/elevator.asm +++ b/engine/overworld/elevator.asm diff --git a/engine/overworld/emotion_bubbles.asm b/engine/overworld/emotion_bubbles.asm index 5a41c226..5a41c226 100755..100644 --- a/engine/overworld/emotion_bubbles.asm +++ b/engine/overworld/emotion_bubbles.asm diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index 62abc7ee..62abc7ee 100755..100644 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm diff --git a/engine/overworld/hidden_objects.asm b/engine/overworld/hidden_objects.asm index 855328e7..855328e7 100755..100644 --- a/engine/overworld/hidden_objects.asm +++ b/engine/overworld/hidden_objects.asm diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm index f01ae5ef..f01ae5ef 100755..100644 --- a/engine/overworld/ledges.asm +++ b/engine/overworld/ledges.asm diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm index fa3a37dc..fa3a37dc 100755..100644 --- a/engine/overworld/map_sprites.asm +++ b/engine/overworld/map_sprites.asm diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index c458a013..c458a013 100755..100644 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm diff --git a/engine/overworld/tilesets.asm b/engine/overworld/tilesets.asm index f40cbbc2..fa5cf626 100644 --- a/engine/overworld/tilesets.asm +++ b/engine/overworld/tilesets.asm @@ -23,7 +23,7 @@ LoadTilesetHeader: dec c jr nz, .copyTilesetHeaderLoop ld a, [hl] - ldh [hTilesetType], a + ldh [hTileAnimations], a xor a ldh [hMovingBGTilesCounter1], a pop hl diff --git a/engine/overworld/trainer_sight.asm b/engine/overworld/trainer_sight.asm index 816dea7f..816dea7f 100755..100644 --- a/engine/overworld/trainer_sight.asm +++ b/engine/overworld/trainer_sight.asm diff --git a/engine/overworld/turn_sprite.asm b/engine/overworld/turn_sprite.asm index 7b34a03a..7b34a03a 100755..100644 --- a/engine/overworld/turn_sprite.asm +++ b/engine/overworld/turn_sprite.asm diff --git a/engine/overworld/update_map.asm b/engine/overworld/update_map.asm index 53a5592d..dbf28dae 100644 --- a/engine/overworld/update_map.asm +++ b/engine/overworld/update_map.asm @@ -52,11 +52,11 @@ RedrawMapView: ret z ldh a, [hAutoBGTransferEnabled] push af - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a ldh [hAutoBGTransferEnabled], a - ldh [hTilesetType], a ; no flower/water BG tile animations + ldh [hTileAnimations], a call LoadCurrentMapView call RunDefaultPaletteCommand ld hl, wMapViewVRAMPointer @@ -112,7 +112,7 @@ RedrawMapView: dec c jr nz, .redrawRowLoop pop af - ldh [hTilesetType], a + ldh [hTileAnimations], a pop af ldh [hAutoBGTransferEnabled], a ret diff --git a/engine/play_time.asm b/engine/play_time.asm index 29897242..29897242 100755..100644 --- a/engine/play_time.asm +++ b/engine/play_time.asm diff --git a/engine/pokemon/evos_moves.asm b/engine/pokemon/evos_moves.asm index ed44f9a6..21b1c9f4 100755..100644 --- a/engine/pokemon/evos_moves.asm +++ b/engine/pokemon/evos_moves.asm @@ -11,7 +11,7 @@ TryEvolvingMon: ; this is only called after battle ; it is supposed to do level up evolutions, though there is a bug that allows item evolutions to occur EvolutionAfterBattle: - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a ld [wEvolutionOccurred], a @@ -245,7 +245,7 @@ Evolution_PartyMonLoop: ; loop over party mons pop bc pop hl pop af - ldh [hTilesetType], a + ldh [hTileAnimations], a ld a, [wLinkState] cp LINK_STATE_TRADING ret z diff --git a/engine/pokemon/experience.asm b/engine/pokemon/experience.asm index 427d2a7f..427d2a7f 100755..100644 --- a/engine/pokemon/experience.asm +++ b/engine/pokemon/experience.asm diff --git a/engine/pokemon/learn_move.asm b/engine/pokemon/learn_move.asm index 8e852fd4..8e852fd4 100755..100644 --- a/engine/pokemon/learn_move.asm +++ b/engine/pokemon/learn_move.asm diff --git a/engine/pokemon/set_types.asm b/engine/pokemon/set_types.asm index e9235f13..e9235f13 100755..100644 --- a/engine/pokemon/set_types.asm +++ b/engine/pokemon/set_types.asm diff --git a/engine/pokemon/status_ailments.asm b/engine/pokemon/status_ailments.asm index 1047cea1..1047cea1 100755..100644 --- a/engine/pokemon/status_ailments.asm +++ b/engine/pokemon/status_ailments.asm diff --git a/engine/pokemon/status_screen.asm b/engine/pokemon/status_screen.asm index 9d53c003..61653a11 100755..100644 --- a/engine/pokemon/status_screen.asm +++ b/engine/pokemon/status_screen.asm @@ -101,10 +101,10 @@ StatusScreen: ld hl, vChars2 tile $72 lb bc, BANK(PTile), 1 call CopyVideoDataDouble ; bold P (for PP) - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a hlcoord 19, 1 lb bc, 6, 10 call DrawLineBox ; Draws the box around name, HP and status @@ -174,7 +174,7 @@ StatusScreen: call PlayCry ; play Pokémon cry call WaitForTextScrollButtonPress ; wait for button pop af - ldh [hTilesetType], a + ldh [hTileAnimations], a ret .GetStringPointer @@ -296,10 +296,10 @@ StatsText: next "ESPECIAL@" StatusScreen2: - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a ldh [hAutoBGTransferEnabled], a ld bc, NUM_MOVES + 1 ld hl, wMoves @@ -428,7 +428,7 @@ StatusScreen2: call Delay3 call WaitForTextScrollButtonPress ; wait for button pop af - ldh [hTilesetType], a + ldh [hTileAnimations], a ld hl, wd72c res 1, [hl] ld a, $77 diff --git a/engine/predefs.asm b/engine/predefs.asm index a9877739..a9877739 100755..100644 --- a/engine/predefs.asm +++ b/engine/predefs.asm diff --git a/engine/slots/game_corner_slots.asm b/engine/slots/game_corner_slots.asm index 48321974..48321974 100755..100644 --- a/engine/slots/game_corner_slots.asm +++ b/engine/slots/game_corner_slots.asm diff --git a/engine/slots/game_corner_slots2.asm b/engine/slots/game_corner_slots2.asm index a4ba4ec1..a4ba4ec1 100755..100644 --- a/engine/slots/game_corner_slots2.asm +++ b/engine/slots/game_corner_slots2.asm diff --git a/engine/slots/slot_machine.asm b/engine/slots/slot_machine.asm index fe137632..fe137632 100755..100644 --- a/engine/slots/slot_machine.asm +++ b/engine/slots/slot_machine.asm |