dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address review comments

Browse Source
This commit is contained in:
PikalaxALT
2019-11-10 20:15:41 -05:00
parent fa91b511b9
commit 451310c0c8
4 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/learn_move.s
-7
View File
@@ -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
data/strings.s
+1 -1
View File
@@ -4570,7 +4570,7 @@ gText_GiveUpTryingToTeachNewMove:: @ 841E4E2
.string "Give up trying to teach a new\n" .string "Give up trying to teach a new\n"
.string "move to {STR_VAR_1}?$" .string "move to {STR_VAR_1}?$"
WhichMoveShouldBeForgotten:: @ 841E50C gText_WhichMoveShouldBeForgotten:: @ 841E50C
.string "Which move should be forgotten?\p" .string "Which move should be forgotten?\p"
.string "$" .string "$"
include/strings.h
+1 -1
View File
@@ -731,7 +731,7 @@ extern const u8 gText_MonIsTryingToLearnMove[];
extern const u8 gText_StopLearningMove[]; extern const u8 gText_StopLearningMove[];
extern const u8 gText_1_2_and_Poof[]; extern const u8 gText_1_2_and_Poof[];
extern const u8 gText_MonForgotOldMoveAndMonLearnedNewMove[]; extern const u8 gText_MonForgotOldMoveAndMonLearnedNewMove[];
extern const u8 WhichMoveShouldBeForgotten[]; extern const u8 gText_WhichMoveShouldBeForgotten[];
extern const u8 gText_TeachMoveQues[]; extern const u8 gText_TeachMoveQues[];
extern const u8 gText_GiveUpTryingToTeachNewMove[]; extern const u8 gText_GiveUpTryingToTeachNewMove[];
src/learn_move.c
+3 -3
View File
@@ -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 sLearnMoveInterfaceSpritesPalette[] = INCBIN_U16("graphics/learn_move/interface_sprites.gbapal");
static const u16 sLearnMoveInterfaceSpritesTiles[] = INCBIN_U16("graphics/learn_move/interface_sprites.4bpp"); 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}, { 0, 0, 19, 13},
{20, 0, 29, 13}, {20, 0, 29, 13},
@@ -96,7 +96,7 @@ static const u8 sJPText_PP[] = _("PP/");
static const u8 sJPText_Iryoku[] = _("いりょく/"); static const u8 sJPText_Iryoku[] = _("いりょく/");
static const u8 sJPText_Meichuu[] = _("めいちゅう/"); static const u8 sJPText_Meichuu[] = _("めいちゅう/");
static const struct MoveTutorMoveInfoHeaders gMoveTutorMoveInfoHeaders[][5] = static const struct MoveTutorMoveInfoHeaders sMoveTutorMoveInfoHeaders[][5] =
{ {
{ {
{sJPText_TatakauWaza, 7, 1, 0}, {sJPText_TatakauWaza, 7, 1, 0},
@@ -469,7 +469,7 @@ static void MoveRelearnerStateMachine(void)
switch (YesNoMenuProcessInput()) switch (YesNoMenuProcessInput())
{ {
case 0: case 0:
StringExpandPlaceholdersAndPrintTextOnWindow7Color2(WhichMoveShouldBeForgotten); StringExpandPlaceholdersAndPrintTextOnWindow7Color2(gText_WhichMoveShouldBeForgotten);
sMoveRelearner->state = 19; sMoveRelearner->state = 19;
break; break;
case 1: case 1: