diff options
author | xCrystal <rgr.crystal@gmail.com> | 2019-07-20 14:08:50 +0200 |
---|---|---|
committer | xCrystal <rgr.crystal@gmail.com> | 2019-07-20 14:08:50 +0200 |
commit | c6b095eae729ed1a8cc19c28be746c43744d83d3 (patch) | |
tree | 8c7eb2f3f8f4e9699e388bc5833f38846178174c /src | |
parent | 87ddb7aaeb884e9f4d73aeeb66d747ccb6077bf3 (diff) |
A few more text labels
Diffstat (limited to 'src')
-rw-r--r-- | src/engine/bank01.asm | 25 | ||||
-rw-r--r-- | src/engine/home.asm | 1 | ||||
-rw-r--r-- | src/text/text1.asm | 8 | ||||
-rw-r--r-- | src/text/text_offsets.asm | 8 |
4 files changed, 21 insertions, 21 deletions
diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index df61f37..792b235 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -466,18 +466,17 @@ OpenNonTurnHolderDiscardPileScreen: ; 4339 (1:4339) OpenTurnHolderDiscardPileScreen: ; 4342 (1:4342) jp OpenDiscardPileScreen -; draw the non-turn holder's hand screen. -; simpler version of OpenPlayerHandScreen where any selected card is directly submitted -; and the duelist could also be the opponent. +; draw the non-turn holder's hand screen. simpler version of OpenPlayerHandScreen +; used only for checking the cards rather than for playing them. OpenNonTurnHolderHandScreen_Simple: ; 4345 (1:4345) call SwapTurn call OpenTurnHolderHandScreen_Simple jp SwapTurn ; 0x434e -; draw the turn holder's hand screen. -; simpler version of OpenPlayerHandScreen where any selected card is directly submitted -; and the duelist could also be the opponent. +; draw the turn holder's hand screen. simpler version of OpenPlayerHandScreen +; used only for checking the cards rather than for playing them. +; used for example in the "Your Play Area" screen of the Check menu OpenTurnHolderHandScreen_Simple: ; 434e (1:434e) call CreateHandCardList jr c, .no_cards_in_hand @@ -2213,19 +2212,19 @@ Func_4e6e: ; 4e6e (1:4e6e) ld b, $52 ld c, $57 .asm_4e7c - ld hl, $63 - ld de, $67 + ldtx hl, ShufflesTheDeckText + ldtx de, Drew7CardsText jr Func_4e98 Func_4e84: ; 4e84 (1:4e84) ld b, $53 ld c, $55 - ld hl, $65 - ld de, $66 + ldtx hl, EachPlayerShuffleOpponentsDeckText + ldtx de, EachPlayerDraw7CardsText ld a, [wDuelType] cp DUELTYPE_PRACTICE jr nz, Func_4e98 - ld hl, $64 + ldtx hl, ThisIsJustPracticeDoNotShuffleText ; fallthrough Func_4e98: ; 4e98 (1:4e98) @@ -2243,10 +2242,10 @@ Func_4e98: ; 4e98 (1:4e98) call EnableLCD ld a, [wDuelType] cp DUELTYPE_PRACTICE - jr nz, .asm_4ebf + jr nz, .not_practice call WaitForWideTextBoxInput jr .asm_4ee0 -.asm_4ebf +.not_practice call Func_3b21 ld hl, sp+$03 ld a, [hl] diff --git a/src/engine/home.asm b/src/engine/home.asm index c4507ef..84cabdd 100644 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -858,6 +858,7 @@ CallIndirect: ; 05b6 (0:05b6) ld h, a pop af ; fallthrough + CallHL: ; 05c1 (0:05c1) jp hl ; 0x5c2 diff --git a/src/text/text1.asm b/src/text/text1.asm index 8245b3b..e7b0fe4 100644 --- a/src/text/text1.asm +++ b/src/text/text1.asm @@ -434,21 +434,21 @@ ShufflesTheDeckText: ; 36afe (d:6afe) text "<RAMNAME> shuffles the Deck." done -Text0064: ; 36b14 (d:6b14) +ThisIsJustPracticeDoNotShuffleText: ; 36b14 (d:6b14) text "Since this is just practice," line "Do not shuffle the Deck." done -Text0065: ; 36b4b (d:6b4b) +EachPlayerShuffleOpponentsDeckText: ; 36b4b (d:6b4b) text "Each player will" line "shuffle the opponent's Deck." done -Text0066: ; 36b7a (d:6b7a) +EachPlayerDraw7CardsText: ; 36b7a (d:6b7a) text "Each player will draw 7 cards." done -Text0067: ; 36b9a (d:6b9a) +Drew7CardsText: ; 36b9a (d:6b9a) text "<RAMNAME>" line "drew 7 cards." done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index 2f56aaa..df61804 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -101,10 +101,10 @@ TextOffsets:: ; 34000 (d:4000) textpointer PlacedOnTheBenchText ; 0x0061 textpointer PlacedInTheArenaText ; 0x0062 textpointer ShufflesTheDeckText ; 0x0063 - textpointer Text0064 ; 0x0064 - textpointer Text0065 ; 0x0065 - textpointer Text0066 ; 0x0066 - textpointer Text0067 ; 0x0067 + textpointer ThisIsJustPracticeDoNotShuffleText ; 0x0064 + textpointer EachPlayerShuffleOpponentsDeckText ; 0x0065 + textpointer EachPlayerDraw7CardsText ; 0x0066 + textpointer Drew7CardsText ; 0x0067 textpointer DeckHasXCardsText ; 0x0068 textpointer ChooseBasicPkmnToPlaceInArenaText ; 0x0069 textpointer ThereAreNoBasicPokemonInHand ; 0x006a |