diff options
| -rw-r--r-- | engine/vblank.asm | 6 | ||||
| -rw-r--r-- | wram.asm | 17 |
2 files changed, 16 insertions, 7 deletions
diff --git a/engine/vblank.asm b/engine/vblank.asm index 5080a56ad..ea1d47260 100644 --- a/engine/vblank.asm +++ b/engine/vblank.asm @@ -146,12 +146,12 @@ VBlank0: ; 2b1 xor a ld [VBlankOccurred], a -; dec $cfb1 until 0 - ld a, [$cfb1] +; dec OverworldDelay until 0 + ld a, [OverworldDelay] and a jr z, .textdelay dec a - ld [$cfb1], a + ld [OverworldDelay], a .textdelay ; dec text delay counter until 0 @@ -845,7 +845,9 @@ TileX: ; cf83 -SECTION "VBlank",BSS[$cfb2] +SECTION "VBlank",BSS[$cfb1] +OverworldDelay: ; cfb1 + ds 1 TextDelayFrames: ; cfb2 ds 1 VBlankOccurred: ; cfb3 @@ -1086,7 +1088,12 @@ SECTION "UsedSprites",BSS[$d154] UsedSprites: ; d154 ds 32 -SECTION "connections",BSS[$d1a9] +SECTION "map",BSS[$d1a3] + +MapEventBank: ; d1a3 + ds 1 + + ds 5 MapConnections: @@ -1534,8 +1541,10 @@ SECTION "Scripting",BSS[$d434] ScriptFlags: ; d434 SCRIPT_RUNNING EQU 2 ds 1 - - ds 2 +ScriptFlags2: ; d435 + ds 1 +ScriptFlags3: ; d436 + ds 1 ScriptMode: ; d437 SCRIPT_OFF EQU 0 |