diff options
| author | dannye <33dannye@gmail.com> | 2025-11-12 17:56:10 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-11-12 17:56:10 -0600 |
| commit | 324ae167d15ae4eef3cda411e10201661e57d88d (patch) | |
| tree | 86c2b73ce1262f12c1b3eb82874e8572e80e583f /engine/overworld | |
| parent | Separate surfing Pikachu graphics from audio engine code (diff) | |
| parent | Use features of RGBDS 1.0.0 (#537) (diff) | |
| download | pokeyellow-324ae167d15ae4eef3cda411e10201661e57d88d.tar.gz pokeyellow-324ae167d15ae4eef3cda411e10201661e57d88d.tar.xz pokeyellow-324ae167d15ae4eef3cda411e10201661e57d88d.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/player_state.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/wild_mons.asm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/overworld/player_state.asm b/engine/overworld/player_state.asm index d29a5425..3f642dc0 100644 --- a/engine/overworld/player_state.asm +++ b/engine/overworld/player_state.asm @@ -241,7 +241,7 @@ PrintSafariZoneSteps:: cp 10 jr nc, .tenOrMore hlcoord 5, 3 - ld a, " " + ld a, ' ' ld [hl], a .tenOrMore hlcoord 6, 3 diff --git a/engine/overworld/wild_mons.asm b/engine/overworld/wild_mons.asm index 2593e0ec..2b186e75 100644 --- a/engine/overworld/wild_mons.asm +++ b/engine/overworld/wild_mons.asm @@ -16,10 +16,10 @@ LoadWildData:: jr z, .NoGrassData ; if no grass data, skip to surfing data push hl ld de, wGrassMons ; otherwise, load grass data - ld bc, $14 + ld bc, WILDDATA_LENGTH - 1 call CopyData pop hl - ld bc, $14 + ld bc, WILDDATA_LENGTH - 1 add hl, bc .NoGrassData ld a, [hli] @@ -27,7 +27,7 @@ LoadWildData:: and a ret z ; if no water data, we're done ld de, wWaterMons ; otherwise, load surfing data - ld bc, $14 + ld bc, WILDDATA_LENGTH - 1 jp CopyData INCLUDE "data/wild/grass_water.asm" |