Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address PR suggestions (#1078)

Browse Source
This commit is contained in:
xCrystal
2024-01-28 21:19:32 +01:00
parent e0c278a595
commit 17d3a1a8ae
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/events/sweet_scent.asm
View File

@@ -30,7 +30,7 @@ SweetScentNothing:
end end
SweetScentEncounter: SweetScentEncounter:
farcall CanEncounterWildMonInThisTile farcall CanEncounterWildMon
jr nc, .no_battle jr nc, .no_battle
ld hl, wStatusFlags2 ld hl, wStatusFlags2
bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl] bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]

4
engine/overworld/events.asm
View File

@@ -1133,7 +1133,7 @@ TryTileCollisionEvent::
RandomEncounter:: RandomEncounter::
call CheckWildEncounterCooldown call CheckWildEncounterCooldown
jr c, .nope jr c, .nope
call CanEncounterWildMonInThisTile call CanEncounterWildMon
jr nc, .nope jr nc, .nope
ld hl, wStatusFlags2 ld hl, wStatusFlags2
bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl] bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
@@ -1173,7 +1173,7 @@ WildBattleScript:
reloadmapafterbattle reloadmapafterbattle
end end
CanEncounterWildMonInThisTile:: CanEncounterWildMon::
ld hl, wStatusFlags ld hl, wStatusFlags
bit STATUSFLAGS_NO_WILD_ENCOUNTERS_F, [hl] bit STATUSFLAGS_NO_WILD_ENCOUNTERS_F, [hl]
jr nz, .no jr nz, .no

2
engine/overworld/load_map_part.asm
View File

@@ -1,6 +1,8 @@
_LoadOverworldTilemap:: _LoadOverworldTilemap::
; From the metatile-based 24x20 map in wSurroundingTiles, ; From the metatile-based 24x20 map in wSurroundingTiles,
; load the corresponding 20x18 tiles to wTilemap. ; 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 hl, wSurroundingTiles
ld a, [wPlayerMetatileY] ld a, [wPlayerMetatileY]
and a and a

2
engine/tilesets/map_palettes.asm
View File

@@ -1,5 +1,7 @@
_LoadOverworldAttrmapPals:: _LoadOverworldAttrmapPals::
; Load wAttrmap palette numbers based on the tileset palettes of current map. ; 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 hlcoord 0, 0
decoord 0, 0, wAttrmap decoord 0, 0, wAttrmap
ld b, SCREEN_HEIGHT ld b, SCREEN_HEIGHT