diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-08-30 22:04:08 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-08-30 22:05:50 -0500 |
| commit | 5facf8377aeda68cb3fca389cb1784cf9c2d406b (patch) | |
| tree | 5327b1d17ee65f0452c7df779f5a0158607f8c11 /engine | |
| parent | 38065a744de1065cc021a4cafe22476f8425448d (diff) | |
No more wram_constants.asm
unfortunately, this means manually declaring the wEnemyMon1 party struct
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/wild_encounters.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/wild_encounters.asm b/engine/battle/wild_encounters.asm index 5e553129..044f7ea5 100644 --- a/engine/battle/wild_encounters.asm +++ b/engine/battle/wild_encounters.asm @@ -33,7 +33,7 @@ TryDoWildEncounter: ; 13870 (4:7870) jr z, .CanEncounter ld a, $14 ; in all tilesets with a water tile, this is its id cp c - ld a, [W_WATERRATE] + ld a, [wWaterRate] jr z, .CanEncounter ; even if not in grass/water, standing anywhere we can encounter pokemon ; so long as the map is "indoor" and has wild pokemon defined. @@ -67,7 +67,7 @@ TryDoWildEncounter: ; 13870 (4:7870) aCoord 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, W_WATERMONS + 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 |