Address PR suggestions (#1078)
This commit is contained in:
@@ -30,7 +30,7 @@ SweetScentNothing:
|
||||
end
|
||||
|
||||
SweetScentEncounter:
|
||||
farcall CanEncounterWildMonInThisTile
|
||||
farcall CanEncounterWildMon
|
||||
jr nc, .no_battle
|
||||
ld hl, wStatusFlags2
|
||||
bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
|
||||
|
@@ -1133,7 +1133,7 @@ TryTileCollisionEvent::
|
||||
RandomEncounter::
|
||||
call CheckWildEncounterCooldown
|
||||
jr c, .nope
|
||||
call CanEncounterWildMonInThisTile
|
||||
call CanEncounterWildMon
|
||||
jr nc, .nope
|
||||
ld hl, wStatusFlags2
|
||||
bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
|
||||
@@ -1173,7 +1173,7 @@ WildBattleScript:
|
||||
reloadmapafterbattle
|
||||
end
|
||||
|
||||
CanEncounterWildMonInThisTile::
|
||||
CanEncounterWildMon::
|
||||
ld hl, wStatusFlags
|
||||
bit STATUSFLAGS_NO_WILD_ENCOUNTERS_F, [hl]
|
||||
jr nz, .no
|
||||
|
@@ -1,6 +1,8 @@
|
||||
_LoadOverworldTilemap::
|
||||
; From the metatile-based 24x20 map in wSurroundingTiles,
|
||||
; load the corresponding 20x18 tiles to wTilemap.
|
||||
; This function is only used for the initial loading of the map; incremental
|
||||
; loads while moving happen through UpdateBGMapRow and UpdateBGMapColumn.
|
||||
ld hl, wSurroundingTiles
|
||||
ld a, [wPlayerMetatileY]
|
||||
and a
|
||||
|
@@ -1,5 +1,7 @@
|
||||
_LoadOverworldAttrmapPals::
|
||||
; Load wAttrmap palette numbers based on the tileset palettes of current map.
|
||||
; This function is only used for the initial loading of the map; incremental
|
||||
; loads while moving happen through ScrollBGMapPalettes.
|
||||
hlcoord 0, 0
|
||||
decoord 0, 0, wAttrmap
|
||||
ld b, SCREEN_HEIGHT
|
||||
|
Reference in New Issue
Block a user