diff options
| -rw-r--r-- | SummerSun.yaml | 2 | ||||
| -rw-r--r-- | src/bonusRoom.cpp | 29 | ||||
| -rw-r--r-- | summerhax.yaml | 16 |
3 files changed, 32 insertions, 15 deletions
diff --git a/SummerSun.yaml b/SummerSun.yaml index e58fb93..227535c 100644 --- a/SummerSun.yaml +++ b/SummerSun.yaml @@ -3,3 +3,5 @@ code_address: 0x808D9000 modules: - processed/prolog.yaml - processed/summerhax.yaml + - processed/soundPlayer.yaml + - processed/effectVideo.yaml diff --git a/src/bonusRoom.cpp b/src/bonusRoom.cpp index 1188528..3b7e9fe 100644 --- a/src/bonusRoom.cpp +++ b/src/bonusRoom.cpp @@ -12,11 +12,13 @@ extern "C" void *StartBGMMusic(); int Songs[2][4][15][2] = { + // First number is the block, Second is the note/sfx, Third is timing: 30 is one quarter note at 120 bpm, 0,0 ends the sequence + { // Song 1 - - {{3,0},{3,15},{3,45},{1,75},{3,90},{5,120},{0,0}}, // First number is the note, Second is timing: 30 is one quarter note at 120 bpm, 0,0 ends the sequence - {{1,0},{5,22},{3,45},{6,67},{7,82},{6,97},{6,105},{0,0}}, - {{1,0},{1,7},{1,22},{1,37},{2,45},{3,60},{1,67},{7,82},{6,90},{0,0}}, - {{1,0},{1,7},{1,22},{1,37},{2,45},{3,52},{0,0}} + {{3,3,0},{3,3,15},{3,3,45},{1,1,75},{3,3,90},{5,5,120},{0,0,0}}, + {{1,1,0},{5,5,22},{3,3,45},{6,6,67},{7,7,82},{6,6,97},{6,6,105},{0,0,0}}, + {{1,1,0},{1,1,7},{1,1,22},{1,1,37},{2,2,45},{3,3,60},{1,1,67},{7,7,82},{6,6,90},{0,0,0}}, + {{1,1,0},{1,1,7},{1,1,22},{1,1,37},{2,2,45},{3,3,52},{0,0,0}} }, { // Song 2 - @@ -157,7 +159,10 @@ int dSongPrize::onCreate() { return true; } -int dSongPrize::onDelete() { return true; } +int dSongPrize::onDelete() { + OSReport("Song Prize Delete"); + return true; +} int dSongPrize::onExecute() { acState.execute(); @@ -340,7 +345,9 @@ int dSingAlong::onExecute() { int dSingAlong::onDraw() { return true; } int dSingAlong::onDelete() { + OSReport("Sing Along Instance Remove"); instance = 0; + OSReport("Sing Along Delete"); return 1; } @@ -354,7 +361,7 @@ void dSingAlong::RegisterNote(int note) { OSReport("State was checked"); if (note == Songs[song][chorus][currentNote][0]) { - PlaySoundAsync(this, Notes[Songs[song][chorus][currentNote][0]-1]); + PlaySoundAsync(this, Notes[Songs[song][chorus][currentNote][1]-1]); OSReport("Note was correct"); currentNote += 1; } @@ -433,10 +440,10 @@ void dSingAlong::executeState_Call() { // OSReport("%d: Waiting for timer %d", timer, *currentNote[1]); - if (timer == Songs[song][chorus][currentNote][1]) { + if (timer == Songs[song][chorus][currentNote][2]) { OSReport("Playing Note %d", Songs[song][chorus][currentNote][0]); - PlaySoundAsync(this, Notes[Songs[song][chorus][currentNote][0]-1]); + PlaySoundAsync(this, Notes[Songs[song][chorus][currentNote][1]-1]); currentNote += 1; OSReport("Next Note %d", Songs[song][chorus][currentNote][0]); @@ -554,8 +561,8 @@ public: nw4r::g3d::ResFile resFile; m3d::mdl_c bodyModel; - StageActorLight light; - mHeapAllocator_c allocatorB; + // StageActorLight light; + // mHeapAllocator_c allocatorB; int note; @@ -622,7 +629,9 @@ int dSongBlock::onCreate() { } int dSongBlock::onDelete() { + OSReport("Song Block Physics Remove"); physics.removeFromList(); + OSReport("Song Block Delete"); return true; } diff --git a/summerhax.yaml b/summerhax.yaml index 2f24d33..1b97df9 100644 --- a/summerhax.yaml +++ b/summerhax.yaml @@ -125,27 +125,33 @@ hooks: - name: WaterEffectsWm_ob_sandpillar02 type: patch addr_pal: 0x8095E0DC - data: '576D5F6D725F7761746572776176655F696E00' # Wm_mr_waterwave_in + data: '00000000' + # data: '576D5F6D725F7761746572776176655F696E00' # Wm_mr_waterwave_in - name: WaterEffectsWm_ob_sandpillar01 type: patch addr_pal: 0x8095E0F0 - data: '576D5F6D725F7761746572776176655F6F757400' # Wm_mr_waterwave_out + data: '00000000' + # data: '576D5F6D725F7761746572776176655F6F757400' # Wm_mr_waterwave_out - name: WaterEffectsWm_ob_spillarsign01 type: patch addr_pal: 0x8095DE34 - data: '576D5F656E5F776174657273706C61736800' # Wm_en_watersplash + data: '00000000' + # data: '576D5F656E5F776174657273706C61736800' # Wm_en_watersplash - name: WaterEffectsWm_ob_spillarsign02 type: patch addr_pal: 0x8095DE48 - data: '576D5F656E5F62757273745F7761746572303200' # Wm_en_burst_water02 + data: '00000000' + # data: '576D5F656E5F62757273745F7761746572303200' # Wm_en_burst_water02 - name: WaterEffectsWm_en_sphitsmoke type: patch addr_pal: 0x8095DE10 - data: '576D5F6D725F77666C6F617473706C61736800' # Wm_mr_wfloatsplash + data: '00000000' + # data: '576D5F6D725F77666C6F617473706C61736800' # Wm_mr_wfloatsplash + |