Address PR suggestions (#1078)

pret · Jan 28, 2024 · 17d3a1a · 17d3a1a
1 parent e0c278a
commit 17d3a1a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/engine/events/sweet_scent.asm b/engine/events/sweet_scent.asm
@@ -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]

diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm
@@ -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

diff --git a/engine/overworld/load_map_part.asm b/engine/overworld/load_map_part.asm
@@ -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

diff --git a/engine/tilesets/map_palettes.asm b/engine/tilesets/map_palettes.asm
@@ -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