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 /home | |
| parent | a20ca92534f9cc6922f40e5f736a22862754db4b (diff) | |
| parent | 21908ba30a8bae5c5e1c86b1164402ec95da0220 (diff) | |
Merge last changes from pret
Diffstat (limited to 'home')
| -rw-r--r-- | home/init.asm | 2 | ||||
| -rw-r--r-- | home/overworld.asm | 2 | ||||
| -rw-r--r-- | home/pokemon.asm | 10 | ||||
| -rw-r--r--[-rwxr-xr-x] | home/start_menu.asm | 0 | ||||
| -rw-r--r-- | home/vcopy.asm | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/home/init.asm b/home/init.asm index fe7dc9a9..e5840e65 100644 --- a/home/init.asm +++ b/home/init.asm @@ -65,7 +65,7 @@ rLCDC_DEFAULT EQU %11100011 call WriteDMACodeToHRAM xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a ldh [rSTAT], a ldh [hSCX], a ldh [hSCY], a diff --git a/home/overworld.asm b/home/overworld.asm index a9cfba24..be2c5d55 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -813,7 +813,7 @@ LoadPlayerSpriteGraphics:: dec a jr z, .ridingBike - ldh a, [hTilesetType] + ldh a, [hTileAnimations] and a jr nz, .determineGraphics jr .startWalking diff --git a/home/pokemon.asm b/home/pokemon.asm index 2a54d390..143d6faa 100644 --- a/home/pokemon.asm +++ b/home/pokemon.asm @@ -175,10 +175,10 @@ GetCryData:: ret DisplayPartyMenu:: - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a call GBPalWhiteOutWithDelay3 call ClearSprites call PartyMenuInit @@ -186,10 +186,10 @@ DisplayPartyMenu:: jp HandlePartyMenuInput GoBackToPartyMenu:: - ldh a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a - ldh [hTilesetType], a + ldh [hTileAnimations], a call PartyMenuInit call RedrawPartyMenu jp HandlePartyMenuInput @@ -251,7 +251,7 @@ HandlePartyMenuInput:: and a jp nz, .swappingPokemon pop af - ldh [hTilesetType], a + ldh [hTileAnimations], a bit 1, b jr nz, .noPokemonChosen ld a, [wPartyCount] diff --git a/home/start_menu.asm b/home/start_menu.asm index 5b29f67a..5b29f67a 100755..100644 --- a/home/start_menu.asm +++ b/home/start_menu.asm diff --git a/home/vcopy.asm b/home/vcopy.asm index 458fa610..882773a8 100644 --- a/home/vcopy.asm +++ b/home/vcopy.asm @@ -379,7 +379,7 @@ UpdateMovingBgTiles:: ; Animate water and flower ; tiles in the overworld. - ldh a, [hTilesetType] + ldh a, [hTileAnimations] and a ret z ; no animations if indoors (or if a menu set this to 0) @@ -417,7 +417,7 @@ UpdateMovingBgTiles:: dec c jr nz, .left .done - ldh a, [hTilesetType] + ldh a, [hTileAnimations] rrca ret nc ; if in a cave, no flower animations |