Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-04-25 07:19:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add missing script labels

Browse Source
This commit is contained in:
GriffinR 2020-03-02 13:52:16 -05:00
parent 40af0d1302
commit dd5f3c3c3d
13 changed files with 222 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/maps/FiveIsland_ResortGorgeous_House/map.json
View File

@ -59,7 +59,7 @@
"y": 1,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "FiveIsland_ResortGorgeous_House_EventScript_1ACF2C"
"script": "FiveIsland_ResortGorgeous_House_EventScript_PokemonJournal"
},
{
"type": "sign",
@ -67,7 +67,7 @@
"y": 1,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "FiveIsland_ResortGorgeous_House_EventScript_1ACF2C"
"script": "FiveIsland_ResortGorgeous_House_EventScript_PokemonJournal"
}
]
}

4
data/maps/PokemonLeague_HallOfFame/scripts.inc
View File

@ -4,10 +4,10 @@ PokemonLeague_HallOfFame_MapScripts:: @ 8162D4C
.byte 0
PokemonLeague_HallOfFame_OnWarp:: @ 8162D57
map_script_2 VAR_TEMP_1, 0, EventScript_162D61
map_script_2 VAR_TEMP_1, 0, PokemonLeague_HallOfFame_EventScript_TurnPlayerNorth
.2byte 0
EventScript_162D61:: @ 8162D61
PokemonLeague_HallOfFame_EventScript_TurnPlayerNorth:: @ 8162D61
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end

1
data/maps/Route21_North/text.inc
View File

@ -32,6 +32,7 @@ Route21_North_Text_SpencerPostBattle:: @ 8188465
@ Below is the battle text for the Cue Ball that was on Route 21 in Gen 1.
@ This trainer wasnt used in Gen 3 so their text goes unused/untranslated
@ Interestingly they did add a rematch intro text for this trainer
@ English translations from RB are listed
@ "What's wrong with me swimming?"

4
data/maps/Route5_PokemonDayCare/text.inc
View File

@ -59,10 +59,10 @@ Route5_PokemonDayCare_Text_YouveGotNoRoomForIt:: @ 819DFC2
Route5_PokemonDayCare_Text_DontHaveEnoughMoney:: @ 819E001
.string "You don't have enough money.$"
Text_19E01E:: @ 819E01E
Route5_PokemonDayCare_Text_19E01E:: @ 819E01E
.string "きみの\n"
.string "みてみるかね？$"
Text_19E02A:: @ 819E02A
Route5_PokemonDayCare_Text_CantAcceptMonWithHM:: @ 819E02A
.string "わるいけど　ひでんのわざを　もった\n"
.string "ポケモンは　あずかれないなぁ$"

2
data/scripts/cable_club.inc
View File

@ -19,7 +19,7 @@ CableClub_EventScript_MysteryGiftMan:: @ 81BB1D2
execram
@ Unused
EventScript_1BB1E4:: @ 81BB1E4
EventScript_MysteryGiftThankYou:: @ 81BB1E4
msgbox Text_ThankYouForAccessingMysteryGift, MSGBOX_NPC
end

12
data/scripts/fame_checker.inc
View File

@ -8,7 +8,7 @@ ViridianCity_House2_EventScript_PokemonJournal:: @ 81ACD65
release
end
EventScript_1ACD8D:: @ 81ACD8D
EventScript_PokemonJournalUnused1:: @ 81ACD8D
lock
faceplayer
famechecker FAMECHECKER_DAISY, 1
@ -18,7 +18,7 @@ EventScript_1ACD8D:: @ 81ACD8D
release
end
EventScript_1ACDB5:: @ 81ACDB5
EventScript_PokemonJournalUnused2:: @ 81ACDB5
lock
faceplayer
famechecker FAMECHECKER_DAISY, 4
@ -135,11 +135,11 @@ CinnabarIsland_Gym_EventScript_BlaineFujiPhoto:: @ 81ACF07
releaseall
end
FiveIsland_ResortGorgeous_House_EventScript_1ACF2C:: @ 81ACF2C
FiveIsland_ResortGorgeous_House_EventScript_PokemonJournal:: @ 81ACF2C
lockall
famechecker FAMECHECKER_BLAINE, 5
textcolor 3
msgbox gUnknown_81B17E9
msgbox PokemonJournal_Text_SpecialFeatureBlaine
releaseall
end
@ -203,7 +203,7 @@ SixIsland_Mart_EventScript_OldWoman:: @ 81ACFEF
release
end
EventScript_1AD008:: @ 81AD008
EventScript_LanceUnused:: @ 81AD008
lock
faceplayer
famechecker FAMECHECKER_LANCE, 0
@ -211,7 +211,7 @@ EventScript_1AD008:: @ 81AD008
release
end
EventScript_1AD021:: @ 81AD021
SaffronCity_EventScript_BattleGirlUnused:: @ 81AD021
lock
faceplayer
famechecker FAMECHECKER_LANCE, 1

8
data/scripts/trainer_card.inc
View File

@ -68,7 +68,7 @@ FourIsland_House2_EventScript_StickerMan:: @ 81B2938
lock
specialvar VAR_0x8008, StickerManGetBragFlags
goto_if_unset FLAG_MET_STICKER_MAN, FourIsland_House2_EventScript_MeetStickerMan
goto_if_set FLAG_MET_STICKER_MAN, EventScript_1B2994
goto_if_set FLAG_MET_STICKER_MAN, FourIsland_House2_EventScript_StickerManAskForBrag
end
FourIsland_House2_EventScript_MeetStickerMan:: @ 81B2951
@ -88,19 +88,19 @@ FourIsland_House2_EventScript_MeetStickerMan:: @ 81B2951
goto FourIsland_House2_EventScript_ChooseBrag
end
EventScript_1B2994:: @ 81B2994
FourIsland_House2_EventScript_StickerManAskForBrag:: @ 81B2994
applymovement 1, Movement_FacePlayer
waitmovement 0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
compare VAR_0x8008, 0
goto_if_eq EventScript_1B29C6
goto_if_eq FourIsland_House2_EventScript_NothingToBragAbout
message FourIsland_House2_Text_BragAboutWhatToday
waitmessage
goto FourIsland_House2_EventScript_ChooseBrag
end
EventScript_1B29C6:: @ 81B29C6
FourIsland_House2_EventScript_NothingToBragAbout:: @ 81B29C6
msgbox FourIsland_House2_Text_BragAboutSomethingForMe
release
end

342
data/specials.inc
View File

@ -14,28 +14,28 @@ gSpecials:: @ 815FD60
def_special ReturnFromLinkRoom
def_special CleanupLinkRoomState
def_special sub_8081770
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special TryBattleLinkup
def_special TryTradeLinkup
def_special TryRecordMixLinkup
@ -44,20 +44,20 @@ gSpecials:: @ 815FD60
def_special EnterTradeSeat
def_special Special_WiredCableClubTrade
def_special Special_CableClub_AskSaveTheGame
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special SavePlayerParty
def_special LoadPlayerParty
def_special ChooseHalfPartyForBattle
def_special Script_ShowLinkTrainerCard
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special IsEnigmaBerryValid
def_special ScrSpecial_GetTrainerBattleMode
def_special ScrSpecial_ShowTrainerIntroSpeech
@ -70,63 +70,63 @@ gSpecials:: @ 815FD60
def_special ScrSpecial_StartTrainerEyeRematch
def_special ShowPokemonStorageSystem
def_special HasEnoughMonsForDoubleBattle
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special Special_HasLeadMonBeenRenamed
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special sub_8081128
def_special Field_AskSaveTheGame
def_special nullsub_56
def_special ShowEasyChatScreen
def_special Special_BufferEasyChatMessage
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special GetHeracrossSizeRecordInfo
def_special CompareHeracrossSize
def_special GetMagikarpSizeRecordInfo
@ -134,43 +134,43 @@ gSpecials:: @ 815FD60
def_special NameRaterWasNicknameChanged
def_special Special_GetMonNickname
def_special Special_IsMonOTIDNotPlayers
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special BufferRandomHobbyOrLifestyleString
def_special nullsub_75
def_special NullFieldSpecial
def_special RegisteredItemHandleBikeSwap
def_special CalculatePlayerPartyCount
def_special CountPartyNonEggMons
def_special CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special Special_ShowStringVar4AsFieldMessage
def_special DrawWholeMapView
def_special Special_GetPlayerXY
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special Special_GetPlayerTrainerIdOnesDigit
def_special Special_BufferBigGuyOrBigGirlString
def_special Special_BufferSonOrDaughterString
def_special Special_SetHiddenItemFlag
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special Overworld_PlaySpecialMapMusic
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special ScrSpecial_StartOldManTutorialBattle
def_special ChangePokemonNickname
def_special Special_ChooseMonFromParty
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special Special_IsFanClubMemberFanOfPlayer
def_special Special_GetNumFansOfPlayerInTrainerFanClub
def_special Special_BufferFanClubTrainerName
@ -180,14 +180,14 @@ gSpecials:: @ 815FD60
def_special Special_UpdateTrainerFanClubGameClear
def_special Special_TryGainNewFanFromCounter
def_special ScrSpecial_RockSmashWildEncounter
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special Special_GetBattleOutcome
def_special GetDaycareMonNicknames
def_special GetDaycareState
@ -209,35 +209,35 @@ gSpecials:: @ 815FD60
def_special SubtractMoneyFromVar0x8005
def_special TryFieldPoisonWhiteOut
def_special SetCB2Whiteout
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special EnterSafariMode
def_special ExitSafariMode
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special Special_GetPokedexCount
def_special Special_GetProfOaksRatingMessage
def_special Special_AnimatePcTurnOn
def_special Special_AnimatePcTurnOff
def_special Special_GetElevatorFloor
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special Special_SelectMoveTutorMon
def_special Special_SelectMove
def_special Special_MoveDeleterForgetMove
def_special Special_BufferMoveDeleterNicknameAndMove
def_special Special_GetNumMovesSelectedMonHas
def_special DisplayMoveTutorMenu
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special Special_GetPlayerAvatarBike
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special GetLeadMonFriendship
def_special ScrSpecial_BattleTowerMapScript2
def_special ChooseNextBattleTowerTrainer
@ -255,7 +255,7 @@ gSpecials:: @ 815FD60
def_special AwardBattleTowerRibbons
def_special ChooseBattleTowerPlayerParty
def_special ValidateEReaderTrainer
def_special nullsub_75
def_special NullFieldSpecial
def_special ReducePlayerPartyToThree
def_special BedroomPC
def_special PlayerPC
@ -264,58 +264,58 @@ gSpecials:: @ 815FD60
def_special CreateInGameTradePokemon
def_special DoInGameTradeScene
def_special GetTradeSpecies
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special ScrSpecial_CreatePCMenu
def_special HallOfFamePCBeginFade
def_special Special_ShowDiploma
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special nullsub_61
def_special DoSoftReset
def_special Special_HallOfFame
def_special Special_AnimateElevator
def_special nullsub_75
def_special NullFieldSpecial
def_special SpawnCameraObject
def_special RemoveCameraObject
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special BufferEReaderTrainerName
def_special Special_GetRandomSlotMachine
def_special GetPlayerFacingDirection
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special LeadMonHasEffortRibbon
def_special GiveLeadMonEffortRibbon
def_special ScrSpecial_AreLeadMonEVsMaxedOut
def_special Script_FacePlayer
def_special Script_ClearHeldMovement
def_special InitRoamer
def_special nullsub_75
def_special NullFieldSpecial
def_special Special_PlayerHasGrassPokemonInParty
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special Special_IsStarterFirstStageInParty
def_special nullsub_75
def_special NullFieldSpecial
def_special Special_IsThereRoomInAnyBoxForMorePokemon
def_special nullsub_75
def_special NullFieldSpecial
def_special Special_DrawElevatorCurrentFloorWindow
def_special nullsub_75
def_special NullFieldSpecial
def_special Special_CheckPartyPokerus
def_special Special_SetIcefallCaveCrackedIceMetatiles
def_special Special_ShakeScreen
@ -323,32 +323,32 @@ gSpecials:: @ 815FD60
def_special Special_StartLegendaryBattle
def_special Special_StartRegiBattle
def_special SetUpTrainerMovement
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special sub_807B6C0
def_special DoDiveWarp
def_special DoFallWarp
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special SetEReaderTrainerGfxId
def_special ScrSpecial_StartSouthernIslandBattle
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special Special_GetSpeciesOfPartySlot_x8004
def_special Special_IsSelectedMonEgg
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special LoadPlayerBag
def_special Script_FadeOutMapMusic
def_special nullsub_75
def_special nullsub_75
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special HasAllKantoMons
def_special Special_IsMonOTNameNotPlayers
def_special nullsub_75
def_special NullFieldSpecial
def_special Dummy_TryEnableBravoTrainerBattleTower
def_special GetNameOfEnigmaBerryInPlayerParty
def_special nullsub_75
def_special NullFieldSpecial
def_special sub_810B82C
def_special ScrSpecial_StartMarowakBattle
def_special Special_ForcePlayerOntoBike

2
data/text/fame_checker.inc
View File

@ -1421,7 +1421,7 @@ PokemonJournal_Text_SpecialFeatureSabrina:: @ 81B1753
.string "communicate with her POKéMON\l"
.string "during battle without speaking.$"
gUnknown_81B17E9:: @ 81B17E9
PokemonJournal_Text_SpecialFeatureBlaine:: @ 81B17E9
.string "POKéMON JOURNAL\p"
.string "Special Feature: CINNABAR GYM\n"
.string "LEADER BLAINE!\p"

9
data/text/trainers.inc
View File

@ -1,14 +1,14 @@
gUnknown_81C137C:: @ 81C137C
VSSeeker_Text_BatteryNotChargedNeedXSteps:: @ 81C137C
.string "The battery isn't charged enough.\p"
.string "No. of steps required to fully\n"
.string "charge the battery: {STR_VAR_1}{PAUSE_UNTIL_PRESS}$"
gUnknown_81C13D6:: @ 81C13D6
VSSeeker_Text_NoTrainersWithinRange:: @ 81C13D6
.string "There are no TRAINERS within range\n"
.string "who can battle…\p"
.string "The VS SEEKER was turned off.{PAUSE_UNTIL_PRESS}$"
gUnknown_81C1429:: @ 81C1429
VSSeeker_Text_TrainersNotReady:: @ 81C1429
.string "The other TRAINERS don't appear\n"
.string "to be ready for battle.\p"
.string "Let's wait till later.{PAUSE_UNTIL_PRESS}$"
@ -610,7 +610,8 @@ Route21_North_Text_WadeRematchIntro:: @ 81C3231
Route21_North_Text_SpencerRematchIntro:: @ 81C3264
.string "The sea cleanses my body and soul!$"
Text_1C3287:: @ 81C3287
@ Unused trainer from RB that had a rematch intro added
Route21_North_Text_CueBallRematchIntro:: @ 81C3287
.string "きょうも　およぎに\n"
.string "きちまったぜ$"

6
include/event_scripts.h
View File

@ -379,9 +379,9 @@ extern const u8 gText_LtSurge[];
extern const u8 gText_Koga[];
extern const u8 gText_PokemonCenter[];
// vs_seeker
extern const u8 gUnknown_81C137C[];
extern const u8 gUnknown_81C13D6[];
extern const u8 gUnknown_81C1429[];
extern const u8 VSSeeker_Text_BatteryNotChargedNeedXSteps[];
extern const u8 VSSeeker_Text_NoTrainersWithinRange[];
extern const u8 VSSeeker_Text_TrainersNotReady[];
// fame_checker

3
src/field_specials.c
View File

@ -533,7 +533,8 @@ bool8 Special_IsMonOTNameNotPlayers(void)
return TRUE;
}
void nullsub_75(void)
// Used to nop all the unused specials from RS
void NullFieldSpecial(void)
{
}

37
src/vs_seeker.c
View File

@ -27,6 +27,13 @@
#include "constants/items.h"
#include "constants/quest_log.h"
enum
{
VSSEEKER_NOT_CHARGED,
VSSEEKER_NO_ONE_IN_RANGE,
VSSEEKER_CAN_USE,
};
typedef enum
{
VSSEEKER_RESPONSE_NO_RESPONSE,
@ -735,17 +742,17 @@ void Task_VsSeeker_0(u8 taskId)
sVsSeeker = AllocZeroed(sizeof(struct VsSeekerStruct));
GatherNearbyTrainerInfo();
respval = CanUseVsSeeker();
if (respval == 0)
if (respval == VSSEEKER_NOT_CHARGED)
{
Free(sVsSeeker);
DisplayItemMessageOnField(taskId, 2, gUnknown_81C137C, sub_80A1E0C);
DisplayItemMessageOnField(taskId, 2, VSSeeker_Text_BatteryNotChargedNeedXSteps, sub_80A1E0C);
}
else if (respval == 1)
else if (respval == VSSEEKER_NO_ONE_IN_RANGE)
{
Free(sVsSeeker);
DisplayItemMessageOnField(taskId, 2, gUnknown_81C13D6, sub_80A1E0C);
DisplayItemMessageOnField(taskId, 2, VSSeeker_Text_NoTrainersWithinRange, sub_80A1E0C);
}
else if (respval == 2)
else if (respval == VSSEEKER_CAN_USE)
{
ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, 0, gSpecialVar_ItemId, 0xffff);
FieldEffectStart(FLDEFF_USE_VS_SEEKER);
@ -814,13 +821,13 @@ static void Task_VsSeeker_3(u8 taskId)
{
if (ScriptMovement_IsObjectMovementFinished(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup))
{
if (sVsSeeker->responseCode == 0)
if (sVsSeeker->responseCode == VSSEEKER_RESPONSE_NO_RESPONSE)
{
DisplayItemMessageOnField(taskId, 2, gUnknown_81C1429, sub_80A1E0C);
DisplayItemMessageOnField(taskId, 2, VSSeeker_Text_TrainersNotReady, sub_80A1E0C);
}
else
{
if (sVsSeeker->responseCode == 2)
if (sVsSeeker->responseCode == VSSEEKER_RESPONSE_FOUND_REMATCHES)
StartAllRespondantIdleMovements();
ClearDialogWindowAndFrame(0, 1);
sub_80696C0();
@ -831,20 +838,20 @@ static void Task_VsSeeker_3(u8 taskId)
}
}
u8 CanUseVsSeeker(void)
static u8 CanUseVsSeeker(void)
{
u8 vsSeekerChargeSteps = gSaveBlock1Ptr->trainerRematchStepCounter;
if (vsSeekerChargeSteps == 100)
{
if (GetRematchableTrainerLocalId() == 0xFF)
return 1;
return VSSEEKER_NO_ONE_IN_RANGE;
else
return 2;
return VSSEEKER_CAN_USE;
}
else
{
TV_PrintIntToStringVar(0, 100 - vsSeekerChargeSteps);
return 0;
return VSSEEKER_NOT_CHARGED;
}
}
@ -928,11 +935,11 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
PlaySE(SE_PIN);
FlagSet(FLAG_SYS_VS_SEEKER_CHARGING);
sub_810C640();
return 2;
return VSSEEKER_RESPONSE_FOUND_REMATCHES;
}
if (sVsSeeker->trainerHasNotYetBeenFought)
return 1;
return 0;
return VSSEEKER_RESPONSE_UNFOUGHT_TRAINERS;
return VSSEEKER_RESPONSE_NO_RESPONSE;
}
void sub_810CB90(void)