Citrine grass encounter fix

Had to hardcode the tile to work. Yeah.
This commit is contained in:
Llinos Evans 2023-04-18 07:33:35 +01:00
parent 19762488ae
commit e234d77c24
3 changed files with 8 additions and 1 deletions

View file

@ -9,7 +9,6 @@ ENDM
Tilesets:
table_width 12, Tilesets
; name, 3 counter tiles, grass tile, animations
; FIXME: Needs to have a new column for a second grass tile for Citrine to work properly. Missing tile is $3F.
tileset Overworld, -1, -1, -1, $52, TILEANIM_WATER_FLOWER
tileset RedsHouse1, -1, -1, -1, -1, TILEANIM_NONE
tileset Mart, $18,$19,$1E, -1, TILEANIM_NONE

View file

@ -9,4 +9,5 @@ WaterTilesets:
db CAVERN
db FACILITY
db PLATEAU
db CITRINE
db -1 ; end

View file

@ -31,6 +31,13 @@ TryDoWildEncounter:
cp c
ld a, [wGrassRate]
jr z, .CanEncounter
cp CITRINE
ld a, $0E ; So the Citrine grass works.
cp c
ld a, [wGrassRate]
jr z, .CanEncounter
ld a, $14 ; in all tilesets with a water tile, this is its id
cp c
ld a, [wWaterRate]