From b7c28c4be76f19d3515ede426ae874390523457f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 21 Feb 2020 15:00:56 -0500 Subject: Remove redundant include lines --- src/battle_controller_pokedude.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/battle_controller_pokedude.c') diff --git a/src/battle_controller_pokedude.c b/src/battle_controller_pokedude.c index d8ebe5ba4..8737a3866 100644 --- a/src/battle_controller_pokedude.c +++ b/src/battle_controller_pokedude.c @@ -11,7 +11,6 @@ #include "link.h" #include "sound.h" #include "event_data.h" -#include "item.h" #include "item_menu.h" #include "text.h" #include "strings.h" @@ -25,7 +24,6 @@ #include "reshow_battle_screen.h" #include "teachy_tv.h" #include "constants/songs.h" -#include "constants/items.h" #include "constants/moves.h" #include "constants/pokemon.h" #include "constants/trainers.h" -- cgit v1.2.3 From 63e0b54f969b19082ce92b2c3596250e53791ec0 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 2 Mar 2020 16:35:52 -0500 Subject: Label pokedude text --- src/battle_controller_pokedude.c | 108 +++++++++++++++++++-------------------- 1 file changed, 54 insertions(+), 54 deletions(-) (limited to 'src/battle_controller_pokedude.c') 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]; } } -- cgit v1.2.3 From a82a7b5fcbb751f91db02d41e355b4b2a5bec8c9 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 4 Mar 2020 18:29:32 -0500 Subject: Lowercase new pokedude labels --- src/battle_controller_pokedude.c | 68 ++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'src/battle_controller_pokedude.c') 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]; } } -- cgit v1.2.3