From aae999f72bd81a3156c7e00da4ebf499f52da5a6 Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 4 Nov 2020 15:16:20 -0500 Subject: Start reorganizing pokeyellow --- scripts/BeachHouse.asm | 193 ---------------------------------------- scripts/BeachHouse2.asm | 33 ------- scripts/BillsHouse2.asm | 2 +- scripts/SSAnneCaptainsRoom.asm | 2 +- scripts/SummerBeachHouse.asm | 196 +++++++++++++++++++++++++++++++++++++++++ scripts/SummerBeachHouse2.asm | 33 +++++++ 6 files changed, 231 insertions(+), 228 deletions(-) delete mode 100644 scripts/BeachHouse.asm delete mode 100755 scripts/BeachHouse2.asm create mode 100644 scripts/SummerBeachHouse.asm create mode 100755 scripts/SummerBeachHouse2.asm (limited to 'scripts') diff --git a/scripts/BeachHouse.asm b/scripts/BeachHouse.asm deleted file mode 100644 index 2059f59d..00000000 --- a/scripts/BeachHouse.asm +++ /dev/null @@ -1,193 +0,0 @@ -BeachHouse_Script: - call EnableAutoTextBoxDrawing - ret - -BeachHouse_TextPointers: - dw SurfinDudeText - dw BeachHousePikachuText - dw BeachHouseSign1Text - dw BeachHouseSign2Text - dw BeachHouseSign3Text - dw BeachHouseSign4Text - -SurfinDudeText: - text_asm - ld a, [wd472] - bit 6, a - jr nz, .next - ld hl, .SurfinDudeText4 - call PrintText - jr .done -.next - ld hl, wd492 - bit 0, [hl] - set 0, [hl] - jr nz, .next2 - ld hl, .SurfinDudeText1 - jr .next3 -.next2 - ld hl, .SurfinDudeText3 -.next3 - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jr nz, .asm_f226b - ld a, 1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - farcall SurfingPikachuMinigame - ld hl, wd492 - set 1, [hl] - jr .done -.asm_f226b - ld hl, .SurfinDudeText2 - call PrintText -.done - jp TextScriptEnd - -.SurfinDudeText1 - text_far _SurfinDudeText1 - text_end -.SurfinDudeText2 - text_far _SurfinDudeText2 - text_end -.SurfinDudeText3 - text_far _SurfinDudeText3 - text_end -.SurfinDudeText4 - text_far _SurfinDudeText4 - text_end - -BeachHousePikachuText: - text_asm - ld hl, .BeachHousePikachuText - call PrintText - ld a, PIKACHU - call PlayCry - call WaitForSoundToFinish - jp TextScriptEnd - -.BeachHousePikachuText - text_far _BeachHousePikachuText - text_end - -BeachHouseSign1Text: - text_asm - ld hl, .BeachHouseSign1Text2 - ld a, [wd472] - bit 6, a - jr z, .next - ld hl, .BeachHouseSign1Text1 -.next - call PrintText - jp TextScriptEnd - -.BeachHouseSign1Text1 - text_far _BeachHouseSign1Text1 - text_end -.BeachHouseSign1Text2 - text_far _BeachHouseSign1Text2 - text_end - -BeachHouseSign2Text: - text_asm - ld hl, .BeachHouseSign2Text2 - ld a, [wd472] - bit 6, a - jr z, .next - ld hl, .BeachHouseSign2Text1 -.next - call PrintText - jp TextScriptEnd - -.BeachHouseSign2Text1 - text_far _BeachHouseSign2Text1 - text_end -.BeachHouseSign2Text2 - text_far _BeachHouseSign2Text2 - text_end - -BeachHouseSign3Text: - text_asm - ld hl, .BeachHouseSign3Text2 - ld a, [wd472] - bit 6, a - jr z, .next - ld hl, .BeachHouseSign3Text1 -.next - call PrintText - jp TextScriptEnd - -.BeachHouseSign3Text1 - text_far _BeachHouseSign3Text1 - text_end -.BeachHouseSign3Text2 - text_far _BeachHouseSign3Text2 - text_end - -BeachHouseSign4Text: - text_asm - ld a, 1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld a, [wd472] - bit 6, a - jr z, .asm_f2369 - - ld hl, wd492 - bit 1, [hl] - jr z, .next2 - ld a, 0 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a -.next2 - ld hl, .BeachHousePrinterText2 - call PrintText - ld a, [wd492] - bit 1, a - jr z, .asm_f236f - - ld a, 1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, .BeachHousePrinterText3 - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jp z, Func_f23d0 - call SaveScreenTilesToBuffer2 - ld hl, wd730 - set 6, [hl] - xor a - ld [wUpdateSpritesEnabled], a - callfar Printer_PrepareSurfingMinigameHighScoreTileMap - call WaitForTextScrollButtonPress - ld hl, wd730 - res 6, [hl] - call GBPalWhiteOutWithDelay3 - call ReloadTilesetTilePatterns - call RestoreScreenTilesAndReloadTilePatterns - call LoadScreenTilesFromBuffer2 - call Delay3 - call GBPalNormal - ld a, 1 - ld [wUpdateSpritesEnabled], a - jr .asm_f236f -.asm_f2369 - ld hl, .BeachHousePrinterText1 - call PrintText -.asm_f236f - jp TextScriptEnd - -.BeachHousePrinterText1 - text_far _BeachHousePrinterText1 - text_waitbutton - text_end -.BeachHousePrinterText2 - text_far _BeachHousePrinterText2 - text_waitbutton - text_end -.BeachHousePrinterText3 - text_far _BeachHousePrinterText3 - text_end -.BeachHousePrinterText4 - text_far _BeachHousePrinterText4 - text_end diff --git a/scripts/BeachHouse2.asm b/scripts/BeachHouse2.asm deleted file mode 100755 index 1cf570bc..00000000 --- a/scripts/BeachHouse2.asm +++ /dev/null @@ -1,33 +0,0 @@ -Func_f23d0: - call SaveScreenTilesToBuffer2 - xor a - ld [wUpdateSpritesEnabled], a - ld hl, wd730 - set 6, [hl] - callfar PrintSurfingMinigameHighScore - ld hl, wd730 - res 6, [hl] - call GBPalWhiteOutWithDelay3 - call ReloadTilesetTilePatterns - call RestoreScreenTilesAndReloadTilePatterns - call LoadScreenTilesFromBuffer2 - call Delay3 - call GBPalNormal - ld hl, Text_f2412 - ldh a, [hOaksAideResult] - and a - jr nz, .asm_f2406 - ld hl, Text_f240c -.asm_f2406 - call PrintText - jp TextScriptEnd - -Text_f240c: - text_far _BeachHousePrinterText5 - text_waitbutton - text_end - -Text_f2412: - text_far _BeachHousePrinterText6 - text_waitbutton - text_end diff --git a/scripts/BillsHouse2.asm b/scripts/BillsHouse2.asm index b1c6e820..ca1a56ad 100755 --- a/scripts/BillsHouse2.asm +++ b/scripts/BillsHouse2.asm @@ -83,7 +83,7 @@ BillsHouseText_f24a9: text_far _BillsHouseText_1e8da text_end -Func_f24ae: +Func_f24ae:: ld a, [wCurMap] cp BILLS_HOUSE jr nz, .asm_f24d2 diff --git a/scripts/SSAnneCaptainsRoom.asm b/scripts/SSAnneCaptainsRoom.asm index 593cd872..9af4744e 100755 --- a/scripts/SSAnneCaptainsRoom.asm +++ b/scripts/SSAnneCaptainsRoom.asm @@ -45,7 +45,7 @@ SSAnne7RubText: text_far _SSAnne7RubText text_asm ld a, [wAudioROMBank] - cp BANK(AudioEngine3) + cp BANK("Audio Engine 3") ld [wAudioSavedROMBank], a jr nz, .asm_61908 call StopAllMusic diff --git a/scripts/SummerBeachHouse.asm b/scripts/SummerBeachHouse.asm new file mode 100644 index 00000000..45e8032d --- /dev/null +++ b/scripts/SummerBeachHouse.asm @@ -0,0 +1,196 @@ +SummerBeachHouse_Script: + call EnableAutoTextBoxDrawing + ret + +SummerBeachHouse_TextPointers: + dw SurfinDudeText + dw SummerBeachHousePikachuText + dw SummerBeachHouseSign1Text + dw SummerBeachHouseSign2Text + dw SummerBeachHouseSign3Text + dw SummerBeachHouseSign4Text + +SurfinDudeText: + text_asm + ld a, [wd472] + bit 6, a + jr nz, .next + ld hl, .SurfinDudeText4 + call PrintText + jr .done +.next + ld hl, wd492 + bit 0, [hl] + set 0, [hl] + jr nz, .next2 + ld hl, .SurfinDudeText1 + jr .next3 +.next2 + ld hl, .SurfinDudeText3 +.next3 + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr nz, .asm_f226b + ld a, 1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + farcall SurfingPikachuMinigame + ld hl, wd492 + set 1, [hl] + jr .done +.asm_f226b + ld hl, .SurfinDudeText2 + call PrintText +.done + jp TextScriptEnd + +.SurfinDudeText1 + text_far _SurfinDudeText1 + text_end +.SurfinDudeText2 + text_far _SurfinDudeText2 + text_end +.SurfinDudeText3 + text_far _SurfinDudeText3 + text_end +.SurfinDudeText4 + text_far _SurfinDudeText4 + text_end + +SummerBeachHousePikachuText: + text_asm + ld hl, .SummerBeachHousePikachuText + call PrintText + ld a, PIKACHU + call PlayCry + call WaitForSoundToFinish + jp TextScriptEnd + +.SummerBeachHousePikachuText + text_far _SummerBeachHousePikachuText + text_end + +SummerBeachHouseSign1Text: + text_asm + ld hl, .SummerBeachHouseSign1Text2 + ld a, [wd472] + bit 6, a + jr z, .next + ld hl, .SummerBeachHouseSign1Text1 +.next + call PrintText + jp TextScriptEnd + +.SummerBeachHouseSign1Text1 + text_far _SummerBeachHouseSign1Text1 + text_end +.SummerBeachHouseSign1Text2 + text_far _SummerBeachHouseSign1Text2 + text_end + +SummerBeachHouseSign2Text: + text_asm + ld hl, .SummerBeachHouseSign2Text2 + ld a, [wd472] + bit 6, a + jr z, .next + ld hl, .SummerBeachHouseSign2Text1 +.next + call PrintText + jp TextScriptEnd + +.SummerBeachHouseSign2Text1 + text_far _SummerBeachHouseSign2Text1 + text_end +.SummerBeachHouseSign2Text2 + text_far _SummerBeachHouseSign2Text2 + text_end + +SummerBeachHouseSign3Text: + text_asm + ld hl, .SummerBeachHouseSign3Text2 + ld a, [wd472] + bit 6, a + jr z, .next + ld hl, .SummerBeachHouseSign3Text1 +.next + call PrintText + jp TextScriptEnd + +.SummerBeachHouseSign3Text1 + text_far _SummerBeachHouseSign3Text1 + text_end +.SummerBeachHouseSign3Text2 + text_far _SummerBeachHouseSign3Text2 + text_end + +SummerBeachHouseSign4Text: + text_asm + ld a, 1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld a, [wd472] + bit 6, a + jr z, .asm_f2369 + + ld hl, wd492 + bit 1, [hl] + jr z, .next2 + ld a, 0 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a +.next2 + ld hl, .SummerBeachHousePrinterText2 + call PrintText + ld a, [wd492] + bit 1, a + jr z, .asm_f236f + + ld a, 1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld hl, .SummerBeachHousePrinterText3 + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jp z, Func_f23d0 + call SaveScreenTilesToBuffer2 + ld hl, wd730 + set 6, [hl] + xor a + ld [wUpdateSpritesEnabled], a + callfar Printer_PrepareSurfingMinigameHighScoreTileMap + call WaitForTextScrollButtonPress + ld hl, wd730 + res 6, [hl] + call GBPalWhiteOutWithDelay3 + call ReloadTilesetTilePatterns + call RestoreScreenTilesAndReloadTilePatterns + call LoadScreenTilesFromBuffer2 + call Delay3 + call GBPalNormal + ld a, 1 + ld [wUpdateSpritesEnabled], a + jr .asm_f236f +.asm_f2369 + ld hl, .SummerBeachHousePrinterText1 + call PrintText +.asm_f236f + jp TextScriptEnd + +.SummerBeachHousePrinterText1 + text_far _SummerBeachHousePrinterText1 + text_waitbutton + text_end + +.SummerBeachHousePrinterText2 + text_far _SummerBeachHousePrinterText2 + text_waitbutton + text_end + +.SummerBeachHousePrinterText3 + text_far _SummerBeachHousePrinterText3 + text_end + +.SummerBeachHousePrinterText4 + text_far _SummerBeachHousePrinterText4 + text_end diff --git a/scripts/SummerBeachHouse2.asm b/scripts/SummerBeachHouse2.asm new file mode 100755 index 00000000..4ac1f705 --- /dev/null +++ b/scripts/SummerBeachHouse2.asm @@ -0,0 +1,33 @@ +Func_f23d0: + call SaveScreenTilesToBuffer2 + xor a + ld [wUpdateSpritesEnabled], a + ld hl, wd730 + set 6, [hl] + callfar PrintSurfingMinigameHighScore + ld hl, wd730 + res 6, [hl] + call GBPalWhiteOutWithDelay3 + call ReloadTilesetTilePatterns + call RestoreScreenTilesAndReloadTilePatterns + call LoadScreenTilesFromBuffer2 + call Delay3 + call GBPalNormal + ld hl, Text_f2412 + ldh a, [hOaksAideResult] + and a + jr nz, .asm_f2406 + ld hl, Text_f240c +.asm_f2406 + call PrintText + jp TextScriptEnd + +Text_f240c: + text_far _SummerBeachHousePrinterText5 + text_waitbutton + text_end + +Text_f2412: + text_far _SummerBeachHousePrinterText6 + text_waitbutton + text_end -- cgit v1.2.3