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

4
engine/overworld/events.asm
View File

@@ -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

2
engine/overworld/load_map_part.asm
View File

@@ -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