dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-blender

Browse Source
This commit is contained in:
GriffinR
2020-08-28 16:16:00 -04:00
committed by GitHub
parent e9b734c1ef 09cfed64b5
commit c830731734
1178 changed files with 10482 additions and 10477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/scripts/berry_tree.inc
View File

@@ -122,7 +122,7 @@ BerryTree_EventScript_PickBerry:: @ 8274448
special IncrementDailyPickedBerries
special ObjectEventInteractionRemoveBerryTree
message BerryTree_Text_PickedTheBerry
playfanfare MUS_ME_KINOMI
playfanfare MUS_OBTAIN_BERRY
waitmessage
waitfanfare
waitbuttonpress

22
data/scripts/cable_club.inc
View File

@@ -132,7 +132,7 @@ CableClub_EventScript_ExitLinkRoom:: @ 8276C85
call CableClub_EventScript_CloseLinkAndExitLinkRoom
call CableClub_EventScript_CloseDirectCornerBarrier
special DrawWholeMapView
playse SE_TK_KASYA
playse SE_CLICK
erasebox 0, 0, 29, 19
releaseall
end
@@ -142,7 +142,7 @@ CableClub_EventScript_ExitMinigameRoom:: @ 8276C9D
call CableClub_EventScript_CloseLinkAndExitLinkRoom
call EventScript_CloseMossdeepGameCornerBarrier
special DrawWholeMapView
playse SE_TK_KASYA
playse SE_CLICK
erasebox 0, 0, 29, 19
releaseall
end
@@ -165,7 +165,7 @@ CableClub_EventScript_ExitTradeCenter:: @ 8276CE7
call CableClub_EventScript_PlayerExitTradeCenter
call CableClub_EventScript_CloseDirectCornerBarrier
special DrawWholeMapView
playse SE_TK_KASYA
playse SE_CLICK
erasebox 0, 0, 29, 19
releaseall
end
@@ -187,7 +187,7 @@ CableClub_EventScript_ExitRecordCorner:: @ 8276D2C
call CableClub_EventScript_PlayerExitRecordCorner
call CableClub_EventScript_CloseDirectCornerBarrier
special DrawWholeMapView
playse SE_TK_KASYA
playse SE_CLICK
erasebox 0, 0, 29, 19
releaseall
end
@@ -209,7 +209,7 @@ CableClub_EventScript_ExitUnionRoom:: @ 8276D6C
call CableClub_EventScript_PlayerExitUnionRoom
call CableClub_EventScript_CloseUnionRoomBarrier
special DrawWholeMapView
playse SE_TK_KASYA
playse SE_CLICK
erasebox 0, 0, 29, 19
releaseall
end
@@ -372,7 +372,7 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD
waitmessage
call CableClub_EventScript_OpenDirectCornerBarrier
special DrawWholeMapView
playse SE_TK_KASYA
playse SE_CLICK
delay 60
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
@@ -477,7 +477,7 @@ CableClub_EventScript_EnterTradeCenter:: @ 827713A
waitmessage
call CableClub_EventScript_OpenDirectCornerBarrier
special DrawWholeMapView
playse SE_TK_KASYA
playse SE_CLICK
delay 60
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
@@ -552,7 +552,7 @@ CableClub_EventScript_EnterRecordCorner:: @ 827724C
waitmessage
call CableClub_EventScript_OpenDirectCornerBarrier
special DrawWholeMapView
playse SE_TK_KASYA
playse SE_CLICK
delay 60
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
@@ -955,7 +955,7 @@ CableClub_EventScript_EnterUnionRoom:: @ 827759F
copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004
call CableClub_EventScript_OpenUnionRoomBarrier
special DrawWholeMapView
playse SE_TK_KASYA
playse SE_CLICK
delay 60
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
@@ -1285,7 +1285,7 @@ CableClub_EventScript_EnterWirelessLinkRoom:: @ 8277B3A
copyvar VAR_0x8007, VAR_LAST_TALKED
call CableClub_EventScript_OpenDirectCornerBarrier
special DrawWholeMapView
playse SE_TK_KASYA
playse SE_CLICK
delay 60
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
@@ -1481,7 +1481,7 @@ MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom:: @ 8277E0E
copyvar VAR_0x8007, VAR_LAST_TALKED
call EventScript_OpenMossdeepGameCornerBarrier
special DrawWholeMapView
playse SE_TK_KASYA
playse SE_CLICK
delay 60
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0

4
data/scripts/cave_hole.inc
View File

@@ -11,7 +11,7 @@ EventScript_FallDownHole:: @ 82A8337
delay 20
applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible
waitmovement 0
playse SE_RU_HYUU
playse SE_FALL
delay 60
warphole MAP_UNDEFINED
waitstate
@@ -22,7 +22,7 @@ EventScript_FallDownHoleMtPyre:: @ 82A8350
delay 20
applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible
waitmovement 0
playse SE_RU_HYUU
playse SE_FALL
delay 60
special DoFallWarp
waitstate

16
data/scripts/contest_hall.inc
View File

@@ -401,13 +401,13 @@ ContestHall_EventScript_ShowContestMonPic:: @ 827A1D2
call ContestHall_EventScript_TryWaitForLink
call ContestHall_EventScript_CheckIfContestWithRSPlayer
addobject LOCALID_POKEBALL
playse SE_DANSA
playse SE_LEDGE
lockall
applymovement VAR_0x800B, ContestHall_Movement_ContestantDelay32
waitmovement 0
releaseall
addvar VAR_0x8006, -1
playse SE_BOWA2
playse SE_BALL_OPEN
special ShowContestEntryMonPic
call ContestHall_EventScript_EntryXTrainersMon
return
@@ -427,7 +427,7 @@ ContestHall_EventScript_EntryXTrainersMonLink:: @ 827A229
ContestHall_EventScript_AudienceVote:: @ 827A230
call ContestHall_EventScript_AudienceWillVote
call ContestHall_EventScript_VotingUnderWay
playse SE_W227B
playse SE_M_ENCORE2
waitmessage
call ContestHall_EventScript_AudienceLookAround
applymovement LOCALID_MC, ContestHall_Movement_MCFaceJudge2
@@ -481,7 +481,7 @@ ContestHall_EventScript_AudienceReactToContestant:: @ 827A2D5
call ContestHall_EventScript_TryWaitForLink
applymovement LOCALID_MC, ContestHall_Movement_AudienceMemberLookLeft
waitmovement 0
playse SE_W227B
playse SE_M_ENCORE2
call ContestHall_EventScript_VObjectAudienceLookAround
applymovement LOCALID_AUDIENCE_5, ContestHall_Movement_AudienceMemberLookRight
applymovement LOCALID_AUDIENCE_2, ContestHall_Movement_AudienceMemberLookDown
@@ -916,7 +916,7 @@ ContestHall_EventScript_ContestResults:: @ 827A8A5
setvar VAR_TEMP_9, 1
showcontestresults
setvar VAR_TEMP_9, 0
playbgm MUS_CON_FAN, 0
playbgm MUS_CONTEST_WINNER, 0
return
ContestHall_EventScript_ThatsItForJudging:: @ 827A8FB
@@ -1005,7 +1005,7 @@ ContestHall_EventScript_CongratulateWinner:: @ 827A9D4
call ContestHall_EventScript_CongratsWinner
applymovement VAR_TEMP_3, ContestHall_Movement_WinningPlayerWalkUp
waitmovement 0
playse SE_W227B
playse SE_M_ENCORE2
setvar VAR_TEMP_1, 0
return
@@ -1117,7 +1117,7 @@ ContestHall_EventScript_GiveWinnerPrize:: @ 827AB36
releaseall
call ContestHall_EventScript_WinnerApproachForPrize
call ContestHall_EventScript_GivePrizeIfWinner
playse SE_W227B
playse SE_M_ENCORE2
setvar VAR_TEMP_1, 0
call ContestHall_EventScript_AudienceLookAround
delay 30
@@ -1266,7 +1266,7 @@ ContestHall_EventScript_ReceiveContestRibbon:: @ 827ACDF
setflag FLAG_SYS_RIBBON_GET
lockall
msgbox ContestHall_Text_ConferRibbonAsPrize, MSGBOX_DEFAULT
playfanfare MUS_FANFA4
playfanfare MUS_OBTAIN_ITEM
msgbox ContestHall_Text_ReceivedRibbon, MSGBOX_DEFAULT
waitfanfare
special BufferContestWinnerMonName

4
data/scripts/day_care.inc
View File

@@ -38,7 +38,7 @@ Route117_EventScript_DaycareAcceptEgg:: @ 8291C83
Route117_EventScript_DaycareReceiveEgg:: @ 8291C9D
message Route117_Text_ReceivedEgg
playfanfare MUS_FANFA1
playfanfare MUS_LEVEL_UP
waitfanfare
waitbuttonpress
msgbox Route117_Text_TakeGoodCareOfIt, MSGBOX_DEFAULT
@@ -217,7 +217,7 @@ Route117_PokemonDayCare_EventScript_RetrieveMon:: @ 8291EE2
waitmovement 0
specialvar VAR_RESULT, TakePokemonFromDaycare
special SubtractMoneyFromVar0x8005
playse SE_REGI
playse SE_SHOP
msgbox Route117_PokemonDayCare_Text_HeresYourMon, MSGBOX_DEFAULT
waitse
playmoncry VAR_RESULT, 0

2
data/scripts/elite_four.inc
View File

@@ -20,7 +20,7 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8
PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 8272475
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp6
waitmovement 0
playse SE_TRACK_DOOR
playse SE_TRUCK_DOOR
setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1

8
data/scripts/lilycove_lady.inc
View File

@@ -259,9 +259,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_SubmitQuizResponse:: @ 82A8689
end
LilycoveCity_PokemonCenter_1F_EventScript_CorrectResponse:: @ 82A86B0
playse SE_SEIKAI
playse SE_SUCCESS
delay 10
playse SE_SEIKAI
playse SE_SUCCESS
msgbox LilycoveCity_PokemonCenter_1F_Text_YouGotItRight, MSGBOX_DEFAULT
goto LilycoveCity_PokemonCenter_1F_EventScript_ReadyGivePrize
end
@@ -269,9 +269,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_CorrectResponse:: @ 82A86B0
LilycoveCity_PokemonCenter_1F_EventScript_IncorrectResponse:: @ 82A86C7
special BufferQuizCorrectAnswer
special BufferQuizPrizeName
playse SE_HAZURE
playse SE_FAILURE
delay 10
playse SE_HAZURE
playse SE_FAILURE
msgbox LilycoveCity_PokemonCenter_1F_Text_WrongTheCorrectAnswerIs, MSGBOX_DEFAULT
msgbox LilycoveCity_PokemonCenter_1F_Text_IGetToKeepPrize, MSGBOX_DEFAULT
goto LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz

2
data/scripts/mevent_pichu.inc
View File

@@ -14,7 +14,7 @@ SurfPichu_GiveIfPossible: @ 8674D4C
vmessage sText_MysteryGiftEgg
waitmessage
waitbuttonpress
playfanfare MUS_FANFA4
playfanfare MUS_OBTAIN_ITEM
waitfanfare
release
end

6
data/scripts/obtain_item.inc
View File

@@ -65,11 +65,11 @@ EventScript_NoRoomForItem:: @ 8271BA9
return
EventScript_PlayFanfareObtainedItem:: @ 8271BAF
playfanfare MUS_FANFA4
playfanfare MUS_OBTAIN_ITEM
return
EventScript_PlayFanfareObtainedTMHM:: @ 8271BB3
playfanfare MUS_ME_WAZA
playfanfare MUS_OBTAIN_TMHM
return
Std_ObtainDecoration:: @ 8271BB7
@@ -87,7 +87,7 @@ EventScript_ObtainDecorationMessage:: @ 8271BC5
return
EventScript_ObtainedDecor:: @ 8271BE0
playfanfare MUS_FANFA4
playfanfare MUS_OBTAIN_ITEM
message gText_ObtainedTheDecor
waitfanfare
msgbox gText_TheDecorWasTransferredToThePC, MSGBOX_DEFAULT

8
data/scripts/players_house.inc
View File

@@ -73,7 +73,7 @@ PlayersHouse_2F_EventScript_WallClock:: @ 8292799
call_if_eq PlayersHouse_2F_EventScript_MomComesUpstairsMale
compare VAR_RESULT, FEMALE
call_if_eq PlayersHouse_2F_EventScript_MomComesUpstairsFemale
playse SE_KAIDAN
playse SE_EXIT
removeobject VAR_0x8008
releaseall
end
@@ -159,7 +159,7 @@ PlayersHouse_1F_EventScript_PetalburgGymReportMale:: @ 829286D
call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymMale
waitmovement 0
playbgm MUS_INTER_V, 0
playbgm MUS_ENCOUNTER_INTERVIEWER, 0
msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale
@@ -184,7 +184,7 @@ PlayersHouse_1F_EventScript_PetalburgGymReportFemale:: @ 82928DC
call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale
waitmovement 0
playbgm MUS_INTER_V, 0
playbgm MUS_ENCOUNTER_INTERVIEWER, 0
msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale
@@ -334,7 +334,7 @@ PlayersHouse_1F_EventScript_TryRegisterMom:: @ 8292A19
msgbox PlayersHouse_1F_Text_IsThatAPokenav, MSGBOX_DEFAULT
closemessage
delay 30
playfanfare MUS_ME_TORE_EYE
playfanfare MUS_REGISTER_MATCH_CALL
msgbox PlayersHouse_1F_Text_RegisteredMom, MSGBOX_DEFAULT
waitfanfare
closemessage

4
data/scripts/safari_zone.inc
View File

@@ -24,7 +24,7 @@ SafariZone_EventScript_Retire:: @ 82A4B85
SafariZone_EventScript_TimesUp:: @ 82A4B8A
lockall
playse SE_PINPON
playse SE_DING_DONG
message SafariZone_Text_TimesUp
waitmessage
waitbuttonpress
@@ -33,7 +33,7 @@ SafariZone_EventScript_TimesUp:: @ 82A4B8A
SafariZone_EventScript_OutOfBalls:: @ 82A4B9B
lockall
playse SE_PINPON
playse SE_DING_DONG
message SafariZone_Text_OutOfBalls
waitmessage
waitbuttonpress

6
data/scripts/secret_base.inc
View File

@@ -144,7 +144,7 @@ SecretBase_EventScript_ShrubEnter:: @ 8275B4D
SecretBase_EventScript_InitSecretBase:: @ 8275B5B
closemessage
playse SE_KAIDAN
playse SE_EXIT
setvar VAR_INIT_SECRET_BASE, 0
setflag FLAG_DECORATION_0
special SetPlayerSecretBase
@@ -164,7 +164,7 @@ SecretBase_EventScript_FirstEntrance:: @ 8275B81
compare VAR_RESULT, YES
goto_if_eq SecretBase_EventScript_SetAsBase
closemessage
playse SE_KAIDAN
playse SE_EXIT
special ClearAndLeaveSecretBase
end
@@ -183,7 +183,7 @@ SecretBase_Movement_275BB4: @ 8275BB4
SecretBase_EventScript_Enter:: @ 8275BB7
lockall
setvar VAR_INIT_SECRET_BASE, 1
playse SE_KAIDAN
playse SE_EXIT
special IsCurSecretBaseOwnedByAnotherPlayer
compare VAR_RESULT, FALSE
goto_if_eq SecretBase_EventScript_EnterPlayersBase

2
data/scripts/std_msgbox.inc
View File

@@ -29,7 +29,7 @@ Std_MsgboxYesNo: @ 8271332
Std_MsgboxGetPoints: @ 827133C
message 0x0
playfanfare MUS_ME_POINTGET
playfanfare MUS_OBTAIN_B_POINTS
waitfanfare
waitmessage
return

2
data/scripts/trainer_script.inc
View File

@@ -3,7 +3,7 @@ Std_RegisteredInMatchCall:: @ 82742C9
buffertrainername 1, VAR_0x8000
closemessage
delay 30
playfanfare MUS_ME_TORE_EYE
playfanfare MUS_REGISTER_MATCH_CALL
msgbox gText_RegisteredTrainerinPokeNav, MSGBOX_DEFAULT
waitfanfare
closemessage