diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-07 11:30:10 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-07 11:30:10 -0400 |
| commit | 13129459f11e73df8c556f0c02cd4fca7266a346 (patch) | |
| tree | f0157c5ba3e66a48eba01fef6ce7283f1dece57a /engine/battle/wild_encounters.asm | |
| parent | 45ed05decf330faab4503fe8fecadc54698c9724 (diff) | |
Sync coordinate macros with pokecrystal
Diffstat (limited to 'engine/battle/wild_encounters.asm')
| -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 3d0eb556..e24f9632 100644 --- a/engine/battle/wild_encounters.asm +++ b/engine/battle/wild_encounters.asm @@ -25,7 +25,7 @@ TryDoWildEncounter: .next ; 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? - coord hl, 9, 9 + hlcoord 9, 9 ld c, [hl] ld a, [wGrassTile] cp c @@ -64,7 +64,7 @@ TryDoWildEncounter: ; determine which wild pokemon (grass or water) can appear in the half-block we're standing in ld c, [hl] ld hl, wGrassMons - aCoord 8, 9 + 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 |