summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-03-04 18:29:32 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-03-04 18:29:32 -0500
commita82a7b5fcbb751f91db02d41e355b4b2a5bec8c9 (patch)
tree6aaef3387957ff6724395100f6a77e28081e62e4
parent4df660dc76b5f35d2a89e0cb627180b79e9caa12 (diff)
Lowercase new pokedude labels
-rw-r--r--data/event_scripts.s2
-rw-r--r--data/text/pokedude.inc (renamed from data/text/poke_dude.inc)40
-rw-r--r--include/strings.h40
-rw-r--r--src/battle_controller_pokedude.c68
4 files changed, 75 insertions, 75 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index ed293ba64..0940cf955 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1358,4 +1358,4 @@ Text_TestMsg:: @ 81ACD45
.include "data/scripts/test.inc"
.include "data/text/save.inc"
.include "data/text/new_game_intro.inc"
- .include "data/text/poke_dude.inc"
+ .include "data/text/pokedude.inc"
diff --git a/data/text/poke_dude.inc b/data/text/pokedude.inc
index 79d7493e0..a7cfd8e9f 100644
--- a/data/text/poke_dude.inc
+++ b/data/text/pokedude.inc
@@ -1,16 +1,16 @@
-PokeDude_Text_SpeedierBattlerGoesFirst::
+Pokedude_Text_SpeedierBattlerGoesFirst::
.string "POKé DUDE: The speedier of the\n"
.string "battlers gets to attack first.$"
-PokeDude_Text_MyRattataFasterThanPidgey::
+Pokedude_Text_MyRattataFasterThanPidgey::
.string "It looks like my RATTATA was\n"
.string "faster than the PIDGEY.$"
-PokeDude_Text_BattlersTakeTurnsAttacking::
+Pokedude_Text_BattlersTakeTurnsAttacking::
.string "The battlers take turns attacking\n"
.string "and reducing each other's HP.$"
-PokeDude_Text_MyRattataWonGetsEXP::
+Pokedude_Text_MyRattataWonGetsEXP::
.string "My RATTATA reduced the foe's HP\n"
.string "to zero, so it wins!\p"
.string "The POKéMON that took part in the\n"
@@ -20,26 +20,26 @@ PokeDude_Text_MyRattataWonGetsEXP::
.string "Leveling up makes your POKéMON\n"
.string "stronger than before.$"
-PokeDude_Text_UhOhRattataPoisoned::
+Pokedude_Text_UhOhRattataPoisoned::
.string "POKé DUDE: Uh-oh…\n"
.string "My RATTATA has been poisoned…\p"
.string "If a POKéMON is poisoned, it loses\n"
.string "HP steadily.$"
-PokeDude_Text_HealStatusRightAway::
+Pokedude_Text_HealStatusRightAway::
.string "If a POKéMON develops a status\n"
.string "problem, heal it right away.$"
-PokeDude_Text_UsingItemTakesTurn::
+Pokedude_Text_UsingItemTakesTurn::
.string "Using an item on a POKéMON uses\n"
.string "up one turn, though.\p"
.string "Now, it's the opponent's turn!$"
-PokeDude_Text_YayWeManagedToWin::
+Pokedude_Text_YayWeManagedToWin::
.string "Yay!\n"
.string "We managed to win!$"
-PokeDude_Text_WaterNotVeryEffectiveAgainstGrass::
+Pokedude_Text_WaterNotVeryEffectiveAgainstGrass::
.string "POKé DUDE: The move BUBBLE is\n"
.string "a WATER-type attack.\p"
.string "The targeted ODDISH is a\n"
@@ -50,7 +50,7 @@ PokeDude_Text_WaterNotVeryEffectiveAgainstGrass::
.string "very effective, and inflicts only\l"
.string "half the usual damage.$"
-PokeDude_Text_GrassEffectiveAgainstWater::
+Pokedude_Text_GrassEffectiveAgainstWater::
.string "Uh-oh, this is not good!\p"
.string "The ABSORB attack you just saw\n"
.string "is a GRASS-type move.\p"
@@ -58,17 +58,17 @@ PokeDude_Text_GrassEffectiveAgainstWater::
.string "So, ABSORB becomes super\n"
.string "effective, doubling the damage.$"
-PokeDude_Text_LetsTryShiftingMons::
+Pokedude_Text_LetsTryShiftingMons::
.string "It's not going to be easy to win\n"
.string "with this matchup…\p"
.string "Let's try shifting POKéMON!$"
-PokeDude_Text_ShiftingUsesTurn::
+Pokedude_Text_ShiftingUsesTurn::
.string "Shifting POKéMON in and out uses\n"
.string "up one turn.\p"
.string "Now, it's the opponent's turn.$"
-PokeDude_Text_ButterfreeDoubleResistsGrass::
+Pokedude_Text_ButterfreeDoubleResistsGrass::
.string "BUTTERFREE is a BUG/FLYING-type\n"
.string "POKéMON.\p"
.string "Against this POKéMON, a GRASS-\n"
@@ -81,7 +81,7 @@ PokeDude_Text_ButterfreeDoubleResistsGrass::
.string "BUG/FLYING POKéMON, only takes\l"
.string "one quarter of the usual damage.$"
-PokeDude_Text_ButterfreeGoodAgainstOddish::
+Pokedude_Text_ButterfreeGoodAgainstOddish::
.string "ODDISH is a GRASS/POISON-type\n"
.string "POKéMON.\p"
.string "A FLYING- or PSYCHIC-type attack\n"
@@ -90,18 +90,18 @@ PokeDude_Text_ButterfreeGoodAgainstOddish::
.string "inflict double the usual damage.\p"
.string "Okay, here we go!$"
-PokeDude_Text_YeahWeWon::
+Pokedude_Text_YeahWeWon::
.string "Yeah!\n"
.string "We won!$"
-PokeDude_Text_WeakenMonBeforeCatching::
+Pokedude_Text_WeakenMonBeforeCatching::
.string "POKé DUDE: When you're trying to\n"
.string "catch a POKéMON, don't throw any\l"
.string "POKé BALLS right away.\p"
.string "First, you need to weaken it by\n"
.string "reducing its HP.$"
-PokeDude_Text_BestIfTargetStatused::
+Pokedude_Text_BestIfTargetStatused::
.string "Okay, that should be good enough.\p"
.string "But, if it's possible, it would be\n"
.string "best if the target has a status\l"
@@ -110,7 +110,7 @@ PokeDude_Text_BestIfTargetStatused::
.string "to catch if it were asleep or\l"
.string "paralyzed.$"
-PokeDude_Text_CantDoubleUpOnStatus::
+Pokedude_Text_CantDoubleUpOnStatus::
.string "This will make the POKéMON a lot\n"
.string "easier to catch!\p"
.string "Oh, yes. If you paralyze a\n"
@@ -119,11 +119,11 @@ PokeDude_Text_CantDoubleUpOnStatus::
.string "In other words, you can't double\n"
.string "up status problems, okay?$"
-PokeDude_Text_LetMeThrowBall::
+Pokedude_Text_LetMeThrowBall::
.string "Okay!\n"
.string "Let me throw my POKé BALL!$"
-PokeDude_Text_PickBestKindOfBall::
+Pokedude_Text_PickBestKindOfBall::
.string "Before you throw a POKé BALL,\n"
.string "consider the condition and the\l"
.string "type of POKéMON, and pick the kind\l"
diff --git a/include/strings.h b/include/strings.h
index 70c2e64d2..bcb5031c1 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -244,26 +244,26 @@ extern const u8 gUnknown_83FDCD2[];
extern const u8 gUnknown_83FE6FA[];
// battle_controller_pokedude
-extern const u8 PokeDude_Text_SpeedierBattlerGoesFirst[];
-extern const u8 PokeDude_Text_MyRattataFasterThanPidgey[];
-extern const u8 PokeDude_Text_BattlersTakeTurnsAttacking[];
-extern const u8 PokeDude_Text_MyRattataWonGetsEXP[];
-extern const u8 PokeDude_Text_UhOhRattataPoisoned[];
-extern const u8 PokeDude_Text_HealStatusRightAway[];
-extern const u8 PokeDude_Text_UsingItemTakesTurn[];
-extern const u8 PokeDude_Text_YayWeManagedToWin[];
-extern const u8 PokeDude_Text_WaterNotVeryEffectiveAgainstGrass[];
-extern const u8 PokeDude_Text_GrassEffectiveAgainstWater[];
-extern const u8 PokeDude_Text_LetsTryShiftingMons[];
-extern const u8 PokeDude_Text_ShiftingUsesTurn[];
-extern const u8 PokeDude_Text_ButterfreeDoubleResistsGrass[];
-extern const u8 PokeDude_Text_ButterfreeGoodAgainstOddish[];
-extern const u8 PokeDude_Text_YeahWeWon[];
-extern const u8 PokeDude_Text_WeakenMonBeforeCatching[];
-extern const u8 PokeDude_Text_BestIfTargetStatused[];
-extern const u8 PokeDude_Text_CantDoubleUpOnStatus[];
-extern const u8 PokeDude_Text_LetMeThrowBall[];
-extern const u8 PokeDude_Text_PickBestKindOfBall[];
+extern const u8 Pokedude_Text_SpeedierBattlerGoesFirst[];
+extern const u8 Pokedude_Text_MyRattataFasterThanPidgey[];
+extern const u8 Pokedude_Text_BattlersTakeTurnsAttacking[];
+extern const u8 Pokedude_Text_MyRattataWonGetsEXP[];
+extern const u8 Pokedude_Text_UhOhRattataPoisoned[];
+extern const u8 Pokedude_Text_HealStatusRightAway[];
+extern const u8 Pokedude_Text_UsingItemTakesTurn[];
+extern const u8 Pokedude_Text_YayWeManagedToWin[];
+extern const u8 Pokedude_Text_WaterNotVeryEffectiveAgainstGrass[];
+extern const u8 Pokedude_Text_GrassEffectiveAgainstWater[];
+extern const u8 Pokedude_Text_LetsTryShiftingMons[];
+extern const u8 Pokedude_Text_ShiftingUsesTurn[];
+extern const u8 Pokedude_Text_ButterfreeDoubleResistsGrass[];
+extern const u8 Pokedude_Text_ButterfreeGoodAgainstOddish[];
+extern const u8 Pokedude_Text_YeahWeWon[];
+extern const u8 Pokedude_Text_WeakenMonBeforeCatching[];
+extern const u8 Pokedude_Text_BestIfTargetStatused[];
+extern const u8 Pokedude_Text_CantDoubleUpOnStatus[];
+extern const u8 Pokedude_Text_LetMeThrowBall[];
+extern const u8 Pokedude_Text_PickBestKindOfBall[];
// party_menu
extern const u8 gText_ChoosePokemon[];
diff --git a/src/battle_controller_pokedude.c b/src/battle_controller_pokedude.c
index 18f950b13..a6b3fe994 100644
--- a/src/battle_controller_pokedude.c
+++ b/src/battle_controller_pokedude.c
@@ -125,7 +125,7 @@ static void SetPokedudeMonData(u8 monId);
static void sub_8159478(u8 battlerId);
static void PokedudeDoMoveAnimation(void);
static void sub_81595EC(u8 taskId);
-static const u8 *GetPokeDudeText(void);
+static const u8 *GetPokedudeText(void);
u8 *gUnknown_3005EE0[MAX_BATTLERS_COUNT];
@@ -421,42 +421,42 @@ static const struct Unk_84790E8 *const gUnknown_8479198[] =
[TTVSCR_CATCHING] = gUnknown_8479168,
};
-static const u8 *const sPokeDudeTexts_Battle[] =
+static const u8 *const sPokedudeTexts_Battle[] =
{
- PokeDude_Text_SpeedierBattlerGoesFirst,
- PokeDude_Text_MyRattataFasterThanPidgey,
- PokeDude_Text_BattlersTakeTurnsAttacking,
- PokeDude_Text_MyRattataWonGetsEXP,
+ Pokedude_Text_SpeedierBattlerGoesFirst,
+ Pokedude_Text_MyRattataFasterThanPidgey,
+ Pokedude_Text_BattlersTakeTurnsAttacking,
+ Pokedude_Text_MyRattataWonGetsEXP,
};
-static const u8 *const sPokeDudeTexts_Status[] =
+static const u8 *const sPokedudeTexts_Status[] =
{
- PokeDude_Text_UhOhRattataPoisoned,
- PokeDude_Text_UhOhRattataPoisoned,
- PokeDude_Text_HealStatusRightAway,
- PokeDude_Text_UsingItemTakesTurn,
- PokeDude_Text_YayWeManagedToWin,
+ Pokedude_Text_UhOhRattataPoisoned,
+ Pokedude_Text_UhOhRattataPoisoned,
+ Pokedude_Text_HealStatusRightAway,
+ Pokedude_Text_UsingItemTakesTurn,
+ Pokedude_Text_YayWeManagedToWin,
};
-static const u8 *const sPokeDudeTexts_TypeMatchup[] =
+static const u8 *const sPokedudeTexts_TypeMatchup[] =
{
- PokeDude_Text_WaterNotVeryEffectiveAgainstGrass,
- PokeDude_Text_GrassEffectiveAgainstWater,
- PokeDude_Text_LetsTryShiftingMons,
- PokeDude_Text_ShiftingUsesTurn,
- PokeDude_Text_ButterfreeDoubleResistsGrass,
- PokeDude_Text_ButterfreeGoodAgainstOddish,
- PokeDude_Text_YeahWeWon,
+ Pokedude_Text_WaterNotVeryEffectiveAgainstGrass,
+ Pokedude_Text_GrassEffectiveAgainstWater,
+ Pokedude_Text_LetsTryShiftingMons,
+ Pokedude_Text_ShiftingUsesTurn,
+ Pokedude_Text_ButterfreeDoubleResistsGrass,
+ Pokedude_Text_ButterfreeGoodAgainstOddish,
+ Pokedude_Text_YeahWeWon,
};
-static const u8 *const sPokeDudeTexts_Catching[] =
+static const u8 *const sPokedudeTexts_Catching[] =
{
- PokeDude_Text_WeakenMonBeforeCatching,
- PokeDude_Text_WeakenMonBeforeCatching,
- PokeDude_Text_BestIfTargetStatused,
- PokeDude_Text_CantDoubleUpOnStatus,
- PokeDude_Text_LetMeThrowBall,
- PokeDude_Text_PickBestKindOfBall,
+ Pokedude_Text_WeakenMonBeforeCatching,
+ Pokedude_Text_WeakenMonBeforeCatching,
+ Pokedude_Text_BestIfTargetStatused,
+ Pokedude_Text_CantDoubleUpOnStatus,
+ Pokedude_Text_LetMeThrowBall,
+ Pokedude_Text_PickBestKindOfBall,
};
static const struct PokedudeBattlePartyInfo sParties_Battle[] =
@@ -2595,7 +2595,7 @@ static void sub_8159BA8(void)
break;
case 2:
gBattle_BG0_Y = 0;
- BattleStringExpandPlaceholdersToDisplayedString(GetPokeDudeText());
+ BattleStringExpandPlaceholdersToDisplayedString(GetPokedudeText());
BattlePutTextOnWindow(gDisplayedStringBattle, 24);
++gUnknown_3005EE0[gActiveBattler][2];
break;
@@ -2656,7 +2656,7 @@ static void sub_8159D04(void)
}
break;
case 3:
- BattleStringExpandPlaceholdersToDisplayedString(GetPokeDudeText());
+ BattleStringExpandPlaceholdersToDisplayedString(GetPokedudeText());
BattlePutTextOnWindow(gDisplayedStringBattle, 24);
++gUnknown_3005EE0[gActiveBattler][2];
break;
@@ -2696,19 +2696,19 @@ static void sub_8159D04(void)
}
}
-static const u8 *GetPokeDudeText(void)
+static const u8 *GetPokedudeText(void)
{
switch (gBattleStruct->field_96)
{
case TTVSCR_BATTLE:
default:
- return sPokeDudeTexts_Battle[gBattleStruct->field_97 - 1];
+ return sPokedudeTexts_Battle[gBattleStruct->field_97 - 1];
case TTVSCR_STATUS:
- return sPokeDudeTexts_Status[gBattleStruct->field_97 - 1];
+ return sPokedudeTexts_Status[gBattleStruct->field_97 - 1];
case TTVSCR_MATCHUPS:
- return sPokeDudeTexts_TypeMatchup[gBattleStruct->field_97 - 1];
+ return sPokedudeTexts_TypeMatchup[gBattleStruct->field_97 - 1];
case TTVSCR_CATCHING:
- return sPokeDudeTexts_Catching[gBattleStruct->field_97 - 1];
+ return sPokedudeTexts_Catching[gBattleStruct->field_97 - 1];
}
}