diff options
author | Yoann Fievez <yoann.fievez@gmail.com> | 2021-05-31 18:50:16 +0200 |
---|---|---|
committer | Yoann Fievez <yoann.fievez@gmail.com> | 2021-05-31 18:50:16 +0200 |
commit | 21c266b950e5f4379bb7c3f605689b9070c8f48d (patch) | |
tree | 765ad5a034dcb91580fec3e827c693e06d9f80c0 | |
parent | dfc81962d227a91d355b23e9aaaf8795860644ab (diff) |
Change name wSeaRoutesWildMons to wWaterMons in WRAM
-rw-r--r-- | engine/battle/wild_encounters.asm | 2 | ||||
-rw-r--r-- | engine/overworld/wild_mons.asm | 2 | ||||
-rw-r--r-- | wram.asm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/wild_encounters.asm b/engine/battle/wild_encounters.asm index 1f458850..8c9c1529 100644 --- a/engine/battle/wild_encounters.asm +++ b/engine/battle/wild_encounters.asm @@ -67,7 +67,7 @@ TryDoWildEncounter: lda_coord 8, 9 cp $14 ; is the bottom left tile (8,9) of the half-block we're standing in a water tile? jr nz, .gotWildEncounterType ; else, it's treated as a grass tile by default - ld hl, wSeaRoutesWildMons + ld hl, wWaterMons ; since the bottom right tile of a "left shore" half-block is $14 but the bottom left tile is not, ; "left shore" half-blocks (such as the one in the east coast of Cinnabar) load grass encounters. .gotWildEncounterType diff --git a/engine/overworld/wild_mons.asm b/engine/overworld/wild_mons.asm index d372cfe4..2593e0ec 100644 --- a/engine/overworld/wild_mons.asm +++ b/engine/overworld/wild_mons.asm @@ -26,7 +26,7 @@ LoadWildData:: ld [wWaterRate], a and a ret z ; if no water data, we're done - ld de, wSeaRoutesWildMons ; otherwise, load surfing data + ld de, wWaterMons ; otherwise, load surfing data ld bc, $14 jp CopyData @@ -3046,7 +3046,7 @@ wGrassMons:: ds 8 wWaterRate:: db -wSeaRoutesWildMons:: +wWaterMons:: ds 10 * 2 NEXTU |