diff options
| author | dannye <33dannye@gmail.com> | 2020-05-09 17:55:08 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-09 17:55:08 -0500 |
| commit | ff2d704ab42fdabb33a222a497d15ddb84bd314f (patch) | |
| tree | 72a8e6feeb6551cf13ba99ff3aa1710fd8e3674c /src/text | |
| parent | e4f2842b0e3e6ecc51ef109f895a1f6f79c3956b (diff) | |
| parent | 6c74edb245a25feaf202f9ee101774be9155bf48 (diff) | |
Merge branch 'master' of https://github.com/pret/poketcg
Diffstat (limited to 'src/text')
| -rw-r--r-- | src/text/text1.asm | 2 | ||||
| -rw-r--r-- | src/text/text_offsets.asm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/text/text1.asm b/src/text/text1.asm index 69f44f6..07d7a7a 100644 --- a/src/text/text1.asm +++ b/src/text/text1.asm @@ -1103,7 +1103,7 @@ Text00ea: ; 37e03 (d:7e03) line "Heads, damage to yours if Tails." done -Text00eb: ; 37e46 (d:7e46) +IfHeadsChangeOpponentsActivePokemonText: ; 37e46 (d:7e46) text "If Heads, change opponent's" line "Active Pokémon." done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index 493ed1d..2f29a11 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -236,7 +236,7 @@ TextOffsets:: ; 34000 (d:40 textpointer Text00e8 ; 0x00e8 textpointer IfHeadPlus10IfTails10ToYourselfText ; 0x00e9 textpointer Text00ea ; 0x00ea - textpointer Text00eb ; 0x00eb + textpointer IfHeadsChangeOpponentsActivePokemonText ; 0x00eb textpointer Text00ec ; 0x00ec textpointer Text00ed ; 0x00ed textpointer Text00ee ; 0x00ee |