From 1ed3fc928de36779fdfa7bf7c826bc9aeb225871 Mon Sep 17 00:00:00 2001 From: earthoul Date: Sat, 22 Nov 2025 12:59:30 +0900 Subject: [PATCH] Refactor prologue scene --- src/constants/scene_constants.asm | 6 ++++ src/engine/bank04.asm | 48 +++++++++++++++---------------- src/text/text4.asm | 26 ++++++++--------- src/text/text_offsets.asm | 26 ++++++++--------- 4 files changed, 56 insertions(+), 50 deletions(-) diff --git a/src/constants/scene_constants.asm b/src/constants/scene_constants.asm index 5833cc5..0f527dd 100644 --- a/src/constants/scene_constants.asm +++ b/src/constants/scene_constants.asm @@ -36,3 +36,9 @@ const SCENE_COIN_TOSS_RESULT_1 ; $22 const SCENE_COIN_TOSS_RESULT_2 ; $23 const SCENE_GBC_ONLY_DISCLAIMER ; $24 + +; prologue scenes + const_def + const PROLOGUE_PLAYER_RECAP ; 0 + const PROLOGUE_GR_INVASION ; 1 + const PROLOGUE_PLAYER_TO_LAB ; 2 diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm index e17554e..5d68591 100644 --- a/src/engine/bank04.asm +++ b/src/engine/bank04.asm @@ -7338,17 +7338,17 @@ ShowProloguePortraitAndText: ret .FunctionMap: - key_func $00, .Func_13bd8 - key_func $01, .Func_13bdf - key_func $02, .Func_13bd8 + key_func PROLOGUE_PLAYER_RECAP, .Player + key_func PROLOGUE_GR_INVASION, .GR + key_func PROLOGUE_PLAYER_TO_LAB, .Player db $ff ; end -.Func_13bd8: +.Player: lb bc, 7, 3 call DrawPlayerPortrait ret -.Func_13bdf: +.GR: ld a, GR_1_PIC lb bc, 7, 3 ld e, EMOTION_NORMAL @@ -7369,30 +7369,30 @@ ShowProloguePortraitAndText: ret .TextListPointers: - dw .text_list1 - dw .text_list2 - dw .text_list3 + dw .PlayerRecap + dw .GRInvasion + dw .PlayerToLab -.text_list1 - tx PrologueScene1Line1Text - tx PrologueScene1Line2Text - tx PrologueScene1Line3Text - tx PrologueScene1Line4Text - tx PrologueScene1Line5Text - tx PrologueScene1Line6Text - tx PrologueScene1Line7Text +.PlayerRecap + tx ProloguePlayerRecapLine1Text + tx ProloguePlayerRecapLine2Text + tx ProloguePlayerRecapLine3Text + tx ProloguePlayerRecapLine4Text + tx ProloguePlayerRecapLine5Text + tx ProloguePlayerRecapLine6Text + tx ProloguePlayerRecapLine7Text dw $ffff -.text_list2 - tx PrologueScene2Line1Text - tx PrologueScene2Line2Text - tx PrologueScene2Line3Text +.GRInvasion + tx PrologueGRInvasionLine1Text + tx PrologueGRInvasionLine2Text + tx PrologueGRInvasionLine3Text dw $ffff -.text_list3 - tx PrologueScene3Line1Text - tx PrologueScene3Line2Text - tx PrologueScene3Line3Text +.PlayerToLab + tx ProloguePlayerToLabLine1Text + tx ProloguePlayerToLabLine2Text + tx ProloguePlayerToLabLine3Text dw $ffff ; 0x13c22 diff --git a/src/text/text4.asm b/src/text/text4.asm index 212e6b4..85ecae1 100644 --- a/src/text/text4.asm +++ b/src/text/text4.asm @@ -2385,67 +2385,67 @@ MainMenuNewGameInsteadOfContinueDeletedText: textfw "すべてのデータをさくじょしました" done -PrologueScene1Line1Text: +ProloguePlayerRecapLine1Text: textfw "は ポケモンカードを" linefw "あつめるのが だいすきです" done -PrologueScene1Line2Text: +ProloguePlayerRecapLine2Text: textfw "は このしまにつたわる" linefw "伝説のポケモンカードを ゲットのため" done -PrologueScene1Line3Text: +ProloguePlayerRecapLine3Text: textfw "8にんの クラブマスターと" linefw "伝説のポケモンカードを まもる" done -PrologueScene1Line4Text: +ProloguePlayerRecapLine4Text: textfw "4にんの グランドマスターに" linefw "ちょうせんしたのでした・・・" done -PrologueScene1Line5Text: +ProloguePlayerRecapLine5Text: textfw "そして ついには!" linefw "グランドマスターを たおして" done -PrologueScene1Line6Text: +ProloguePlayerRecapLine6Text: textfw "4枚の 伝説のポケモンカードを" linefw "そのてに ゲットしたのです" done -PrologueScene1Line7Text: +ProloguePlayerRecapLine7Text: textfw "そんな ある日・・・" linefw "じけんは おこりました!" done -PrologueScene2Line1Text: +PrologueGRInvasionLine1Text: textfw "とつぜん" linefw "なぞのぐん団が おそってきたのです!" done -PrologueScene2Line2Text: +PrologueGRInvasionLine2Text: textfw "その名を 「GR団」!" linefw "「グレートロケット団」と いいました" done -PrologueScene2Line3Text: +PrologueGRInvasionLine3Text: textfw "「GR団」は クラブを こうげき!" linefw "カードを うばっていったのです!" done -PrologueScene3Line1Text: +ProloguePlayerToLabLine1Text: textfw "もっていたカードを GR団に" linefw "うばわれた は" done -PrologueScene3Line2Text: +ProloguePlayerToLabLine2Text: textfw "このことを しらせるため" linefw "ポケモンカードの 研究者である" done -PrologueScene3Line3Text: +ProloguePlayerToLabLine3Text: textfw "Dr.オーヤマのいる 研究所へ" linefw "むかったのでした・・・" done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index 582e184..8290079 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -1896,19 +1896,19 @@ TextOffsets:: textpointer MainMenuNewGameInsteadOfContinueWarning2Text ; 0x075f textpointer MainMenuNewGameInsteadOfContinueConfirmPromptText ; 0x0760 textpointer MainMenuNewGameInsteadOfContinueDeletedText ; 0x0761 - textpointer PrologueScene1Line1Text ; 0x0762 - textpointer PrologueScene1Line2Text ; 0x0763 - textpointer PrologueScene1Line3Text ; 0x0764 - textpointer PrologueScene1Line4Text ; 0x0765 - textpointer PrologueScene1Line5Text ; 0x0766 - textpointer PrologueScene1Line6Text ; 0x0767 - textpointer PrologueScene1Line7Text ; 0x0768 - textpointer PrologueScene2Line1Text ; 0x0769 - textpointer PrologueScene2Line2Text ; 0x076a - textpointer PrologueScene2Line3Text ; 0x076b - textpointer PrologueScene3Line1Text ; 0x076c - textpointer PrologueScene3Line2Text ; 0x076d - textpointer PrologueScene3Line3Text ; 0x076e + textpointer ProloguePlayerRecapLine1Text ; 0x0762 + textpointer ProloguePlayerRecapLine2Text ; 0x0763 + textpointer ProloguePlayerRecapLine3Text ; 0x0764 + textpointer ProloguePlayerRecapLine4Text ; 0x0765 + textpointer ProloguePlayerRecapLine5Text ; 0x0766 + textpointer ProloguePlayerRecapLine6Text ; 0x0767 + textpointer ProloguePlayerRecapLine7Text ; 0x0768 + textpointer PrologueGRInvasionLine1Text ; 0x0769 + textpointer PrologueGRInvasionLine2Text ; 0x076a + textpointer PrologueGRInvasionLine3Text ; 0x076b + textpointer ProloguePlayerToLabLine1Text ; 0x076c + textpointer ProloguePlayerToLabLine2Text ; 0x076d + textpointer ProloguePlayerToLabLine3Text ; 0x076e textpointer IntroductionText ; 0x076f textpointer ConfigTitleText_2 ; 0x0770 textpointer ConfigFrameColorText ; 0x0771