diff options
| author | dannye <33dannye@gmail.com> | 2023-04-25 19:52:12 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-04-25 19:52:12 -0500 |
| commit | 667f1febbe59355b1ffea68619e5e5486fd3c408 (patch) | |
| tree | 9a3ca97fea7cb54d1db9c23ac8c2a405a13f6f5c /engine/movie | |
| parent | Fix trainer parties' comments (#104) (diff) | |
| parent | Update `EndBug` to v9. (diff) | |
| download | pokeyellow-667f1febbe59355b1ffea68619e5e5486fd3c408.tar.gz pokeyellow-667f1febbe59355b1ffea68619e5e5486fd3c408.tar.xz pokeyellow-667f1febbe59355b1ffea68619e5e5486fd3c408.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/movie')
| -rw-r--r-- | engine/movie/oak_speech/oak_speech.asm | 10 | ||||
| -rw-r--r-- | engine/movie/title.asm | 23 |
2 files changed, 20 insertions, 13 deletions
diff --git a/engine/movie/oak_speech/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm index 2ed61fda..3c6b8b45 100644 --- a/engine/movie/oak_speech/oak_speech.asm +++ b/engine/movie/oak_speech/oak_speech.asm @@ -1,4 +1,4 @@ -SetDefaultNames: +PrepareOakSpeech: ld a, [wLetterPrintingDelayFlags] push af ld a, [wOptions] @@ -30,11 +30,13 @@ SetDefaultNames: ld a, [wOptionsInitialized] and a call z, InitOptions - ld hl, NintenText + ; These debug names are used for StartNewGameDebug. + ; TestBattle uses the debug names from DebugMenu. + ld hl, DebugNewGamePlayerName ld de, wPlayerName ld bc, NAME_LENGTH call CopyData - ld hl, SonyText + ld hl, DebugNewGameRivalName ld de, wRivalName ld bc, NAME_LENGTH call CopyData ; rip optimizations @@ -48,7 +50,7 @@ OakSpeech: call PlayMusic call ClearScreen call LoadTextBoxTilePatterns - call SetDefaultNames + call PrepareOakSpeech predef InitPlayerData2 ld hl, wNumBoxItems ld a, POTION diff --git a/engine/movie/title.asm b/engine/movie/title.asm index c84b1f23..3d054138 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -1,10 +1,13 @@ -SetDefaultNamesBeforeTitlescreen:: - ld hl, NintenText +PrepareTitleScreen:: + ; These debug names are already copied later in PrepareOakSpeech. + ; Removing the unused copies below has no apparent impact. + ; CopyDebugName can also be safely deleted afterwards. + ld hl, DebugNewGamePlayerName ld de, wPlayerName - call CopyFixedLengthText - ld hl, SonyText + call CopyDebugName + ld hl, DebugNewGameRivalName ld de, wRivalName - call CopyFixedLengthText + call CopyDebugName xor a ldh [hWY], a ld [wLetterPrintingDelayFlags], a @@ -344,13 +347,15 @@ DoTitleScreenFunction: ld [wTitleScreenScene], a ret -; copy text of fixed length NAME_LENGTH (like player name, rival name, mon names, ...) -CopyFixedLengthText: +CopyDebugName: ld bc, NAME_LENGTH jp CopyData -NintenText: db "NINTEN@" -SonyText: db "SONY@" +DebugNewGamePlayerName: + db "NINTEN@" + +DebugNewGameRivalName: + db "SONY@" IncrementResetCounter: ld hl, wTitleScreenScene + 2 |