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

Merge branch 'master' of github.com:pret/pokefirered into dodrio_berry_picking

Browse Source
This commit is contained in:
PikalaxALT
2020-03-05 14:38:26 -05:00
parent 7f81fdc8df 3d5d298c63
commit 83137b4005
219 changed files with 6271 additions and 9187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_controller_pokedude.c
+54 -54
View File
@@ -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];
}
}
src/battle_main.c
+5 -5
View File
@@ -641,17 +641,17 @@ void CB2_InitBattle(void)
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
{
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
HelpSystem_SetSomeVariable2(0x19);
SetHelpContext(HELPCONTEXT_TRAINER_BATTLE_DOUBLE);
else
HelpSystem_SetSomeVariable2(0x18);
SetHelpContext(HELPCONTEXT_TRAINER_BATTLE_SINGLE);
}
else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
{
HelpSystem_SetSomeVariable2(0x1A);
SetHelpContext(HELPCONTEXT_SAFARI_BATTLE);
}
else
{
HelpSystem_SetSomeVariable2(0x17);
SetHelpContext(HELPCONTEXT_WILD_BATTLE);
}
}
}
@@ -3713,7 +3713,7 @@ static void HandleEndTurn_BattleLost(void)
}
else
{
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && ScrSpecial_GetTrainerBattleMode() == TRAINER_BATTLE_EARLY_RIVAL)
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && GetTrainerBattleMode() == TRAINER_BATTLE_EARLY_RIVAL)
{
if (GetRivalBattleFlags() & RIVAL_BATTLE_HEAL_AFTER)
gBattleCommunication[MULTISTRING_CHOOSER] = 1; // Dont do white out text
src/battle_records.c
+1 -1
View File
@@ -88,7 +88,7 @@ static u8 *const sStringVars[3] = {
gStringVar3
};
void Special_BattleRecords(void)
void ShowBattleRecords(void)
{
SetVBlankCallback(NULL);
SetMainCallback2(MainCB2_SetUp);
src/battle_setup.c
+19 -19
View File
@@ -221,7 +221,7 @@ static bool8 CheckSilphScopeInPokemonTower(u16 mapGroup, u16 mapNum)
return FALSE;
}
void BattleSetup_StartWildBattle(void)
void StartWildBattle(void)
{
if (GetSafariZoneFlag())
DoSafariBattle();
@@ -243,7 +243,7 @@ static void DoStandardWildBattle(void)
IncrementGameStat(GAME_STAT_WILD_BATTLES);
}
void BattleSetup_StartRoamerBattle(void)
void StartRoamerBattle(void)
{
ScriptContext2_Enable();
FreezeObjectEvents();
@@ -285,7 +285,7 @@ static void DoTrainerBattle(void)
IncrementGameStat(GAME_STAT_TRAINER_BATTLES);
}
void ScrSpecial_StartOldManTutorialBattle(void)
void StartOldManTutorialBattle(void)
{
CreateMaleMon(&gEnemyParty[0], SPECIES_WEEDLE, 5);
ScriptContext2_Enable();
@@ -294,7 +294,7 @@ void ScrSpecial_StartOldManTutorialBattle(void)
CreateBattleStartTask(B_TRANSITION_SLICED_SCREEN, 0);
}
void BattleSetup_StartScriptedWildBattle(void)
void StartScriptedWildBattle(void)
{
ScriptContext2_Enable();
gMain.savedCallback = CB2_EndScriptedWildBattle;
@@ -304,7 +304,7 @@ void BattleSetup_StartScriptedWildBattle(void)
IncrementGameStat(GAME_STAT_WILD_BATTLES);
}
void ScrSpecial_StartMarowakBattle(void)
void StartMarowakBattle(void)
{
ScriptContext2_Enable();
gMain.savedCallback = CB2_EndMarowakBattle;
@@ -323,7 +323,7 @@ void ScrSpecial_StartMarowakBattle(void)
IncrementGameStat(GAME_STAT_WILD_BATTLES);
}
void ScrSpecial_StartSouthernIslandBattle(void)
void StartSouthernIslandBattle(void)
{
ScriptContext2_Enable();
gMain.savedCallback = CB2_EndScriptedWildBattle;
@@ -333,7 +333,7 @@ void ScrSpecial_StartSouthernIslandBattle(void)
IncrementGameStat(GAME_STAT_WILD_BATTLES);
}
void Special_StartLegendaryBattle(void)
void StartLegendaryBattle(void)
{
u16 species;
@@ -364,7 +364,7 @@ void Special_StartLegendaryBattle(void)
IncrementGameStat(GAME_STAT_WILD_BATTLES);
}
void Special_StartGroudonKyogreBattle(void)
void StartGroudonKyogreBattle(void)
{
ScriptContext2_Enable();
gMain.savedCallback = CB2_EndScriptedWildBattle;
@@ -377,7 +377,7 @@ void Special_StartGroudonKyogreBattle(void)
IncrementGameStat(GAME_STAT_WILD_BATTLES);
}
void Special_StartRegiBattle(void)
void StartRegiBattle(void)
{
ScriptContext2_Enable();
gMain.savedCallback = CB2_EndScriptedWildBattle;
@@ -778,7 +778,7 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
{
case TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT:
TrainerBattleLoadArgs(sOrdinaryNoIntroBattleParams, data);
return EventScript_DoTrainerBattle;
return EventScript_DoNoIntroTrainerBattle;
case TRAINER_BATTLE_DOUBLE:
TrainerBattleLoadArgs(sDoubleBattleParams, data);
SetMapVarsToTrainer();
@@ -807,7 +807,7 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
return EventScript_TryDoRematchBattle;
case TRAINER_BATTLE_EARLY_RIVAL:
TrainerBattleLoadArgs(sEarlyRivalBattleParams, data);
return EventScript_DoTrainerBattle;
return EventScript_DoNoIntroTrainerBattle;
default:
TrainerBattleLoadArgs(sOrdinaryBattleParams, data);
SetMapVarsToTrainer();
@@ -820,7 +820,7 @@ void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerSc
gSelectedObjectEvent = trainerEventObjId;
gSpecialVar_LastTalked = gObjectEvents[trainerEventObjId].localId;
BattleSetup_ConfigureTrainerBattle(trainerScript + 1);
ScriptContext1_SetupScript(gUnknown_81A4EB4);
ScriptContext1_SetupScript(EventScript_DoTrainerBattleFromApproach);
ScriptContext2_Enable();
}
@@ -838,7 +838,7 @@ void SetUpTrainerMovement(void)
SetTrainerMovementType(objectEvent, GetTrainerFacingDirectionMovementType(objectEvent->facingDirection));
}
u8 ScrSpecial_GetTrainerBattleMode(void)
u8 GetTrainerBattleMode(void)
{
return sTrainerBattleMode;
}
@@ -848,7 +848,7 @@ u16 GetRivalBattleFlags(void)
return sRivalBattleFlags;
}
u16 ScrSpecial_HasTrainerBeenFought(void)
u16 Script_HasTrainerBeenFought(void)
{
return FlagGet(GetTrainerAFlag());
}
@@ -879,10 +879,10 @@ void ClearTrainerFlag(u16 trainerId)
FlagClear(FLAG_TRAINER_FLAG_START + trainerId);
}
void BattleSetup_StartTrainerBattle(void)
void StartTrainerBattle(void)
{
gBattleTypeFlags = BATTLE_TYPE_TRAINER;
if (ScrSpecial_GetTrainerBattleMode() == TRAINER_BATTLE_EARLY_RIVAL && GetRivalBattleFlags() & RIVAL_BATTLE_TUTORIAL)
if (GetTrainerBattleMode() == TRAINER_BATTLE_EARLY_RIVAL && GetRivalBattleFlags() & RIVAL_BATTLE_TUTORIAL)
gBattleTypeFlags |= BATTLE_TYPE_FIRST_BATTLE;
gMain.savedCallback = CB2_EndTrainerBattle;
DoTrainerBattle();
@@ -956,7 +956,7 @@ static void CB2_EndRematchBattle(void)
}
}
void ScrSpecial_StartTrainerEyeRematch(void)
void StartRematchBattle(void)
{
gBattleTypeFlags = BATTLE_TYPE_TRAINER;
gMain.savedCallback = CB2_EndRematchBattle;
@@ -964,7 +964,7 @@ void ScrSpecial_StartTrainerEyeRematch(void)
ScriptContext1_Stop();
}
void ScrSpecial_ShowTrainerIntroSpeech(void)
void ShowTrainerIntroSpeech(void)
{
ShowFieldMessage(GetIntroSpeechOfApproachingTrainer());
}
@@ -985,7 +985,7 @@ const u8 *BattleSetup_GetTrainerPostBattleScript(void)
return Test_EventScript_Sign;
}
void ScrSpecial_ShowTrainerNonBattlingSpeech(void)
void ShowTrainerCantBattleSpeech(void)
{
ShowFieldMessage(GetTrainerCantBattleSpeech());
}
src/battle_tower.c
+1 -1
View File
@@ -177,7 +177,7 @@ static const u16 sLongStreakPrizes[] = {
ITEM_CHOICE_BAND
};
void ScrSpecial_BattleTowerMapScript2(void)
void BattleTowerMapScript2(void)
{
u8 count = 0;
s32 levelType;
src/berry_pouch.c
+1 -1
View File
@@ -1027,7 +1027,7 @@ static void CreateNormalContextMenu(u8 taskId)
Menu_InitCursor(windowId, 2, 0, 2, GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT) + 2, sContextMenuNumOptions, 0);
windowId2 = GetOrCreateVariableWindow(6);
CopySelectedListMenuItemName(data[1], gStringVar1);
StringExpandPlaceholders(gStringVar4, gOtherText_StrVar1);
StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected);
BerryPouchPrint(windowId2, 2, gStringVar4, 0, 2, 1, 2, 0, 1);
}
src/berry_powder.c
+2 -2
View File
@@ -36,7 +36,7 @@ static bool8 HasEnoughBerryPowder(u32 cost)
return TRUE;
}
bool8 Special_HasEnoughBerryPowder(void)
bool8 Script_HasEnoughBerryPowder(void)
{
if (DecryptBerryPowder(&gSaveBlock2Ptr->berryCrush.berryPowderAmount) < gSpecialVar_0x8004)
return FALSE;
@@ -73,7 +73,7 @@ static bool8 TakeBerryPowder(u32 cost)
}
}
bool8 Special_TakeBerryPowder(void)
bool8 Script_TakeBerryPowder(void)
{
u32 *powder = &gSaveBlock2Ptr->berryCrush.berryPowderAmount;
if (!HasEnoughBerryPowder(gSpecialVar_0x8004))
src/cable_club.c
+3 -3
View File
@@ -573,7 +573,7 @@ static void Task_ReestablishLinkInCableClubRoom_2(u8 taskId)
}
}
void Special_CableClub_AskSaveTheGame(void)
void CableClub_AskSaveTheGame(void)
{
Field_AskSaveTheGame();
}
@@ -765,7 +765,7 @@ void CleanupLinkRoomState(void)
copy_saved_warp2_bank_and_enter_x_to_warp1(127);
}
void sub_8081770(void)
void ExitLinkRoom(void)
{
sub_8057F5C();
}
@@ -896,7 +896,7 @@ static void CreateTask_StartWiredCableClubTrade(void)
CreateTask(Task_StartWiredCableClubTrade, 80);
}
void Special_WiredCableClubTrade(void)
void StartWiredCableClubTrade(void)
{
CreateTask_StartWiredCableClubTrade();
ScriptContext1_Stop();
src/credits.c
+1 -1
View File
@@ -714,7 +714,7 @@ static const struct CreditsTextHeader sCreditsTexts[] = {
{ gString_Dummy, gString_Dummy, FALSE }
};
void Special_Credits(void)
void DoCredits(void)
{
sCreditsMgr = AllocZeroed(sizeof(*sCreditsMgr));
ResetTasks();
src/data/text/quest_log.h
+125
View File
@@ -0,0 +1,125 @@
const u8 gText_QuestLog_PreviouslyOnYourQuest[] = _("Previously on your quest…");
const u8 gText_QuestLog_SwitchMon1WithMon2[] = _("{PLAYER} switched the POKéMON\n{STR_VAR_1} with {STR_VAR_2}.");
const u8 gText_QuestLog_SwappedHeldItemsOnMon[] = _("Took the item {STR_VAR_2} from\n{STR_VAR_1} and gave it the item\n{STR_VAR_3} to hold.");
const u8 gText_QuestLog_TookHeldItemFromMon[] = _("Took the item {STR_VAR_2} from\n{STR_VAR_1}.");
const u8 gText_QuestLog_UsedItemOnMonAtThisLocation[] = _("Used the item {STR_VAR_1} on {STR_VAR_2}\nat this location.");
const u8 gText_QuestLog_UsedTheItem[] = _("{PLAYER} used the\n{STR_VAR_1}.");
const u8 gText_QuestLog_UsedTheKeyItem[] = _("Used the item {STR_VAR_1}, which was\nin the KEY ITEMS POCKET.");
const u8 gText_QuestLog_MonLearnedMoveFromTM[] = _("{STR_VAR_1} learned the move\n{STR_VAR_2} from a TM.");
const u8 gText_QuestLog_MonReplacedMoveWithTM[] = _("{STR_VAR_1} learned the move\n{STR_VAR_2} from a TM and forgot\nthe move {STR_VAR_3}.");
const u8 gText_QuestLog_MonsWereFullyRestoredAtCenter[] = _("POKéMON were fully restored\nat a POKéMON CENTER.");
const u8 gText_QuestLog_PlayerBattledChampionRival[] = _("{DYNAMIC 0x00} had a marvelous battle\nwith the CHAMPION, {DYNAMIC 0x01}.");
const u8 gText_QuestLog_PlayerSentOutMon1RivalSentOutMon2[] = _("In the end, {DYNAMIC 0x00} sent out {DYNAMIC 0x01}\nwhile {DYNAMIC 0x02} countered with\n{DYNAMIC 0x03}.");
const u8 gText_QuestLog_WonTheMatchAsAResult[] = _("And, as a result of battling with every\nbit of power, {DYNAMIC 0x00} won\nthe match.");
const u8 gText_QuestLog_StoredItemInPC[] = _("Removed the item {STR_VAR_1} from\nthe BAG's ITEMS POCKET and stored it\non the PC.");
const u8 gText_QuestLog_WithdrewItemFromPC[] = _("{PLAYER} withdrew the item {STR_VAR_1}\nfrom the PC.");
const u8 gText_QuestLog_TradedMon1ForPersonsMon2[] = _("Traded {STR_VAR_3} in exchange for\n{STR_VAR_1}'s {STR_VAR_2}.");
const u8 gText_QuestLog_SingleBattleWithPersonResultedInOutcome[] = _("Took on {DYNAMIC 0x00} in a SINGLE BATTLE.\nIt was a hotly contested match that\nresulted in a {DYNAMIC 0x01}.");
const u8 gText_QuestLog_DoubleBattleWithPersonResultedInOutcome[] = _("Took on {DYNAMIC 0x00} in a DOUBLE BATTLE.\nIt was an extended match that resulted\nin a {DYNAMIC 0x01}.");
const u8 gText_QuestLog_MultiBattleWithPeopleResultedInOutcome[] = _("{DYNAMIC 0x00} and {DYNAMIC 0x01} took on\n{DYNAMIC 0x02} and {DYNAMIC 0x03} in a\nMULTI BATTLE and got a {DYNAMIC 0x04}.");
const u8 gText_QuestLog_Win[] = _("win");
const u8 gText_QuestLog_Loss[] = _("loss");
const u8 gText_QuestLog_MingledInUnionRoom[] = _("Mingled with other TRAINERS in\nthe UNION ROOM.");
const u8 gText_QuestLog_DepartedPlaceInTownForNextDestination[] = _("Departed {STR_VAR_2}\nin {STR_VAR_1} for the next\ndestination.");
const u8 gText_QuestLog_SwitchedMonsBetweenBoxes[] = _("After consideration, switched\n{DYNAMIC 0x01} in {DYNAMIC 0x00} with\n{DYNAMIC 0x03} in {DYNAMIC 0x02}.");
const u8 gText_QuestLog_MovedMonToNewBox[] = _("After deep thought, switched\n{DYNAMIC 0x01} in BOX “{DYNAMIC 0x00}” to\nthe BOX “{DYNAMIC 0x02}.”");
const u8 gText_QuestLog_SwitchedMonsWithinBox[] = _("Switched around {DYNAMIC 0x01} and\n{DYNAMIC 0x02} in {DYNAMIC 0x00}.");
const u8 gText_QuestLog_MovedMonWithinBox[] = _("Moved {DYNAMIC 0x01} in {DYNAMIC 0x00}.");
const u8 gText_QuestLog_SwitchedPartyMonForPCMon[] = _("Switched {DYNAMIC 0x01} in {DYNAMIC 0x00}\nwith {DYNAMIC 0x02} in the party.");
const u8 gText_QuestLog_WithdrewMonFromPC[] = _("Added {DYNAMIC 0x01} in {DYNAMIC 0x00}\nto the party.");
const u8 gText_QuestLog_DepositedMonInPC[] = _("Moved {DYNAMIC 0x00} from the party\nto {DYNAMIC 0x01}.");
const u8 gText_QuestLog_SwitchedMultipleMons[] = _("Moved a group of POKéMON in\n{DYNAMIC 0x00} to {DYNAMIC 0x01}.");
const u8 gText_QuestLog_ADifferentSpot[] = _("a different spot");
const u8 gText_QuestLog_GaveMonHeldItemFromPC[] = _("Removed the item {STR_VAR_1} from\n{PLAYER}'s PC and gave it to {STR_VAR_2}\nto hold.");
const u8 gText_QuestLog_SwappedHeldItemFromPC[] = _("Removed the item {STR_VAR_1} from\na PC, gave it to {STR_VAR_2}, and put\nthe {STR_VAR_3} it held in the BAG.");
const u8 gText_QuestLog_ChattedWithManyTrainers[] = _("Chatted with many TRAINERS.");
const u8 gText_QuestLog_Handily[] = _("handily");
const u8 gText_QuestLog_Tenaciously[] = _("tenaciously");
const u8 gText_QuestLog_Somehow[] = _("somehow");
const u8 gText_QuestLog_TradedMon1ForTrainersMon2[] = _("Met and traded with {STR_VAR_1}.\nObtained the TRAINER's {STR_VAR_2} in\nexchange for {STR_VAR_3}.");
const u8 gText_QuestLog_BattledTrainerEndedInOutcome[] = _("Met and battled {STR_VAR_1}.\nThe match ended in a {STR_VAR_2}.");
const u8 gText_QuestLog_BoughtItem[] = _("Went to the POKéMON MART in\n{DYNAMIC 0x00} and bought one \n{DYNAMIC 0x01}.");
const u8 gText_QuestLog_BoughtItemsIncludingItem[] = _("Went to the POKéMON MART in\n{DYNAMIC 0x00} and spent ¥{DYNAMIC 0x02} for\nitems including {DYNAMIC 0x01}(s).");
const u8 gText_QuestLog_SoldNumOfItem[] = _("{DYNAMIC 0x00} went to the POKéMON MART in\n{DYNAMIC 0x01} and sold {DYNAMIC 0x03} of\nthe item {DYNAMIC 0x02}.");
const u8 gText_QuestLog_SoldItemsIncludingItem[] = _("Sold items including {DYNAMIC 0x01} at\nthe POKéMON MART in {DYNAMIC 0x00},\nworth ¥{DYNAMIC 0x02}.");
const u8 gText_QuestLog_JustOne[] = _("just one");
const u8 gText_QuestLog_Num[] = _("{DYNAMIC 0x04}");
const u8 gText_QuestLog_UsedSoftboiled[] = _("{STR_VAR_1} shared its HP using the move\nSOFTBOILED.");
const u8 gText_QuestLog_UsedMilkDrink[] = _("{STR_VAR_1} shared its HP using the move\nMILK DRINK.");
const u8 gText_QuestLog_MonLearnedMoveFromHM[] = _("{STR_VAR_1} securely learned the move\n{STR_VAR_2} using an HM.");
const u8 gText_QuestLog_MonReplacedMoveWithHM[] = _("{STR_VAR_1} securely learned the move\n{STR_VAR_2} using an HM and forgot\nthe move {STR_VAR_3}.");
const u8 gText_QuestLog_DefeatedWildMon[] = _("{DYNAMIC 0x05} managed to defeat the POKéMON\n{DYNAMIC 0x01} in {DYNAMIC 0x00}.");
const u8 gText_QuestLog_DefeatedWildMons[] = _("Defeated {DYNAMIC 0x02} wild POKéMON including\n{DYNAMIC 0x01} in {DYNAMIC 0x00}.");
const u8 gText_QuestLog_CaughtWildMon[] = _("{DYNAMIC 0x05} managed to catch the POKéMON\n{DYNAMIC 0x03} in {DYNAMIC 0x00}.");
const u8 gText_QuestLog_CaughtWildMons[] = _("Threw POKé BALLS in a frenzy, catching\n{DYNAMIC 0x04} POKéMON including {DYNAMIC 0x03} here\nin {DYNAMIC 0x00}.");
const u8 gText_QuestLog_DefeatedWildMonAndCaughtWildMon[] = _("{DYNAMIC 0x05} defeated the POKéMON\n{DYNAMIC 0x01} and caught one {DYNAMIC 0x03}\nin {DYNAMIC 0x00}.");
const u8 gText_QuestLog_DefeatedWildMonAndCaughtWildMons[] = _("Defeated the POKéMON {DYNAMIC 0x01}\nand caught {DYNAMIC 0x04} POKéMON including\n{DYNAMIC 0x03} in {DYNAMIC 0x00}.");
const u8 gText_QuestLog_DefeatedWildMonsAndCaughtWildMon[] = _("{DYNAMIC 0x05} defeated {DYNAMIC 0x02} POKéMON including\n{DYNAMIC 0x01} and caught one {DYNAMIC 0x03}\nin {DYNAMIC 0x00}.");
const u8 gText_QuestLog_DefeatedWildMonsAndCaughtWildMons[] = _("Defeated {DYNAMIC 0x02} POKéMON including\n{DYNAMIC 0x01} and caught {DYNAMIC 0x04} POKéMON\nincluding {DYNAMIC 0x03} in {DYNAMIC 0x00}.");
const u8 gText_QuestLog_GaveMonHeldItem[] = _("Made {STR_VAR_1} hold the item\n{STR_VAR_2}.");
const u8 gText_QuestLog_GaveMonHeldItem2[] = _("{PLAYER} made {STR_VAR_1} hold the item\n{STR_VAR_2}.");
const u8 gText_QuestLog_UsedCut[] = _("{STR_VAR_1} used the Hidden Move\nCUT here.");
const u8 gText_QuestLog_UsedFly[] = _("{STR_VAR_1} used the Hidden Move\nFLY and flew to {STR_VAR_2}.");
const u8 gText_QuestLog_UsedSurf[] = _("{STR_VAR_1} used the Hidden Move\nSURF and rode the waves.");
const u8 gText_QuestLog_UsedStrength[] = _("{STR_VAR_1} used the Hidden Move\nSTRENGTH here.");
const u8 gText_QuestLog_UsedFlash[] = _("{STR_VAR_1} used the Hidden Move\nFLASH and illuminated a pitch-black\ncave.");
const u8 gText_QuestLog_UsedRockSmash[] = _("{STR_VAR_1} used the Hidden Move\nROCK SMASH here.");
const u8 gText_QuestLog_UsedWaterfall[] = _("{STR_VAR_1} used the Hidden Move\nWATERFALL to scale a raging torrent."); // Unused
const u8 gText_QuestLog_UsedDive[] = _("{STR_VAR_1}は　ふかい　ところを　めざし\nひでんわざ\nダイビングを　つかった！");
const u8 gText_QuestLog_UsedDigInLocation[] = _("{STR_VAR_1} used DIG to escape from\n{STR_VAR_2}.");
const u8 gText_QuestLog_UsedSweetScent[] = _("{STR_VAR_1} used SWEET SCENT to attract\nwild POKéMON.");
const u8 gText_QuestLog_UsedTeleportToLocation[] = _("{STR_VAR_1} used TELEPORT, transporting\nthe party to {STR_VAR_2}'s\n{STR_VAR_3}.");
const u8 gText_QuestLog_LeftTownsLocationForNextDestination[] = _("{PLAYER} left {STR_VAR_1}'s\n{STR_VAR_2} for the next\ndestination.");
const u8 gText_QuestLog_PlayedGamesAtGameCorner[] = _("Played a lot of games at the ROCKET\nGAME CORNER in {STR_VAR_1}.");
const u8 gText_QuestLog_RestedAtHome[] = _("{PLAYER} rested comfortably at home.");
const u8 gText_QuestLog_LeftOaksLab[] = _("{PLAYER} left PROF. OAK's POKéMON\nRESEARCH LAB.");
const u8 gText_QuestLog_GymWasFullOfToughTrainers[] = _("The GYM in {STR_VAR_1} was full of\ntough TRAINERS…\nPreparations had to be made.");
const u8 gText_QuestLog_DepartedGym[] = _("Departed the GYM in {STR_VAR_1}.");
const u8 gText_QuestLog_HadGreatTimeInSafariZone[] = _("{PLAYER} had a great time with POKéMON\nin the SAFARI ZONE.");
const u8 gText_QuestLog_ManagedToGetOutOfLocation[] = _("Managed to get out of {STR_VAR_2}\nafter wandering about.");
const u8 gText_QuestLog_TookOnGymLeadersMonWithMonAndWon[] = _("Took on {DYNAMIC 0x00} GYM LEADER\n{DYNAMIC 0x01}'s {DYNAMIC 0x02} with {DYNAMIC 0x03}\nand won {DYNAMIC 0x04}!");
const u8 gText_QuestLog_TookOnEliteFoursMonWithMonAndWon[] = _("Took on ELITE FOUR {DYNAMIC 0x00}'s\n{DYNAMIC 0x01} with {DYNAMIC 0x02} and\nwon {DYNAMIC 0x03}!");
const u8 gText_QuestLog_TookOnTrainersMonWithMonAndWon[] = _("In {DYNAMIC 0x00}, took on\n{DYNAMIC 0x01}'s {DYNAMIC 0x02} with {DYNAMIC 0x03}\nand won {DYNAMIC 0x04}!");
const u8 gText_QuestLog_Coolly[] = _("coolly");
const u8 gText_QuestLog_Barely[] = _("barely");
const u8 gText_QuestLog_UsedEscapeRope[] = _("{PLAYER} used an ESCAPE ROPE to get\nout from {STR_VAR_2}.");
const u8 gText_QuestLog_Draw[] = _("draw");
const u8 gText_QuestLog_DepartedTheLocationForNextDestination[] = _("Departed from the {STR_VAR_2}\nfor the next destination.");
const u8 gText_QuestLog_DepartedFromLocationToNextDestination[] = _("{PLAYER} departed from\n{STR_VAR_2} and made way\nto the next destination.");
const u8 gText_QuestLog_ObtainedItemInLocation[] = _("Here in {STR_VAR_1}, {PLAYER}\nobtained the item {STR_VAR_2}.");
const u8 gText_QuestLog_ArrivedInLocation[] = _("Arrived in {STR_VAR_1}.");
const u8 gText_QuestLog_SavedGameAtLocation[] = _("And {PLAYER} saved the game at this\nlocation: {STR_VAR_1}.");
const u8 gText_QuestLog_Home[] = _("HOME");
const u8 gText_QuestLog_OakResearchLab[] = _("OAK RESEARCH LAB");
const u8 gText_QuestLog_Gym[] = _("GYM");
const u8 gText_QuestLog_PokemonLeagueGate[] = _("POKéMON LEAGUE GATE");
const u8 gText_QuestLog_ViridianForest[] = _("VIRIDIAN FOREST");
const u8 gText_QuestLog_PewterMuseumOfScience[] = _("PEWTER MUSEUM OF SCIENCE");
const u8 gText_QuestLog_MtMoon[] = _("MT. MOON");
const u8 gText_QuestLog_BikeShop[] = _("BIKE SHOP");
const u8 gText_QuestLog_BillsHouse[] = _("BILL'S HOUSE");
const u8 gText_QuestLog_DayCare[] = _("DAY CARE");
const u8 gText_QuestLog_UndergroundPath[] = _("UNDERGROUND PATH");
const u8 gText_QuestLog_PokemonFanClub[] = _("POKéMON FAN CLUB");
const u8 gText_QuestLog_SSAnne[] = _("S.S. ANNE");
const u8 gText_QuestLog_DiglettsCave[] = _("DIGLETT'S CAVE");
const u8 gText_QuestLog_RockTunnel[] = _("ROCK TUNNEL");
const u8 gText_QuestLog_PowerPlant[] = _("POWER PLANT");
const u8 gText_QuestLog_PokemonTower[] = _("POKéMON TOWER");
const u8 gText_QuestLog_VolunteerHouse[] = _("VOLUNTEER HOUSE");
const u8 gText_QuestLog_NameRatersHouse[] = _("NAME RATER'S HOUSE");
const u8 gText_QuestLog_CeladonDeptStore[] = _("CELADON DEPT. STORE");
const u8 gText_QuestLog_CeladonMansion[] = _("CELADON MANSION");
const u8 gText_QuestLog_RocketGameCorner[] = _("ROCKET GAME CORNER");
const u8 gText_QuestLog_Restaurant[] = _("RESTAURANT");
const u8 gText_QuestLog_RocketHideout[] = _("ROCKET HIDEOUT");
const u8 gText_QuestLog_SafariZone[] = _("SAFARI ZONE");
const u8 gText_QuestLog_WardensHome[] = _("WARDEN'S HOME");
const u8 gText_QuestLog_FightingDojo[] = _("FIGHTING DOJO");
const u8 gText_QuestLog_SilphCo[] = _("SILPH CO.");
const u8 gText_QuestLog_SeafoamIslands[] = _("SEAFOAM ISLANDS");
const u8 gText_QuestLog_PokemonMansion[] = _("POKéMON MANSION");
const u8 gText_QuestLog_PokemonResearchLab[] = _("POKéMON RESEARCH LAB");
const u8 gText_QuestLog_VictoryRoad[] = _("VICTORY ROAD");
const u8 gText_QuestLog_PokemonLeague[] = _("POKéMON LEAGUE");
const u8 gText_QuestLog_CeruleanCave[] = _("CERULEAN CAVE");
src/data/text/teachy_tv.h
+198
View File
@@ -0,0 +1,198 @@
const u8 gTeachyTvString_TeachBattle[] = _("Teach me how to battle.");
const u8 gTeachyTvString_StatusProblems[] = _("What are status problems?");
const u8 gTeachyTvString_TypeMatchups[] = _("What are type matchups?");
const u8 gTeachyTvString_CatchPkmn[] = _("I want to catch POKéMON.");
const u8 gTeachyTvString_AboutTMs[] = _("Teach me about TMs.");
const u8 gTeachyTvString_RegisterItem[] = _("How do I register an item?");
const u8 gTeachyTvString_Cancel[] = _("CANCEL");
const u8 gTeachyTvText_PokedudeSaysHello[] = _(
"Hey, all you TRAINERS out there!\n"
"HELLO, TRAINERS!\p"
"……… ……… ………\p"
"Come on, let me hear you!\n"
"HELLO, TRAINERS!\l"
"It's me, the POKé DUDE!\p");
const u8 gTeachyTvText_BattleScript1[] = _(
"Today, the POKé DUDE's here to\n"
"tell you about how you can battle\l"
"POKéMON!\p"
"Say you're out for a stroll when,\n"
"suddenly, a wild POKéMON appears!\p"
"It's up to you to smartly use your\n"
"POKéMON and their moves to reduce\l"
"the opponent's HP to nothing, and\l"
"claim victory!\p"
"I'll show you how to do that in\n"
"person and for sure!\p"
"All righty, here goes!\p"
"Keep your eyes glued to the super\n"
"POKé DUDE SHOW!");
const u8 gTeachyTvText_BattleScript2[] = _(
"Well, did you get that?\p"
"Even if your own POKéMON's HP\n"
"falls to zero, and it becomes\l"
"unable to battle, not to worry!\p"
"Just take it to any POKéMON\n"
"CENTER and heal it!\p"
"All righty, be seeing you!\p"
"Remember, TRAINERS, a good deed\n"
"a day brings happiness to stay!");
const u8 gTeachyTvText_StatusScript1[] = _(
"Today, the POKé DUDE's here to\n"
"tell you about status problems!\p"
"Status problems include poisoning,\n"
"paralysis, sleep, burn…\p"
"There are a couple others, but\n"
"they really are trouble.\p"
"Get any one, and your POKéMON\n"
"may become useless in battle.\p"
"You know, it hurts the POKé DUDE\n"
"to see a POKéMON suffer…\p"
"So, what should you do if your\n"
"POKéMON gets a status problem?\p"
"Well, you've got me to show you!\p"
"All righty, here goes!\p"
"Keep your eyes glued to the super\n"
"POKé DUDE SHOW!");
const u8 gTeachyTvText_StatusScript2[] = _(
"Poisoning or paralysis don't go\n"
"away after a battle.\p"
"If a POKéMON is poisoned, it loses\n"
"HP even while you're walking.\p"
"You should heal POKéMON of these\n"
"kinds of problems right away.\p"
"Use an item, or try to get to a\n"
"POKéMON CENTER for healing.\p"
"That wasn't hard, was it?\n"
"All righty, be seeing you!\p"
"Remember, TRAINERS, a good deed\n"
"a day brings happiness to stay!");
const u8 gTeachyTvText_MatchupsScript1[] = _(
"Does everyone know about type\n"
"matchups?\p"
"POKéMON and their moves all\n"
"belong to certain types.\p"
"For example, there are such types\n"
"as GRASS and WATER.\p"
"You need to consider the type of\n"
"the move used to attack…\p"
"And, the type of the POKéMON that\n"
"is hit by that attack.\p"
"Depending on how those two types\n"
"match up, the damage can change.\p"
"You see, it depends on whether\n"
"the type matchup is good or bad.\p"
"If you don't know how matchups\n"
"work, battles will be tough.\p"
"So, let me demonstrate exactly\n"
"what I mean.\p"
"All righty, here goes!\p"
"Keep your eyes glued to the super\n"
"POKé DUDE SHOW!");
const u8 gTeachyTvText_MatchupsScript2[] = _(
"Is it possible to launch an attack\n"
"that will inflict heavy damage?\p"
"Does the opposing POKéMON pose\n"
"a threat to your POKéMON?\p"
"Is there any chance that it may\n"
"have disastrously tough moves?\p"
"Watch the type matchups to gain\n"
"the upper hand!\p"
"All righty, be seeing you!\p"
"Oh, for the COOL-type POKé DUDE,\n"
"AWESOME-type kids like you match\l"
"up perfectly!\p"
"Remember, a good deed a day\n"
"brings happiness to stay!");
const u8 gTeachyTvText_CatchingScript1[] = _(
"Today, the POKé DUDE's going to\n"
"show you how to catch POKéMON!\p"
"Just imagine… A groovy POKéMON\n"
"suddenly appearing in the wild!\p"
"Oh, you want it!\n"
"You just can't help it!\p"
"Oh, you have to catch it!\n"
"You gotta have it!\p"
"Let me show you how you can make\n"
"it happen!\p"
"All righty, here goes!\p"
"Keep your eyes glued to the super\n"
"POKé DUDE SHOW!");
const u8 gTeachyTvText_CatchingScript2[] = _(
"If your first POKé BALL fails to\n"
"catch the POKéMON, don't give up!\p"
"Keep throwing POKé BALLS…\n"
"It's bound to work sometime!\p"
"All righty, be seeing you!\p"
"Remember, TRAINERS, a good deed\n"
"a day brings happiness to stay!");
const u8 gTeachyTvText_TMsScript1[] = _(
"Hey, everyone!\n"
"Do you all have TMs?\p"
"A TM, Technical Machine, is an\n"
"amazingly great item!\p"
"It teaches POKéMON a move that\n"
"it may not learn when leveling up!\p"
"Isn't that just great? What a\n"
"convenient world we live in!\p"
"Open the TM CASE and check out\n"
"the TMs you have.\p"
"You can check them out in detail,\n"
"too.");
const u8 gPokedudeText_TMTypes[] = _(
"POKé DUDE: NORMAL, WATER, GRASS…\n"
"TMs also come in types.\p"
"Check the type and teach it to\n"
"a POKéMON that matches up well.\p"
"For example, WATER PULSE is\n"
"suitable for WATER-type POKéMON.\p"
"BULLET SEED is a move that most\n"
"GRASS-type POKéMON can learn.\p"
"There's one other thing!");
const u8 gPokedudeText_ReadTMDescription[] = _(
"Don't just look at the type, read\n"
"the description, too.\p"
"It will contain hints about what\n"
"POKéMON might learn the move.\p"
"For example, take a move like\n"
"FOCUS PUNCH.\p"
"It doesn't sound like anything a\n"
"bird or fish POKéMON can learn.\p"
"So, try using it on POKéMON with\n"
"arms that can throw punches!");
const u8 gTeachyTvText_TMsScript2[] = _(
"Wow, I talked a lot today!\n"
"All righty, be seeing you!\p"
"Remember, TRAINERS, a good deed\n"
"a day brings happiness to stay!");
const u8 gTeachyTvText_RegisterScript1[] = _(
"A TRAINER's BAG has a bunch of\n"
"nifty, convenient features!\p"
"Take stuff in the KEY ITEMS\n"
"POCKET, for instance.\p"
"You can use a key item without\n"
"opening the BAG every time.\p"
"For example, let's pretend I have\n"
"a TEACHY TV in my BAG.\p"
"I can register it for instant use,\n"
"and I'll show you how!\p"
"All righty, here goes!\p"
"Keep your eyes glued to the sorta\n"
"super POKé DUDE SHOW!");
const u8 gTeachyTvText_RegisterScript2[] = _(
"And now, your TEACHY TV is\n"
"registered.\p"
"How do you use it?\n"
"Well, here's how it works.\p"
"Once an item in the KEY ITEMS\n"
"POKCET is registered, you can use\l"
"it by pressing SELECT.\p"
"So, you've given yourself\n"
"one-touch access to TEACHY TV.\p"
"All it takes for you to see me is\n"
"pressing one button!\p"
"That kind of attention is a little\n"
"embarrassing!\p"
"All righty, be seeing you!\p"
"Remember, TRAINERS, a good deed\n"
"a day brings happiness to stay!");
src/dodrio_berry_picking.c
+5 -5
View File
@@ -1501,7 +1501,7 @@ void sub_815256C(void)
u8 r10 = 0;
u8 i;
u8 r2;
struct DodrioStruct *ptr;
struct DodrioStruct * ptr;
gUnknown_203F3E0->unk120 = 0;
@@ -1588,7 +1588,7 @@ void sub_81527D0(void)
count = gUnknown_203F3E0->unk48;
for (i = first; i < count; i++)
{
struct DodrioSubstruct_31A0 *ptr = &gUnknown_203F3E0->unk31A0[gUnknown_203F3E0->multiplayerId];
struct DodrioSubstruct_31A0 * ptr = &gUnknown_203F3E0->unk31A0[gUnknown_203F3E0->multiplayerId];
u8 var = sUnknown_8471F50[gUnknown_203F3E0->unk24 - 1][gUnknown_203F3E0->multiplayerId][i];
if (ptr->unk14.unkB[var] != 0)
@@ -1622,7 +1622,7 @@ void sub_81528D0(void)
count = gUnknown_203F3E0->unk24;
for (i = 0; i < count; i++)
{
struct DodrioSubstruct_31A0 *ptr = &gUnknown_203F3E0->unk31A0[i];
struct DodrioSubstruct_31A0 * ptr = &gUnknown_203F3E0->unk31A0[i];
sub_8153DA8(i, ptr->unk2C.unk0);
}
}
@@ -1737,7 +1737,7 @@ bool32 sub_8152AD8(void)
{
for (i = first; i < count; i++)
{
struct DodrioSubstruct_31A0 *ptr = &gUnknown_203F3E0->unk31A0[gUnknown_203F3E0->multiplayerId];
struct DodrioSubstruct_31A0 * ptr = &gUnknown_203F3E0->unk31A0[gUnknown_203F3E0->multiplayerId];
u8 var = sUnknown_8471F50[gUnknown_203F3E0->unk24 - 1][gUnknown_203F3E0->multiplayerId][i];
if (ptr->unk14.unkB[var] != 10)
@@ -2230,7 +2230,7 @@ u32 sub_81535B0(void)
return 0;
}
void sub_81536A0(struct DodrioSubstruct_3308 *dst, u8 id)
void sub_81536A0(struct DodrioSubstruct_3308 * dst, u8 id)
{
*dst = gUnknown_203F3E0->unk3308[id];
}
src/dodrio_berry_picking_2.c
+24 -24
View File
@@ -26,16 +26,16 @@ EWRAM_DATA u16 *gUnknown_203F3E4[5] = {NULL};
EWRAM_DATA u16 *gUnknown_203F3F8[2] = {NULL};
EWRAM_DATA u16 *gUnknown_203F400[11] = {NULL};
EWRAM_DATA u16 *gUnknown_203F42C[4] = {NULL};
EWRAM_DATA struct DodrioStruct_2022CF4 *gUnknown_203F43C = NULL;
EWRAM_DATA struct DodrioSubstruct_0160 *gUnknown_203F440 = NULL;
EWRAM_DATA struct DodrioStruct_2022CF4 * gUnknown_203F43C = NULL;
EWRAM_DATA struct DodrioSubstruct_0160 * gUnknown_203F440 = NULL;
void sub_8153B9C(struct Sprite * sprite);
u32 sub_8153C30(struct Sprite * sprite);
u32 sub_8153CA0(struct Sprite * sprite);
void sub_8153D48(bool8 a0, u8 a1);
void nullsub_97(struct Sprite *sprite);
void nullsub_97(struct Sprite * sprite);
void sub_8154324(bool8 a0);
void sub_81543E8(struct Sprite *sprite);
void sub_81543E8(struct Sprite * sprite);
s16 sub_8154608(u8 a0, u8 a1);
void sub_8154A08(u8 taskId);
void sub_8154A2C(void);
@@ -285,7 +285,7 @@ void sub_8153A9C(void)
LoadSpritePalette(&pal2);
}
void sub_8153AFC(struct DodrioSubstruct_318C *arg0, u8 arg1, u8 id, u8 arg3)
void sub_8153AFC(struct DodrioSubstruct_318C * arg0, u8 arg1, u8 id, u8 arg3)
{
struct SpriteTemplate sprTemplate =
{
@@ -303,7 +303,7 @@ void sub_8153AFC(struct DodrioSubstruct_318C *arg0, u8 arg1, u8 id, u8 arg3)
sub_8153D48(TRUE, id);
}
void sub_8153B9C(struct Sprite *sprite)
void sub_8153B9C(struct Sprite * sprite)
{
switch (sprite->data[0])
{
@@ -320,7 +320,7 @@ void sub_8153B9C(struct Sprite *sprite)
void sub_8153BC0(u8 unused)
{
struct Sprite *sprite = &gSprites[*gUnknown_203F3E4[GetMultiplayerId()]];
struct Sprite * sprite = &gSprites[*gUnknown_203F3E4[GetMultiplayerId()]];
sprite->data[0] = 1;
sprite->data[1] = 0;
sprite->data[2] = 0;
@@ -330,7 +330,7 @@ void sub_8153BC0(u8 unused)
void sub_8153BF8(u8 unused)
{
struct Sprite *sprite = &gSprites[*gUnknown_203F3E4[GetMultiplayerId()]];
struct Sprite * sprite = &gSprites[*gUnknown_203F3E4[GetMultiplayerId()]];
sprite->data[0] = 2;
sprite->data[1] = 0;
sprite->data[2] = 0;
@@ -338,7 +338,7 @@ void sub_8153BF8(u8 unused)
sprite->data[4] = 0;
}
u32 sub_8153C30(struct Sprite *sprite)
u32 sub_8153C30(struct Sprite * sprite)
{
s8 var;
u8 mod = (++sprite->data[1] / 2) % 4;
@@ -367,7 +367,7 @@ u32 sub_8153C30(struct Sprite *sprite)
return 0;
}
u32 sub_8153CA0(struct Sprite *sprite)
u32 sub_8153CA0(struct Sprite * sprite)
{
u8 mod = (++sprite->data[1] / 13) % 4;
@@ -387,7 +387,7 @@ void sub_8153D08(u8 count)
u8 i;
for (i = 0; i < count; i++)
{
struct Sprite *sprite = &gSprites[*gUnknown_203F3E4[i]];
struct Sprite * sprite = &gSprites[*gUnknown_203F3E4[i]];
if (sprite != NULL)
DestroySpriteAndFreeResources(sprite);
// Memory should be freed here but is not.
@@ -421,7 +421,7 @@ void sub_8153DD8(void)
u8 i;
for (i = 0; i < 10; i++)
{
struct Sprite *sprite = &gSprites[gUnknown_203F43C->unk2A[i]];
struct Sprite * sprite = &gSprites[gUnknown_203F43C->unk2A[i]];
sprite->pos1.x = (i * 16) + 48;
sprite->pos1.y = -8 - (i * 8);
gUnknown_203F43C->unkC[i] = 0;
@@ -465,7 +465,7 @@ void sub_8153ED8(void)
u8 i;
for (i = 0; i < 10; i++)
{
struct Sprite *sprite = &gSprites[gUnknown_203F43C->unk2A[i]];
struct Sprite * sprite = &gSprites[gUnknown_203F43C->unk2A[i]];
if (sprite != NULL)
DestroySpriteAndFreeResources(sprite);
}
@@ -478,7 +478,7 @@ bool32 sub_8153F1C(void)
bool32 r3 = FALSE;
for (i = 0; i < 10; i++)
{
struct Sprite *sprite = &gSprites[gUnknown_203F43C->unk2A[i]];
struct Sprite * sprite = &gSprites[gUnknown_203F43C->unk2A[i]];
gUnknown_203F43C->unk16[i] = 2;
if (gUnknown_203F43C->unkC[i] != 0 && sprite->pos1.y == 8)
continue;
@@ -620,7 +620,7 @@ void sub_815417C(void)
void sub_8154274(void)
{
struct Sprite *sprite;
struct Sprite * sprite;
u8 i;
for (i = 0; i < 11; i++)
@@ -676,7 +676,7 @@ void sub_81543C4(u8 spriteId)
#define sKeepPosX data[10]
#endif // NONMATCHING
void sub_81543E8(struct Sprite *sprite)
void sub_81543E8(struct Sprite * sprite)
{
u8 i;
static const u8 array[] = {30, 20};
@@ -734,7 +734,7 @@ void sub_81544F0(void)
u8 i;
for (i = 0; i < 2; i++)
{
struct Sprite *sprite = &gSprites[*gUnknown_203F3F8[i]];
struct Sprite * sprite = &gSprites[*gUnknown_203F3F8[i]];
sprite->sKeepPosX = TRUE;
sprite->pos1.x = gUnknown_8478E0E[i][0];
sprite->pos1.y = gUnknown_8478E0E[i][1];
@@ -746,7 +746,7 @@ void sub_8154540(void)
u8 i;
for (i = 0; i < 2; i++)
{
struct Sprite *sprite = &gSprites[*gUnknown_203F3F8[i]];
struct Sprite * sprite = &gSprites[*gUnknown_203F3F8[i]];
sprite->sKeepPosX = FALSE;
}
}
@@ -756,7 +756,7 @@ void sub_8154578(void)
u8 i;
for (i = 0; i < 2; i++)
{
struct Sprite *sprite = &gSprites[*gUnknown_203F3F8[i]];
struct Sprite * sprite = &gSprites[*gUnknown_203F3F8[i]];
if (sprite)
DestroySprite(sprite);
FREE_AND_SET_NULL(gUnknown_203F3F8[i]);
@@ -850,7 +850,7 @@ void sub_8154730(void)
gUnknown_203F440->unk3024 = 0;
}
void sub_8154768(const struct WindowTemplate *winTempl)
void sub_8154768(const struct WindowTemplate * winTempl)
{
u8 pal = 0xA;
@@ -864,7 +864,7 @@ void sub_8154768(const struct WindowTemplate *winTempl)
FillBgTilemapBufferRect(0, 9, winTempl->tilemapLeft + winTempl->width, winTempl->tilemapTop + winTempl->height, 1, 1, pal);
}
void sub_8154868(const struct WindowTemplate *winTempl)
void sub_8154868(const struct WindowTemplate * winTempl)
{
u8 pal = 0xB;
@@ -878,7 +878,7 @@ void sub_8154868(const struct WindowTemplate *winTempl)
FillBgTilemapBufferRect(0, 18, winTempl->tilemapLeft + winTempl->width, winTempl->tilemapTop + winTempl->height, 1, 1, pal);
}
void sub_8154968(struct DodrioSubstruct_0160 *ptr)
void sub_8154968(struct DodrioSubstruct_0160 * ptr)
{
gUnknown_203F440 = ptr;
gUnknown_203F440->finished = FALSE;
@@ -928,7 +928,7 @@ const struct WinCoords sUnknown_8478E50[] = {{12, 6}, {18, 10}, {6, 10}};
const struct WinCoords sUnknown_8478E5C[] = {{9, 10}, {15, 6}, {21, 10}, {3, 6}};
const struct WinCoords sUnknown_8478E6C[] = {{12, 6}, {18, 10}, {23, 6}, {1, 6}, {6, 10}};
const struct WinCoords *const sUnknown_8478E80[] =
const struct WinCoords * const sUnknown_8478E80[] =
{
sUnknown_8478E44,
sUnknown_8478E48,
@@ -1028,7 +1028,7 @@ void sub_8154B34(void)
u8 i, playersCount, id, colorsId, *name;
u32 left;
struct WindowTemplate window;
const struct WinCoords *ptr;
const struct WinCoords * ptr;
switch (gUnknown_203F440->state)
{
src/dodrio_berry_picking_3.c
+9 -9
View File
@@ -22,7 +22,6 @@ u8 sub_815A5E8(s32 a0)
return 0;
}
struct UnkPacket2
{
u8 id;
@@ -66,11 +65,12 @@ struct UnkPacket2
u8 unkB_6:1;
};
// Yeah not even attempting this lol
#ifdef NONMATCHING
static void sub_815A61C(struct DodrioSubstruct_31A0 *arg0, struct DodrioSubstruct_31A0_2C *arg1, struct DodrioSubstruct_31A0_2C *arg2, struct DodrioSubstruct_31A0_2C *arg3, struct DodrioSubstruct_31A0_2C *arg4, struct DodrioSubstruct_31A0_2C *arg5, u8 arg6, u32 arg7, u32 arg8)
static void sub_815A61C(struct DodrioSubstruct_31A0 * arg0, struct DodrioSubstruct_31A0_2C * arg1, struct DodrioSubstruct_31A0_2C * arg2, struct DodrioSubstruct_31A0_2C * arg3, struct DodrioSubstruct_31A0_2C * arg4, struct DodrioSubstruct_31A0_2C * arg5, u8 arg6, u32 arg7, u32 arg8)
{
struct UnkPacket2 packet;
struct DodrioSubstruct_31A0_14 *ptr = &arg0->unk14;
struct DodrioSubstruct_31A0_14 * ptr = &arg0->unk14;
packet.id = 2;
packet.unk1_0 = ptr->unkB[0];
@@ -120,7 +120,7 @@ static void sub_815A61C(struct DodrioSubstruct_31A0 *arg0, struct DodrioSubstruc
}
#else
NAKED
void sub_815A61C(struct DodrioSubstruct_31A0 *arg0, struct DodrioSubstruct_31A0_2C *arg1, struct DodrioSubstruct_31A0_2C *arg2, struct DodrioSubstruct_31A0_2C *arg3, struct DodrioSubstruct_31A0_2C *arg4, struct DodrioSubstruct_31A0_2C *arg5, u8 arg6, u32 arg7, u32 arg8)
void sub_815A61C(struct DodrioSubstruct_31A0 * arg0, struct DodrioSubstruct_31A0_2C * arg1, struct DodrioSubstruct_31A0_2C * arg2, struct DodrioSubstruct_31A0_2C * arg3, struct DodrioSubstruct_31A0_2C * arg4, struct DodrioSubstruct_31A0_2C * arg5, u8 arg6, u32 arg7, u32 arg8)
{
asm_unified(" push {r4-r7,lr}\n\
mov r7, r10\n\
@@ -535,10 +535,10 @@ void sub_815A61C(struct DodrioSubstruct_31A0 *arg0, struct DodrioSubstruct_31A0_
}
#endif
u32 sub_815A950(u32 unused, struct DodrioSubstruct_31A0 *arg0, struct DodrioSubstruct_31A0_2C *arg1, struct DodrioSubstruct_31A0_2C *arg2, struct DodrioSubstruct_31A0_2C *arg3, struct DodrioSubstruct_31A0_2C *arg4, struct DodrioSubstruct_31A0_2C *arg5, u8 *arg6, u32 *arg7, u32 *arg8)
u32 sub_815A950(u32 unused, struct DodrioSubstruct_31A0 * arg0, struct DodrioSubstruct_31A0_2C * arg1, struct DodrioSubstruct_31A0_2C * arg2, struct DodrioSubstruct_31A0_2C * arg3, struct DodrioSubstruct_31A0_2C * arg4, struct DodrioSubstruct_31A0_2C * arg5, u8 *arg6, u32 *arg7, u32 *arg8)
{
struct UnkPacket2 *packet;
struct DodrioSubstruct_31A0_14 *ptr = &arg0->unk14;
struct UnkPacket2 * packet;
struct DodrioSubstruct_31A0_14 * ptr = &arg0->unk14;
if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00)
return 0;
@@ -615,7 +615,7 @@ void sub_815AAD8(u8 arg0)
u32 sub_815AB04(u32 arg0, u8 *arg1)
{
struct UnkPacket3 *packet;
struct UnkPacket3 * packet;
if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00)
return 0;
@@ -646,7 +646,7 @@ void sub_815AB3C(u32 arg0)
u32 sub_815AB60(u32 arg0)
{
struct UnkPacket4 *packet;
struct UnkPacket4 * packet;
if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00)
return 0;
src/easy_chat.c
+1 -1
View File
@@ -276,7 +276,7 @@ static u16 GetRandomWordFromAnyGroup(u16 groupId)
return GetRandomWordFromGroup(groupId);
}
void Special_BufferEasyChatMessage(void)
void ShowEasyChatMessage(void)
{
u16 *easyChatWords;
int columns, rows;
src/field_effect.c
+2 -2
View File
@@ -1232,7 +1232,7 @@ static bool8 FallWarpEffect_7(struct Task * task)
{
VarSet(VAR_TEMP_1, 1);
SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_SURFING);
HelpSystem_SetSomeVariable2(22);
SetHelpContext(HELPCONTEXT_SURFING);
}
DestroyTask(FindTaskIdByFunc(Task_FallWarpFieldEffect));
return FALSE;
@@ -2963,7 +2963,7 @@ static void UseSurfEffect_5(struct Task * task)
ScriptContext2_Disable();
FieldEffectActiveListRemove(FLDEFF_USE_SURF);
DestroyTask(FindTaskIdByFunc(Task_FldEffUseSurf));
HelpSystem_SetSomeVariable2(22);
SetHelpContext(HELPCONTEXT_SURFING);
}
}
src/field_special_scene.c
+2 -1
View File
@@ -21,6 +21,7 @@ void nullsub_60(void)
{
}
void nullsub_61(void)
// From Hoenn's SS Tidal
void LookThroughPorthole(void)
{
}
src/field_specials.c
+149 -116
View File
@@ -46,6 +46,7 @@
#include "constants/moves.h"
#include "constants/menu.h"
#include "constants/event_objects.h"
#include "constants/metatile_labels.h"
static EWRAM_DATA u8 sElevatorCurrentFloorWindowId = 0;
static EWRAM_DATA u16 sElevatorScroll = 0;
@@ -76,12 +77,12 @@ static void Task_SuspendListMenu(u8 taskId);
static void Task_RedrawScrollArrowsAndWaitInput(u8 taskId);
static void Task_CreateMenuRemoveScrollIndicatorArrowPair(u8 taskId);
static void Task_ListMenuRemoveScrollIndicatorArrowPair(u8 taskId);
static u16 GetStarterPokemon(u16 starterIdx);
static u16 GetStarterSpeciesById(u16 starterIdx);
static void ChangeBoxPokemonNickname_CB(void);
static void ChangePokemonNickname_CB(void);
static void Task_RunPokemonLeagueLightingEffect(u8 taskId);
static void Task_CancelPokemonLeagueLightingEffect(u8 taskId);
static void Task_DoDeoxysRockInteraction(u8 taskId);
static void Task_DoDeoxysTriangleInteraction(u8 taskId);
static void MoveDeoxysObject(u8 num);
static void Task_WaitDeoxysFieldEffect(u8 taskId);
static void Task_WingFlapSound(u8 taskId);
@@ -92,14 +93,14 @@ static u8 *const sStringVarPtrs[] = {
gStringVar3
};
void Special_ShowDiploma(void)
void ShowDiploma(void)
{
sub_8112364();
SetMainCallback2(CB2_ShowDiploma);
ScriptContext2_Enable();
}
void Special_ForcePlayerOntoBike(void)
void ForcePlayerOntoBike(void)
{
if (gPlayerAvatar.flags & 1)
SetPlayerAvatarTransitionFlags(2);
@@ -112,7 +113,7 @@ void nullsub_74(void)
}
u8 Special_GetPlayerAvatarBike(void)
u8 GetPlayerAvatarBike(void)
{
if (TestPlayerAvatarFlags(4))
return 1;
@@ -122,24 +123,24 @@ u8 Special_GetPlayerAvatarBike(void)
return 0;
}
void Special_ShowStringVar4AsFieldMessage(void)
void ShowFieldMessageStringVar4(void)
{
ShowFieldMessage(gStringVar4);
}
void Special_GetPlayerXY(void)
void GetPlayerXY(void)
{
gSpecialVar_0x8004 = gSaveBlock1Ptr->pos.x;
gSpecialVar_0x8005 = gSaveBlock1Ptr->pos.y;
}
u8 Special_GetPlayerTrainerIdOnesDigit(void)
u8 GetPlayerTrainerIdOnesDigit(void)
{
u16 playerId = (gSaveBlock2Ptr->playerTrainerId[1] << 8) | gSaveBlock2Ptr->playerTrainerId[0];
return playerId % 10;
}
void Special_BufferBigGuyOrBigGirlString(void)
void BufferBigGuyOrBigGirlString(void)
{
if (gSaveBlock2Ptr->playerGender == MALE)
StringCopy(gStringVar1, gText_BigGuy);
@@ -147,7 +148,7 @@ void Special_BufferBigGuyOrBigGirlString(void)
StringCopy(gStringVar1, gText_BigGirl);
}
void Special_BufferSonOrDaughterString(void)
void BufferSonOrDaughterString(void)
{
if (gSaveBlock2Ptr->playerGender == MALE)
StringCopy(gStringVar1, gText_Son);
@@ -155,12 +156,12 @@ void Special_BufferSonOrDaughterString(void)
StringCopy(gStringVar1, gText_Daughter);
}
u8 Special_GetBattleOutcome(void)
u8 GetBattleOutcome(void)
{
return gBattleOutcome;
}
void Special_SetHiddenItemFlag(void)
void SetHiddenItemFlag(void)
{
FlagSet(gSpecialVar_0x8004);
}
@@ -184,13 +185,13 @@ u8 GetLeadMonFriendship(void)
return 0;
}
void Special_TownMap(void)
void ShowTownMap(void)
{
sub_8112364();
sub_80BFF50(1, CB2_ReturnToFieldContinueScriptPlayMapMusic);
}
bool8 Special_PlayerHasGrassPokemonInParty(void)
bool8 PlayerHasGrassPokemonInParty(void)
{
u8 i;
struct Pokemon * pokemon;
@@ -211,34 +212,41 @@ bool8 Special_PlayerHasGrassPokemonInParty(void)
return FALSE;
}
void Special_AnimatePcTurnOn(void)
#define tState data[0]
#define tTimer data[1]
void AnimatePcTurnOn(void)
{
u8 taskId;
if (FuncIsActiveTask(Task_AnimatePcTurnOn) != TRUE)
{
taskId = CreateTask(Task_AnimatePcTurnOn, 8);
gTasks[taskId].data[0] = 0;
gTasks[taskId].data[1] = 0;
gTasks[taskId].tState = 0;
gTasks[taskId].tTimer = 0;
}
}
// PC flickers on and off while turning on
static void Task_AnimatePcTurnOn(u8 taskId)
{
s16 *data = gTasks[taskId].data;
if (data[1] == 6)
if (tTimer == 6)
{
PcTurnOnUpdateMetatileId(data[0] & 1);
PcTurnOnUpdateMetatileId(tState & 1);
DrawWholeMapView();
data[1] = 0;
data[0]++;
if (data[0] == 5)
tTimer = 0;
tState++;
if (tState == 5)
DestroyTask(taskId);
}
data[1]++;
tTimer++;
}
static void PcTurnOnUpdateMetatileId(bool16 a0)
#undef tState
#undef tTimer
static void PcTurnOnUpdateMetatileId(bool16 flickerOff)
{
u16 metatileId = 0;
s8 deltaX = 0;
@@ -260,28 +268,28 @@ static void PcTurnOnUpdateMetatileId(bool16 a0)
deltaY = -1;
break;
}
if (a0)
if (flickerOff)
{
if (gSpecialVar_0x8004 == 0)
metatileId = 0x62;
metatileId = METATILE_Building_PCOff;
else if (gSpecialVar_0x8004 == 1)
metatileId = 0x28F;
metatileId = METATILE_GenericBuilding1_PlayersPCOff;
else if (gSpecialVar_0x8004 == 2)
metatileId = 0x28F;
metatileId = METATILE_GenericBuilding1_PlayersPCOff;
}
else
{
if (gSpecialVar_0x8004 == 0)
metatileId = 0x63;
metatileId = METATILE_Building_PCOn;
else if (gSpecialVar_0x8004 == 1)
metatileId = 0x28A;
metatileId = METATILE_GenericBuilding1_PlayersPCOn;
else if (gSpecialVar_0x8004 == 2)
metatileId = 0x28A;
metatileId = METATILE_GenericBuilding1_PlayersPCOn;
}
MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + deltaX + 7, gSaveBlock1Ptr->pos.y + deltaY + 7, metatileId | 0xC00);
MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + deltaX + 7, gSaveBlock1Ptr->pos.y + deltaY + 7, metatileId | METATILE_COLLISION_MASK);
}
void Special_AnimatePcTurnOff()
void AnimatePcTurnOff()
{
u16 metatileId = 0;
s8 deltaX = 0;
@@ -304,12 +312,12 @@ void Special_AnimatePcTurnOff()
break;
}
if (gSpecialVar_0x8004 == 0)
metatileId = 0x62;
metatileId = METATILE_Building_PCOff;
else if (gSpecialVar_0x8004 == 1)
metatileId = 0x28F;
metatileId = METATILE_GenericBuilding1_PlayersPCOff;
else if (gSpecialVar_0x8004 == 2)
metatileId = 0x28F;
MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + deltaX + 7, gSaveBlock1Ptr->pos.y + deltaY + 7, metatileId | 0xC00);
metatileId = METATILE_GenericBuilding1_PlayersPCOff;
MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + deltaX + 7, gSaveBlock1Ptr->pos.y + deltaY + 7, metatileId | METATILE_COLLISION_MASK);
DrawWholeMapView();
}
@@ -381,7 +389,7 @@ static const u8 sSlotMachineIndices[] = {
5
};
u8 Special_GetRandomSlotMachine(void)
u8 GetRandomSlotMachineId(void)
{
u16 rval = Random() % NELEMS(sSlotMachineIndices);
return sSlotMachineIndices[rval];
@@ -404,7 +412,7 @@ void GiveLeadMonEffortRibbon(void)
SetMonData(&gPlayerParty[leadMonIdx], MON_DATA_EFFORT_RIBBON, &param);
}
bool8 ScrSpecial_AreLeadMonEVsMaxedOut(void)
bool8 AreLeadMonEVsMaxedOut(void)
{
u8 leadMonIndex = GetLeadMonIndex();
if (GetMonEVCount(&gPlayerParty[leadMonIndex]) >= 510)
@@ -413,9 +421,9 @@ bool8 ScrSpecial_AreLeadMonEVsMaxedOut(void)
return FALSE;
}
bool8 Special_IsStarterFirstStageInParty(void)
bool8 IsStarterFirstStageInParty(void)
{
u16 species = GetStarterPokemon(VarGet(VAR_STARTER_MON));
u16 species = GetStarterSpeciesById(VarGet(VAR_STARTER_MON));
u8 partyCount = CalculatePlayerPartyCount();
u8 i;
for (i = 0; i < partyCount; i++)
@@ -426,7 +434,7 @@ bool8 Special_IsStarterFirstStageInParty(void)
return FALSE;
}
bool8 Special_IsThereRoomInAnyBoxForMorePokemon(void)
bool8 IsThereRoomInAnyBoxForMorePokemon(void)
{
u16 i;
u16 j;
@@ -441,7 +449,7 @@ bool8 Special_IsThereRoomInAnyBoxForMorePokemon(void)
return FALSE;
}
bool8 Special_CheckPartyPokerus(void)
bool8 IsPokerusInParty(void)
{
if (!CheckPartyPokerus(gPlayerParty, 0x3F))
return FALSE;
@@ -455,7 +463,7 @@ bool8 Special_CheckPartyPokerus(void)
#define tDuration data[3]
#define tYtrans data[4]
void Special_ShakeScreen(void)
void ShakeScreen(void)
{
/*
* 0x8004 = x translation
@@ -518,12 +526,12 @@ u8 GetLeadMonIndex(void)
return 0;
}
u16 Special_GetSpeciesOfPartySlot_x8004(void)
u16 GetPartyMonSpecies(void)
{
return GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_SPECIES2, NULL);
}
bool8 Special_IsMonOTNameNotPlayers(void)
bool8 IsMonOTNameNotPlayers(void)
{
GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_OT_NAME, gStringVar1);
@@ -533,7 +541,8 @@ bool8 Special_IsMonOTNameNotPlayers(void)
return TRUE;
}
void nullsub_75(void)
// Used to nop all the unused specials from RS
void NullFieldSpecial(void)
{
}
@@ -545,7 +554,7 @@ void sub_80CADC4(void)
sub_809D424();
}
void Special_SetVermilionTrashCans(void)
void SetVermilionTrashCans(void)
{
u16 idx = (Random() % 15) + 1;
gSpecialVar_0x8004 = idx;
@@ -712,7 +721,7 @@ static u16 SampleResortGorgeousReward(void)
return sResortGorgeousDeluxeRewards[Random() % NELEMS(sResortGorgeousDeluxeRewards)];
}
bool8 Special_CheckAddCoins(void)
bool8 CheckAddCoins(void)
{
if (gSpecialVar_Result + gSpecialVar_0x8006 > 9999)
return FALSE;
@@ -769,15 +778,39 @@ static const u8 sUnused_83F5B84[] = {
};
static const u16 sElevatorWindowMetatilesGoingUp[][3] = {
{0x2e8, 0x2e9, 0x2ea},
{0x2f0, 0x2f1, 0x2f2},
{0x2f8, 0x2f9, 0x2fa}
{
METATILE_SilphCo_ElevatorWindow_Top0,
METATILE_SilphCo_ElevatorWindow_Top1,
METATILE_SilphCo_ElevatorWindow_Top2
},
{
METATILE_SilphCo_ElevatorWindow_Mid0,
METATILE_SilphCo_ElevatorWindow_Mid1,
METATILE_SilphCo_ElevatorWindow_Mid2
},
{
METATILE_SilphCo_ElevatorWindow_Bottom0,
METATILE_SilphCo_ElevatorWindow_Bottom1,
METATILE_SilphCo_ElevatorWindow_Bottom2
}
};
static const u16 sElevatorWindowMetatilesGoingDown[][3] = {
{0x2e8, 0x2ea, 0x2e9},
{0x2f0, 0x2f2, 0x2f1},
{0x2f8, 0x2fa, 0x2f9}
{
METATILE_SilphCo_ElevatorWindow_Top0,
METATILE_SilphCo_ElevatorWindow_Top2,
METATILE_SilphCo_ElevatorWindow_Top1
},
{
METATILE_SilphCo_ElevatorWindow_Mid0,
METATILE_SilphCo_ElevatorWindow_Mid2,
METATILE_SilphCo_ElevatorWindow_Mid1
},
{
METATILE_SilphCo_ElevatorWindow_Bottom0,
METATILE_SilphCo_ElevatorWindow_Bottom2,
METATILE_SilphCo_ElevatorWindow_Bottom1
}
};
static const u8 sElevatorAnimationDuration[] = {
@@ -804,7 +837,7 @@ static const u8 sElevatorWindowAnimDuration[] = {
27
};
void Special_GetElevatorFloor(void)
void GetElevatorFloor(void)
{
u16 floor = 4;
if (gSaveBlock1Ptr->warp2.mapGroup == MAP_GROUP(ROCKET_HIDEOUT_B1F))
@@ -899,7 +932,7 @@ void Special_GetElevatorFloor(void)
VarSet(VAR_ELEVATOR_FLOOR, floor);
}
u16 Special_InitElevatorFloorSelectMenuPos(void)
u16 InitElevatorFloorSelectMenuPos(void)
{
sElevatorScroll = 0;
sElevatorCursorPos = 0;
@@ -1017,7 +1050,7 @@ u16 Special_InitElevatorFloorSelectMenuPos(void)
return sElevatorCursorPos;
}
void Special_AnimateElevator(void)
void AnimateElevator(void)
{
u16 nfloors;
s16 *data = gTasks[CreateTask(Task_ElevatorShake, 9)].data;
@@ -1062,7 +1095,7 @@ static void Task_ElevatorShake(u8 taskId)
}
}
void Special_DrawElevatorCurrentFloorWindow(void)
void DrawElevatorCurrentFloorWindow(void)
{
const u8 *floorname;
u32 strwidth;
@@ -1080,7 +1113,7 @@ void Special_DrawElevatorCurrentFloorWindow(void)
}
}
void Special_CloseElevatorCurrentFloorWindow(void)
void CloseElevatorCurrentFloorWindow(void)
{
ClearStdWindowAndFrameToTransparent(sElevatorCurrentFloorWindowId, TRUE);
RemoveWindow(sElevatorCurrentFloorWindowId);
@@ -1113,7 +1146,7 @@ static void Task_AnimateElevatorWindowView(u8 taskId)
{
for (j = 0; j < 3; j++)
{
MapGridSetMetatileIdAt(j + 8, i + 7, sElevatorWindowMetatilesGoingUp[i][data[0] % 3] | 0xC00);
MapGridSetMetatileIdAt(j + 8, i + 7, sElevatorWindowMetatilesGoingUp[i][data[0] % 3] | METATILE_COLLISION_MASK);
}
}
}
@@ -1123,7 +1156,7 @@ static void Task_AnimateElevatorWindowView(u8 taskId)
{
for (j = 0; j < 3; j++)
{
MapGridSetMetatileIdAt(j + 8, i + 7, sElevatorWindowMetatilesGoingDown[i][data[0] % 3] | 0xC00);
MapGridSetMetatileIdAt(j + 8, i + 7, sElevatorWindowMetatilesGoingDown[i][data[0] % 3] | METATILE_COLLISION_MASK);
}
}
}
@@ -1135,7 +1168,7 @@ static void Task_AnimateElevatorWindowView(u8 taskId)
data[1]++;
}
void Special_ListMenu(void)
void ListMenu(void)
{
u8 taskId;
struct Task * task;
@@ -1439,7 +1472,7 @@ static void Task_SuspendListMenu(u8 taskId)
}
}
void Special_ReturnToListMenu(void)
void ReturnToListMenu(void)
{
u8 taskId = FindTaskIdByFunc(Task_SuspendListMenu);
if (taskId == 0xFF)
@@ -1483,31 +1516,31 @@ static void Task_ListMenuRemoveScrollIndicatorArrowPair(u8 taskId)
RemoveScrollIndicatorArrowPair(task->data[12]);
}
void Special_ForcePlayerToStartSurfing(void)
void ForcePlayerToStartSurfing(void)
{
HelpSystem_SetSomeVariable2(22);
SetHelpContext(HELPCONTEXT_SURFING);
SetPlayerAvatarTransitionFlags(8);
}
static const u16 sStarterMon[] = {
static const u16 sStarterSpecies[] = {
SPECIES_BULBASAUR,
SPECIES_SQUIRTLE,
SPECIES_CHARMANDER
};
static u16 GetStarterPokemon(u16 idx)
static u16 GetStarterSpeciesById(u16 idx)
{
if (idx >= NELEMS(sStarterMon))
if (idx >= NELEMS(sStarterSpecies))
idx = 0;
return sStarterMon[idx];
return sStarterSpecies[idx];
}
u16 ScrSpecial_GetStarter(void)
u16 GetStarterSpecies(void)
{
return GetStarterPokemon(VarGet(VAR_STARTER_MON));
return GetStarterSpeciesById(VarGet(VAR_STARTER_MON));
}
void Special_SetSeenMon(void)
void SetSeenMon(void)
{
GetSetPokedexFlag(SpeciesToNationalPokedexNum(gSpecialVar_0x8004), 2);
}
@@ -1548,7 +1581,7 @@ static bool8 HasMonBeenRenamed(u8 idx)
return FALSE;
}
bool8 Special_HasLeadMonBeenRenamed(void)
bool8 HasLeadMonBeenRenamed(void)
{
return HasMonBeenRenamed(GetLeadMonIndex());
}
@@ -1633,13 +1666,13 @@ static void ChangePokemonNickname_CB(void)
CB2_ReturnToFieldContinueScriptPlayMapMusic();
}
void Special_GetMonNickname(void)
void BufferMonNickname(void)
{
GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar1);
StringGetEnd10(gStringVar1);
}
void Special_IsMonOTIDNotPlayers(void)
void IsMonOTIDNotPlayers(void)
{
if (GetPlayerTrainerId() == GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_OT_ID, NULL))
gSpecialVar_Result = FALSE;
@@ -1672,7 +1705,7 @@ u8 GetUnlockedSeviiAreas(void)
return result;
}
void Special_UpdateTrainerCardPhotoIcons(void)
void UpdateTrainerCardPhotoIcons(void)
{
u16 species[PARTY_SIZE];
u32 personality[PARTY_SIZE];
@@ -1729,7 +1762,7 @@ u16 GetHiddenItemAttr(u32 hiddenItem, u8 attr)
return 1;
}
bool8 Special_PlayerPartyContainsSpecies(void)
bool8 DoesPlayerPartyContainSpecies(void)
{
u8 partyCount = CalculatePlayerPartyCount();
u8 i;
@@ -1756,7 +1789,7 @@ static const u8 sMartMaps[][3] = {
{MAP_GROUP(SIX_ISLAND_MART), MAP_NUM(SIX_ISLAND_MART), 1}
};
u8 Special_GetMartClerkObjectId(void)
u8 GetMartClerkObjectId(void)
{
u8 i;
for (i = 0; i < NELEMS(sMartMaps); i++)
@@ -1915,7 +1948,7 @@ void sub_80CC59C(void)
}
}
u16 Special_BattleCardAction(void)
u16 BattleCardAction(void)
{
switch (gSpecialVar_Result)
{
@@ -2016,7 +2049,7 @@ bool8 sub_80CC87C(void)
return FALSE;
}
bool8 Special_ItemIsTM_GetMoveName(void)
bool8 BufferTMHMMoveName(void)
{
// 8004 = item ID
if (gSpecialVar_0x8004 >= ITEM_TM01 && gSpecialVar_0x8004 <= ITEM_HM08)
@@ -2035,7 +2068,7 @@ void RunMassageCooldownStepCounter(void)
VarSet(VAR_MASSAGE_COOLDOWN_STEP_COUNTER, count + 1);
}
void Special_DaisyMassageServices(void)
void DaisyMassageServices(void)
{
AdjustFriendship(&gPlayerParty[gSpecialVar_0x8004], 6);
VarSet(VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 0);
@@ -2093,7 +2126,7 @@ static const u8 sChampionRoomLightingTimers[] = {
8
};
void Special_PokemonLeagueLightingEffect(void)
void DoPokemonLeagueLightingEffect(void)
{
u8 taskId = CreateTask(Task_RunPokemonLeagueLightingEffect, 8);
s16 *data = gTasks[taskId].data;
@@ -2183,36 +2216,36 @@ static const u8 sCapeBrinkCompatibleSpecies[] = {
SPECIES_BLASTOISE
};
bool8 Special_CapeBrinkGetMoveToTeachLeadPokemon(void)
bool8 CapeBrinkGetMoveToTeachLeadPokemon(void)
{
// Returns:
// 8005 = Move tutor index
// 8006 = Num moves known by lead mon
// 8007 = Index of lead mon
// to specialvar = whether a move can be taught in the first place
u8 r7 = 0;
u8 r6 = 0;
u8 r8 = GetLeadMonIndex();
u8 r4;
gSpecialVar_0x8007 = r8;
for (r4 = 0; r4 < NELEMS(sCapeBrinkCompatibleSpecies); r4++)
u8 tutorMonId = 0;
u8 numMovesKnown = 0;
u8 leadMonSlot = GetLeadMonIndex();
u8 i;
gSpecialVar_0x8007 = leadMonSlot;
for (i = 0; i < NELEMS(sCapeBrinkCompatibleSpecies); i++)
{
if (GetMonData(&gPlayerParty[r8], MON_DATA_SPECIES2, NULL) == sCapeBrinkCompatibleSpecies[r4])
if (GetMonData(&gPlayerParty[leadMonSlot], MON_DATA_SPECIES2, NULL) == sCapeBrinkCompatibleSpecies[i])
{
r7 = r4;
tutorMonId = i;
break;
}
}
if (r4 == NELEMS(sCapeBrinkCompatibleSpecies) || GetMonData(&gPlayerParty[r8], MON_DATA_FRIENDSHIP) != 255)
if (i == NELEMS(sCapeBrinkCompatibleSpecies) || GetMonData(&gPlayerParty[leadMonSlot], MON_DATA_FRIENDSHIP) != 255)
return FALSE;
if (r7 == 0)
if (tutorMonId == 0)
{
StringCopy(gStringVar2, gMoveNames[MOVE_FRENZY_PLANT]);
gSpecialVar_0x8005 = MOVETUTOR_FRENZY_PLANT;
if (FlagGet(FLAG_TUTOR_FRENZY_PLANT) == TRUE)
return FALSE;
}
else if (r7 == 1)
else if (tutorMonId == 1)
{
StringCopy(gStringVar2, gMoveNames[MOVE_BLAST_BURN]);
gSpecialVar_0x8005 = MOVETUTOR_BLAST_BURN;
@@ -2226,21 +2259,21 @@ bool8 Special_CapeBrinkGetMoveToTeachLeadPokemon(void)
if (FlagGet(FLAG_TUTOR_HYDRO_CANNON) == TRUE)
return FALSE;
}
if (GetMonData(&gPlayerParty[r8], MON_DATA_MOVE1) != MOVE_NONE)
r6++;
if (GetMonData(&gPlayerParty[r8], MON_DATA_MOVE2) != MOVE_NONE)
r6++;
if (GetMonData(&gPlayerParty[r8], MON_DATA_MOVE3) != MOVE_NONE)
r6++;
if (GetMonData(&gPlayerParty[r8], MON_DATA_MOVE4) != MOVE_NONE)
r6++;
gSpecialVar_0x8006 = r6;
if (GetMonData(&gPlayerParty[leadMonSlot], MON_DATA_MOVE1) != MOVE_NONE)
numMovesKnown++;
if (GetMonData(&gPlayerParty[leadMonSlot], MON_DATA_MOVE2) != MOVE_NONE)
numMovesKnown++;
if (GetMonData(&gPlayerParty[leadMonSlot], MON_DATA_MOVE3) != MOVE_NONE)
numMovesKnown++;
if (GetMonData(&gPlayerParty[leadMonSlot], MON_DATA_MOVE4) != MOVE_NONE)
numMovesKnown++;
gSpecialVar_0x8006 = numMovesKnown;
return TRUE;
}
bool8 Special_HasLearnedAllMovesFromCapeBrinkTutor(void)
bool8 HasLearnedAllMovesFromCapeBrinkTutor(void)
{
// 8005 is set by Special_CapeBrinkGetMoveToTeachLeadPokemon
// 8005 is set by CapeBrinkGetMoveToTeachLeadPokemon
u8 r4 = 0;
if (gSpecialVar_0x8005 == MOVETUTOR_FRENZY_PLANT)
FlagSet(FLAG_TUTOR_FRENZY_PLANT);
@@ -2276,7 +2309,7 @@ bool8 CutMoveRuinValleyCheck(void)
void CutMoveOpenDottedHoleDoor(void)
{
MapGridSetMetatileIdAt(31, 31, 0x358);
MapGridSetMetatileIdAt(31, 31, METATILE_SeviiIslands67_DottedHoleDoor_Open);
DrawWholeMapView();
PlaySE(SE_BAN);
FlagSet(FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE);
@@ -2324,12 +2357,12 @@ static const u8 sDeoxysStepCaps[] = {
3
};
void DoDeoxysRockInteraction(void)
void DoDeoxysTriangleInteraction(void)
{
CreateTask(Task_DoDeoxysRockInteraction, 8);
CreateTask(Task_DoDeoxysTriangleInteraction, 8);
}
static void Task_DoDeoxysRockInteraction(u8 taskId)
static void Task_DoDeoxysTriangleInteraction(u8 taskId)
{
u16 r5;
u16 r6;
@@ -2415,14 +2448,14 @@ void BirthIslandDeoxysStepCounter(void)
}
}
void Special_SetDeoxysTriangleObjectPal(void)
void SetDeoxysTrianglePalette(void)
{
u8 num = VarGet(VAR_DEOXYS_INTERACTION_NUM);
LoadPalette(sDeoxysObjectPals[num], 0x1A0, 0x08);
sub_8083598(10);
}
bool8 Special_BadEggInParty(void)
bool8 IsBadEggInParty(void)
{
u8 partyCount = CalculatePlayerPartyCount();
u8 i;
@@ -2434,7 +2467,7 @@ bool8 Special_BadEggInParty(void)
return FALSE;
}
bool8 Special_PlayerIsNotInTrainerTowerLobby(void)
bool8 IsPlayerNotInTrainerTowerLobby(void)
{
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRAINER_TOWER_LOBBY) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_LOBBY))
return FALSE;
@@ -2442,7 +2475,7 @@ bool8 Special_PlayerIsNotInTrainerTowerLobby(void)
return TRUE;
}
void Special_BrailleCursorToggle(void)
void BrailleCursorToggle(void)
{
// 8004 = x - 27
// 8005 = y
@@ -2476,7 +2509,7 @@ bool8 PlayerPartyContainsSpeciesWithPlayerID(void)
* Determines which of Lorelei's doll collection to show
* based on how many times you've entered the Hall of Fame.
*/
void Special_ComputeLoreleiDollCollection(void)
void UpdateLoreleiDollCollection(void)
{
u32 numHofClears = GetGameStat(GAME_STAT_ENTERED_HOF);
if (numHofClears >= 25)
@@ -2499,7 +2532,7 @@ void Special_ComputeLoreleiDollCollection(void)
}
}
void Special_LoopWingFlapSound(void)
void LoopWingFlapSound(void)
{
// 8004 = Num flaps
// 8005 = Frame delay between flaps
src/field_tasks.c
+14 -13
View File
@@ -13,6 +13,7 @@
#include "task.h"
#include "constants/field_tasks.h"
#include "constants/flags.h"
#include "constants/metatile_labels.h"
#include "constants/songs.h"
#include "constants/vars.h"
@@ -37,15 +38,15 @@ static const TaskFunc sPerStepCallbacks[] =
static const u8 sIcefallCaveIceTileCoords[][2] =
{
{ 0x08, 0x03 },
{ 0x0a, 0x05 },
{ 0x0f, 0x05 },
{ 0x08, 0x09 },
{ 0x09, 0x09 },
{ 0x10, 0x09 },
{ 0x08, 0x0a },
{ 0x09, 0x0a },
{ 0x08, 0x0e }
{ 8, 3 },
{ 10, 5 },
{ 15, 5 },
{ 8, 9 },
{ 9, 9 },
{ 16, 9 },
{ 8, 10 },
{ 9, 10 },
{ 8, 14 }
};
static void Task_RunPerStepCallback(u8 taskId)
@@ -137,7 +138,7 @@ static void MarkIcefallCaveCoordVisited(s16 x, s16 y)
}
}
void Special_SetIcefallCaveCrackedIceMetatiles(void)
void SetIcefallCaveCrackedIceMetatiles(void)
{
u8 i = 0;
for (; i < NELEMS(sIcefallCaveIceTileCoords); ++i)
@@ -146,7 +147,7 @@ void Special_SetIcefallCaveCrackedIceMetatiles(void)
{
int x = sIcefallCaveIceTileCoords[i][0] + 7;
int y = sIcefallCaveIceTileCoords[i][1] + 7;
MapGridSetMetatileIdAt(x, y, 0x35a);
MapGridSetMetatileIdAt(x, y, METATILE_SeafoamIslands_CrackedIce);
}
}
}
@@ -199,7 +200,7 @@ static void IcefallCaveIcePerStepCallback(u8 taskId)
x = data[4];
y = data[5];
PlaySE(SE_RU_BARI);
MapGridSetMetatileIdAt(x, y, 0x35a);
MapGridSetMetatileIdAt(x, y, METATILE_SeafoamIslands_CrackedIce);
CurrentMapDrawMetatileAt(x, y);
data[1] = 1;
}
@@ -214,7 +215,7 @@ static void IcefallCaveIcePerStepCallback(u8 taskId)
x = data[4];
y = data[5];
PlaySE(SE_RU_GASYAN);
MapGridSetMetatileIdAt(x, y, 0x35b);
MapGridSetMetatileIdAt(x, y, METATILE_SeafoamIslands_IceHole);
CurrentMapDrawMetatileAt(x, y);
VarSet(VAR_TEMP_1, 1);
data[1] = 1;
src/fldeff_berrytree.c
+2 -2
View File
@@ -1,4 +1,4 @@
void nullsub_56(void)
// From R/S, removed
void DoWateringBerryTreeAnim(void)
{
}
src/help_system.c
+2 -2
View File
@@ -90,7 +90,7 @@ u8 RunHelpSystemCallback(void)
HelpSystem_FillPanel2();
HelpSystem_PrintText_Row61(gString_Help);
sub_813BD14(1);
if (sub_812B40C() == TRUE)
if (HelpSystem_UpdateHasntSeenIntro() == TRUE)
HelpSystemSubroutine_PrintWelcomeMessage(&gHelpSystemListMenu, gHelpSystemListMenuItems);
else
HelpSystemSubroutine_WelcomeEndGotoMenu(&gHelpSystemListMenu, gHelpSystemListMenuItems);
@@ -1184,7 +1184,7 @@ bool8 MoveCursor(u8 by, u8 dirn)
HelpSystem_FillPanel1();
PrintListMenuItems();
PlaceListMenuCursor();
sub_812BDEC();
HelpSystem_PrintTopicLabel();
sub_813C75C();
}
else
src/help_system_812B1E0.c
+1867 -983
View File
File diff suppressed because it is too large Load Diff
src/hof_pc.c
+1 -1
View File
@@ -39,7 +39,7 @@ static void ReshowPCMenuAfterHallOfFamePC(void)
{
ScriptContext2_Enable();
Overworld_PlaySpecialMapMusic();
ScrSpecial_CreatePCMenu();
CreatePCMenu();
ScriptMenu_DisplayPCStartupPrompt();
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
CreateTask(Task_WaitForPaletteFade, 10);
src/item_menu.c
+3 -3
View File
@@ -496,9 +496,9 @@ static bool8 LoadBagMenuGraphics(void)
break;
case 19:
if (gBagMenuState.location == ITEMMENULOCATION_ITEMPC)
HelpSystem_SetSomeVariable2(29);
SetHelpContext(HELPCONTEXT_PLAYERS_PC_ITEMS);
else
HelpSystem_SetSomeVariable2(9);
SetHelpContext(HELPCONTEXT_BAG);
gPaletteFade.bufferTransferDisabled = FALSE;
gMain.state++;
break;
@@ -1434,7 +1434,7 @@ static void OpenContextMenu(u8 taskId)
Menu_InitCursor(r6, 2, 0, 2, GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT) + 2, sContextMenuNumItems, 0);
r4 = ShowBagWindow(6, 0);
CopyItemName(gSpecialVar_ItemId, gStringVar1);
StringExpandPlaceholders(gStringVar4, gOtherText_StrVar1);
StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected);
BagPrintTextOnWindow(r4, 2, gStringVar4, 0, 2, 1, 0, 0, 1);
}
src/item_pc.c
+2 -2
View File
@@ -361,7 +361,7 @@ static bool8 ItemPc_DoGfxSetup(void)
gMain.state++;
break;
case 17:
HelpSystem_SetSomeVariable2(29);
SetHelpContext(HELPCONTEXT_PLAYERS_PC_ITEMS);
gMain.state++;
break;
case 18:
@@ -848,7 +848,7 @@ static void Task_ItemPcSubmenuInit(u8 taskId)
PrintTextArray(4, 2, 8, 2, GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT) + 2, 3, sItemPcSubmenuOptions);
Menu_InitCursor(4, 2, 0, 2, GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT) + 2, 3, 0);
CopyItemName(ItemPc_GetItemIdBySlotId(data[1]), gStringVar1);
StringExpandPlaceholders(gStringVar4, gOtherText_StrVar1);
StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected);
ItemPc_AddTextPrinterParameterized(windowId, 2, gStringVar4, 0, 2, 1, 0, 0, 1);
ScheduleBgCopyTilemapToVram(0);
gTasks[taskId].func = Task_ItemPcSubmenuRun;
src/mail.c
+3 -3
View File
@@ -506,10 +506,10 @@ static bool8 DoInitMailView(void)
SetVBlankCallback(NULL);
ScanlineEffect_Stop();
SetGpuReg(REG_OFFSET_DISPCNT, 0);
if (gPlayerPcMenuManager.unk_9 == 0)
HelpSystem_SetSomeVariable2(34);
if (gPlayerPcMenuManager.notInRoom == FALSE)
SetHelpContext(HELPCONTEXT_BEDROOM_PC_MAILBOX);
else
HelpSystem_SetSomeVariable2(30);
SetHelpContext(HELPCONTEXT_PLAYERS_PC_MAILBOX);
break;
case 1:
CpuFill16(0, (void *)OAM, OAM_SIZE);
src/menews_jisan.c
+1 -1
View File
@@ -54,7 +54,7 @@ void MENewsJisanStepCounter(void)
}
}
u16 Special_GetMENewsJisanItemAndState(void)
u16 GetMENewsJisanItemAndState(void)
{
u16 *r6 = &gSpecialVar_Result;
struct MENewsJisanStruct *r4 = GetMENewsJisanStructPtr();
src/oak_speech.c
+1 -1
View File
@@ -512,7 +512,7 @@ static void Task_OaksSpeech1(u8 taskId)
ResetSpriteData();
FreeAllSpritePalettes();
ResetTempTileDataBuffers();
HelpSystem_SetSomeVariable2(2);
SetHelpContext(HELPCONTEXT_NEW_GAME);
break;
case 1:
sOakSpeechResources = AllocZeroed(sizeof(*sOakSpeechResources));
src/option_menu.c
+1 -1
View File
@@ -224,7 +224,7 @@ void CB2_OptionsMenuFromStartMenu(void)
if (sOptionMenuPtr->option[i] > (sOptionMenuItemCounts[i]) - 1)
sOptionMenuPtr->option[i] = 0;
}
HelpSystem_SetSomeVariable2(0xD);
SetHelpContext(HELPCONTEXT_OPTIONS);
SetMainCallback2(CB2_OptionMenu);
}
src/party_menu.c
+1 -1
View File
@@ -566,7 +566,7 @@ static bool8 ShowPartyMenu(void)
++gMain.state;
break;
case 19:
HelpSystem_SetSomeVariable2(5);
SetHelpContext(HELPCONTEXT_PARTY_MENU);
++gMain.state;
break;
case 20:
src/party_menu_specials.c
+7 -7
View File
@@ -13,7 +13,7 @@
static void sub_80BF97C(u8 taskId);
void Special_ChooseMonFromParty(void)
void ChoosePartyMon(void)
{
u8 taskId;
@@ -23,7 +23,7 @@ void Special_ChooseMonFromParty(void)
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
}
void Special_SelectMoveTutorMon(void)
void SelectMoveTutorMon(void)
{
u8 taskId;
@@ -43,14 +43,14 @@ static void sub_80BF97C(u8 taskId)
}
}
void Special_SelectMove(void)
void SelectMoveDeleterMove(void)
{
ShowSelectMovePokemonSummaryScreen(gPlayerParty, gSpecialVar_0x8004, gPlayerPartyCount - 1, CB2_ReturnToField, 0);
sub_8138B38(3);
gFieldCallback = FieldCallback_ReturnToEventScript2;
}
void Special_GetNumMovesSelectedMonHas(void)
void GetNumMovesSelectedMonHas(void)
{
u8 i;
@@ -60,7 +60,7 @@ void Special_GetNumMovesSelectedMonHas(void)
++gSpecialVar_Result;
}
void Special_BufferMoveDeleterNicknameAndMove(void)
void BufferMoveDeleterNicknameAndMove(void)
{
struct Pokemon *mon = &gPlayerParty[gSpecialVar_0x8004];
u16 move = GetMonData(mon, MON_DATA_MOVE1 + gSpecialVar_0x8005);
@@ -91,7 +91,7 @@ static void ShiftMoveSlot(struct Pokemon *mon, u8 slotTo, u8 slotFrom)
SetMonData(mon, MON_DATA_PP_BONUSES, &ppBonuses);
}
void Special_MoveDeleterForgetMove(void)
void MoveDeleterForgetMove(void)
{
u16 i;
@@ -101,7 +101,7 @@ void Special_MoveDeleterForgetMove(void)
ShiftMoveSlot(&gPlayerParty[gSpecialVar_0x8004], i, i + 1);
}
void Special_IsSelectedMonEgg(void)
void IsSelectedMonEgg(void)
{
if (GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_IS_EGG))
gSpecialVar_Result = TRUE;
src/player_pc.c
+18 -18
View File
@@ -153,8 +153,8 @@ void BedroomPC(void)
{
u8 taskId;
gPlayerPcMenuManager.unk_9 = 0;
HelpSystem_BackupSomeVariable();
gPlayerPcMenuManager.notInRoom = FALSE;
BackupHelpContext();
sItemOrder = gUnknown_8402200;
sTopMenuItemCount = 3;
taskId = CreateTask(TaskDummy, 0);
@@ -165,8 +165,8 @@ void PlayerPC(void)
{
u8 taskId;
gPlayerPcMenuManager.unk_9 = 1;
HelpSystem_BackupSomeVariable();
gPlayerPcMenuManager.notInRoom = TRUE;
BackupHelpContext();
sItemOrder = gUnknown_8402203;
sTopMenuItemCount = 3;
taskId = CreateTask(TaskDummy, 0);
@@ -215,7 +215,7 @@ static void Task_TopMenuHandleInput(u8 taskId)
static void Task_ReturnToTopMenu(u8 taskId)
{
HelpSystem_RestoreSomeVariable();
RestoreHelpContext();
DisplayItemMessageOnField(taskId, 2, gText_WhatWouldYouLikeToDo, Task_DrawPlayerPcTopMenu);
}
@@ -238,10 +238,10 @@ static void Task_PlayerPcMailbox(u8 taskId)
gPlayerPcMenuManager.itemsAbove = 0;
PCMailCompaction();
Task_SetPageItemVars(taskId);
if (gPlayerPcMenuManager.unk_9 == 0)
HelpSystem_SetSomeVariable2(34);
if (gPlayerPcMenuManager.notInRoom == FALSE)
SetHelpContext(HELPCONTEXT_BEDROOM_PC_MAILBOX);
else
HelpSystem_SetSomeVariable2(30);
SetHelpContext(HELPCONTEXT_PLAYERS_PC_MAILBOX);
if (MailboxPC_InitBuffers(gPlayerPcMenuManager.count) == TRUE)
{
ClearDialogWindowAndFrame(0, FALSE);
@@ -257,7 +257,7 @@ static void Task_PlayerPcMailbox(u8 taskId)
static void Task_PlayerPcTurnOff(u8 taskId)
{
if (gPlayerPcMenuManager.unk_9 == 0)
if (gPlayerPcMenuManager.notInRoom == FALSE)
ScriptContext1_SetupScript(EventScript_PalletTown_PlayersHouse_2F_ShutDownPC);
else
EnableBothScriptContexts();
@@ -267,10 +267,10 @@ static void Task_PlayerPcTurnOff(u8 taskId)
static void Task_CreateItemStorageSubmenu(u8 taskId, u8 cursorPos)
{
s16 *data = gTasks[taskId].data;
if (gPlayerPcMenuManager.unk_9 == 0)
HelpSystem_SetSomeVariable2(33);
if (gPlayerPcMenuManager.notInRoom == FALSE)
SetHelpContext(HELPCONTEXT_BEDROOM_PC_ITEMS);
else
HelpSystem_SetSomeVariable2(29);
SetHelpContext(HELPCONTEXT_PLAYERS_PC_ITEMS);
tWindowId = AddWindow(&sWindowTemplate_ItemStorageSubmenu);
SetStdWindowBorderStyle(tWindowId, FALSE);
PrintTextArray(tWindowId, 2, GetMenuCursorDimensionByFont(2, 0), 2, 16, 3, sMenuActions_ItemPc);
@@ -580,10 +580,10 @@ static void Task_WaitFadeAndReturnToMailboxPcInputHandler(u8 taskId)
static void CB2_ReturnToMailbox(void)
{
u8 taskId;
if (gPlayerPcMenuManager.unk_9 == 0)
HelpSystem_SetSomeVariable2(34);
if (gPlayerPcMenuManager.notInRoom == FALSE)
SetHelpContext(HELPCONTEXT_BEDROOM_PC_MAILBOX);
else
HelpSystem_SetSomeVariable2(30);
SetHelpContext(HELPCONTEXT_PLAYERS_PC_MAILBOX);
LoadStdWindowFrameGfx();
taskId = CreateTask(Task_WaitFadeAndReturnToMailboxPcInputHandler, 0);
if (MailboxPC_InitBuffers(gPlayerPcMenuManager.count) == TRUE)
@@ -683,10 +683,10 @@ static void CB2_ReturnToMailboxPc_UpdateScrollVariables(void)
{
u8 taskId;
u8 count;
if (gPlayerPcMenuManager.unk_9 == 0)
HelpSystem_SetSomeVariable2(34);
if (gPlayerPcMenuManager.notInRoom == FALSE)
SetHelpContext(HELPCONTEXT_BEDROOM_PC_MAILBOX);
else
HelpSystem_SetSomeVariable2(30);
SetHelpContext(HELPCONTEXT_PLAYERS_PC_MAILBOX);
taskId = CreateTask(Task_WaitFadeAndReturnToMailboxPcInputHandler, 0);
count = gPlayerPcMenuManager.count;
gPlayerPcMenuManager.count = CountPCMail();
src/pokedex_screen.c
+1 -1
View File
@@ -302,7 +302,7 @@ void CB2_OpenPokedexFromStartMenu(void)
SetGpuReg(REG_OFFSET_BLDALPHA, 0);
SetGpuReg(REG_OFFSET_BLDY, 0);
SetMainCallback2(sub_81024D4);
HelpSystem_SetSomeVariable2(4);
SetHelpContext(HELPCONTEXT_POKEDEX);
}
#define FREE_IF_NOT_NULL(ptr0) ({ void * ptr = (ptr0); if (ptr) Free(ptr); })
src/post_battle_event_funcs.c
+2 -2
View File
@@ -8,7 +8,7 @@
#include "constants/flags.h"
#include "constants/spawn_points.h"
bool8 Special_HallOfFame(void)
bool8 EnterHallOfFame(void)
{
bool8 ribbonState;
bool8 *r7;
@@ -52,7 +52,7 @@ bool8 Special_HallOfFame(void)
return FALSE;
}
bool8 SetCB2Whiteout(void)
bool8 SetCB2WhiteOut(void)
{
SetMainCallback2(CB2_WhiteOut);
return FALSE;
src/prof_pc.c
+2 -2
View File
@@ -21,7 +21,7 @@ extern const u8 PokedexRating_Text_LessThan140[];
extern const u8 PokedexRating_Text_LessThan150[];
extern const u8 PokedexRating_Text_Complete[];
u16 Special_GetPokedexCount(void)
u16 GetPokedexCount(void)
{
if (gSpecialVar_0x8004 == 0)
{
@@ -104,7 +104,7 @@ static const u8 *GetProfOaksRatingMessageByCount(u16 count)
return PokedexRating_Text_LessThan10;
}
void Special_GetProfOaksRatingMessage(void)
void GetProfOaksRatingMessage(void)
{
ShowFieldMessage(GetProfOaksRatingMessageByCount(gSpecialVar_0x8004));
}
src/quest_log.c
+153 -280
View File
@@ -281,133 +281,6 @@ static bool8 sub_81153A8(u16, const u16 *);
static bool8 sub_81153E4(u16, const u16 *);
static void BufferLinkPartnersName(u8 *);
extern const u8 QuestLog_Text_PreviouslyOnYourQuest[];
extern const u8 QuestLog_Text_SwitchMon1WithMon2[];
extern const u8 QuestLog_Text_SwappedHeldItemsOnMon[];
extern const u8 QuestLog_Text_TookHeldItemFromMon[];
extern const u8 QuestLog_Text_UsedItemOnMonAtThisLocation[];
extern const u8 QuestLog_Text_UsedTheItem[];
extern const u8 QuestLog_Text_UsedTheKeyItem[];
extern const u8 QuestLog_Text_MonLearnedMoveFromTM[];
extern const u8 QuestLog_Text_MonReplacedMoveWithTM[];
extern const u8 QuestLog_Text_MonsWereFullyRestoredAtCenter[];
extern const u8 QuestLog_Text_PlayerBattledChampionRival[];
extern const u8 QuestLog_Text_PlayerSentOutMon1RivalSentOutMon2[];
extern const u8 QuestLog_Text_WonTheMatchAsAResult[];
extern const u8 QuestLog_Text_StoredItemInPC[];
extern const u8 QuestLog_Text_WithdrewItemFromPC[];
extern const u8 QuestLog_Text_TradedMon1ForPersonsMon2[];
extern const u8 QuestLog_Text_SingleBattleWithPersonResultedInOutcome[];
extern const u8 QuestLog_Text_DoubleBattleWithPersonResultedInOutcome[];
extern const u8 QuestLog_Text_MultiBattleWithPeopleResultedInOutcome[];
extern const u8 QuestLog_Text_Win[];
extern const u8 QuestLog_Text_Loss[];
extern const u8 QuestLog_Text_MingledInUnionRoom[];
extern const u8 QuestLog_Text_DepartedPlaceInTownForNextDestination[];
extern const u8 QuestLog_Text_SwitchedMonsBetweenBoxes[];
extern const u8 QuestLog_Text_MovedMonToNewBox[];
extern const u8 QuestLog_Text_SwitchedMonsWithinBox[];
extern const u8 QuestLog_Text_MovedMonWithinBox[];
extern const u8 QuestLog_Text_SwitchedPartyMonForPCMon[];
extern const u8 QuestLog_Text_WithdrewMonFromPC[];
extern const u8 QuestLog_Text_DepositedMonInPC[];
extern const u8 QuestLog_Text_SwitchedMultipleMons[];
extern const u8 QuestLog_Text_ADifferentSpot[];
extern const u8 QuestLog_Text_GaveMonHeldItemFromPC[];
extern const u8 QuestLog_Text_SwappedHeldItemFromPC[];
extern const u8 QuestLog_Text_ChattedWithManyTrainers[];
extern const u8 QuestLog_Text_Handily[];
extern const u8 QuestLog_Text_Tenaciously[];
extern const u8 QuestLog_Text_Somehow[];
extern const u8 QuestLog_Text_TradedMon1ForTrainersMon2[];
extern const u8 QuestLog_Text_BattledTrainerEndedInOutcome[];
extern const u8 QuestLog_Text_BoughtItem[];
extern const u8 QuestLog_Text_BoughtItemsIncludingItem[];
extern const u8 QuestLog_Text_SoldNumOfItem[];
extern const u8 QuestLog_Text_SoldItemsIncludingItem[];
extern const u8 QuestLog_Text_JustOne[];
extern const u8 QuestLog_Text_Num[];
extern const u8 QuestLog_Text_UsedSoftboiled[];
extern const u8 QuestLog_Text_UsedMilkDrink[];
extern const u8 QuestLog_Text_MonLearnedMoveFromHM[];
extern const u8 QuestLog_Text_MonReplacedMoveWithHM[];
extern const u8 QuestLog_Text_DefeatedWildMon[];
extern const u8 QuestLog_Text_DefeatedWildMons[];
extern const u8 QuestLog_Text_CaughtWildMon[];
extern const u8 QuestLog_Text_CaughtWildMons[];
extern const u8 QuestLog_Text_DefeatedWildMonAndCaughtWildMon[];
extern const u8 QuestLog_Text_DefeatedWildMonAndCaughtWildMons[];
extern const u8 QuestLog_Text_DefeatedWildMonsAndCaughtWildMon[];
extern const u8 QuestLog_Text_DefeatedWildMonsAndCaughtWildMons[];
extern const u8 QuestLog_Text_GaveMonHeldItem[];
extern const u8 QuestLog_Text_GaveMonHeldItem2[];
extern const u8 QuestLog_Text_UsedCut[];
extern const u8 QuestLog_Text_UsedFly[];
extern const u8 QuestLog_Text_UsedSurf[];
extern const u8 QuestLog_Text_UsedStrength[];
extern const u8 QuestLog_Text_UsedFlash[];
extern const u8 QuestLog_Text_UsedRockSmash[];
extern const u8 QuestLog_Text_UsedWaterfall[];
extern const u8 QuestLog_Text_UsedDive[];
extern const u8 QuestLog_Text_UsedDigInLocation[];
extern const u8 QuestLog_Text_UsedSweetScent[];
extern const u8 QuestLog_Text_UsedTeleportToLocation[];
extern const u8 QuestLog_Text_LeftTownsLocationForNextDestination[];
extern const u8 QuestLog_Text_PlayedGamesAtGameCorner[];
extern const u8 QuestLog_Text_RestedAtHome[];
extern const u8 QuestLog_Text_LeftOaksLab[];
extern const u8 QuestLog_Text_GymWasFullOfToughTrainers[];
extern const u8 QuestLog_Text_DepartedGym[];
extern const u8 QuestLog_Text_HadGreatTimeInSafariZone[];
extern const u8 QuestLog_Text_ManagedToGetOutOfLocation[];
extern const u8 QuestLog_Text_TookOnGymLeadersMonWithMonAndWon[];
extern const u8 QuestLog_Text_TookOnEliteFoursMonWithMonAndWon[];
extern const u8 QuestLog_Text_TookOnTrainersMonWithMonAndWon[];
extern const u8 QuestLog_Text_Coolly[];
extern const u8 QuestLog_Text_Barely[];
extern const u8 QuestLog_Text_UsedEscapeRope[];
extern const u8 QuestLog_Text_Draw[];
extern const u8 QuestLog_Text_DepartedTheLocationForNextDestination[];
extern const u8 QuestLog_Text_DepartedFromLocationToNextDestination[];
extern const u8 QuestLog_Text_ObtainedItemInLocation[];
extern const u8 QuestLog_Text_ArrivedInLocation[];
extern const u8 QuestLog_Text_SavedGameAtLocation[];
extern const u8 QuestLog_Text_Home[];
extern const u8 QuestLog_Text_OakResearchLab[];
extern const u8 QuestLog_Text_Gym[];
extern const u8 QuestLog_Text_PokemonLeagueGate[];
extern const u8 QuestLog_Text_ViridianForest[];
extern const u8 QuestLog_Text_PewterMuseumOfScience[];
extern const u8 QuestLog_Text_MtMoon[];
extern const u8 QuestLog_Text_BikeShop[];
extern const u8 QuestLog_Text_BillsHouse[];
extern const u8 QuestLog_Text_DayCare[];
extern const u8 QuestLog_Text_UndergroundPath[];
extern const u8 QuestLog_Text_PokemonFanClub[];
extern const u8 QuestLog_Text_SSAnne[];
extern const u8 QuestLog_Text_DiglettsCave[];
extern const u8 QuestLog_Text_RockTunnel[];
extern const u8 QuestLog_Text_PowerPlant[];
extern const u8 QuestLog_Text_PokemonTower[];
extern const u8 QuestLog_Text_VolunteerHouse[];
extern const u8 QuestLog_Text_NameRatersHouse[];
extern const u8 QuestLog_Text_CeladonDeptStore[];
extern const u8 QuestLog_Text_CeladonMansion[];
extern const u8 QuestLog_Text_RocketGameCorner[];
extern const u8 QuestLog_Text_Restaurant[];
extern const u8 QuestLog_Text_RocketHideout[];
extern const u8 QuestLog_Text_SafariZone[];
extern const u8 QuestLog_Text_WardensHome[];
extern const u8 QuestLog_Text_FightingDojo[];
extern const u8 QuestLog_Text_SilphCo[];
extern const u8 QuestLog_Text_SeafoamIslands[];
extern const u8 QuestLog_Text_PokemonMansion[];
extern const u8 QuestLog_Text_PokemonResearchLab[];
extern const u8 QuestLog_Text_VictoryRoad[];
extern const u8 QuestLog_Text_PokemonLeague[];
extern const u8 QuestLog_Text_CeruleanCave[];
static const struct WindowTemplate gUnknown_845661C[3] = {
{ 0, 0, 0, 30, 2, 15, 0x0e9 },
{ 0, 0, 18, 30, 2, 15, 0x0ad },
@@ -526,7 +399,7 @@ static void sub_8110A3C(void)
}
}
void Special_GetQuestLogState(void)
void GetQuestLogState(void)
{
gSpecialVar_Result = gQuestLogState;
}
@@ -751,7 +624,7 @@ void DrawPreviouslyOnQuestHeader(u8 sceneNum)
FillWindowPixelRect(gUnknown_203ADFE[i], 15, 0, 0, gUnknown_845661C[i].width * 8, gUnknown_845661C[i].height * 8);
}
StringExpandPlaceholders(gStringVar4, QuestLog_Text_PreviouslyOnYourQuest);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_PreviouslyOnYourQuest);
// Scene numbers count from 4 to 0, 0 being where the player saved
if (sceneNum != 0)
@@ -1370,7 +1243,7 @@ static void Task_QuestLogScene_SavedGame(u8 taskId)
if (gUnknown_203AE94.unk_0_6 != 1)
{
GetMapNameGeneric(gStringVar1, gMapHeader.regionMapSectionId);
StringExpandPlaceholders(gStringVar4, QuestLog_Text_SavedGameAtLocation);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_SavedGameAtLocation);
DrawQuestLogSceneDescription();
}
task->data[0] = 0;
@@ -2151,7 +2024,7 @@ void ResetTrainerFanClub(void)
VarSet(VAR_FANCLUB_LOSE_FAN_TIMER, 0);
}
void Special_TryLoseFansFromPlayTimeAfterLinkBattle(void)
void Script_TryLoseFansFromPlayTimeAfterLinkBattle(void)
{
TryLoseFansFromPlayTimeAfterLinkBattle(TRAINER_FAN_CLUB);
}
@@ -2165,7 +2038,7 @@ static void TryLoseFansFromPlayTimeAfterLinkBattle(struct TrainerFanClub *fanClu
}
}
void Special_UpdateTrainerFanClubGameClear(void)
void Script_UpdateTrainerFanClubGameClear(void)
{
UpdateTrainerFanClubGameClear(TRAINER_FAN_CLUB);
}
@@ -2282,7 +2155,7 @@ static u8 PlayerLoseRandomTrainerFan(struct TrainerFanClub *fanClub)
return sFanClubMemberIds[idx];
}
u16 Special_GetNumFansOfPlayerInTrainerFanClub(void)
u16 Script_GetNumFansOfPlayerInTrainerFanClub(void)
{
return GetNumFansOfPlayerInTrainerFanClub(TRAINER_FAN_CLUB);
}
@@ -2301,7 +2174,7 @@ static u16 GetNumFansOfPlayerInTrainerFanClub(struct TrainerFanClub *fanClub)
return count;
}
void Special_TryLoseFansFromPlayTime(void)
void Script_TryLoseFansFromPlayTime(void)
{
TryLoseFansFromPlayTime(TRAINER_FAN_CLUB);
}
@@ -2335,7 +2208,7 @@ static void TryLoseFansFromPlayTime(struct TrainerFanClub *fanClub)
}
}
bool16 Special_IsFanClubMemberFanOfPlayer(void)
bool16 Script_IsFanClubMemberFanOfPlayer(void)
{
return IsFanClubMemberFanOfPlayer(TRAINER_FAN_CLUB);
}
@@ -2352,7 +2225,7 @@ static void SetInitialFansOfPlayer(struct TrainerFanClub *fanClub)
SET_TRAINER_FAN_CLUB_FLAG(FANCLUB_MEMBER3);
}
void Special_BufferFanClubTrainerName(void)
void Script_BufferFanClubTrainerName(void)
{
u8 whichLinkTrainer = 0;
u8 whichNPCTrainer = 0;
@@ -2446,7 +2319,7 @@ static bool8 DidPlayerGetFirstFans(struct TrainerFanClub *fanClub)
return fanClub->gotInitialFans;
}
void Special_SetPlayerGotFirstFans(void)
void Script_SetPlayerGotFirstFans(void)
{
SetPlayerGotFirstFans(TRAINER_FAN_CLUB);
}
@@ -2456,7 +2329,7 @@ static void SetPlayerGotFirstFans(struct TrainerFanClub *fanClub)
fanClub->gotInitialFans = TRUE;
}
u8 Special_TryGainNewFanFromCounter(void)
u8 Script_TryGainNewFanFromCounter(void)
{
return TryGainNewFanFromCounter(TRAINER_FAN_CLUB, gSpecialVar_0x8004);
}
@@ -3170,7 +3043,7 @@ static const u16 *BufferQuestLogText_SwitchedPartyOrder(const u16 *eventData)
const u16 *r4 = sub_8113E88(QL_EVENT_SWITCHED_PARTY_ORDER, eventData);
QuestLog_GetSpeciesName(r4[0], gStringVar1, 0);
QuestLog_GetSpeciesName(r4[1], gStringVar2, 0);
StringExpandPlaceholders(gStringVar4, QuestLog_Text_SwitchMon1WithMon2);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_SwitchMon1WithMon2);
r4 += 2;
return r4;
}
@@ -3204,21 +3077,21 @@ static const u16 *BufferQuestLogText_UsedItem(const u16 *eventData)
if (r5[0] == ITEM_ESCAPE_ROPE)
{
GetMapNameGeneric(gStringVar2, (u8)r5[2]);
StringExpandPlaceholders(gStringVar4, QuestLog_Text_UsedEscapeRope);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_UsedEscapeRope);
}
else if (r5[1] != 0xFFFF)
{
QuestLog_GetSpeciesName(r5[1], gStringVar2, 0);
StringExpandPlaceholders(gStringVar4, QuestLog_Text_UsedItemOnMonAtThisLocation);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_UsedItemOnMonAtThisLocation);
}
else
{
StringExpandPlaceholders(gStringVar4, QuestLog_Text_UsedTheItem);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_UsedTheItem);
}
break;
case POCKET_KEY_ITEMS:
StringCopy(gStringVar1, ItemId_GetName(r5[0]));
StringExpandPlaceholders(gStringVar4, QuestLog_Text_UsedTheKeyItem);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_UsedTheKeyItem);
break;
case POCKET_TM_CASE:
QuestLog_GetSpeciesName(r5[1], gStringVar1, 0);
@@ -3227,16 +3100,16 @@ static const u16 *BufferQuestLogText_UsedItem(const u16 *eventData)
{
StringCopy(gStringVar3, gMoveNames[r5[2]]);
if (r5[0] > ITEM_TM50)
StringExpandPlaceholders(gStringVar4, QuestLog_Text_MonReplacedMoveWithHM);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_MonReplacedMoveWithHM);
else
StringExpandPlaceholders(gStringVar4, QuestLog_Text_MonReplacedMoveWithTM);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_MonReplacedMoveWithTM);
}
else
{
if (r5[0] > ITEM_TM50)
StringExpandPlaceholders(gStringVar4, QuestLog_Text_MonLearnedMoveFromHM);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_MonLearnedMoveFromHM);
else
StringExpandPlaceholders(gStringVar4, QuestLog_Text_MonLearnedMoveFromTM);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_MonLearnedMoveFromTM);
}
break;
}
@@ -3264,7 +3137,7 @@ static const u16 *BufferQuestLogText_GaveHeldItemFromPartyMenu(const u16 *eventD
const u16 *r4 = sub_8113E88(QL_EVENT_GAVE_HELD_ITEM, eventData);
QuestLog_GetSpeciesName(r4[1], gStringVar1, 0);
StringCopy(gStringVar2, ItemId_GetName(r4[0]));
StringExpandPlaceholders(gStringVar4, QuestLog_Text_GaveMonHeldItem);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_GaveMonHeldItem);
r4 += 2;
return r4;
}
@@ -3279,7 +3152,7 @@ static const u16 *BufferQuestLogText_GaveHeldItemFromBagMenu(const u16 *eventDat
const u16 *r4 = sub_8113E88(QL_EVENT_GAVE_HELD_ITEM_BAG, eventData);
QuestLog_GetSpeciesName(r4[1], gStringVar1, 0);
StringCopy(gStringVar2, ItemId_GetName(r4[0]));
StringExpandPlaceholders(gStringVar4, QuestLog_Text_GaveMonHeldItem2);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_GaveMonHeldItem2);
r4 += 2;
return r4;
}
@@ -3295,7 +3168,7 @@ static const u16 *BufferQuestLogText_GaveHeldItemFromPC(const u16 *eventData)
QuestLog_GetSpeciesName(r4[1], gStringVar2, 0);
StringCopy(gStringVar1, ItemId_GetName(r4[0]));
StringExpandPlaceholders(gStringVar4, QuestLog_Text_GaveMonHeldItemFromPC);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_GaveMonHeldItemFromPC);
r4 += 2;
return r4;
}
@@ -3311,7 +3184,7 @@ static const u16 *BufferQuestLogText_TookHeldItem(const u16 *eventData)
QuestLog_GetSpeciesName(r4[1], gStringVar1, 0);
StringCopy(gStringVar2, ItemId_GetName(r4[0]));
StringExpandPlaceholders(gStringVar4, QuestLog_Text_TookHeldItemFromMon);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_TookHeldItemFromMon);
r4 += 2;
return r4;
}
@@ -3339,7 +3212,7 @@ static const u16 *BufferQuestLogText_SwappedHeldItem(const u16 *eventData)
QuestLog_GetSpeciesName(r4[2], gStringVar1, 0);
StringCopy(gStringVar2, ItemId_GetName(r4[0])); // Item taken
StringCopy(gStringVar3, ItemId_GetName(r4[1])); // Item given
StringExpandPlaceholders(gStringVar4, QuestLog_Text_SwappedHeldItemsOnMon);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_SwappedHeldItemsOnMon);
r4 += 3;
return r4;
}
@@ -3355,7 +3228,7 @@ static const u16 *BufferQuestLogText_SwappedHeldItemFromPC(const u16 *eventData)
QuestLog_GetSpeciesName(r4[2], gStringVar2, 0);
StringCopy(gStringVar3, ItemId_GetName(r4[0]));
StringCopy(gStringVar1, ItemId_GetName(r4[1]));
StringExpandPlaceholders(gStringVar4, QuestLog_Text_SwappedHeldItemFromPC);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_SwappedHeldItemFromPC);
r4 += 3;
return r4;
}
@@ -3376,7 +3249,7 @@ static u16 *BufferQuestLogData_UsedPkmnCenter(u16 *a0, const u16 *eventData)
static const u16 *BufferQuestLogText_UsedPkmnCenter(const u16 *a0)
{
StringExpandPlaceholders(gStringVar4, QuestLog_Text_MonsWereFullyRestoredAtCenter);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_MonsWereFullyRestoredAtCenter);
a0 += 2;
return a0;
}
@@ -3405,27 +3278,27 @@ static const u16 *BufferQuestLogText_LinkTraded(const u16 *a0)
BufferLinkPartnersName(gStringVar1);
QuestLog_GetSpeciesName(a0[3], gStringVar2, 0); // Mon received
QuestLog_GetSpeciesName(a0[2], gStringVar3, 0); // Mon sent
StringExpandPlaceholders(gStringVar4, QuestLog_Text_TradedMon1ForPersonsMon2);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_TradedMon1ForPersonsMon2);
r6 += 4;
return r6;
}
static const u8 *const sDefeatedOpponentFlavorTexts[] = {
QuestLog_Text_Handily,
QuestLog_Text_Tenaciously,
QuestLog_Text_Somehow
gText_QuestLog_Handily,
gText_QuestLog_Tenaciously,
gText_QuestLog_Somehow
};
static const u8 *const sDefeatedChampionFlavorTexts[] = {
QuestLog_Text_Coolly,
QuestLog_Text_Somehow,
QuestLog_Text_Barely
gText_QuestLog_Coolly,
gText_QuestLog_Somehow,
gText_QuestLog_Barely
};
static const u8 *const sBattleOutcomeTexts[] = {
QuestLog_Text_Win,
QuestLog_Text_Loss,
QuestLog_Text_Draw
gText_QuestLog_Win,
gText_QuestLog_Loss,
gText_QuestLog_Draw
};
static u16 *BufferQuestLogData_LinkBattledSingle(u16 *a0, const u16 *eventData)
@@ -3447,7 +3320,7 @@ static const u16 *BufferQuestLogText_LinkBattledSingle(const u16 *a0)
BufferLinkPartnersName(gStringVar1);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, sBattleOutcomeTexts[((const u8 *)a0)[4]]);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_SingleBattleWithPersonResultedInOutcome);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_SingleBattleWithPersonResultedInOutcome);
a0 += 6;
return a0;
}
@@ -3471,7 +3344,7 @@ static const u16 *BufferQuestLogText_LinkBattledDouble(const u16 *a0)
BufferLinkPartnersName(gStringVar1);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, sBattleOutcomeTexts[((const u8 *)a0)[4]]);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_DoubleBattleWithPersonResultedInOutcome);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_DoubleBattleWithPersonResultedInOutcome);
a0 += 6;
return a0;
}
@@ -3506,7 +3379,7 @@ static const u16 *BufferQuestLogText_LinkBattledMulti(const u16 *a0)
DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, gStringVar2); // opponent 1
DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, gStringVar3); // opponent 2
DynamicPlaceholderTextUtil_SetPlaceholderPtr(4, sBattleOutcomeTexts[((const u8 *)a0)[4]]);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_MultiBattleWithPeopleResultedInOutcome);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_MultiBattleWithPeopleResultedInOutcome);
a0 += 13;
return a0;
}
@@ -3520,7 +3393,7 @@ static u16 *BufferQuestLogData_UsedUnionRoom(u16 *a0, const u16 *eventData)
static const u16 *BufferQuestLogText_UsedUnionRoom(const u16 *a0)
{
StringExpandPlaceholders(gStringVar4, QuestLog_Text_MingledInUnionRoom);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_MingledInUnionRoom);
a0 += 2;
return a0;
}
@@ -3534,7 +3407,7 @@ static u16 *BufferQuestLogData_UsedUnionRoomChat(u16 *a0, const u16 *eventData)
static const u16 *BufferQuestLogText_UsedUnionRoomChat(const u16 *a0)
{
StringExpandPlaceholders(gStringVar4, QuestLog_Text_ChattedWithManyTrainers);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_ChattedWithManyTrainers);
a0 += 2;
return a0;
}
@@ -3559,7 +3432,7 @@ static const u16 *BufferQuestLogText_LinkTradedUnionRoom(const u16 *a0)
BufferLinkPartnersName(gStringVar1);
QuestLog_GetSpeciesName(a0[3], gStringVar2, 0);
QuestLog_GetSpeciesName(a0[2], gStringVar3, 0);
StringExpandPlaceholders(gStringVar4, QuestLog_Text_TradedMon1ForTrainersMon2);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_TradedMon1ForTrainersMon2);
r6 += 8;
return (const u16 *)r6;
}
@@ -3580,7 +3453,7 @@ static const u16 *BufferQuestLogText_LinkBattledUnionRoom(const u16 *a0)
memcpy(gStringVar1, (const u8 *)a0 + 5, PLAYER_NAME_LENGTH);
BufferLinkPartnersName(gStringVar1);
StringCopy(gStringVar2, sBattleOutcomeTexts[*(const u8 *)&a0[2]]);
StringExpandPlaceholders(gStringVar4, QuestLog_Text_BattledTrainerEndedInOutcome);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_BattledTrainerEndedInOutcome);
a0 += 6;
return a0;
}
@@ -3607,7 +3480,7 @@ static const u16 *BufferQuestLogText_SwitchedMonsBetweenBoxes(const u16 *eventDa
QuestLog_GetSpeciesName(eventData[0], NULL, 1);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, GetBoxNamePtr(boxIdxs[1]));
QuestLog_GetSpeciesName(eventData[1], NULL, 3);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_SwitchedMonsBetweenBoxes);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_SwitchedMonsBetweenBoxes);
return eventData + 3;
}
@@ -3631,7 +3504,7 @@ static const u16 *BufferQuestLogText_SwitchedMonsWithinBox(const u16 *eventData)
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, GetBoxNamePtr(boxIdxs[0]));
QuestLog_GetSpeciesName(eventData[0], NULL, 1);
QuestLog_GetSpeciesName(eventData[1], NULL, 2);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_SwitchedMonsWithinBox);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_SwitchedMonsWithinBox);
return eventData + 3;
}
@@ -3667,7 +3540,7 @@ static const u16 *BufferQuestLogText_SwitchedPartyMonForPCMon(const u16 *eventDa
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, GetBoxNamePtr(boxIdxs[0]));
QuestLog_GetSpeciesName(eventData[0], NULL, 1);
QuestLog_GetSpeciesName(eventData[1], NULL, 2);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_SwitchedPartyMonForPCMon);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_SwitchedPartyMonForPCMon);
return eventData + 3;
}
@@ -3694,7 +3567,7 @@ static const u16 *BufferQuestLogText_MovedMonBetweenBoxes(const u16 *eventData)
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, GetBoxNamePtr(boxIdxs[0]));
QuestLog_GetSpeciesName(eventData[0], NULL, 1);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, GetBoxNamePtr(boxIdxs[1]));
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_MovedMonToNewBox);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_MovedMonToNewBox);
return (const u16 *)boxIdxs + 1;
}
@@ -3717,7 +3590,7 @@ static const u16 *BufferQuestLogText_MovedMonWithinBox(const u16 *eventData)
DynamicPlaceholderTextUtil_Reset();
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, GetBoxNamePtr(boxIdxs[0]));
QuestLog_GetSpeciesName(eventData[0], NULL, 1);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_MovedMonWithinBox);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_MovedMonWithinBox);
return (const u16 *)boxIdxs + 1;
}
@@ -3740,7 +3613,7 @@ static const u16 *BufferQuestLogText_WithdrewMonFromPC(const u16 *eventData)
DynamicPlaceholderTextUtil_Reset();
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, GetBoxNamePtr(boxIdxs[0]));
QuestLog_GetSpeciesName(eventData[0], NULL, 1);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_WithdrewMonFromPC);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_WithdrewMonFromPC);
return (const u16 *)boxIdxs + 1;
}
@@ -3763,7 +3636,7 @@ static const u16 *BufferQuestLogText_DepositedMonInPC(const u16 *eventData)
DynamicPlaceholderTextUtil_Reset();
QuestLog_GetSpeciesName(eventData[0], NULL, 0);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, GetBoxNamePtr(boxIdxs[0]));
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_DepositedMonInPC);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_DepositedMonInPC);
return (const u16 *)boxIdxs + 1;
}
@@ -3784,10 +3657,10 @@ static const u16 *BufferQuestLogText_SwitchedMultipleMons(const u16 *eventData)
DynamicPlaceholderTextUtil_Reset();
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, GetBoxNamePtr(*((const u8 *)r4 + 0)));
if (*((const u8 *)r4 + 0) == *((const u8 *)r4 + 1))
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, QuestLog_Text_ADifferentSpot);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gText_QuestLog_ADifferentSpot);
else
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, GetBoxNamePtr(*((const u8 *)r4 + 1)));
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_SwitchedMultipleMons);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_SwitchedMultipleMons);
return r4 + 1;
}
@@ -3804,7 +3677,7 @@ static const u16 *BufferQuestLogText_DepositedItemInPC(const u16 *eventData)
{
const u16 *r4 = sub_8113E88(QL_EVENT_DEPOSITED_ITEM_PC, eventData);
CopyItemName(r4[0], gStringVar1);
StringExpandPlaceholders(gStringVar4, QuestLog_Text_StoredItemInPC);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_StoredItemInPC);
return r4 + 1;
}
@@ -3821,7 +3694,7 @@ static const u16 *BufferQuestLogText_WithdrewItemFromPC(const u16 *eventData)
{
const u16 *r4 = sub_8113E88(QL_EVENT_WITHDREW_ITEM_PC, eventData);
CopyItemName(r4[0], gStringVar1);
StringExpandPlaceholders(gStringVar4, QuestLog_Text_WithdrewItemFromPC);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_WithdrewItemFromPC);
return r4 + 1;
}
@@ -3856,7 +3729,7 @@ static const u16 *BufferQuestLogText_DefeatedGymLeader(const u16 *eventData)
QuestLog_GetSpeciesName(eventData[0], 0, 2);
QuestLog_GetSpeciesName(eventData[1], 0, 3);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(4, sDefeatedOpponentFlavorTexts[r6[1]]);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_TookOnGymLeadersMonWithMonAndWon);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_TookOnGymLeadersMonWithMonAndWon);
return eventData + 4;
}
@@ -3903,30 +3776,30 @@ static const u16 *BufferQuestLogText_DefeatedWildMon(const u16 *a0)
if (data[0] == 0)
{
if (data[1] == 1)
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_CaughtWildMon);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_CaughtWildMon);
else
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_CaughtWildMons);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_CaughtWildMons);
}
else if (data[1] == 0)
{
if (data[0] == 1)
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_DefeatedWildMon);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_DefeatedWildMon);
else
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_DefeatedWildMons);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_DefeatedWildMons);
}
else if (data[0] == 1)
{
if (data[1] == 1)
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_DefeatedWildMonAndCaughtWildMon);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_DefeatedWildMonAndCaughtWildMon);
else
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_DefeatedWildMonAndCaughtWildMons);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_DefeatedWildMonAndCaughtWildMons);
}
else
{
if (data[1] == 1)
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_DefeatedWildMonsAndCaughtWildMon);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_DefeatedWildMonsAndCaughtWildMon);
else
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_DefeatedWildMonsAndCaughtWildMons);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_DefeatedWildMonsAndCaughtWildMons);
}
return (const u16 *)(data + 4);
}
@@ -3964,7 +3837,7 @@ static const u16 *BufferQuestLogText_DefeatedEliteFourMember(const u16 *eventDat
QuestLog_GetSpeciesName(eventData[0], NULL, 1);
QuestLog_GetSpeciesName(eventData[1], NULL, 2);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, sDefeatedOpponentFlavorTexts[r5[1]]);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_TookOnEliteFoursMonWithMonAndWon);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_TookOnEliteFoursMonWithMonAndWon);
return eventData + 4;
}
@@ -3995,18 +3868,18 @@ static const u16 *BufferQuestLogText_DefeatedChampion(const u16 *a0)
case 0:
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gSaveBlock2Ptr->playerName);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gSaveBlock1Ptr->rivalName);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_PlayerBattledChampionRival);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_PlayerBattledChampionRival);
break;
case 1:
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gSaveBlock1Ptr->rivalName);
QuestLog_GetSpeciesName(a0[2], NULL, 1);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, gSaveBlock2Ptr->playerName);
QuestLog_GetSpeciesName(a0[3], NULL, 3);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_PlayerSentOutMon1RivalSentOutMon2);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_PlayerSentOutMon1RivalSentOutMon2);
break;
case 2:
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, sDefeatedChampionFlavorTexts[r5[0]]);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_WonTheMatchAsAResult);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_WonTheMatchAsAResult);
break;
}
return (const u16 *)(r5 + 2);
@@ -4036,77 +3909,77 @@ static const u16 *BufferQuestLogText_DefeatedTrainer(const u16 *eventData)
QuestLog_GetSpeciesName(r5[0], NULL, 2);
QuestLog_GetSpeciesName(r5[1], NULL, 3);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(4, sDefeatedOpponentFlavorTexts[r6[1]]);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_TookOnTrainersMonWithMonAndWon);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_TookOnTrainersMonWithMonAndWon);
return (const u16 *)(r6 + 2);
}
static const u8 *const sLocationNameTexts[] =
{
[QL_LOCATION_HOME] = QuestLog_Text_Home,
[QL_LOCATION_OAKS_LAB] = QuestLog_Text_OakResearchLab,
[QL_LOCATION_VIRIDIAN_GYM] = QuestLog_Text_Gym,
[QL_LOCATION_LEAGUE_GATE_1] = QuestLog_Text_PokemonLeagueGate,
[QL_LOCATION_LEAGUE_GATE_2] = QuestLog_Text_PokemonLeagueGate,
[QL_LOCATION_VIRIDIAN_FOREST_1] = QuestLog_Text_ViridianForest,
[QL_LOCATION_VIRIDIAN_FOREST_2] = QuestLog_Text_ViridianForest,
[QL_LOCATION_PEWTER_MUSEUM] = QuestLog_Text_PewterMuseumOfScience,
[QL_LOCATION_PEWTER_GYM] = QuestLog_Text_Gym,
[QL_LOCATION_MT_MOON_1] = QuestLog_Text_MtMoon,
[QL_LOCATION_MT_MOON_2] = QuestLog_Text_MtMoon,
[QL_LOCATION_CERULEAN_GYM] = QuestLog_Text_Gym,
[QL_LOCATION_BIKE_SHOP] = QuestLog_Text_BikeShop,
[QL_LOCATION_BILLS_HOUSE] = QuestLog_Text_BillsHouse,
[QL_LOCATION_DAY_CARE] = QuestLog_Text_DayCare,
[QL_LOCATION_UNDERGROUND_PATH_1] = QuestLog_Text_UndergroundPath,
[QL_LOCATION_UNDERGROUND_PATH_2] = QuestLog_Text_UndergroundPath,
[QL_LOCATION_PKMN_FAN_CLUB] = QuestLog_Text_PokemonFanClub,
[QL_LOCATION_VERMILION_GYM] = QuestLog_Text_Gym,
[QL_LOCATION_SS_ANNE] = QuestLog_Text_SSAnne,
[QL_LOCATION_DIGLETTS_CAVE_1] = QuestLog_Text_DiglettsCave,
[QL_LOCATION_DIGLETTS_CAVE_2] = QuestLog_Text_DiglettsCave,
[QL_LOCATION_ROCK_TUNNEL_1] = QuestLog_Text_RockTunnel,
[QL_LOCATION_ROCK_TUNNEL_2] = QuestLog_Text_RockTunnel,
[QL_LOCATION_POWER_PLANT] = QuestLog_Text_PowerPlant,
[QL_LOCATION_PKMN_TOWER] = QuestLog_Text_PokemonTower,
[QL_LOCATION_VOLUNTEER_HOUSE] = QuestLog_Text_VolunteerHouse,
[QL_LOCATION_NAME_RATERS_HOUSE] = QuestLog_Text_NameRatersHouse,
[QL_LOCATION_UNDERGROUND_PATH_3] = QuestLog_Text_UndergroundPath,
[QL_LOCATION_UNDERGROUND_PATH_4] = QuestLog_Text_UndergroundPath,
[QL_LOCATION_CELADON_DEPT_STORE] = QuestLog_Text_CeladonDeptStore,
[QL_LOCATION_CELADON_MANSION] = QuestLog_Text_CeladonMansion,
[QL_LOCATION_GAME_CORNER] = QuestLog_Text_RocketGameCorner,
[QL_LOCATION_CELADON_GYM] = QuestLog_Text_Gym,
[QL_LOCATION_CELADON_RESTAURANT] = QuestLog_Text_Restaurant,
[QL_LOCATION_ROCKET_HIDEOUT] = QuestLog_Text_RocketHideout,
[QL_LOCATION_SAFARI_ZONE] = QuestLog_Text_SafariZone,
[QL_LOCATION_FUCHSIA_GYM] = QuestLog_Text_Gym,
[QL_LOCATION_WARDENS_HOME] = QuestLog_Text_WardensHome,
[QL_LOCATION_FIGHTING_DOJO] = QuestLog_Text_FightingDojo,
[QL_LOCATION_SAFFRON_GYM] = QuestLog_Text_Gym,
[QL_LOCATION_SILPH_CO] = QuestLog_Text_SilphCo,
[QL_LOCATION_SEAFOAM_ISLANDS_1] = QuestLog_Text_SeafoamIslands,
[QL_LOCATION_SEAFOAM_ISLANDS_2] = QuestLog_Text_SeafoamIslands,
[QL_LOCATION_PKMN_MANSION] = QuestLog_Text_PokemonMansion,
[QL_LOCATION_CINNABAR_GYM] = QuestLog_Text_Gym,
[QL_LOCATION_CINNABAR_LAB] = QuestLog_Text_PokemonResearchLab,
[QL_LOCATION_VICTORY_ROAD_1] = QuestLog_Text_VictoryRoad,
[QL_LOCATION_VICTORY_ROAD_2] = QuestLog_Text_VictoryRoad,
[QL_LOCATION_PKMN_LEAGUE] = QuestLog_Text_PokemonLeague,
[QL_LOCATION_CERULEAN_CAVE] = QuestLog_Text_CeruleanCave
[QL_LOCATION_HOME] = gText_QuestLog_Home,
[QL_LOCATION_OAKS_LAB] = gText_QuestLog_OakResearchLab,
[QL_LOCATION_VIRIDIAN_GYM] = gText_QuestLog_Gym,
[QL_LOCATION_LEAGUE_GATE_1] = gText_QuestLog_PokemonLeagueGate,
[QL_LOCATION_LEAGUE_GATE_2] = gText_QuestLog_PokemonLeagueGate,
[QL_LOCATION_VIRIDIAN_FOREST_1] = gText_QuestLog_ViridianForest,
[QL_LOCATION_VIRIDIAN_FOREST_2] = gText_QuestLog_ViridianForest,
[QL_LOCATION_PEWTER_MUSEUM] = gText_QuestLog_PewterMuseumOfScience,
[QL_LOCATION_PEWTER_GYM] = gText_QuestLog_Gym,
[QL_LOCATION_MT_MOON_1] = gText_QuestLog_MtMoon,
[QL_LOCATION_MT_MOON_2] = gText_QuestLog_MtMoon,
[QL_LOCATION_CERULEAN_GYM] = gText_QuestLog_Gym,
[QL_LOCATION_BIKE_SHOP] = gText_QuestLog_BikeShop,
[QL_LOCATION_BILLS_HOUSE] = gText_QuestLog_BillsHouse,
[QL_LOCATION_DAY_CARE] = gText_QuestLog_DayCare,
[QL_LOCATION_UNDERGROUND_PATH_1] = gText_QuestLog_UndergroundPath,
[QL_LOCATION_UNDERGROUND_PATH_2] = gText_QuestLog_UndergroundPath,
[QL_LOCATION_PKMN_FAN_CLUB] = gText_QuestLog_PokemonFanClub,
[QL_LOCATION_VERMILION_GYM] = gText_QuestLog_Gym,
[QL_LOCATION_SS_ANNE] = gText_QuestLog_SSAnne,
[QL_LOCATION_DIGLETTS_CAVE_1] = gText_QuestLog_DiglettsCave,
[QL_LOCATION_DIGLETTS_CAVE_2] = gText_QuestLog_DiglettsCave,
[QL_LOCATION_ROCK_TUNNEL_1] = gText_QuestLog_RockTunnel,
[QL_LOCATION_ROCK_TUNNEL_2] = gText_QuestLog_RockTunnel,
[QL_LOCATION_POWER_PLANT] = gText_QuestLog_PowerPlant,
[QL_LOCATION_PKMN_TOWER] = gText_QuestLog_PokemonTower,
[QL_LOCATION_VOLUNTEER_HOUSE] = gText_QuestLog_VolunteerHouse,
[QL_LOCATION_NAME_RATERS_HOUSE] = gText_QuestLog_NameRatersHouse,
[QL_LOCATION_UNDERGROUND_PATH_3] = gText_QuestLog_UndergroundPath,
[QL_LOCATION_UNDERGROUND_PATH_4] = gText_QuestLog_UndergroundPath,
[QL_LOCATION_CELADON_DEPT_STORE] = gText_QuestLog_CeladonDeptStore,
[QL_LOCATION_CELADON_MANSION] = gText_QuestLog_CeladonMansion,
[QL_LOCATION_GAME_CORNER] = gText_QuestLog_RocketGameCorner,
[QL_LOCATION_CELADON_GYM] = gText_QuestLog_Gym,
[QL_LOCATION_CELADON_RESTAURANT] = gText_QuestLog_Restaurant,
[QL_LOCATION_ROCKET_HIDEOUT] = gText_QuestLog_RocketHideout,
[QL_LOCATION_SAFARI_ZONE] = gText_QuestLog_SafariZone,
[QL_LOCATION_FUCHSIA_GYM] = gText_QuestLog_Gym,
[QL_LOCATION_WARDENS_HOME] = gText_QuestLog_WardensHome,
[QL_LOCATION_FIGHTING_DOJO] = gText_QuestLog_FightingDojo,
[QL_LOCATION_SAFFRON_GYM] = gText_QuestLog_Gym,
[QL_LOCATION_SILPH_CO] = gText_QuestLog_SilphCo,
[QL_LOCATION_SEAFOAM_ISLANDS_1] = gText_QuestLog_SeafoamIslands,
[QL_LOCATION_SEAFOAM_ISLANDS_2] = gText_QuestLog_SeafoamIslands,
[QL_LOCATION_PKMN_MANSION] = gText_QuestLog_PokemonMansion,
[QL_LOCATION_CINNABAR_GYM] = gText_QuestLog_Gym,
[QL_LOCATION_CINNABAR_LAB] = gText_QuestLog_PokemonResearchLab,
[QL_LOCATION_VICTORY_ROAD_1] = gText_QuestLog_VictoryRoad,
[QL_LOCATION_VICTORY_ROAD_2] = gText_QuestLog_VictoryRoad,
[QL_LOCATION_PKMN_LEAGUE] = gText_QuestLog_PokemonLeague,
[QL_LOCATION_CERULEAN_CAVE] = gText_QuestLog_CeruleanCave
};
static const u8 *const sDepartedLocationTexts[] =
{
[QL_DEPARTED_TOWN_BUILDING] = QuestLog_Text_DepartedPlaceInTownForNextDestination,
[QL_DEPARTED_MUSEUM] = QuestLog_Text_LeftTownsLocationForNextDestination,
[QL_DEPARTED_GAME_CORNER] = QuestLog_Text_PlayedGamesAtGameCorner,
[QL_DEPARTED_HOME] = QuestLog_Text_RestedAtHome,
[QL_DEPARTED_OAKS_LAB] = QuestLog_Text_LeftOaksLab,
[QL_DEPARTED_GYM] = QuestLog_Text_GymWasFullOfToughTrainers,
[QL_DEPARTED_SAFARI_ZONE] = QuestLog_Text_HadGreatTimeInSafariZone,
[QL_DEPARTED_CAVE] = QuestLog_Text_ManagedToGetOutOfLocation,
[QL_DEPARTED_MISC_BUILDING_1] = QuestLog_Text_DepartedTheLocationForNextDestination,
[QL_DEPARTED_MISC_BUILDING_2] = QuestLog_Text_DepartedFromLocationToNextDestination
[QL_DEPARTED_TOWN_BUILDING] = gText_QuestLog_DepartedPlaceInTownForNextDestination,
[QL_DEPARTED_MUSEUM] = gText_QuestLog_LeftTownsLocationForNextDestination,
[QL_DEPARTED_GAME_CORNER] = gText_QuestLog_PlayedGamesAtGameCorner,
[QL_DEPARTED_HOME] = gText_QuestLog_RestedAtHome,
[QL_DEPARTED_OAKS_LAB] = gText_QuestLog_LeftOaksLab,
[QL_DEPARTED_GYM] = gText_QuestLog_GymWasFullOfToughTrainers,
[QL_DEPARTED_SAFARI_ZONE] = gText_QuestLog_HadGreatTimeInSafariZone,
[QL_DEPARTED_CAVE] = gText_QuestLog_ManagedToGetOutOfLocation,
[QL_DEPARTED_MISC_BUILDING_1] = gText_QuestLog_DepartedTheLocationForNextDestination,
[QL_DEPARTED_MISC_BUILDING_2] = gText_QuestLog_DepartedFromLocationToNextDestination
};
static const u8 sLocationToDepartedTextId[] =
@@ -4177,18 +4050,18 @@ static const u8 gUnknown_8456C17[] = {
static const u8 *const sUsedFieldMoveTexts[] =
{
[FIELD_MOVE_FLASH] = QuestLog_Text_UsedFlash,
[FIELD_MOVE_CUT] = QuestLog_Text_UsedCut,
[FIELD_MOVE_FLY] = QuestLog_Text_UsedFly,
[FIELD_MOVE_STRENGTH] = QuestLog_Text_UsedStrength,
[FIELD_MOVE_SURF] = QuestLog_Text_UsedSurf,
[FIELD_MOVE_ROCK_SMASH] = QuestLog_Text_UsedRockSmash,
[FIELD_MOVE_WATERFALL] = QuestLog_Text_UsedWaterfall,
[FIELD_MOVE_TELEPORT] = QuestLog_Text_UsedTeleportToLocation,
[FIELD_MOVE_DIG] = QuestLog_Text_UsedDigInLocation,
[FIELD_MOVE_MILK_DRINK] = QuestLog_Text_UsedMilkDrink,
[FIELD_MOVE_SOFT_BOILED] = QuestLog_Text_UsedSoftboiled,
[FIELD_MOVE_SWEET_SCENT] = QuestLog_Text_UsedSweetScent
[FIELD_MOVE_FLASH] = gText_QuestLog_UsedFlash,
[FIELD_MOVE_CUT] = gText_QuestLog_UsedCut,
[FIELD_MOVE_FLY] = gText_QuestLog_UsedFly,
[FIELD_MOVE_STRENGTH] = gText_QuestLog_UsedStrength,
[FIELD_MOVE_SURF] = gText_QuestLog_UsedSurf,
[FIELD_MOVE_ROCK_SMASH] = gText_QuestLog_UsedRockSmash,
[FIELD_MOVE_WATERFALL] = gText_QuestLog_UsedWaterfall,
[FIELD_MOVE_TELEPORT] = gText_QuestLog_UsedTeleportToLocation,
[FIELD_MOVE_DIG] = gText_QuestLog_UsedDigInLocation,
[FIELD_MOVE_MILK_DRINK] = gText_QuestLog_UsedMilkDrink,
[FIELD_MOVE_SOFT_BOILED] = gText_QuestLog_UsedSoftboiled,
[FIELD_MOVE_SWEET_SCENT] = gText_QuestLog_UsedSweetScent
};
static u16 *BufferQuestLogData_DepartedLocation(u16 *a0, const u16 *eventData)
@@ -4217,9 +4090,9 @@ static const u16 *BufferQuestLogText_DepartedLocation(const u16 *eventData)
if (r5_2[0] != gUnknown_8456C17[r4])
continue;
if (FlagGet(FLAG_BADGE01_GET + r4) == TRUE)
StringExpandPlaceholders(gStringVar4, QuestLog_Text_DepartedGym);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_DepartedGym);
else
StringExpandPlaceholders(gStringVar4, QuestLog_Text_GymWasFullOfToughTrainers);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_GymWasFullOfToughTrainers);
break;
}
if (r4 == 8)
@@ -4290,7 +4163,7 @@ static const u16 *BufferQuestLogText_UsedFieldMove(const u16 *eventData)
if (r5[0] == FIELD_MOVE_TELEPORT)
{
if (r5[1] == 0x58)
StringCopy(gStringVar3, QuestLog_Text_Home);
StringCopy(gStringVar3, gText_QuestLog_Home);
else
StringCopy(gStringVar3, gText_PokemonCenter);
}
@@ -4323,12 +4196,12 @@ static const u16 *BufferQuestLogText_BoughtItem(const u16 *eventData)
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, ItemId_GetName(r4[0]));
if (r4[1] < 2)
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_BoughtItem);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_BoughtItem);
else
{
ConvertIntToDecimalStringN(gStringVar2, r6, STR_CONV_MODE_LEFT_ALIGN, 6);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, gStringVar2);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_BoughtItemsIncludingItem);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_BoughtItemsIncludingItem);
}
return (const u16 *)(r7 + 2);
}
@@ -4359,15 +4232,15 @@ static const u16 *BufferQuestLogText_SoldItem(const u16 *eventData)
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gStringVar1);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, ItemId_GetName(r5[0]));
if (r5[1] == 1)
DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, QuestLog_Text_JustOne);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, gText_QuestLog_JustOne);
else
{
ConvertIntToDecimalStringN(gStringVar2, r5[1], STR_CONV_MODE_LEFT_ALIGN, 3);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(4, gStringVar2);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar3, QuestLog_Text_Num);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar3, gText_QuestLog_Num);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, gStringVar3);
}
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_SoldNumOfItem);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_SoldNumOfItem);
}
else
{
@@ -4375,7 +4248,7 @@ static const u16 *BufferQuestLogText_SoldItem(const u16 *eventData)
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, ItemId_GetName(r5[0]));
ConvertIntToDecimalStringN(gStringVar2, r6, STR_CONV_MODE_LEFT_ALIGN, 6);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, gStringVar2);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_SoldItemsIncludingItem);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_SoldItemsIncludingItem);
}
return (const u16 *)(r7 + 2);
}
@@ -4396,7 +4269,7 @@ static const u16 *BufferQuestLogText_ObtainedItem(const u16 *eventData)
const u8 *r5 = (const u8 *)r4 + 2;
GetMapNameGeneric(gStringVar1, r5[0]);
StringCopy(gStringVar2, ItemId_GetName(r4[0]));
StringExpandPlaceholders(gStringVar4, QuestLog_Text_ObtainedItemInLocation);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_ObtainedItemInLocation);
return (const u16 *)(r5 + 2);
}
@@ -4474,7 +4347,7 @@ static const u16 *BufferQuestLogText_ArrivedInLocation(const u16 *eventData)
{
const u16 *r4 = sub_8113E88(QL_EVENT_ARRIVED, eventData);
GetMapNameGeneric(gStringVar1, (u8)r4[0]);
StringExpandPlaceholders(gStringVar4, QuestLog_Text_ArrivedInLocation);
StringExpandPlaceholders(gStringVar4, gText_QuestLog_ArrivedInLocation);
return r4 + 1;
}
src/reshow_battle_screen.c
+4 -4
View File
@@ -36,17 +36,17 @@ void ReshowBattleScreenAfterMenu(void)
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
{
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
HelpSystem_SetSomeVariable2(0x19);
SetHelpContext(HELPCONTEXT_TRAINER_BATTLE_DOUBLE);
else
HelpSystem_SetSomeVariable2(0x18);
SetHelpContext(HELPCONTEXT_TRAINER_BATTLE_SINGLE);
}
else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
{
HelpSystem_SetSomeVariable2(0x1A);
SetHelpContext(HELPCONTEXT_SAFARI_BATTLE);
}
else
{
HelpSystem_SetSomeVariable2(0x17);
SetHelpContext(HELPCONTEXT_WILD_BATTLE);
}
}
SetMainCallback2(CB2_ReshowBattleScreenAfterMenu);
src/roamer.c
+1 -1
View File
@@ -61,7 +61,7 @@ void ClearRoamerData(void)
#define GetRoamerSpecies() ({\
u16 a;\
switch (ScrSpecial_GetStarter())\
switch (GetStarterSpecies())\
{\
default:\
a = SPECIES_RAIKOU;\
src/scrcmd.c
+3 -3
View File
@@ -1892,7 +1892,7 @@ bool8 ScrCmd_trainerbattle(struct ScriptContext *ctx)
bool8 ScrCmd_dotrainerbattle(struct ScriptContext *ctx)
{
BattleSetup_StartTrainerBattle();
StartTrainerBattle();
return TRUE;
}
@@ -1944,7 +1944,7 @@ bool8 ScrCmd_setwildbattle(struct ScriptContext *ctx)
bool8 ScrCmd_dowildbattle(struct ScriptContext *ctx)
{
BattleSetup_StartScriptedWildBattle();
StartScriptedWildBattle();
ScriptContext1_Stop();
return TRUE;
}
@@ -2111,7 +2111,7 @@ bool8 ScrCmd_setmetatile(struct ScriptContext *ctx)
if (!v8)
MapGridSetMetatileIdAt(x, y, tileId);
else
MapGridSetMetatileIdAt(x, y, tileId | 0xC00);
MapGridSetMetatileIdAt(x, y, tileId | METATILE_COLLISION_MASK);
return FALSE;
}
src/script_menu.c
+5 -5
View File
@@ -944,7 +944,7 @@ static void Hask_MultichoiceGridMenu_HandleInput(u8 taskId)
EnableBothScriptContexts();
}
bool8 ScrSpecial_CreatePCMenu(void)
bool8 CreatePCMenu(void)
{
if (FuncIsActiveTask(Task_MultichoiceMenu_HandleInput) == TRUE)
return FALSE;
@@ -1116,7 +1116,7 @@ void Task_WaitMuseumFossilPic(u8 taskId)
}
}
bool8 Special_OpenMuseumFossilPic(void)
bool8 OpenMuseumFossilPic(void)
{
u8 spriteId;
u8 taskId;
@@ -1149,7 +1149,7 @@ bool8 Special_OpenMuseumFossilPic(void)
return TRUE;
}
bool8 Special_CloseMuseumFossilPic(void)
bool8 CloseMuseumFossilPic(void)
{
u8 taskId = FindTaskIdByFunc(Task_WaitMuseumFossilPic);
if (taskId == 0xFF)
@@ -1197,7 +1197,7 @@ void QLPlaybackCB_DestroyScriptMenuMonPicSprites(void)
}
}
void Special_DrawSeagallopDestinationMenu(void)
void DrawSeagallopDestinationMenu(void)
{
// 8004 = Starting location
// 8005 = Page (0: Verm, One, Two, Three, Four, Other, Exit; 1: Four, Five, Six, Seven, Other, Exit)
@@ -1249,7 +1249,7 @@ void Special_DrawSeagallopDestinationMenu(void)
}
}
u16 Special_GetSelectedSeagallopDestination(void)
u16 GetSelectedSeagallopDestination(void)
{
// 8004 = Starting location
// 8005 = Page (0: Verm, One, Two, Three, Four, Other, Exit; 1: Four, Five, Six, Seven, Other, Exit)
src/script_pokemon_util.c
+1 -1
View File
@@ -117,7 +117,7 @@ static bool8 CheckPartyMonHasHeldItem(u16 item)
return FALSE;
}
bool8 GetNameOfEnigmaBerryInPlayerParty(void)
bool8 DoesPartyHaveEnigmaBerry(void)
{
bool8 hasItem = CheckPartyMonHasHeldItem(ITEM_ENIGMA_BERRY);
if (hasItem == TRUE)
src/seagallop.c
+1 -1
View File
@@ -16,7 +16,7 @@
#include "field_weather.h"
#include "constants/songs.h"
#include "constants/maps.h"
#include "seagallop.h"
#include "constants/seagallop.h"
#define TILESTAG_FERRY 3000
#define TILESTAG_WAKE 4000
src/ss_anne.c
+1 -1
View File
@@ -79,7 +79,7 @@ static const struct SpriteTemplate sSmokeSpriteTemplate = {
SmokeSpriteCallback
};
void Special_SSAnneDepartureCutscene(void)
void DoSSAnneDepartureCutscene(void)
{
u8 taskId;
src/start_menu.c
+8 -8
View File
@@ -562,8 +562,8 @@ static bool8 StartMenuLinkPlayerCallback(void)
static bool8 StartCB_Save1(void)
{
HelpSystem_BackupSomeVariable();
HelpSystem_SetSomeVariable2(12);
BackupHelpContext();
SetHelpContext(HELPCONTEXT_SAVE);
StartMenu_PrepareForSave();
sStartMenuCallback = StartCB_Save2;
return FALSE;
@@ -579,19 +579,19 @@ static bool8 StartCB_Save2(void)
ClearDialogWindowAndFrameToTransparent(0, TRUE);
sub_80696C0();
ScriptContext2_Disable();
HelpSystem_RestoreSomeVariable();
RestoreHelpContext();
return TRUE;
case SAVECB_RETURN_CANCEL:
ClearDialogWindowAndFrameToTransparent(0, FALSE);
DrawStartMenuInOneGo();
HelpSystem_RestoreSomeVariable();
RestoreHelpContext();
sStartMenuCallback = StartCB_HandleInput;
break;
case SAVECB_RETURN_ERROR:
ClearDialogWindowAndFrameToTransparent(0, TRUE);
sub_80696C0();
ScriptContext2_Disable();
HelpSystem_RestoreSomeVariable();
RestoreHelpContext();
return TRUE;
}
return FALSE;
@@ -614,8 +614,8 @@ static u8 RunSaveDialogCB(void)
void Field_AskSaveTheGame(void)
{
HelpSystem_BackupSomeVariable();
HelpSystem_SetSomeVariable2(12);
BackupHelpContext();
SetHelpContext(HELPCONTEXT_SAVE);
StartMenu_PrepareForSave();
CreateTask(task50_save_game, 80);
}
@@ -645,7 +645,7 @@ static void task50_save_game(u8 taskId)
}
DestroyTask(taskId);
EnableBothScriptContexts();
HelpSystem_RestoreSomeVariable();
RestoreHelpContext();
}
static void CloseSaveMessageWindow(void)
src/strings.c
+1335
View File
File diff suppressed because it is too large Load Diff
src/teachy_tv.c
+1 -1
View File
@@ -500,7 +500,7 @@ static void TeachyTvMainCallback(void)
ScheduleBgCopyTilemapToVram(1);
ScheduleBgCopyTilemapToVram(2);
ScheduleBgCopyTilemapToVram(3);
HelpSystem_SetSomeVariable(9); // help system something
SetHelpContextDontCheckBattle(HELPCONTEXT_BAG);
BlendPalettes(0xFFFFFFFF, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
SetVBlankCallback(TeachyTvVblankHandler);
src/title_screen.c
+1 -1
View File
@@ -575,7 +575,7 @@ static void SetTitleScreenScene_Run(s16 * data)
switch (data[1])
{
case 0:
HelpSystem_SetSomeVariable2(1);
SetHelpContext(HELPCONTEXT_TITLE_SCREEN);
CreateTask(Task_TitleScreen_BlinkPressStart, 0);
CreateTask(Task_FlameOrLeafSpawner, 5);
SetGpuRegsForTitleScreenRun();
src/tm_case.c
+1 -1
View File
@@ -797,7 +797,7 @@ static void Task_SelectTMAction_FromFieldBag(u8 taskId)
Menu_InitCursor(sTMCaseDynamicResources->contextMenuWindowId, 2, 0, 2, GetFontAttribute(2, 1) + 2, sTMCaseDynamicResources->numMenuActions, 0);
strbuf = Alloc(256);
GetTMNumberAndMoveString(strbuf, gSpecialVar_ItemId);
StringAppend(strbuf, gText_IsSelected);
StringAppend(strbuf, gText_Var1IsSelected + 2); // +2 skips over the stringvar
AddTextPrinterParameterized_ColorByIndex(2, 2, strbuf, 0, 2, 1, 0, 0, 1);
Free(strbuf);
if (itemid_is_unique(gSpecialVar_ItemId))
src/trainer_card.c
+3 -3
View File
@@ -570,7 +570,7 @@ static void Task_TrainerCard(u8 taskId)
if (JOY_NEW(A_BUTTON))
{
HelpSystem_SetSomeVariable2(11);
SetHelpContext(HELPCONTEXT_TRAINER_CARD_BACK);
FlipTrainerCard();
PlaySE(SE_CARD1);
sTrainerCardDataPtr->mainState = STATE_WAIT_FLIP_TO_BACK;
@@ -609,7 +609,7 @@ static void Task_TrainerCard(u8 taskId)
}
else
{
HelpSystem_SetSomeVariable2(10);
SetHelpContext(HELPCONTEXT_TRAINER_CARD_FRONT);
FlipTrainerCard();
sTrainerCardDataPtr->mainState = STATE_WAIT_FLIP_TO_FRONT;
PlaySE(SE_CARD1);
@@ -1042,7 +1042,7 @@ static void InitBgsAndWindows(void)
static void SetTrainerCardCB2(void)
{
SetMainCallback2(CB2_TrainerCard);
HelpSystem_SetSomeVariable2(10);
SetHelpContext(HELPCONTEXT_TRAINER_CARD_FRONT);
}
static void SetUpTrainerCardTask(void)
src/trainer_see.c
+1 -1
View File
@@ -544,7 +544,7 @@ void MovementAction_RevealTrainer_RunTrainerSeeFuncList(struct ObjectEvent *var)
StoreWordInTwoHalfwords((u16 *)&gTasks[CreateTask(Task_RevealTrainer_RunTrainerSeeFuncList, 0)].data[1], (u32)var);
}
void ScrSpecial_EndTrainerApproach(void)
void EndTrainerApproach(void)
{
StartTrainerApproachWithFollowupTask(Task_DestroyTrainerApproachTask);
}
src/vs_seeker.c
+23 -16
View File
@@ -27,6 +27,13 @@
#include "constants/items.h"
#include "constants/quest_log.h"
enum
{
VSSEEKER_NOT_CHARGED,
VSSEEKER_NO_ONE_IN_RANGE,
VSSEEKER_CAN_USE,
};
typedef enum
{
VSSEEKER_RESPONSE_NO_RESPONSE,
@@ -735,17 +742,17 @@ void Task_VsSeeker_0(u8 taskId)
sVsSeeker = AllocZeroed(sizeof(struct VsSeekerStruct));
GatherNearbyTrainerInfo();
respval = CanUseVsSeeker();
if (respval == 0)
if (respval == VSSEEKER_NOT_CHARGED)
{
Free(sVsSeeker);
DisplayItemMessageOnField(taskId, 2, gUnknown_81C137C, sub_80A1E0C);
DisplayItemMessageOnField(taskId, 2, VSSeeker_Text_BatteryNotChargedNeedXSteps, sub_80A1E0C);
}
else if (respval == 1)
else if (respval == VSSEEKER_NO_ONE_IN_RANGE)
{
Free(sVsSeeker);
DisplayItemMessageOnField(taskId, 2, gUnknown_81C13D6, sub_80A1E0C);
DisplayItemMessageOnField(taskId, 2, VSSeeker_Text_NoTrainersWithinRange, sub_80A1E0C);
}
else if (respval == 2)
else if (respval == VSSEEKER_CAN_USE)
{
ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, 0, gSpecialVar_ItemId, 0xffff);
FieldEffectStart(FLDEFF_USE_VS_SEEKER);
@@ -814,13 +821,13 @@ static void Task_VsSeeker_3(u8 taskId)
{
if (ScriptMovement_IsObjectMovementFinished(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup))
{
if (sVsSeeker->responseCode == 0)
if (sVsSeeker->responseCode == VSSEEKER_RESPONSE_NO_RESPONSE)
{
DisplayItemMessageOnField(taskId, 2, gUnknown_81C1429, sub_80A1E0C);
DisplayItemMessageOnField(taskId, 2, VSSeeker_Text_TrainersNotReady, sub_80A1E0C);
}
else
{
if (sVsSeeker->responseCode == 2)
if (sVsSeeker->responseCode == VSSEEKER_RESPONSE_FOUND_REMATCHES)
StartAllRespondantIdleMovements();
ClearDialogWindowAndFrame(0, 1);
sub_80696C0();
@@ -831,20 +838,20 @@ static void Task_VsSeeker_3(u8 taskId)
}
}
u8 CanUseVsSeeker(void)
static u8 CanUseVsSeeker(void)
{
u8 vsSeekerChargeSteps = gSaveBlock1Ptr->trainerRematchStepCounter;
if (vsSeekerChargeSteps == 100)
{
if (GetRematchableTrainerLocalId() == 0xFF)
return 1;
return VSSEEKER_NO_ONE_IN_RANGE;
else
return 2;
return VSSEEKER_CAN_USE;
}
else
{
TV_PrintIntToStringVar(0, 100 - vsSeekerChargeSteps);
return 0;
return VSSEEKER_NOT_CHARGED;
}
}
@@ -928,11 +935,11 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
PlaySE(SE_PIN);
FlagSet(FLAG_SYS_VS_SEEKER_CHARGING);
sub_810C640();
return 2;
return VSSEEKER_RESPONSE_FOUND_REMATCHES;
}
if (sVsSeeker->trainerHasNotYetBeenFought)
return 1;
return 0;
return VSSEEKER_RESPONSE_UNFOUGHT_TRAINERS;
return VSSEEKER_RESPONSE_NO_RESPONSE;
}
void sub_810CB90(void)
@@ -1079,7 +1086,7 @@ s32 GetRematchTrainerId(u16 a0)
return sVsSeekerData[i].trainerIdxs[j];
}
u8 ScrSpecial_GetTrainerEyeRematchFlag(void) // unreferenced, or reference not disassembled
u8 IsTrainerReadyForRematch(void)
{
return sub_810CED0(sVsSeekerData, gTrainerBattleOpponent_A);
}
src/wild_encounter.c
+11 -11
View File
@@ -387,7 +387,7 @@ bool8 StandardWildEncounter(u32 currMetatileBehavior, u16 previousMetatileBehavi
return FALSE;
}
BattleSetup_StartRoamerBattle();
StartRoamerBattle();
return TRUE;
}
else
@@ -396,7 +396,7 @@ bool8 StandardWildEncounter(u32 currMetatileBehavior, u16 previousMetatileBehavi
// try a regular wild land encounter
if (TryGenerateWildMon(gWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, WILD_CHECK_REPEL) == TRUE)
{
BattleSetup_StartWildBattle();
StartWildBattle();
return TRUE;
}
else
@@ -426,14 +426,14 @@ bool8 StandardWildEncounter(u32 currMetatileBehavior, u16 previousMetatileBehavi
return FALSE;
}
BattleSetup_StartRoamerBattle();
StartRoamerBattle();
return TRUE;
}
else // try a regular surfing encounter
{
if (TryGenerateWildMon(gWildMonHeaders[headerId].waterMonsInfo, WILD_AREA_WATER, WILD_CHECK_REPEL) == TRUE)
{
BattleSetup_StartWildBattle();
StartWildBattle();
return TRUE;
}
else
@@ -447,7 +447,7 @@ bool8 StandardWildEncounter(u32 currMetatileBehavior, u16 previousMetatileBehavi
return FALSE;
}
void ScrSpecial_RockSmashWildEncounter(void)
void RockSmashWildEncounter(void)
{
u16 headerIdx = GetCurrentMapWildMonHeaderId();
if (headerIdx == 0xFFFF)
@@ -458,7 +458,7 @@ void ScrSpecial_RockSmashWildEncounter(void)
gSpecialVar_Result = FALSE;
else if (TryGenerateWildMon(gWildMonHeaders[headerIdx].rockSmashMonsInfo, WILD_AREA_ROCKS, WILD_CHECK_REPEL) == TRUE)
{
BattleSetup_StartWildBattle();
StartWildBattle();
gSpecialVar_Result = TRUE;
}
else
@@ -478,7 +478,7 @@ bool8 SweetScentWildEncounter(void)
{
if (TryStartRoamerEncounter() == TRUE)
{
BattleSetup_StartRoamerBattle();
StartRoamerBattle();
return TRUE;
}
@@ -487,14 +487,14 @@ bool8 SweetScentWildEncounter(void)
TryGenerateWildMon(gWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0);
BattleSetup_StartWildBattle();
StartWildBattle();
return TRUE;
}
else if (MapGridGetMetatileAttributeAt(x, y, 4) == 2)
{
if (TryStartRoamerEncounter() == TRUE)
{
BattleSetup_StartRoamerBattle();
StartRoamerBattle();
return TRUE;
}
@@ -502,7 +502,7 @@ bool8 SweetScentWildEncounter(void)
return FALSE;
TryGenerateWildMon(gWildMonHeaders[headerId].waterMonsInfo, WILD_AREA_WATER, 0);
BattleSetup_StartWildBattle();
StartWildBattle();
return TRUE;
}
}
@@ -524,7 +524,7 @@ void FishingWildEncounter(u8 rod)
{
GenerateFishingEncounter(gWildMonHeaders[GetCurrentMapWildMonHeaderId()].fishingMonsInfo, rod);
IncrementGameStat(GAME_STAT_FISHING_CAPTURES);
BattleSetup_StartWildBattle();
StartWildBattle();
}
u16 GetLocalWildMon(bool8 *isWaterMon)
src/wild_pokemon_area.c
+1 -1
View File
@@ -244,7 +244,7 @@ static s32 CountRoamerNests(u16 species, struct Subsprite * subsprites)
roamerIdx = GetRoamerIndex(species);
if (roamerIdx < 0)
return 0;
if (sRoamerPairs[roamerIdx].starter != ScrSpecial_GetStarter())
if (sRoamerPairs[roamerIdx].starter != GetStarterSpecies())
return 0;
roamerLocation = GetRoamerLocationMapSectionId();
dexAreaEntryLUTidx = 0;
src/wireless_communication_status_screen.c
+1 -1
View File
@@ -171,7 +171,7 @@ static void VBlankCB_WirelessCommunicationScreen(void)
TransferPlttBuffer();
}
void Special_WirelessCommunicationScreen(void)
void ShowWirelessCommunicationScreen(void)
{
SetMainCallback2(CB2_InitWirelessCommunicationScreen);
}