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:
@@ -1109,7 +1109,7 @@ RandomEncounter::
|
||||
|
||||
call CheckWildEncounterCooldown
|
||||
jr c, .nope
|
||||
call CanUseSweetScent
|
||||
call CanEncounterWildMonInThisTile
|
||||
jr nc, .nope
|
||||
ld hl, wStatusFlags2
|
||||
bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
|
||||
@@ -1149,15 +1149,13 @@ WildBattleScript:
|
||||
reloadmapafterbattle
|
||||
end
|
||||
|
||||
CanUseSweetScent::
|
||||
CanEncounterWildMonInThisTile::
|
||||
ld hl, wStatusFlags
|
||||
bit STATUSFLAGS_NO_WILD_ENCOUNTERS_F, [hl]
|
||||
jr nz, .no
|
||||
ld a, [wEnvironment]
|
||||
cp CAVE
|
||||
jr z, .ice_check
|
||||
cp DUNGEON
|
||||
jr z, .ice_check
|
||||
cp INDOOR_ENVIRONMENT
|
||||
jr nc, .ice_check
|
||||
farcall CheckGrassCollision
|
||||
jr nc, .no
|
||||
|
||||
|
||||
@@ -31,7 +31,6 @@ ReanchorBGMap_NoOAMUpdate::
|
||||
ld a, HIGH(vBGMap1)
|
||||
call .LoadBGMapAddrIntoHRAM
|
||||
call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
|
||||
farcall LoadOW_BGPal7
|
||||
farcall ApplyPals
|
||||
ld a, TRUE
|
||||
ldh [hCGBPalUpdate], a
|
||||
|
||||
@@ -130,11 +130,7 @@ CheckUpdatePlayerSprite:
|
||||
cp PLAYER_SURF_PIKA
|
||||
jr z, .surfing
|
||||
call GetMapEnvironment
|
||||
cp INDOOR
|
||||
jr z, .no_biking
|
||||
cp ENVIRONMENT_5
|
||||
jr z, .no_biking
|
||||
cp DUNGEON
|
||||
cp INDOOR_BUILDING
|
||||
jr z, .no_biking
|
||||
jr .nope
|
||||
.no_biking
|
||||
|
||||
@@ -236,6 +236,8 @@ ApplyCleanseTagEffectOnEncounterRate::
|
||||
ld hl, wPartyMon1Item
|
||||
ld de, PARTYMON_STRUCT_LENGTH
|
||||
ld a, [wPartyCount]
|
||||
and a
|
||||
ret z
|
||||
ld c, a
|
||||
.loop
|
||||
ld a, [hl]
|
||||
|
||||
Reference in New Issue
Block a user