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

Generate local IDs from map.json files

Browse Source
This commit is contained in:
GriffinR
2024-10-11 21:30:52 -04:00
parent 6518f1e3ff
commit 9f31b0fe90
146 changed files with 878 additions and 833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/scripts/apprentice.inc
View File

@@ -1,5 +1,3 @@
.set LOCALID_APPRENTICE, 6
BattleFrontier_BattleTowerLobby_EventScript_Apprentice::
lock
faceplayer

20
data/scripts/berry_blender.inc
View File

@@ -1,11 +1,3 @@
@ Note: local IDs shared with scripts.inc for LilycoveCity_ContestLobby
.set LOCALID_MAN, 3
.set LOCALID_BOY, 9
.set LOCALID_TWIN, 10
.set LOCALID_POKEFAN_F, 15
.set LOCALID_EXPERT_M, 16
.set LOCALID_GIRL, 17
.set NUM_OPPONENTS, VAR_0x8009
BerryBlender_Text_WantToMakePokeblocks:
@@ -246,7 +238,7 @@ BerryBlender_EventScript_BerryBlender1::
lockall
goto_if_unset FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER, BerryBlender_EventScript_BlendMasterPresent
setvar NUM_OPPONENTS, 1
applymovement LOCALID_EXPERT_M, BerryBlender_Movement_BlendLeaderWalkInPlace
applymovement LOCALID_BLEND_MASTER, BerryBlender_Movement_BlendLeaderWalkInPlace
waitmovement 0
msgbox BerryBlender_Text_WantToMakePokeblocks, MSGBOX_YESNO
goto_if_eq VAR_RESULT, YES, BerryBlender_EventScript_TryUseBerryBlender1
@@ -325,8 +317,8 @@ BerryBlender_EventScript_Blender1NoCase:
BerryBlender_EventScript_BerryBlender2::
lockall
setvar NUM_OPPONENTS, 2
applymovement LOCALID_TWIN, Common_Movement_FaceOriginalDirection
applymovement LOCALID_MAN, BerryBlender_Movement_BlendLeaderWalkInPlace
applymovement LOCALID_CONTEST_LOBBY_BLENDER_2_PARTICIPANT, Common_Movement_FaceOriginalDirection
applymovement LOCALID_CONTEST_LOBBY_BLENDER_2_LEADER, BerryBlender_Movement_BlendLeaderWalkInPlace
waitmovement 0
msgbox BerryBlender_Text_WantToBlendPokeblocksWithUs, MSGBOX_YESNO
goto_if_eq VAR_RESULT, YES, BerryBlender_EventScript_TryUseBerryBlender2
@@ -382,10 +374,10 @@ BerryBlender_EventScript_Blender2NoCase:
BerryBlender_EventScript_BerryBlender3::
lockall
setvar VAR_0x8008, LOCALID_POKEFAN_F
setvar VAR_0x8008, LOCALID_CONTEST_LOBBY_BLENDER_3_LEADER
setvar NUM_OPPONENTS, 3
applymovement LOCALID_BOY, Common_Movement_FaceOriginalDirection
applymovement LOCALID_GIRL, Common_Movement_FaceOriginalDirection
applymovement LOCALID_CONTEST_LOBBY_BLENDER_3_PARTICIPANT_1, Common_Movement_FaceOriginalDirection
applymovement LOCALID_CONTEST_LOBBY_BLENDER_3_PARTICIPANT_2, Common_Movement_FaceOriginalDirection
applymovement VAR_0x8008, BerryBlender_Movement_BlendLeaderWalkInPlace
waitmovement 0
msgbox BerryBlender_Text_LookGoodAtBlendingJoinUs, MSGBOX_YESNO

100
data/scripts/contest_hall.inc
View File

@@ -1,19 +1,3 @@
.set LOCALID_MC, 1
.set LOCALID_JUDGE, 2
.set LOCALID_CONTESTANT_1, 3
.set LOCALID_CONTESTANT_2, 4
.set LOCALID_CONTESTANT_3, 5
.set LOCALID_AUDIENCE_1, 6
.set LOCALID_AUDIENCE_3, 7
.set LOCALID_AUDIENCE_4, 8
.set LOCALID_AUDIENCE_5, 9
.set LOCALID_AUDIENCE_6, 10
.set LOCALID_AUDIENCE_7, 11
.set LOCALID_AUDIENCE_2, 12
.set LOCALID_POKEBALL, 13
.set LOCALID_CONTESTANT_4, 14
.set LOCALID_ARTIST, 15
@ Either ends or returns to EventScript_ContestReceptionist after submitting a contest entry
LilycoveCity_ContestLobby_EventScript_SpeakToContestReceptionist::
lock
@@ -203,7 +187,7 @@ ContestHall_EventScript_DoContest::
lockall
applymovement LOCALID_CONTESTANT_4, ContestHall_Movement_Player4FaceUp
waitmovement 0
applymovement LOCALID_MC, ContestHall_Movement_MCWalkDown
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_MCWalkDown
waitmovement 0
releaseall
call ContestHall_EventScript_TryWaitForLink
@@ -279,7 +263,7 @@ ContestHall_EventScript_ContestGettingStarted::
bufferstdstring STR_VAR_3, VAR_0x8009
call ContestHall_EventScript_GettingStarted
lockall
applymovement LOCALID_MC, ContestHall_Movement_MCBackUp
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_MCBackUp
waitmovement 0
releaseall
return
@@ -384,7 +368,7 @@ ContestHall_EventScript_ShowContestMonPic::
releaseall
call ContestHall_EventScript_TryWaitForLink
call ContestHall_EventScript_CheckIfContestWithRSPlayer
addobject LOCALID_POKEBALL
addobject LOCALID_CONTEST_POKEBALL
playse SE_LEDGE
lockall
applymovement VAR_0x800B, ContestHall_Movement_ContestantDelay32
@@ -413,13 +397,13 @@ ContestHall_EventScript_AudienceVote::
playse SE_M_ENCORE2
waitmessage
call ContestHall_EventScript_AudienceLookAround
applymovement LOCALID_MC, ContestHall_Movement_MCFaceJudge2
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_MCFaceJudge2
waitmovement 0
applymovement LOCALID_JUDGE, ContestHall_Movement_JudgeFaceMC
applymovement LOCALID_CONTEST_JUDGE, ContestHall_Movement_JudgeFaceMC
waitmovement 0
delay 20
applymovement LOCALID_MC, ContestHall_Movement_FaceContestants
applymovement LOCALID_JUDGE, ContestHall_Movement_FaceContestants
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_FaceContestants
applymovement LOCALID_CONTEST_JUDGE, ContestHall_Movement_FaceContestants
waitmovement 0
return
@@ -459,25 +443,25 @@ ContestHall_EventScript_VotingUnderWayLink::
ContestHall_EventScript_AudienceReactToContestant::
call ContestHall_EventScript_TryWaitForLink
applymovement LOCALID_MC, ContestHall_Movement_AudienceMemberLookLeft
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_AudienceMemberLookLeft
waitmovement 0
playse SE_M_ENCORE2
call ContestHall_EventScript_VObjectAudienceLookAround
applymovement LOCALID_AUDIENCE_5, ContestHall_Movement_AudienceMemberLookRight
applymovement LOCALID_AUDIENCE_2, ContestHall_Movement_AudienceMemberLookDown
applymovement LOCALID_AUDIENCE_3, ContestHall_Movement_AudienceMemberLookRight
applymovement LOCALID_CONTEST_AUDIENCE_5, ContestHall_Movement_AudienceMemberLookRight
applymovement LOCALID_CONTEST_AUDIENCE_2, ContestHall_Movement_AudienceMemberLookDown
applymovement LOCALID_CONTEST_AUDIENCE_3, ContestHall_Movement_AudienceMemberLookRight
waitmovement 0
applymovement LOCALID_MC, ContestHall_Movement_AudienceMemberLookRight
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_AudienceMemberLookRight
waitmovement 0
applymovement LOCALID_AUDIENCE_6, ContestHall_Movement_AudienceMemberLookLeft
applymovement LOCALID_AUDIENCE_7, ContestHall_Movement_AudienceMemberLookDown
applymovement LOCALID_AUDIENCE_1, ContestHall_Movement_AudienceMemberLookUp
applymovement LOCALID_AUDIENCE_4, ContestHall_Movement_AudienceMemberLookLeft
applymovement LOCALID_CONTEST_AUDIENCE_6, ContestHall_Movement_AudienceMemberLookLeft
applymovement LOCALID_CONTEST_AUDIENCE_7, ContestHall_Movement_AudienceMemberLookDown
applymovement LOCALID_CONTEST_AUDIENCE_1, ContestHall_Movement_AudienceMemberLookUp
applymovement LOCALID_CONTEST_AUDIENCE_4, ContestHall_Movement_AudienceMemberLookLeft
waitmovement 0
applymovement LOCALID_MC, ContestHall_Movement_MCLookAtJudge
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_MCLookAtJudge
waitmovement 0
applymovement LOCALID_MC, ContestHall_Movement_MCWalkInPlaceDown
applymovement LOCALID_JUDGE, ContestHall_Movement_JudgeLookAtMC
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_MCWalkInPlaceDown
applymovement LOCALID_CONTEST_JUDGE, ContestHall_Movement_JudgeLookAtMC
waitmovement 0
releaseall
call ContestHall_EventScript_TryWaitForLink
@@ -623,7 +607,7 @@ ContestHall_EventScript_Set8Hearts::
ContestHall_EventScript_TryDisplayHeartAudienceMember1::
goto_if_eq VAR_TEMP_1, 1, ContestHall_EventScript_AudienceMember1AlreadyEmoted
applymovement LOCALID_AUDIENCE_1, ContestHall_Movement_Heart
applymovement LOCALID_CONTEST_AUDIENCE_1, ContestHall_Movement_Heart
playse SE_PIN
delay 14
setvar VAR_TEMP_1, 1
@@ -635,7 +619,7 @@ ContestHall_EventScript_AudienceMember1AlreadyEmoted::
ContestHall_EventScript_TryDisplayHeartAudienceMember2::
goto_if_eq VAR_TEMP_2, 1, ContestHall_EventScript_AudienceMember2AlreadyEmoted
applymovement LOCALID_AUDIENCE_2, ContestHall_Movement_Heart
applymovement LOCALID_CONTEST_AUDIENCE_2, ContestHall_Movement_Heart
playse SE_PIN
delay 14
setvar VAR_TEMP_2, 1
@@ -647,7 +631,7 @@ ContestHall_EventScript_AudienceMember2AlreadyEmoted::
ContestHall_EventScript_TryDisplayHeartAudienceMember3::
goto_if_eq VAR_TEMP_3, 1, ContestHall_EventScript_AudienceMember3AlreadyEmoted
applymovement LOCALID_AUDIENCE_3, ContestHall_Movement_Heart
applymovement LOCALID_CONTEST_AUDIENCE_3, ContestHall_Movement_Heart
playse SE_PIN
delay 14
setvar VAR_TEMP_3, 1
@@ -659,7 +643,7 @@ ContestHall_EventScript_AudienceMember3AlreadyEmoted::
ContestHall_EventScript_TryDisplayHeartAudienceMember4::
goto_if_eq VAR_TEMP_4, 1, ContestHall_EventScript_Audience4MemberAlreadyEmoted
applymovement LOCALID_AUDIENCE_4, ContestHall_Movement_Heart
applymovement LOCALID_CONTEST_AUDIENCE_4, ContestHall_Movement_Heart
playse SE_PIN
delay 14
setvar VAR_TEMP_4, 1
@@ -671,7 +655,7 @@ ContestHall_EventScript_Audience4MemberAlreadyEmoted::
ContestHall_EventScript_TryDisplayHeartAudienceMember5::
goto_if_eq VAR_TEMP_5, 1, ContestHall_EventScript_AudienceMember5AlreadyEmoted
applymovement LOCALID_AUDIENCE_5, ContestHall_Movement_Heart
applymovement LOCALID_CONTEST_AUDIENCE_5, ContestHall_Movement_Heart
playse SE_PIN
delay 14
setvar VAR_TEMP_5, 1
@@ -683,7 +667,7 @@ ContestHall_EventScript_AudienceMember5AlreadyEmoted::
ContestHall_EventScript_TryDisplayHeartAudienceMember6::
goto_if_eq VAR_TEMP_6, 1, ContestHall_EventScript_AudienceMember6AlreadyEmoted
applymovement LOCALID_AUDIENCE_6, ContestHall_Movement_Heart
applymovement LOCALID_CONTEST_AUDIENCE_6, ContestHall_Movement_Heart
playse SE_PIN
delay 14
setvar VAR_TEMP_6, 1
@@ -695,7 +679,7 @@ ContestHall_EventScript_AudienceMember6AlreadyEmoted::
ContestHall_EventScript_TryDisplayHeartAudienceMember7::
goto_if_eq VAR_TEMP_7, 1, ContestHall_EventScript_AudienceMember7AlreadyEmoted
applymovement LOCALID_AUDIENCE_7, ContestHall_Movement_Heart
applymovement LOCALID_CONTEST_AUDIENCE_7, ContestHall_Movement_Heart
playse SE_PIN
delay 14
setvar VAR_TEMP_7, 1
@@ -707,7 +691,7 @@ ContestHall_EventScript_AudienceMember7AlreadyEmoted::
ContestHall_EventScript_TryDisplayHeartAudienceMember8::
goto_if_eq VAR_TEMP_8, 1, ContestHall_EventScript_AudienceMember8AlreadyEmoted
applymovement LOCALID_ARTIST, ContestHall_Movement_Heart
applymovement LOCALID_CONTEST_ARTIST, ContestHall_Movement_Heart
playse SE_PIN
delay 14
setvar VAR_TEMP_8, 1
@@ -720,7 +704,7 @@ ContestHall_EventScript_AudienceMember8AlreadyEmoted::
ContestHall_EventScript_ContestantReturn::
closemessage
release
removeobject LOCALID_POKEBALL
removeobject LOCALID_CONTEST_POKEBALL
special HideContestEntryMonPic
call ContestHall_EventScript_TryWaitForLink
switch VAR_0x8006
@@ -764,13 +748,13 @@ ContestHall_EventScript_Player4WalkBack::
ContestHall_EventScript_DoContestAppeals::
lockall
applymovement LOCALID_MC, ContestHall_Movement_FaceContestants2
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_FaceContestants2
waitmovement 0
call ContestHall_EventScript_TryWaitForLink
call ContestHall_EventScript_LetsAppeal
waitmessage
applymovement LOCALID_MC, ContestHall_Movement_WalkStageLeft
applymovement LOCALID_JUDGE, ContestHall_Movement_WalkStageRight
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_WalkStageLeft
applymovement LOCALID_CONTEST_JUDGE, ContestHall_Movement_WalkStageRight
waitmovement 0
releaseall
call ContestHall_EventScript_TryWaitForLink
@@ -780,8 +764,8 @@ ContestHall_EventScript_DoContestAppeals::
special LinkContestTryShowWirelessIndicator
setvar VAR_TEMP_9, 0
lockall
applymovement LOCALID_MC, ContestHall_Movement_WalkStageRight
applymovement LOCALID_JUDGE, ContestHall_Movement_WalkStageLeft
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_WalkStageRight
applymovement LOCALID_CONTEST_JUDGE, ContestHall_Movement_WalkStageLeft
waitmovement 0
releaseall
return
@@ -817,13 +801,13 @@ ContestHall_EventScript_ContestResults::
call ContestHall_EventScript_TryWaitForLink
call ContestHall_EventScript_ThankYouForAppeals
call ContestHall_EventScript_TryWaitForLink
applymovement LOCALID_MC, ContestHall_Movement_MCFaceJudge
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_MCFaceJudge
waitmovement 0
call ContestHall_EventScript_JudgeLooksReady
call ContestHall_EventScript_TryWaitForLink
call ContestHall_EventScript_WeWillDeclareWinner
call ContestHall_EventScript_TryWaitForLink
applymovement LOCALID_MC, ContestHall_Movement_FaceContestants
applymovement LOCALID_CONTEST_MC, ContestHall_Movement_FaceContestants
waitmovement 0
closemessage
releaseall
@@ -934,14 +918,14 @@ ContestHall_EventScript_AudienceLookAround::
addvar VAR_TEMP_1, 1
lockall
call_if_gt VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_NORMAL, ContestHall_EventScript_VObjectAudienceLookAround
applymovement LOCALID_AUDIENCE_5, ContestHall_Movement_AudienceMemberLookRight
applymovement LOCALID_AUDIENCE_2, ContestHall_Movement_AudienceMemberLookDown
applymovement LOCALID_AUDIENCE_3, ContestHall_Movement_AudienceMemberLookRight
applymovement LOCALID_CONTEST_AUDIENCE_5, ContestHall_Movement_AudienceMemberLookRight
applymovement LOCALID_CONTEST_AUDIENCE_2, ContestHall_Movement_AudienceMemberLookDown
applymovement LOCALID_CONTEST_AUDIENCE_3, ContestHall_Movement_AudienceMemberLookRight
delay 30
applymovement LOCALID_AUDIENCE_6, ContestHall_Movement_AudienceMemberLookLeft
applymovement LOCALID_AUDIENCE_7, ContestHall_Movement_AudienceMemberLookDown
applymovement LOCALID_AUDIENCE_1, ContestHall_Movement_AudienceMemberLookUp
applymovement LOCALID_AUDIENCE_4, ContestHall_Movement_AudienceMemberLookLeft
applymovement LOCALID_CONTEST_AUDIENCE_6, ContestHall_Movement_AudienceMemberLookLeft
applymovement LOCALID_CONTEST_AUDIENCE_7, ContestHall_Movement_AudienceMemberLookDown
applymovement LOCALID_CONTEST_AUDIENCE_1, ContestHall_Movement_AudienceMemberLookUp
applymovement LOCALID_CONTEST_AUDIENCE_4, ContestHall_Movement_AudienceMemberLookLeft
goto_if_ne VAR_TEMP_1, 4, ContestHall_EventScript_AudienceLookAround
delay 30
return

2
data/scripts/day_care.inc
View File

@@ -1,5 +1,3 @@
.set LOCALID_DAYCARE_LADY, 1
Route117_EventScript_DaycareMan::
lock
faceplayer

39
data/scripts/gabby_and_ty.inc
View File

@@ -1,8 +1,15 @@
@ Gabby and Ty always move to the same spots for the first 5 battles
@ From the 6th battle onwards, they move randomly between locations 6-8
@ Note: The local IDs of Gabby and Ty are hard-coded in GetGabbyAndTyLocalIds
@ Gabby and Ty can appear in a fixed location on 3 different routes.
@ Each time they are battled they will disappear from the route they're on
@ and relocate to the next one, in the order Route 111 -> Route 118 -> Route 120.
@ Gabby and Ty have 6 different parties which will get cycled on each appearance.
@ After they're defeated 6 times they will stick to their 6th party but continue
@ cycling between the 3 routes. To determine which trainer party gets used GF created
@ multiple object events for Gabby and Ty on each of the 3 routes. The scripts below
@ handle hiding and showing these objects so the correct party appears on the correct route.
@ Route 111 and Route 118 have 3 object events each (parties 1,4,6 and 2,5,6 respectively)
@ and Route 120 has 2 object events each (parties 3 and 6).
GabbyAndTy_EventScript_UpdateLocation::
cleartrainerflag TRAINER_GABBY_AND_TY_6
cleartrainerflag TRAINER_GABBY_AND_TY_6 @ Clear flag for their final party to allow infinite rematches.
specialvar VAR_RESULT, GabbyAndTyGetBattleNum
switch VAR_RESULT
case 0, GabbyAndTy_EventScript_MoveForBattle1
@@ -31,13 +38,13 @@ GabbyAndTy_EventScript_MoveForBattle3::
return
GabbyAndTy_EventScript_MoveForBattle4::
call GabbyAndTy_EventScript_ShowAtRoute111_3
call GabbyAndTy_EventScript_ShowAtRoute111_2
call GabbyAndTy_EventScript_HideAtRoute120_1
return
GabbyAndTy_EventScript_MoveForBattle5::
call GabbyAndTy_EventScript_ShowAtRoute118_2
call GabbyAndTy_EventScript_HideAtRoute111_3
call GabbyAndTy_EventScript_HideAtRoute111_2
return
GabbyAndTy_EventScript_MoveForBattle6::
@@ -46,13 +53,13 @@ GabbyAndTy_EventScript_MoveForBattle6::
return
GabbyAndTy_EventScript_MoveForBattle7::
call GabbyAndTy_EventScript_ShowAtRoute111_2
call GabbyAndTy_EventScript_ShowAtRoute111_3
call GabbyAndTy_EventScript_HideAtRoute120_2
return
GabbyAndTy_EventScript_MoveForBattle8::
call GabbyAndTy_EventScript_ShowAtRoute118_3
call GabbyAndTy_EventScript_HideAtRoute111_2
call GabbyAndTy_EventScript_HideAtRoute111_3
return
GabbyAndTy_EventScript_MoveForBattle9::
@@ -84,12 +91,12 @@ GabbyAndTy_EventScript_ShowAtRoute120_1::
clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
return
GabbyAndTy_EventScript_HideAtRoute111_3::
setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
GabbyAndTy_EventScript_HideAtRoute111_2::
setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
return
GabbyAndTy_EventScript_ShowAtRoute111_3::
clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
GabbyAndTy_EventScript_ShowAtRoute111_2::
clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
return
GabbyAndTy_EventScript_HideAtRoute118_2::
@@ -108,12 +115,12 @@ GabbyAndTy_EventScript_ShowAtRoute120_2::
clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
return
GabbyAndTy_EventScript_HideAtRoute111_2::
setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
GabbyAndTy_EventScript_HideAtRoute111_3::
setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
return
GabbyAndTy_EventScript_ShowAtRoute111_2::
clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
GabbyAndTy_EventScript_ShowAtRoute111_3::
clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
return
GabbyAndTy_EventScript_HideAtRoute118_3::

7
data/scripts/lilycove_lady.inc
View File

@@ -1,6 +1,3 @@
.set LOCALID_LILYCOVE_LADY, 4
.set LOCALID_LADYS_MON, 5
LilycoveCity_PokemonCenter_1F_EventScript_LilycoveLady::
special Script_GetLilycoveLadyId
switch VAR_RESULT
@@ -390,7 +387,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_FeedPokeblock::
applymovement LOCALID_LILYCOVE_LADY, LilycoveCity_PokemonCenter_1F_Movement_LadyFaceMon
waitmovement 0
delay 60
applymovement LOCALID_LADYS_MON, LilycoveCity_PokemonCenter_1F_Movement_MonFaceLady
applymovement LOCALID_LILYCOVE_LADYS_MON, LilycoveCity_PokemonCenter_1F_Movement_MonFaceLady
waitmovement 0
delay 60
waitse
@@ -403,7 +400,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_FeedPokeblock::
@ VAR_0x8004 here is the return value from GivePokeblockToContestLady
LilycoveCity_PokemonCenter_1F_EventScript_MonEnjoyPokeblock::
applymovement LOCALID_LADYS_MON, LilycoveCity_PokemonCenter_1F_Movement_MonJump
applymovement LOCALID_LILYCOVE_LADYS_MON, LilycoveCity_PokemonCenter_1F_Movement_MonJump
waitmovement 0
delay 60
LilycoveCity_PokemonCenter_1F_EventScript_FinishFeedPokeblock::

4
data/scripts/new_game.inc
View File

@@ -161,10 +161,10 @@ EventScript_ResetAllMapFlags::
setflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER
setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER
setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER

17
data/scripts/players_house.inc
View File

@@ -1,8 +1,3 @@
@ Local IDs are the same for both players houses
.set LOCALID_MOM, 1
.set LOCALID_DAD, 5
.set LOCALID_MOM_2F, 14
PlayersHouse_2F_EventScript_BlockStairsUntilClockIsSet::
setvar VAR_LITTLEROOT_INTRO_STATE, 5
return
@@ -75,7 +70,7 @@ PlayersHouse_2F_EventScript_WallClock::
end
PlayersHouse_2F_EventScript_MomComesUpstairsMale::
setvar VAR_0x8008, LOCALID_MOM_2F
setvar VAR_0x8008, LOCALID_PLAYERS_HOUSE_2F_MOM
addobject VAR_0x8008
applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersMale
waitmovement 0
@@ -88,7 +83,7 @@ PlayersHouse_2F_EventScript_MomComesUpstairsMale::
return
PlayersHouse_2F_EventScript_MomComesUpstairsFemale::
setvar VAR_0x8008, LOCALID_MOM_2F
setvar VAR_0x8008, LOCALID_PLAYERS_HOUSE_2F_MOM
addobject VAR_0x8008
applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersFemale
waitmovement 0
@@ -492,14 +487,14 @@ PlayersHouse_1F_EventScript_AirLatiBroadcast::
PlayersHouse_1F_EventScript_SetUpObjectEventVarsMale::
setvar VAR_0x8008, MALE
setvar VAR_0x8009, LOCALID_DAD
setvar VAR_0x800A, LOCALID_MOM
setvar VAR_0x8009, LOCALID_PLAYERS_HOUSE_1F_DAD
setvar VAR_0x800A, LOCALID_PLAYERS_HOUSE_1F_MOM
return
PlayersHouse_1F_EventScript_SetUpObjectEventVarsFemale::
setvar VAR_0x8008, FEMALE
setvar VAR_0x8009, LOCALID_DAD
setvar VAR_0x800A, LOCALID_MOM
setvar VAR_0x8009, LOCALID_PLAYERS_HOUSE_1F_DAD
setvar VAR_0x800A, LOCALID_PLAYERS_HOUSE_1F_MOM
return
PlayersHouse_1F_EventScript_DadApproachPlayerMale::