Build out much of test chamber 09

This commit is contained in:
James Lambert 2024-01-02 21:36:53 -07:00
parent dba8b5d415
commit 95ca05b846
7 changed files with 15 additions and 4 deletions

View file

@ -380,7 +380,8 @@ ANIM_TEST_CHAMBERS = build/assets/test_chambers/test_chamber_00/test_chamber_00_
build/assets/test_chambers/test_chamber_04/test_chamber_04_anim.o \
build/assets/test_chambers/test_chamber_06/test_chamber_06_anim.o \
build/assets/test_chambers/test_chamber_07/test_chamber_07_anim.o \
build/assets/test_chambers/test_chamber_08/test_chamber_08_anim.o
build/assets/test_chambers/test_chamber_08/test_chamber_08_anim.o \
build/assets/test_chambers/test_chamber_09/test_chamber_09_anim.o
build/anims.ld: $(ANIM_LIST) $(ANIM_TEST_CHAMBERS) tools/generate_animation_ld.js
@mkdir -p $(@D)
@ -398,7 +399,8 @@ TEST_CHAMBERS = assets/test_chambers/test_chamber_00/test_chamber_00.blend \
assets/test_chambers/test_chamber_05/test_chamber_05.blend \
assets/test_chambers/test_chamber_06/test_chamber_06.blend \
assets/test_chambers/test_chamber_07/test_chamber_07.blend \
assets/test_chambers/test_chamber_08/test_chamber_08.blend
assets/test_chambers/test_chamber_08/test_chamber_08.blend \
assets/test_chambers/test_chamber_09/test_chamber_09.blend
TEST_CHAMBER_HEADERS = $(TEST_CHAMBERS:%.blend=build/%.h)
TEST_CHAMBER_OBJECTS = $(TEST_CHAMBERS:%.blend=build/%_geo.o)

View file

@ -0,0 +1,4 @@
cutscenes:
INTRO:
- activate_signage 14
- set_signal launch_ball

View file

@ -257,6 +257,8 @@ int getChamberDisplayNumberFromLevelIndex(int levelIndex, int roomIndex){
return 12;
case 8:
return 13;
case 9:
return 14;
default:
return 0;
}
@ -287,6 +289,8 @@ int getLevelIndexFromChamberDisplayNumber(int chamberNumber) {
return 7;
case 13:
return 8;
case 14:
return 9;
default:
return 0;
}

View file

@ -249,7 +249,7 @@ static void gameProc(void* arg) {
savefileLoad();
levelLoadWithCallbacks(INTRO_MENU);
levelLoadWithCallbacks(9);
gCurrentTestSubject = 0;
cutsceneRunnerReset();
controllersInit();

View file

@ -28,7 +28,7 @@ struct Chapter gChapters[] = {
{images_chapter3_rgba_16b, 4, 8},
{images_chapter4_rgba_16b, 6, 10},
{images_chapter5_rgba_16b, 8, 13},
{images_chapter6_rgba_16b, -1, 14},
{images_chapter6_rgba_16b, 9, 14},
{images_chapter7_rgba_16b, -1, 15},
{images_chapter8_rgba_16b, -1, 16},
{images_chapter9_rgba_16b, -1, 17},

View file

@ -122,6 +122,7 @@ short gLevelWarnings[] = {
LevelWarningsBallHit | LevelWarningsBallCollect | LevelWarningsLiquid | LevelWarningsDrinking,
LevelWarningsCubeDispense | LevelWarningsCubeHit | LevelWarningsSpeedyIn | LevelWarningsSpeedyOut,
LevelWarningsCubeHit | LevelWarningsBallHit | LevelWarningsBallCollect,
LevelWarningsCubeHit | LevelWarningsBallHit | LevelWarningsBallCollect | LevelWarningsLiquid | LevelWarningsDrinking | LevelWarningsSpeedyIn | LevelWarningsSpeedyOut,
};
static struct Coloru8 gBacklightColors[] = {