diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-04 15:16:20 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-04 19:44:31 -0500 |
| commit | aae999f72bd81a3156c7e00da4ebf499f52da5a6 (patch) | |
| tree | 32fef70a31af3a0b5ad2b0d34042c312574fb42d /scripts/BeachHouse.asm | |
| parent | Merge branch 'master' of https://github.com/pret/pokered (diff) | |
| download | pokeyellow-aae999f72bd81a3156c7e00da4ebf499f52da5a6.tar.gz pokeyellow-aae999f72bd81a3156c7e00da4ebf499f52da5a6.tar.xz pokeyellow-aae999f72bd81a3156c7e00da4ebf499f52da5a6.zip | |
Start reorganizing pokeyellow
Diffstat (limited to '')
| -rw-r--r-- | scripts/SummerBeachHouse.asm (renamed from scripts/BeachHouse.asm) | 91 |
1 files changed, 47 insertions, 44 deletions
diff --git a/scripts/BeachHouse.asm b/scripts/SummerBeachHouse.asm index 2059f59d..45e8032d 100644 --- a/scripts/BeachHouse.asm +++ b/scripts/SummerBeachHouse.asm @@ -1,14 +1,14 @@ -BeachHouse_Script: +SummerBeachHouse_Script: call EnableAutoTextBoxDrawing ret -BeachHouse_TextPointers: +SummerBeachHouse_TextPointers: dw SurfinDudeText - dw BeachHousePikachuText - dw BeachHouseSign1Text - dw BeachHouseSign2Text - dw BeachHouseSign3Text - dw BeachHouseSign4Text + dw SummerBeachHousePikachuText + dw SummerBeachHouseSign1Text + dw SummerBeachHouseSign2Text + dw SummerBeachHouseSign3Text + dw SummerBeachHouseSign4Text SurfinDudeText: text_asm @@ -58,74 +58,74 @@ SurfinDudeText: text_far _SurfinDudeText4 text_end -BeachHousePikachuText: +SummerBeachHousePikachuText: text_asm - ld hl, .BeachHousePikachuText + ld hl, .SummerBeachHousePikachuText call PrintText ld a, PIKACHU call PlayCry call WaitForSoundToFinish jp TextScriptEnd -.BeachHousePikachuText - text_far _BeachHousePikachuText +.SummerBeachHousePikachuText + text_far _SummerBeachHousePikachuText text_end -BeachHouseSign1Text: +SummerBeachHouseSign1Text: text_asm - ld hl, .BeachHouseSign1Text2 + ld hl, .SummerBeachHouseSign1Text2 ld a, [wd472] bit 6, a jr z, .next - ld hl, .BeachHouseSign1Text1 + ld hl, .SummerBeachHouseSign1Text1 .next call PrintText jp TextScriptEnd -.BeachHouseSign1Text1 - text_far _BeachHouseSign1Text1 +.SummerBeachHouseSign1Text1 + text_far _SummerBeachHouseSign1Text1 text_end -.BeachHouseSign1Text2 - text_far _BeachHouseSign1Text2 +.SummerBeachHouseSign1Text2 + text_far _SummerBeachHouseSign1Text2 text_end -BeachHouseSign2Text: +SummerBeachHouseSign2Text: text_asm - ld hl, .BeachHouseSign2Text2 + ld hl, .SummerBeachHouseSign2Text2 ld a, [wd472] bit 6, a jr z, .next - ld hl, .BeachHouseSign2Text1 + ld hl, .SummerBeachHouseSign2Text1 .next call PrintText jp TextScriptEnd -.BeachHouseSign2Text1 - text_far _BeachHouseSign2Text1 +.SummerBeachHouseSign2Text1 + text_far _SummerBeachHouseSign2Text1 text_end -.BeachHouseSign2Text2 - text_far _BeachHouseSign2Text2 +.SummerBeachHouseSign2Text2 + text_far _SummerBeachHouseSign2Text2 text_end -BeachHouseSign3Text: +SummerBeachHouseSign3Text: text_asm - ld hl, .BeachHouseSign3Text2 + ld hl, .SummerBeachHouseSign3Text2 ld a, [wd472] bit 6, a jr z, .next - ld hl, .BeachHouseSign3Text1 + ld hl, .SummerBeachHouseSign3Text1 .next call PrintText jp TextScriptEnd -.BeachHouseSign3Text1 - text_far _BeachHouseSign3Text1 +.SummerBeachHouseSign3Text1 + text_far _SummerBeachHouseSign3Text1 text_end -.BeachHouseSign3Text2 - text_far _BeachHouseSign3Text2 +.SummerBeachHouseSign3Text2 + text_far _SummerBeachHouseSign3Text2 text_end -BeachHouseSign4Text: +SummerBeachHouseSign4Text: text_asm ld a, 1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a @@ -139,7 +139,7 @@ BeachHouseSign4Text: ld a, 0 ld [wDoNotWaitForButtonPressAfterDisplayingText], a .next2 - ld hl, .BeachHousePrinterText2 + ld hl, .SummerBeachHousePrinterText2 call PrintText ld a, [wd492] bit 1, a @@ -147,7 +147,7 @@ BeachHouseSign4Text: ld a, 1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, .BeachHousePrinterText3 + ld hl, .SummerBeachHousePrinterText3 call PrintText call YesNoChoice ld a, [wCurrentMenuItem] @@ -172,22 +172,25 @@ BeachHouseSign4Text: ld [wUpdateSpritesEnabled], a jr .asm_f236f .asm_f2369 - ld hl, .BeachHousePrinterText1 + ld hl, .SummerBeachHousePrinterText1 call PrintText .asm_f236f jp TextScriptEnd -.BeachHousePrinterText1 - text_far _BeachHousePrinterText1 +.SummerBeachHousePrinterText1 + text_far _SummerBeachHousePrinterText1 text_waitbutton text_end -.BeachHousePrinterText2 - text_far _BeachHousePrinterText2 + +.SummerBeachHousePrinterText2 + text_far _SummerBeachHousePrinterText2 text_waitbutton text_end -.BeachHousePrinterText3 - text_far _BeachHousePrinterText3 + +.SummerBeachHousePrinterText3 + text_far _SummerBeachHousePrinterText3 text_end -.BeachHousePrinterText4 - text_far _BeachHousePrinterText4 + +.SummerBeachHousePrinterText4 + text_far _SummerBeachHousePrinterText4 text_end |