mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-11-16 11:37:40 +01:00
Clean up berry_tree.inc and misc adjacent documentation
This commit is contained in:
parent
cefc31dd1e
commit
0db188b487
@ -199,7 +199,7 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "0",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "BattleFrontier_OutsideEast_EventScript_242CEA",
|
||||
"script": "BattleFrontier_OutsideEast_EventScript_Sudowoodo",
|
||||
"flag": "FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO"
|
||||
},
|
||||
{
|
||||
|
@ -102,24 +102,24 @@ BattleFrontier_OutsideEast_EventScript_242CE1:: @ 8242CE1
|
||||
msgbox BattleFrontier_OutsideEast_Text_243230, MSGBOX_NPC
|
||||
end
|
||||
|
||||
BattleFrontier_OutsideEast_EventScript_242CEA:: @ 8242CEA
|
||||
BattleFrontier_OutsideEast_EventScript_Sudowoodo:: @ 8242CEA
|
||||
lock
|
||||
faceplayer
|
||||
waitse
|
||||
playse 269
|
||||
applymovement 14, BattleFrontier_OutsideEast_Movement_242D69
|
||||
applymovement 14, BattleFrontier_OutsideEast_Movement_SudowoodoShake
|
||||
waitmovement 0
|
||||
release
|
||||
end
|
||||
|
||||
BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC
|
||||
BattleFrontier_OutsideEast_EventScript_WaterSudowoodo:: @ 8242CFC
|
||||
lock
|
||||
faceplayer
|
||||
special DoWateringBerryTreeAnim
|
||||
waitstate
|
||||
waitse
|
||||
playse 269
|
||||
applymovement 14, BattleFrontier_OutsideEast_Movement_242D69
|
||||
playse SE_USSOKI
|
||||
applymovement 14, BattleFrontier_OutsideEast_Movement_SudowoodoShake
|
||||
waitmovement 0
|
||||
msgbox gText_Sudowoodo_Attacked, MSGBOX_DEFAULT
|
||||
closemessage
|
||||
@ -127,28 +127,28 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC
|
||||
playmoncry SPECIES_SUDOWOODO, 2
|
||||
delay 40
|
||||
waitmoncry
|
||||
setvar VAR_LAST_TALKED, 14
|
||||
setvar VAR_LAST_TALKED, 14 @ Sudowoodo object event id
|
||||
setwildbattle SPECIES_SUDOWOODO, 40, ITEM_NONE
|
||||
setflag FLAG_SYS_CTRL_OBJ_DELETE
|
||||
dowildbattle
|
||||
clearflag FLAG_SYS_CTRL_OBJ_DELETE
|
||||
specialvar VAR_RESULT, GetBattleOutcome
|
||||
compare VAR_RESULT, B_OUTCOME_WON
|
||||
goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60
|
||||
goto_if_eq BattleFrontier_OutsideEast_EventScript_RemoveSudowoodo
|
||||
compare VAR_RESULT, B_OUTCOME_RAN
|
||||
goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60
|
||||
goto_if_eq BattleFrontier_OutsideEast_EventScript_RemoveSudowoodo
|
||||
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
|
||||
goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60
|
||||
goto_if_eq BattleFrontier_OutsideEast_EventScript_RemoveSudowoodo
|
||||
setflag FLAG_DEFEATED_SUDOWOODO
|
||||
release
|
||||
end
|
||||
|
||||
BattleFrontier_OutsideEast_EventScript_242D60:: @ 8242D60
|
||||
BattleFrontier_OutsideEast_EventScript_RemoveSudowoodo:: @ 8242D60
|
||||
setflag FLAG_DEFEATED_SUDOWOODO
|
||||
goto Common_EventScript_RemoveStaticPokemon
|
||||
end
|
||||
|
||||
BattleFrontier_OutsideEast_Movement_242D69: @ 8242D69
|
||||
BattleFrontier_OutsideEast_Movement_SudowoodoShake: @ 8242D69
|
||||
face_right
|
||||
delay_8
|
||||
face_down
|
||||
|
@ -1,16 +1,16 @@
|
||||
BerryTreeScript:: @ 82742F9
|
||||
special EventObjectInteractionGetBerryTreeData
|
||||
switch VAR_0x8004
|
||||
case 255, BerryTree_EventScript_27434F
|
||||
case 0, BerryTree_EventScript_CheckSoil
|
||||
case 1, BerryTree_EventScript_CheckBerryStage1
|
||||
case 2, BerryTree_EventScript_CheckBerryStage2
|
||||
case 3, BerryTree_EventScript_CheckBerryStage3
|
||||
case 4, BerryTree_EventScript_CheckBerryStage4
|
||||
case 5, BerryTree_EventScript_CheckBerryFullyGrown
|
||||
case BERRY_STAGE_SPARKLING, BerryTree_EventScript_Sparkling
|
||||
case BERRY_STAGE_NO_BERRY, BerryTree_EventScript_CheckSoil
|
||||
case BERRY_STAGE_PLANTED, BerryTree_EventScript_CheckBerryStage1
|
||||
case BERRY_STAGE_SPROUTED, BerryTree_EventScript_CheckBerryStage2
|
||||
case BERRY_STAGE_TALLER, BerryTree_EventScript_CheckBerryStage3
|
||||
case BERRY_STAGE_FLOWERING, BerryTree_EventScript_CheckBerryStage4
|
||||
case BERRY_STAGE_BERRIES, BerryTree_EventScript_CheckBerryFullyGrown
|
||||
end
|
||||
|
||||
BerryTree_EventScript_27434F:: @ 827434F
|
||||
BerryTree_EventScript_Sparkling:: @ 827434F
|
||||
lockall
|
||||
message BerryTree_Text_ExclamationPoint
|
||||
waitmessage
|
||||
@ -22,7 +22,7 @@ BerryTree_EventScript_CheckSoil:: @ 8274359
|
||||
lock
|
||||
faceplayer
|
||||
specialvar VAR_RESULT, PlayerHasBerries
|
||||
compare VAR_RESULT, 1
|
||||
compare VAR_RESULT, TRUE
|
||||
goto_if_eq BerryTree_EventScript_WantToPlant
|
||||
message BerryTree_Text_ItsSoftLoamySoil
|
||||
waitmessage
|
||||
@ -85,6 +85,8 @@ BerryTree_EventScript_CheckBerryStage4:: @ 82743E1
|
||||
waitbuttonpress
|
||||
goto BerryTree_EventScript_WantToWater
|
||||
|
||||
@ VAR_0x8005 here is the number of times watered
|
||||
@ Buffered by EventObjectInteractionGetBerryTreeData
|
||||
BerryTree_EventScript_GetCareAdverb:: @ 82743F6
|
||||
compare VAR_0x8005, 0
|
||||
goto_if_eq BerryTree_EventScript_SetAdverbPoor
|
||||
@ -101,6 +103,7 @@ BerryTree_EventScript_SetAdverbPoor:: @ 827441A
|
||||
bufferstring 1, BerryTree_Text_CareAdverbPoor
|
||||
return
|
||||
|
||||
@ VAR_0x8006 here is the number of berries
|
||||
BerryTree_EventScript_CheckBerryFullyGrown:: @ 8274421
|
||||
buffernumberstring 1, VAR_0x8006
|
||||
lock
|
||||
@ -116,7 +119,7 @@ BerryTree_EventScript_PickBerry:: @ 8274448
|
||||
special EventObjectInteractionPickBerryTree
|
||||
compare VAR_0x8004, 0
|
||||
goto_if_eq BerryTree_EventScript_BerryPocketFull
|
||||
special sub_80EED34
|
||||
special IncrementDailyPickedBerries
|
||||
special EventObjectInteractionRemoveBerryTree
|
||||
message BerryTree_Text_PickedTheBerry
|
||||
playfanfare MUS_ME_KINOMI
|
||||
@ -143,7 +146,7 @@ BerryTree_EventScript_CancelPickingBerry:: @ 8274479
|
||||
release
|
||||
end
|
||||
|
||||
BerryTree_EventScript_274482:: @ 8274482
|
||||
BerryTree_EventScript_ItemUsePlantBerry:: @ 8274482
|
||||
lockall
|
||||
special EventObjectInteractionGetBerryTreeData
|
||||
call BerryTree_EventScript_PlantBerry
|
||||
@ -165,10 +168,9 @@ BerryTree_EventScript_DontWater:: @ 82744BE
|
||||
releaseall
|
||||
end
|
||||
|
||||
BerryTree_EventScript_2744C0:: @ 82744C0
|
||||
BerryTree_EventScript_ItemUseWailmerPail:: @ 82744C0
|
||||
special EventObjectInteractionGetBerryTreeData
|
||||
lockall
|
||||
|
||||
BerryTree_EventScript_WaterBerry:: @ 82744C4
|
||||
special EventObjectInteractionGetBerryName
|
||||
message BerryTree_Text_WateredTheBerry
|
||||
@ -185,7 +187,7 @@ BerryTree_EventScript_WaterBerry:: @ 82744C4
|
||||
BerryTree_EventScript_PlantBerry:: @ 82744DD
|
||||
special EventObjectInteractionPlantBerryTree
|
||||
incrementgamestat GAME_STAT_PLANTED_BERRIES
|
||||
special sub_80EED10
|
||||
special IncrementDailyPlantedBerries
|
||||
special EventObjectInteractionGetBerryCountString
|
||||
message BerryTree_Text_PlantedOneBerry
|
||||
waitmessage
|
||||
|
@ -358,8 +358,8 @@ gSpecials:: @ 81DBA64
|
||||
def_special sub_80EE7C0
|
||||
def_special ShowGlassWorkshopMenu
|
||||
def_special PutFanClubSpecialOnTheAir
|
||||
def_special sub_80EED10
|
||||
def_special sub_80EED34
|
||||
def_special IncrementDailyPlantedBerries
|
||||
def_special IncrementDailyPickedBerries
|
||||
def_special InitSecretBaseVars
|
||||
def_special SetSecretBaseSecretsTvFlags_SandOrnament
|
||||
def_special sub_80EB300
|
||||
|
@ -50,6 +50,6 @@ void ItemUseOutOfBattle_EnigmaBerry(u8);
|
||||
void ItemUseInBattle_EnigmaBerry(u8);
|
||||
void ItemUseOutOfBattle_CannotUse(u8);
|
||||
u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId);
|
||||
void sub_80FDD10(u8);
|
||||
void ItemUseOutOfBattle_Berry(u8);
|
||||
|
||||
#endif // GUARD_ITEM_USE_H
|
||||
|
14
include/tv.h
14
include/tv.h
@ -15,9 +15,9 @@ void DoTVShowInSearchOfTrainers(void);
|
||||
void sub_80EDCE8(void);
|
||||
void sub_80EE2CC(void);
|
||||
void sub_80EE72C(void);
|
||||
void sub_80EED10(void);
|
||||
void sub_80EED34(void);
|
||||
void sub_80EED60(u16 delta);
|
||||
void IncrementDailyPlantedBerries(void);
|
||||
void IncrementDailyPickedBerries(void);
|
||||
void IncrementDailyBattlePoints(u16 delta);
|
||||
void sub_80F01B8(void);
|
||||
void ReceiveTvShowsData(void *src, u32 size, u8 masterIdx);
|
||||
void sub_80EE4DC(struct Pokemon *pokemon, u8 ribbonMonDataIdx);
|
||||
@ -36,10 +36,10 @@ void sub_80EDA80(void);
|
||||
void ReceivePokeNewsData(void *src, u32 size, u8 masterIdx);
|
||||
void sub_80F0BB8(void);
|
||||
void sub_80ED950(bool8 flag);
|
||||
void sub_80EEC80(void);
|
||||
void sub_80EECA4(void);
|
||||
void sub_80EECC8(void);
|
||||
void sub_80EECEC(void);
|
||||
void IncrementDailySlotsUses(void);
|
||||
void IncrementDailyRouletteUses(void);
|
||||
void IncrementDailyWildBattles(void);
|
||||
void IncrementDailyBerryBlender(void);
|
||||
void sub_80F1208(TVShow *shows);
|
||||
void sub_80EE44C(u8 nMonsCaught, u8 nPkblkUsed);
|
||||
void sub_80F14F8(TVShow *shows);
|
||||
|
@ -72,8 +72,8 @@ static void CB2_EndWildBattle(void);
|
||||
static void CB2_EndScriptedWildBattle(void);
|
||||
static u8 GetWildBattleTransition(void);
|
||||
static u8 GetTrainerBattleTransition(void);
|
||||
static void sub_80B1218(void);
|
||||
static void sub_80B1234(void);
|
||||
static void TryUpdateGymLeaderRematchFromWild(void);
|
||||
static void TryUpdateGymLeaderRematchFromTrainer(void);
|
||||
static void CB2_GiveStarter(void);
|
||||
static void CB2_StartFirstBattle(void);
|
||||
static void CB2_EndFirstBattle(void);
|
||||
@ -395,8 +395,8 @@ static void DoStandardWildBattle(void)
|
||||
CreateBattleStartTask(GetWildBattleTransition(), 0);
|
||||
IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
|
||||
IncrementGameStat(GAME_STAT_WILD_BATTLES);
|
||||
sub_80EECC8();
|
||||
sub_80B1218();
|
||||
IncrementDailyWildBattles();
|
||||
TryUpdateGymLeaderRematchFromWild();
|
||||
}
|
||||
|
||||
void BattleSetup_StartRoamerBattle(void)
|
||||
@ -409,8 +409,8 @@ void BattleSetup_StartRoamerBattle(void)
|
||||
CreateBattleStartTask(GetWildBattleTransition(), 0);
|
||||
IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
|
||||
IncrementGameStat(GAME_STAT_WILD_BATTLES);
|
||||
sub_80EECC8();
|
||||
sub_80B1218();
|
||||
IncrementDailyWildBattles();
|
||||
TryUpdateGymLeaderRematchFromWild();
|
||||
}
|
||||
|
||||
static void DoSafariBattle(void)
|
||||
@ -433,8 +433,8 @@ static void DoBattlePikeWildBattle(void)
|
||||
CreateBattleStartTask(GetWildBattleTransition(), 0);
|
||||
IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
|
||||
IncrementGameStat(GAME_STAT_WILD_BATTLES);
|
||||
sub_80EECC8();
|
||||
sub_80B1218();
|
||||
IncrementDailyWildBattles();
|
||||
TryUpdateGymLeaderRematchFromWild();
|
||||
}
|
||||
|
||||
static void DoTrainerBattle(void)
|
||||
@ -442,7 +442,7 @@ static void DoTrainerBattle(void)
|
||||
CreateBattleStartTask(GetTrainerBattleTransition(), 0);
|
||||
IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
|
||||
IncrementGameStat(GAME_STAT_TRAINER_BATTLES);
|
||||
sub_80B1234();
|
||||
TryUpdateGymLeaderRematchFromTrainer();
|
||||
}
|
||||
|
||||
static void sub_80B0828(void)
|
||||
@ -454,7 +454,7 @@ static void sub_80B0828(void)
|
||||
|
||||
IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
|
||||
IncrementGameStat(GAME_STAT_TRAINER_BATTLES);
|
||||
sub_80B1234();
|
||||
TryUpdateGymLeaderRematchFromTrainer();
|
||||
}
|
||||
|
||||
// Initiates battle where Wally catches Ralts
|
||||
@ -475,8 +475,8 @@ void BattleSetup_StartScriptedWildBattle(void)
|
||||
CreateBattleStartTask(GetWildBattleTransition(), 0);
|
||||
IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
|
||||
IncrementGameStat(GAME_STAT_WILD_BATTLES);
|
||||
sub_80EECC8();
|
||||
sub_80B1218();
|
||||
IncrementDailyWildBattles();
|
||||
TryUpdateGymLeaderRematchFromWild();
|
||||
}
|
||||
|
||||
void BattleSetup_StartLatiBattle(void)
|
||||
@ -487,8 +487,8 @@ void BattleSetup_StartLatiBattle(void)
|
||||
CreateBattleStartTask(GetWildBattleTransition(), 0);
|
||||
IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
|
||||
IncrementGameStat(GAME_STAT_WILD_BATTLES);
|
||||
sub_80EECC8();
|
||||
sub_80B1218();
|
||||
IncrementDailyWildBattles();
|
||||
TryUpdateGymLeaderRematchFromWild();
|
||||
}
|
||||
|
||||
void BattleSetup_StartLegendaryBattle(void)
|
||||
@ -526,8 +526,8 @@ void BattleSetup_StartLegendaryBattle(void)
|
||||
|
||||
IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
|
||||
IncrementGameStat(GAME_STAT_WILD_BATTLES);
|
||||
sub_80EECC8();
|
||||
sub_80B1218();
|
||||
IncrementDailyWildBattles();
|
||||
TryUpdateGymLeaderRematchFromWild();
|
||||
}
|
||||
|
||||
void StartGroudonKyogreBattle(void)
|
||||
@ -543,8 +543,8 @@ void StartGroudonKyogreBattle(void)
|
||||
|
||||
IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
|
||||
IncrementGameStat(GAME_STAT_WILD_BATTLES);
|
||||
sub_80EECC8();
|
||||
sub_80B1218();
|
||||
IncrementDailyWildBattles();
|
||||
TryUpdateGymLeaderRematchFromWild();
|
||||
}
|
||||
|
||||
void StartRegiBattle(void)
|
||||
@ -576,8 +576,8 @@ void StartRegiBattle(void)
|
||||
|
||||
IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
|
||||
IncrementGameStat(GAME_STAT_WILD_BATTLES);
|
||||
sub_80EECC8();
|
||||
sub_80B1218();
|
||||
IncrementDailyWildBattles();
|
||||
TryUpdateGymLeaderRematchFromWild();
|
||||
}
|
||||
|
||||
static void CB2_EndWildBattle(void)
|
||||
@ -919,8 +919,8 @@ static void CB2_StartFirstBattle(void)
|
||||
ClearPoisonStepCounter();
|
||||
IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
|
||||
IncrementGameStat(GAME_STAT_WILD_BATTLES);
|
||||
sub_80EECC8();
|
||||
sub_80B1218();
|
||||
IncrementDailyWildBattles();
|
||||
TryUpdateGymLeaderRematchFromWild();
|
||||
}
|
||||
}
|
||||
|
||||
@ -930,13 +930,13 @@ static void CB2_EndFirstBattle(void)
|
||||
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
|
||||
}
|
||||
|
||||
static void sub_80B1218(void)
|
||||
static void TryUpdateGymLeaderRematchFromWild(void)
|
||||
{
|
||||
if (GetGameStat(GAME_STAT_WILD_BATTLES) % 60 == 0)
|
||||
UpdateGymLeaderRematch();
|
||||
}
|
||||
|
||||
static void sub_80B1234(void)
|
||||
static void TryUpdateGymLeaderRematchFromTrainer(void)
|
||||
{
|
||||
if (GetGameStat(GAME_STAT_TRAINER_BATTLES) % 20 == 0)
|
||||
UpdateGymLeaderRematch();
|
||||
|
@ -3339,7 +3339,7 @@ static bool8 Blender_PrintBlendingResults(void)
|
||||
TryAddContestLinkTvShow(&pokeblock, &sBerryBlenderData->tvBlender);
|
||||
|
||||
CreateTask(sub_8083F3C, 6);
|
||||
sub_80EECEC();
|
||||
IncrementDailyBerryBlender();
|
||||
|
||||
RemoveBagItem(gSpecialVar_ItemId, 1);
|
||||
AddPokeblock(&pokeblock);
|
||||
|
@ -1889,11 +1889,11 @@ static void sub_81A3B64(void)
|
||||
|
||||
points = gSaveBlock2Ptr->frontier.field_EBA;
|
||||
points += gUnknown_086118B4[challengeNum][facility][battleMode];
|
||||
sub_80EED60(gUnknown_086118B4[challengeNum][facility][battleMode]);
|
||||
IncrementDailyBattlePoints(gUnknown_086118B4[challengeNum][facility][battleMode]);
|
||||
if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN)
|
||||
{
|
||||
points += 10;
|
||||
sub_80EED60(10);
|
||||
IncrementDailyBattlePoints(10);
|
||||
}
|
||||
if (points > 0xFFFF)
|
||||
points = 0xFFFF;
|
||||
|
@ -1651,7 +1651,7 @@ void ItemMenu_UseOutOfBattle(u8 taskId)
|
||||
if (gBagPositionStruct.pocket != BERRIES_POCKET)
|
||||
ItemId_GetFieldFunc(gSpecialVar_ItemId)(taskId);
|
||||
else
|
||||
sub_80FDD10(taskId);
|
||||
ItemUseOutOfBattle_Berry(taskId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -43,9 +43,9 @@
|
||||
#include "constants/vars.h"
|
||||
#include "event_obj_lock.h"
|
||||
|
||||
extern u8 BerryTree_EventScript_274482[];
|
||||
extern u8 BerryTree_EventScript_2744C0[];
|
||||
extern u8 BattleFrontier_OutsideEast_EventScript_242CFC[];
|
||||
extern u8 BerryTree_EventScript_ItemUsePlantBerry[];
|
||||
extern u8 BerryTree_EventScript_ItemUseWailmerPail[];
|
||||
extern u8 BattleFrontier_OutsideEast_EventScript_WaterSudowoodo[];
|
||||
|
||||
void SetUpItemUseCallback(u8 taskId);
|
||||
void MapPostLoadHook_UseItem(void);
|
||||
@ -61,9 +61,9 @@ void sub_80FDA94(u8 taskId);
|
||||
void sub_80FDADC(u8 taskId);
|
||||
void sub_80FD7C8(u8 taskId);
|
||||
void sub_80FDC00(u8 taskId);
|
||||
void sub_80FDD74(u8 taskId);
|
||||
void sub_80FDE08(u8 taskId);
|
||||
void sub_80FDE7C(u8 taskId);
|
||||
void ItemUseOnFieldCB_Berry(u8 taskId);
|
||||
void ItemUseOnFieldCB_WailmerPailBerry(u8 taskId);
|
||||
void ItemUseOnFieldCB_WailmerPailSudowoodo(u8 taskId);
|
||||
void sub_80FDF90(u8 taskId);
|
||||
void task08_0809AD8C(u8 taskId);
|
||||
void sub_80FE024(u8 taskId);
|
||||
@ -81,7 +81,7 @@ u8 sub_80FD9B0(s16 a, s16 b);
|
||||
void sub_80FDA24(u8 a);
|
||||
void sub_80FD8E0(u8 taskId, s16 x, s16 y);
|
||||
void sub_80FDBEC(void);
|
||||
bool8 sub_80FDE2C(void);
|
||||
bool8 TryToWaterSudowoodo(void);
|
||||
void ItemUseOutOfBattle_CannotUse(u8 taskId);
|
||||
|
||||
// EWRAM variables
|
||||
@ -651,11 +651,11 @@ void ItemUseOutOfBattle_PowderJar(u8 taskId)
|
||||
}
|
||||
}
|
||||
|
||||
void sub_80FDD10(u8 taskId)
|
||||
void ItemUseOutOfBattle_Berry(u8 taskId)
|
||||
{
|
||||
if (IsPlayerFacingEmptyBerryTreePatch() == TRUE)
|
||||
{
|
||||
gUnknown_0203A0F4 = sub_80FDD74;
|
||||
gUnknown_0203A0F4 = ItemUseOnFieldCB_Berry;
|
||||
gFieldCallback = MapPostLoadHook_UseItem;
|
||||
gBagMenu->mainCallback2 = CB2_ReturnToField;
|
||||
unknown_ItemMenu_Confirm(taskId);
|
||||
@ -666,24 +666,24 @@ void sub_80FDD10(u8 taskId)
|
||||
}
|
||||
}
|
||||
|
||||
void sub_80FDD74(u8 taskId)
|
||||
void ItemUseOnFieldCB_Berry(u8 taskId)
|
||||
{
|
||||
RemoveBagItem(gSpecialVar_ItemId, 1);
|
||||
ScriptContext2_Enable();
|
||||
ScriptContext1_SetupScript(BerryTree_EventScript_274482);
|
||||
ScriptContext1_SetupScript(BerryTree_EventScript_ItemUsePlantBerry);
|
||||
DestroyTask(taskId);
|
||||
}
|
||||
|
||||
void ItemUseOutOfBattle_WailmerPail(u8 taskId)
|
||||
{
|
||||
if (sub_80FDE2C() == TRUE)
|
||||
if (TryToWaterSudowoodo() == TRUE)
|
||||
{
|
||||
gUnknown_0203A0F4 = sub_80FDE7C;
|
||||
gUnknown_0203A0F4 = ItemUseOnFieldCB_WailmerPailSudowoodo;
|
||||
SetUpItemUseOnFieldCallback(taskId);
|
||||
}
|
||||
else if (TryToWaterBerryTree() == TRUE)
|
||||
{
|
||||
gUnknown_0203A0F4 = sub_80FDE08;
|
||||
gUnknown_0203A0F4 = ItemUseOnFieldCB_WailmerPailBerry;
|
||||
SetUpItemUseOnFieldCallback(taskId);
|
||||
}
|
||||
else
|
||||
@ -692,14 +692,14 @@ void ItemUseOutOfBattle_WailmerPail(u8 taskId)
|
||||
}
|
||||
}
|
||||
|
||||
void sub_80FDE08(u8 taskId)
|
||||
void ItemUseOnFieldCB_WailmerPailBerry(u8 taskId)
|
||||
{
|
||||
ScriptContext2_Enable();
|
||||
ScriptContext1_SetupScript(BerryTree_EventScript_2744C0);
|
||||
ScriptContext1_SetupScript(BerryTree_EventScript_ItemUseWailmerPail);
|
||||
DestroyTask(taskId);
|
||||
}
|
||||
|
||||
bool8 sub_80FDE2C(void)
|
||||
bool8 TryToWaterSudowoodo(void)
|
||||
{
|
||||
u16 x, y;
|
||||
u8 z;
|
||||
@ -707,16 +707,16 @@ bool8 sub_80FDE2C(void)
|
||||
GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
|
||||
z = PlayerGetZCoord();
|
||||
objId = GetEventObjectIdByXYZ(x, y, z);
|
||||
if (objId == 16 || gEventObjects[objId].graphicsId != 0xE4)
|
||||
if (objId == EVENT_OBJECTS_COUNT || gEventObjects[objId].graphicsId != EVENT_OBJ_GFX_SUDOWOODO)
|
||||
return FALSE;
|
||||
else
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void sub_80FDE7C(u8 taskId)
|
||||
void ItemUseOnFieldCB_WailmerPailSudowoodo(u8 taskId)
|
||||
{
|
||||
ScriptContext2_Enable();
|
||||
ScriptContext1_SetupScript(BattleFrontier_OutsideEast_EventScript_242CFC);
|
||||
ScriptContext1_SetupScript(BattleFrontier_OutsideEast_EventScript_WaterSudowoodo);
|
||||
DestroyTask(taskId);
|
||||
}
|
||||
|
||||
|
@ -1213,7 +1213,7 @@ static void sub_8140D6C(u8 r0)
|
||||
|
||||
static void sub_8140F6C(u8 r0)
|
||||
{
|
||||
sub_80EECA4();
|
||||
IncrementDailyRouletteUses();
|
||||
gUnknown_0203AB88->var28 = 0xFF;
|
||||
if (gUnknown_0203AB88->var19 == 1)
|
||||
gUnknown_0203AB88->var23 = 1;
|
||||
|
@ -1060,7 +1060,7 @@ static bool8 SlotAction9(struct Task *task)
|
||||
ReelTasks_SetUnkTaskData(1);
|
||||
ReelTasks_SetUnkTaskData(2);
|
||||
|
||||
sub_80EEC80(); // something with daily slot variable
|
||||
IncrementDailySlotsUses();
|
||||
|
||||
task->data[0] = 0;
|
||||
if (sSlotMachine->luckyFlags & LUCKY_BIAS_REELTIME)
|
||||
|
14
src/tv.c
14
src/tv.c
@ -2626,37 +2626,37 @@ static void sub_80EEBF4(u8 actionIdx)
|
||||
}
|
||||
}
|
||||
|
||||
void sub_80EEC80(void)
|
||||
void IncrementDailySlotsUses(void)
|
||||
{
|
||||
VarSet(VAR_DAILY_SLOTS, VarGet(VAR_DAILY_SLOTS) + 1);
|
||||
}
|
||||
|
||||
void sub_80EECA4(void)
|
||||
void IncrementDailyRouletteUses(void)
|
||||
{
|
||||
VarSet(VAR_DAILY_ROULETTE, VarGet(VAR_DAILY_ROULETTE) + 1);
|
||||
}
|
||||
|
||||
void sub_80EECC8(void)
|
||||
void IncrementDailyWildBattles(void)
|
||||
{
|
||||
VarSet(VAR_DAILY_WILDS, VarGet(VAR_DAILY_WILDS) + 1);
|
||||
}
|
||||
|
||||
void sub_80EECEC(void)
|
||||
void IncrementDailyBerryBlender(void)
|
||||
{
|
||||
VarSet(VAR_DAILY_BLENDER, VarGet(VAR_DAILY_BLENDER) + 1);
|
||||
}
|
||||
|
||||
void sub_80EED10(void)
|
||||
void IncrementDailyPlantedBerries(void)
|
||||
{
|
||||
VarSet(VAR_DAILY_PLANTED_BERRIES, VarGet(VAR_DAILY_PLANTED_BERRIES) + 1);
|
||||
}
|
||||
|
||||
void sub_80EED34(void)
|
||||
void IncrementDailyPickedBerries(void)
|
||||
{
|
||||
VarSet(VAR_DAILY_PICKED_BERRIES, VarGet(VAR_DAILY_PICKED_BERRIES) + gSpecialVar_0x8006);
|
||||
}
|
||||
|
||||
void sub_80EED60(u16 delta)
|
||||
void IncrementDailyBattlePoints(u16 delta)
|
||||
{
|
||||
VarSet(VAR_DAILY_BP, VarGet(VAR_DAILY_BP) + delta);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user