diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-06-04 23:17:30 -0500 |
|---|---|---|
| committer | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-06-04 23:17:30 -0500 |
| commit | b0b1f88b9466f0414e4a6c782b5348f46768c8c4 (patch) | |
| tree | 3ed8d12b5328b4f655d96351b3959f262fb2d72a /engine/battle/wild_encounters.asm | |
| parent | EOL Windows->UNIX (diff) | |
| parent | Merge pull request #96 from dannye/master (diff) | |
| download | pokeyellow-b0b1f88b9466f0414e4a6c782b5348f46768c8c4.tar.gz pokeyellow-b0b1f88b9466f0414e4a6c782b5348f46768c8c4.tar.xz pokeyellow-b0b1f88b9466f0414e4a6c782b5348f46768c8c4.zip | |
Merge branch 'master' of https://github.com/iimarckus/pokered
Conflicts:
wram.asm
Diffstat (limited to 'engine/battle/wild_encounters.asm')
| -rw-r--r-- | engine/battle/wild_encounters.asm | 10 |
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 |