You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-09-08 08:13:02 -07:00
Make map environments more granular and make all map palettes except darkness depend on map environment (#7)
This commit is contained in:
@@ -17,7 +17,6 @@ BlindingFlash:
|
||||
farcall UpdateTimeOfDayPal
|
||||
ld b, CGB_MAPPALS
|
||||
call GetCGBLayout
|
||||
farcall LoadOW_BGPal7
|
||||
farcall FadeInPalettes
|
||||
ret
|
||||
|
||||
|
||||
@@ -404,7 +404,7 @@ MagnetTrain_Jumptable_FirstRunThrough:
|
||||
ld a, [wTimeOfDay]
|
||||
maskbits NUM_DAYTIMES
|
||||
ld [wTimeOfDayPal], a
|
||||
ld a, TOWN
|
||||
ld a, OUTDOOR_GRASSY
|
||||
ld [wEnvironment], a
|
||||
ld b, CGB_MAPPALS
|
||||
call GetCGBLayout
|
||||
|
||||
@@ -762,9 +762,9 @@ EscapeRopeOrDig:
|
||||
|
||||
.CheckCanDig:
|
||||
call GetMapEnvironment
|
||||
cp CAVE
|
||||
cp INDOOR_CAVE
|
||||
jr z, .incave
|
||||
cp DUNGEON
|
||||
cp INDOOR_ICE_CAVE
|
||||
jr z, .incave
|
||||
.fail
|
||||
ld a, $2
|
||||
@@ -1677,13 +1677,8 @@ BikeFunction:
|
||||
|
||||
.CheckEnvironment:
|
||||
call GetMapEnvironment
|
||||
call CheckOutdoorMap
|
||||
jr z, .ok
|
||||
cp CAVE
|
||||
jr z, .ok
|
||||
cp GATE
|
||||
jr z, .ok
|
||||
jr .nope
|
||||
cp INDOOR_BUILDING
|
||||
jr z, .nope
|
||||
|
||||
.ok
|
||||
call GetPlayerTile
|
||||
|
||||
@@ -30,7 +30,7 @@ SweetScentNothing:
|
||||
end
|
||||
|
||||
SweetScentEncounter:
|
||||
farcall CanUseSweetScent
|
||||
farcall CanEncounterWildMonInThisTile
|
||||
jr nc, .no_battle
|
||||
ld hl, wStatusFlags2
|
||||
bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
|
||||
|
||||
Reference in New Issue
Block a user