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

Merge pull request #323 from PikalaxALT/various_documentation

Browse Source 
Document various parts of the source tree
This commit is contained in:
PikalaxALT
2020-04-10 12:48:58 -04:00
committed by GitHub
parent a81edaba1d 5f7ed93363
commit 2880cf2a51
219 changed files with 5420 additions and 5578 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/pokemon_summary_screen.s
+6 -6
View File
@@ -3657,7 +3657,7 @@ sub_8136350: @ 8136350
ldr r1, _0813650C @ =0x000032f8
adds r0, r2, r1
ldr r1, [r0]
ldr r0, _08136510 @ =sub_804CF14
ldr r0, _08136510 @ =CB2_ReturnToTradeMenuFromSummary
cmp r1, r0
beq _081363DA
b _08136518
@@ -3797,7 +3797,7 @@ _08136500: .4byte 0x00003090
_08136504: .4byte gText_Slash
_08136508: .4byte gUnknown_203B144
_0813650C: .4byte 0x000032f8
_08136510: .4byte sub_804CF14
_08136510: .4byte CB2_ReturnToTradeMenuFromSummary
_08136514: .4byte 0x00003024
_08136518:
ldr r4, _0813677C @ =gUnknown_203B140
@@ -10237,7 +10237,7 @@ sub_813995C: @ 813995C
ldr r1, _081399D8 @ =0x000032f8
adds r0, r5, r1
ldr r1, [r0]
ldr r0, _081399DC @ =sub_804CF14
ldr r0, _081399DC @ =CB2_ReturnToTradeMenuFromSummary
cmp r1, r0
bne _081399E8
ldr r1, _081399E0 @ =0x00003024
@@ -10265,7 +10265,7 @@ _081399CC: .4byte gUnknown_203B170
_081399D0: .4byte gUnknown_203B140
_081399D4: .4byte 0x00003290
_081399D8: .4byte 0x000032f8
_081399DC: .4byte sub_804CF14
_081399DC: .4byte CB2_ReturnToTradeMenuFromSummary
_081399E0: .4byte 0x00003024
_081399E4: .4byte 0x0000ffff
_081399E8:
@@ -10764,7 +10764,7 @@ sub_8139DBC: @ 8139DBC
ldr r1, _08139E10 @ =0x000032f8
adds r0, r2, r1
ldr r1, [r0]
ldr r0, _08139E14 @ =sub_804CF14
ldr r0, _08139E14 @ =CB2_ReturnToTradeMenuFromSummary
cmp r1, r0
bne _08139E2C
ldr r1, _08139E18 @ =0x00003024
@@ -10781,7 +10781,7 @@ sub_8139DBC: @ 8139DBC
_08139E08: .4byte gUnknown_203B140
_08139E0C: .4byte 0x00003290
_08139E10: .4byte 0x000032f8
_08139E14: .4byte sub_804CF14
_08139E14: .4byte CB2_ReturnToTradeMenuFromSummary
_08139E18: .4byte 0x00003024
_08139E1C: .4byte SpriteCallbackDummy
_08139E20:
common_syms/quest_log.txt
+1 -1
View File
@@ -1,4 +1,4 @@
gUnknown_3005E88
gQuestLogPlaybackState
sNumEventsInLogEntry
gQuestLogFieldInput
sCurQuestLogEntry
common_syms/scrcmd.txt
+1 -1
View File
@@ -1,2 +1,2 @@
gUnknown_3005070
sQuestLogScriptContextPtr
gSelectedObjectEvent
data/battle_anim_scripts.s
+15 -15
View File
@@ -418,7 +418,7 @@ gBattleAnims_General::
.4byte General_StatsChange
.4byte General_SubstituteFade
.4byte General_SubstituteAppear
.4byte General_PokeblockThrow
.4byte General_BaitThrow
.4byte General_ItemKnockoff
.4byte General_TurnTrap
.4byte General_ItemEffect
@@ -437,11 +437,11 @@ gBattleAnims_General::
.4byte General_FocusPunchSetUp
.4byte General_IngrainHeal
.4byte General_WishHeal
.4byte gUnknown_81D628A
.4byte gUnknown_81D6301
.4byte gUnknown_81D637B
.4byte gUnknown_81D6394
.4byte gUnknown_81D63DC
.4byte General_MonScared
.4byte General_GhostGetOut
.4byte General_SilphScoped
.4byte General_SafariRockThrow
.4byte General_SafariReaction
gBattleAnims_Special::
.4byte Special_LevelUp
@@ -10584,17 +10584,17 @@ General_SubstituteAppear:: @ 81D5C04
createvisualtask AnimTask_MonToSubstitute, 2,
end
General_PokeblockThrow:: @ 81D5C0C
General_BaitThrow:: @ 81D5C0C
createvisualtask sub_80F1C8C, 2, 0
createvisualtask AnimTask_LoadPokeblockGfx, 2,
createvisualtask AnimTask_LoadBaitGfx, 2,
delay 0
waitplaysewithpan SE_W026, 192, 22
createsprite gPokeblockSpriteTemplate, ANIM_TARGET, 3, -18, 12, 0, 32
createsprite gSafariBaitSpriteTemplate, ANIM_TARGET, 3, -18, 12, 0, 32
delay 50
loopsewithpan SE_W039, 63, 19, 2
createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, 1
waitforvisualfinish
createvisualtask AnimTask_FreePokeblockGfx, 2,
createvisualtask AnimTask_FreeBaitGfx, 2,
end
General_ItemKnockoff:: @ 81D5C54
@@ -10925,7 +10925,7 @@ General_WishHeal:: @ 81D6250
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 10, 0, 0
end
gUnknown_81D628A:: @ 81D628A
General_MonScared:: @ 81D628A
createvisualtask sub_80F1C8C, 2, 1
waitforvisualfinish
loadspritegfx ANIM_TAG_SWEAT_BEAD
@@ -10942,7 +10942,7 @@ gUnknown_81D628A:: @ 81D628A
waitforvisualfinish
end
gUnknown_81D6301:: @ 81D6301
General_GhostGetOut:: @ 81D6301
createvisualtask sub_80F1C8C, 2, 1
waitforvisualfinish
fadetobg 2
@@ -10967,7 +10967,7 @@ gUnknown_81D6301:: @ 81D6301
waitbgfadein
end
gUnknown_81D637B:: @ 81D637B
General_SilphScoped:: @ 81D637B
monbg 0
playsewithpan SE_W100, 192
waitplaysewithpan SE_W107, 192, 48
@@ -10977,7 +10977,7 @@ gUnknown_81D637B:: @ 81D637B
clearmonbg 0
end
gUnknown_81D6394:: @ 81D6394
General_SafariRockThrow:: @ 81D6394
createvisualtask sub_80F1C8C, 2, 0
waitforvisualfinish
loadspritegfx ANIM_TAG_ROCKS
@@ -10997,7 +10997,7 @@ gUnknown_81D6394:: @ 81D6394
waitforvisualfinish
end
gUnknown_81D63DC:: @ 81D63DC
General_SafariReaction:: @ 81D63DC
createvisualtask sub_80F1CE4, 2,
waitforvisualfinish
jumpargeq 7, 0, gUnknown_81D63FD
data/maps/BirthIsland_Exterior/scripts.inc
+1 -1
View File
@@ -43,7 +43,7 @@ BirthIsland_Exterior_EventScript_Triangle:: @ 8165271
lock
faceplayer
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
special DoDeoxysTriangleInteraction
waitstate
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
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
lock
faceplayer
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
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
lock
faceplayer
waitse
data/maps/CeruleanCity_House4/scripts.inc
+1 -1
View File
@@ -3,7 +3,7 @@ CeruleanCity_House4_MapScripts:: @ 816ACEE
CeruleanCity_House4_EventScript_WonderNewsBerryMan:: @ 816ACEF
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
lock
specialvar VAR_0x8004, GetMENewsJisanItemAndState
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
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
lockall
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
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
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
lock
faceplayer
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
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
lock
faceplayer
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
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
lock
faceplayer
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
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
lock
faceplayer
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
giveitem_msg MtMoon_B2F_Text_ObtainedDomeFossil, ITEM_DOME_FOSSIL, 1, MUS_FAN5
closemessage
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
delay 10
applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToHelixFossil
waitmovement 0
@@ -95,7 +95,7 @@ MtMoon_B2F_EventScript_HelixFossil:: @ 816077F
removeobject LOCALID_HELIX_FOSSIL
giveitem_msg MtMoon_B2F_Text_ObtainedHelixFossil, ITEM_HELIX_FOSSIL, 1, MUS_FAN5
closemessage
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
delay 10
applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToDomeFossil
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
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
lock
faceplayer
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
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
lockall
setvar VAR_TEMP_1, 1
special SpawnCameraObject
data/maps/PalletTown_GarysHouse/scripts.inc
+1 -1
View File
@@ -50,7 +50,7 @@ PalletTown_GarysHouse_EventScript_HeardBattledRival:: @ 8168DAF
PalletTown_GarysHouse_EventScript_GroomMon:: @ 8168DB9
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500
goto_if_lt PalletTown_GarysHouse_EventScript_RateMonFriendship
msgbox PalletTown_GarysHouse_Text_LikeMeToGroomMon, MSGBOX_YESNO
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+1 -1
View File
@@ -1000,7 +1000,7 @@ PalletTown_ProfessorOaksLab_EventScript_DontStartNationalDexScene:: @ 81699F9
PalletTown_ProfessorOaksLab_EventScript_CheckIfPlayerNeedsBalls:: @ 81699FB
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
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
checkitem ITEM_POKE_BALL, 1
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
special StartMarowakBattle
waitstate
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
compare VAR_RESULT, FALSE @ Set by CB2_EndMarowakBattle
goto_if_eq PokemonTower_6F_EventScript_DefeatedMarowakGhost
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
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
lock
faceplayer
setwildbattle SPECIES_ZAPDOS, 50, ITEM_NONE
@@ -84,7 +84,7 @@ PowerPlant_EventScript_Electrode1:: @ 816382F
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
dowildbattle
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq PowerPlant_EventScript_FoughtElectrode1
@@ -113,7 +113,7 @@ PowerPlant_EventScript_Electrode2:: @ 816388D
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
dowildbattle
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq PowerPlant_EventScript_FoughtElectrode2
data/maps/Route12/scripts.inc
+1 -1
View File
@@ -15,7 +15,7 @@ Route12_EventScript_Snorlax:: @ 8168014
faceplayer
goto_if_unset FLAG_GOT_POKE_FLUTE, Route12_EventScript_SnorlaxNoPokeFlute
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
msgbox Text_WantToUsePokeFlute, MSGBOX_YESNO
compare VAR_RESULT, NO
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
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
setvar VAR_0x8004, SPECIES_MAGIKARP
specialvar VAR_RESULT, DoesPlayerPartyContainSpecies
compare VAR_RESULT, FALSE
data/maps/Route16/scripts.inc
+1 -1
View File
@@ -34,7 +34,7 @@ Route16_EventScript_Snorlax:: @ 8168121
faceplayer
goto_if_unset FLAG_GOT_POKE_FLUTE, Route16_EventScript_SnorlaxNoPokeFlute
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
msgbox Text_WantToUsePokeFlute, MSGBOX_YESNO
compare VAR_RESULT, NO
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
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
lock
faceplayer
checkitem ITEM_POKE_DOLL, 1
data/maps/SeafoamIslands_B4F/scripts.inc
+1 -1
View File
@@ -159,7 +159,7 @@ SeafoamIslands_B4F_Movement_WalkUp:: @ 81631AA
SeafoamIslands_B4F_EventScript_Articuno:: @ 81631AC
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
lock
faceplayer
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
faceplayer
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
setvar VAR_0x8004, SPECIES_HERACROSS
specialvar VAR_RESULT, DoesPlayerPartyContainSpecies
compare VAR_RESULT, FALSE
data/maps/ThreeIsland_BerryForest/scripts.inc
+1 -1
View File
@@ -23,7 +23,7 @@ ThreeIsland_BerryForest_EventScript_Lostelle:: @ 8163C83
waitmoncry
setwildbattle SPECIES_HYPNO, 30, ITEM_NONE
dowildbattle
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
applymovement 1, Movement_FacePlayer
waitmovement 0
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
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
lock
faceplayer
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
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
call VermilionCity_EventScript_CheckHasMysticTicket
compare VAR_RESULT, TRUE
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
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
copyvar SWITCH1_ID, VAR_TEMP_0
copyvar SWITCH2_ID, VAR_TEMP_1
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
msgbox ViridianCity_Text_ThatWasEducationalTakeThis
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
special StartOldManTutorialBattle
waitstate
release
@@ -239,7 +239,7 @@ ViridianCity_EventScript_DoTutorialBattle:: @ 8165B4C
msgbox ViridianCity_Text_ShowYouHowToCatchMons
closemessage
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
special StartOldManTutorialBattle
waitstate
lock
data/scripts/cable_club.inc
+5 -5
View File
@@ -15,7 +15,7 @@ EventScript_HideMysteryGiftMan:: @ 81BB1CE
CableClub_EventScript_MysteryGiftMan:: @ 81BB1D2
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
execram
@ Unused
@@ -775,7 +775,7 @@ CableClub_EventScript_DoLinkRoomExit:: @ 81BB9FC
CableClub_EventScript_UnionRoomAttendant:: @ 81BBA04
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
lock
faceplayer
goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements
@@ -885,7 +885,7 @@ CableClub_EventScript_DontAskAboutLinking:: @ 81BBB92
CableClub_EventScript_DirectCornerAttendant:: @ 81BBB9C
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
lock
faceplayer
goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements
@@ -1195,7 +1195,7 @@ CableClub_OnResume:: @ 81BC05C
JoyfulGameCorner_EventScript_InfoMan2:: @ 81BC060
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
lock
faceplayer
message Text_DescribeWhichGame
@@ -1225,7 +1225,7 @@ CableClub_EventScript_MinigameInfoExit:: @ 81BC0C4
JoyfulGameCorner_EventScript_MinigameAttendant:: @ 81BC0CE
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
lock
faceplayer
message Text_WelcomeCanYouWait
data/scripts/move_tutors.inc
+1 -1
View File
@@ -448,7 +448,7 @@ EventScript_BodySlamTaught:: @ 81C4DE2
TwoIsland_CapeBrink_House_EventScript_StarterTutor:: @ 81C4DEC
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
lock
faceplayer
goto_if_set FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK, CapeBrinkTutor_EventScript_TaughtAllMoves
data/scripts/pokedex_rating.inc
+1 -1
View File
@@ -1,6 +1,6 @@
PokedexRating_EventScript_RateInPerson:: @ 81A737B
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
call_if_set FLAG_OAK_SAW_DEX_COMPLETION, PokedexRating_EventScript_DexCompleteIntro
call_if_unset FLAG_OAK_SAW_DEX_COMPLETION, PokedexRating_EventScript_NormalIntro
call PokedexRating_EventScript_Rate
data/scripts/seagallop.inc
+1 -1
View File
@@ -111,7 +111,7 @@ EventScript_SetSail:: @ 81A90DA
closemessage
delay 20
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
fadescreen FADE_TO_BLACK
special DoSeagallopFerryScene
waitstate
data/scripts/trainer_card.inc
+1 -1
View File
@@ -92,7 +92,7 @@ FourIsland_House2_EventScript_StickerManAskForBrag:: @ 81B2994
applymovement 1, Movement_FacePlayer
waitmovement 0
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_OnInteractionWithSpecialNpc
special QuestLog_CutRecording
compare VAR_0x8008, 0
goto_if_eq FourIsland_House2_EventScript_NothingToBragAbout
message FourIsland_House2_Text_BragAboutWhatToday
data/specials.inc
+1 -1
View File
@@ -400,7 +400,7 @@ gSpecials:: @ 815FD60
def_special GetMartClerkObjectId
def_special BattleCardAction
def_special GetQuestLogState
def_special QuestLog_OnInteractionWithSpecialNpc
def_special QuestLog_CutRecording
def_special GetMENewsJisanItemAndState
def_special GetPCBoxToSendMon
def_special OpenMuseumFossilPic
graphics/battle_anims/sprites/pokeblock.png → graphics/battle_anims/sprites/safari_bait.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 179 B

After

Width:  |  Height:  |  Size: 179 B

include/battle.h
+1 -1
View File
@@ -33,7 +33,7 @@
#define B_ACTION_RUN 3
#define B_ACTION_SAFARI_WATCH_CAREFULLY 4
#define B_ACTION_SAFARI_BALL 5
#define B_ACTION_SAFARI_POKEBLOCK 6
#define B_ACTION_SAFARI_BAIT 6
#define B_ACTION_SAFARI_GO_NEAR 7
#define B_ACTION_SAFARI_RUN 8
#define B_ACTION_OLDMAN_THROW 9
include/battle_anim.h
+1 -1
View File
@@ -391,7 +391,7 @@ void InitAnimBgTilemapBuffer(u32 bgId, const void *src);
void AnimLoadCompressedBgTilemap(u32 bgId, const u32 *src);
u8 GetBattleBgPaletteNum(void);
void sub_8075458(bool8 arg0);
void sub_8075490(struct Sprite *sprite);
void StartSpriteLinearTranslationFromCurrentPos(struct Sprite *sprite);
void InitSpriteDataForLinearTranslation(struct Sprite *sprite);
void InitAnimLinearTranslation(struct Sprite *sprite);
void StartAnimLinearTranslation(struct Sprite *sprite);
include/cable_club.h
+1 -1
View File
@@ -8,7 +8,7 @@
// Exported RAM declarations
// Exported ROM declarations
void sub_8081A90(u8 taskId);
void Task_WaitForReceivedRemoteLinkPlayers5SecondTimeout(u8 taskId);
u8 CreateTask_ReestablishLinkInCableClubRoom(void);
void CB2_ReturnFromCableClubBattle(void);
bool32 GetSeeingLinkPlayerCardMsg(u8 who);
include/constants/battle_anim.h
+1 -1
View File
@@ -276,7 +276,7 @@
#define ANIM_TAG_GREEN_SPIKE (ANIM_SPRITES_START + 266)
#define ANIM_TAG_WHITE_CIRCLE_OF_LIGHT (ANIM_SPRITES_START + 267)
#define ANIM_TAG_GLOWY_BLUE_ORB (ANIM_SPRITES_START + 268)
#define ANIM_TAG_POKEBLOCK (ANIM_SPRITES_START + 269)
#define ANIM_TAG_SAFARI_BAIT (ANIM_SPRITES_START + 269)
#define ANIM_TAG_WHITE_FEATHER (ANIM_SPRITES_START + 270)
#define ANIM_TAG_SPARKLE_6 (ANIM_SPRITES_START + 271)
#define ANIM_TAG_SPLASH (ANIM_SPRITES_START + 272)
include/constants/metatile_behaviors.h
+7 -7
View File
@@ -16,12 +16,12 @@
#define MB_OCEAN_WATER 0x15
#define MB_PUDDLE 0x16
#define MB_SHALLOW_WATER 0x17
#define MB_19 0x19
#define MB_UNDERWATER_BLOCKED_ABOVE 0x19
#define MB_1A 0x1A
#define MB_1B 0x1B
#define MB_STRENGTH_BUTTON 0x20
#define MB_SAND 0x21
#define MB_22 0x22
#define MB_SEAWEED 0x22
#define MB_ICE 0x23
#define MB_THIN_ICE 0x26
#define MB_CRACKED_ICE 0x27
@@ -68,14 +68,14 @@
#define MB_SOUTH_ARROW_WARP 0x65
#define MB_FALL_WARP 0x66
#define MB_REGULAR_WARP 0x67
#define MB_68 0x68
#define MB_LAVARIDGE_1F_WARP 0x68
#define MB_WARP_DOOR 0x69
#define MB_UP_ESCALATOR 0x6A
#define MB_DOWN_ESCALATOR 0x6B
#define MB_UNKNOWN_WARP_6C 0x6C
#define MB_UNKNOWN_WARP_6D 0x6D
#define MB_UNKNOWN_WARP_6E 0x6E
#define MB_UNKNOWN_WARP_6F 0x6F
#define MB_UP_RIGHT_STAIR_WARP 0x6C
#define MB_UP_LEFT_STAIR_WARP 0x6D
#define MB_DOWN_RIGHT_STAIR_WARP 0x6E
#define MB_DOWN_LEFT_STAIR_WARP 0x6F
#define MB_UNION_ROOM_WARP 0x71
#define MB_COUNTER 0x80
#define MB_BOOKSHELF 0x81
include/constants/quest_log.h
+8 -4
View File
@@ -1,10 +1,14 @@
#ifndef GUARD_CONSTANTS_QUEST_LOG_H
#define GUARD_CONSTANTS_QUEST_LOG_H
// TODO: Name and use state constants
#define QL_STATE_1 1
#define QL_STATE_2 2
#define QL_STATE_3 3
#define QL_STATE_RECORDING 1
#define QL_STATE_PLAYBACK 2
#define QL_STATE_PLAYBACK_LAST 3
#define QL_START_NORMAL 1
#define QL_START_WARP 2
#define QL_IS_PLAYBACK_STATE (gQuestLogState == QL_STATE_PLAYBACK || gQuestLogState == QL_STATE_PLAYBACK_LAST)
#define QL_EVENT_0 0 // Null
#define QL_EVENT_1 1 // Null
include/constants/trainer_types.h
+1
View File
@@ -4,5 +4,6 @@
#define TRAINER_TYPE_NONE 0
#define TRAINER_TYPE_NORMAL 1
#define TRAINER_TYPE_SEE_ALL_DIRECTIONS 2
#define TRAINER_TYPE_BURIED 3
#endif // GUARD_CONSTANTS_TRAINER_TYPES_H
include/event_object_lock.h
+3 -3
View File
@@ -3,13 +3,13 @@
#include "global.h"
bool8 sub_8069590(void);
bool8 NativeScript_WaitPlayerStopMoving(void);
void ScriptFreezeObjectEvents(void);
bool8 sub_8069648(void);
bool8 NativeScript_WaitPlayerAndTargetNPCStopMoving(void);
void LockSelectedObjectEvent(void);
void sub_8098630(void);
bool8 sub_8098734(void);
void sub_80696C0(void);
void ClearPlayerHeldMovementAndUnfreezeObjectEvents(void);
bool8 walkrun_is_standing_still(void);
void UnionRoom_UnlockPlayerAndChatPartner(void);
include/event_object_movement.h
+1 -1
View File
@@ -66,7 +66,7 @@ u8 GetObjectEventIdByXY(s16, s16);
void SetObjectEventDirection(struct ObjectEvent *, u8);
u8 sub_808D4F4(void);
void RemoveObjectEventByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup);
u16 sub_805FCD8(u8 localId, u8 mapNum, u8 mapGroup);
u16 GetObjectEventFlagByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup);
void LoadPlayerObjectReflectionPalette(u16, u8);
void LoadSpecialObjectReflectionPalette(u16, u8);
void TryMoveObjectEventToMapCoords(u8, u8, u8, s16, s16);
include/field_control_avatar.h
+3 -3
View File
@@ -26,15 +26,15 @@ extern struct FieldInput gInputToStoreInQuestLogMaybe;
void RestartWildEncounterImmunitySteps(void);
void ClearPoisonStepCounter(void);
int SetCableClubWarp(void);
void sub_806DE28(struct ObjectEvent *);
void HandleBoulderFallThroughHole(struct ObjectEvent *);
bool8 dive_warp(struct MapPosition * pos, u16 behavior);
bool8 sub_806DB84(u16 metatileBehavior, u8 playerDirection);
bool8 IsDirectionalStairWarpMetatileBehavior(u16 metatileBehavior, u8 playerDirection);
const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehavior, u8 direction);
const u8 *GetCoordEventScriptAtMapPosition(struct MapPosition *position);
void FieldClearPlayerInput(struct FieldInput *input);
int ProcessPlayerFieldInput(struct FieldInput *input);
void FieldInput_HandleCancelSignpost(struct FieldInput * input);
void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys);
void sub_806DE70(u16 x, u16 y);
void HandleBoulderActivateVictoryRoadSwitch(u16 x, u16 y);
#endif //GUARD_FIELD_CONTROL_AVATAR_H
include/field_fadetransition.h
+2 -2
View File
@@ -10,7 +10,7 @@ void DoDoorWarp(void);
void DoFallWarp(void);
void DoTeleportWarp(void);
void sub_807E500(void);
void DoTeleport2Warp(void);
void FieldCB_DefaultWarpExit(void);
void WarpFadeOutScreen(void);
void FieldCB_ContinueScriptHandleMusic(void);
@@ -22,7 +22,7 @@ void sub_807DCE4(void);
bool32 FieldFadeTransitionBackgroundEffectIsFinished(void);
void palette_bg_faded_fill_black(void);
void sub_807E4A0(u16 metatileBehavior, u16 delay);
void DoStairWarp(u16 metatileBehavior, u16 delay);
void DoEscalatorWarp(u8 a0);
void DoLavaridgeGymB1FWarp(void);
void DoLavaridgeGym1FWarp(void);
include/field_player_avatar.h
+2 -2
View File
@@ -14,7 +14,7 @@ u8 PlayerGetCopyableMovement(void);
void MovePlayerNotOnBike(u8 direction, u16 heldKeys);
void MovementType_Player(struct Sprite * sprite);
void sub_805C270(void);
void HandleEnforcedLookDirectionOnPlayerStopMoving(void);
void StopPlayerAvatar(void);
void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr);
u8 GetPlayerAvatarGraphicsIdByStateId(u8);
@@ -22,7 +22,7 @@ void SetPlayerAvatarStateMask(u8 mask);
void AlignFishingAnimationFrames(struct Sprite *sprite);
void CreateStopSurfingTask_NoMusicChange(u8 direction);
void SavePlayerFacingDirectionForTeleport(u8 direction);
void SetPlayerAvatarTransitionFlags(u16 a);
void SetPlayerAvatarTransitionFlags(u16 flags);
bool8 IsPlayerFacingSurfableFishableWater(void);
void StartFishing(u8 secondaryId);
u8 GetPlayerAvatarObjectId(void);
include/field_screen_effect.h
+1 -1
View File
@@ -6,7 +6,7 @@
void sub_80AF79C(void);
void AnimateFlash(u8);
void sub_80B0244(void);
void sub_807E3EC(void);
void FieldCB_SafariZoneRanOutOfBalls(void);
void DoOutwardBarnDoorWipe(void);
void Task_BarnDoorWipe(u8 taskId);
void FieldCB_RushInjuredPokemonToCenter(void);
include/global.h
+2 -32
View File
@@ -544,42 +544,12 @@ struct QuestLogNPCData
u32 movementType:8;
};
struct UnkStruct_203B024
{
u16 unk_00;
u16 unk_02;
u16 unk_04[14];
};
union QuestLogScene
{
u8 allocation[32];
u16 ident;
};
typedef union QuestLogScene QuestLogScene;
// This name is a complete guess and may change.
#define BERRY_TREES_COUNT 128
#define FLAGS_COUNT 288 // 300
#define VARS_COUNT 256
#define MAIL_COUNT (PARTY_SIZE + 10)
#define PC_MAIL_NUM(i) (PARTY_SIZE + (i))
// Declare here so that it can be recursively referenced.
union QuestLogMovement;
// Define here
union QuestLogMovement
{
u16 ident_raw;
struct {
u16 ident:12;
u16 flags:4;
} ident_struct;
};
struct QuestLogObjectEvent
{
/*0x00*/ u8 active:1;
@@ -619,7 +589,7 @@ struct QuestLogObjectEvent
struct QuestLog
{
/*0x0000*/ u8 unk_000;
/*0x0000*/ u8 startType;
/*0x0001*/ u8 mapGroup;
/*0x0002*/ u8 mapNum;
/*0x0003*/ u8 warpId;
@@ -632,7 +602,7 @@ struct QuestLog
/*0x0148*/ u8 flags[FLAGS_COUNT];
/*0x02c8*/ u16 vars[VARS_COUNT];
/*0x0468*/ struct QuestLogNPCData npcData[64];
/*0x0568*/ u16 unk_568[128];
/*0x0568*/ u16 script[128];
/*0x0668*/ u16 end[0];
};
include/graphics.h
+2 -2
View File
@@ -3943,7 +3943,7 @@ extern const u32 gBattleAnimSpriteGfx_IcicleSpear[];
extern const u32 gBattleAnimSpriteGfx_Hail[];
extern const u32 gBattleAnimSpriteGfx_GlowyRedOrb[];
extern const u32 gBattleAnimSpriteGfx_GreenSpike[];
extern const u32 gBattleAnimSpriteGfx_Pokeblock[];
extern const u32 gBattleAnimSpriteGfx_SafariBait[];
extern const u32 gBattleAnimSpriteGfx_WhiteFeather[];
extern const u32 gBattleAnimSpriteGfx_Sparkle6[];
extern const u32 gBattleAnimSpriteGfx_Splash[];
@@ -4196,7 +4196,7 @@ extern const u32 gBattleAnimSpritePal_GlowyGreenOrb[];
extern const u32 gBattleAnimSpritePal_GreenSpike[];
extern const u32 gBattleAnimSpritePal_WhiteCircleOfLight[];
extern const u32 gBattleAnimSpritePal_GlowyBlueOrb[];
extern const u32 gBattleAnimSpritePal_Pokeblock[];
extern const u32 gBattleAnimSpritePal_SafariBait[];
extern const u32 gBattleAnimSpritePal_WhiteFeather[];
extern const u32 gBattleAnimSpritePal_Sparkle6[];
extern const u32 gBattleAnimSpritePal_Splash[];
include/help_message.h
+10
View File
@@ -0,0 +1,10 @@
#ifndef GUARD_HELP_MESSAGE_H
#define GUARD_HELP_MESSAGE_H
void DestroyHelpMessageWindow(u8 a0);
u8 CreateHelpMessageWindow(void);
void PrintTextOnHelpMessageWindow(const u8 * text, u8 mode);
void MapNamePopupWindowIdSetDummy(void);
void sub_8112F18(u8 windowId);
#endif //GUARD_HELP_MESSAGE_H
include/item_use.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "global.h"
void sub_80A1E0C(u8);
void Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker(u8);
void ItemUse_SetQuestLogEvent(u8, struct Pokemon *, u16, u16);
void FieldUseFunc_OrangeMail(u8 taskId);
include/link.h
+1 -1
View File
@@ -277,7 +277,7 @@ void ClearLinkCallback_2(void);
void LinkRfu_SetRfuFuncToSend6600(void);
void IntlConvertLinkPlayerName(struct LinkPlayer * linkPlayer);
bool8 IsWirelessAdapterConnected(void);
bool8 sub_800A474(u8 blockRequestType);
bool8 Link_PrepareCmd0xCCCC_Rfu0xA100(u8 blockRequestType);
void LinkVSync(void);
bool8 HandleLinkConnection(void);
void PrepareLocalLinkPlayerBlock(void);
include/link_rfu.h
+4 -4
View File
@@ -127,7 +127,7 @@ typedef struct UnkRfuStruct_2
/* 0x010 */ u16 linkman_param[2];
/* 0x014 */ u8 unk_14[RFU_CHILD_MAX][14];
/* 0x04c */ u8 unk_4c[14];
/* 0x05a */ u8 unk_5a;
/* 0x05a */ u8 cmdA100_blockRequestType;
/* 0x05b */ u8 unk_5b;
/* 0x05c */ u8 unk_5c[5];
/* 0x061 */ u8 unk_61[5];
@@ -139,7 +139,7 @@ typedef struct UnkRfuStruct_2
/* 0x0e4 */ u8 cmd5f00Ack[5];
/* 0x0e9 */ u8 cmd_6600_recvd[5];
/* 0x0ee */ vu8 errorState;
/* 0x0ef */ u8 unk_ef;
/* 0x0ef */ bool8 isShuttingDown;
/* 0x0f0 */ u8 linkLossRecoveryState;
/* 0x0f1 */ u8 unk_f1;
/* 0x0f2 */ u16 unk_f2[6];
@@ -207,7 +207,7 @@ u8 GetRfuPlayerCount(void);
void StartSendingKeysToRfu(void);
u8 LinkRfu_GetMultiplayerId(void);
bool32 Rfu_InitBlockSend(const u8 * src, size_t size);
bool8 sub_80FA0F8(u8 a0);
bool8 LinkRfu_PrepareCmd0xA100(u8 blockRequestType);
u8 Rfu_GetBlockReceivedStatus(void);
void Rfu_SetBlockReceivedFlag(u8 who);
void Rfu_ResetBlockReceivedFlag(u8 who);
@@ -219,7 +219,7 @@ bool32 IsRfuRecvQueueEmpty(void);
u32 GetRfuRecvQueueLength(void);
void LinkRfu_Shutdown(void);
void LinkRfu_CreateIdleTask(void);
bool8 sub_80FA484(bool32 a0);
bool8 ToggleLMANlinkRecovery(bool32 a0);
void var_800D_set_xB(void);
struct GFtgtGname *GetHostRFUtgtGname(void);
void UpdateWirelessStatusIndicatorSprite(void);
include/metatile_behavior.h
+5 -5
View File
@@ -17,11 +17,11 @@ bool8 MetatileBehavior_IsIce(u8 metatileBehavior);
bool8 MetatileBehavior_IsWarpDoor(u8 metatileBehavior);
bool8 MetatileBehavior_IsWarpDoor_2(u8 metatileBehavior);
bool8 MetatileBehavior_IsEscalator(u8 metatileBehavior);
bool8 MetatileBehavior_IsUnknownWarp6C(u8 metatileBehavior);
bool8 MetatileBehavior_IsUnknownWarp6D(u8 metatileBehavior);
bool8 MetatileBehavior_IsUnknownWarp6E(u8 metatileBehavior);
bool8 MetatileBehavior_IsUnknownWarp6F(u8 metatileBehavior);
bool8 MetatileBehavior_IsUnknownWarp6C_to_6F(u8 metatileBehavior);
bool8 MetatileBehavior_IsDirectionalUpRightStairWarp(u8 metatileBehavior);
bool8 MetatileBehavior_IsDirectionalUpLeftStairWarp(u8 metatileBehavior);
bool8 MetatileBehavior_IsDirectionalDownRightStairWarp(u8 metatileBehavior);
bool8 MetatileBehavior_IsDirectionalDownLeftStairWarp(u8 metatileBehavior);
bool8 MetatileBehavior_IsDirectionalStairWarp(u8 metatileBehavior);
bool8 MetatileBehavior_IsLadder(u8 metatileBehavior);
bool8 MetatileBehavior_IsNonAnimDoor(u8 metatileBehavior);
bool8 MetatileBehavior_IsDeepSouthWarp(u8 metatileBehavior);
include/new_menu_helpers.h
+1 -1
View File
@@ -37,7 +37,7 @@ void SetStdWindowBorderStyle(u8 windowId, bool8 copyToVram);
void sub_80F7768(u8 windowId, bool8 copyToVram);
void Menu_LoadStdPal(void);
void Menu_LoadStdPalAt(u16 offset);
void DisplayItemMessageOnField(u8 taskId, u8 bgId, const u8 *src, TaskFunc callback);
void DisplayItemMessageOnField(u8 taskId, u8 textSpeed, const u8 *src, TaskFunc callback);
void DisplayYesNoMenuDefaultYes(void);
void DisplayYesNoMenuDefaultNo(void);
u8 GetTextSpeedSetting(void);
include/overworld.h
+5 -5
View File
@@ -110,10 +110,10 @@ u32 GetGameStat(u8 statId);
void SetGameStat(u8 statId, u32 value);
void CB2_ContinueSavedGame(void);
void sub_8055D5C(struct WarpData *);
void sub_80572A8(void);
void sub_805726C(void);
void sub_8057430(void);
void Overworld_SetWarpDestinationFromWarp(struct WarpData *);
void CB2_SetUpOverworldForQLPlayback(void);
void CB2_SetUpOverworldForQLPlaybackWithWarpExit(void);
void CB2_EnterFieldFromQuestLog(void);
void Overworld_PlaySpecialMapMusic(void);
u8 GetCurrentRegionMapSectionId(void);
@@ -133,7 +133,7 @@ extern bool8 (* gFieldCallback2)(void);
void SetLastHealLocationWarp(u8 healLocaionId);
void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum);
void sub_80568FC(void);
void CB2_ReturnToFieldFromDiploma(void);
void CB2_OverworldBasic(void);
void CB2_NewGame(void);
bool8 IsMapTypeOutdoors(u8 mapType);
include/quest_log.h
+51 -16
View File
@@ -6,37 +6,53 @@
#include "constants/quest_log.h"
#include "field_control_avatar.h"
struct QuestLogEntry
{
u8 localId;
u8 mapNum;
u8 mapGroup;
u8 animId;
u16 duration;
u8 command;
};
struct UnkStruct_203B044
{
u8 id;
u8 unk_1;
u16 unk_2;
};
extern u8 gQuestLogState;
extern u8 gUnknown_3005E88;
extern u8 gQuestLogPlaybackState;
extern const u16 gUnknown_84566A8[];
extern struct FieldInput gQuestLogFieldInput;
extern struct UnkStruct_203B044 gUnknown_203B044;
extern u16 *gUnknown_203AE04;
extern u16 *sEventRecordingPointer;
extern u16 sQuestLogCursor;
void sub_8112720(u8);
void SetQuestLogEvent(u16, const u16 *);
void sub_811539C(void);
void SetQLPlayedTheSlots(void);
void QuestLog_RecordEnteredMap(u16);
u8 sub_8112CAC(void);
bool8 QuestLog_SchedulePlaybackCB(void (*func)(void));
void sub_8111F38(u16 offset, u16 idx);
void CommitQuestLogWindow1(void);
void DestroyHelpMessageWindow(u8 a0);
u8 CreateHelpMessageWindow(void);
void PrintTextOnHelpMessageWindow(const u8 * text, u8 mode);
void MapNamePopupWindowIdSetDummy(void);
void sub_8111CF0(void);
void QuestLog_DrawPreviouslyOnQuestHeaderIfInPlaybackMode(void);
void ResetQuestLog(void);
void ResetTrainerFanClub(void);
void TrySetUpQuestLogScenes_ElseContinueFromSave(u8 taskId);
void SaveQuestLogData(void);
void QuestLog_OnInteractionWithSpecialNpc(void);
void QuestLog_CutRecording(void);
u8 sub_8112CAC(void);
void sub_81138F8(void);
void sub_811231C(void);
void ResetDeferredLinkEvent(void);
void FinishRecordingQuestLogScene(void);
void sub_81139BC(void);
void *QuestLogGetFlagOrVarPtr(bool8 isFlag, u16 idx);
void QuestLogSetFlagOrVar(bool8 isFlag, u16 idx, u16 value);
void sub_8110840(void *oldSave);
void sub_8112F18(u8 windowId);
void SetQuestLogRecordAndPlaybackPointers(void *oldSave);
void sub_811246C(struct Sprite *sprite);
void sub_81124EC(u8 a0, u8 a1, u8 a2, u8 a3);
bool8 sub_8111C2C(void);
@@ -53,14 +69,33 @@ void sub_81127F8(struct FieldInput * a0);
void sub_8112B3C(void);
void RunQuestLogCB(void);
void sub_8111C68(void);
bool8 sub_8111CD0(void);
bool8 QuestLogScenePlaybackIsEnding(void);
void sub_8115798(void);
bool8 sub_8113748(void);
void sub_81119C8(void);
bool8 QuestLog_ShouldEndSceneOnMapChange(void);
void QuestLog_AdvancePlayhead_(void);
void sub_8111F14(void);
void sub_8110FCC(void);
u8 sub_8110AC8(void);
u8 GetQuestLogStartType(void);
void sub_81113E4(void);
void sub_8111438(void);
void StartRecordingQuestLogEntry(u16 eventId);
bool8 WillCommandOfSizeFitInSav1Record(u16 *cursor, size_t size);
bool8 sub_8110944(const void * a0, size_t cmdSize);
void sub_8113BD8(void);
void ResetUnk203B044(void);
u16 *TryRecordEvent39_NoParams(u16 *);
u16 *sub_8113C8C(u16 *, struct QuestLogEntry *);
u16 *sub_8113CC8(u16 *, struct QuestLogEntry *);
u16 *sub_8113D08(u16 *, struct QuestLogEntry *);
u16 *sub_8113D48(u16 *, struct QuestLogEntry *);
u16 *sub_8113D94(u16 *, struct QuestLogEntry *);
void sub_811381C(void);
u16 *QuestLog_SkipCommand(u16 *, u16 **);
void sub_8113ABC(const u16 *);
u16 *sub_8113C20(u16 *, struct QuestLogEntry *);
bool8 sub_8113AE8(const u16 *);
bool8 sub_8113B44(const u16 *);
void TryRecordEvent41_IncCursor(u16);
#endif //GUARD_QUEST_LOG_H
include/scrcmd.h
-6
View File
@@ -1,6 +0,0 @@
#ifndef GUARD_SCRCMD_H
#define GUARD_SCRCMD_H
extern struct ScriptContext * gUnknown_3005070;
#endif //GUARD_SCRCMD_H
include/strings.h
+3 -3
View File
@@ -169,7 +169,7 @@ extern const u8 gText_WithdrawItem[];
extern const u8 gText_Withdraw[];
extern const u8 gText_ReturnToPC[];
extern const u8 gUnknown_8416425[];
extern const u8 gText_OakForbidsUseOfItemHere[];
extern const u8 gUnknown_8416451[];
extern const u8 gUnknown_8416537[];
extern const u8 gUnknown_841658C[];
@@ -838,7 +838,7 @@ extern const u8 gText_SixIsland[];
extern const u8 gText_SevenIsland[];
// trade
extern const u8 gUnknown_841E0A5[];
extern const u8 gText_IsThisTradeOkay[];
extern const u8 gText_XWillBeSentToY[];
extern const u8 gText_ByeByeVar1[];
extern const u8 gText_XSentOverY[];
@@ -861,7 +861,7 @@ extern const u8 gUnknown_841E1C5[];
extern const u8 gText_PkmnCantBeTradedNow[];
extern const u8 gText_EggCantBeTradedNow[];
extern const u8 gText_OtherTrainersPkmnCantBeTraded[];
extern const u8 gUnknown_841E09F[];
extern const u8 gText_4Qmark[];
extern const u8 gEasyChatGroupName_Pokemon[];
extern const u8 gEasyChatGroupName_Trainer[];
include/text_window.h
+1 -9
View File
@@ -9,22 +9,14 @@ struct TilesPal
u16* pal;
};
const struct TilesPal* sub_8098758(u8 id);
void copy_textbox_border_tile_patterns_to_vram(u8 windowId, u16 destOffset, u8 palOffset);
void sub_809882C(u8 windowId, u16 destOffset, u8 palOffset);
void sub_80987D4(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset);
void box_border_load_tiles_and_pal(u8 windowId, u16 destOffset, u8 palOffset);
void sub_8098858(u8 windowId, u16 tileNum, u8 palNum);
void sub_80989E0(u8 windowId, u16 tileNum, u8 palNum);
void rbox_fill_rectangle(u8 windowId);
const u16* stdpal_get(u8 id);
const u16* GetOverworldTextboxPalettePtr(void);
void sub_8098C6C(u8 bg, u16 destOffset, u8 palOffset);
void TextWindow_LoadResourcesStdFrame0(u8 windowId, u16 tileStart, u8 palette);
void TextWindow_SetStdFrame0_WithPal(u8 windowId, u16 tileStart, u8 palette);
void TextWindow_SetUserSelectedFrame(u8 windowId, u16 tileStart, u8 palette);
void LoadUserWindowBorderGfx(u8 windowId, u16 tileStart, u8 palette);
void sub_814FDA0(u8 windowId, u16 tileStart, u8 palette);
void DrawWindowBorderWithStdpal3(u8 bgId, u16 tileStart, u8 palette);
void DrawTextBorderOuter(u8 windowId, u16 tileStart, u8 palette);
void DrawTextBorderInner(u8 windowId, u16 tileNum, u8 palNum);
void TextWindow_LoadTilesStdFrame1(u8 windowId, u16 destOffset);
include/trade.h
+1 -1
View File
@@ -14,7 +14,7 @@ extern const u8 gText_GenderlessSymbol[];
extern const u16 gUnknown_826601C[];
void CB2_ReturnFromLinkTrade(void);
s32 sub_804FB34(void);
s32 Trade_CalcLinkPlayerCompatibilityParam(void);
s32 CanRegisterMonForTradingBoard(struct GFtgtGnameSub rfuPlayer, u16 species2, u16 species, u8 isObedientBitSet);
s32 GetUnionRoomTradeMessageId(struct GFtgtGnameSub rfuPlayer, struct GFtgtGnameSub rfuPartner, u16 playerSpecies2, u16 partnerSpecies, u8 requestedType, u16 playerSpecies, u8 isObedientBitSet);
include/vs_seeker.h
+3 -6
View File
@@ -4,13 +4,10 @@
#include "global.h"
void Task_VsSeeker_0(u8 taskId);
void sub_810CB90(void);
void sub_810CDE8(void);
void ClearRematchStateByTrainerId(void);
void ClearRematchStateOfLastTalked(void);
int GetRematchTrainerId(u16 a0);
bool8 sub_810CF04(u8 a0);
void sub_810D0D0(void);
void sub_810CB90(void);
bool8 UpdateVsSeekerStepCounter(void);
void TryUpdateRandomTrainerRematches(u16 mapGroup, u16 mapNum);
void MapResetTrainerRematches(u16 mapGroup, u16 mapNum);
#endif //GUARD_VS_SEEKER_H
ld_script.txt
+6
View File
@@ -248,6 +248,9 @@ SECTIONS {
src/mailbox_pc.o(.text);
src/menu.o(.text);
src/quest_log.o(.text);
src/help_message.o(.text);
src/trainer_fan_club.o(.text);
src/quest_log_events.o(.text);
src/union_room.o(.text);
src/rfu_union_tool.o(.text);
src/union_room_battle.o(.text);
@@ -549,6 +552,9 @@ SECTIONS {
src/decoration.o(.rodata);
src/menu.o(.rodata);
src/quest_log.o(.rodata);
src/help_message.o(.rodata);
src/trainer_fan_club.o(.rodata);
src/quest_log_events.o(.rodata);
src/union_room.o(.rodata);
src/rfu_union_tool.o(.rodata);
src/union_room_battle.o(.rodata);
src/battle_anim.c
+2 -2
View File
@@ -1382,7 +1382,7 @@ const struct CompressedSpriteSheet gBattleAnimPicTable[] =
{gBattleAnimSpriteGfx_GreenSpike, 0x0080, ANIM_TAG_GREEN_SPIKE},
{gBattleAnimSpriteGfx_CircleOfLight, 0x0800, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT},
{gBattleAnimSpriteGfx_GlowyRedOrb, 0x0020, ANIM_TAG_GLOWY_BLUE_ORB},
{gBattleAnimSpriteGfx_Pokeblock, 0x0080, ANIM_TAG_POKEBLOCK},
{gBattleAnimSpriteGfx_SafariBait, 0x0080, ANIM_TAG_SAFARI_BAIT},
{gBattleAnimSpriteGfx_WhiteFeather, 0x0400, ANIM_TAG_WHITE_FEATHER},
{gBattleAnimSpriteGfx_Sparkle6, 0x0080, ANIM_TAG_SPARKLE_6},
{gBattleAnimSpriteGfx_Splash, 0x0800, ANIM_TAG_SPLASH},
@@ -1675,7 +1675,7 @@ const struct CompressedSpritePalette gBattleAnimPaletteTable[] =
{gBattleAnimSpritePal_GreenSpike, ANIM_TAG_GREEN_SPIKE},
{gBattleAnimSpritePal_WhiteCircleOfLight, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT},
{gBattleAnimSpritePal_GlowyBlueOrb, ANIM_TAG_GLOWY_BLUE_ORB},
{gBattleAnimSpritePal_Pokeblock, ANIM_TAG_POKEBLOCK},
{gBattleAnimSpritePal_SafariBait, ANIM_TAG_SAFARI_BAIT},
{gBattleAnimSpritePal_WhiteFeather, ANIM_TAG_WHITE_FEATHER},
{gBattleAnimSpritePal_Sparkle6, ANIM_TAG_SPARKLE_6},
{gBattleAnimSpritePal_Splash, ANIM_TAG_SPLASH},
src/battle_anim_mons.c
+1 -1
View File
@@ -898,7 +898,7 @@ void sub_8075458(bool8 arg0)
}
}
void sub_8075490(struct Sprite *sprite)
void StartSpriteLinearTranslationFromCurrentPos(struct Sprite *sprite)
{
sprite->data[1] = sprite->pos1.x;
sprite->data[3] = sprite->pos1.y;
src/battle_anim_special.c
+10 -10
View File
@@ -375,10 +375,10 @@ static const u16 sBallOpenFadeColors[] =
RGB(4, 0, 0),
};
const struct SpriteTemplate gPokeblockSpriteTemplate =
const struct SpriteTemplate gSafariBaitSpriteTemplate =
{
.tileTag = ANIM_TAG_POKEBLOCK,
.paletteTag = ANIM_TAG_POKEBLOCK,
.tileTag = ANIM_TAG_SAFARI_BAIT,
.paletteTag = ANIM_TAG_SAFARI_BAIT,
.oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gDummySpriteAnimTable,
.images = NULL,
@@ -2205,20 +2205,20 @@ static void sub_80F1A80(struct Sprite *sprite)
}
}
void AnimTask_LoadPokeblockGfx(u8 taskId)
void AnimTask_LoadBaitGfx(u8 taskId)
{
u8 paletteIndex;
LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[ANIM_TAG_POKEBLOCK - ANIM_SPRITES_START]);
LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[ANIM_TAG_POKEBLOCK - ANIM_SPRITES_START]);
paletteIndex = IndexOfSpritePaletteTag(ANIM_TAG_POKEBLOCK);
LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[ANIM_TAG_SAFARI_BAIT - ANIM_SPRITES_START]);
LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[ANIM_TAG_SAFARI_BAIT - ANIM_SPRITES_START]);
paletteIndex = IndexOfSpritePaletteTag(ANIM_TAG_SAFARI_BAIT);
DestroyAnimVisualTask(taskId);
}
void AnimTask_FreePokeblockGfx(u8 taskId)
void AnimTask_FreeBaitGfx(u8 taskId)
{
FreeSpriteTilesByTag(ANIM_TAG_POKEBLOCK);
FreeSpritePaletteByTag(ANIM_TAG_POKEBLOCK);
FreeSpriteTilesByTag(ANIM_TAG_SAFARI_BAIT);
FreeSpritePaletteByTag(ANIM_TAG_SAFARI_BAIT);
DestroyAnimVisualTask(taskId);
}
src/battle_controller_safari.c
+1 -1
View File
@@ -171,7 +171,7 @@ static void HandleInputChooseAction(void)
BtlController_EmitTwoReturnValues(1, B_ACTION_SAFARI_BALL, 0);
break;
case 1:
BtlController_EmitTwoReturnValues(1, B_ACTION_SAFARI_POKEBLOCK, 0);
BtlController_EmitTwoReturnValues(1, B_ACTION_SAFARI_BAIT, 0);
break;
case 2:
BtlController_EmitTwoReturnValues(1, B_ACTION_SAFARI_GO_NEAR, 0);
src/battle_controllers.c
+1 -1
View File
@@ -37,7 +37,7 @@ void HandleLinkBattleSetup(void)
SetWirelessCommType1();
if (!gReceivedRemoteLinkPlayers)
OpenLink();
CreateTask(sub_8081A90, 0);
CreateTask(Task_WaitForReceivedRemoteLinkPlayers5SecondTimeout, 0);
CreateTasksForSendRecvLinkBuffers();
}
}
src/battle_main.c
+3 -3
View File
@@ -569,7 +569,7 @@ static void (*const sTurnActionsFuncsTable[])(void) =
[B_ACTION_RUN] = HandleAction_Run,
[B_ACTION_SAFARI_WATCH_CAREFULLY] = HandleAction_WatchesCarefully,
[B_ACTION_SAFARI_BALL] = HandleAction_SafariZoneBallThrow,
[B_ACTION_SAFARI_POKEBLOCK] = HandleAction_ThrowBait,
[B_ACTION_SAFARI_BAIT] = HandleAction_ThrowBait,
[B_ACTION_SAFARI_GO_NEAR] = HandleAction_ThrowRock,
[B_ACTION_SAFARI_RUN] = HandleAction_SafariZoneRun,
[B_ACTION_OLDMAN_THROW] = HandleAction_OldManBallThrow,
@@ -3260,7 +3260,7 @@ static void HandleTurnActionSelectionState(void)
case B_ACTION_SAFARI_BALL:
++gBattleCommunication[gActiveBattler];
break;
case B_ACTION_SAFARI_POKEBLOCK:
case B_ACTION_SAFARI_BAIT:
case B_ACTION_SAFARI_GO_NEAR:
++gBattleCommunication[gActiveBattler];
break;
@@ -3771,7 +3771,7 @@ static void HandleEndTurn_FinishBattle(void)
}
TrySetQuestLogBattleEvent();
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
sub_810CB90();
ClearRematchStateByTrainerId();
BeginFastPaletteFade(3);
FadeOutMapMusic(5);
gBattleMainFunc = FreeResetData_ReturnToOvOrDoEvolutions;
src/battle_message.c
+374 -374
View File
@@ -514,380 +514,380 @@ const u8 gUnknown_83FDD64[] = _("OAK: Hm! Excellent!\pIf you win, you earn prize
const u8 gUnknown_83FDDEB[] = _("OAK: Hm…\nHow disappointing…\pIf you win, you earn prize money,\nand your POKéMON grow.\pBut if you lose, {B_PLAYER_NAME}, you end\nup paying prize money…\pHowever, since you had no warning\nthis time, I'll pay for you.\pBut things won't be this way once\nyou step outside these doors.\pThat's why you must strengthen your\nPOKéMON by battling wild POKéMON.\p");
const u8 *const gBattleStringsTable[] = {
gUnknown_83FB219,
gUnknown_83FB265,
gUnknown_83FB28E,
gUnknown_83FB2A4,
gUnknown_83FB2B6,
gUnknown_83FB2D1,
gUnknown_83FB2FC,
gUnknown_83FB31F,
gUnknown_83FB32E,
gUnknown_83FB343,
gUnknown_83FD1B8,
gUnknown_83FB36B,
gUnknown_83FB37F,
gUnknown_83FCBA5,
gUnknown_83FB394,
gUnknown_83FB3EA,
gUnknown_83FB400,
gUnknown_83FB40D,
gUnknown_83FB41A,
gUnknown_83FB433,
gUnknown_83FB451,
gUnknown_83FB508,
gUnknown_83FB545,
gUnknown_83FB555,
gUnknown_83FB565,
gUnknown_83FB57C,
gUnknown_83FB592,
gUnknown_83FB5A8,
gUnknown_83FB5BC,
gUnknown_83FB5CD,
gUnknown_83FB5E2,
gUnknown_83FB5F8,
gUnknown_83FB610,
gUnknown_83FB626,
gUnknown_83FB641,
gUnknown_83FB650,
gUnknown_83FB663,
gUnknown_83FB692,
gUnknown_83FB6A7,
gUnknown_83FB6BF,
gUnknown_83FB6D3,
gUnknown_83FB6E5,
gUnknown_83FB6F7,
gUnknown_83FB70F,
gUnknown_83FB73A,
gUnknown_83FB76A,
gUnknown_83FB78A,
gUnknown_83FB7A3,
gUnknown_83FB7BF,
gUnknown_83FB7D5,
gUnknown_83FB7EE,
gUnknown_83FB806,
gUnknown_83FB826,
gUnknown_83FB844,
gUnknown_83FB854,
gUnknown_83FB871,
gUnknown_83FB885,
gUnknown_83FB89D,
gUnknown_83FB8AE,
gUnknown_83FB8C5,
gUnknown_83FB8E0,
gUnknown_83FB8F3,
gUnknown_83FB914,
gUnknown_83FB921,
gUnknown_83FB935,
gUnknown_83FB946,
gUnknown_83FB97F,
gUnknown_83FB9B8,
gUnknown_83FB9D9,
gUnknown_83FB9FF,
gUnknown_83FBA2F,
gUnknown_83FBA41,
gUnknown_83FBA5E,
gUnknown_83FBA79,
gUnknown_83FBA8E,
gUnknown_83FBAA3,
gUnknown_83FBAB2,
gUnknown_83FBAC3,
gUnknown_83FBAF3,
gUnknown_83FBB11,
gUnknown_83FBB4C,
gUnknown_83FBB62,
gUnknown_83FBB71,
gUnknown_83FBB83,
gUnknown_83FBB99,
gBattleText_MistShroud,
gUnknown_83FBBD0,
gBattleText_GetPumped,
gUnknown_83FBBFF,
gUnknown_83FBC16,
gUnknown_83FBC2B,
gUnknown_83FBC4C,
gUnknown_83FBC74,
gUnknown_83FBC83,
gUnknown_83FBC99,
gUnknown_83FBCBE,
gUnknown_83FBCD1,
gUnknown_83FBCDD,
gUnknown_83FBCFC,
gUnknown_83FBD16,
gUnknown_83FBD2B,
gUnknown_83FBD43,
gUnknown_83FBD53,
gUnknown_83FBD74,
gUnknown_83FBD86,
gUnknown_83FBDA3,
gUnknown_83FBDC4,
gUnknown_83FBDE2,
gUnknown_83FBE00,
gUnknown_83FBE16,
gUnknown_83FBE2B,
gUnknown_83FBE4E,
gUnknown_83FBE61,
gUnknown_83FBE73,
gUnknown_83FBE8B,
gUnknown_83FBEA1,
gUnknown_83FBEBE,
gUnknown_83FBEE2,
gUnknown_83FBEFA,
gUnknown_83FBF0C,
gUnknown_83FBF23,
gUnknown_83FC687,
gUnknown_83FBF39,
gUnknown_83FBF51,
gUnknown_83FBF63,
gUnknown_83FBF76,
gUnknown_83FBF89,
gUnknown_83FBF99,
gUnknown_83FBFBF,
gUnknown_83FBFD3,
gUnknown_83FBFEA,
gUnknown_83FBFFC,
gUnknown_83FC011,
gUnknown_83FC02B,
gUnknown_83FC048,
gUnknown_83FC072,
gUnknown_83FC090,
gUnknown_83FC0C6,
gUnknown_83FC0DC,
gUnknown_83FC0EE,
gUnknown_83FC10C,
gUnknown_83FC11E,
gUnknown_83FC132,
gUnknown_83FC140,
gUnknown_83FC168,
gUnknown_83FC185,
gUnknown_83FC19D,
gUnknown_83FC1B1,
gUnknown_83FC1C6,
gUnknown_83FC1DB,
gUnknown_83FC1F1,
gUnknown_83FC224,
gUnknown_83FC231,
gUnknown_83FC254,
gUnknown_83FC26D,
gUnknown_83FC28A,
gUnknown_83FC670,
gUnknown_83FC2AA,
gUnknown_83FC69D,
gUnknown_83FC2C7,
gUnknown_83FC2E3,
gUnknown_83FC6D6,
gUnknown_83FC2FA,
gUnknown_83FC312,
gUnknown_83FC377,
gUnknown_83FC38A,
gUnknown_83FC39A,
gUnknown_83FC3AF,
gUnknown_83FC3C5,
gUnknown_83FC3EB,
gUnknown_83FC40E,
gUnknown_83FC421,
gUnknown_83FC439,
gUnknown_83FC461,
gUnknown_83FC6F8,
gUnknown_83FC483,
gUnknown_83FC4AB,
gUnknown_83FC4D6,
gUnknown_83FC4F0,
gUnknown_83FC518,
gUnknown_83FC53D,
gUnknown_83FC715,
gUnknown_83FC72B,
gUnknown_83FC745,
gUnknown_83FC75D,
gUnknown_83FC780,
gUnknown_83FC7B6,
gUnknown_83FC7D3,
gUnknown_83FC7EF,
gUnknown_83FC809,
gUnknown_83FC825,
gUnknown_83FC841,
gUnknown_83FC860,
gUnknown_83FC87B,
gUnknown_83FC895,
gUnknown_83FC8B1,
gUnknown_83FC8C2,
gUnknown_83FCB41,
gBattleText_Rose,
gUnknown_83FCB50,
gUnknown_83FCB59,
gUnknown_83FCB5F,
gBattleText_UnknownString3,
gUnknown_83FCB8F,
gUnknown_83FCB9A,
gUnknown_83FCBE4,
gUnknown_83FCBF4,
gUnknown_83FCC07,
gUnknown_83FCC33,
gUnknown_83FCC5B,
gUnknown_83FCC74,
sText_GotAwaySafely,
gUnknown_83FCCD2,
gUnknown_83FCDB3,
gUnknown_83FCDE2,
gUnknown_83FCDF1,
gUnknown_83FCDF2,
gUnknown_83FCE08,
gUnknown_83FCE17,
gUnknown_83FCE38,
gUnknown_83FCE50,
gUnknown_83FCE64,
gUnknown_83FCE78,
gUnknown_83FCE90,
gUnknown_83FCEA8,
gUnknown_83FCEBA,
gUnknown_83FCECE,
gUnknown_83FCEE3,
gUnknown_83FCEFB,
gUnknown_83FCF14,
gUnknown_83FCF2C,
gUnknown_83FCF40,
gUnknown_83FCF54,
gUnknown_83FCF6C,
gUnknown_83FCF7E,
gUnknown_83FCFA0,
gUnknown_83FCFC2,
gUnknown_83FCFE4,
gUnknown_83FD006,
gUnknown_83FD022,
gUnknown_83FD048,
gUnknown_83FD068,
gUnknown_83FD077,
gUnknown_83FD0A7,
gUnknown_83FD0CA,
sText_PlayerUsedItem,
sText_OldManUsedItem,
sText_TrainerBlockedBall,
sText_DontBeAThief,
sText_ItDodgedBall,
sText_YouMissedPkmn,
sText_PkmnBrokeFree,
sText_ItAppearedCaught,
sText_AarghAlmostHadIt,
sText_ShootSoClose,
sText_GotchaPkmnCaught,
sText_GotchaPkmnCaught2,
sText_GiveNicknameCaptured,
sText_PkmnSentToPC,
gUnknown_83FD82B,
gUnknown_83FD850,
gUnknown_83FD85F,
gUnknown_83FB525,
gUnknown_83FD0F1,
gUnknown_83FD111,
gUnknown_83FD124,
gUnknown_83FD135,
gUnknown_83FD14B,
gUnknown_83FD15A,
gUnknown_83FD16A,
gUnknown_83FD186,
gUnknown_83FD1DF,
gUnknown_83FD1FA,
gUnknown_83FD218,
gUnknown_83FD232,
gUnknown_83FD23F,
gUnknown_83FB218,
gUnknown_83FB218,
gUnknown_83FD24D,
gUnknown_83FD8B9,
gUnknown_83FD8D2,
gUnknown_83FD8E8,
gUnknown_83FD901,
gUnknown_83FD917,
gUnknown_83FD937,
gUnknown_83FD95C,
gUnknown_83FD999,
gUnknown_83FD9B2,
gUnknown_83FD9CC,
gUnknown_83FD9E9,
gUnknown_83FDA0B,
gUnknown_83FDA33,
gUnknown_83FDA4C,
gUnknown_83FC8D5,
gUnknown_83FC8ED,
gUnknown_83FC913,
gUnknown_83FC935,
gUnknown_83FC979,
gUnknown_83FC993,
gUnknown_83FC9AA,
gUnknown_83FC9C7,
gUnknown_83FC9E5,
gUnknown_83FCA03,
gUnknown_83FC554,
gUnknown_83FC576,
gUnknown_83FBAD2,
gUnknown_83FBAE5,
gUnknown_83FCC39,
gUnknown_83FC591,
sText_PlayerDefeatedLinkTrainerTrainer1,
gUnknown_83FC5A2,
gUnknown_83FC5CC,
gUnknown_83FC5E8,
gUnknown_83FCB75,
gUnknown_83FC5F6,
gUnknown_83FC79D,
gUnknown_83FBB2F,
gUnknown_83FB282,
gUnknown_83FB283,
gUnknown_83FC955,
gUnknown_83FB3AF,
gUnknown_83FDAB1,
gUnknown_83FCA13,
gUnknown_83FC208,
gUnknown_83FC60C,
gUnknown_83FB359,
gUnknown_83FCCA0,
gUnknown_83FCCBB,
gUnknown_83FC631,
gUnknown_83FCA49,
gUnknown_83FD97A,
sText_Trainer1UsedItem,
gUnknown_83FD876,
gUnknown_83FB3D3,
gUnknown_83FCA71,
gUnknown_83FCA8E,
gUnknown_83FB67B,
gUnknown_83FCBC5,
gUnknown_83FC900,
gUnknown_83FBC62,
gUnknown_83FB997,
gUnknown_83FB95E,
gUnknown_83FC646,
gUnknown_83FCAAA,
gUnknown_83FCAD1,
gUnknown_83FB534,
gUnknown_83FC337,
gUnknown_83FC347,
gUnknown_83FC357,
gUnknown_83FC65A,
gUnknown_83FCAEF,
gUnknown_83FDD64,
gUnknown_83FDDEB,
gUnknown_83FB484,
gUnknown_83FB4BE,
Text_MonSentToBoxInSomeonesPC,
Text_MonSentToBoxInBillsPC,
Text_MonSentToBoxSomeonesBoxFull,
Text_MonSentToBoxBillsBoxFull,
sText_PokedudeUsedItem,
gUnknown_83FDA4D,
gUnknown_83FDA7A,
gUnknown_83FDA8C,
gUnknown_83FB21C,
gUnknown_83FB262,
gUnknown_83FB4F7,
gUnknown_83FCB0C,
gUnknown_83FCB26,
gUnknown_83FD322,
gUnknown_83FD34D,
gUnknown_83FB21F,
gUnknown_83FB232,
gUnknown_83FB235,
gUnknown_83FB248
[STRINGID_TRAINER1LOSETEXT - 12] = gUnknown_83FB219,
[STRINGID_PKMNGAINEDEXP - 12] = gUnknown_83FB265,
[STRINGID_PKMNGREWTOLV - 12] = gUnknown_83FB28E,
[STRINGID_PKMNLEARNEDMOVE - 12] = gUnknown_83FB2A4,
[STRINGID_TRYTOLEARNMOVE1 - 12] = gUnknown_83FB2B6,
[STRINGID_TRYTOLEARNMOVE2 - 12] = gUnknown_83FB2D1,
[STRINGID_TRYTOLEARNMOVE3 - 12] = gUnknown_83FB2FC,
[STRINGID_PKMNFORGOTMOVE - 12] = gUnknown_83FB31F,
[STRINGID_STOPLEARNINGMOVE - 12] = gUnknown_83FB32E,
[STRINGID_DIDNOTLEARNMOVE - 12] = gUnknown_83FB343,
[STRINGID_PKMNLEARNEDMOVE2 - 12] = gUnknown_83FD1B8,
[STRINGID_ATTACKMISSED - 12] = gUnknown_83FB36B,
[STRINGID_PKMNPROTECTEDITSELF - 12] = gUnknown_83FB37F,
[STRINGID_STATSWONTINCREASE2 - 12] = gUnknown_83FCBA5,
[STRINGID_AVOIDEDDAMAGE - 12] = gUnknown_83FB394,
[STRINGID_ITDOESNTAFFECT - 12] = gUnknown_83FB3EA,
[STRINGID_ATTACKERFAINTED - 12] = gUnknown_83FB400,
[STRINGID_TARGETFAINTED - 12] = gUnknown_83FB40D,
[STRINGID_PLAYERGOTMONEY - 12] = gUnknown_83FB41A,
[STRINGID_PLAYERWHITEOUT - 12] = gUnknown_83FB433,
[STRINGID_PLAYERWHITEOUT2 - 12] = gUnknown_83FB451,
[STRINGID_PREVENTSESCAPE - 12] = gUnknown_83FB508,
[STRINGID_HITXTIMES - 12] = gUnknown_83FB545,
[STRINGID_PKMNFELLASLEEP - 12] = gUnknown_83FB555,
[STRINGID_PKMNMADESLEEP - 12] = gUnknown_83FB565,
[STRINGID_PKMNALREADYASLEEP - 12] = gUnknown_83FB57C,
[STRINGID_PKMNALREADYASLEEP2 - 12] = gUnknown_83FB592,
[STRINGID_PKMNWASNTAFFECTED - 12] = gUnknown_83FB5A8,
[STRINGID_PKMNWASPOISONED - 12] = gUnknown_83FB5BC,
[STRINGID_PKMNPOISONEDBY - 12] = gUnknown_83FB5CD,
[STRINGID_PKMNHURTBYPOISON - 12] = gUnknown_83FB5E2,
[STRINGID_PKMNALREADYPOISONED - 12] = gUnknown_83FB5F8,
[STRINGID_PKMNBADLYPOISONED - 12] = gUnknown_83FB610,
[STRINGID_PKMNENERGYDRAINED - 12] = gUnknown_83FB626,
[STRINGID_PKMNWASBURNED - 12] = gUnknown_83FB641,
[STRINGID_PKMNBURNEDBY - 12] = gUnknown_83FB650,
[STRINGID_PKMNHURTBYBURN - 12] = gUnknown_83FB663,
[STRINGID_PKMNWASFROZEN - 12] = gUnknown_83FB692,
[STRINGID_PKMNFROZENBY - 12] = gUnknown_83FB6A7,
[STRINGID_PKMNISFROZEN - 12] = gUnknown_83FB6BF,
[STRINGID_PKMNWASDEFROSTED - 12] = gUnknown_83FB6D3,
[STRINGID_PKMNWASDEFROSTED2 - 12] = gUnknown_83FB6E5,
[STRINGID_PKMNWASDEFROSTEDBY - 12] = gUnknown_83FB6F7,
[STRINGID_PKMNWASPARALYZED - 12] = gUnknown_83FB70F,
[STRINGID_PKMNWASPARALYZEDBY - 12] = gUnknown_83FB73A,
[STRINGID_PKMNISPARALYZED - 12] = gUnknown_83FB76A,
[STRINGID_PKMNISALREADYPARALYZED - 12] = gUnknown_83FB78A,
[STRINGID_PKMNHEALEDPARALYSIS - 12] = gUnknown_83FB7A3,
[STRINGID_PKMNDREAMEATEN - 12] = gUnknown_83FB7BF,
[STRINGID_STATSWONTINCREASE - 12] = gUnknown_83FB7D5,
[STRINGID_STATSWONTDECREASE - 12] = gUnknown_83FB7EE,
[STRINGID_TEAMSTOPPEDWORKING - 12] = gUnknown_83FB806,
[STRINGID_FOESTOPPEDWORKING - 12] = gUnknown_83FB826,
[STRINGID_PKMNISCONFUSED - 12] = gUnknown_83FB844,
[STRINGID_PKMNHEALEDCONFUSION - 12] = gUnknown_83FB854,
[STRINGID_PKMNWASCONFUSED - 12] = gUnknown_83FB871,
[STRINGID_PKMNALREADYCONFUSED - 12] = gUnknown_83FB885,
[STRINGID_PKMNFELLINLOVE - 12] = gUnknown_83FB89D,
[STRINGID_PKMNINLOVE - 12] = gUnknown_83FB8AE,
[STRINGID_PKMNIMMOBILIZEDBYLOVE - 12] = gUnknown_83FB8C5,
[STRINGID_PKMNBLOWNAWAY - 12] = gUnknown_83FB8E0,
[STRINGID_PKMNCHANGEDTYPE - 12] = gUnknown_83FB8F3,
[STRINGID_PKMNFLINCHED - 12] = gUnknown_83FB914,
[STRINGID_PKMNREGAINEDHEALTH - 12] = gUnknown_83FB921,
[STRINGID_PKMNHPFULL - 12] = gUnknown_83FB935,
[STRINGID_PKMNRAISEDSPDEF - 12] = gUnknown_83FB946,
[STRINGID_PKMNRAISEDDEF - 12] = gUnknown_83FB97F,
[STRINGID_PKMNCOVEREDBYVEIL - 12] = gUnknown_83FB9B8,
[STRINGID_PKMNUSEDSAFEGUARD - 12] = gUnknown_83FB9D9,
[STRINGID_PKMNSAFEGUARDEXPIRED - 12] = gUnknown_83FB9FF,
[STRINGID_PKMNWENTTOSLEEP - 12] = gUnknown_83FBA2F,
[STRINGID_PKMNSLEPTHEALTHY - 12] = gUnknown_83FBA41,
[STRINGID_PKMNWHIPPEDWHIRLWIND - 12] = gUnknown_83FBA5E,
[STRINGID_PKMNTOOKSUNLIGHT - 12] = gUnknown_83FBA79,
[STRINGID_PKMNLOWEREDHEAD - 12] = gUnknown_83FBA8E,
[STRINGID_PKMNISGLOWING - 12] = gUnknown_83FBAA3,
[STRINGID_PKMNFLEWHIGH - 12] = gUnknown_83FBAB2,
[STRINGID_PKMNDUGHOLE - 12] = gUnknown_83FBAC3,
[STRINGID_PKMNSQUEEZEDBYBIND - 12] = gUnknown_83FBAF3,
[STRINGID_PKMNTRAPPEDINVORTEX - 12] = gUnknown_83FBB11,
[STRINGID_PKMNWRAPPEDBY - 12] = gUnknown_83FBB4C,
[STRINGID_PKMNCLAMPED - 12] = gUnknown_83FBB62,
[STRINGID_PKMNHURTBY - 12] = gUnknown_83FBB71,
[STRINGID_PKMNFREEDFROM - 12] = gUnknown_83FBB83,
[STRINGID_PKMNCRASHED - 12] = gUnknown_83FBB99,
[STRINGID_PKMNSHROUDEDINMIST - 12] = gBattleText_MistShroud,
[STRINGID_PKMNPROTECTEDBYMIST - 12] = gUnknown_83FBBD0,
[STRINGID_PKMNGETTINGPUMPED - 12] = gBattleText_GetPumped,
[STRINGID_PKMNHITWITHRECOIL - 12] = gUnknown_83FBBFF,
[STRINGID_PKMNPROTECTEDITSELF2 - 12] = gUnknown_83FBC16,
[STRINGID_PKMNBUFFETEDBYSANDSTORM - 12] = gUnknown_83FBC2B,
[STRINGID_PKMNPELTEDBYHAIL - 12] = gUnknown_83FBC4C,
[STRINGID_PKMNSEEDED - 12] = gUnknown_83FBC74,
[STRINGID_PKMNEVADEDATTACK - 12] = gUnknown_83FBC83,
[STRINGID_PKMNSAPPEDBYLEECHSEED - 12] = gUnknown_83FBC99,
[STRINGID_PKMNFASTASLEEP - 12] = gUnknown_83FBCBE,
[STRINGID_PKMNWOKEUP - 12] = gUnknown_83FBCD1,
[STRINGID_PKMNUPROARKEPTAWAKE - 12] = gUnknown_83FBCDD,
[STRINGID_PKMNWOKEUPINUPROAR - 12] = gUnknown_83FBCFC,
[STRINGID_PKMNCAUSEDUPROAR - 12] = gUnknown_83FBD16,
[STRINGID_PKMNMAKINGUPROAR - 12] = gUnknown_83FBD2B,
[STRINGID_PKMNCALMEDDOWN - 12] = gUnknown_83FBD43,
[STRINGID_PKMNCANTSLEEPINUPROAR - 12] = gUnknown_83FBD53,
[STRINGID_PKMNSTOCKPILED - 12] = gUnknown_83FBD74,
[STRINGID_PKMNCANTSTOCKPILE - 12] = gUnknown_83FBD86,
[STRINGID_PKMNCANTSLEEPINUPROAR2 - 12] = gUnknown_83FBDA3,
[STRINGID_UPROARKEPTPKMNAWAKE - 12] = gUnknown_83FBDC4,
[STRINGID_PKMNSTAYEDAWAKEUSING - 12] = gUnknown_83FBDE2,
[STRINGID_PKMNSTORINGENERGY - 12] = gUnknown_83FBE00,
[STRINGID_PKMNUNLEASHEDENERGY - 12] = gUnknown_83FBE16,
[STRINGID_PKMNFATIGUECONFUSION - 12] = gUnknown_83FBE2B,
[STRINGID_PKMNPICKEDUPITEM - 12] = gUnknown_83FBE4E,
[STRINGID_PKMNUNAFFECTED - 12] = gUnknown_83FBE61,
[STRINGID_PKMNTRANSFORMEDINTO - 12] = gUnknown_83FBE73,
[STRINGID_PKMNMADESUBSTITUTE - 12] = gUnknown_83FBE8B,
[STRINGID_PKMNHASSUBSTITUTE - 12] = gUnknown_83FBEA1,
[STRINGID_SUBSTITUTEDAMAGED - 12] = gUnknown_83FBEBE,
[STRINGID_PKMNSUBSTITUTEFADED - 12] = gUnknown_83FBEE2,
[STRINGID_PKMNMUSTRECHARGE - 12] = gUnknown_83FBEFA,
[STRINGID_PKMNRAGEBUILDING - 12] = gUnknown_83FBF0C,
[STRINGID_PKMNMOVEWASDISABLED - 12] = gUnknown_83FBF23,
[STRINGID_PKMNMOVEISDISABLED - 12] = gUnknown_83FC687,
[STRINGID_PKMNMOVEDISABLEDNOMORE - 12] = gUnknown_83FBF39,
[STRINGID_PKMNGOTENCORE - 12] = gUnknown_83FBF51,
[STRINGID_PKMNENCOREENDED - 12] = gUnknown_83FBF63,
[STRINGID_PKMNTOOKAIM - 12] = gUnknown_83FBF76,
[STRINGID_PKMNSKETCHEDMOVE - 12] = gUnknown_83FBF89,
[STRINGID_PKMNTRYINGTOTAKEFOE - 12] = gUnknown_83FBF99,
[STRINGID_PKMNTOOKFOE - 12] = gUnknown_83FBFBF,
[STRINGID_PKMNREDUCEDPP - 12] = gUnknown_83FBFD3,
[STRINGID_PKMNSTOLEITEM - 12] = gUnknown_83FBFEA,
[STRINGID_TARGETCANTESCAPENOW - 12] = gUnknown_83FBFFC,
[STRINGID_PKMNFELLINTONIGHTMARE - 12] = gUnknown_83FC011,
[STRINGID_PKMNLOCKEDINNIGHTMARE - 12] = gUnknown_83FC02B,
[STRINGID_PKMNLAIDCURSE - 12] = gUnknown_83FC048,
[STRINGID_PKMNAFFLICTEDBYCURSE - 12] = gUnknown_83FC072,
[STRINGID_SPIKESSCATTERED - 12] = gUnknown_83FC090,
[STRINGID_PKMNHURTBYSPIKES - 12] = gUnknown_83FC0C6,
[STRINGID_PKMNIDENTIFIED - 12] = gUnknown_83FC0DC,
[STRINGID_PKMNPERISHCOUNTFELL - 12] = gUnknown_83FC0EE,
[STRINGID_PKMNBRACEDITSELF - 12] = gUnknown_83FC10C,
[STRINGID_PKMNENDUREDHIT - 12] = gUnknown_83FC11E,
[STRINGID_MAGNITUDESTRENGTH - 12] = gUnknown_83FC132,
[STRINGID_PKMNCUTHPMAXEDATTACK - 12] = gUnknown_83FC140,
[STRINGID_PKMNCOPIEDSTATCHANGES - 12] = gUnknown_83FC168,
[STRINGID_PKMNGOTFREE - 12] = gUnknown_83FC185,
[STRINGID_PKMNSHEDLEECHSEED - 12] = gUnknown_83FC19D,
[STRINGID_PKMNBLEWAWAYSPIKES - 12] = gUnknown_83FC1B1,
[STRINGID_PKMNFLEDFROMBATTLE - 12] = gUnknown_83FC1C6,
[STRINGID_PKMNFORESAWATTACK - 12] = gUnknown_83FC1DB,
[STRINGID_PKMNTOOKATTACK - 12] = gUnknown_83FC1F1,
[STRINGID_PKMNATTACK - 12] = gUnknown_83FC224,
[STRINGID_PKMNCENTERATTENTION - 12] = gUnknown_83FC231,
[STRINGID_PKMNCHARGINGPOWER - 12] = gUnknown_83FC254,
[STRINGID_NATUREPOWERTURNEDINTO - 12] = gUnknown_83FC26D,
[STRINGID_PKMNSTATUSNORMAL - 12] = gUnknown_83FC28A,
[STRINGID_PKMNHASNOMOVESLEFT - 12] = gUnknown_83FC670,
[STRINGID_PKMNSUBJECTEDTOTORMENT - 12] = gUnknown_83FC2AA,
[STRINGID_PKMNCANTUSEMOVETORMENT - 12] = gUnknown_83FC69D,
[STRINGID_PKMNTIGHTENINGFOCUS - 12] = gUnknown_83FC2C7,
[STRINGID_PKMNFELLFORTAUNT - 12] = gUnknown_83FC2E3,
[STRINGID_PKMNCANTUSEMOVETAUNT - 12] = gUnknown_83FC6D6,
[STRINGID_PKMNREADYTOHELP - 12] = gUnknown_83FC2FA,
[STRINGID_PKMNSWITCHEDITEMS - 12] = gUnknown_83FC312,
[STRINGID_PKMNCOPIEDFOE - 12] = gUnknown_83FC377,
[STRINGID_PKMNMADEWISH - 12] = gUnknown_83FC38A,
[STRINGID_PKMNWISHCAMETRUE - 12] = gUnknown_83FC39A,
[STRINGID_PKMNPLANTEDROOTS - 12] = gUnknown_83FC3AF,
[STRINGID_PKMNABSORBEDNUTRIENTS - 12] = gUnknown_83FC3C5,
[STRINGID_PKMNANCHOREDITSELF - 12] = gUnknown_83FC3EB,
[STRINGID_PKMNWASMADEDROWSY - 12] = gUnknown_83FC40E,
[STRINGID_PKMNKNOCKEDOFF - 12] = gUnknown_83FC421,
[STRINGID_PKMNSWAPPEDABILITIES - 12] = gUnknown_83FC439,
[STRINGID_PKMNSEALEDOPPONENTMOVE - 12] = gUnknown_83FC461,
[STRINGID_PKMNCANTUSEMOVESEALED - 12] = gUnknown_83FC6F8,
[STRINGID_PKMNWANTSGRUDGE - 12] = gUnknown_83FC483,
[STRINGID_PKMNLOSTPPGRUDGE - 12] = gUnknown_83FC4AB,
[STRINGID_PKMNSHROUDEDITSELF - 12] = gUnknown_83FC4D6,
[STRINGID_PKMNMOVEBOUNCED - 12] = gUnknown_83FC4F0,
[STRINGID_PKMNWAITSFORTARGET - 12] = gUnknown_83FC518,
[STRINGID_PKMNSNATCHEDMOVE - 12] = gUnknown_83FC53D,
[STRINGID_PKMNMADEITRAIN - 12] = gUnknown_83FC715,
[STRINGID_PKMNRAISEDSPEED - 12] = gUnknown_83FC72B,
[STRINGID_PKMNPROTECTEDBY - 12] = gUnknown_83FC745,
[STRINGID_PKMNPREVENTSUSAGE - 12] = gUnknown_83FC75D,
[STRINGID_PKMNRESTOREDHPUSING - 12] = gUnknown_83FC780,
[STRINGID_PKMNCHANGEDTYPEWITH - 12] = gUnknown_83FC7B6,
[STRINGID_PKMNPREVENTSPARALYSISWITH - 12] = gUnknown_83FC7D3,
[STRINGID_PKMNPREVENTSROMANCEWITH - 12] = gUnknown_83FC7EF,
[STRINGID_PKMNPREVENTSPOISONINGWITH - 12] = gUnknown_83FC809,
[STRINGID_PKMNPREVENTSCONFUSIONWITH - 12] = gUnknown_83FC825,
[STRINGID_PKMNRAISEDFIREPOWERWITH - 12] = gUnknown_83FC841,
[STRINGID_PKMNANCHORSITSELFWITH - 12] = gUnknown_83FC860,
[STRINGID_PKMNCUTSATTACKWITH - 12] = gUnknown_83FC87B,
[STRINGID_PKMNPREVENTSSTATLOSSWITH - 12] = gUnknown_83FC895,
[STRINGID_PKMNHURTSWITH - 12] = gUnknown_83FC8B1,
[STRINGID_PKMNTRACED - 12] = gUnknown_83FC8C2,
[STRINGID_STATSHARPLY - 12] = gUnknown_83FCB41,
[STRINGID_STATROSE - 12] = gBattleText_Rose,
[STRINGID_STATHARSHLY - 12] = gUnknown_83FCB50,
[STRINGID_STATFELL - 12] = gUnknown_83FCB59,
[STRINGID_PKMNSSTATCHANGED - 12] = gUnknown_83FCB5F,
[STRINGID_PKMNSSTATCHANGED2 - 12] = gBattleText_UnknownString3,
[STRINGID_PKMNSSTATCHANGED3 - 12] = gUnknown_83FCB8F,
[STRINGID_PKMNSSTATCHANGED4 - 12] = gUnknown_83FCB9A,
[STRINGID_CRITICALHIT - 12] = gUnknown_83FCBE4,
[STRINGID_ONEHITKO - 12] = gUnknown_83FCBF4,
[STRINGID_123POOF - 12] = gUnknown_83FCC07,
[STRINGID_ANDELLIPSIS - 12] = gUnknown_83FCC33,
[STRINGID_NOTVERYEFFECTIVE - 12] = gUnknown_83FCC5B,
[STRINGID_SUPEREFFECTIVE - 12] = gUnknown_83FCC74,
[STRINGID_GOTAWAYSAFELY - 12] = sText_GotAwaySafely,
[STRINGID_WILDPKMNFLED - 12] = gUnknown_83FCCD2,
[STRINGID_NORUNNINGFROMTRAINERS - 12] = gUnknown_83FCDB3,
[STRINGID_CANTESCAPE - 12] = gUnknown_83FCDE2,
[STRINGID_DONTLEAVEBIRCH - 12] = gUnknown_83FCDF1,
[STRINGID_BUTNOTHINGHAPPENED - 12] = gUnknown_83FCDF2,
[STRINGID_BUTITFAILED - 12] = gUnknown_83FCE08,
[STRINGID_ITHURTCONFUSION - 12] = gUnknown_83FCE17,
[STRINGID_MIRRORMOVEFAILED - 12] = gUnknown_83FCE38,
[STRINGID_STARTEDTORAIN - 12] = gUnknown_83FCE50,
[STRINGID_DOWNPOURSTARTED - 12] = gUnknown_83FCE64,
[STRINGID_RAINCONTINUES - 12] = gUnknown_83FCE78,
[STRINGID_DOWNPOURCONTINUES - 12] = gUnknown_83FCE90,
[STRINGID_RAINSTOPPED - 12] = gUnknown_83FCEA8,
[STRINGID_SANDSTORMBREWED - 12] = gUnknown_83FCEBA,
[STRINGID_SANDSTORMRAGES - 12] = gUnknown_83FCECE,
[STRINGID_SANDSTORMSUBSIDED - 12] = gUnknown_83FCEE3,
[STRINGID_SUNLIGHTGOTBRIGHT - 12] = gUnknown_83FCEFB,
[STRINGID_SUNLIGHTSTRONG - 12] = gUnknown_83FCF14,
[STRINGID_SUNLIGHTFADED - 12] = gUnknown_83FCF2C,
[STRINGID_STARTEDHAIL - 12] = gUnknown_83FCF40,
[STRINGID_HAILCONTINUES - 12] = gUnknown_83FCF54,
[STRINGID_HAILSTOPPED - 12] = gUnknown_83FCF6C,
[STRINGID_FAILEDTOSPITUP - 12] = gUnknown_83FCF7E,
[STRINGID_FAILEDTOSWALLOW - 12] = gUnknown_83FCFA0,
[STRINGID_WINDBECAMEHEATWAVE - 12] = gUnknown_83FCFC2,
[STRINGID_STATCHANGESGONE - 12] = gUnknown_83FCFE4,
[STRINGID_COINSSCATTERED - 12] = gUnknown_83FD006,
[STRINGID_TOOWEAKFORSUBSTITUTE - 12] = gUnknown_83FD022,
[STRINGID_SHAREDPAIN - 12] = gUnknown_83FD048,
[STRINGID_BELLCHIMED - 12] = gUnknown_83FD068,
[STRINGID_FAINTINTHREE - 12] = gUnknown_83FD077,
[STRINGID_NOPPLEFT - 12] = gUnknown_83FD0A7,
[STRINGID_BUTNOPPLEFT - 12] = gUnknown_83FD0CA,
[STRINGID_PLAYERUSEDITEM - 12] = sText_PlayerUsedItem,
[STRINGID_OLDMANUSEDITEM - 12] = sText_OldManUsedItem,
[STRINGID_TRAINERBLOCKEDBALL - 12] = sText_TrainerBlockedBall,
[STRINGID_DONTBEATHIEF - 12] = sText_DontBeAThief,
[STRINGID_ITDODGEDBALL - 12] = sText_ItDodgedBall,
[STRINGID_YOUMISSEDPKMN - 12] = sText_YouMissedPkmn,
[STRINGID_PKMNBROKEFREE - 12] = sText_PkmnBrokeFree,
[STRINGID_ITAPPEAREDCAUGHT - 12] = sText_ItAppearedCaught,
[STRINGID_AARGHALMOSTHADIT - 12] = sText_AarghAlmostHadIt,
[STRINGID_SHOOTSOCLOSE - 12] = sText_ShootSoClose,
[STRINGID_GOTCHAPKMNCAUGHT - 12] = sText_GotchaPkmnCaught,
[STRINGID_GOTCHAPKMNCAUGHT2 - 12] = sText_GotchaPkmnCaught2,
[STRINGID_GIVENICKNAMECAPTURED - 12] = sText_GiveNicknameCaptured,
[STRINGID_PKMNSENTTOPC - 12] = sText_PkmnSentToPC,
[STRINGID_PKMNDATAADDEDTODEX - 12] = gUnknown_83FD82B,
[STRINGID_ITISRAINING - 12] = gUnknown_83FD850,
[STRINGID_SANDSTORMISRAGING - 12] = gUnknown_83FD85F,
[STRINGID_CANTESCAPE2 - 12] = gUnknown_83FB525,
[STRINGID_PKMNIGNORESASLEEP - 12] = gUnknown_83FD0F1,
[STRINGID_PKMNIGNOREDORDERS - 12] = gUnknown_83FD111,
[STRINGID_PKMNBEGANTONAP - 12] = gUnknown_83FD124,
[STRINGID_PKMNLOAFING - 12] = gUnknown_83FD135,
[STRINGID_PKMNWONTOBEY - 12] = gUnknown_83FD14B,
[STRINGID_PKMNTURNEDAWAY - 12] = gUnknown_83FD15A,
[STRINGID_PKMNPRETENDNOTNOTICE - 12] = gUnknown_83FD16A,
[STRINGID_ENEMYABOUTTOSWITCHPKMN - 12] = gUnknown_83FD186,
[STRINGID_THREWROCK - 12] = gUnknown_83FD1DF,
[STRINGID_THREWBAIT - 12] = gUnknown_83FD1FA,
[STRINGID_PKMNWATCHINGCAREFULLY - 12] = gUnknown_83FD218,
[STRINGID_PKMNANGRY - 12] = gUnknown_83FD232,
[STRINGID_PKMNEATING - 12] = gUnknown_83FD23F,
[STRINGID_DUMMY288 - 12] = gUnknown_83FB218,
[STRINGID_DUMMY289 - 12] = gUnknown_83FB218,
[STRINGID_OUTOFSAFARIBALLS - 12] = gUnknown_83FD24D,
[STRINGID_PKMNSITEMCUREDPARALYSIS - 12] = gUnknown_83FD8B9,
[STRINGID_PKMNSITEMCUREDPOISON - 12] = gUnknown_83FD8D2,
[STRINGID_PKMNSITEMHEALEDBURN - 12] = gUnknown_83FD8E8,
[STRINGID_PKMNSITEMDEFROSTEDIT - 12] = gUnknown_83FD901,
[STRINGID_PKMNSITEMWOKEIT - 12] = gUnknown_83FD917,
[STRINGID_PKMNSITEMSNAPPEDOUT - 12] = gUnknown_83FD937,
[STRINGID_PKMNSITEMCUREDPROBLEM - 12] = gUnknown_83FD95C,
[STRINGID_PKMNSITEMRESTOREDHEALTH - 12] = gUnknown_83FD999,
[STRINGID_PKMNSITEMRESTOREDPP - 12] = gUnknown_83FD9B2,
[STRINGID_PKMNSITEMRESTOREDSTATUS - 12] = gUnknown_83FD9CC,
[STRINGID_PKMNSITEMRESTOREDHPALITTLE - 12] = gUnknown_83FD9E9,
[STRINGID_ITEMALLOWSONLYYMOVE - 12] = gUnknown_83FDA0B,
[STRINGID_PKMNHUNGONWITHX - 12] = gUnknown_83FDA33,
[STRINGID_EMPTYSTRING3 - 12] = gUnknown_83FDA4C,
[STRINGID_PKMNSXPREVENTSBURNS - 12] = gUnknown_83FC8D5,
[STRINGID_PKMNSXBLOCKSY - 12] = gUnknown_83FC8ED,
[STRINGID_PKMNSXRESTOREDHPALITTLE2 - 12] = gUnknown_83FC913,
[STRINGID_PKMNSXWHIPPEDUPSANDSTORM - 12] = gUnknown_83FC935,
[STRINGID_PKMNSXPREVENTSYLOSS - 12] = gUnknown_83FC979,
[STRINGID_PKMNSXINFATUATEDY - 12] = gUnknown_83FC993,
[STRINGID_PKMNSXMADEYINEFFECTIVE - 12] = gUnknown_83FC9AA,
[STRINGID_PKMNSXCUREDYPROBLEM - 12] = gUnknown_83FC9C7,
[STRINGID_ITSUCKEDLIQUIDOOZE - 12] = gUnknown_83FC9E5,
[STRINGID_PKMNTRANSFORMED - 12] = gUnknown_83FCA03,
[STRINGID_ELECTRICITYWEAKENED - 12] = gUnknown_83FC554,
[STRINGID_FIREWEAKENED - 12] = gUnknown_83FC576,
[STRINGID_PKMNHIDUNDERWATER - 12] = gUnknown_83FBAD2,
[STRINGID_PKMNSPRANGUP - 12] = gUnknown_83FBAE5,
[STRINGID_HMMOVESCANTBEFORGOTTEN - 12] = gUnknown_83FCC39,
[STRINGID_XFOUNDONEY - 12] = gUnknown_83FC591,
[STRINGID_PLAYERDEFEATEDTRAINER1 - 12] = sText_PlayerDefeatedLinkTrainerTrainer1,
[STRINGID_SOOTHINGAROMA - 12] = gUnknown_83FC5A2,
[STRINGID_ITEMSCANTBEUSEDNOW - 12] = gUnknown_83FC5CC,
[STRINGID_FORXCOMMAYZ - 12] = gUnknown_83FC5E8,
[STRINGID_USINGXTHEYOFZN - 12] = gUnknown_83FCB75,
[STRINGID_PKMNUSEDXTOGETPUMPED - 12] = gUnknown_83FC5F6,
[STRINGID_PKMNSXMADEYUSELESS - 12] = gUnknown_83FC79D,
[STRINGID_PKMNTRAPPEDBYSANDTOMB - 12] = gUnknown_83FBB2F,
[STRINGID_EMPTYSTRING4 - 12] = gUnknown_83FB282,
[STRINGID_ABOOSTED - 12] = gUnknown_83FB283,
[STRINGID_PKMNSXINTENSIFIEDSUN - 12] = gUnknown_83FC955,
[STRINGID_PKMNMAKESGROUNDMISS - 12] = gUnknown_83FB3AF,
[STRINGID_YOUTHROWABALLNOWRIGHT - 12] = gUnknown_83FDAB1,
[STRINGID_PKMNSXTOOKATTACK - 12] = gUnknown_83FCA13,
[STRINGID_PKMNCHOSEXASDESTINY - 12] = gUnknown_83FC208,
[STRINGID_PKMNLOSTFOCUS - 12] = gUnknown_83FC60C,
[STRINGID_USENEXTPKMN - 12] = gUnknown_83FB359,
[STRINGID_PKMNFLEDUSINGITS - 12] = gUnknown_83FCCA0,
[STRINGID_PKMNFLEDUSING - 12] = gUnknown_83FCCBB,
[STRINGID_PKMNWASDRAGGEDOUT - 12] = gUnknown_83FC631,
[STRINGID_PREVENTEDFROMWORKING - 12] = gUnknown_83FCA49,
[STRINGID_PKMNSITEMNORMALIZEDSTATUS - 12] = gUnknown_83FD97A,
[STRINGID_TRAINER1USEDITEM - 12] = sText_Trainer1UsedItem,
[STRINGID_BOXISFULL - 12] = gUnknown_83FD876,
[STRINGID_PKMNAVOIDEDATTACK - 12] = gUnknown_83FB3D3,
[STRINGID_PKMNSXMADEITINEFFECTIVE - 12] = gUnknown_83FCA71,
[STRINGID_PKMNSXPREVENTSFLINCHING - 12] = gUnknown_83FCA8E,
[STRINGID_PKMNALREADYHASBURN - 12] = gUnknown_83FB67B,
[STRINGID_STATSWONTDECREASE2 - 12] = gUnknown_83FCBC5,
[STRINGID_PKMNSXBLOCKSY2 - 12] = gUnknown_83FC900,
[STRINGID_PKMNSXWOREOFF - 12] = gUnknown_83FBC62,
[STRINGID_PKMNRAISEDDEFALITTLE - 12] = gUnknown_83FB997,
[STRINGID_PKMNRAISEDSPDEFALITTLE - 12] = gUnknown_83FB95E,
[STRINGID_THEWALLSHATTERED - 12] = gUnknown_83FC646,
[STRINGID_PKMNSXPREVENTSYSZ - 12] = gUnknown_83FCAAA,
[STRINGID_PKMNSXCUREDITSYPROBLEM - 12] = gUnknown_83FCAD1,
[STRINGID_ATTACKERCANTESCAPE - 12] = gUnknown_83FB534,
[STRINGID_PKMNOBTAINEDX - 12] = gUnknown_83FC337,
[STRINGID_PKMNOBTAINEDX2 - 12] = gUnknown_83FC347,
[STRINGID_PKMNOBTAINEDXYOBTAINEDZ - 12] = gUnknown_83FC357,
[STRINGID_BUTNOEFFECT - 12] = gUnknown_83FC65A,
[STRINGID_PKMNSXHADNOEFFECTONY - 12] = gUnknown_83FCAEF,
[STRINGID_OAKPLAYERWON - 12] = gUnknown_83FDD64,
[STRINGID_OAKPLAYERLOST - 12] = gUnknown_83FDDEB,
[STRINGID_PLAYERLOSTAGAINSTENEMYTRAINER - 12] = gUnknown_83FB484,
[STRINGID_PLAYERPAIDPRIZEMONEY - 12] = gUnknown_83FB4BE,
[STRINGID_PKMNTRANSFERREDSOMEONESPC - 12] = Text_MonSentToBoxInSomeonesPC,
[STRINGID_PKMNTRANSFERREDBILLSPC - 12] = Text_MonSentToBoxInBillsPC,
[STRINGID_PKMNBOXSOMEONESPCFULL - 12] = Text_MonSentToBoxSomeonesBoxFull,
[STRINGID_PKMNBOXBILLSPCFULL - 12] = Text_MonSentToBoxBillsBoxFull,
[STRINGID_POKEDUDEUSED - 12] = sText_PokedudeUsedItem,
[STRINGID_POKEFLUTECATCHY - 12] = gUnknown_83FDA4D,
[STRINGID_POKEFLUTE - 12] = gUnknown_83FDA7A,
[STRINGID_MONHEARINGFLUTEAWOKE - 12] = gUnknown_83FDA8C,
[STRINGID_TRAINER2CLASS - 12] = gUnknown_83FB21C,
[STRINGID_TRAINER2NAME - 12] = gUnknown_83FB262,
[STRINGID_PLAYERWHITEDOUT - 12] = gUnknown_83FB4F7,
[STRINGID_MONTOOSCAREDTOMOVE - 12] = gUnknown_83FCB0C,
[STRINGID_GHOSTGETOUTGETOUT - 12] = gUnknown_83FCB26,
[STRINGID_SILPHSCOPEUNVEILED - 12] = gUnknown_83FD322,
[STRINGID_GHOSTWASMAROWAK - 12] = gUnknown_83FD34D,
[STRINGID_TRAINER1MON1COMEBACK - 12] = gUnknown_83FB21F,
[STRINGID_TRAINER1WINTEXT - 12] = gUnknown_83FB232,
[STRINGID_TRAINER1MON2COMEBACK - 12] = gUnknown_83FB235,
[STRINGID_TRAINER1MON1AND2COMEBACK - 12] = gUnknown_83FB248
};
const u16 gMissStringIds[] = {
src/battle_setup.c
+6 -7
View File
@@ -417,7 +417,7 @@ static void CB2_EndWildBattle(void)
else
{
SetMainCallback2(CB2_ReturnToField);
gFieldCallback = sub_807E3EC;
gFieldCallback = FieldCB_SafariZoneRanOutOfBalls;
}
}
@@ -794,13 +794,13 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
SetMapVarsToTrainer();
return EventScript_TryDoDoubleTrainerBattle;
case TRAINER_BATTLE_REMATCH_DOUBLE:
sub_811231C();
FinishRecordingQuestLogScene();
TrainerBattleLoadArgs(sDoubleBattleParams, data);
SetMapVarsToTrainer();
gTrainerBattleOpponent_A = GetRematchTrainerId(gTrainerBattleOpponent_A);
return EventScript_TryDoDoubleRematchBattle;
case TRAINER_BATTLE_REMATCH:
sub_811231C();
FinishRecordingQuestLogScene();
TrainerBattleLoadArgs(sOrdinaryBattleParams, data);
SetMapVarsToTrainer();
gTrainerBattleOpponent_A = GetRematchTrainerId(gTrainerBattleOpponent_A);
@@ -951,8 +951,8 @@ static void CB2_EndRematchBattle(void)
{
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
SetBattledTrainerFlag();
sub_810CDE8();
sub_81138F8();
ClearRematchStateOfLastTalked();
ResetDeferredLinkEvent();
}
}
@@ -994,8 +994,7 @@ void PlayTrainerEncounterMusic(void)
{
u16 music;
if (gQuestLogState != 2
&& gQuestLogState != 3
if (!QL_IS_PLAYBACK_STATE
&& sTrainerBattleMode != TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC
&& sTrainerBattleMode != TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC)
{
src/cable_club.c
+4 -4
View File
@@ -173,7 +173,7 @@ static void sub_80809C4(u8 taskId)
gTasks[taskId].data[0]++;
if (gTasks[taskId].data[0] == 10)
{
sub_800A474(2);
Link_PrepareCmd0xCCCC_Rfu0xA100(2);
DestroyTask(taskId);
}
}
@@ -369,7 +369,7 @@ static void Task_LinkupMaster_6(u8 taskId)
sub_800A900(gFieldLinkPlayerCount);
TrainerCard_GenerateCardForLinkPlayer((void*)gBlockSendBuffer);
gTasks[taskId].func = Task_Linkup_6a;
sub_800A474(2);
Link_PrepareCmd0xCCCC_Rfu0xA100(2);
}
}
}
@@ -532,7 +532,7 @@ static void Task_ReestablishLinkInCableClubRoom_0(u8 taskId)
{
OpenLink();
ResetLinkPlayers();
CreateTask(sub_8081A90, 80);
CreateTask(Task_WaitForReceivedRemoteLinkPlayers5SecondTimeout, 80);
}
else if (data[0] > 9)
gTasks[taskId].func = Task_ReestablishLinkInCableClubRoom_1;
@@ -934,7 +934,7 @@ bool32 GetSeeingLinkPlayerCardMsg(u8 who)
return TRUE;
}
void sub_8081A90(u8 taskId)
void Task_WaitForReceivedRemoteLinkPlayers5SecondTimeout(u8 taskId)
{
struct Task * task = &gTasks[taskId];
task->data[0]++;
src/cereader_tool.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include "global.h"
#include "gflib.h"
#include "util.h"
#include "save.h"
#include "malloc.h"
#include "cereader_tool.h"
u8 sub_815D654(void)
src/coins.c
+1 -1
View File
@@ -1,6 +1,6 @@
#include "global.h"
#include "gflib.h"
#include "string_util.h"
#include "text.h"
#include "menu.h"
#include "text_window.h"
#include "strings.h"
src/credits.c
+1 -6
View File
@@ -1,19 +1,14 @@
#include "global.h"
#include "malloc.h"
#include "bg.h"
#include "gflib.h"
#include "credits.h"
#include "palette.h"
#include "gpu_regs.h"
#include "task.h"
#include "overworld.h"
#include "event_data.h"
#include "window.h"
#include "new_menu_helpers.h"
#include "decompress.h"
#include "graphics.h"
#include "strings.h"
#include "trainer_pokemon_sprites.h"
#include "sound.h"
#include "constants/species.h"
#include "constants/maps.h"
#include "constants/field_weather.h"
src/dark.c
+1 -2
View File
@@ -1,8 +1,7 @@
#include "global.h"
#include "gflib.h"
#include "battle_anim.h"
#include "gpu_regs.h"
#include "graphics.h"
#include "palette.h"
#include "scanline_effect.h"
#include "trig.h"
#include "util.h"
src/data.c
+1 -1
View File
@@ -1,5 +1,5 @@
#include "global.h"
#include "malloc.h"
#include "gflib.h"
#include "battle.h"
#include "data.h"
#include "graphics.h"
src/decompress.c
+1 -1
View File
@@ -1,5 +1,5 @@
#include "global.h"
#include "malloc.h"
#include "gflib.h"
#include "decompress.h"
#include "pokemon.h"
#include "constants/species.h"
src/digit_obj_util.c
+1 -2
View File
@@ -1,8 +1,7 @@
#include "global.h"
#include "malloc.h"
#include "gflib.h"
#include "decompress.h"
#include "digit_obj_util.h"
#include "main.h"
struct DigitPrinterAlloc
{
src/diploma.c
+3 -12
View File
@@ -1,23 +1,14 @@
#include "global.h"
#include "bg.h"
#include "constants/fanfares.h"
#include "gflib.h"
#include "dynamic_placeholder_text_util.h"
#include "gba/macro.h"
#include "gpu_regs.h"
#include "main.h"
#include "malloc.h"
#include "menu.h"
#include "new_menu_helpers.h"
#include "overworld.h"
#include "palette.h"
#include "pokedex.h"
#include "scanline_effect.h"
#include "sound.h"
#include "sprite.h"
#include "strings.h"
#include "task.h"
#include "text.h"
#include "window.h"
#include "constants/fanfares.h"
struct Diploma
{
@@ -193,7 +184,7 @@ static void Task_DiplomaReturnToOverworld(u8 taskId)
DestroyTask(taskId);
FreeAllWindowBuffers();
FREE_AND_SET_NULL(gDiploma);
SetMainCallback2(sub_80568FC);
SetMainCallback2(CB2_ReturnToFieldFromDiploma);
}
static void DiplomaBgInit(void)
src/dynamic_placeholder_text_util.c
+1 -2
View File
@@ -1,6 +1,5 @@
#include "global.h"
#include "text.h"
#include "string_util.h"
#include "gflib.h"
#include "constants/event_objects.h"
static EWRAM_DATA const u8 *sStringPointers[8] = {0};
src/easy_chat.c
+1 -2
View File
@@ -1,5 +1,5 @@
#include "global.h"
#include "malloc.h"
#include "gflib.h"
#include "data.h"
#include "easy_chat.h"
#include "event_data.h"
@@ -9,7 +9,6 @@
#include "mail.h"
#include "pokedex.h"
#include "random.h"
#include "string_util.h"
#include "strings.h"
#include "constants/easy_chat.h"
#include "constants/flags.h"
src/event_data.c
+2 -2
View File
@@ -179,7 +179,7 @@ u16 *GetVarPointer(u16 idx)
return NULL;
if (idx < SPECIAL_VARS_START)
{
switch (gUnknown_3005E88)
switch (gQuestLogPlaybackState)
{
case 0:
default:
@@ -250,7 +250,7 @@ u8 *GetFlagAddr(u16 idx)
return NULL;
if (idx < SPECIAL_FLAGS_START)
{
switch (gUnknown_3005E88)
switch (gQuestLogPlaybackState)
{
case 0:
default:
src/event_object_lock.c
+14 -13
View File
@@ -4,6 +4,7 @@
#include "event_object_movement.h"
#include "script_movement.h"
#include "event_data.h"
#include "constants/event_objects.h"
bool8 walkrun_is_standing_still(void)
{
@@ -13,18 +14,18 @@ bool8 walkrun_is_standing_still(void)
return TRUE;
}
void sub_8069570(u8 taskId)
void Task_WaitPlayerStopMoving(u8 taskId)
{
if (walkrun_is_standing_still())
{
sub_805C270();
HandleEnforcedLookDirectionOnPlayerStopMoving();
DestroyTask(taskId);
}
}
bool8 sub_8069590(void)
bool8 NativeScript_WaitPlayerStopMoving(void)
{
if (FuncIsActiveTask(sub_8069570))
if (FuncIsActiveTask(Task_WaitPlayerStopMoving))
return FALSE;
else
{
@@ -36,16 +37,16 @@ bool8 sub_8069590(void)
void ScriptFreezeObjectEvents(void)
{
FreezeObjectEvents();
CreateTask(sub_8069570, 80);
CreateTask(Task_WaitPlayerStopMoving, 80);
}
void sub_80695CC(u8 taskId)
void Task_WaitPlayerAndTargetNPCStopMoving(u8 taskId)
{
struct Task * task = &gTasks[taskId];
if (task->data[0] == 0 && walkrun_is_standing_still() == TRUE)
{
sub_805C270();
HandleEnforcedLookDirectionOnPlayerStopMoving();
task->data[0] = 1;
}
@@ -59,9 +60,9 @@ void sub_80695CC(u8 taskId)
DestroyTask(taskId);
}
bool8 sub_8069648(void)
bool8 NativeScript_WaitPlayerAndTargetNPCStopMoving(void)
{
if (FuncIsActiveTask(sub_80695CC))
if (FuncIsActiveTask(Task_WaitPlayerAndTargetNPCStopMoving))
return FALSE;
else
{
@@ -75,7 +76,7 @@ void LockSelectedObjectEvent(void)
u8 taskId;
FreezeObjectEventsExceptOne(gSelectedObjectEvent);
taskId = CreateTask(sub_80695CC, 80);
taskId = CreateTask(Task_WaitPlayerAndTargetNPCStopMoving, 80);
if (!gObjectEvents[gSelectedObjectEvent].singleMovementActive)
{
FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]);
@@ -83,9 +84,9 @@ void LockSelectedObjectEvent(void)
}
}
void sub_80696C0(void)
void ClearPlayerHeldMovementAndUnfreezeObjectEvents(void)
{
u8 objectEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0);
u8 objectEventId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objectEventId]);
ScriptMovement_UnfreezeObjectEvents();
UnfreezeObjectEvents();
@@ -96,7 +97,7 @@ void UnionRoom_UnlockPlayerAndChatPartner(void)
u8 objectEventId;
if (gObjectEvents[gSelectedObjectEvent].active)
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]);
objectEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0);
objectEventId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objectEventId]);
ScriptMovement_UnfreezeObjectEvents();
UnfreezeObjectEvents();
src/event_object_movement.c
+4 -5
View File
@@ -1,5 +1,5 @@
#include "global.h"
#include "malloc.h"
#include "gflib.h"
#include "event_data.h"
#include "event_object_movement.h"
#include "field_camera.h"
@@ -10,7 +10,6 @@
#include "fieldmap.h"
#include "metatile_behavior.h"
#include "overworld.h"
#include "palette.h"
#include "quest_log.h"
#include "random.h"
#include "script.h"
@@ -2805,7 +2804,7 @@ u8 sub_805FC9C(u8 localId, u8 mapNum, u8 mapGroup)
return gObjectEvents[objectEventId].trainerType;
}
u16 sub_805FCD8(u8 localId, u8 mapNum, u8 mapGroup)
u16 GetObjectEventFlagByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
{
return GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->trainerType;
}
@@ -5530,7 +5529,7 @@ static void sub_8064544(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
objectEvent->heldMovementFinished = TRUE;
if (objectEvent->graphicsId == 0x61)
sub_806DE28(objectEvent);
HandleBoulderFallThroughHole(objectEvent);
}
}
@@ -5550,7 +5549,7 @@ static void ObjectEventSetSingleMovement(struct ObjectEvent *objectEvent, struct
objectEvent->movementActionId = animId;
sprite->data[2] = 0;
if (gUnknown_3005E88 == 2)
if (gQuestLogPlaybackState == 2)
{
sub_81124EC(objectEvent->localId, objectEvent->mapNum, objectEvent->mapGroup, animId);
}
src/evolution_graphics.c
+1 -2
View File
@@ -1,9 +1,8 @@
#include "global.h"
#include "gflib.h"
#include "trig.h"
#include "random.h"
#include "decompress.h"
#include "palette.h"
#include "sound.h"
#include "task.h"
#include "evolution_scene.h"
#include "evolution_graphics.h"
src/evolution_scene.c
+1 -10
View File
@@ -1,34 +1,25 @@
#include "global.h"
#include "malloc.h"
#include "gflib.h"
#include "battle.h"
#include "battle_message.h"
#include "bg.h"
#include "data.h"
#include "decompress.h"
#include "help_system.h"
#include "evolution_scene.h"
#include "evolution_graphics.h"
#include "gpu_regs.h"
#include "link.h"
#include "link_rfu.h"
#include "m4a.h"
#include "event_data.h"
#include "trade_scene.h"
#include "main.h"
#include "new_menu_helpers.h"
#include "menu.h"
#include "overworld.h"
#include "palette.h"
#include "pokedex.h"
#include "pokemon.h"
#include "pokemon_summary_screen.h"
#include "scanline_effect.h"
#include "sound.h"
#include "sprite.h"
#include "string_util.h"
#include "strings.h"
#include "task.h"
#include "text.h"
#include "text_window.h"
#include "trig.h"
#include "battle_string_ids.h"
src/fame_checker.c
+1 -10
View File
@@ -1,7 +1,6 @@
#include "global.h"
#include "gflib.h"
#include "constants/songs.h"
#include "sprite.h"
#include "bg.h"
#include "event_data.h"
#include "event_scripts.h"
#include "graphics.h"
@@ -13,15 +12,7 @@
#include "new_menu_helpers.h"
#include "item_menu.h"
#include "list_menu.h"
#include "gpu_regs.h"
#include "palette.h"
#include "task.h"
#include "malloc.h"
#include "main.h"
#include "sound.h"
#include "text.h"
#include "window.h"
#include "string_util.h"
#include "event_object_movement.h"
#include "menu_indicators.h"
#include "text_window.h"
src/field_control_avatar.c
+16 -17
View File
@@ -107,7 +107,7 @@ void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys)
{
if ((newKeys & START_BUTTON) && !(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING))
input->pressedStartButton = TRUE;
if (gQuestLogState != QL_STATE_2 && gQuestLogState != QL_STATE_3)
if (!QL_IS_PLAYBACK_STATE)
{
if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING))
{
@@ -123,7 +123,7 @@ void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys)
}
}
if (gQuestLogState != QL_STATE_2 && gQuestLogState != QL_STATE_3)
if (!QL_IS_PLAYBACK_STATE)
{
if (heldKeys & (DPAD_UP | DPAD_DOWN | DPAD_LEFT | DPAD_RIGHT))
{
@@ -142,7 +142,7 @@ void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys)
input->checkStandardWildEncounter = TRUE;
}
if (gQuestLogState != QL_STATE_2 && gQuestLogState != QL_STATE_3)
if (!QL_IS_PLAYBACK_STATE)
{
if (heldKeys & DPAD_UP)
input->dpadDirection = DIR_NORTH;
@@ -650,7 +650,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
{
if (InUnionRoom() == TRUE)
return FALSE;
if (gQuestLogState == QL_STATE_2)
if (gQuestLogState == QL_STATE_PLAYBACK)
return FALSE;
UpdateHappinessStepCounter();
@@ -836,17 +836,17 @@ static bool8 TryArrowWarp(struct MapPosition *position, u16 metatileBehavior, u8
DoWarp();
return TRUE;
}
else if (sub_806DB84(metatileBehavior, direction) == TRUE)
else if (IsDirectionalStairWarpMetatileBehavior(metatileBehavior, direction) == TRUE)
{
delay = 0;
if (gPlayerAvatar.flags & (PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
{
SetPlayerAvatarTransitionFlags(1);
SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT);
delay = 12;
}
StoreInitialPlayerAvatarState();
SetupWarp(&gMapHeader, warpEventId, position);
sub_807E4A0(metatileBehavior, delay);
DoStairWarp(metatileBehavior, delay);
return TRUE;
}
}
@@ -921,20 +921,20 @@ static bool8 IsWarpMetatileBehavior(u16 metatileBehavior)
return FALSE;
}
bool8 sub_806DB84(u16 metatileBehavior, u8 playerDirection)
bool8 IsDirectionalStairWarpMetatileBehavior(u16 metatileBehavior, u8 playerDirection)
{
switch (playerDirection)
{
case DIR_WEST:
if (MetatileBehavior_IsUnknownWarp6D(metatileBehavior))
if (MetatileBehavior_IsDirectionalUpLeftStairWarp(metatileBehavior))
return TRUE;
if (MetatileBehavior_IsUnknownWarp6F(metatileBehavior))
if (MetatileBehavior_IsDirectionalDownLeftStairWarp(metatileBehavior))
return TRUE;
break;
case DIR_EAST:
if (MetatileBehavior_IsUnknownWarp6C(metatileBehavior))
if (MetatileBehavior_IsDirectionalUpRightStairWarp(metatileBehavior))
return TRUE;
if (MetatileBehavior_IsUnknownWarp6E(metatileBehavior))
if (MetatileBehavior_IsDirectionalDownRightStairWarp(metatileBehavior))
return TRUE;
break;
}
@@ -1063,18 +1063,17 @@ static const u8 *GetCoordEventScriptAtPosition(struct MapHeader *mapHeader, u16
return NULL;
}
void sub_806DE28(struct ObjectEvent * object)
void HandleBoulderFallThroughHole(struct ObjectEvent * object)
{
if (MapGridGetMetatileBehaviorAt(object->currentCoords.x, object->currentCoords.y) == MB_FALL_WARP)
{
PlaySE(SE_RU_HYUU);
// w-why?!
RemoveObjectEventByLocalIdAndMap(object->localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
FlagClear(sub_805FCD8(object->localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup));
FlagClear(GetObjectEventFlagByLocalIdAndMap(object->localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup));
}
}
void sub_806DE70(u16 x, u16 y)
void HandleBoulderActivateVictoryRoadSwitch(u16 x, u16 y)
{
int i;
const struct CoordEvent * events = gMapHeader.events->coordEvents;
@@ -1086,7 +1085,7 @@ void sub_806DE70(u16 x, u16 y)
{
if (events[i].x + 7 == x && events[i].y + 7 == y)
{
QuestLog_OnInteractionWithSpecialNpc();
QuestLog_CutRecording();
ScriptContext1_SetupScript(events[i].script);
ScriptContext2_Enable();
}
src/field_effect.c
+6 -6
View File
@@ -1105,7 +1105,7 @@ void FieldCB_FallWarpExit(void)
{
Overworld_PlaySpecialMapMusic();
WarpFadeInScreen();
sub_8111CF0();
QuestLog_DrawPreviouslyOnQuestHeaderIfInPlaybackMode();
ScriptContext2_Enable();
FreezeObjectEvents();
CreateTask(Task_FallWarpFieldEffect, 0);
@@ -1409,7 +1409,7 @@ static void FieldCB_EscalatorWarpIn(void)
{
Overworld_PlaySpecialMapMusic();
WarpFadeInScreen();
sub_8111CF0();
QuestLog_DrawPreviouslyOnQuestHeaderIfInPlaybackMode();
ScriptContext2_Enable();
FreezeObjectEvents();
CreateTask(Task_EscalatorWarpInFieldEffect, 0);
@@ -1819,7 +1819,7 @@ static void FieldCB_LavaridgeGymB1FWarpExit(void)
{
Overworld_PlaySpecialMapMusic();
WarpFadeInScreen();
sub_8111CF0();
QuestLog_DrawPreviouslyOnQuestHeaderIfInPlaybackMode();
ScriptContext2_Enable();
gFieldCallback = NULL;
CreateTask(Task_LavaridgeGymB1FWarpExit, 0);
@@ -2186,7 +2186,7 @@ static void FieldCallback_EscapeRopeExit(void)
{
Overworld_PlaySpecialMapMusic();
WarpFadeInScreen();
sub_8111CF0();
QuestLog_DrawPreviouslyOnQuestHeaderIfInPlaybackMode();
ScriptContext2_Enable();
FreezeObjectEvents();
gFieldCallback = NULL;
@@ -2350,7 +2350,7 @@ static void FieldCallback_TeleportIn(void)
{
Overworld_PlaySpecialMapMusic();
WarpFadeInScreen();
sub_8111CF0();
QuestLog_DrawPreviouslyOnQuestHeaderIfInPlaybackMode();
ScriptContext2_Enable();
FreezeObjectEvents();
gFieldCallback = NULL;
@@ -2984,7 +2984,7 @@ static void (*const sUseVsSeekerEffectFuncs[])(struct Task * task) = {
u32 FldEff_UseVsSeeker(void)
{
if (gQuestLogState == QL_STATE_1)
if (gQuestLogState == QL_STATE_RECORDING)
sub_811278C(8, 89);
CreateTask(Task_FldEffUseVsSeeker, 0xFF);
return 0;
src/field_effect_helpers.c
+1 -2
View File
@@ -1,12 +1,11 @@
#include "global.h"
#include "gflib.h"
#include "event_object_movement.h"
#include "field_camera.h"
#include "field_effect.h"
#include "field_weather.h"
#include "fieldmap.h"
#include "metatile_behavior.h"
#include "sound.h"
#include "sprite.h"
#include "constants/field_effects.h"
#include "constants/songs.h"
src/field_fadetransition.c
+44 -44
View File
@@ -1,5 +1,5 @@
#include "global.h"
#include "palette.h"
#include "gflib.h"
#include "field_fadetransition.h"
#include "overworld.h"
#include "fldeff.h"
@@ -14,7 +14,6 @@
#include "quest_log.h"
#include "link.h"
#include "event_object_movement.h"
#include "sound.h"
#include "field_door.h"
#include "field_effect.h"
#include "field_screen_effect.h"
@@ -23,6 +22,7 @@
#include "start_menu.h"
#include "constants/songs.h"
#include "constants/event_object_movement.h"
#include "constants/event_objects.h"
#include "constants/field_weather.h"
static void sub_807DF4C(u8 a0);
@@ -30,10 +30,10 @@ static void sub_807DFBC(u8 taskId);
static void task_map_chg_seq_0807E20C(u8 taskId);
static void task_map_chg_seq_0807E2CC(u8 taskId);
static void Task_TeleportWarpIn(u8 taskId);
static void sub_807E718(u8 taskId);
static void Task_Teleport2Warp(u8 taskId);
static void Task_TeleportWarp(u8 taskId);
static void sub_807E80C(u8 taskId);
static void sub_807E980(u8 taskId);
static void Task_DoorWarp(u8 taskId);
static void Task_StairWarp(u8 taskId);
static void sub_807EB64(u16, s16*, s16*);
static void sub_807EBBC(u8 a0, s16 *a1, s16 *a2);
static void sub_807EAC4(s16, s16, s16*, s16*, s16*);
@@ -262,7 +262,7 @@ static void sub_807DE78(bool8 a0)
sub_807DF4C(a0);
if (MetatileBehavior_IsNonAnimDoor(behavior) == TRUE)
func = task_map_chg_seq_0807E20C;
else if (MetatileBehavior_IsUnknownWarp6C_to_6F(behavior) == TRUE)
else if (MetatileBehavior_IsDirectionalStairWarp(behavior) == TRUE)
{
u8 tmp = gUnknown_2031DE0;
func = task_map_chg_seq_0807E2CC;
@@ -287,7 +287,7 @@ static void sub_807DF4C(bool8 a0)
void FieldCB_DefaultWarpExit(void)
{
Overworld_PlaySpecialMapMusic();
sub_8111CF0();
QuestLog_DrawPreviouslyOnQuestHeaderIfInPlaybackMode();
sub_807DE78(FALSE);
ScriptContext2_Enable();
}
@@ -295,7 +295,7 @@ void FieldCB_DefaultWarpExit(void)
void FieldCB_WarpExitFadeFromBlack(void)
{
Overworld_PlaySpecialMapMusic();
sub_8111CF0();
QuestLog_DrawPreviouslyOnQuestHeaderIfInPlaybackMode();
sub_807DE78(TRUE);
ScriptContext2_Enable();
}
@@ -304,7 +304,7 @@ static void FieldCB_TeleportWarpIn(void)
{
Overworld_PlaySpecialMapMusic();
WarpFadeInScreen();
sub_8111CF0();
QuestLog_DrawPreviouslyOnQuestHeaderIfInPlaybackMode();
PlaySE(SE_TK_WARPOUT);
CreateTask(Task_TeleportWarpIn, 10);
ScriptContext2_Enable();
@@ -350,7 +350,7 @@ static void sub_807DFBC(u8 taskId)
{
PlayerGetDestCoords(&task->data[12], &task->data[13]);
sub_807DCB0(TRUE);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_DOWN);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_DOWN);
task->data[0] = 8;
}
break;
@@ -365,7 +365,7 @@ static void sub_807DFBC(u8 taskId)
case 9:
if (FieldFadeTransitionBackgroundEffectIsFinished() && walkrun_is_standing_still() && !FieldIsDoorAnimationRunning() && !FuncIsActiveTask(Task_BarnDoorWipe))
{
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]);
task->data[0] = 4;
}
break;
@@ -374,7 +374,7 @@ static void sub_807DFBC(u8 taskId)
if (FieldFadeTransitionBackgroundEffectIsFinished())
{
sub_807DCB0(TRUE);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_DOWN);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_DOWN);
task->data[0] = 2;
}
break;
@@ -382,7 +382,7 @@ static void sub_807DFBC(u8 taskId)
if (walkrun_is_standing_still())
{
task->data[1] = FieldAnimateDoorClose(*x, *y);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]);
task->data[0] = 3;
}
break;
@@ -416,7 +416,7 @@ static void task_map_chg_seq_0807E20C(u8 taskId)
if (FieldFadeTransitionBackgroundEffectIsFinished())
{
sub_807DCB0(TRUE);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], GetWalkNormalMovementAction(GetPlayerFacingDirection()));
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)], GetWalkNormalMovementAction(GetPlayerFacingDirection()));
task->data[0] = 2;
}
break;
@@ -497,22 +497,22 @@ bool8 FieldCB_ReturnToFieldOpenStartMenu(void)
return FALSE;
}
static void task_mpl_807E3C8(u8 taskId)
static void Task_SafariZoneRanOutOfBalls(u8 taskId)
{
if (FieldFadeTransitionBackgroundEffectIsFinished() == TRUE)
{
ScriptContext2_Disable();
DestroyTask(taskId);
sub_80696C0();
ClearPlayerHeldMovementAndUnfreezeObjectEvents();
}
}
void sub_807E3EC(void)
void FieldCB_SafariZoneRanOutOfBalls(void)
{
ScriptContext2_Enable();
Overworld_PlaySpecialMapMusic();
FadeInFromBlack();
CreateTask(task_mpl_807E3C8, 10);
CreateTask(Task_SafariZoneRanOutOfBalls, 10);
}
static bool32 WaitWarpFadeOutScreen(void)
@@ -536,7 +536,7 @@ void DoWarp(void)
PlayRainStoppingSoundEffect();
PlaySE(SE_KAIDAN);
gFieldCallback = FieldCB_DefaultWarpExit;
CreateTask(sub_807E718, 10);
CreateTask(Task_Teleport2Warp, 10);
}
void DoDiveWarp(void)
@@ -546,28 +546,28 @@ void DoDiveWarp(void)
WarpFadeOutScreen();
PlayRainStoppingSoundEffect();
gFieldCallback = FieldCB_DefaultWarpExit;
CreateTask(sub_807E718, 10);
CreateTask(Task_Teleport2Warp, 10);
}
void sub_807E4A0(u16 metatileBehavior, u16 delay)
void DoStairWarp(u16 metatileBehavior, u16 delay)
{
u8 taskId = CreateTask(sub_807E980, 10);
u8 taskId = CreateTask(Task_StairWarp, 10);
gTasks[taskId].data[1] = metatileBehavior;
gTasks[taskId].data[15] = delay;
sub_807E980(taskId);
Task_StairWarp(taskId);
}
void DoDoorWarp(void)
{
ScriptContext2_Enable();
gFieldCallback = FieldCB_DefaultWarpExit;
CreateTask(sub_807E80C, 10);
CreateTask(Task_DoorWarp, 10);
}
void sub_807E500(void)
void DoTeleport2Warp(void)
{
ScriptContext2_Enable();
CreateTask(sub_807E718, 10);
CreateTask(Task_Teleport2Warp, 10);
gFieldCallback = FieldCB_TeleportWarpIn;
}
@@ -614,11 +614,11 @@ void sub_807E5C4(void)
{
ScriptContext2_Enable();
WarpFadeOutScreen();
CreateTask(sub_807E718, 10);
CreateTask(Task_Teleport2Warp, 10);
gFieldCallback = nullsub_60;
}
static void sub_807E5EC(u8 taskId)
static void Task_CableClubWarp(u8 taskId)
{
struct Task * task = &gTasks[taskId];
switch (task->data[0])
@@ -645,10 +645,10 @@ void DoCableClubWarp(void)
TryFadeOutOldMapMusic();
WarpFadeOutScreen();
PlaySE(SE_KAIDAN);
CreateTask(sub_807E5EC, 10);
CreateTask(Task_CableClubWarp, 10);
}
static void sub_807E678(u8 taskId)
static void Task_ReturnFromLinkRoomWarp(u8 taskId)
{
s16 * data = gTasks[taskId].data;
switch (data[0])
@@ -680,10 +680,10 @@ static void sub_807E678(u8 taskId)
void ReturnFromLinkRoom(void)
{
CreateTask(sub_807E678, 10);
CreateTask(Task_ReturnFromLinkRoomWarp, 10);
}
static void sub_807E718(u8 taskId)
static void Task_Teleport2Warp(u8 taskId)
{
struct Task *task = &gTasks[taskId];
switch (task->data[0])
@@ -736,7 +736,7 @@ static void Task_TeleportWarp(u8 taskId)
}
}
static void sub_807E80C(u8 taskId)
static void Task_DoorWarp(u8 taskId)
{
struct Task *task = &gTasks[taskId];
s16 * xp = &task->data[2];
@@ -753,8 +753,8 @@ static void sub_807E80C(u8 taskId)
case 1:
if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE)
{
ObjectEventClearHeldMovementIfActive(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_UP);
ObjectEventClearHeldMovementIfActive(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_UP);
task->data[0] = 2;
}
break;
@@ -762,7 +762,7 @@ static void sub_807E80C(u8 taskId)
if (walkrun_is_standing_still())
{
task->data[1] = FieldAnimateDoorClose(*xp, *yp - 1);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]);
sub_807DCB0(FALSE);
task->data[0] = 3;
}
@@ -778,18 +778,18 @@ static void sub_807E80C(u8 taskId)
WarpFadeOutScreen();
PlayRainStoppingSoundEffect();
task->data[0] = 0;
task->func = sub_807E718;
task->func = Task_Teleport2Warp;
break;
case 5:
TryFadeOutOldMapMusic();
PlayRainStoppingSoundEffect();
task->data[0] = 0;
task->func = sub_807E718;
task->func = Task_Teleport2Warp;
break;
}
}
static void sub_807E980(u8 taskId)
static void Task_StairWarp(u8 taskId)
{
s16 * data = gTasks[taskId].data;
struct ObjectEvent *playerObj = &gObjectEvents[gPlayerAvatar.objectEventId];
@@ -865,22 +865,22 @@ static void sub_807EB64(u16 a0, s16 *a1, s16 *a2)
static void sub_807EBBC(u8 a0, s16 *a1, s16 *a2)
{
if (MetatileBehavior_IsUnknownWarp6C(a0))
if (MetatileBehavior_IsDirectionalUpRightStairWarp(a0))
{
*a1 = 16;
*a2 = -10;
}
else if (MetatileBehavior_IsUnknownWarp6D(a0))
else if (MetatileBehavior_IsDirectionalUpLeftStairWarp(a0))
{
*a1 = -17;
*a2 = -10;
}
else if (MetatileBehavior_IsUnknownWarp6E(a0))
else if (MetatileBehavior_IsDirectionalDownRightStairWarp(a0))
{
*a1 = 17;
*a2 = 3;
}
else if (MetatileBehavior_IsUnknownWarp6F(a0))
else if (MetatileBehavior_IsDirectionalDownLeftStairWarp(a0))
{
*a1 = -17;
*a2 = 3;
@@ -927,7 +927,7 @@ static void sub_807ECBC(s16 *a0, s16 *a1, s16 *a2, s16 *a3, s16 *a4)
struct Sprite *sprite;
PlayerGetDestCoords(&x, &y);
behavior = MapGridGetMetatileBehaviorAt(x, y);
if (MetatileBehavior_IsUnknownWarp6E(behavior) || MetatileBehavior_IsUnknownWarp6C(behavior))
if (MetatileBehavior_IsDirectionalDownRightStairWarp(behavior) || MetatileBehavior_IsDirectionalUpRightStairWarp(behavior))
r1 = 3;
else
r1 = 4;
src/field_message_box.c
+1 -1
View File
@@ -24,7 +24,7 @@ static void Task_RunFieldMessageBoxPrinter(u8 taskId)
switch (task->data[0])
{
case 0:
if (gQuestLogState == QL_STATE_2)
if (gQuestLogState == QL_STATE_PLAYBACK)
{
gTextFlags.autoScroll = TRUE;
TextWindow_LoadTilesStdFrame1(0, 0x200);
src/field_player_avatar.c
+8 -8
View File
@@ -556,7 +556,7 @@ static u8 CheckForPlayerAvatarCollision(u8 direction)
x = playerObjEvent->currentCoords.x;
y = playerObjEvent->currentCoords.y;
if (sub_806DB84(MapGridGetMetatileBehaviorAt(x, y), direction))
if (IsDirectionalStairWarpMetatileBehavior(MapGridGetMetatileBehaviorAt(x, y), direction))
return 8;
MoveCoords(direction, &x, &y);
return CheckForObjectEventCollision(playerObjEvent, x, y, direction, MapGridGetMetatileBehaviorAt(x, y));
@@ -673,7 +673,7 @@ static void CheckAcroBikeCollision(s16 x, s16 y, u8 metatileBehavior, u8 *collis
}
}
void SetPlayerAvatarTransitionFlags(bool16 flags)
void SetPlayerAvatarTransitionFlags(u16 flags)
{
gPlayerAvatar.transitionFlags |= flags;
DoPlayerAvatarTransition();
@@ -910,7 +910,7 @@ void sub_805C260(void)
PlayerSetAnimId(MOVEMENT_ACTION_0x9F, 0);
}
void sub_805C270(void)
void HandleEnforcedLookDirectionOnPlayerStopMoving(void)
{
if (gPlayerAvatar.tileTransitionState == T_TILE_CENTER || gPlayerAvatar.tileTransitionState == T_NOT_MOVING)
{
@@ -1006,12 +1006,12 @@ static void PlayCollisionSoundIfNotFacingWarp(u8 direction)
{
if (direction == DIR_WEST)
{
if (MetatileBehavior_IsUnknownWarp6D(metatileBehavior) || MetatileBehavior_IsUnknownWarp6F(metatileBehavior))
if (MetatileBehavior_IsDirectionalUpLeftStairWarp(metatileBehavior) || MetatileBehavior_IsDirectionalDownLeftStairWarp(metatileBehavior))
return;
}
if (direction == DIR_EAST)
{
if (MetatileBehavior_IsUnknownWarp6C(metatileBehavior) || MetatileBehavior_IsUnknownWarp6E(metatileBehavior))
if (MetatileBehavior_IsDirectionalUpRightStairWarp(metatileBehavior) || MetatileBehavior_IsDirectionalDownRightStairWarp(metatileBehavior))
return;
}
if (direction == DIR_NORTH)
@@ -1445,8 +1445,8 @@ static bool8 sub_805CE20(struct Task *task, struct ObjectEvent *playerObject, st
{
ObjectEventClearHeldMovementIfFinished(playerObject);
ObjectEventClearHeldMovementIfFinished(strengthObject);
sub_806DE28(strengthObject);
sub_806DE70(strengthObject->currentCoords.x, strengthObject->currentCoords.y);
HandleBoulderFallThroughHole(strengthObject);
HandleBoulderActivateVictoryRoadSwitch(strengthObject->currentCoords.x, strengthObject->currentCoords.y);
gPlayerAvatar.preventStep = FALSE;
ScriptContext2_Disable();
DestroyTask(FindTaskIdByFunc(Task_BumpBoulder));
@@ -1598,7 +1598,7 @@ void CreateStopSurfingTask_NoMusicChange(u8 direction)
void SeafoamIslandsB4F_CurrentDumpsPlayerOnLand(void)
{
if (gUnknown_3005E88 != 1 && gUnknown_3005E88 != 3)
if (gQuestLogPlaybackState != 1 && gQuestLogPlaybackState != 3)
{
sub_811278C(gUnknown_835B820[DIR_NORTH], 16);
CreateStopSurfingTask(DIR_NORTH);
src/field_poison.c
+1 -1
View File
@@ -1,9 +1,9 @@
#include "global.h"
#include "gflib.h"
#include "strings.h"
#include "task.h"
#include "field_message_box.h"
#include "script.h"
#include "string_util.h"
#include "event_data.h"
#include "fldeff.h"
#include "party_menu.h"
src/field_screen_effect.c
+1 -3
View File
@@ -1,13 +1,11 @@
#include "global.h"
#include "gflib.h"
#include "field_screen_effect.h"
#include "gpu_regs.h"
#include "overworld.h"
#include "scanline_effect.h"
#include "script.h"
#include "task.h"
#include "window.h"
#include "strings.h"
#include "string_util.h"
#include "menu.h"
#include "heal_location.h"
#include "new_menu_helpers.h"

Some files were not shown because too many files have changed in this diff Show More