diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-20 11:08:30 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-20 11:08:30 -0500 |
| commit | e7cb5476c4fb4e2583bb8ca03a290cb838ad9bbc (patch) | |
| tree | fdaf5ff39fae35770193f3e936deb2ca36377ffd /data | |
| parent | 539ec639fddd248a7f1a36d7e46d89ba68684364 (diff) | |
Port evolution_scene
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_message.s | 10 | ||||
| -rw-r--r-- | data/evolution_scene.s | 33 | ||||
| -rw-r--r-- | data/strings.s | 2 |
3 files changed, 6 insertions, 39 deletions
diff --git a/data/battle_message.s b/data/battle_message.s index e6ec14116..4f7576103 100644 --- a/data/battle_message.s +++ b/data/battle_message.s @@ -1797,7 +1797,7 @@ gUnknown_83FDDEB:: @ 83FDDEB .string "$" .align 2 -gUnknown_83FDF3C:: @ 83FDF3C +gBattleStringsTable:: @ 83FDF3C .4byte gUnknown_83FB219 .4byte gUnknown_83FB265 .4byte gUnknown_83FB28E @@ -2448,21 +2448,21 @@ gTrappingMoves:: @ 83FE664 .2byte MOVE_SAND_TOMB .2byte 0xFFFF -gUnknown_83FE672:: @ 83FE672 +gText_PkmnIsEvolving:: @ 83FE672 .string "What?\n" .string "{STR_VAR_1} is evolving!$" -gUnknown_83FE688:: @ 83FE688 +gText_CongratsPkmnEvolved:: @ 83FE688 .string "Congratulations! Your {STR_VAR_1}\n" .string "evolved into {STR_VAR_2}!{WAIT_SE}\p" .string "$" -gUnknown_83FE6B5:: @ 83FE6B5 +gText_PkmnStoppedEvolving:: @ 83FE6B5 .string "Huh? {STR_VAR_1}\n" .string "stopped evolving!\p" .string "$" -gUnknown_83FE6D0:: @ 83FE6D0 +gText_EllipsisQuestionMark:: @ 83FE6D0 .string "……?\p" .string "$" diff --git a/data/evolution_scene.s b/data/evolution_scene.s deleted file mode 100644 index 0bba4c18c..000000000 --- a/data/evolution_scene.s +++ /dev/null @@ -1,33 +0,0 @@ -#include "constants/species.h" -#include "constants/items.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2 - -gUnknown_83F6C90:: @ 83F6C90 - .incbin "baserom.gba", 0x3F6C90, 0x20 - -gUnknown_83F6CB0:: @ 83F6CB0 - .incbin "baserom.gba", 0x3F6CB0, 0x6F8 - -gUnknown_83F73A8:: @ 83F73A8 - .incbin "baserom.gba", 0x3F73A8, 0x4E4 - -gUnknown_83F788C:: @ 83F788C - .incbin "baserom.gba", 0x3F788C, 0x4D4 - -gUnknown_83F7D60:: @ 83F7D60 - .incbin "baserom.gba", 0x3F7D60, 0x6A0 - -gUnknown_83F8400:: @ 83F8400 - .incbin "baserom.gba", 0x3F8400, 0x40 - -gUnknown_83F8440:: @ 83F8440 - .incbin "baserom.gba", 0x3F8440, 0x2D - -gUnknown_83F846D:: @ 83F846D - .incbin "baserom.gba", 0x3F846D, 0x10 - -gUnknown_83F847D:: @ 83F847D - .incbin "baserom.gba", 0x3F847D, 0x323 diff --git a/data/strings.s b/data/strings.s index 101946475..f39060846 100644 --- a/data/strings.s +++ b/data/strings.s @@ -4517,7 +4517,7 @@ gUnknown_841E2F5:: @ 841E2F5 gUnknown_841E322:: @ 841E322 .string "{ID}$" -gUnknown_841E325:: @ 841E325 +gText_CommunicationStandby5:: @ 841E325 .string "Communication standby…$" gDaycareText_GetAlongVeryWell:: @ 841E33C |