diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-24 10:24:52 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-24 10:24:52 -0400 |
| commit | dc18e188b2948ede03328c0c0cf7ab423cacc861 (patch) | |
| tree | 0eff97454766331e3bb41e3158b1575cf044b983 /engine/overworld | |
| parent | 8bf76af5a7360d9e86a24e3d9750329f354b3ac3 (diff) | |
Sync some files with pokegold
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/map_objects.asm | 4 | ||||
| -rw-r--r-- | engine/overworld/player_movement.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/scripting.asm | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index 9082f4c19..b1041ed69 100644 --- 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 diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm index a5db49970..7fb321dcf 100644 --- 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. diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index e20b2b391..92ca71605 100644 --- 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 |