No more wram_constants.asm

unfortunately, this means manually declaring the wEnemyMon1 party struct
This commit is contained in:
dannye 2015-08-30 22:04:08 -05:00
parent 38065a744d
commit 5facf8377a
6 changed files with 44 additions and 18 deletions

View file

@ -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