Sync some files with pokegold

2021-03-24 10:24:52 -04:00
parent 8bf76af5a7
commit dc18e188b2
8 changed files with 22 additions and 14 deletions
--- a/engine/overworld/map_objects.asm
+++ b/engine/overworld/map_objects.asm
@@ -2746,9 +2746,9 @@ _UpdateSprites::
 .fill
 	ld a, [wVramState]
 	bit 1, a
-	ld b, OBJECT_LENGTH * SPRITEOAMSTRUCT_LENGTH
+	ld b, NUM_SPRITE_OAM_STRUCTS * SPRITEOAMSTRUCT_LENGTH
 	jr z, .ok
-	ld b, 28 * SPRITEOAMSTRUCT_LENGTH
+	ld b, (NUM_SPRITE_OAM_STRUCTS - 12) * SPRITEOAMSTRUCT_LENGTH
 .ok
 	ldh a, [hUsedSpriteIndex]
 	cp b
--- a/engine/overworld/player_movement.asm
+++ b/engine/overworld/player_movement.asm
@@ -392,7 +392,7 @@ DoPlayerMovement::

 .CheckWarp:
 ; Bug: Since no case is made for STANDING here, it will check
-; [.edgewarps + $ff]. This resolves to $3e at $8035a.
+; [.EdgeWarps + $ff]. This resolves to $3e.
 ; This causes wWalkingIntoEdgeWarp to be nonzero when standing on tile $3e,
 ; making bumps silent.

--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -2360,5 +2360,5 @@ Script_checkver_duplicate: ; unreferenced
 	ld [wScriptVar], a
 	ret

-.gs_version
+.gs_version:
 	db GS_VERSION