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

Standardize EVENT_OBJECT to OBJECT_EVENT

Browse Source
This commit is contained in:
GriffinR
2019-11-20 23:12:51 -05:00
parent ec3e86f1d2
commit 82cb741d8b
611 changed files with 4984 additions and 4984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
data/scripts/battle_pike.inc
View File

@@ -48,8 +48,8 @@ BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE: @ 82C3EDE
.2byte 0
BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST
setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_LINK_RECEPTIONIST
setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_LINK_RECEPTIONIST
setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE
special CallBattlePikeFunction
compare VAR_RESULT, 3
@@ -62,17 +62,17 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8
goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F
hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1
setvar VAR_TEMP_4, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35:: @ 82C3F35
setvar VAR_TEMP_4, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F:: @ 82C3F3F
setvar VAR_TEMP_4, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1
end
@@ -125,7 +125,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030:: @ 82C4030
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A
waitmovement 0
call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49
warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1, 255, 4, 7
@@ -133,7 +133,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030:: @ 82C4030
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4049:: @ 82C4049
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A
waitmovement 0
call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49
warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3, 255, 4, 19
@@ -214,7 +214,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136:: @ 82C4136
BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144:: @ 82C4144
BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144:: @ 82C4144
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A
waitmovement 0
call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49
warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2, 255, 2, 7
@@ -222,7 +222,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144:: @ 82C4144
BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C:: @ 82C415C
BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C:: @ 82C415C
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A
waitmovement 0
call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49
warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10

52
data/scripts/cable_club.inc
View File

@@ -154,7 +154,7 @@ CableClub_EventScript_CloseLinkAndExitLinkRoom:: @ 8276CB5
goto_if_eq CableClub_EventScript_PlayerExitLinkRoom
applymovement VAR_0x8007, Movement_AttendantFaceLeft
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom
waitmovement 0
applymovement VAR_0x8007, Movement_AttendantFaceDown
waitmovement 0
@@ -175,7 +175,7 @@ CableClub_EventScript_PlayerExitTradeCenter:: @ 8276CFF
setvar VAR_CABLE_CLUB_STATE, 0
compare VAR_0x8007, 0
goto_if_eq CableClub_EventScript_PlayerExitLinkRoom
applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerFaceAttendantRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerFaceAttendantRight
waitmovement 0
applymovement VAR_0x8007, Movement_AttendantFaceLeft
waitmovement 0
@@ -195,7 +195,7 @@ CableClub_EventScript_ExitRecordCorner:: @ 8276D2C
CableClub_EventScript_PlayerExitRecordCorner:: @ 8276D44
special CloseLink
setvar VAR_CABLE_CLUB_STATE, 0
applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom
waitmovement 0
compare VAR_0x8007, 0
goto_if_eq CableClub_EventScript_ExitRecordCornerRet
@@ -218,7 +218,7 @@ CableClub_EventScript_PlayerExitUnionRoom:: @ 8276D84
setvar VAR_CABLE_CLUB_STATE, 0
compare VAR_0x8007, 0
goto_if_eq CableClub_EventScript_PlayerExitLinkRoom
applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerFaceAttendantRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerFaceAttendantRight
waitmovement 0
applymovement VAR_0x8007, Movement_AttendantFaceLeft
waitmovement 0
@@ -232,24 +232,24 @@ CableClub_EventScript_TrainerCardDataOverwritten:: @ 8276DAE
delay 60
message CableClub_Text_HopeToSeeYouAgain
waitmessage
applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom
waitmovement 0
applymovement VAR_0x8007, Movement_AttendantFaceDown
waitmovement 0
return
CableClub_EventScript_PlayerExitLinkRoom:: @ 8276DD5
applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom
waitmovement 0
return
CableClub_EventScript_Tutorial:: @ 8276DE0
lockall
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox CableClub_Text_FirstTimeRightThisWay, MSGBOX_DEFAULT
closemessage
applymovement EVENT_OBJ_ID_PLAYER, CableClub_Movement_PlayerApproachCounter
applymovement OBJ_EVENT_ID_PLAYER, CableClub_Movement_PlayerApproachCounter
waitmovement 0
delay 30
msgbox CableClub_Text_ExplainWirelessClubFirstTime, MSGBOX_DEFAULT
@@ -377,13 +377,13 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
closemessage
applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
waitmovement 0
opendoor 9, 1
waitdooranim
applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
closedoor 9, 1
waitdooranim
release
@@ -397,7 +397,7 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD
@ Unused
CableClub_EventScript_PlayerApproachLinkRoomRight:: @ 827702B
applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomRight
waitmovement 0
return
@@ -482,13 +482,13 @@ CableClub_EventScript_EnterTradeCenter:: @ 827713A
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
closemessage
applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
waitmovement 0
opendoor 9, 1
waitdooranim
applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
closedoor 9, 1
waitdooranim
release
@@ -557,13 +557,13 @@ CableClub_EventScript_EnterRecordCorner:: @ 827724C
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
closemessage
applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
waitmovement 0
opendoor 9, 1
waitdooranim
applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
closedoor 9, 1
waitdooranim
release
@@ -958,13 +958,13 @@ CableClub_EventScript_EnterUnionRoom:: @ 827759F
delay 60
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
waitmovement 0
opendoor 5, 1
waitdooranim
applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
closedoor 5, 1
waitdooranim
special Script_ResetUnionRoomTrade
@@ -1289,13 +1289,13 @@ CableClub_EventScript_EnterWirelessLinkRoom:: @ 8277B3A
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
closemessage
applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
waitmovement 0
opendoor 9, 1
waitdooranim
applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
closedoor 9, 1
waitdooranim
release
@@ -1485,9 +1485,9 @@ MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom:: @ 8277E0E
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
closemessage
applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterMinigameRoom
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterMinigameRoom
waitmovement 0
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
release
waitstate
end

4
data/scripts/cave_hole.inc
View File

@@ -9,7 +9,7 @@ CaveHole_FixCrackedGround: @ 82A8331
EventScript_FallDownHole:: @ 82A8337
lockall
delay 20
applymovement EVENT_OBJ_ID_PLAYER, Movement_SetInvisible
applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible
waitmovement 0
playse SE_RU_HYUU
delay 60
@@ -20,7 +20,7 @@ EventScript_FallDownHole:: @ 82A8337
EventScript_FallDownHoleMtPyre:: @ 82A8350
lockall
delay 20
applymovement EVENT_OBJ_ID_PLAYER, Movement_SetInvisible
applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible
waitmovement 0
playse SE_RU_HYUU
delay 60

4
data/scripts/elite_four.inc
View File

@@ -1,5 +1,5 @@
PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay32
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay32
waitmovement 0
playse SE_DOOR
setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0
@@ -18,7 +18,7 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8
return
PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 8272475
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp6
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp6
waitmovement 0
playse SE_TRACK_DOOR
setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1

46
data/scripts/players_house.inc
View File

@@ -13,19 +13,19 @@ PlayersHouse_1F_EventScript_EnterHouseMovingIn:: @ 8292704
msgbox PlayersHouse_1F_Text_MoversPokemonGoSetClock, MSGBOX_DEFAULT
closemessage
setvar VAR_LITTLEROOT_INTRO_STATE, 4
applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerWalkIn
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerWalkIn
applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
releaseall
end
PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale:: @ 829274D
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale:: @ 8292758
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
@@ -37,7 +37,7 @@ PlayersHouse_1F_EventScript_MomGoSeeRoom:: @ 8292765
msgbox PlayersHouse_1F_Text_ArentYouInterestedInRoom, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_MovePlayerAwayFromDoor
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_MovePlayerAwayFromDoor
waitmovement 0
releaseall
end
@@ -78,7 +78,7 @@ PlayersHouse_2F_EventScript_MomComesUpstairsMale:: @ 82927DF
addobject VAR_0x8008
applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersMale
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT
closemessage
@@ -91,7 +91,7 @@ PlayersHouse_2F_EventScript_MomComesUpstairsFemale:: @ 829280F
addobject VAR_0x8008
applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersFemale
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT
closemessage
@@ -152,17 +152,17 @@ PlayersHouse_1F_EventScript_PetalburgGymReportMale:: @ 829286D
applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast
applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymMale
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymMale
waitmovement 0
playbgm MUS_INTER_V, 0
msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVMale
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVMale
waitmovement 0
call PlayersHouse_1F_EventScript_WatchGymBroadcast
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT
@@ -177,17 +177,17 @@ PlayersHouse_1F_EventScript_PetalburgGymReportFemale:: @ 82928DC
applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast
applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale
waitmovement 0
playbgm MUS_INTER_V, 0
msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVFemale
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVFemale
waitmovement 0
call PlayersHouse_1F_EventScript_WatchGymBroadcast
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT
@@ -209,7 +209,7 @@ PlayersHouse_1F_EventScript_MomNoticeGymBroadcast:: @ 829294B
return
PlayersHouse_1F_EventScript_WatchGymBroadcast:: @ 829296C
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox PlayersHouse_1F_Text_ReportFromPetalburgGym, MSGBOX_DEFAULT
fadedefaultbgm
@@ -549,38 +549,38 @@ PlayersHouse_1F_EventScript_MomApproachDadFemale:: @ 8292CC1
return
PlayersHouse_1F_EventScript_DadExitsMale:: @ 8292CD6
applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit
applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit
applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadExitsMale
waitmovement 0
return
PlayersHouse_1F_EventScript_DadExitsFemale:: @ 8292CEF
applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit
applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit
applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadExitsFemale
waitmovement 0
return
PlayersHouse_1F_EventScript_PlayerEnterRoomMale:: @ 8292D08
applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomMale
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomMale
waitmovement 0
return
PlayersHouse_1F_EventScript_PlayerEnterRoomFemale:: @ 8292D13
applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomFemale
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomFemale
waitmovement 0
return
PlayersHouse_1F_EventScript_PlayerApproachTVForLatiMale:: @ 8292D1E
applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale
waitmovement 0
applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
PlayersHouse_1F_EventScript_PlayerApproachTVForLatiFemale:: @ 8292D33
applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale
waitmovement 0
applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
@@ -589,14 +589,14 @@ PlayersHouse_1F_EventScript_PlayerApproachTVForLatiFemale:: @ 8292D33
PlayersHouse_1F_EventScript_MomApproachPlayerMale:: @ 8292D48
applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerMale
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
PlayersHouse_1F_EventScript_MomApproachPlayerFemale:: @ 8292D5D
applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerFemale
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
@@ -613,14 +613,14 @@ PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastFemale:: @ 8292D7D
PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVMale:: @ 8292D88
applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVMale
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVFemale:: @ 8292D9D
applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVFemale
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return

12
data/scripts/rival_graphics.inc
View File

@@ -7,11 +7,11 @@ Common_EventScript_SetupRivalGfxId:: @ 8271ED7
end
EventScript_SetupRivalGfxIdFemale:: @ 8271EEF
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
return
EventScript_SetupRivalGfxIdMale:: @ 8271EF5
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
return
Common_EventScript_SetupRivalOnBikeGfxId:: @ 8271EFB
@@ -23,11 +23,11 @@ Common_EventScript_SetupRivalOnBikeGfxId:: @ 8271EFB
end
EventScript_SetupRivalOnBikeGfxIdFemale:: @ 8271F13
setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE
setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_MAY_MACH_BIKE
return
EventScript_SetupRivalOnBikeGfxIdMale:: @ 8271F19
setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE
setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_BRENDAN_MACH_BIKE
return
@ Unused
@@ -40,9 +40,9 @@ Common_EventScript_SetupRivalGfxIdSameGender:: @ 8271F1F
end
EventScript_SetupRivalGfxIdMale2:: @ 8271F37
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
return
EventScript_SetupRivalGfxIdFemale2:: @ 8271F3D
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
return

2
data/scripts/secret_base.inc
View File

@@ -157,7 +157,7 @@ SecretBase_EventScript_InitSecretBase:: @ 8275B5B
end
SecretBase_EventScript_FirstEntrance:: @ 8275B81
applymovement EVENT_OBJ_ID_PLAYER, SecretBase_Movement_275BB4
applymovement OBJ_EVENT_ID_PLAYER, SecretBase_Movement_275BB4
waitmovement 0
setvar VAR_INIT_SECRET_BASE, 1
msgbox SecretBase_Text_WantToMakeYourSecretBaseHere, MSGBOX_YESNO