summaryrefslogtreecommitdiff
path: root/engine/battle/wild_encounters.asm
diff options
context:
space:
mode:
authorDaniel Harding <corrnondacqb@yahoo.com>2015-06-04 23:02:28 -0500
committerDaniel Harding <corrnondacqb@yahoo.com>2015-06-04 23:02:28 -0500
commitc43c338a5f7d90494b7e6e67c6533288bd28117d (patch)
treea2ab7437ff9980a9debb73a4c4ece6a4650455f5 /engine/battle/wild_encounters.asm
parent26d279b5515446e444089ce727b3eda3122721b5 (diff)
parentbdfd6ac09ba71ca73f5f058f9cf01ccdad8f21c4 (diff)
Merge pull request #96 from dannye/master
wram comments, EOLs, EOFs, and UTF-8
Diffstat (limited to 'engine/battle/wild_encounters.asm')
-rw-r--r--engine/battle/wild_encounters.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle/wild_encounters.asm b/engine/battle/wild_encounters.asm
index 03119b90..61b318b9 100644
--- a/engine/battle/wild_encounters.asm
+++ b/engine/battle/wild_encounters.asm
@@ -23,7 +23,7 @@ TryDoWildEncounter: ; 13870 (4:7870)
jr z, .lastRepelStep
ld [wRepelRemainingSteps], a
.asm_1389e
-; determine if wild pokémon can appear in the half-block we’re standing in
+; determine if wild pokemon can appear in the half-block we're standing in
; is the bottom right tile (9,9) of the half-block we're standing in a grass/water tile?
hlCoord 9, 9
ld c, [hl]
@@ -35,9 +35,9 @@ TryDoWildEncounter: ; 13870 (4:7870)
cp c
ld a, [W_WATERRATE]
jr z, .CanEncounter
-; even if not in grass/water, standing anywhere we can encounter pokémon
-; so long as the map is “indoor” and has wild pokémon defined.
-; …as long as it’s not Viridian Forest or Safari Zone.
+; even if not in grass/water, standing anywhere we can encounter pokemon
+; so long as the map is "indoor" and has wild pokemon defined.
+; ...as long as it's not Viridian Forest or Safari Zone.
ld a, [W_CURMAP]
cp REDS_HOUSE_1F ; is this an indoor map?
jr c, .CantEncounter2
@@ -61,7 +61,7 @@ TryDoWildEncounter: ; 13870 (4:7870)
inc hl
jr .determineEncounterSlot
.gotEncounterSlot
-; determine which wild pokémon (grass or water) can appear in the half-block we’re standing in
+; determine which wild pokemon (grass or water) can appear in the half-block we're standing in
ld c, [hl]
ld hl, W_GRASSMONS
aCoord 8, 9