diff options
| -rw-r--r-- | data/learn_move.s | 7 | ||||
| -rw-r--r-- | data/strings.s | 2 | ||||
| -rw-r--r-- | include/strings.h | 2 | ||||
| -rw-r--r-- | src/learn_move.c | 6 |
4 files changed, 5 insertions, 12 deletions
diff --git a/data/learn_move.s b/data/learn_move.s deleted file mode 100644 index 7b0827b6c..000000000 --- a/data/learn_move.s +++ /dev/null @@ -1,7 +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 diff --git a/data/strings.s b/data/strings.s index b6060f97b..101946475 100644 --- a/data/strings.s +++ b/data/strings.s @@ -4570,7 +4570,7 @@ gText_GiveUpTryingToTeachNewMove:: @ 841E4E2 .string "Give up trying to teach a new\n" .string "move to {STR_VAR_1}?$" -WhichMoveShouldBeForgotten:: @ 841E50C +gText_WhichMoveShouldBeForgotten:: @ 841E50C .string "Which move should be forgotten?\p" .string "$" diff --git a/include/strings.h b/include/strings.h index 14722f7d3..f39f4f553 100644 --- a/include/strings.h +++ b/include/strings.h @@ -731,7 +731,7 @@ extern const u8 gText_MonIsTryingToLearnMove[]; extern const u8 gText_StopLearningMove[]; extern const u8 gText_1_2_and_Poof[]; extern const u8 gText_MonForgotOldMoveAndMonLearnedNewMove[]; -extern const u8 WhichMoveShouldBeForgotten[]; +extern const u8 gText_WhichMoveShouldBeForgotten[]; extern const u8 gText_TeachMoveQues[]; extern const u8 gText_GiveUpTryingToTeachNewMove[]; diff --git a/src/learn_move.c b/src/learn_move.c index 48ada8dd9..e22922528 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -83,7 +83,7 @@ static void PrintTextOnWindow(u8 windowId, const u8 *str, u8 x, u8 y, s32 speed, static const u16 sLearnMoveInterfaceSpritesPalette[] = INCBIN_U16("graphics/learn_move/interface_sprites.gbapal"); static const u16 sLearnMoveInterfaceSpritesTiles[] = INCBIN_U16("graphics/learn_move/interface_sprites.4bpp"); -static const u8 gMoveTutorMenuWindowFrameDimensions[][4] = +static const u8 sMoveTutorMenuWindowFrameDimensions[][4] = { { 0, 0, 19, 13}, {20, 0, 29, 13}, @@ -96,7 +96,7 @@ static const u8 sJPText_PP[] = _("PP/"); static const u8 sJPText_Iryoku[] = _("いりょく/"); static const u8 sJPText_Meichuu[] = _("めいちゅう/"); -static const struct MoveTutorMoveInfoHeaders gMoveTutorMoveInfoHeaders[][5] = +static const struct MoveTutorMoveInfoHeaders sMoveTutorMoveInfoHeaders[][5] = { { {sJPText_TatakauWaza, 7, 1, 0}, @@ -469,7 +469,7 @@ static void MoveRelearnerStateMachine(void) switch (YesNoMenuProcessInput()) { case 0: - StringExpandPlaceholdersAndPrintTextOnWindow7Color2(WhichMoveShouldBeForgotten); + StringExpandPlaceholdersAndPrintTextOnWindow7Color2(gText_WhichMoveShouldBeForgotten); sMoveRelearner->state = 19; break; case 1: |