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

Sync event.inc and scrcmd.c

Browse Source
This commit is contained in:
GriffinR
2022-08-09 12:57:49 -04:00
parent d6d5290099
commit acb480f1c1
78 changed files with 1364 additions and 1148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/scripts/cable_club.inc
+7 -7
View File
@@ -16,7 +16,7 @@ EventScript_HideMysteryGiftMan::
CableClub_EventScript_MysteryGiftMan::
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_CutRecording
execram
trywondercardscript
@ Unused
EventScript_MysteryGiftThankYou::
@@ -323,7 +323,7 @@ CableClub_EventScript_EnterColosseum::
waitdooranim
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
hideobject OBJ_EVENT_ID_PLAYER, 0
hideobjectat OBJ_EVENT_ID_PLAYER, 0
closedoor 9, 1
waitdooranim
release
@@ -432,7 +432,7 @@ CableClub_EventScript_EnterTradeCenter::
waitdooranim
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
hideobject OBJ_EVENT_ID_PLAYER, 0
hideobjectat OBJ_EVENT_ID_PLAYER, 0
closedoor 9, 1
waitdooranim
release
@@ -831,12 +831,12 @@ CableClub_EventScript_EnterUnionRoom::
waitdooranim
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
hideobject OBJ_EVENT_ID_PLAYER, 0
hideobjectat OBJ_EVENT_ID_PLAYER, 0
closedoor 5, 1
waitdooranim
special Script_ResetUnionRoomTrade
special SetCableClubWarp
warpteleport2 MAP_UNION_ROOM, 255, 7, 11
warpspinenter MAP_UNION_ROOM, 255, 7, 11
waitstate
special UnionRoomSpecial
waitstate
@@ -1137,7 +1137,7 @@ CableClub_EventScript_EnterWirelessLinkRoom::
waitdooranim
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
hideobject OBJ_EVENT_ID_PLAYER, 0
hideobjectat OBJ_EVENT_ID_PLAYER, 0
closedoor 9, 1
waitdooranim
release
@@ -1331,7 +1331,7 @@ CableClub_EventScript_EnterMinigame::
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterMinigameRoom
waitmovement 0
hideobject OBJ_EVENT_ID_PLAYER, 0
hideobjectat OBJ_EVENT_ID_PLAYER, 0
release
waitstate
end
data/scripts/day_care.inc
+4 -4
View File
@@ -19,7 +19,7 @@ Route5_PokemonDayCare_EventScript_TryGiveMon::
goto_if_eq Route5_PokemonDayCare_EventScript_OnlyOneMonInParty
msgbox Route5_PokemonDayCare_Text_WhichMonShouldIRaise
fadescreen FADE_TO_BLACK
hidemoneybox 0, 0
hidemoneybox
special ChooseSendDaycareMon
waitstate
showmoneybox 0, 0, 0
@@ -91,11 +91,11 @@ Route5_PokemonDayCare_EventScript_RetrieveMon::
setvar VAR_0x8004, 0
specialvar VAR_RESULT, TakePokemonFromRoute5Daycare
special SubtractMoneyFromVar0x8005
updatemoneybox 0, 0, 0
updatemoneybox
copyvar VAR_0x8008, VAR_RESULT
getpartysize
subvar VAR_RESULT, 1
getpartymonname 0, VAR_RESULT
bufferpartymonnick STR_VAR_1, VAR_RESULT
copyvar VAR_RESULT, VAR_0x8008
msgbox Route5_PokemonDayCare_Text_ThankYouHeresMon
textcolor 3
@@ -113,7 +113,7 @@ Route5_PokemonDayCare_EventScript_NoRoomInParty::
end
Route5_PokemonDayCare_EventScript_CloseMoneyBox::
hidemoneybox 0, 0
hidemoneybox
release
end
data/scripts/field_moves.inc
+15 -15
View File
@@ -5,9 +5,9 @@ EventScript_CutTree::
checkpartymove MOVE_CUT
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantCutTree
setfieldeffectarg 0, VAR_RESULT
getpartymonname 0, VAR_RESULT
getmovename 1, MOVE_CUT
setfieldeffectargument 0, VAR_RESULT
bufferpartymonnick STR_VAR_1, VAR_RESULT
buffermovename STR_VAR_2, MOVE_CUT
msgbox Text_CutTreeDown, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_DontCutTree
@@ -65,9 +65,9 @@ EventScript_RockSmash::
checkpartymove MOVE_ROCK_SMASH
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantSmashRock
setfieldeffectarg 0, VAR_RESULT
getpartymonname 0, VAR_RESULT
getmovename 1, MOVE_ROCK_SMASH
setfieldeffectargument 0, VAR_RESULT
bufferpartymonnick STR_VAR_1, VAR_RESULT
buffermovename STR_VAR_2, MOVE_ROCK_SMASH
msgbox Text_UseRockSmash, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_DontSmashRock
@@ -129,7 +129,7 @@ EventScript_StrengthBoulder::
checkpartymove MOVE_STRENGTH
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantMoveBoulder
setfieldeffectarg 0, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
msgbox Text_UseStrength, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_DontUseStrength
@@ -188,8 +188,8 @@ EventScript_Waterfall::
checkpartymove MOVE_WATERFALL
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_WaterCrashingDown
getpartymonname 0, VAR_RESULT
setfieldeffectarg 0, VAR_RESULT
bufferpartymonnick STR_VAR_1, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
msgbox Text_UseWaterfall, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_EndWaterfall
@@ -222,9 +222,9 @@ EventScript_DeepWater::
checkpartymove MOVE_DIVE
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_MayGoUnderwater
getpartymonname 0, VAR_RESULT
setfieldeffectarg 0, VAR_RESULT
setfieldeffectarg 1, 1
bufferpartymonnick STR_VAR_1, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
setfieldeffectargument 1, 1
msgbox Text_SeaIsDeepUseDive, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_EndDive
@@ -245,9 +245,9 @@ EventScript_TrySurface::
checkpartymove MOVE_DIVE
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_CantSurface
getpartymonname 0, VAR_RESULT
setfieldeffectarg 0, VAR_RESULT
setfieldeffectarg 1, 1
bufferpartymonnick STR_VAR_1, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
setfieldeffectargument 1, 1
msgbox Text_LightFilteringUseDive, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_EndSurface
data/scripts/flash.inc
+1 -1
View File
@@ -1,4 +1,4 @@
EventScript_FldEffFlash::
animateflash 0
setflashradius 0
setflashlevel 0
end
data/scripts/move_tutors.inc
+1 -1
View File
@@ -455,7 +455,7 @@ TwoIsland_CapeBrink_House_EventScript_StarterTutor::
faceplayer
goto_if_set FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK, CapeBrinkTutor_EventScript_TaughtAllMoves
goto_if_set FLAG_TEMP_2, CapeBrinkTutor_EventScript_MoveJustTaught
getfirstpartymonname 0
bufferleadmonspeciesname STR_VAR_1
msgbox Text_UltimateMoveThatMon
specialvar VAR_RESULT, CapeBrinkGetMoveToTeachLeadPokemon
compare VAR_RESULT, FALSE
data/scripts/obtain_item.inc
+17 -17
View File
@@ -17,7 +17,7 @@ Std_ObtainItem::
return
EventScript_ObtainItemMessage::
bufferitemnameplural 1, VAR_0x8000, VAR_0x8001
bufferitemnameplural STR_VAR_2, VAR_0x8000, VAR_0x8001
checkitemtype VAR_0x8000
call EventScript_BufferPocketNameTryFanfare
compare VAR_0x8007, TRUE
@@ -36,31 +36,31 @@ EventScript_BufferPocketNameTryFanfare::
end
EventScript_BufferItemsPocket::
getstdstring 2, STDSTRING_ITEMS_POCKET
bufferstdstring STR_VAR_3, STDSTRING_ITEMS_POCKET
compare VAR_0x8007, TRUE
call_if_eq EventScript_PlayFanfareObtainedItem
return
EventScript_BufferKeyItemsPocket::
getstdstring 2, STDSTRING_KEY_ITEMS_POCKET
bufferstdstring STR_VAR_3, STDSTRING_KEY_ITEMS_POCKET
compare VAR_0x8007, TRUE
call_if_eq EventScript_PlayFanfareObtainedItem
return
EventScript_BufferPokeBallsPocket::
getstdstring 2, STDSTRING_POKEBALLS_POCKET
bufferstdstring STR_VAR_3, STDSTRING_POKEBALLS_POCKET
compare VAR_0x8007, TRUE
call_if_eq EventScript_PlayFanfareObtainedItem
return
EventScript_BufferTMCase::
getstdstring 2, STDSTRING_TM_CASE
bufferstdstring STR_VAR_3, STDSTRING_TM_CASE
compare VAR_0x8007, TRUE
call_if_eq EventScript_PlayFanfareObtainedTMHM
return
EventScript_BufferBerryPouch::
getstdstring 2, STDSTRING_BERRY_POUCH
bufferstdstring STR_VAR_3, STDSTRING_BERRY_POUCH
compare VAR_0x8007, TRUE
call_if_eq EventScript_PlayFanfareObtainedItem
return
@@ -86,13 +86,13 @@ EventScript_PlayFanfareObtainedTMHM::
return
Std_ObtainDecoration::
adddecor VAR_0x8000
adddecoration VAR_0x8000
copyvar VAR_0x8007, VAR_RESULT
call EventScript_ObtainDecorMessage
return
EventScript_ObtainDecorMessage::
getdecorname 1, VAR_0x8000
bufferdecorationname STR_VAR_2, VAR_0x8000
compare VAR_0x8007, TRUE
call_if_eq EventScript_ObtainedDecor
compare VAR_0x8007, FALSE
@@ -120,7 +120,7 @@ Std_FindItem::
copyvar VAR_0x8005, VAR_0x8001
checkitemspace VAR_0x8000, VAR_0x8001
copyvar VAR_0x8007, VAR_RESULT
getitemname 1, VAR_0x8000
bufferitemname STR_VAR_2, VAR_0x8000
checkitemtype VAR_0x8000
call EventScript_BufferPocketNameTryFanfare
compare VAR_0x8007, TRUE
@@ -174,7 +174,7 @@ EventScript_HiddenItemScript::
EventScript_TryPickUpHiddenItem::
additem VAR_0x8005, VAR_0x8006
copyvar VAR_0x8007, VAR_RESULT
getitemname 1, VAR_0x8005
bufferitemname STR_VAR_2, VAR_0x8005
checkitemtype VAR_0x8005
call EventScript_BufferPocketNameTryFanfare
return
@@ -196,12 +196,12 @@ EventScript_FoundSingleItem::
return
EventScript_FoundCoins::
getnumberstring 0, VAR_0x8006
buffernumberstring STR_VAR_1, VAR_0x8006
message Text_FoundXCoins
return
EventScript_FoundMultipleItems::
getnumberstring 0, VAR_0x8006
buffernumberstring STR_VAR_1, VAR_0x8006
message Text_FoundXItems
return
@@ -219,7 +219,7 @@ EventScript_TryPickUpHiddenCoins::
compare VAR_RESULT, FALSE
goto_if_eq EventScript_HiddenCoinsButCaseIsFull
addcoins VAR_0x8006
getstdstring 1, STDSTRING_COINS
bufferstdstring STR_VAR_2, STDSTRING_COINS
call EventScript_PlayFanfareObtainedItem
call EventScript_FoundCoins
waitfanfare
@@ -230,8 +230,8 @@ EventScript_TryPickUpHiddenCoins::
end
EventScript_HiddenCoinsButCaseIsFull::
getnumberstring 0, VAR_0x8006
getstdstring 1, STDSTRING_COINS
buffernumberstring STR_VAR_1, VAR_0x8006
bufferstdstring STR_VAR_2, STDSTRING_COINS
msgbox Text_FoundXCoins
msgbox Text_CoinCaseIsFull
setvar VAR_RESULT, 0
@@ -239,8 +239,8 @@ EventScript_HiddenCoinsButCaseIsFull::
end
EventScript_NoCaseForHiddenCoins::
getnumberstring 0, VAR_0x8006
getstdstring 1, STDSTRING_COINS
buffernumberstring STR_VAR_1, VAR_0x8006
bufferstdstring STR_VAR_2, STDSTRING_COINS
msgbox Text_FoundXCoins
msgbox Text_NothingToPutThemIn
setvar VAR_RESULT, 0
data/scripts/pc_transfer.inc
+4 -4
View File
@@ -13,8 +13,8 @@ EventScript_NameReceivedBoxMon::
return
EventScript_TransferredToPC::
bufferboxname 0, VAR_PC_BOX_TO_SEND_MON
getspeciesname 1, VAR_TEMP_1
bufferboxname STR_VAR_1, VAR_PC_BOX_TO_SEND_MON
bufferspeciesname STR_VAR_2, VAR_TEMP_1
call_if_unset FLAG_SYS_NOT_SOMEONES_PC, EventScript_TransferredSomeonesPC
call_if_set FLAG_SYS_NOT_SOMEONES_PC, EventScript_TransferredBillsPC
return
@@ -28,7 +28,7 @@ EventScript_TransferredSomeonesPC::
EventScript_TransferredSomeonesPCBoxFull::
specialvar VAR_RESULT, GetPCBoxToSendMon
bufferboxname 2, VAR_RESULT
bufferboxname STR_VAR_3, VAR_RESULT
msgbox Text_MonSentToBoxSomeonesBoxFull
return
@@ -41,6 +41,6 @@ EventScript_TransferredBillsPC::
EventScript_TransferredBillsPCBoxFull::
specialvar VAR_RESULT, GetPCBoxToSendMon
bufferboxname 2, VAR_RESULT
bufferboxname STR_VAR_3, VAR_RESULT
msgbox Text_MonSentToBoxBillsBoxFull
return
data/scripts/pokedex_rating.inc
+4 -4
View File
@@ -43,8 +43,8 @@ PokedexRating_EventScript_Rate::
copyvar VAR_0x8008, VAR_0x8005
copyvar VAR_0x8009, VAR_0x8006
copyvar VAR_0x800A, VAR_RESULT
getnumberstring 0, VAR_0x8008 @ Num Kanto Seen
getnumberstring 1, VAR_0x8009 @ Num Kanto Caught
buffernumberstring STR_VAR_1, VAR_0x8008 @ Num Kanto Seen
buffernumberstring STR_VAR_2, VAR_0x8009 @ Num Kanto Caught
msgbox PokedexRating_Text_SeenXOwnedY
call_if_unset FLAG_OAKS_RATING_IS_VIA_PC, PokedexRating_EventScript_SetTextColor
call PokedexRating_EventScript_ShowRatingMsg
@@ -54,8 +54,8 @@ PokedexRating_EventScript_Rate::
specialvar VAR_RESULT, GetPokedexCount
copyvar VAR_0x8008, VAR_0x8005
copyvar VAR_0x8009, VAR_0x8006
getnumberstring 0, VAR_0x8008 @ Num National Seen
getnumberstring 1, VAR_0x8009 @ Num National Caught
buffernumberstring STR_VAR_1, VAR_0x8008 @ Num National Seen
buffernumberstring STR_VAR_2, VAR_0x8009 @ Num National Caught
msgbox PokedexRating_Text_NationalDexSeenXOwnedY
specialvar VAR_RESULT, HasAllMons
compare VAR_RESULT, FALSE
data/scripts/seagallop.inc
+1 -1
View File
@@ -90,7 +90,7 @@ EventScript_ChooseDestFromIslandVermilionAllowed::
EventScript_SailToDest::
specialvar VAR_RESULT, GetSeagallopNumber
getnumberstring 0, VAR_RESULT
buffernumberstring STR_VAR_1, VAR_RESULT
compare VAR_0x8004, SEAGALLOP_VERMILION_CITY
goto_if_eq EventScript_DepartingVermilion
compare VAR_0x8004, SEAGALLOP_VERMILION_CITY
data/scripts/static_pokemon.inc
+1 -1
View File
@@ -9,7 +9,7 @@ EventScript_MonFlewAway::
fadescreen FADE_TO_BLACK
removeobject VAR_LAST_TALKED
fadescreen FADE_FROM_BLACK
getspeciesname 0, VAR_0x8004
bufferspeciesname STR_VAR_1, VAR_0x8004
msgbox Text_MonFlewAway
release
end
data/scripts/surf.inc
+2 -2
View File
@@ -3,8 +3,8 @@ EventScript_UseSurf::
checkpartymove MOVE_SURF
compare VAR_RESULT, PARTY_SIZE
goto_if_eq EventScript_UseSurfEnd
getpartymonname 0, VAR_RESULT
setfieldeffectarg 0, VAR_RESULT
bufferpartymonnick STR_VAR_1, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
lockall
msgbox Text_WantToSurf, MSGBOX_YESNO
compare VAR_RESULT, NO
data/scripts/trainer_battle.inc
+8 -8
View File
@@ -18,7 +18,7 @@ EventScript_TryDoNormalTrainerBattle::
goto EventScript_DoTrainerBattle
EventScript_NoTrainerBattle::
ontrainerbattleend
gotopostbattlescript
EventScript_TryDoDoubleTrainerBattle::
lock
@@ -42,15 +42,15 @@ EventScript_NotEnoughMonsForDoubleBattle::
end
EventScript_NoDoubleTrainerBattle::
ontrainerbattleend
gotopostbattlescript
EventScript_DoNoIntroTrainerBattle::
applymovement VAR_LAST_TALKED, Movement_RevealTrainer
waitmovement 0
special PlayTrainerEncounterMusic
goto_if_questlog EventScript_EndQuestLogBattle
battlebegin
ontrainerbattleend
dotrainerbattle
gotopostbattlescript
EventScript_TryDoRematchBattle::
call EventScript_RevealTrainer
@@ -69,7 +69,7 @@ EventScript_TryDoRematchBattle::
end
EventScript_NoRematchBattle::
ontrainerbattleend
gotopostbattlescript
EventScript_TryDoDoubleRematchBattle::
specialvar VAR_RESULT, IsTrainerReadyForRematch
@@ -90,7 +90,7 @@ EventScript_TryDoDoubleRematchBattle::
end
EventScript_NoDoubleRematchBattle::
ontrainerbattleend
gotopostbattlescript
EventScript_NotEnoughMonsForDoubleRematchBattle::
special ShowTrainerCantBattleSpeech
@@ -117,7 +117,7 @@ EventScript_DoTrainerBattle::
waitmessage
waitbuttonpress
goto_if_questlog EventScript_EndQuestLogBattle
battlebegin
dotrainerbattle
specialvar VAR_RESULT, GetTrainerBattleMode
compare VAR_RESULT, TRAINER_BATTLE_SINGLE
goto_if_eq EventScript_EndTrainerBattle
@@ -134,7 +134,7 @@ EventScript_EndTrainerBattle::
end
EventScript_EndTrainerBattleContinueScript::
ontrainerbattleendgoto
gotobeatenscript
EventScript_EndQuestLogBattle::
special SetBattledTrainerFlag
data/scripts/trainer_card.inc
+4 -4
View File
@@ -11,7 +11,7 @@ CeladonCity_GameCorner_EventScript_PhotoPrinter::
goto_if_eq CeladonCity_GameCorner_EventScript_NotEnoughMoneyForPhoto
playse SE_SHOP
removemoney 50, 0
updatemoneybox 0, 0, 0
updatemoneybox
waitse
message CeladonCity_GameCorner_Text_ChoosePrintType
waitmessage
@@ -51,18 +51,18 @@ CeladonCity_GameCorner_EventScript_PrintPhoto::
delay 60
special UpdateTrainerCardPhotoIcons
msgbox CeladonCity_GameCorner_Text_PrintIsReadyCheckTrainerCard
hidemoneybox 0, 0
hidemoneybox
releaseall
end
CeladonCity_GameCorner_EventScript_DeclinePhoto::
hidemoneybox 0, 0
hidemoneybox
releaseall
end
CeladonCity_GameCorner_EventScript_NotEnoughMoneyForPhoto::
msgbox CeladonCity_GameCorner_Text_DontHaveEnoughMoney
hidemoneybox 0, 0
hidemoneybox
releaseall
end
data/scripts/trainer_tower.inc
+1 -1
View File
@@ -297,7 +297,7 @@ TrainerTower_Roof_EventScript_ReceivePrize:
message Text_ObtainedTheX
waitfanfare
waitmessage
getstdstring 2, STDSTRING_ITEMS_POCKET
bufferstdstring STR_VAR_3, STDSTRING_ITEMS_POCKET
msgbox Text_PutItemAway
call EventScript_RestorePrevTextColor
goto TrainerTower_Roof_EventScript_CheckFinalTime