forked from mirror/Archipelago
Jonathan Tinney
7971961166
Some checks failed
Analyze modified files / flake8 (push) Failing after 2m28s
Build / build-win (push) Has been cancelled
Build / build-ubuntu2204 (push) Has been cancelled
ctest / Test C++ ubuntu-latest (push) Has been cancelled
ctest / Test C++ windows-latest (push) Has been cancelled
Analyze modified files / mypy (push) Has been cancelled
Build and Publish Docker Images / Push Docker image to Docker Hub (push) Successful in 5m4s
Native Code Static Analysis / scan-build (push) Failing after 5m2s
type check / pyright (push) Successful in 1m7s
unittests / Test Python 3.11.2 ubuntu-latest (push) Failing after 16m23s
unittests / Test Python 3.12 ubuntu-latest (push) Failing after 28m19s
unittests / Test Python 3.13 ubuntu-latest (push) Failing after 14m49s
unittests / Test hosting with 3.13 on ubuntu-latest (push) Successful in 5m0s
unittests / Test Python 3.13 macos-latest (push) Has been cancelled
unittests / Test Python 3.11 windows-latest (push) Has been cancelled
unittests / Test Python 3.13 windows-latest (push) Has been cancelled
27 lines
575 B
YAML
27 lines
575 B
YAML
# 2 frames before the end, reactivate enemies so that Pols Voice have time to
|
|
# witness the flute playing and die accordingly. This is a hacky fix, but it works.
|
|
06//skipSong: |
|
|
call $23d6 ; itemDecCounter1
|
|
push bc
|
|
ld bc,$8f03 ; Tokkey room
|
|
call compareRoom
|
|
pop bc
|
|
jp z,$4dbc ; return to vanilla behavior
|
|
|
|
ld a,(hl)
|
|
and $1f
|
|
cp $02
|
|
jr z,@frameReactivateEnemies
|
|
or a
|
|
jp z,$4df8 ; @donePlayingSong
|
|
jp $4dd8 ; ++
|
|
|
|
@frameReactivateEnemies:
|
|
xor a
|
|
ld (wDisabledObjects),a
|
|
ret
|
|
|
|
06/4db9/: |
|
|
jp skipSong
|
|
|