Skip to content

Add PAL Debug option to NTSC #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Mar 30, 2024
Merged

Add PAL Debug option to NTSC #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0f50b93
Port improvements from HackROMBase
idlechild Mar 24, 2024
20ef2b9
Add PAL Debug option to NTSC
idlechild Mar 24, 2024
b9c662b
Disallow shortcuts that match menu inputs
InsaneFirebat Mar 25, 2024
db91549
Unlock hidden demo set
InsaneFirebat Mar 25, 2024
56206df
Merge pull request #1 from InsaneFirebat/pull_2.6.1
idlechild Mar 25, 2024
b166087
Rename Bat room to Skree Boost room
idlechild Mar 25, 2024
6c9447c
Expand walljump room strat
idlechild Mar 27, 2024
59a0ee0
Add flag to indicate if segment timer should be printed
idlechild Mar 28, 2024
2ddedfb
Improve charge infohud mode
idlechild Mar 28, 2024
ac182ad
Improve shinespark infohud mode
idlechild Mar 28, 2024
ce5d849
Improve shinetune infohud mode
idlechild Mar 29, 2024
3a3991f
Added tasdance support to moondance roomstrat
idlechild Mar 30, 2024
17ebe2b
Update config version and touch up infohud help
idlechild Mar 30, 2024
c5da8ed
Indicator if you fall off elevator before doing 35 turns
idlechild Mar 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
@echo off

if not exist build mkdir build

echo Building SM NTSC Practice Hack
if not exist build mkdir build
python enemies\create_clear_enemies_data.py ..\src\clearenemies.asm clear_enemies.txt
python layout\create_layout.py portals.txt layoutmenutemplate.asm ..\src\layoutmenu.asm ..\src\layoutportaltables.asm
python names\create_names.py ..\src\roomnames.asm default_names.txt custom_names.txt
Expand All @@ -12,30 +11,36 @@ python create_dummies.py 00.sfc ff.sfc

echo Building saveless version
if exist ..\build\smhack20.ips del ..\build\smhack20.ips
copy *.sfc ..\build
copy 00.sfc ..\build
copy ff.sfc ..\build
..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\00.sfc
if ERRORLEVEL 1 goto end_build_saveless
..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\ff.sfc
python sort_debug_symbols.py ..\build\symbols.sym x ..\build\smhack20_combined.sym
..\tools\asar --no-title-check -DFEATURE_SD2SNES=0 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\ff.sfc
python dos_to_unix.py ..\build\symbols.sym
python sort_debug_symbols.py ..\build\symbols.sym x ..\build\smhack20.sym
python create_ips.py ..\build\00.sfc ..\build\ff.sfc ..\build\smhack20.ips
:end_build_saveless

echo Building SD2SNES version
if exist ..\build\smhack20_sd2snes.ips del ..\build\smhack20_sd2snes.ips
copy *.sfc ..\build
copy 00.sfc ..\build
copy ff.sfc ..\build
..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\00.sfc
if ERRORLEVEL 1 goto end_build_sd2snes
..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\ff.sfc
..\tools\asar --no-title-check -DFEATURE_SD2SNES=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\ff.sfc
python dos_to_unix.py ..\build\symbols.sym
python sort_debug_symbols.py ..\build\symbols.sym x ..\build\smhack20_sd2snes.sym
python create_ips.py ..\build\00.sfc ..\build\ff.sfc ..\build\smhack20_sd2snes.ips
:end_build_sd2snes

echo Building TinyStates version
if exist ..\build\smhack20_tinystates.ips del ..\build\smhack20_tinystates.ips
copy *.sfc ..\build
copy 00.sfc ..\build
copy ff.sfc ..\build
..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=1 ..\src\main.asm ..\build\00.sfc
if ERRORLEVEL 1 goto end_build_tinystates
..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=1 ..\src\main.asm ..\build\ff.sfc
..\tools\asar --no-title-check -DFEATURE_SD2SNES=0 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=1 ..\src\main.asm ..\build\ff.sfc
python dos_to_unix.py ..\build\symbols.sym
python sort_debug_symbols.py ..\build\symbols.sym x ..\build\smhack20_tinystates.sym
python create_ips.py ..\build\00.sfc ..\build\ff.sfc ..\build\smhack20_tinystates.ips
:end_build_tinystates
Expand Down
18 changes: 10 additions & 8 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
success=0
trap success=1 ERR

mkdir -p build

echo "Building SM NTSC Practice Hack"
mkdir -p build
python3 enemies/create_clear_enemies_data.py ../src/clearenemies.asm clear_enemies.txt
python3 layout/create_layout.py portals.txt layoutmenutemplate.asm ../src/layoutmenu.asm ../src/layoutportaltables.asm
python3 names/create_names.py ../src/roomnames.asm default_names.txt custom_names.txt
Expand All @@ -16,25 +15,28 @@ python3 create_dummies.py 00.sfc ff.sfc

echo "Building saveless version"
rm -f ../build/smhack20.ips
cp *.sfc ../build
cp 00.sfc ../build
cp ff.sfc ../build
../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/00.sfc
../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/ff.sfc
../tools/asar --no-title-check -DFEATURE_SD2SNES=0 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/ff.sfc
python3 sort_debug_symbols.py ../build/symbols.sym x ../build/smhack20.sym
python3 create_ips.py ../build/00.sfc ../build/ff.sfc ../build/smhack20.ips

echo "Building SD2SNES version"
rm -f ../build/smhack20_sd2snes.ips
cp *.sfc ../build
cp 00.sfc ../build
cp ff.sfc ../build
../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/00.sfc
../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/ff.sfc
../tools/asar --no-title-check -DFEATURE_SD2SNES=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/ff.sfc
python3 sort_debug_symbols.py ../build/symbols.sym x ../build/smhack20_sd2snes.sym
python3 create_ips.py ../build/00.sfc ../build/ff.sfc ../build/smhack20_sd2snes.ips

echo "Building TinyStates version"
rm -f ../build/smhack20_tinystates.ips
cp *.sfc ../build
cp 00.sfc ../build
cp ff.sfc ../build
../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=1 "$@" ../src/main.asm ../build/00.sfc
../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=1 "$@" ../src/main.asm ../build/ff.sfc
../tools/asar --no-title-check -DFEATURE_SD2SNES=0 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=1 "$@" ../src/main.asm ../build/ff.sfc
python3 sort_debug_symbols.py ../build/symbols.sym x ../build/smhack20_tinystates.sym
python3 create_ips.py ../build/00.sfc ../build/ff.sfc ../build/smhack20_tinystates.ips

Expand Down
21 changes: 13 additions & 8 deletions build_PAL.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
@echo off

if not exist build mkdir build

echo Building SM PAL Practice Hack
if not exist build mkdir build
python enemies\create_clear_enemies_data.py ..\src\clearenemies.asm clear_enemies.txt
python layout\create_layout.py portals.txt layoutmenutemplate.asm ..\src\layoutmenu.asm ..\src\layoutportaltables.asm
python names\create_names.py ..\src\roomnames.asm default_names.txt custom_names.txt
Expand All @@ -12,30 +11,36 @@ python create_dummies.py 00.sfc ff.sfc

echo Building saveless version
if exist ..\build\smpalhack20.ips del ..\build\smpalhack20.ips
copy *.sfc ..\build
copy 00.sfc ..\build
copy ff.sfc ..\build
..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\00.sfc
if ERRORLEVEL 1 goto end_build_saveless
..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\ff.sfc
..\tools\asar --no-title-check -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\ff.sfc
python dos_to_unix.py ..\build\symbols.sym
python sort_debug_symbols.py ..\build\symbols.sym x ..\build\smpalhack20.sym
python create_ips.py ..\build\00.sfc ..\build\ff.sfc ..\build\smpalhack20.ips
:end_build_saveless

echo Building SD2SNES version
if exist ..\build\smpalhack20_sd2snes.ips del ..\build\smpalhack20_sd2snes.ips
copy *.sfc ..\build
copy 00.sfc ..\build
copy ff.sfc ..\build
..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=1 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\00.sfc
if ERRORLEVEL 1 goto end_build_sd2snes
..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=1 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\ff.sfc
..\tools\asar --no-title-check -DFEATURE_SD2SNES=1 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\ff.sfc
python dos_to_unix.py ..\build\symbols.sym
python sort_debug_symbols.py ..\build\symbols.sym x ..\build\smpalhack20_sd2snes.sym
python create_ips.py ..\build\00.sfc ..\build\ff.sfc ..\build\smpalhack20_sd2snes.ips
:end_build_sd2snes

echo Building TinyStates version
if exist ..\build\smpalhack20_tinystates.ips del ..\build\smpalhack20_tinystates.ips
copy *.sfc ..\build
copy 00.sfc ..\build
copy ff.sfc ..\build
..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=1 ..\src\main.asm ..\build\00.sfc
if ERRORLEVEL 1 goto end_build_tinystates
..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=1 ..\src\main.asm ..\build\ff.sfc
..\tools\asar --no-title-check -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=1 ..\src\main.asm ..\build\ff.sfc
python dos_to_unix.py ..\build\symbols.sym
python sort_debug_symbols.py ..\build\symbols.sym x ..\build\smpalhack20_tinystates.sym
python create_ips.py ..\build\00.sfc ..\build\ff.sfc ..\build\smpalhack20_tinystates.ips
:end_build_tinystates
Expand Down
18 changes: 10 additions & 8 deletions build_PAL.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
success=0
trap success=1 ERR

mkdir -p build

echo "Building SM PAL Practice Hack"
mkdir -p build
python3 enemies/create_clear_enemies_data.py ../src/clearenemies.asm clear_enemies.txt
python3 layout/create_layout.py portals.txt layoutmenutemplate.asm ../src/layoutmenu.asm ../src/layoutportaltables.asm
python3 names/create_names.py ../src/roomnames.asm default_names.txt custom_names.txt
Expand All @@ -16,25 +15,28 @@ python3 create_dummies.py 00.sfc ff.sfc

echo "Building saveless version"
rm -f ../build/smpalhack20.ips
cp *.sfc ../build
cp 00.sfc ../build
cp ff.sfc ../build
../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/00.sfc
../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/ff.sfc
../tools/asar --no-title-check -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/ff.sfc
python3 sort_debug_symbols.py ../build/symbols.sym x ../build/smpalhack20.sym
python3 create_ips.py ../build/00.sfc ../build/ff.sfc ../build/smpalhack20.ips

echo "Building SD2SNES version"
rm -f ../build/smpalhack20_sd2snes.ips
cp *.sfc ../build
cp 00.sfc ../build
cp ff.sfc ../build
../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=1 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/00.sfc
../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=1 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/ff.sfc
../tools/asar --no-title-check -DFEATURE_SD2SNES=1 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/ff.sfc
python3 sort_debug_symbols.py ../build/symbols.sym x ../build/smpalhack20_sd2snes.sym
python3 create_ips.py ../build/00.sfc ../build/ff.sfc ../build/smpalhack20_sd2snes.ips

echo "Building TinyStates version"
rm -f ../build/smpalhack20_tinystates.ips
cp *.sfc ../build
cp 00.sfc ../build
cp ff.sfc ../build
../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=1 "$@" ../src/main.asm ../build/00.sfc
../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=1 "$@" ../src/main.asm ../build/ff.sfc
../tools/asar --no-title-check -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=1 "$@" ../src/main.asm ../build/ff.sfc
python3 sort_debug_symbols.py ../build/symbols.sym x ../build/smpalhack20_tinystates.sym
python3 create_ips.py ../build/00.sfc ../build/ff.sfc ../build/smpalhack20_tinystates.ips

Expand Down
8 changes: 4 additions & 4 deletions build_dev.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
@echo off
cls

if not exist build mkdir build

echo Building SM NTSC Dev Practice Hack
if not exist build mkdir build
python enemies\create_clear_enemies_data.py ..\src\clearenemies.asm clear_enemies.txt
python layout\create_layout.py portals.txt layoutmenutemplate.asm ..\src\layoutmenu.asm ..\src\layoutportaltables.asm
python names\create_names.py ..\src\roomnames.asm default_names.txt custom_names.txt
Expand All @@ -14,10 +13,11 @@ python create_dummies.py 00.sfc ff.sfc
echo Building SD2SNES Dev version
if exist ..\build\print_pc.log del ..\build\print_pc.log
if exist ..\build\smhack20_sd2snes_dev.ips del ..\build\smhack20_sd2snes_dev.ips
copy *.sfc ..\build
copy 00.sfc ..\build
copy ff.sfc ..\build
..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\Debugging_Symbols.sym -DFEATURE_SD2SNES=1 -DFEATURE_DEV=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\00.sfc > ..\build\print_pc.log 2>&1
if ERRORLEVEL 1 goto fail_build_dev
..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\Debugging_Symbols.sym -DFEATURE_SD2SNES=1 -DFEATURE_DEV=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\ff.sfc
..\tools\asar --no-title-check -DFEATURE_SD2SNES=1 -DFEATURE_DEV=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\ff.sfc
python dos_to_unix.py ..\build\Debugging_Symbols.sym
python sort_debug_symbols.py ..\build\Debugging_Symbols.sym ..\build\Debugging_Sorted.sym ..\build\Debugging_Combined.sym
python create_ips.py ..\build\00.sfc ..\build\ff.sfc ..\build\smhack20_sd2snes_dev.ips
Expand Down
10 changes: 5 additions & 5 deletions build_dev.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
success=0
trap success=1 ERR

mkdir -p build

echo "Building SM NTSC Dev Practice Hack"
mkdir -p build
python3 enemies/create_clear_enemies_data.py ../src/clearenemies.asm clear_enemies.txt
python3 layout/create_layout.py portals.txt layoutmenutemplate.asm ../src/layoutmenu.asm ../src/layoutportaltables.asm
python3 names/create_names.py ../src/roomnames.asm default_names.txt custom_names.txt
Expand All @@ -16,14 +15,15 @@ python3 create_dummies.py 00.sfc ff.sfc

echo "Building tinystates Dev version"
rm -f ../build/smhack20_tinystates_dev.ips
cp *.sfc ../build
cp 00.sfc ../build
cp ff.sfc ../build
if git --version &>/dev/null; then
PRERELEASE=$(git rev-parse --short HEAD)
../tools/asar --no-title-check --symbols=wla --symbols-path=../build/Debugging_Symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_DEV=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=1 -DPRERELEASE=$PRERELEASE "$@" ../src/main.asm ../build/00.sfc
../tools/asar --no-title-check --symbols=wla --symbols-path=../build/Debugging_Symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_DEV=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=1 -DPRERELEASE=$PRERELEASE "$@" ../src/main.asm ../build/ff.sfc
../tools/asar --no-title-check -DFEATURE_SD2SNES=0 -DFEATURE_DEV=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=1 -DPRERELEASE=$PRERELEASE "$@" ../src/main.asm ../build/ff.sfc
else
../tools/asar --no-title-check --symbols=wla --symbols-path=../build/Debugging_Symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_DEV=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=1 "$@" ../src/main.asm ../build/00.sfc
../tools/asar --no-title-check --symbols=wla --symbols-path=../build/Debugging_Symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_DEV=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=1 "$@" ../src/main.asm ../build/ff.sfc
../tools/asar --no-title-check -DFEATURE_SD2SNES=0 -DFEATURE_DEV=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=1 "$@" ../src/main.asm ../build/ff.sfc
fi
python3 sort_debug_symbols.py ../build/Debugging_Symbols.sym ../build/Debugging_Sorted.sym ../build/Debugging_Combined.sym
python3 create_ips.py ../build/00.sfc ../build/ff.sfc ../build/smhack20_tinystates_dev.ips
Expand Down
8 changes: 4 additions & 4 deletions layout/portals.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,16 +220,16 @@ LayoutPinkMaridiaLeftDoorMenu:
LayoutRedBrinstarLeftDoorMenu:
; Red Brinstar
90EA, 9096, RB Alpha Power Bombs, Alpha Power Bombs door 0 --> Caterpillars
9102, 910E, RB Bat, Bat door 1 --> Below Spazer
911A, A36C, RB Below Spazer (Lower), Below Spazer door 1 --> West Tunnel
9126, 9132, RB Below Spazer (Upper), Below Spazer door 2 --> Spazer
90DE, 90A2, RB Beta Power Bombs, Beta Power Bombs door 0 --> Caterpillars
90D2, 926A, RB Caterpillars (Lower), Caterpillars door 6 --> Red Brinstar Save
90C6, A480, RB Caterpillars (Upper), Caterpillars door 4 --> Red Fish
908A, 90AE, RB Hellway, Hellway door 1 --> Caterpillars
9066, 9036, RB Red Brinstar Firefleas, Red Brinstar Firefleas door 1 --> Red Tower
9042, 90F6, RB Red Tower (Lower), Red Tower door 3 --> Bat
9042, 90F6, RB Red Tower (Lower), Red Tower door 3 --> Skree Boost
901E, 907E, RB Red Tower (Upper), Red Tower door 0 --> Hellway
9102, 910E, RB Skree Boost, Skree Boost door 1 --> Below Spazer
91FE, 904E, RB Sloaters Refill, Sloaters Refill door 0 --> Red Tower
9072, 905A, RB X-Ray Scope, X-Ray Scope door 0 --> Red Brinstar Firefleas
LayoutTourianLeftDoorMenu:
Expand Down Expand Up @@ -515,8 +515,7 @@ LayoutPinkMaridiaRightDoorMenu:
A93C, A75C, PM West Cactus Alley, West Cactus Alley door 0 --> Butterfly
LayoutRedBrinstarRightDoorMenu:
; Red Brinstar
90F6, 9042, RB Bat, Bat door 0 --> Red Tower
910E, 9102, RB Below Spazer, Below Spazer door 0 --> Bat
910E, 9102, RB Below Spazer, Below Spazer door 0 --> Skree Boost
9096, 90EA, RB Caterpillars (Lower), Caterpillars door 0 --> Alpha Power Bombs
90AE, 908A, RB Caterpillars (Middle), Caterpillars door 2 --> Hellway
90A2, 90DE, RB Caterpillars (Upper), Caterpillars door 1 --> Beta Power Bombs
Expand All @@ -526,6 +525,7 @@ LayoutRedBrinstarRightDoorMenu:
904E, 91FE, RB Red Tower (Lower), Red Tower door 4 --> Sloaters Refill
9036, 9066, RB Red Tower (Middle), Red Tower door 2 --> Red Brinstar Firefleas
902A, 8F0A, RB Red Tower (Upper), Red Tower door 1 --> Noob Bridge
90F6, 9042, RB Skree Boost, Skree Boost door 0 --> Red Tower
9132, 9126, RB Spazer, Spazer door 0 --> Below Spazer
LayoutTourianRightDoorMenu:
; Tourian
Expand Down
2 changes: 1 addition & 1 deletion names/default_names.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ A2F7=Hellway
A322=Caterpillar Room
A37C=Beta Power Bomb Room
A3AE=Alpha Power Bomb Room
A3DD=Bat Room
A3DD=Skree Boost Room
A408=Below Spazer
A447=Spazer Room
A471=Warehouse Zeela Room
Expand Down
2 changes: 1 addition & 1 deletion resources/header.tbl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
=1F
A=50
a=50
B=51
Expand Down Expand Up @@ -57,7 +58,6 @@ z=69
,=6D
?=6E
#=6F
=1F
0=70
1=71
2=72
Expand Down
Loading
Loading