From 3b76c590da92834aeb6c738038364a6f84ef247c Mon Sep 17 00:00:00 2001 From: Yoann Fievez Date: Tue, 18 May 2021 20:58:24 +0200 Subject: Standardize names of wild maps entities Standardize the name of entities of maps for wild pokemon --- engine/battle/wild_encounters.asm | 2 +- engine/overworld/wild_mons.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'engine') diff --git a/engine/battle/wild_encounters.asm b/engine/battle/wild_encounters.asm index 8c9c1529..1f458850 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, wWaterMons + ld hl, wSeaRoutesWildMons ; 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 2593e0ec..d372cfe4 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, wWaterMons ; otherwise, load surfing data + ld de, wSeaRoutesWildMons ; otherwise, load surfing data ld bc, $14 jp CopyData -- cgit v1.3.1-sl0p