diff options
| -rw-r--r-- | data/text/poke_dude.inc | 65 | ||||
| -rw-r--r-- | include/strings.h | 40 | ||||
| -rw-r--r-- | src/battle_controller_pokedude.c | 108 |
3 files changed, 94 insertions, 119 deletions
diff --git a/data/text/poke_dude.inc b/data/text/poke_dude.inc index fc1273056..79d7493e0 100644 --- a/data/text/poke_dude.inc +++ b/data/text/poke_dude.inc @@ -1,154 +1,129 @@ -gUnknown_81C5F69:: +PokeDude_Text_SpeedierBattlerGoesFirst:: .string "POKé DUDE: The speedier of the\n" .string "battlers gets to attack first.$" -gUnknown_81C5FA7:: +PokeDude_Text_MyRattataFasterThanPidgey:: .string "It looks like my RATTATA was\n" .string "faster than the PIDGEY.$" -gUnknown_81C5FDC:: +PokeDude_Text_BattlersTakeTurnsAttacking:: .string "The battlers take turns attacking\n" .string "and reducing each other's HP.$" -gUnknown_81C601C:: +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" .string "battle get EXP. Points.\p" - .string "When a POKéMON collects enough\n" .string "EXP. Points, it levels up.\p" - .string "Leveling up makes your POKéMON\n" .string "stronger than before.$" -gUnknown_81C60FA:: +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.$" -gUnknown_81C615A:: +PokeDude_Text_HealStatusRightAway:: .string "If a POKéMON develops a status\n" .string "problem, heal it right away.$" -gUnknown_81C6196:: +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!$" -gUnknown_81C61EA:: +PokeDude_Text_YayWeManagedToWin:: .string "Yay!\n" .string "We managed to win!$" -gUnknown_81C6202:: +PokeDude_Text_WaterNotVeryEffectiveAgainstGrass:: .string "POKé DUDE: The move BUBBLE is\n" .string "a WATER-type attack.\p" - .string "The targeted ODDISH is a\n" .string "GRASS/POISON-type POKéMON.\p" - .string "The WATER-type attack is absorbed\n" .string "by the GRASS-type POKéMON…\p" - .string "As a result, the move becomes not\n" .string "very effective, and inflicts only\l" .string "half the usual damage.$" -gUnknown_81C6301:: +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" - .string "POLIWAG is a WATER-type POKéMON.\p" - .string "So, ABSORB becomes super\n" .string "effective, doubling the damage.$" -gUnknown_81C63A9:: +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!$" -gUnknown_81C63F9:: +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.$" -gUnknown_81C6446:: +PokeDude_Text_ButterfreeDoubleResistsGrass:: .string "BUTTERFREE is a BUG/FLYING-type\n" .string "POKéMON.\p" - .string "Against this POKéMON, a GRASS-\n" .string "type attack…\p" - .string "…inflicts only half the usual\n" .string "damage on a BUG-type POKéMON…\p" - .string "…And, it also causes only half the\n" .string "damage on a FLYING-type POKéMON.\p" - .string "Therefore, BUTTERFREE, being a\n" .string "BUG/FLYING POKéMON, only takes\l" .string "one quarter of the usual damage.$" -gUnknown_81C657A:: +PokeDude_Text_ButterfreeGoodAgainstOddish:: .string "ODDISH is a GRASS/POISON-type\n" .string "POKéMON.\p" - .string "A FLYING- or PSYCHIC-type attack\n" .string "is super effective against it.\p" - .string "One of those types of attacks will\n" .string "inflict double the usual damage.\p" - .string "Okay, here we go!$" -gUnknown_81C6637:: +PokeDude_Text_YeahWeWon:: .string "Yeah!\n" .string "We won!$" -gUnknown_81C6645:: +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.$" -gUnknown_81C66CF:: +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" .string "problem.\p" - .string "For instance, it would be easier\n" .string "to catch if it were asleep or\l" .string "paralyzed.$" -gUnknown_81C6787:: +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" .string "POKéMON, you can't make it fall\l" .string "asleep on top of paralysis.\p" - .string "In other words, you can't double\n" .string "up status problems, okay?$" -gUnknown_81C684B:: +PokeDude_Text_LetMeThrowBall:: .string "Okay!\n" .string "Let me throw my POKé BALL!$" -gUnknown_81C686C:: +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 ec5965b75..70c2e64d2 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 gUnknown_81C5F69[]; -extern const u8 gUnknown_81C5FA7[]; -extern const u8 gUnknown_81C5FDC[]; -extern const u8 gUnknown_81C601C[]; -extern const u8 gUnknown_81C60FA[]; -extern const u8 gUnknown_81C615A[]; -extern const u8 gUnknown_81C6196[]; -extern const u8 gUnknown_81C61EA[]; -extern const u8 gUnknown_81C6202[]; -extern const u8 gUnknown_81C6301[]; -extern const u8 gUnknown_81C63A9[]; -extern const u8 gUnknown_81C63F9[]; -extern const u8 gUnknown_81C6446[]; -extern const u8 gUnknown_81C657A[]; -extern const u8 gUnknown_81C6637[]; -extern const u8 gUnknown_81C6645[]; -extern const u8 gUnknown_81C66CF[]; -extern const u8 gUnknown_81C6787[]; -extern const u8 gUnknown_81C684B[]; -extern const u8 gUnknown_81C686C[]; +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 8737a3866..18f950b13 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 *sub_8159EF0(void); +static const u8 *GetPokeDudeText(void); u8 *gUnknown_3005EE0[MAX_BATTLERS_COUNT]; @@ -222,10 +222,10 @@ static const u8 gUnknown_8479048[][8] = static const u8 (*const gUnknown_8479060[])[8] = { - gUnknown_8479008, - gUnknown_8479018, - gUnknown_8479030, - gUnknown_8479048, + [TTVSCR_BATTLE] = gUnknown_8479008, + [TTVSCR_STATUS] = gUnknown_8479018, + [TTVSCR_MATCHUPS] = gUnknown_8479030, + [TTVSCR_CATCHING] = gUnknown_8479048, }; static const u8 gUnknown_8479070[][8] = @@ -259,10 +259,10 @@ static const u8 gUnknown_84790C0[][8] = static const u8 (*const gUnknown_84790D8[])[8] = { - gUnknown_8479070, - gUnknown_8479080, - gUnknown_84790A0, - gUnknown_84790C0, + [TTVSCR_BATTLE] = gUnknown_8479070, + [TTVSCR_STATUS] = gUnknown_8479080, + [TTVSCR_MATCHUPS] = gUnknown_84790A0, + [TTVSCR_CATCHING] = gUnknown_84790C0, }; static const struct Unk_84790E8 gUnknown_84790E8[] = @@ -415,48 +415,48 @@ static const struct Unk_84790E8 gUnknown_8479168[] = static const struct Unk_84790E8 *const gUnknown_8479198[] = { - gUnknown_84790E8, - gUnknown_8479108, - gUnknown_8479130, - gUnknown_8479168, + [TTVSCR_BATTLE] = gUnknown_84790E8, + [TTVSCR_STATUS] = gUnknown_8479108, + [TTVSCR_MATCHUPS] = gUnknown_8479130, + [TTVSCR_CATCHING] = gUnknown_8479168, }; -static const u8 *const gUnknown_84791A8[] = +static const u8 *const sPokeDudeTexts_Battle[] = { - gUnknown_81C5F69, - gUnknown_81C5FA7, - gUnknown_81C5FDC, - gUnknown_81C601C, + PokeDude_Text_SpeedierBattlerGoesFirst, + PokeDude_Text_MyRattataFasterThanPidgey, + PokeDude_Text_BattlersTakeTurnsAttacking, + PokeDude_Text_MyRattataWonGetsEXP, }; -static const u8 *const gUnknown_84791B8[] = +static const u8 *const sPokeDudeTexts_Status[] = { - gUnknown_81C60FA, - gUnknown_81C60FA, - gUnknown_81C615A, - gUnknown_81C6196, - gUnknown_81C61EA, + PokeDude_Text_UhOhRattataPoisoned, + PokeDude_Text_UhOhRattataPoisoned, + PokeDude_Text_HealStatusRightAway, + PokeDude_Text_UsingItemTakesTurn, + PokeDude_Text_YayWeManagedToWin, }; -static const u8 *const gUnknown_84791CC[] = +static const u8 *const sPokeDudeTexts_TypeMatchup[] = { - gUnknown_81C6202, - gUnknown_81C6301, - gUnknown_81C63A9, - gUnknown_81C63F9, - gUnknown_81C6446, - gUnknown_81C657A, - gUnknown_81C6637, + 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 gUnknown_84791E8[] = +static const u8 *const sPokeDudeTexts_Catching[] = { - gUnknown_81C6645, - gUnknown_81C6645, - gUnknown_81C66CF, - gUnknown_81C6787, - gUnknown_81C684B, - gUnknown_81C686C, + PokeDude_Text_WeakenMonBeforeCatching, + PokeDude_Text_WeakenMonBeforeCatching, + PokeDude_Text_BestIfTargetStatused, + PokeDude_Text_CantDoubleUpOnStatus, + PokeDude_Text_LetMeThrowBall, + PokeDude_Text_PickBestKindOfBall, }; static const struct PokedudeBattlePartyInfo sParties_Battle[] = @@ -554,10 +554,10 @@ static const struct PokedudeBattlePartyInfo sParties_Catching[] = static const struct PokedudeBattlePartyInfo *const sPokedudeBattlePartyPointers[] = { - sParties_Battle, - sParties_Status, - sParties_Matchups, - sParties_Catching, + [TTVSCR_BATTLE] = sParties_Battle, + [TTVSCR_STATUS] = sParties_Status, + [TTVSCR_MATCHUPS] = sParties_Matchups, + [TTVSCR_CATCHING] = sParties_Catching, }; static void nullsub_99(void) @@ -2595,7 +2595,7 @@ static void sub_8159BA8(void) break; case 2: gBattle_BG0_Y = 0; - BattleStringExpandPlaceholdersToDisplayedString(sub_8159EF0()); + BattleStringExpandPlaceholdersToDisplayedString(GetPokeDudeText()); BattlePutTextOnWindow(gDisplayedStringBattle, 24); ++gUnknown_3005EE0[gActiveBattler][2]; break; @@ -2656,7 +2656,7 @@ static void sub_8159D04(void) } break; case 3: - BattleStringExpandPlaceholdersToDisplayedString(sub_8159EF0()); + BattleStringExpandPlaceholdersToDisplayedString(GetPokeDudeText()); BattlePutTextOnWindow(gDisplayedStringBattle, 24); ++gUnknown_3005EE0[gActiveBattler][2]; break; @@ -2696,19 +2696,19 @@ static void sub_8159D04(void) } } -static const u8 *sub_8159EF0(void) +static const u8 *GetPokeDudeText(void) { switch (gBattleStruct->field_96) { - case 0: + case TTVSCR_BATTLE: default: - return gUnknown_84791A8[gBattleStruct->field_97 - 1]; - case 1: - return gUnknown_84791B8[gBattleStruct->field_97 - 1]; - case 2: - return gUnknown_84791CC[gBattleStruct->field_97 - 1]; - case 3: - return gUnknown_84791E8[gBattleStruct->field_97 - 1]; + return sPokeDudeTexts_Battle[gBattleStruct->field_97 - 1]; + case TTVSCR_STATUS: + return sPokeDudeTexts_Status[gBattleStruct->field_97 - 1]; + case TTVSCR_MATCHUPS: + return sPokeDudeTexts_TypeMatchup[gBattleStruct->field_97 - 1]; + case TTVSCR_CATCHING: + return sPokeDudeTexts_Catching[gBattleStruct->field_97 - 1]; } } |