diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_anim_effects_3.s | 2 | ||||
| -rw-r--r-- | data/learn_move.s | 28 | ||||
| -rw-r--r-- | data/strings.s | 18 |
3 files changed, 10 insertions, 38 deletions
diff --git a/data/battle_anim_effects_3.s b/data/battle_anim_effects_3.s index 23dd1e1fd..58fb29794 100644 --- a/data/battle_anim_effects_3.s +++ b/data/battle_anim_effects_3.s @@ -67,4 +67,4 @@ gUnknown_83FF65C:: @ 83FF65C .incbin "baserom.gba", 0x3FF65C, 0x14C gUnknown_83FF7A8:: @ 83FF7A8 - .incbin "baserom.gba", 0x3FF7A8, 0x24C + .incbin "baserom.gba", 0x3FF7A8, 0x30 diff --git a/data/learn_move.s b/data/learn_move.s deleted file mode 100644 index ff3f2e3d1..000000000 --- a/data/learn_move.s +++ /dev/null @@ -1,28 +0,0 @@ -#include "constants/region_map.h" -#include "constants/flags.h" -#include "constants/moves.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2 - -gUnknown_83FF9F4:: @ 83FF9F4 - .incbin "baserom.gba", 0x3FF9F4, 0x8 - -gUnknown_83FF9FC:: @ 83FF9FC - .incbin "baserom.gba", 0x3FF9FC, 0x28 - -gUnknown_83FFA24:: @ 83FFA24 - .incbin "baserom.gba", 0x3FFA24, 0x18 - -gUnknown_83FFA3C:: @ 83FFA3C - .incbin "baserom.gba", 0x3FFA3C, 0x8 - -gUnknown_83FFA44:: @ 83FFA44 - .incbin "baserom.gba", 0x3FFA44, 0x48 - -gUnknown_83FFA8C:: @ 83FFA8C - .incbin "baserom.gba", 0x3FFA8C, 0x8 - -gUnknown_83FFA94:: @ 83FFA94 - .incbin "baserom.gba", 0x3FFA94, 0x30 diff --git a/data/strings.s b/data/strings.s index 9b223df62..101946475 100644 --- a/data/strings.s +++ b/data/strings.s @@ -4535,17 +4535,17 @@ gDaycareText_PlayOther:: @ 841E3A8 .string "The two prefer to play with other\n" .string "POKéMON than each other.$" -gUnknown_841E3E3:: @ 841E3E3 +gText_TeachWhichMoveToMon:: @ 841E3E3 .string "Teach which move to {STR_VAR_1}?$" -gUnknown_841E3FB:: @ 841E3FB +gText_TeachMoveQues:: @ 841E3FB .string "Teach {STR_VAR_2}?$" -gUnknown_841E405:: @ 841E405 +gText_MonLearnedMove:: @ 841E405 .string "{STR_VAR_1} learned\n" .string "{STR_VAR_2}.$" -gUnknown_841E414:: @ 841E414 +gText_MonIsTryingToLearnMove:: @ 841E414 .string "{STR_VAR_1} is trying to learn\n" .string "{STR_VAR_2}.\p" .string "But {STR_VAR_1} can't learn more\n" @@ -4553,24 +4553,24 @@ gUnknown_841E414:: @ 841E414 .string "Delete an older move to make\n" .string "room for {STR_VAR_2}?$" -gUnknown_841E481:: @ 841E481 +gText_StopLearningMove:: @ 841E481 .string "Stop learning {STR_VAR_2}?$" -gUnknown_841E493:: @ 841E493 +gText_1_2_and_Poof:: @ 841E493 .string "{PAUSE 0x20}1, {PAUSE 0x0F}2, and {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}{PLAY_SE SE_KON}Poof!\p" .string "$" -gUnknown_841E4C0:: @ 841E4C0 +gText_MonForgotOldMoveAndMonLearnedNewMove:: @ 841E4C0 .string "{STR_VAR_1} forgot {STR_VAR_3}.\p" .string "And‥\p" .string "{STR_VAR_1}\n" .string "learned {STR_VAR_2}.$" -gUnknown_841E4E2:: @ 841E4E2 +gText_GiveUpTryingToTeachNewMove:: @ 841E4E2 .string "Give up trying to teach a new\n" .string "move to {STR_VAR_1}?$" -gUnknown_841E50C:: @ 841E50C +gText_WhichMoveShouldBeForgotten:: @ 841E50C .string "Which move should be forgotten?\p" .string "$" |