Make map environments more granular and make all map palettes except darkness depend on map environment (#7)

This commit is contained in:
xCrystal
2023-08-04 18:45:50 +02:00
parent 6e3c5fd008
commit 55a38ff2de
28 changed files with 157 additions and 531 deletions

View File

@@ -12,10 +12,8 @@ ResetBikeFlags::
ResetFlashIfOutOfCave::
ld a, [wEnvironment]
cp ROUTE
jr z, .outdoors
cp TOWN
jr z, .outdoors
cp INDOOR_ENVIRONMENT
jr c, .outdoors
ret
.outdoors

View File

@@ -351,20 +351,20 @@ CopyWarpData::
ret
CheckOutdoorMap::
cp ROUTE
ret z
cp TOWN
ret
cp INDOOR_ENVIRONMENT
jr c, .outdoor
ret ; nz
.outdoor
xor a
ret ; z
CheckIndoorMap::
cp INDOOR
ret z
cp CAVE
ret z
cp DUNGEON
ret z
cp GATE
ret
cp INDOOR_ENVIRONMENT
jr nc, .indoor
ret ; nz
.indoor
xor a
ret ; z
LoadMapAttributes::
call CopyMapPartialAndAttributes
@@ -1912,7 +1912,6 @@ ExitAllMenus::
FinishExitMenu::
ld b, CGB_MAPPALS
call GetCGBLayout
farcall LoadOW_BGPal7
call WaitBGMap2
farcall FadeInPalettes
call EnableSpriteUpdates
@@ -1934,7 +1933,6 @@ ReturnToMapWithSpeechTextbox::
call WaitBGMap2
ld b, CGB_MAPPALS
call GetCGBLayout
farcall LoadOW_BGPal7
call UpdateTimePals
call DelayFrame
ld a, $1