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

Name all specials

Browse Source
This commit is contained in:
PikalaxALT
2020-03-31 08:49:47 -04:00
parent 4134baf3eb
commit af32535610
58 changed files with 198 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+3 -3
View File
@@ -1223,10 +1223,10 @@ EventScript_DoInGameTrade:: @ 81A8CD9
faceplayer faceplayer
return return
gUnknown_81A8CED:: @ 81A8CED EventScript_VsSeekerChargingDone:: @ 81A8CED
special sub_810C3A4 special VsSeekerFreezeObjectsAfterChargeComplete
waitstate waitstate
special sub_810C444 special VsSeekerResetObjectMovementAfterChargeComplete
releaseall releaseall
end end
data/maps/BirthIsland_Exterior/scripts.inc
+1 -1
View File
@@ -43,7 +43,7 @@ BirthIsland_Exterior_EventScript_Triangle:: @ 8165271
lock lock
faceplayer faceplayer
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
special DoDeoxysTriangleInteraction special DoDeoxysTriangleInteraction
waitstate waitstate
switch VAR_RESULT switch VAR_RESULT
data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
+1 -1
View File
@@ -3,7 +3,7 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC
CeladonCity_DepartmentStore_Roof_EventScript_ThirstyGirl:: @ 816BCCD CeladonCity_DepartmentStore_Roof_EventScript_ThirstyGirl:: @ 816BCCD
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
lock lock
faceplayer faceplayer
call CeladonCity_DepartmentStore_Roof_EventScript_CheckPlayerHasDrinks call CeladonCity_DepartmentStore_Roof_EventScript_CheckPlayerHasDrinks
data/maps/CeruleanCave_B1F/scripts.inc
+1 -1
View File
@@ -24,7 +24,7 @@ CeruleanCave_B1F_EventScript_ShowMewtwo:: @ 81624F1
CeruleanCave_B1F_EventScript_Mewtwo:: @ 81624F5 CeruleanCave_B1F_EventScript_Mewtwo:: @ 81624F5
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
lock lock
faceplayer faceplayer
waitse waitse
data/maps/CeruleanCity_House4/scripts.inc
+1 -1
View File
@@ -3,7 +3,7 @@ CeruleanCity_House4_MapScripts:: @ 816ACEE
CeruleanCity_House4_EventScript_WonderNewsBerryMan:: @ 816ACEF CeruleanCity_House4_EventScript_WonderNewsBerryMan:: @ 816ACEF
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
lock lock
specialvar VAR_0x8004, GetMENewsJisanItemAndState specialvar VAR_0x8004, GetMENewsJisanItemAndState
copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8008, VAR_RESULT
data/maps/FiveIsland_MemorialPillar/scripts.inc
+1 -1
View File
@@ -33,7 +33,7 @@ FiveIsland_MemorialPillar_EventScript_ReturnedForTM42:: @ 8168A22
FiveIsland_MemorialPillar_EventScript_Memorial:: @ 8168A48 FiveIsland_MemorialPillar_EventScript_Memorial:: @ 8168A48
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
lockall lockall
goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced
goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced
data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD
FiveIsland_ResortGorgeous_House_EventScript_Selphy:: @ 8171EBE FiveIsland_ResortGorgeous_House_EventScript_Selphy:: @ 8171EBE
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
lock lock
faceplayer faceplayer
goto_if_set SHOWN_REQUESTED_MON, FiveIsland_ResortGorgeous_House_EventScript_JustFulfilledRequest goto_if_set SHOWN_REQUESTED_MON, FiveIsland_ResortGorgeous_House_EventScript_JustFulfilledRequest
data/maps/FiveIsland_WaterLabyrinth/scripts.inc
+1 -1
View File
@@ -3,7 +3,7 @@ FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D
FiveIsland_WaterLabyrinth_EventScript_EggGentleman:: @ 816884E FiveIsland_WaterLabyrinth_EventScript_EggGentleman:: @ 816884E
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
lock lock
faceplayer faceplayer
goto_if_set FLAG_GOT_TOGEPI_EGG, FiveIsland_WaterLabyrinth_EventScript_PostEggComment goto_if_set FLAG_GOT_TOGEPI_EGG, FiveIsland_WaterLabyrinth_EventScript_PostEggComment
data/maps/FourIsland/scripts.inc
+1 -1
View File
@@ -73,7 +73,7 @@ FourIsland_Movement_PlayerWatchRivalExit:: @ 8167D52
FourIsland_EventScript_DaycareMan:: @ 8167D55 FourIsland_EventScript_DaycareMan:: @ 8167D55
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
lock lock
faceplayer faceplayer
special GetDaycareMonNicknames special GetDaycareMonNicknames
data/maps/MtEmber_Summit/scripts.inc
+1 -1
View File
@@ -24,7 +24,7 @@ MtEmber_Summit_EventScript_ShowMoltres:: @ 8163B2F
MtEmber_Summit_EventScript_Moltres:: @ 8163B33 MtEmber_Summit_EventScript_Moltres:: @ 8163B33
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
lock lock
faceplayer faceplayer
setwildbattle SPECIES_MOLTRES, 50, ITEM_NONE setwildbattle SPECIES_MOLTRES, 50, ITEM_NONE
data/maps/MtMoon_B2F/scripts.inc
+2 -2
View File
@@ -63,7 +63,7 @@ MtMoon_B2F_EventScript_DomeFossil:: @ 816071B
removeobject LOCALID_DOME_FOSSIL removeobject LOCALID_DOME_FOSSIL
giveitem_msg MtMoon_B2F_Text_ObtainedDomeFossil, ITEM_DOME_FOSSIL, 1, MUS_FAN5 giveitem_msg MtMoon_B2F_Text_ObtainedDomeFossil, ITEM_DOME_FOSSIL, 1, MUS_FAN5
closemessage closemessage
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
delay 10 delay 10
applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToHelixFossil applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToHelixFossil
waitmovement 0 waitmovement 0
@@ -95,7 +95,7 @@ MtMoon_B2F_EventScript_HelixFossil:: @ 816077F
removeobject LOCALID_HELIX_FOSSIL removeobject LOCALID_HELIX_FOSSIL
giveitem_msg MtMoon_B2F_Text_ObtainedHelixFossil, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 giveitem_msg MtMoon_B2F_Text_ObtainedHelixFossil, ITEM_HELIX_FOSSIL, 1, MUS_FAN5
closemessage closemessage
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
delay 10 delay 10
applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToDomeFossil applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToDomeFossil
waitmovement 0 waitmovement 0
data/maps/NavelRock_Base/scripts.inc
+1 -1
View File
@@ -30,7 +30,7 @@ NavelRock_Base_EventScript_TryRemoveLugia:: @ 8165120
NavelRock_Base_EventScript_Lugia:: @ 8165134 NavelRock_Base_EventScript_Lugia:: @ 8165134
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
lock lock
faceplayer faceplayer
waitse waitse
data/maps/NavelRock_Summit/scripts.inc
+1 -1
View File
@@ -33,7 +33,7 @@ NavelRock_Summit_EventScript_TryRemoveHoOh:: @ 8164FE7
NavelRock_Summit_EventScript_HoOh:: @ 8164FFB NavelRock_Summit_EventScript_HoOh:: @ 8164FFB
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
lockall lockall
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
special SpawnCameraObject special SpawnCameraObject
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -289,7 +289,7 @@ OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire:: @ 8170FA5
applymovement LOCALID_CELIO, Movement_FacePlayer applymovement LOCALID_CELIO, Movement_FacePlayer
waitmovement 0 waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_ManagedToLinkWithHoennThankYou msgbox OneIsland_PokemonCenter_1F_Text_ManagedToLinkWithHoennThankYou
special sub_810B82C special SetPostgameFlags
setflag FLAG_SYS_CAN_LINK_WITH_RS setflag FLAG_SYS_CAN_LINK_WITH_RS
setflag FLAG_HIDE_CERULEAN_CAVE_GUARD setflag FLAG_HIDE_CERULEAN_CAVE_GUARD
setflag FLAG_HIDE_LORELEI_IN_HER_HOUSE setflag FLAG_HIDE_LORELEI_IN_HER_HOUSE
data/maps/PalletTown/scripts.inc
+1 -1
View File
@@ -451,7 +451,7 @@ PalletTown_EventScript_SignLadyShowSign:: @ 8165894
setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
setvar SIGN_LADY_READY, FALSE setvar SIGN_LADY_READY, FALSE
special SetWalkingIntoSignVars special SetWalkingIntoSignVars
special sub_80699BC special DisableMsgBoxWalkaway
signmsg signmsg
msgbox PalletTown_Text_PressStartToOpenMenuCopy msgbox PalletTown_Text_PressStartToOpenMenuCopy
normalmsg normalmsg
data/maps/PalletTown_GarysHouse/scripts.inc
+1 -1
View File
@@ -50,7 +50,7 @@ PalletTown_GarysHouse_EventScript_HeardBattledRival:: @ 8168DAF
PalletTown_GarysHouse_EventScript_GroomMon:: @ 8168DB9 PalletTown_GarysHouse_EventScript_GroomMon:: @ 8168DB9
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500
goto_if_lt PalletTown_GarysHouse_EventScript_RateMonFriendship goto_if_lt PalletTown_GarysHouse_EventScript_RateMonFriendship
msgbox PalletTown_GarysHouse_Text_LikeMeToGroomMon, MSGBOX_YESNO msgbox PalletTown_GarysHouse_Text_LikeMeToGroomMon, MSGBOX_YESNO
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+2 -2
View File
@@ -723,7 +723,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E
waitfanfare waitfanfare
call EventScript_RestorePrevTextColor call EventScript_RestorePrevTextColor
setflag FLAG_SYS_POKEDEX_GET setflag FLAG_SYS_POKEDEX_GET
special sub_810B810 special SetUnlockedPokedexFlags
setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 1 setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 1
msgbox PalletTown_ProfessorOaksLab_Text_OakCatchMonsForDataTakeThese msgbox PalletTown_ProfessorOaksLab_Text_OakCatchMonsForDataTakeThese
giveitem_msg PalletTown_ProfessorOaksLab_Text_ReceivedFivePokeBalls, ITEM_POKE_BALL, 5 giveitem_msg PalletTown_ProfessorOaksLab_Text_ReceivedFivePokeBalls, ITEM_POKE_BALL, 5
@@ -1000,7 +1000,7 @@ PalletTown_ProfessorOaksLab_EventScript_DontStartNationalDexScene:: @ 81699F9
PalletTown_ProfessorOaksLab_EventScript_CheckIfPlayerNeedsBalls:: @ 81699FB PalletTown_ProfessorOaksLab_EventScript_CheckIfPlayerNeedsBalls:: @ 81699FB
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
goto_if_set FLAG_OAK_SKIP_22_RIVAL_CHECK, PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait goto_if_set FLAG_OAK_SKIP_22_RIVAL_CHECK, PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait
goto_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, PalletTown_ProfessorOaksLab_EventScript_PlayerAlreadyGotBalls goto_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, PalletTown_ProfessorOaksLab_EventScript_PlayerAlreadyGotBalls
checkitem ITEM_POKE_BALL, 1 checkitem ITEM_POKE_BALL, 1
data/maps/PewterCity/scripts.inc
+1 -1
View File
@@ -724,7 +724,7 @@ PewterCity_EventScript_AideGiveRunningShoes:: @ 81662DE
waitmessage waitmessage
waitfanfare waitfanfare
msgbox PewterCity_Text_SwitchedShoesWithRunningShoes msgbox PewterCity_Text_SwitchedShoesWithRunningShoes
special sub_80699BC special DisableMsgBoxWalkaway
signmsg signmsg
msgbox PewterCity_Text_ExplainRunningShoes msgbox PewterCity_Text_ExplainRunningShoes
normalmsg normalmsg
data/maps/PokemonTower_6F/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ PokemonTower_6F_EventScript_MarowakGhost:: @ 81634B8
setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE
special StartMarowakBattle special StartMarowakBattle
waitstate waitstate
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
compare VAR_RESULT, FALSE @ Set by CB2_EndMarowakBattle compare VAR_RESULT, FALSE @ Set by CB2_EndMarowakBattle
goto_if_eq PokemonTower_6F_EventScript_DefeatedMarowakGhost goto_if_eq PokemonTower_6F_EventScript_DefeatedMarowakGhost
applymovement OBJ_EVENT_ID_PLAYER, PokemonTower_6F_Movement_ForcePlayerUp applymovement OBJ_EVENT_ID_PLAYER, PokemonTower_6F_Movement_ForcePlayerUp
data/maps/PowerPlant/scripts.inc
+3 -3
View File
@@ -35,7 +35,7 @@ PowerPlant_EventScript_ShowElectrode2:: @ 81637B4
PowerPlant_EventScript_Zapdos:: @ 81637B8 PowerPlant_EventScript_Zapdos:: @ 81637B8
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
lock lock
faceplayer faceplayer
setwildbattle SPECIES_ZAPDOS, 50, ITEM_NONE setwildbattle SPECIES_ZAPDOS, 50, ITEM_NONE
@@ -84,7 +84,7 @@ PowerPlant_EventScript_Electrode1:: @ 816382F
setflag FLAG_SYS_SPECIAL_WILD_BATTLE setflag FLAG_SYS_SPECIAL_WILD_BATTLE
dowildbattle dowildbattle
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq PowerPlant_EventScript_FoughtElectrode1 goto_if_eq PowerPlant_EventScript_FoughtElectrode1
@@ -113,7 +113,7 @@ PowerPlant_EventScript_Electrode2:: @ 816388D
setflag FLAG_SYS_SPECIAL_WILD_BATTLE setflag FLAG_SYS_SPECIAL_WILD_BATTLE
dowildbattle dowildbattle
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq PowerPlant_EventScript_FoughtElectrode2 goto_if_eq PowerPlant_EventScript_FoughtElectrode2
data/maps/Route12/scripts.inc
+1 -1
View File
@@ -15,7 +15,7 @@ Route12_EventScript_Snorlax:: @ 8168014
faceplayer faceplayer
goto_if_unset FLAG_GOT_POKE_FLUTE, Route12_EventScript_SnorlaxNoPokeFlute goto_if_unset FLAG_GOT_POKE_FLUTE, Route12_EventScript_SnorlaxNoPokeFlute
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
msgbox Text_WantToUsePokeFlute, MSGBOX_YESNO msgbox Text_WantToUsePokeFlute, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq Route12_EventScript_DontUsePokeFlute goto_if_eq Route12_EventScript_DontUsePokeFlute
data/maps/Route12_FishingHouse/scripts.inc
+1 -1
View File
@@ -31,7 +31,7 @@ Route12_FishingHouse_EventScript_NoRoomForSuperRod:: @ 816FF75
Route12_FishingHouse_EventScript_CheckMagikarpRecord:: @ 816FF7F Route12_FishingHouse_EventScript_CheckMagikarpRecord:: @ 816FF7F
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
setvar VAR_0x8004, SPECIES_MAGIKARP setvar VAR_0x8004, SPECIES_MAGIKARP
specialvar VAR_RESULT, DoesPlayerPartyContainSpecies specialvar VAR_RESULT, DoesPlayerPartyContainSpecies
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
data/maps/Route16/scripts.inc
+1 -1
View File
@@ -34,7 +34,7 @@ Route16_EventScript_Snorlax:: @ 8168121
faceplayer faceplayer
goto_if_unset FLAG_GOT_POKE_FLUTE, Route16_EventScript_SnorlaxNoPokeFlute goto_if_unset FLAG_GOT_POKE_FLUTE, Route16_EventScript_SnorlaxNoPokeFlute
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
msgbox Text_WantToUsePokeFlute, MSGBOX_YESNO msgbox Text_WantToUsePokeFlute, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
goto_if_eq Route16_EventScript_DontUsePokeFlute goto_if_eq Route16_EventScript_DontUsePokeFlute
data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc
+1 -1
View File
@@ -19,7 +19,7 @@ SaffronCity_CopycatsHouse_2F_EventScript_Doll:: @ 816EB70
SaffronCity_CopycatsHouse_2F_EventScript_Copycat:: @ 816EB7B SaffronCity_CopycatsHouse_2F_EventScript_Copycat:: @ 816EB7B
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
lock lock
faceplayer faceplayer
checkitem ITEM_POKE_DOLL, 1 checkitem ITEM_POKE_DOLL, 1
data/maps/SeafoamIslands_B4F/scripts.inc
+2 -2
View File
@@ -100,7 +100,7 @@ SeafoamIslands_B4F_EventScript_EnterByFalling:: @ 8163121
call_if_lt SeafoamIslands_B4F_EventScript_RideCurrentFar call_if_lt SeafoamIslands_B4F_EventScript_RideCurrentFar
compare VAR_0x8008, 9 compare VAR_0x8008, 9
call_if_ge SeafoamIslands_B4F_EventScript_RideCurrentClose call_if_ge SeafoamIslands_B4F_EventScript_RideCurrentClose
special sub_805D1A8 special SeafoamIslandsB4F_CurrentDumpsPlayerOnLand
setvar VAR_TEMP_1, 0 setvar VAR_TEMP_1, 0
releaseall releaseall
end end
@@ -159,7 +159,7 @@ SeafoamIslands_B4F_Movement_WalkUp:: @ 81631AA
SeafoamIslands_B4F_EventScript_Articuno:: @ 81631AC SeafoamIslands_B4F_EventScript_Articuno:: @ 81631AC
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
lock lock
faceplayer faceplayer
setwildbattle SPECIES_ARTICUNO, 50, ITEM_NONE setwildbattle SPECIES_ARTICUNO, 50, ITEM_NONE
data/maps/SixIsland_WaterPath_House1/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ SixIsland_WaterPath_House1_EventScript_Beauty:: @ 817206D
lock lock
faceplayer faceplayer
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
setvar VAR_0x8004, SPECIES_HERACROSS setvar VAR_0x8004, SPECIES_HERACROSS
specialvar VAR_RESULT, DoesPlayerPartyContainSpecies specialvar VAR_RESULT, DoesPlayerPartyContainSpecies
compare VAR_RESULT, FALSE compare VAR_RESULT, FALSE
data/maps/ThreeIsland_BerryForest/scripts.inc
+1 -1
View File
@@ -23,7 +23,7 @@ ThreeIsland_BerryForest_EventScript_Lostelle:: @ 8163C83
waitmoncry waitmoncry
setwildbattle SPECIES_HYPNO, 30, ITEM_NONE setwildbattle SPECIES_HYPNO, 30, ITEM_NONE
dowildbattle dowildbattle
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
applymovement 1, Movement_FacePlayer applymovement 1, Movement_FacePlayer
waitmovement 0 waitmovement 0
msgbox ThreeIsland_BerryForest_Text_ThankYouHaveThis msgbox ThreeIsland_BerryForest_Text_ThankYouHaveThis
data/maps/TwoIsland_House/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ TwoIsland_House_MapScripts:: @ 8171618
TwoIsland_House_EventScript_MoveManiac:: @ 8171619 TwoIsland_House_EventScript_MoveManiac:: @ 8171619
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
lock lock
faceplayer faceplayer
clearflag HAS_BIG_MUSHROOM clearflag HAS_BIG_MUSHROOM
data/maps/VermilionCity/scripts.inc
+1 -1
View File
@@ -86,7 +86,7 @@ VermilionCity_EventScript_CheckSeagallopPresent:: @ 8166996
VermilionCity_EventScript_ChooseSeagallopDestRainbowPass:: @ 81669BB VermilionCity_EventScript_ChooseSeagallopDestRainbowPass:: @ 81669BB
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
call VermilionCity_EventScript_CheckHasMysticTicket call VermilionCity_EventScript_CheckHasMysticTicket
compare VAR_RESULT, TRUE compare VAR_RESULT, TRUE
goto_if_eq VermilionCity_EventScript_HasMysticTicket goto_if_eq VermilionCity_EventScript_HasMysticTicket
data/maps/VermilionCity_Gym/scripts.inc
+1 -1
View File
@@ -142,7 +142,7 @@ VermilionCity_Gym_EventScript_TrashCan15:: @ 816B837
VermilionCity_Gym_EventScript_TrashCan:: @ 816B843 VermilionCity_Gym_EventScript_TrashCan:: @ 816B843
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
copyvar SWITCH1_ID, VAR_TEMP_0 copyvar SWITCH1_ID, VAR_TEMP_0
copyvar SWITCH2_ID, VAR_TEMP_1 copyvar SWITCH2_ID, VAR_TEMP_1
goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, VermilionCity_Gym_EventScript_LocksAlreadyOpen goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, VermilionCity_Gym_EventScript_LocksAlreadyOpen
data/maps/ViridianCity/scripts.inc
+2 -2
View File
@@ -146,7 +146,7 @@ ViridianCity_EventScript_WatchToLearnBasics:: @ 8165A5B
ViridianCity_EventScript_TutorialUnused:: @ 8165A65 ViridianCity_EventScript_TutorialUnused:: @ 8165A65
msgbox ViridianCity_Text_ThatWasEducationalTakeThis msgbox ViridianCity_Text_ThatWasEducationalTakeThis
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
special StartOldManTutorialBattle special StartOldManTutorialBattle
waitstate waitstate
release release
@@ -239,7 +239,7 @@ ViridianCity_EventScript_DoTutorialBattle:: @ 8165B4C
msgbox ViridianCity_Text_ShowYouHowToCatchMons msgbox ViridianCity_Text_ShowYouHowToCatchMons
closemessage closemessage
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
special StartOldManTutorialBattle special StartOldManTutorialBattle
waitstate waitstate
lock lock
data/scripts/cable_club.inc
+8 -8
View File
@@ -15,7 +15,7 @@ EventScript_HideMysteryGiftMan:: @ 81BB1CE
CableClub_EventScript_MysteryGiftMan:: @ 81BB1D2 CableClub_EventScript_MysteryGiftMan:: @ 81BB1D2
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
execram execram
@ Unused @ Unused
@@ -111,7 +111,7 @@ CableClub_EventScript_ExitMinigameRoom:: @ 81BB2FD
CableClub_EventScript_CloseLinkAndExitLinkRoom:: @ 81BB315 CableClub_EventScript_CloseLinkAndExitLinkRoom:: @ 81BB315
special CloseLink special CloseLink
special HelpSystem_Enable special HelpSystem_Enable
special sub_811390C special QuestLog_StartRecordingInputsAfterDeferredEvent
setvar VAR_CABLE_CLUB_STATE, 0 setvar VAR_CABLE_CLUB_STATE, 0
textcolor 1 textcolor 1
compare VAR_0x8007, 0 compare VAR_0x8007, 0
@@ -137,7 +137,7 @@ CableClub_EventScript_ExitTradeCenter:: @ 81BB34F
CableClub_EventScript_PlayerExitTradeCenter:: @ 81BB367 CableClub_EventScript_PlayerExitTradeCenter:: @ 81BB367
special CloseLink special CloseLink
special HelpSystem_Enable special HelpSystem_Enable
special sub_811390C special QuestLog_StartRecordingInputsAfterDeferredEvent
setvar VAR_CABLE_CLUB_STATE, 0 setvar VAR_CABLE_CLUB_STATE, 0
textcolor 1 textcolor 1
compare VAR_0x8007, 0 compare VAR_0x8007, 0
@@ -161,7 +161,7 @@ CableClub_EventScript_ExitUnionRoom:: @ 81BB39C
CableClub_EventScript_PlayerExitUnionRoom:: @ 81BB3B4 CableClub_EventScript_PlayerExitUnionRoom:: @ 81BB3B4
special HelpSystem_Enable special HelpSystem_Enable
special sub_811390C special QuestLog_StartRecordingInputsAfterDeferredEvent
setvar VAR_CABLE_CLUB_STATE, 0 setvar VAR_CABLE_CLUB_STATE, 0
textcolor 1 textcolor 1
compare VAR_0x8007, 0 compare VAR_0x8007, 0
@@ -775,7 +775,7 @@ CableClub_EventScript_DoLinkRoomExit:: @ 81BB9FC
CableClub_EventScript_UnionRoomAttendant:: @ 81BBA04 CableClub_EventScript_UnionRoomAttendant:: @ 81BBA04
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
lock lock
faceplayer faceplayer
goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements
@@ -885,7 +885,7 @@ CableClub_EventScript_DontAskAboutLinking:: @ 81BBB92
CableClub_EventScript_DirectCornerAttendant:: @ 81BBB9C CableClub_EventScript_DirectCornerAttendant:: @ 81BBB9C
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
lock lock
faceplayer faceplayer
goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements
@@ -1195,7 +1195,7 @@ CableClub_OnResume:: @ 81BC05C
JoyfulGameCorner_EventScript_InfoMan2:: @ 81BC060 JoyfulGameCorner_EventScript_InfoMan2:: @ 81BC060
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
lock lock
faceplayer faceplayer
message Text_DescribeWhichGame message Text_DescribeWhichGame
@@ -1225,7 +1225,7 @@ CableClub_EventScript_MinigameInfoExit:: @ 81BC0C4
JoyfulGameCorner_EventScript_MinigameAttendant:: @ 81BC0CE JoyfulGameCorner_EventScript_MinigameAttendant:: @ 81BC0CE
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
lock lock
faceplayer faceplayer
message Text_WelcomeCanYouWait message Text_WelcomeCanYouWait
data/scripts/move_tutors.inc
+2 -2
View File
@@ -448,7 +448,7 @@ EventScript_BodySlamTaught:: @ 81C4DE2
TwoIsland_CapeBrink_House_EventScript_StarterTutor:: @ 81C4DEC TwoIsland_CapeBrink_House_EventScript_StarterTutor:: @ 81C4DEC
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
lock lock
faceplayer faceplayer
goto_if_set FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK, CapeBrinkTutor_EventScript_TaughtAllMoves goto_if_set FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK, CapeBrinkTutor_EventScript_TaughtAllMoves
@@ -556,7 +556,7 @@ EventScript_ChooseMoveTutorMon:: @ 81C4F30
EventScript_CanOnlyBeLearnedOnce:: @ 81C4F37 EventScript_CanOnlyBeLearnedOnce:: @ 81C4F37
textcolor 3 textcolor 3
special sub_80699BC special DisableMsgBoxWalkaway
signmsg signmsg
msgbox Text_MoveCanOnlyBeLearnedOnce, MSGBOX_YESNO msgbox Text_MoveCanOnlyBeLearnedOnce, MSGBOX_YESNO
normalmsg normalmsg
data/scripts/pokedex_rating.inc
+1 -1
View File
@@ -1,6 +1,6 @@
PokedexRating_EventScript_RateInPerson:: @ 81A737B PokedexRating_EventScript_RateInPerson:: @ 81A737B
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
call_if_set FLAG_OAK_SAW_DEX_COMPLETION, PokedexRating_EventScript_DexCompleteIntro call_if_set FLAG_OAK_SAW_DEX_COMPLETION, PokedexRating_EventScript_DexCompleteIntro
call_if_unset FLAG_OAK_SAW_DEX_COMPLETION, PokedexRating_EventScript_NormalIntro call_if_unset FLAG_OAK_SAW_DEX_COMPLETION, PokedexRating_EventScript_NormalIntro
call PokedexRating_EventScript_Rate call PokedexRating_EventScript_Rate
data/scripts/questionnaire.inc
+1 -1
View File
@@ -29,7 +29,7 @@ EventScript_EnableMysteryGift:: @ 81A774D
msgbox Text_YouKnowThoseWords msgbox Text_YouKnowThoseWords
setflag FLAG_SYS_MYSTERY_GIFT_ENABLED setflag FLAG_SYS_MYSTERY_GIFT_ENABLED
textcolor 3 textcolor 3
special sub_80699BC special DisableMsgBoxWalkaway
signmsg signmsg
msgbox Text_YouCanAccessMysteryGift msgbox Text_YouCanAccessMysteryGift
normalmsg normalmsg
data/scripts/seagallop.inc
+1 -1
View File
@@ -111,7 +111,7 @@ EventScript_SetSail:: @ 81A90DA
closemessage closemessage
delay 20 delay 20
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
special DoSeagallopFerryScene special DoSeagallopFerryScene
waitstate waitstate
data/scripts/trainer_card.inc
+1 -1
View File
@@ -92,7 +92,7 @@ FourIsland_House2_EventScript_StickerManAskForBrag:: @ 81B2994
applymovement 1, Movement_FacePlayer applymovement 1, Movement_FacePlayer
waitmovement 0 waitmovement 0
goto_if_questlog EventScript_ReleaseEnd goto_if_questlog EventScript_ReleaseEnd
special sub_8112364 special QuestLog_OnInteractionWithSpecialNpc
compare VAR_0x8008, 0 compare VAR_0x8008, 0
goto_if_eq FourIsland_House2_EventScript_NothingToBragAbout goto_if_eq FourIsland_House2_EventScript_NothingToBragAbout
message FourIsland_House2_Text_BragAboutWhatToday message FourIsland_House2_Text_BragAboutWhatToday
data/specials.inc
+10 -10
View File
@@ -100,7 +100,7 @@ gSpecials:: @ 815FD60
def_special NullFieldSpecial def_special NullFieldSpecial
def_special NullFieldSpecial def_special NullFieldSpecial
def_special NullFieldSpecial def_special NullFieldSpecial
def_special sub_8081128 def_special TryContestLinkup
def_special Field_AskSaveTheGame def_special Field_AskSaveTheGame
def_special DoWateringBerryTreeAnim def_special DoWateringBerryTreeAnim
def_special ShowEasyChatScreen def_special ShowEasyChatScreen
@@ -349,14 +349,14 @@ gSpecials:: @ 815FD60
def_special Dummy_TryEnableBravoTrainerBattleTower def_special Dummy_TryEnableBravoTrainerBattleTower
def_special DoesPartyHaveEnigmaBerry def_special DoesPartyHaveEnigmaBerry
def_special NullFieldSpecial def_special NullFieldSpecial
def_special sub_810B82C def_special SetPostgameFlags
def_special StartMarowakBattle def_special StartMarowakBattle
def_special ForcePlayerOntoBike def_special ForcePlayerOntoBike
def_special ListMenu def_special ListMenu
def_special ReturnToListMenu def_special ReturnToListMenu
def_special DoPicboxCancel def_special DoPicboxCancel
def_special SetVermilionTrashCans def_special SetVermilionTrashCans
def_special sub_805D1A8 def_special SeafoamIslandsB4F_CurrentDumpsPlayerOnLand
def_special SampleResortGorgeousMonAndReward def_special SampleResortGorgeousMonAndReward
def_special CheckAddCoins def_special CheckAddCoins
def_special GetDaycarePokemonCount def_special GetDaycarePokemonCount
@@ -364,7 +364,7 @@ gSpecials:: @ 815FD60
def_special ForcePlayerToStartSurfing def_special ForcePlayerToStartSurfing
def_special GetStarterSpecies def_special GetStarterSpecies
def_special SetSeenMon def_special SetSeenMon
def_special sub_810C444 def_special VsSeekerResetObjectMovementAfterChargeComplete
def_special ShouldShowBoxWasFullMessage def_special ShouldShowBoxWasFullMessage
def_special ChangeBoxPokemonNickname def_special ChangeBoxPokemonNickname
def_special UpdateTrainerCardPhotoIcons def_special UpdateTrainerCardPhotoIcons
@@ -377,8 +377,8 @@ gSpecials:: @ 815FD60
def_special ShowWirelessCommunicationScreen def_special ShowWirelessCommunicationScreen
def_special EnableNationalPokedex def_special EnableNationalPokedex
def_special SetWalkingIntoSignVars def_special SetWalkingIntoSignVars
def_special sub_80699BC def_special DisableMsgBoxWalkaway
def_special sub_810C3A4 def_special VsSeekerFreezeObjectsAfterChargeComplete
def_special SetFlavorTextFlagFromSpecialVars def_special SetFlavorTextFlagFromSpecialVars
def_special UpdatePickStateFromSpecialVar8005 def_special UpdatePickStateFromSpecialVar8005
def_special OverworldWhiteOutGetMoneyLoss def_special OverworldWhiteOutGetMoneyLoss
@@ -393,14 +393,14 @@ gSpecials:: @ 815FD60
def_special BackupHelpContext def_special BackupHelpContext
def_special RestoreHelpContext def_special RestoreHelpContext
def_special ValidateReceivedWonderCard def_special ValidateReceivedWonderCard
def_special sub_810B810 def_special SetUnlockedPokedexFlags
def_special InitUnionRoom def_special InitUnionRoom
def_special BufferUnionRoomPlayerName def_special BufferUnionRoomPlayerName
def_special sub_811390C def_special QuestLog_StartRecordingInputsAfterDeferredEvent
def_special GetMartClerkObjectId def_special GetMartClerkObjectId
def_special BattleCardAction def_special BattleCardAction
def_special GetQuestLogState def_special GetQuestLogState
def_special sub_8112364 def_special QuestLog_OnInteractionWithSpecialNpc
def_special GetMENewsJisanItemAndState def_special GetMENewsJisanItemAndState
def_special GetPCBoxToSendMon def_special GetPCBoxToSendMon
def_special OpenMuseumFossilPic def_special OpenMuseumFossilPic
@@ -418,7 +418,7 @@ gSpecials:: @ 815FD60
def_special DaisyMassageServices def_special DaisyMassageServices
def_special HelpSystem_Disable def_special HelpSystem_Disable
def_special HelpSystem_Enable def_special HelpSystem_Enable
def_special sub_810B82C def_special SetPostgameFlags
def_special CheckHasAtLeastOneBerry def_special CheckHasAtLeastOneBerry
def_special DisplayBerryPowderVendorMenu def_special DisplayBerryPowderVendorMenu
def_special RemoveBerryPowderVendorMenu def_special RemoveBerryPowderVendorMenu
include/event_scripts.h
+1 -1
View File
@@ -1254,7 +1254,7 @@ extern const u8 EventScript_CurrentTooFast[];
extern const u8 EventScript_UseSurf[]; extern const u8 EventScript_UseSurf[];
extern const u8 EventScript_Waterfall[]; extern const u8 EventScript_Waterfall[];
extern const u8 EventScript_CantUseWaterfall[]; extern const u8 EventScript_CantUseWaterfall[];
extern const u8 gUnknown_81A8CED[]; extern const u8 EventScript_VsSeekerChargingDone[];
extern const u8 EventScript_FieldPoison[]; extern const u8 EventScript_FieldPoison[];
extern const u8 EventScript_EggHatch[]; extern const u8 EventScript_EggHatch[];
extern const u8 EventScript_1C1361[]; extern const u8 EventScript_1C1361[];
include/field_player_avatar.h
+1 -1
View File
@@ -15,7 +15,7 @@ void MovePlayerNotOnBike(u8 direction, u16 heldKeys);
void MovementType_Player(struct Sprite * sprite); void MovementType_Player(struct Sprite * sprite);
void sub_805C270(void); void sub_805C270(void);
void sub_805C780(void); void StopPlayerAvatar(void);
void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr); void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr);
u8 GetPlayerAvatarGraphicsIdByStateId(u8); u8 GetPlayerAvatarGraphicsIdByStateId(u8);
void SetPlayerAvatarStateMask(u8 mask); void SetPlayerAvatarStateMask(u8 mask);
include/link.h
+2 -2
View File
@@ -79,8 +79,8 @@
#define LINKTYPE_BATTLE_TOWER 0x2288 #define LINKTYPE_BATTLE_TOWER 0x2288
#define LINKTYPE_0x3311 0x3311 #define LINKTYPE_0x3311 0x3311
#define LINKTYPE_0x3322 0x3322 #define LINKTYPE_0x3322 0x3322
#define LINKTYPE_0x4411 0x4411 #define LINKTYPE_BERRY_BLENDER_SETUP 0x4411
#define LINKTYPE_0x6601 0x6601 #define LINKTYPE_CONTEST_GMODE 0x6601
#define MASTER_HANDSHAKE 0x8FFF #define MASTER_HANDSHAKE 0x8FFF
#define SLAVE_HANDSHAKE 0xB9A0 #define SLAVE_HANDSHAKE 0xB9A0
include/quest_log.h
+1 -1
View File
@@ -28,7 +28,7 @@ void ResetQuestLog(void);
void ResetTrainerFanClub(void); void ResetTrainerFanClub(void);
void TrySetUpQuestLogScenes_ElseContinueFromSave(u8 taskId); void TrySetUpQuestLogScenes_ElseContinueFromSave(u8 taskId);
void sub_8112450(void); void sub_8112450(void);
void sub_8112364(void); void QuestLog_OnInteractionWithSpecialNpc(void);
u8 sub_8112CAC(void); u8 sub_8112CAC(void);
void sub_81138F8(void); void sub_81138F8(void);
void sub_811231C(void); void sub_811231C(void);
include/save_location.h
+2 -2
View File
@@ -10,7 +10,7 @@
void TrySetMapSaveWarpStatus(void); void TrySetMapSaveWarpStatus(void);
bool32 IsCurMapPokeCenter(void); bool32 IsCurMapPokeCenter(void);
void sub_810B810(void); void SetUnlockedPokedexFlags(void);
void sub_810B82C(void); void SetPostgameFlags(void);
#endif // GUARD_SAVE_LOCATION_H #endif // GUARD_SAVE_LOCATION_H
include/script.h
+1 -1
View File
@@ -78,7 +78,7 @@ u8 GetRegisteredQuestLogInput(void);
void ResetFacingNpcOrSignPostVars(void); void ResetFacingNpcOrSignPostVars(void);
bool8 CanWalkAwayToCancelMsgBox(void); bool8 CanWalkAwayToCancelMsgBox(void);
void SetWalkingIntoSignVars(void); void SetWalkingIntoSignVars(void);
bool8 sub_80699D4(void); bool8 IsMsgBoxWalkawayDisabled(void);
extern const u8 *gRAMScriptPtr; extern const u8 *gRAMScriptPtr;
extern u8 gWalkAwayFromSignInhibitTimer; extern u8 gWalkAwayFromSignInhibitTimer;
include/vs_seeker.h
+1 -5
View File
@@ -3,18 +3,14 @@
#include "global.h" #include "global.h"
void sub_810C604(void);
void sub_810C640(void);
void Task_VsSeeker_0(u8 taskId); void Task_VsSeeker_0(u8 taskId);
void sub_810CB90(void); void sub_810CB90(void);
void sub_810CDE8(void); void sub_810CDE8(void);
int GetRematchTrainerId(u16 a0); int GetRematchTrainerId(u16 a0);
bool8 sub_810CF04(u8 a0); bool8 sub_810CF04(u8 a0);
u8 sub_810CF54();
void sub_810D0D0(void); void sub_810D0D0(void);
void sub_810CB90(void); void sub_810CB90(void);
bool8 sub_810C4EC(void); bool8 UpdateVsSeekerStepCounter(void);
void TryUpdateRandomTrainerRematches(u16 mapGroup, u16 mapNum); void TryUpdateRandomTrainerRematches(u16 mapGroup, u16 mapNum);
#endif //GUARD_VS_SEEKER_H #endif //GUARD_VS_SEEKER_H
src/battle_setup.c
+5 -5
View File
@@ -235,7 +235,7 @@ static void DoStandardWildBattle(void)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
FreezeObjectEvents(); FreezeObjectEvents();
sub_805C780(); StopPlayerAvatar();
gMain.savedCallback = CB2_EndWildBattle; gMain.savedCallback = CB2_EndWildBattle;
gBattleTypeFlags = 0; gBattleTypeFlags = 0;
CreateBattleStartTask(GetWildBattleTransition(), 0); CreateBattleStartTask(GetWildBattleTransition(), 0);
@@ -247,7 +247,7 @@ void StartRoamerBattle(void)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
FreezeObjectEvents(); FreezeObjectEvents();
sub_805C780(); StopPlayerAvatar();
gMain.savedCallback = CB2_EndWildBattle; gMain.savedCallback = CB2_EndWildBattle;
gBattleTypeFlags = BATTLE_TYPE_ROAMER; gBattleTypeFlags = BATTLE_TYPE_ROAMER;
CreateBattleStartTask(GetWildBattleTransition(), MUS_VS_DEN); CreateBattleStartTask(GetWildBattleTransition(), MUS_VS_DEN);
@@ -259,7 +259,7 @@ static void DoSafariBattle(void)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
FreezeObjectEvents(); FreezeObjectEvents();
sub_805C780(); StopPlayerAvatar();
gMain.savedCallback = CB2_EndSafariBattle; gMain.savedCallback = CB2_EndSafariBattle;
gBattleTypeFlags = BATTLE_TYPE_SAFARI; gBattleTypeFlags = BATTLE_TYPE_SAFARI;
CreateBattleStartTask(GetWildBattleTransition(), 0); CreateBattleStartTask(GetWildBattleTransition(), 0);
@@ -269,7 +269,7 @@ static void DoGhostBattle(void)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
FreezeObjectEvents(); FreezeObjectEvents();
sub_805C780(); StopPlayerAvatar();
gMain.savedCallback = CB2_EndWildBattle; gMain.savedCallback = CB2_EndWildBattle;
gBattleTypeFlags = BATTLE_TYPE_GHOST; gBattleTypeFlags = BATTLE_TYPE_GHOST;
CreateBattleStartTask(GetWildBattleTransition(), 0); CreateBattleStartTask(GetWildBattleTransition(), 0);
@@ -399,7 +399,7 @@ static void sub_807FB08(void)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
FreezeObjectEvents(); FreezeObjectEvents();
sub_805C780(); StopPlayerAvatar();
gMain.savedCallback = sub_807FAF8; gMain.savedCallback = sub_807FAF8;
SavePlayerParty(); SavePlayerParty();
InitPokedudePartyAndOpponent(); InitPokedudePartyAndOpponent();
src/cable_club.c
+3 -3
View File
@@ -402,7 +402,7 @@ static void Task_Linkup_6a(u8 taskId)
if (gSpecialVar_Result == 1) if (gSpecialVar_Result == 1)
{ {
// Dumb trick required to match // Dumb trick required to match
if (gLinkType == LINKTYPE_0x4411) if (gLinkType == LINKTYPE_BERRY_BLENDER_SETUP)
*UnusedVarNeededToMatch += 0; *UnusedVarNeededToMatch += 0;
DestroyLinkPlayerCountDisplayWindow(gTasks[taskId].data[5]); DestroyLinkPlayerCountDisplayWindow(gTasks[taskId].data[5]);
EnableBothScriptContexts(); EnableBothScriptContexts();
@@ -493,9 +493,9 @@ void TryRecordMixLinkup(void)
CreateLinkupTask(2, 4); CreateLinkupTask(2, 4);
} }
void sub_8081128(void) void TryContestLinkup(void)
{ {
gLinkType = LINKTYPE_0x6601; gLinkType = LINKTYPE_CONTEST_GMODE;
gBattleTypeFlags = 0; gBattleTypeFlags = 0;
CreateLinkupTask(4, 4); CreateLinkupTask(4, 4);
} }
src/event_object_lock.c
+2 -2
View File
@@ -28,7 +28,7 @@ bool8 sub_8069590(void)
return FALSE; return FALSE;
else else
{ {
sub_805C780(); StopPlayerAvatar();
return TRUE; return TRUE;
} }
} }
@@ -65,7 +65,7 @@ bool8 sub_8069648(void)
return FALSE; return FALSE;
else else
{ {
sub_805C780(); StopPlayerAvatar();
return TRUE; return TRUE;
} }
} }
src/field_control_avatar.c
+4 -4
View File
@@ -308,7 +308,7 @@ void FieldInput_HandleCancelSignpost(struct FieldInput * input)
{ {
if (input->dpadDirection != 0 && GetPlayerFacingDirection() != input->dpadDirection) if (input->dpadDirection != 0 && GetPlayerFacingDirection() != input->dpadDirection)
{ {
if (sub_80699D4() == TRUE) if (IsMsgBoxWalkawayDisabled() == TRUE)
return; return;
if (input->dpadDirection == DIR_NORTH) if (input->dpadDirection == DIR_NORTH)
RegisterQuestLogInput(QL_INPUT_UP); RegisterQuestLogInput(QL_INPUT_UP);
@@ -657,9 +657,9 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior)) if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior))
{ {
if (sub_810C4EC() == TRUE) if (UpdateVsSeekerStepCounter() == TRUE)
{ {
ScriptContext1_SetupScript(gUnknown_81A8CED); ScriptContext1_SetupScript(EventScript_VsSeekerChargingDone);
return TRUE; return TRUE;
} }
else if (UpdatePoisonStepCounter() == TRUE) else if (UpdatePoisonStepCounter() == TRUE)
@@ -1086,7 +1086,7 @@ void sub_806DE70(u16 x, u16 y)
{ {
if (events[i].x + 7 == x && events[i].y + 7 == y) if (events[i].x + 7 == x && events[i].y + 7 == y)
{ {
sub_8112364(); QuestLog_OnInteractionWithSpecialNpc();
ScriptContext1_SetupScript(events[i].script); ScriptContext1_SetupScript(events[i].script);
ScriptContext2_Enable(); ScriptContext2_Enable();
} }
src/field_player_avatar.c
+2 -2
View File
@@ -1114,7 +1114,7 @@ void sub_805C774(void)
ForcedMovement_None(); ForcedMovement_None();
} }
void sub_805C780(void) void StopPlayerAvatar(void)
{ {
struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
@@ -1596,7 +1596,7 @@ void CreateStopSurfingTask_NoMusicChange(u8 direction)
Task_StopSurfingInit(taskId); Task_StopSurfingInit(taskId);
} }
void sub_805D1A8(void) void SeafoamIslandsB4F_CurrentDumpsPlayerOnLand(void)
{ {
if (gUnknown_3005E88 != 1 && gUnknown_3005E88 != 3) if (gUnknown_3005E88 != 1 && gUnknown_3005E88 != 3)
{ {
src/field_specials.c
+2 -2
View File
@@ -95,7 +95,7 @@ static u8 *const sStringVarPtrs[] = {
void ShowDiploma(void) void ShowDiploma(void)
{ {
sub_8112364(); QuestLog_OnInteractionWithSpecialNpc();
SetMainCallback2(CB2_ShowDiploma); SetMainCallback2(CB2_ShowDiploma);
ScriptContext2_Enable(); ScriptContext2_Enable();
} }
@@ -187,7 +187,7 @@ u8 GetLeadMonFriendship(void)
void ShowTownMap(void) void ShowTownMap(void)
{ {
sub_8112364(); QuestLog_OnInteractionWithSpecialNpc();
sub_80BFF50(1, CB2_ReturnToFieldContinueScriptPlayMapMusic); sub_80BFF50(1, CB2_ReturnToFieldContinueScriptPlayMapMusic);
} }
src/item_menu.c
+1 -1
View File
@@ -2036,7 +2036,7 @@ bool8 UseRegisteredKeyItemOnField(void)
ScriptContext2_Enable(); ScriptContext2_Enable();
FreezeObjectEvents(); FreezeObjectEvents();
sub_805C270(); sub_805C270();
sub_805C780(); StopPlayerAvatar();
gSpecialVar_ItemId = gSaveBlock1Ptr->registeredItem; gSpecialVar_ItemId = gSaveBlock1Ptr->registeredItem;
taskId = CreateTask(ItemId_GetFieldFunc(gSaveBlock1Ptr->registeredItem), 8); taskId = CreateTask(ItemId_GetFieldFunc(gSaveBlock1Ptr->registeredItem), 8);
gTasks[taskId].data[3] = 1; gTasks[taskId].data[3] = 1;
src/overworld.c
+1 -1
View File
@@ -1555,7 +1555,7 @@ void CB2_WhiteOut(void)
gFieldCallback = FieldCB_RushInjuredPokemonToCenter; gFieldCallback = FieldCB_RushInjuredPokemonToCenter;
val = 0; val = 0;
do_load_map_stuff_loop(&val); do_load_map_stuff_loop(&val);
sub_8112364(); QuestLog_OnInteractionWithSpecialNpc();
SetFieldVBlankCallback(); SetFieldVBlankCallback();
SetMainCallback1(CB1_Overworld); SetMainCallback1(CB1_Overworld);
SetMainCallback2(CB2_Overworld); SetMainCallback2(CB2_Overworld);
src/quest_log.c
+55 -55
View File
@@ -106,7 +106,7 @@ EWRAM_DATA u8 gQuestLogState = 0;
static EWRAM_DATA u16 gUnknown_203ADFC = 0; static EWRAM_DATA u16 gUnknown_203ADFC = 0;
static EWRAM_DATA u8 sQuestLogHeaderWindowIds[3] = {0}; static EWRAM_DATA u8 sQuestLogHeaderWindowIds[3] = {0};
static EWRAM_DATA u16 *gUnknown_203AE04 = NULL; static EWRAM_DATA u16 *gUnknown_203AE04 = NULL;
static EWRAM_DATA u16 *gUnknown_203AE08 = NULL; static EWRAM_DATA u16 *sEventRecordingPointer = NULL;
static EWRAM_DATA u16 *gUnknown_203AE0C[32] = {NULL}; static EWRAM_DATA u16 *gUnknown_203AE0C[32] = {NULL};
static EWRAM_DATA void (* sQuestLogCB)(void) = NULL; static EWRAM_DATA void (* sQuestLogCB)(void) = NULL;
static EWRAM_DATA u16 *gUnknown_203AE90 = NULL; static EWRAM_DATA u16 *gUnknown_203AE90 = NULL;
@@ -129,7 +129,7 @@ static void sub_8110A00(void);
static void sub_8110A3C(void); static void sub_8110A3C(void);
static void SetPlayerInitialCoordsAtScene(u8); static void SetPlayerInitialCoordsAtScene(u8);
static void SetNPCInitialCoordsAtScene(u8); static void SetNPCInitialCoordsAtScene(u8);
static void sub_8110E3C(void); static void TryRecordEvent39_GoToNextScene(void);
static void BackUpTrainerRematchesToVars(void); static void BackUpTrainerRematchesToVars(void);
static void BackUpMapLayoutToVar(void); static void BackUpMapLayoutToVar(void);
static void SetGameStateAtScene(u8); static void SetGameStateAtScene(u8);
@@ -182,7 +182,7 @@ static bool8 sub_81137E4(u16, const u16 *);
static u16 *sub_8113828(u16, const u16 *); static u16 *sub_8113828(u16, const u16 *);
static bool8 TrySetLinkQuestLogEvent(u16, const u16 *); static bool8 TrySetLinkQuestLogEvent(u16, const u16 *);
static bool8 TrySetTrainerBattleQuestLogEvent(u16, const u16 *); static bool8 TrySetTrainerBattleQuestLogEvent(u16, const u16 *);
static void sub_8113A1C(u16); static void TryRecordEvent41_IncCursor(u16);
static void sub_811381C(void); static void sub_811381C(void);
static bool8 IsQuestLogEventWithSpecialEncounterSpecies(u16, const u16 *); static bool8 IsQuestLogEventWithSpecialEncounterSpecies(u16, const u16 *);
static u16 *QuestLog_SkipCommand(u16 *, u16 **); static u16 *QuestLog_SkipCommand(u16 *, u16 **);
@@ -192,9 +192,9 @@ static bool8 sub_8113B44(const u16 *);
static void sub_8113B88(void); static void sub_8113B88(void);
static void sub_8113B94(u16); static void sub_8113B94(u16);
static void sub_8113BD8(void); static void sub_8113BD8(void);
static u16 *sub_8113BF4(u16 *); static u16 *TryRecordEvent39_NoParams(u16 *);
static u16 *sub_8113C20(u16 *, struct QuestLogEntry *); static u16 *sub_8113C20(u16 *, struct QuestLogEntry *);
static u16 *sub_8113C5C(u16 *, u16); static u16 *TryRecordEvent41(u16 *, u16);
static u16 *sub_8113C8C(u16 *, struct QuestLogEntry *); static u16 *sub_8113C8C(u16 *, struct QuestLogEntry *);
static u16 *sub_8113CC8(u16 *, struct QuestLogEntry *); static u16 *sub_8113CC8(u16 *, struct QuestLogEntry *);
static u16 *sub_8113D08(u16 *, struct QuestLogEntry *); static u16 *sub_8113D08(u16 *, struct QuestLogEntry *);
@@ -300,8 +300,8 @@ void sub_8110840(void * oldPointer)
gUnknown_203AE04 = (void *)gUnknown_203AE04 + offset; gUnknown_203AE04 = (void *)gUnknown_203AE04 + offset;
if (gQuestLogState != 0) if (gQuestLogState != 0)
{ {
if (gUnknown_203AE08) if (sEventRecordingPointer)
gUnknown_203AE08 = (void *)gUnknown_203AE08 + offset; sEventRecordingPointer = (void *)sEventRecordingPointer + offset;
if (gQuestLogState == QL_STATE_2) if (gQuestLogState == QL_STATE_2)
{ {
int r3; int r3;
@@ -318,7 +318,7 @@ void ResetQuestLog(void)
sCurrentSceneNum = 0; sCurrentSceneNum = 0;
gQuestLogState = 0; gQuestLogState = 0;
sQuestLogCB = NULL; sQuestLogCB = NULL;
gUnknown_203AE08 = NULL; sEventRecordingPointer = NULL;
gUnknown_203AE04 = NULL; gUnknown_203AE04 = NULL;
sub_8113BD8(); sub_8113BD8();
sub_81138F8(); sub_81138F8();
@@ -351,12 +351,12 @@ bool8 sub_8110944(const void * a0, size_t cmdSize)
return TRUE; return TRUE;
} }
bool8 sub_8110988(u16 *a0, size_t a1) static bool8 WillCommandOfSizeFitInSav1Record(u16 *cursor, size_t size)
{ {
void * r2 = gSaveBlock1Ptr->questLog[sCurrentSceneNum].unk_568; void * start = gSaveBlock1Ptr->questLog[sCurrentSceneNum].unk_568;
void * r0 = gSaveBlock1Ptr->questLog[sCurrentSceneNum].end; void * end = gSaveBlock1Ptr->questLog[sCurrentSceneNum].end;
r0 -= a1; end -= size;
if ((void *)a0 < r2 || (void *)a0 > r0) if ((void *)cursor < start || (void *)cursor > end)
return FALSE; return FALSE;
return TRUE; return TRUE;
} }
@@ -375,7 +375,7 @@ static void sub_8110A00(void)
if (TryRecordQuestLogEntrySequence(sQuestLogSceneRecordBuffer) != 1) if (TryRecordQuestLogEntrySequence(sQuestLogSceneRecordBuffer) != 1)
{ {
gUnknown_3005E88 = 0; gUnknown_3005E88 = 0;
sub_8110E3C(); TryRecordEvent39_GoToNextScene();
gQuestLogState = 0; gQuestLogState = 0;
sQuestLogCB = NULL; sQuestLogCB = NULL;
} }
@@ -416,7 +416,7 @@ static void StartRecordingQuestLogEntry(u16 eventId)
DestroySav1QuestLogEntry(sCurrentSceneNum); DestroySav1QuestLogEntry(sCurrentSceneNum);
sub_8113B88(); sub_8113B88();
gUnknown_203AE08 = gSaveBlock1Ptr->questLog[sCurrentSceneNum].unk_568; sEventRecordingPointer = gSaveBlock1Ptr->questLog[sCurrentSceneNum].unk_568;
if (IS_LINK_QL_EVENT(eventId) || eventId == QL_EVENT_DEPARTED) if (IS_LINK_QL_EVENT(eventId) || eventId == QL_EVENT_DEPARTED)
gSaveBlock1Ptr->questLog[sCurrentSceneNum].unk_000 = 2; gSaveBlock1Ptr->questLog[sCurrentSceneNum].unk_000 = 2;
else else
@@ -509,9 +509,9 @@ static void BackUpMapLayoutToVar(void)
VarSet(VAR_QLBAK_MAP_LAYOUT, gSaveBlock1Ptr->mapLayoutId); VarSet(VAR_QLBAK_MAP_LAYOUT, gSaveBlock1Ptr->mapLayoutId);
} }
static void sub_8110E3C(void) static void TryRecordEvent39_GoToNextScene(void)
{ {
sub_8113BF4(gUnknown_203AE08); TryRecordEvent39_NoParams(sEventRecordingPointer);
if (++sCurrentSceneNum >= QUEST_LOG_SCENE_COUNT) if (++sCurrentSceneNum >= QUEST_LOG_SCENE_COUNT)
sCurrentSceneNum = 0; sCurrentSceneNum = 0;
} }
@@ -522,19 +522,19 @@ static bool8 TryRecordQuestLogEntrySequence(struct QuestLogEntry * entry)
for (i = gUnknown_203ADFC; i < sQuestLogCursor; i++) for (i = gUnknown_203ADFC; i < sQuestLogCursor; i++)
{ {
if (gUnknown_203AE08 == NULL) if (sEventRecordingPointer == NULL)
return FALSE; return FALSE;
switch (entry[i].unk_6) switch (entry[i].unk_6)
{ {
case 0: case 0:
case 1: case 1:
gUnknown_203AE08 = sub_8113D48(gUnknown_203AE08, &entry[i]); sEventRecordingPointer = sub_8113D48(sEventRecordingPointer, &entry[i]);
break; break;
default: default:
gUnknown_203AE08 = sub_8113CC8(gUnknown_203AE08, &entry[i]); sEventRecordingPointer = sub_8113CC8(sEventRecordingPointer, &entry[i]);
break; break;
} }
if (gUnknown_203AE08 == NULL) if (sEventRecordingPointer == NULL)
{ {
gUnknown_3005E88 = 0; gUnknown_3005E88 = 0;
return FALSE; return FALSE;
@@ -543,7 +543,7 @@ static bool8 TryRecordQuestLogEntrySequence(struct QuestLogEntry * entry)
if (gUnknown_3005E88 == 0) if (gUnknown_3005E88 == 0)
{ {
gUnknown_203AE08 = sub_8113BF4(gUnknown_203AE08); sEventRecordingPointer = TryRecordEvent39_NoParams(sEventRecordingPointer);
return FALSE; return FALSE;
} }
gUnknown_203ADFC = sQuestLogCursor; gUnknown_203ADFC = sQuestLogCursor;
@@ -966,7 +966,7 @@ bool8 QuestLog_SchedulePlaybackCB(void (*callback)(void))
switch (gQuestLogState) switch (gQuestLogState)
{ {
case 1: case 1:
sub_8112364(); QuestLog_OnInteractionWithSpecialNpc();
break; break;
case 2: case 2:
gUnknown_3005E88 = 3; gUnknown_3005E88 = 3;
@@ -1228,7 +1228,7 @@ static void sub_8111F8C(u8 taskId)
{ {
FreezeObjectEvents(); FreezeObjectEvents();
sub_805C270(); sub_805C270();
sub_805C780(); StopPlayerAvatar();
ScriptContext2_Enable(); ScriptContext2_Enable();
task->func = Task_QuestLogScene_SavedGame; task->func = Task_QuestLogScene_SavedGame;
} }
@@ -1364,28 +1364,28 @@ void sub_811231C(void)
if (gQuestLogState == QL_STATE_1) if (gQuestLogState == QL_STATE_1)
{ {
TryRecordQuestLogEntrySequence(sQuestLogSceneRecordBuffer); TryRecordQuestLogEntrySequence(sQuestLogSceneRecordBuffer);
sub_8110E3C(); TryRecordEvent39_GoToNextScene();
gQuestLogState = 0; gQuestLogState = 0;
sQuestLogCB = NULL; sQuestLogCB = NULL;
gUnknown_203AE04 = NULL; gUnknown_203AE04 = NULL;
gUnknown_203AE08 = NULL; sEventRecordingPointer = NULL;
gUnknown_3005E88 = 0; gUnknown_3005E88 = 0;
} }
} }
void sub_8112364(void) void QuestLog_OnInteractionWithSpecialNpc(void)
{ {
if (gUnknown_3005E88 && gQuestLogState == QL_STATE_1) if (gUnknown_3005E88 && gQuestLogState == QL_STATE_1)
{ {
TryRecordQuestLogEntrySequence(sQuestLogSceneRecordBuffer); TryRecordQuestLogEntrySequence(sQuestLogSceneRecordBuffer);
sub_8113A1C(1); TryRecordEvent41_IncCursor(1);
sub_8110E3C(); TryRecordEvent39_GoToNextScene();
gUnknown_3005E88 = 0; gUnknown_3005E88 = 0;
gQuestLogState = 0; gQuestLogState = 0;
sQuestLogCB = NULL; sQuestLogCB = NULL;
} }
gUnknown_203AE04 = NULL; gUnknown_203AE04 = NULL;
gUnknown_203AE08 = NULL; sEventRecordingPointer = NULL;
} }
void sub_81123BC(void) void sub_81123BC(void)
@@ -1414,7 +1414,7 @@ void sub_8112450(void)
{ {
if (MenuHelpers_LinkSomething() != TRUE) if (MenuHelpers_LinkSomething() != TRUE)
{ {
sub_8112364(); QuestLog_OnInteractionWithSpecialNpc();
sub_81123BC(); sub_81123BC();
} }
} }
@@ -2442,7 +2442,7 @@ void SetQuestLogEvent(u16 eventId, const u16 *eventData)
{ {
if (gUnknown_203AE04 == NULL) if (gUnknown_203AE04 == NULL)
{ {
gUnknown_203AE04 = gUnknown_203AE08; gUnknown_203AE04 = sEventRecordingPointer;
r1 = sQuestLogStorageCBs[eventId](gUnknown_203AE04, eventData); r1 = sQuestLogStorageCBs[eventId](gUnknown_203AE04, eventData);
} }
else else
@@ -2454,7 +2454,7 @@ void SetQuestLogEvent(u16 eventId, const u16 *eventData)
else else
{ {
gUnknown_203AE04 = NULL; gUnknown_203AE04 = NULL;
r1 = sQuestLogStorageCBs[eventId](gUnknown_203AE08, eventData); r1 = sQuestLogStorageCBs[eventId](sEventRecordingPointer, eventData);
} }
if (r1 == NULL) if (r1 == NULL)
@@ -2465,7 +2465,7 @@ void SetQuestLogEvent(u16 eventId, const u16 *eventData)
return; return;
} }
gUnknown_203AE08 = r1; sEventRecordingPointer = r1;
if (gUnknown_203B048 == 0) if (gUnknown_203B048 == 0)
return; return;
sub_811231C(); sub_811231C();
@@ -2517,7 +2517,7 @@ bool8 sub_8113748(void)
return TRUE; return TRUE;
if (gQuestLogState == QL_STATE_1) if (gQuestLogState == QL_STATE_1)
sub_8112364(); QuestLog_OnInteractionWithSpecialNpc();
return FALSE; return FALSE;
} }
@@ -2583,11 +2583,11 @@ static u16 *sub_8113828(u16 eventId, const u16 *eventData)
sub_8113B94(eventId); sub_8113B94(eventId);
if (eventId == QL_EVENT_DEFEATED_WILD_MON) if (eventId == QL_EVENT_DEFEATED_WILD_MON)
gUnknown_203AE04 = gUnknown_203AE08; gUnknown_203AE04 = sEventRecordingPointer;
else else
gUnknown_203AE04 = NULL; gUnknown_203AE04 = NULL;
return sQuestLogStorageCBs[eventId](gUnknown_203AE08, eventData); return sQuestLogStorageCBs[eventId](sEventRecordingPointer, eventData);
} }
static bool8 TrySetLinkQuestLogEvent(u16 eventId, const u16 *eventData) static bool8 TrySetLinkQuestLogEvent(u16 eventId, const u16 *eventData)
@@ -2613,15 +2613,15 @@ void sub_81138F8(void)
gUnknown_203B024 = (struct UnkStruct_203B024){}; gUnknown_203B024 = (struct UnkStruct_203B024){};
} }
void sub_811390C(void) void QuestLog_StartRecordingInputsAfterDeferredEvent(void)
{ {
if (gUnknown_203B024.unk_00 != QL_EVENT_0) if (gUnknown_203B024.unk_00 != QL_EVENT_0)
{ {
u16 *resp; u16 *resp;
gUnknown_203B04A = 0; gUnknown_203B04A = 0;
StartRecordingQuestLogEntry(gUnknown_203B024.unk_00); StartRecordingQuestLogEntry(gUnknown_203B024.unk_00);
resp = sQuestLogStorageCBs[gUnknown_203B024.unk_00](gUnknown_203AE08, gUnknown_203B024.unk_04); resp = sQuestLogStorageCBs[gUnknown_203B024.unk_00](sEventRecordingPointer, gUnknown_203B024.unk_04);
gUnknown_203AE08 = resp; sEventRecordingPointer = resp;
sub_81138F8(); sub_81138F8();
} }
} }
@@ -2654,17 +2654,17 @@ void sub_81139BC(void)
StartRecordingQuestLogEntry(gUnknown_203B024.unk_00); StartRecordingQuestLogEntry(gUnknown_203B024.unk_00);
} }
sub_8113B94(gUnknown_203B024.unk_00); sub_8113B94(gUnknown_203B024.unk_00);
resp = sQuestLogStorageCBs[gUnknown_203B024.unk_00](gUnknown_203AE08, gUnknown_203B024.unk_04); resp = sQuestLogStorageCBs[gUnknown_203B024.unk_00](sEventRecordingPointer, gUnknown_203B024.unk_04);
gUnknown_203AE08 = resp; sEventRecordingPointer = resp;
sub_8113A1C(1); TryRecordEvent41_IncCursor(1);
sub_81138F8(); sub_81138F8();
sub_811231C(); sub_811231C();
} }
} }
static void sub_8113A1C(u16 a0) static void TryRecordEvent41_IncCursor(u16 a0)
{ {
gUnknown_203AE08 = sub_8113C5C(gUnknown_203AE08, a0); sEventRecordingPointer = TryRecordEvent41(sEventRecordingPointer, a0);
sQuestLogCursor++; sQuestLogCursor++;
} }
@@ -2853,9 +2853,9 @@ static void sub_8113BD8(void)
gUnknown_203B04B = FALSE; gUnknown_203B04B = FALSE;
} }
static u16 *sub_8113BF4(u16 *a0) static u16 *TryRecordEvent39_NoParams(u16 *a0)
{ {
if (!sub_8110988(a0, sQuestLogEventCmdSizes[QL_EVENT_39])) if (!WillCommandOfSizeFitInSav1Record(a0, sQuestLogEventCmdSizes[QL_EVENT_39]))
return NULL; return NULL;
a0[0] = QL_EVENT_39; a0[0] = QL_EVENT_39;
return a0 + 1; return a0 + 1;
@@ -2863,7 +2863,7 @@ static u16 *sub_8113BF4(u16 *a0)
static u16 *sub_8113C20(u16 *a0, struct QuestLogEntry * a1) static u16 *sub_8113C20(u16 *a0, struct QuestLogEntry * a1)
{ {
if (!sub_8110988(a0, sQuestLogEventCmdSizes[QL_EVENT_39])) if (!WillCommandOfSizeFitInSav1Record(a0, sQuestLogEventCmdSizes[QL_EVENT_39]))
return NULL; return NULL;
a1->unk_6 = 0xFF; a1->unk_6 = 0xFF;
a1->unk_4 = 0; a1->unk_4 = 0;
@@ -2874,9 +2874,9 @@ static u16 *sub_8113C20(u16 *a0, struct QuestLogEntry * a1)
return a0 + 1; return a0 + 1;
} }
static u16 *sub_8113C5C(u16 *a0, u16 a1) static u16 *TryRecordEvent41(u16 *a0, u16 a1)
{ {
if (!sub_8110988(a0, sQuestLogEventCmdSizes[QL_EVENT_41])) if (!WillCommandOfSizeFitInSav1Record(a0, sQuestLogEventCmdSizes[QL_EVENT_41]))
return NULL; return NULL;
a0[0] = QL_EVENT_41; a0[0] = QL_EVENT_41;
a0[1] = a1; a0[1] = a1;
@@ -2885,7 +2885,7 @@ static u16 *sub_8113C5C(u16 *a0, u16 a1)
static u16 *sub_8113C8C(u16 *a0, struct QuestLogEntry * a1) static u16 *sub_8113C8C(u16 *a0, struct QuestLogEntry * a1)
{ {
if (!sub_8110988(a0, sQuestLogEventCmdSizes[QL_EVENT_41])) if (!WillCommandOfSizeFitInSav1Record(a0, sQuestLogEventCmdSizes[QL_EVENT_41]))
return NULL; return NULL;
a1->unk_6 = 0xFE; a1->unk_6 = 0xFE;
a1->unk_4 = a0[1]; a1->unk_4 = a0[1];
@@ -2900,7 +2900,7 @@ static u16 *sub_8113CC8(u16 *a0, struct QuestLogEntry * a1)
{ {
u8 *r6 = (u8 *)a0 + 4; u8 *r6 = (u8 *)a0 + 4;
if (!sub_8110988(a0, sQuestLogEventCmdSizes[QL_EVENT_0])) if (!WillCommandOfSizeFitInSav1Record(a0, sQuestLogEventCmdSizes[QL_EVENT_0]))
return NULL; return NULL;
a0[0] = 0; a0[0] = 0;
a0[1] = a1->unk_4; a0[1] = a1->unk_4;
@@ -2915,7 +2915,7 @@ static u16 *sub_8113D08(u16 *a0, struct QuestLogEntry * a1)
{ {
u8 *r6 = (u8 *)a0 + 4; u8 *r6 = (u8 *)a0 + 4;
if (!sub_8110988(a0, sQuestLogEventCmdSizes[QL_EVENT_0])) if (!WillCommandOfSizeFitInSav1Record(a0, sQuestLogEventCmdSizes[QL_EVENT_0]))
return NULL; return NULL;
a1->unk_6 = 2; a1->unk_6 = 2;
a1->unk_4 = a0[1]; a1->unk_4 = a0[1];
@@ -2931,7 +2931,7 @@ static u16 *sub_8113D48(u16 *a0, struct QuestLogEntry * a1)
u16 *r4 = a0; u16 *r4 = a0;
u8 *r6 = (u8 *)a0 + 4; u8 *r6 = (u8 *)a0 + 4;
if (!sub_8110988(r4, sQuestLogEventCmdSizes[QL_EVENT_2])) if (!WillCommandOfSizeFitInSav1Record(r4, sQuestLogEventCmdSizes[QL_EVENT_2]))
return NULL; return NULL;
if (a1->unk_6 == 0) if (a1->unk_6 == 0)
r4[0] = 2; r4[0] = 2;
@@ -2950,7 +2950,7 @@ static u16 *sub_8113D94(u16 *a0, struct QuestLogEntry * a1)
u16 *r5 = a0; u16 *r5 = a0;
u8 *r6 = (u8 *)a0 + 4; u8 *r6 = (u8 *)a0 + 4;
if (!sub_8110988(r5, sQuestLogEventCmdSizes[QL_EVENT_2])) if (!WillCommandOfSizeFitInSav1Record(r5, sQuestLogEventCmdSizes[QL_EVENT_2]))
return NULL; return NULL;
if (r5[0] == 2) if (r5[0] == 2)
a1->unk_6 = 0; a1->unk_6 = 0;
src/save_location.c
+3 -3
View File
@@ -93,16 +93,16 @@ void TrySetMapSaveWarpStatus(void)
sub_810B7CC(); sub_810B7CC();
} }
void sub_810B810(void) void SetUnlockedPokedexFlags(void)
{ {
gSaveBlock2Ptr->field_A8 |= 0x1; gSaveBlock2Ptr->field_A8 |= 0x1;
gSaveBlock2Ptr->field_A8 |= 0x10; gSaveBlock2Ptr->field_A8 |= 0x10;
gSaveBlock2Ptr->field_A8 |= 0x20; gSaveBlock2Ptr->field_A8 |= 0x20;
} }
void sub_810B82C(void) void SetPostgameFlags(void)
{ {
gSaveBlock2Ptr->specialSaveWarpFlags |= 0x80; gSaveBlock2Ptr->specialSaveWarpFlags |= CHAMPION_SAVEWARP;
gSaveBlock2Ptr->field_A8 |= 0x2; gSaveBlock2Ptr->field_A8 |= 0x2;
gSaveBlock2Ptr->field_A8 |= 0x4; gSaveBlock2Ptr->field_A8 |= 0x4;
gSaveBlock2Ptr->field_A8 |= 0x8; gSaveBlock2Ptr->field_A8 |= 0x8;
src/script.c
+8 -8
View File
@@ -28,7 +28,7 @@ static struct ScriptContext sScriptContext1;
static u32 sUnusedVariable2; static u32 sUnusedVariable2;
static struct ScriptContext sScriptContext2; static struct ScriptContext sScriptContext2;
static bool8 sScriptContext2Enabled; static bool8 sScriptContext2Enabled;
static u8 gUnknown_3000F9D; static u8 sMsgBoxWalkawayDisabled;
static u8 sMsgBoxIsCancelable; static u8 sMsgBoxIsCancelable;
static u8 sQuestLogInput; static u8 sQuestLogInput;
static u8 sQuestLogInputIsDpad; static u8 sQuestLogInputIsDpad;
@@ -235,19 +235,19 @@ u8 GetRegisteredQuestLogInput(void)
return sQuestLogInput; return sQuestLogInput;
} }
void sub_80699BC(void) void DisableMsgBoxWalkaway(void)
{ {
gUnknown_3000F9D = TRUE; sMsgBoxWalkawayDisabled = TRUE;
} }
void sub_80699C8(void) void EnableMsgBoxWalkaway(void)
{ {
gUnknown_3000F9D = FALSE; sMsgBoxWalkawayDisabled = FALSE;
} }
bool8 sub_80699D4(void) bool8 IsMsgBoxWalkawayDisabled(void)
{ {
return gUnknown_3000F9D; return sMsgBoxWalkawayDisabled;
} }
void SetWalkingIntoSignVars(void) void SetWalkingIntoSignVars(void)
@@ -330,7 +330,7 @@ bool8 ScriptContext2_RunScript(void)
void ScriptContext1_SetupScript(const u8 *ptr) void ScriptContext1_SetupScript(const u8 *ptr)
{ {
ClearMsgBoxCancelableState(); ClearMsgBoxCancelableState();
sub_80699C8(); EnableMsgBoxWalkaway();
ClearQuestLogInputIsDpadFlag(); ClearQuestLogInputIsDpadFlag();
InitScriptContext(&sScriptContext1, gScriptCmdTable, gScriptCmdTableEnd); InitScriptContext(&sScriptContext1, gScriptCmdTable, gScriptCmdTableEnd);
SetupBytecodeScript(&sScriptContext1, ptr); SetupBytecodeScript(&sScriptContext1, ptr);
src/start_menu.c
+1 -1
View File
@@ -395,7 +395,7 @@ void ShowStartMenu(void)
{ {
FreezeObjectEvents(); FreezeObjectEvents();
sub_805C270(); sub_805C270();
sub_805C780(); StopPlayerAvatar();
} }
OpenStartMenuWithFollowupFunc(Task_StartMenuHandleInput); OpenStartMenuWithFollowupFunc(Task_StartMenuHandleInput);
ScriptContext2_Enable(); ScriptContext2_Enable();
src/vs_seeker.c
+39 -38
View File
@@ -80,7 +80,9 @@ extern u8 gSelectedObjectEvent;
// static declarations // static declarations
static EWRAM_DATA struct VsSeekerStruct *sVsSeeker = NULL; static EWRAM_DATA struct VsSeekerStruct *sVsSeeker = NULL;
static void sub_810C3B8(u8 taskId); static void VsSeekerResetInBagStepCounter(void);
static void VsSeekerResetChargingStepCounter(void);
static void Task_ResetObjectsRematchWantedState(u8 taskId);
static void sub_810C594(void); static void sub_810C594(void);
static void Task_VsSeeker_1(u8 taskId); static void Task_VsSeeker_1(u8 taskId);
static void Task_VsSeeker_2(u8 taskId); static void Task_VsSeeker_2(u8 taskId);
@@ -103,6 +105,7 @@ static u8 GetRematchableTrainerLocalId(void);
static void StartTrainerObjectMovementScript(struct VsSeekerTrainerInfo *, const u8 *); static void StartTrainerObjectMovementScript(struct VsSeekerTrainerInfo *, const u8 *);
static u8 GetCurVsSeekerResponse(s32, u16); static u8 GetCurVsSeekerResponse(s32, u16);
static void StartAllRespondantIdleMovements(void); static void StartAllRespondantIdleMovements(void);
static u8 GetRandomFaceDirectionMovementType();
// rodata // rodata
static const VsSeekerData sVsSeekerData[] = { static const VsSeekerData sVsSeekerData[] = {
@@ -581,16 +584,14 @@ static const u8 gUnknown_8453F67[] = {
MOVEMENT_TYPE_FACE_RIGHT MOVEMENT_TYPE_FACE_RIGHT
}; };
// text // text
void VsSeekerFreezeObjectsAfterChargeComplete(void)
void sub_810C3A4(void)
{ {
CreateTask(sub_810C3B8, 80); CreateTask(Task_ResetObjectsRematchWantedState, 80);
} }
static void sub_810C3B8(u8 taskId) static void Task_ResetObjectsRematchWantedState(u8 taskId)
{ {
struct Task * task = &gTasks[taskId]; struct Task * task = &gTasks[taskId];
u8 i; u8 i;
@@ -618,36 +619,36 @@ static void sub_810C3B8(u8 taskId)
if (task->data[0] != 0) if (task->data[0] != 0)
{ {
DestroyTask(taskId); DestroyTask(taskId);
sub_805C780(); StopPlayerAvatar();
EnableBothScriptContexts(); EnableBothScriptContexts();
} }
} }
void sub_810C444(void) void VsSeekerResetObjectMovementAfterChargeComplete(void)
{ {
struct ObjectEventTemplate * templates = gSaveBlock1Ptr->objectEventTemplates; struct ObjectEventTemplate * templates = gSaveBlock1Ptr->objectEventTemplates;
u8 i; u8 i;
u8 r6; u8 movementType;
u8 sp0; u8 objEventId;
struct ObjectEvent * objectEvent; struct ObjectEvent * objectEvent;
for (i = 0; i < gMapHeader.events->objectEventCount; i++) for (i = 0; i < gMapHeader.events->objectEventCount; i++)
{ {
if ((templates[i].trainerType == 1 || templates[i].trainerType == 3) && (templates[i].movementType == MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN || templates[i].movementType == MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP || templates[i].movementType == MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT)) if ((templates[i].trainerType == 1 || templates[i].trainerType == 3) && (templates[i].movementType == MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN || templates[i].movementType == MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP || templates[i].movementType == MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT))
{ {
r6 = sub_810CF54(); movementType = GetRandomFaceDirectionMovementType();
TryGetObjectEventIdByLocalIdAndMap(templates[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &sp0); TryGetObjectEventIdByLocalIdAndMap(templates[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objEventId);
objectEvent = &gObjectEvents[sp0]; objectEvent = &gObjectEvents[objEventId];
if (sub_810CF04(sp0) == TRUE) if (sub_810CF04(objEventId) == TRUE)
{ {
SetTrainerMovementType(objectEvent, r6); SetTrainerMovementType(objectEvent, movementType);
} }
templates[i].movementType = r6; templates[i].movementType = movementType;
} }
} }
} }
bool8 sub_810C4EC(void) bool8 UpdateVsSeekerStepCounter(void)
{ {
if (CheckBagHasItem(ITEM_VS_SEEKER, 1) == TRUE) if (CheckBagHasItem(ITEM_VS_SEEKER, 1) == TRUE)
{ {
@@ -672,7 +673,7 @@ bool8 sub_810C4EC(void)
if (x == 100) if (x == 100)
{ {
FlagClear(FLAG_SYS_VS_SEEKER_CHARGING); FlagClear(FLAG_SYS_VS_SEEKER_CHARGING);
sub_810C640(); VsSeekerResetChargingStepCounter();
sub_810D0D0(); sub_810D0D0();
return TRUE; return TRUE;
} }
@@ -684,7 +685,7 @@ bool8 sub_810C4EC(void)
void TryUpdateRandomTrainerRematches(u16 mapGroup, u16 mapNum) void TryUpdateRandomTrainerRematches(u16 mapGroup, u16 mapNum)
{ {
FlagClear(FLAG_SYS_VS_SEEKER_CHARGING); FlagClear(FLAG_SYS_VS_SEEKER_CHARGING);
sub_810C640(); VsSeekerResetChargingStepCounter();
sub_810D0D0(); sub_810D0D0();
sub_810C594(); sub_810C594();
} }
@@ -698,34 +699,34 @@ static void sub_810C594(void)
struct ObjectEvent * objectEvent = &gObjectEvents[i]; struct ObjectEvent * objectEvent = &gObjectEvents[i];
if (objectEvent->movementType == MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN || objectEvent->movementType == MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP || objectEvent->movementType == MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT) if (objectEvent->movementType == MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN || objectEvent->movementType == MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP || objectEvent->movementType == MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT)
{ {
u8 r3 = sub_810CF54(); u8 movementType = GetRandomFaceDirectionMovementType();
if (objectEvent->active && gSprites[objectEvent->spriteId].data[0] == i) if (objectEvent->active && gSprites[objectEvent->spriteId].data[0] == i)
{ {
gSprites[objectEvent->spriteId].pos2.x = 0; gSprites[objectEvent->spriteId].pos2.x = 0;
gSprites[objectEvent->spriteId].pos2.y = 0; gSprites[objectEvent->spriteId].pos2.y = 0;
SetTrainerMovementType(objectEvent, r3); SetTrainerMovementType(objectEvent, movementType);
} }
} }
} }
} }
void sub_810C604(void) static void VsSeekerResetInBagStepCounter(void)
{ {
gSaveBlock1Ptr->trainerRematchStepCounter &= 0xFF00; gSaveBlock1Ptr->trainerRematchStepCounter &= 0xFF00;
} }
void sub_810C620(void) static void VsSeekerSetStepCounterInBagFull(void)
{ {
gSaveBlock1Ptr->trainerRematchStepCounter &= 0xFF00; gSaveBlock1Ptr->trainerRematchStepCounter &= 0xFF00;
gSaveBlock1Ptr->trainerRematchStepCounter |= 100; gSaveBlock1Ptr->trainerRematchStepCounter |= 100;
} }
void sub_810C640(void) static void VsSeekerResetChargingStepCounter(void)
{ {
gSaveBlock1Ptr->trainerRematchStepCounter &= 0x00FF; gSaveBlock1Ptr->trainerRematchStepCounter &= 0x00FF;
} }
void sub_810C654(void) static void VsSeekerSetStepCounterFullyCharged(void)
{ {
gSaveBlock1Ptr->trainerRematchStepCounter &= 0x00FF; gSaveBlock1Ptr->trainerRematchStepCounter &= 0x00FF;
gSaveBlock1Ptr->trainerRematchStepCounter |= (100 << 8); gSaveBlock1Ptr->trainerRematchStepCounter |= (100 << 8);
@@ -785,7 +786,7 @@ static void Task_VsSeeker_2(u8 taskId)
{ {
data[1] = 0; data[1] = 0;
data[2] = 0; data[2] = 0;
sub_810C604(); VsSeekerResetInBagStepCounter();
sVsSeeker->responseCode = GetVsSeekerResponseInArea(sVsSeekerData); sVsSeeker->responseCode = GetVsSeekerResponseInArea(sVsSeekerData);
ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gUnknown_8453F5C); ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gUnknown_8453F5C);
gTasks[taskId].func = Task_VsSeeker_3; gTasks[taskId].func = Task_VsSeeker_3;
@@ -934,7 +935,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
{ {
PlaySE(SE_PIN); PlaySE(SE_PIN);
FlagSet(FLAG_SYS_VS_SEEKER_CHARGING); FlagSet(FLAG_SYS_VS_SEEKER_CHARGING);
sub_810C640(); VsSeekerResetChargingStepCounter();
return VSSEEKER_RESPONSE_FOUND_REMATCHES; return VSSEEKER_RESPONSE_FOUND_REMATCHES;
} }
if (sVsSeeker->trainerHasNotYetBeenFought) if (sVsSeeker->trainerHasNotYetBeenFought)
@@ -944,7 +945,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
void sub_810CB90(void) void sub_810CB90(void)
{ {
u8 sp0 = 0; u8 objEventId = 0;
struct ObjectEventTemplate *r4 = gSaveBlock1Ptr->objectEventTemplates; struct ObjectEventTemplate *r4 = gSaveBlock1Ptr->objectEventTemplates;
s32 r9 = sub_810CE10(sVsSeekerData, gTrainerBattleOpponent_A); s32 r9 = sub_810CE10(sVsSeekerData, gTrainerBattleOpponent_A);
@@ -958,12 +959,12 @@ void sub_810CB90(void)
{ {
struct ObjectEvent *r4_2; struct ObjectEvent *r4_2;
TryGetObjectEventIdByLocalIdAndMap(r4[r8].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &sp0); TryGetObjectEventIdByLocalIdAndMap(r4[r8].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objEventId);
r4_2 = &gObjectEvents[sp0]; r4_2 = &gObjectEvents[objEventId];
sub_810CF54(&r4[r8]); // You are using this function incorrectly. Please consult the manual. GetRandomFaceDirectionMovementType(&r4[r8]); // You are using this function incorrectly. Please consult the manual.
OverrideMovementTypeForObjectEvent(r4_2, gUnknown_8453F67[r4_2->facingDirection]); OverrideMovementTypeForObjectEvent(r4_2, gUnknown_8453F67[r4_2->facingDirection]);
gSaveBlock1Ptr->trainerRematches[r4[r8].localId] = 0; gSaveBlock1Ptr->trainerRematches[r4[r8].localId] = 0;
if (gSelectedObjectEvent == sp0) if (gSelectedObjectEvent == objEventId)
r4_2->movementType = gUnknown_8453F67[r4_2->facingDirection]; r4_2->movementType = gUnknown_8453F67[r4_2->facingDirection];
else else
r4_2->movementType = MOVEMENT_TYPE_FACE_DOWN; r4_2->movementType = MOVEMENT_TYPE_FACE_DOWN;
@@ -1113,22 +1114,22 @@ bool8 sub_810CF04(u8 a0)
return FALSE; return FALSE;
} }
u8 sub_810CF54() static u8 GetRandomFaceDirectionMovementType()
{ {
u16 r1 = Random() % 4; u16 r1 = Random() % 4;
switch (r1) switch (r1)
{ {
case 0: case 0:
return 7; return MOVEMENT_TYPE_FACE_UP;
case 1: case 1:
return 8; return MOVEMENT_TYPE_FACE_DOWN;
case 2: case 2:
return 9; return MOVEMENT_TYPE_FACE_LEFT;
case 3: case 3:
return 10; return MOVEMENT_TYPE_FACE_RIGHT;
default: default:
return 8; return MOVEMENT_TYPE_FACE_DOWN;
} }
} }