diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-11 17:43:20 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-11 17:43:20 -0500 |
| commit | 97a11c623ebd2c3e8d40a9c01b42669b2094da2c (patch) | |
| tree | fdf8c33ef5d460793b4e84450ab42e030a58fe01 /engine | |
| parent | d132a20b7aa5e0e411683e792d90947ab195e1d4 (diff) | |
Sync some files with pokegold
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/overworld/cmd_queue.asm | 4 | ||||
| -rw-r--r-- | engine/overworld/map_objects.asm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engine/overworld/cmd_queue.asm b/engine/overworld/cmd_queue.asm index 906a02faa..f94bf5c64 100644 --- a/engine/overworld/cmd_queue.asm +++ b/engine/overworld/cmd_queue.asm @@ -163,7 +163,7 @@ CmdQueue_Type1: CmdQueue_Type4: call CmdQueues_AnonJumptable - ; anonymous dw +.anon_dw dw .zero dw .one @@ -207,7 +207,7 @@ CmdQueue_Type4: CmdQueue_Type3: call CmdQueues_AnonJumptable - ; anonymous dw +.anon_dw dw .zero dw .one dw .two diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index bf809a2e6..9082f4c19 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -2746,7 +2746,7 @@ _UpdateSprites:: .fill ld a, [wVramState] bit 1, a - ld b, LOW(wVirtualOAMEnd) + ld b, OBJECT_LENGTH * SPRITEOAMSTRUCT_LENGTH jr z, .ok ld b, 28 * SPRITEOAMSTRUCT_LENGTH .ok |