Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-10-06 09:07:24 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav

Browse Source
This commit is contained in:
ghoulslash
2021-06-11 12:22:15 -06:00
parent ccb17e9a22 e308dc8236
commit 0c14ec4b78
83 changed files with 1062 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/scripts/contest_hall.inc
View File

@@ -916,7 +916,7 @@ ContestHall_EventScript_ContestResults:: @ 827A8A5
setvar VAR_TEMP_9, 1
showcontestresults
setvar VAR_TEMP_9, 0
playbgm MUS_CONTEST_WINNER, 0
playbgm MUS_CONTEST_WINNER, FALSE
return
ContestHall_EventScript_ThatsItForJudging:: @ 827A8FB

4
data/scripts/players_house.inc
View File

@@ -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_ENCOUNTER_INTERVIEWER, 0
playbgm MUS_ENCOUNTER_INTERVIEWER, FALSE
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_ENCOUNTER_INTERVIEWER, 0
playbgm MUS_ENCOUNTER_INTERVIEWER, FALSE
msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale