diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-12-29 10:56:56 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-29 10:56:56 -0600 |
| commit | 60a68b2611959035e4b49fcd758656c2c8d9b5e7 (patch) | |
| tree | f5e8244e25e82ad39d26570b5ec67b430880ab0a /src/text | |
| parent | 39a348c7844186be17b59dfcfae6b043ec2eb489 (diff) | |
| parent | 4b1a0a6f81d5b30c7c03893bcd7e6faf33bbb389 (diff) | |
Merge pull request #87 from ElectroDeoxys/effects
Finish up effect functions
Diffstat (limited to 'src/text')
| -rw-r--r-- | src/text/text2.asm | 4 | ||||
| -rw-r--r-- | src/text/text_offsets.asm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/text/text2.asm b/src/text/text2.asm index 43a8ba5..fc603ee 100644 --- a/src/text/text2.asm +++ b/src/text/text2.asm @@ -626,12 +626,12 @@ ChoosePokemonInYourAreaThenPokemonInYourOppText: ; 398e8 (e:58e8) line "a Pokémon in your opponent's." done -Text0169: ; 3992b (e:592b) +ChooseUpTo4FromDiscardPileText: ; 3992b (e:592b) text "Choose up to 4" line "from the Discard Pile." done -Text016a: ; 39952 (e:5952) +ChooseAPokemonToSwitchWithActivePokemonText: ; 39952 (e:5952) text "Choose a Pokémon to switch" line "with the Active Pokémon." done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index 23a7ddf..b793894 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -362,8 +362,8 @@ TextOffsets:: ; 34000 (d:4000) textpointer ChooseBasicPokemonToPlaceOnBenchText ; 0x0166 textpointer ChooseEvolutionCardAndPressAButtonToDevolveText ; 0x0167 textpointer ChoosePokemonInYourAreaThenPokemonInYourOppText ; 0x0168 - textpointer Text0169 ; 0x0169 - textpointer Text016a ; 0x016a + textpointer ChooseUpTo4FromDiscardPileText ; 0x0169 + textpointer ChooseAPokemonToSwitchWithActivePokemonText ; 0x016a textpointer PokemonAndAllAttachedCardsWereReturnedToDeckText ; 0x016b textpointer PokemonWasReturnedFromArenaToHandText ; 0x016c textpointer PokemonWasReturnedFromBenchToHandText ; 0x016d |