summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/debug/mori_debug_menu.c2
-rw-r--r--src/engine/trade.c12
-rw-r--r--src/engine/trainer_card.c2
-rw-r--r--src/field/battle_tower.c18
-rw-r--r--src/field/field_specials.c79
-rw-r--r--src/field/field_tasks.c6
-rw-r--r--src/field/money.c4
-rw-r--r--src/field/pokeblock.c6
-rw-r--r--src/field/secret_base.c4
-rw-r--r--src/field/tv.c12
-rw-r--r--src/pokemon/learn_move.c2
-rw-r--r--src/pokemon/pokedex.c2
-rw-r--r--src/scene/berry_blender.c10
-rw-r--r--src/script_pokemon_util_80F99CC.c10
14 files changed, 85 insertions, 84 deletions
diff --git a/src/debug/mori_debug_menu.c b/src/debug/mori_debug_menu.c
index 2c937bb28..83dba8b73 100644
--- a/src/debug/mori_debug_menu.c
+++ b/src/debug/mori_debug_menu.c
@@ -136,7 +136,7 @@ u8 MoriDebugMenu_10000Steps(void)
u8 MoriDebugMenu_MoveTutor(void)
{
- sub_8132670();
+ TeachMoveTutorMove();
CloseMenu();
return 1;
}
diff --git a/src/engine/trade.c b/src/engine/trade.c
index 0567b4d2f..0bc589ff4 100644
--- a/src/engine/trade.c
+++ b/src/engine/trade.c
@@ -5391,7 +5391,7 @@ static void sub_804D80C(struct Sprite *sprite)
}
}
-u16 sub_804D89C(void)
+u16 GetInGameTradeSpeciesInfo(void)
{
const struct InGameTrade *inGameTrade = &gIngameTrades[gSpecialVar_0x8004];
StringCopy(gStringVar1, gSpeciesNames[inGameTrade->playerSpecies]);
@@ -5408,7 +5408,7 @@ static void sub_804D8E4(void)
StringCopy(gStringVar2, gSpeciesNames[inGameTrade->species]);
}
-static void sub_804D948(u8 whichPlayerMon, u8 whichInGameTrade)
+static void _CreateInGameTradePokemon(u8 whichPlayerMon, u8 whichInGameTrade)
{
const struct InGameTrade *inGameTrade = &gIngameTrades[whichInGameTrade];
u8 level = GetMonData(&gPlayerParty[whichPlayerMon], MON_DATA_LEVEL);
@@ -5478,16 +5478,16 @@ static void sub_804DAD4(struct MailStruct *mail, const struct InGameTrade *trade
mail->itemId = trade->heldItem;
}
-u16 sub_804DB2C(void)
+u16 GetTradeSpecies(void)
{
if (GetMonData(&gPlayerParty[gSpecialVar_0x8005], MON_DATA_IS_EGG))
return SPECIES_NONE;
return GetMonData(&gPlayerParty[gSpecialVar_0x8005], MON_DATA_SPECIES);
}
-void sub_804DB68(void)
+void CreateInGameTradePokemon(void)
{
- sub_804D948(gSpecialVar_0x8005, gSpecialVar_0x8004);
+ _CreateInGameTradePokemon(gSpecialVar_0x8005, gSpecialVar_0x8004);
}
#ifdef NONMATCHING
@@ -5670,7 +5670,7 @@ static void sub_804E144(void)
UpdatePaletteFade();
}
-void sub_804E174(void)
+void DoInGameTradeScene(void)
{
ScriptContext2_Enable();
CreateTask(sub_804E1A0, 10);
diff --git a/src/engine/trainer_card.c b/src/engine/trainer_card.c
index dcd1197cb..ffa4cbd08 100644
--- a/src/engine/trainer_card.c
+++ b/src/engine/trainer_card.c
@@ -321,7 +321,7 @@ void sub_8093390(struct TrainerCard *trainerCard)
trainerCard->firstHallOfFameC = playTime & 0xFF;
trainerCard->hasPokedex = FlagGet(FLAG_SYS_POKEDEX_GET);
- trainerCard->var_3 = sub_8090FC0();
+ trainerCard->var_3 = CompletedHoennPokedex();
trainerCard->pokedexSeen = GetPokedexSeenCount();
trainerCard->trainerId = (gSaveBlock2.playerTrainerId[1] << 8) | gSaveBlock2.playerTrainerId[0];
diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c
index 12337631f..caebc6a7b 100644
--- a/src/field/battle_tower.c
+++ b/src/field/battle_tower.c
@@ -1608,7 +1608,7 @@ void sub_8135534(u8 taskId)
}
}
-void sub_813556C(void)
+void StartSpecialBattle(void)
{
s32 i;
u16 heldItem;
@@ -1616,7 +1616,7 @@ void sub_813556C(void)
switch (gSpecialVar_0x8004)
{
- case 0:
+ case 0: // battle tower battle
gBattleTypeFlags = (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_TRAINER);
gTrainerBattleOpponent = 0;
@@ -1627,7 +1627,7 @@ void sub_813556C(void)
transition = BattleSetup_GetBattleTowerBattleTransition();
BattleTransition_StartOnField(transition);
break;
- case 1:
+ case 1: // secret base battle
for (i = 0; i < PARTY_SIZE; i++)
{
heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM);
@@ -1639,7 +1639,7 @@ void sub_813556C(void)
transition = BattleSetup_GetBattleTowerBattleTransition();
BattleTransition_StartOnField(transition);
break;
- case 2:
+ case 2: // e-reader trainer battle
ZeroEnemyPartyMons();
for (i = 0; i < 3; i++)
@@ -1658,7 +1658,7 @@ void sub_813556C(void)
}
}
-void sub_8135668(void)
+void SetBattleTowerProperty(void)
{
s32 i;
u8 battleTowerLevelType = gSaveBlock2.battleTower.battleTowerLevelType;
@@ -1740,7 +1740,7 @@ void sub_8135668(void)
}
}
-void sub_81358A4(void)
+void BattleTowerUtil(void)
{
u8 battleTowerLevelType = gSaveBlock2.battleTower.battleTowerLevelType;
@@ -1789,7 +1789,7 @@ void sub_81358A4(void)
}
}
-void sub_8135A14(void)
+void SetBattleTowerParty(void)
{
s32 i;
@@ -1954,7 +1954,7 @@ void sub_8135AC4(void)
sub_8135A3C();
}
-void sub_8135BA0(void)
+void SaveBattleTowerProgress(void)
{
u8 battleTowerLevelType = gSaveBlock2.battleTower.battleTowerLevelType;
@@ -2336,7 +2336,7 @@ void PrintEReaderTrainerFarewellMessage(void)
}
}
-void sub_813610C(void)
+void TryEnableBravoTrainerBattleTower(void)
{
s32 i;
diff --git a/src/field/field_specials.c b/src/field/field_specials.c
index 1a4ebe1af..28ed5dcfc 100644
--- a/src/field/field_specials.c
+++ b/src/field/field_specials.c
@@ -688,7 +688,7 @@ void GetRivalSonDaughterString(void)
}
}
-u8 sub_810E300(void)
+u8 GetBattleOutcome(void)
{
return gBattleOutcome;
}
@@ -958,11 +958,11 @@ void EndLotteryCornerComputerEffect(void)
}
static void sub_810E874(void);
-void sub_810E944(void);
+void DisplayCurrentElevatorFloor(void);
void sub_810E984(u8);
bool8 sub_810EAC8(u8, u8);
void sub_810EB90(u8, u8);
-void sub_810EBEC(void);
+void ShakeScreenInElevator(void);
void sub_810EC34(u8);
void sub_810EC9C(u8);
void sub_810ECB0(void);
@@ -1074,11 +1074,11 @@ static void sub_810E874(void)
{
MenuPrint(gUnknown_083F8380[gUnknown_03000760[i].var0], 1, 2 * i + 1);
}
- sub_810E944();
+ DisplayCurrentElevatorFloor();
CreateTask(sub_810E984, 8);
}
-void sub_810E944(void)
+void DisplayCurrentElevatorFloor(void)
{
MenuDrawTextWindow(20, 0, 29, 5);
sub_8072BD8(gOtherText_NowOn, 21, 1, 64);
@@ -1116,7 +1116,7 @@ void sub_810E984(u8 taskId)
{
gSpecialVar_Result = 1;
gSpecialVar_0x8005 = gUnknown_0203925B;
- sub_810EBEC();
+ ShakeScreenInElevator();
FieldObjectTurnByLocalIdAndMap(gSpecialVar_LastTalked, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, DIR_SOUTH);
sub_810EEDC();
MenuZeroFillScreen();
@@ -1300,7 +1300,7 @@ void sub_810EB90(u8 newPos, u8 maxItems)
}
}
-void sub_810EBEC(void)
+void ShakeScreenInElevator(void)
{
u8 taskId = CreateTask(sub_810EC34, 9);
gTasks[taskId].data[0] = 1;
@@ -1779,12 +1779,12 @@ void GetSecretBaseNearbyMapName(void)
GetMapSectionName(gStringVar1, VarGet(VAR_SECRET_BASE_MAP), 0);
}
-u16 sub_810F404(void)
+u16 GetBestBattleTowerStreak(void)
{
return GetGameStat(GAME_STAT_BATTLE_TOWER_BEST_STREAK);
}
-void sub_810F414(void)
+void BufferEReaderTrainerName(void)
{
SetEReaderTrainerName(gStringVar1);
}
@@ -1793,7 +1793,7 @@ const u8 gUnknown_083F83E0[] = {12, 2, 4, 5, 1, 8, 7, 11, 3, 10, 9, 6};
const u8 gUnknown_083F83EC[] = {0, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5};
const u8 gUnknown_083F83F8[] = {3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5};
-u8 sub_810F424(void)
+u8 GetSlotMachineId(void)
{
u32 v0 = gSaveBlock1.easyChatPairs[0].unk0_0 + gSaveBlock1.easyChatPairs[0].unk2 + gUnknown_083F83E0[gSpecialVar_0x8004];
if (GetPriceReduction(2))
@@ -1803,10 +1803,10 @@ u8 sub_810F424(void)
return gUnknown_083F83EC[v0 % 12];
}
-bool8 sub_810F488(void)
+bool8 FoundAbandonedShipRoom1Key(void)
{
u16 *specVar = &gSpecialVar_0x8004;
- u16 flag = 0x277;
+ u16 flag = FLAG_HIDDEN_ITEM_1F;
*specVar = flag;
if (!FlagGet(flag))
{
@@ -1815,10 +1815,10 @@ bool8 sub_810F488(void)
return TRUE;
}
-bool8 sub_810F4B0(void)
+bool8 FoundAbandonedShipRoom2Key(void)
{
u16 *specVar = &gSpecialVar_0x8004;
- u16 flag = 0x278;
+ u16 flag = FLAG_HIDDEN_ITEM_20;
*specVar = flag;
if (!FlagGet(flag))
{
@@ -1827,10 +1827,10 @@ bool8 sub_810F4B0(void)
return TRUE;
}
-bool8 sub_810F4D4(void)
+bool8 FoundAbandonedShipRoom4Key(void)
{
u16 *specVar = &gSpecialVar_0x8004;
- u16 flag = 0x279;
+ u16 flag = FLAG_HIDDEN_ITEM_21;
*specVar = flag;
if (!FlagGet(flag))
{
@@ -1839,10 +1839,10 @@ bool8 sub_810F4D4(void)
return TRUE;
}
-bool8 sub_810F4FC(void)
+bool8 FoundAbandonedShipRoom6Key(void)
{
u16 *specVar = &gSpecialVar_0x8004;
- u16 flag = 0x27a;
+ u16 flag = FLAG_HIDDEN_ITEM_22;
*specVar = flag;
if (!FlagGet(flag))
{
@@ -1874,7 +1874,7 @@ bool8 ScrSpecial_AreLeadMonEVsMaxedOut(void)
return FALSE;
}
-u8 sub_810F5BC(void)
+u8 TryUpdateRusturfTunnelState(void)
{
if (!FlagGet(FLAG_RUSTURF_TUNNEL_OPENED) && gSaveBlock1.location.mapGroup == MAP_GROUP(RUSTURF_TUNNEL) && gSaveBlock1.location.mapNum == MAP_NUM(RUSTURF_TUNNEL))
{
@@ -2040,7 +2040,7 @@ void sub_810F8FC(void)
sub_805ADDC(6);
}
-u16 sub_810F908(void)
+u16 GetDaysUntilPacifidlogTMAvailable(void)
{
u16 tmReceivedDay = VarGet(VAR_PACIFIDLOG_TM_RECEIVED_DAY);
if (gLocalTime.days - tmReceivedDay >= 7)
@@ -2054,13 +2054,13 @@ u16 sub_810F908(void)
return 7 - (gLocalTime.days - tmReceivedDay);
}
-u16 sub_810F950(void)
+u16 SetPacifidlogTMReceivedDay(void)
{
VarSet(VAR_PACIFIDLOG_TM_RECEIVED_DAY, gLocalTime.days);
return gLocalTime.days;
}
-bool8 sub_810F96C(void)
+bool8 MonOTNameMatchesPlayer(void)
{
GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_OT_NAME, gStringVar1);
if (!StringCompareWithoutExtCtrlCodes(gSaveBlock2.playerName, gStringVar1))
@@ -2070,7 +2070,7 @@ bool8 sub_810F96C(void)
return TRUE;
}
-void sub_810F9AC(void)
+void BufferLottoTicketNumber(void)
{
if (gSpecialVar_Result >= 10000)
{
@@ -2109,10 +2109,10 @@ const u8 gUnknown_083F8408[] = {8, 9, 10, 11, 12, 13, 14, 15};
const u8 gUnknown_083F8410[] = {8, 13, 14, 11, 10, 12, 15, 9};
bool8 sub_810FF30(void);
-void sub_810FCE8(void);
+void UpdateMovedLilycoveFanClubMembers(void);
void sub_810FF48(void);
void sub_810FD80(void);
-u16 sub_810FCB0(void);
+u16 GetNumMovedLilycoveFanClubMembers(void);
int sub_810FB9C(void);
void ResetFanClub(void)
@@ -2125,7 +2125,7 @@ void sub_810FA74(void)
{
if (sub_810FF30())
{
- sub_810FCE8();
+ UpdateMovedLilycoveFanClubMembers();
gSaveBlock1.vars[0x42] = gSaveBlock2.playTimeHours;
}
}
@@ -2137,10 +2137,10 @@ void sub_810FAA0(void)
sub_810FF48();
sub_810FD80();
gSaveBlock1.vars[0x42] = gSaveBlock2.playTimeHours;
- FlagClear(0x315);
- FlagClear(0x316);
- FlagClear(0x317);
- FlagClear(0x318);
+ FlagClear(FLAG_HIDE_FANCLUB_OLD_LADY);
+ FlagClear(FLAG_HIDE_FANCLUB_BOY);
+ FlagClear(FLAG_HIDE_FANCLUB_LITTLE_BOY);
+ FlagClear(FLAG_HIDE_FANCLUB_LADY);
VarSet(VAR_LILYCOVE_FAN_CLUB_STATE, 1);
}
}
@@ -2151,7 +2151,7 @@ u8 sub_810FB10(u8 a0)
{
if ((gSaveBlock1.vars[0x41] & 0x7f) + gUnknown_083F8404[a0] >= 20)
{
- if (sub_810FCB0() < 3)
+ if (GetNumMovedLilycoveFanClubMembers() < 3)
{
sub_810FB9C();
gSaveBlock1.vars[0x41] &= 0xff80;
@@ -2193,7 +2193,7 @@ int sub_810FC18(void)
{
u8 i;
int retval = 0;
- if (sub_810FCB0() == TRUE)
+ if (GetNumMovedLilycoveFanClubMembers() == 1)
{
return 0;
}
@@ -2216,28 +2216,29 @@ int sub_810FC18(void)
return retval;
}
-u16 sub_810FCB0(void)
+u16 GetNumMovedLilycoveFanClubMembers(void)
{
u8 i;
u8 retval = 0;
- for (i=0; i<8; i++)
+ for (i = 0; i < 8; i++)
{
if ((gSaveBlock1.vars[0x41] >> (i + 8)) & 1)
{
- retval ++;
+ retval++;
}
}
+
return retval;
}
-void sub_810FCE8(void)
+void UpdateMovedLilycoveFanClubMembers(void)
{
u8 i = 0;
if (gSaveBlock2.playTimeHours < 999)
{
while (1)
{
- if (sub_810FCB0() < 5)
+ if (GetNumMovedLilycoveFanClubMembers() < 5)
{
gSaveBlock1.vars[0x42] = gSaveBlock2.playTimeHours;
break;
@@ -2257,7 +2258,7 @@ void sub_810FCE8(void)
}
}
-bool8 sub_810FD60(void)
+bool8 ShouldMoveLilycoveFanClubMember(void)
{
return (gSaveBlock1.vars[0x41] >> gSpecialVar_0x8004) & 0x01;
}
@@ -2271,7 +2272,7 @@ void sub_810FD80(void)
void sub_810FE1C(void *, u8, u8);
-void sub_810FDAC(void)
+void BufferStreakTrainerText(void)
{
u8 a = 0;
u8 b = 0;
diff --git a/src/field/field_tasks.c b/src/field/field_tasks.c
index 393c7d75a..ce5fc6c0e 100644
--- a/src/field/field_tasks.c
+++ b/src/field/field_tasks.c
@@ -608,14 +608,14 @@ bool32 sub_8069D34(s16 x, s16 y)
return FALSE;
}
-void sub_8069D78(void)
+void SetSootopolisGymCrackedIceMetatiles(void)
{
s32 x, y;
s32 width = gMapHeader.mapData->width;
s32 height = gMapHeader.mapData->height;
- for (x=0; x<width; x++)
+ for (x = 0; x < width; x++)
{
- for (y=0; y<height; y++)
+ for (y = 0; y < height; y++)
{
if (sub_8069D34(x, y) == TRUE)
{
diff --git a/src/field/money.c b/src/field/money.c
index f277ac905..d0f0ab1f6 100644
--- a/src/field/money.c
+++ b/src/field/money.c
@@ -291,12 +291,12 @@ void CloseMoneyWindow(u8 x, u8 y)
MenuZeroFillWindowRect(x, y, x + 13, y + 3);
}
-bool8 sub_80B7CE8(void)
+bool8 HasEnoughMoneyFor(void)
{
return IsEnoughMoney(gSaveBlock1.money, gSpecialVar_0x8005);
}
-void sub_80B7D0C(void)
+void PayMoneyFor(void)
{
RemoveMoney(&gSaveBlock1.money, gSpecialVar_0x8005);
}
diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c
index 4a904fbb1..640d4731f 100644
--- a/src/field/pokeblock.c
+++ b/src/field/pokeblock.c
@@ -426,7 +426,7 @@ void sub_810BADC(void)
SetMainCallback2(sub_810B96C);
}
-void sub_810BAF4(void)
+void OpenPokeblockCaseOnFeeder(void)
{
sub_810BA7C(3);
SetMainCallback2(sub_810B96C);
@@ -1041,7 +1041,7 @@ u8 sub_810C9E8(struct Pokeblock *pokeblock)
return feel;
}
-s8 sub_810CA00(void)
+s8 GetFirstFreePokeblockSlot(void)
{
u8 i;
for (i=0; i<ARRAY_COUNT(gSaveBlock1.pokeblocks); i++)
@@ -1056,7 +1056,7 @@ s8 sub_810CA00(void)
bool8 sub_810CA34(struct Pokeblock *pokeblock)
{
- s8 idx = sub_810CA00();
+ s8 idx = GetFirstFreePokeblockSlot();
if (idx == -1)
{
return FALSE;
diff --git a/src/field/secret_base.c b/src/field/secret_base.c
index 5c53e1e28..2e4138a3b 100644
--- a/src/field/secret_base.c
+++ b/src/field/secret_base.c
@@ -575,7 +575,7 @@ u8 *GetSecretBaseMapName(u8 *dest) {
return sub_80BC190(dest, VarGet(VAR_CURRENT_SECRET_BASE));
}
-void sub_80BC224(void) {
+void BufferSecretBaseOwnerName(void) {
u8 *var0 = gSaveBlock1.secretBases[(u8)VarGet(VAR_CURRENT_SECRET_BASE)].playerName;
u8 *var1 = gStringVar1;
u8 var2 = sub_80BB8A8(var0);
@@ -830,7 +830,7 @@ void sub_80BC474(void)
}
}
-void sub_80BC50C(void)
+void MoveSecretBase(void)
{
u16 backupValue;
sub_80BC474();
diff --git a/src/field/tv.c b/src/field/tv.c
index 93fe6a0f5..d7a75a709 100644
--- a/src/field/tv.c
+++ b/src/field/tv.c
@@ -686,7 +686,7 @@ void GabbyAndTyBeforeInterview(void)
FlagSet(FLAG_TEMP_1);
}
-void sub_80BDC14(void)
+void GabbyAndTyAfterInterview(void)
{
gSaveBlock1.gabbyAndTyData.valB_0 = gSaveBlock1.gabbyAndTyData.valA_0;
gSaveBlock1.gabbyAndTyData.valB_1 = gSaveBlock1.gabbyAndTyData.valA_1;
@@ -725,7 +725,7 @@ bool8 GabbyAndTyGetLastQuote(void)
return TRUE;
}
-u8 sub_80BDD18(void)
+u8 GabbyAndTyGetLastBattleTrivia(void)
{
if (!gSaveBlock1.gabbyAndTyData.valB_0)
return 1;
@@ -2073,9 +2073,9 @@ bool8 TV_PutNameRaterShowOnTheAirIfNicnkameChanged(void)
return TRUE;
}
-void c2_080CC144(void);
+void ChangePokemonNickname_CB(void);
-void sub_80BF9F8(void)
+void ChangePokemonNickname(void)
{
u16 spec;
u16 gender;
@@ -2086,10 +2086,10 @@ void sub_80BF9F8(void)
spec = GetMonData(&(gPlayerParty[gSpecialVar_0x8004]), MON_DATA_SPECIES, 0);
gender = GetMonGender(&(gPlayerParty[gSpecialVar_0x8004]));
pval = GetMonData(&(gPlayerParty[gSpecialVar_0x8004]), MON_DATA_PERSONALITY, 0);
- DoNamingScreen(3, gStringVar2, spec, gender, pval, c2_080CC144);
+ DoNamingScreen(3, gStringVar2, spec, gender, pval, ChangePokemonNickname_CB);
}
-void c2_080CC144(void)
+void ChangePokemonNickname_CB(void)
{
SetMonData(&(gPlayerParty[gSpecialVar_0x8004]), MON_DATA_NICKNAME, gStringVar2);
c2_exit_to_overworld_1_continue_scripts_restart_music();
diff --git a/src/pokemon/learn_move.c b/src/pokemon/learn_move.c
index 5eee45b23..ef1d66349 100644
--- a/src/pokemon/learn_move.c
+++ b/src/pokemon/learn_move.c
@@ -239,7 +239,7 @@ void VBlankCB_LearnMove(void)
TransferPlttBuffer();
}
-void sub_8132670(void)
+void TeachMoveTutorMove(void)
{
ScriptContext2_Enable();
CreateTask(sub_813269C, 10);
diff --git a/src/pokemon/pokedex.c b/src/pokemon/pokedex.c
index a4d84bebd..1c1c71454 100644
--- a/src/pokemon/pokedex.c
+++ b/src/pokemon/pokedex.c
@@ -4109,7 +4109,7 @@ u16 GetHoennPokedexCount(u8 caseID)
return count;
}
-bool8 sub_8090FC0(void)
+bool8 CompletedHoennPokedex(void)
{
u16 i;
diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c
index d147d11ce..53308e856 100644
--- a/src/scene/berry_blender.c
+++ b/src/scene/berry_blender.c
@@ -200,7 +200,7 @@ void sub_80A6978(void);
u8 sub_80A7DEC(u8 berryId, u8 x, u8 y, bool8 animate);
void sub_814A880(u8 a1, u8 a2);
u8 sub_814A5C0(u8 a1, u16 a2, u8 a3, u16 a4, u8 a5);
-s8 sub_810CA00(void);
+s8 GetFirstFreePokeblockSlot(void);
bool8 sub_810CA34(struct Pokeblock *pokeblock);
#ifdef GERMAN
extern void de_sub_8073110();
@@ -933,7 +933,7 @@ static void sub_804E4FC(void)
REG_BG1VOFS = 0;
}
-void sub_804E538(void)
+void DoBerryBlending(void)
{
u8* field6F; //this temp value is needed to match
@@ -2621,7 +2621,7 @@ static void sub_8050954(void)
gBerryBlenderData->field_7C = 2;
gSendCmd[1] = 0x9999;
}
- else if (sub_810CA00() == -1)
+ else if (GetFirstFreePokeblockSlot() == -1)
{
gBerryBlenderData->field_7C = 3;
gSendCmd[1] = 0xAAAA;
@@ -2816,7 +2816,7 @@ static void sub_8050E30(void)
if (!gPaletteFade.active)
{
if (gBerryBlenderData->field_70[0] == 0x2222)
- SetMainCallback2(sub_804E538);
+ SetMainCallback2(DoBerryBlending);
else
{
gBerryBlenderData->framesToWait = 0;
@@ -2880,7 +2880,7 @@ static void sub_80510E8(void)
if (!gPaletteFade.active)
{
if (gBerryBlenderData->field_7C == 0)
- SetMainCallback2(sub_804E538);
+ SetMainCallback2(DoBerryBlending);
else
SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
}
diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c
index b58363d31..df83d3e2d 100644
--- a/src/script_pokemon_util_80F99CC.c
+++ b/src/script_pokemon_util_80F99CC.c
@@ -39,7 +39,7 @@ void sub_80F99CC(void)
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
}
-void sub_80F9A0C(void)
+void SelectMonForNPCTrade(void)
{
u8 taskId;
@@ -49,7 +49,7 @@ void sub_80F9A0C(void)
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
}
-void sub_80F9A4C(void)
+void SelectMoveTutorMon(void)
{
u8 taskId;
@@ -272,7 +272,7 @@ void HandleMoveTutorPartyMenu(u8 var)
}
}
-void sub_80F9EEC(void)
+void SelectMove(void)
{
ShowSelectMovePokemonSummaryScreen(&gPlayerParty[0], gSpecialVar_0x8004, gPlayerPartyCount - 1, c2_exit_to_overworld_2_switch, 0);
UNK_2018000_STRUCT.unk8 = 3;
@@ -321,7 +321,7 @@ void sub_80F9FDC(struct Pokemon *pkmn, u8 moveIndex1, u8 moveIndex2)
SetMonData(pkmn, MON_DATA_PP_BONUSES, &bonuses);
}
-void sub_80FA0DC(void)
+void DeleteMonMove(void)
{
u16 i;
@@ -332,7 +332,7 @@ void sub_80FA0DC(void)
sub_80F9FDC(&gPlayerParty[gSpecialVar_0x8004], i, i + 1);
}
-void sub_80FA148(void)
+void IsSelectedMonEgg(void)
{
struct Pokemon *party = &gPlayerParty[gSpecialVar_0x8004];
gSpecialVar_Result = 0;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 20:30:08 +0000