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

Add local object event ids for referenced objects

Browse Source
This commit is contained in:
GriffinR
2020-06-21 01:56:57 -04:00
parent 46f4a4bbf7
commit fac6288156
192 changed files with 2857 additions and 2205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/MauvilleCity/scripts.inc
+36 -32
View File
@@ -1,3 +1,7 @@
.set LOCALID_WALLY, 6
.set LOCALID_WALLYS_UNCLE, 7
.set LOCALID_SCOTT, 11
MauvilleCity_MapScripts:: @ 81DF385
map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_OnTransition
.byte 0
@@ -70,7 +74,7 @@ MauvilleCity_EventScript_WallysUncle:: @ 81DF41D
goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_UncleAskPlayerToBattleWally
msgbox MauvilleCity_Text_UncleHesTooPeppy, MSGBOX_DEFAULT
closemessage
applymovement 7, Common_Movement_FaceOriginalDirection
applymovement LOCALID_WALLYS_UNCLE, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -78,7 +82,7 @@ MauvilleCity_EventScript_WallysUncle:: @ 81DF41D
MauvilleCity_EventScript_UncleAskPlayerToBattleWally:: @ 81DF43D
msgbox MauvilleCity_Text_UncleCanYouBattleWally, MSGBOX_DEFAULT
closemessage
applymovement 7, Common_Movement_FaceOriginalDirection
applymovement LOCALID_WALLYS_UNCLE, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -86,17 +90,17 @@ MauvilleCity_EventScript_UncleAskPlayerToBattleWally:: @ 81DF43D
MauvilleCity_EventScript_Wally:: @ 81DF452
lockall
goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_WallyRequestBattleAgain
applymovement 6, Common_Movement_WalkInPlaceFastestRight
applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox MauvilleCity_Text_WallyWantToChallengeGym, MSGBOX_DEFAULT
msgbox MauvilleCity_Text_UncleYourePushingIt, MSGBOX_DEFAULT
msgbox MauvilleCity_Text_WallyWeCanBeatAnyone, MSGBOX_DEFAULT
applymovement 6, Common_Movement_FacePlayer
applymovement LOCALID_WALLY, Common_Movement_FacePlayer
waitmovement 0
playse SE_PIN
applymovement 6, Common_Movement_ExclamationMark
applymovement LOCALID_WALLY, Common_Movement_ExclamationMark
waitmovement 0
applymovement 6, Common_Movement_Delay48
applymovement LOCALID_WALLY, Common_Movement_Delay48
waitmovement 0
msgbox MauvilleCity_Text_WallyWillYouBattleMe, MSGBOX_YESNO
goto MauvilleCity_EventScript_BattleWallyPrompt
@@ -115,46 +119,46 @@ MauvilleCity_EventScript_BattleWallyPrompt:: @ 81DF4AD
MauvilleCity_EventScript_WallyAndUncleExitNorth:: @ 81DF4E0
applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth1
applymovement 6, MauvilleCity_Movement_WallyExitNorth1
applymovement 7, MauvilleCity_Movement_WallysUncleExitNorth1
applymovement LOCALID_WALLY, MauvilleCity_Movement_WallyExitNorth1
applymovement LOCALID_WALLYS_UNCLE, MauvilleCity_Movement_WallysUncleExitNorth1
waitmovement 0
applymovement 6, Common_Movement_WalkInPlaceFastestRight
applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
delay 30
applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerFaceUncleNorth
applymovement 7, MauvilleCity_Movement_WallysUncleApproachPlayerNorth
applymovement LOCALID_WALLYS_UNCLE, MauvilleCity_Movement_WallysUncleApproachPlayerNorth
waitmovement 0
msgbox MauvilleCity_Text_UncleVisitUsSometime, MSGBOX_DEFAULT
closemessage
applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth2
applymovement 7, MauvilleCity_Movement_WallysUncleExitNorth2
applymovement 6, MauvilleCity_Movement_WallyExitNorth2
applymovement LOCALID_WALLYS_UNCLE, MauvilleCity_Movement_WallysUncleExitNorth2
applymovement LOCALID_WALLY, MauvilleCity_Movement_WallyExitNorth2
waitmovement 0
goto MauvilleCity_EventScript_DefeatedWally
end
MauvilleCity_EventScript_WallyAndUncleExitEast:: @ 81DF53D
applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast1
applymovement 6, MauvilleCity_Movement_WallyExitEast1
applymovement 7, MauvilleCity_Movement_WallysUncleExitEast1
applymovement LOCALID_WALLY, MauvilleCity_Movement_WallyExitEast1
applymovement LOCALID_WALLYS_UNCLE, MauvilleCity_Movement_WallysUncleExitEast1
waitmovement 0
applymovement 6, Common_Movement_WalkInPlaceFastestRight
applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
delay 30
applymovement 7, MauvilleCity_Movement_WallysUncleApproachPlayerEast
applymovement LOCALID_WALLYS_UNCLE, MauvilleCity_Movement_WallysUncleApproachPlayerEast
waitmovement 0
msgbox MauvilleCity_Text_UncleVisitUsSometime, MSGBOX_DEFAULT
closemessage
applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast2
applymovement 7, MauvilleCity_Movement_WallysUncleExitEast2
applymovement 6, MauvilleCity_Movement_WallyExitEast2
applymovement LOCALID_WALLYS_UNCLE, MauvilleCity_Movement_WallysUncleExitEast2
applymovement LOCALID_WALLY, MauvilleCity_Movement_WallyExitEast2
waitmovement 0
goto MauvilleCity_EventScript_DefeatedWally
end
MauvilleCity_EventScript_DefeatedWally:: @ 81DF593
removeobject 6
removeobject 7
removeobject LOCALID_WALLY
removeobject LOCALID_WALLYS_UNCLE
clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE
setflag FLAG_DEFEATED_WALLY_MAUVILLE
@@ -173,45 +177,45 @@ MauvilleCity_EventScript_DefeatedWally:: @ 81DF593
call_if_eq MauvilleCity_EventScript_ScottExitNorth
compare VAR_FACING, DIR_EAST
call_if_eq MauvilleCity_EventScript_ScottExitEast
removeobject 11
removeobject LOCALID_SCOTT
releaseall
end
MauvilleCity_EventScript_ScottApproachPlayerNorth:: @ 81DF5F3
addobject 11
applymovement 11, MauvilleCity_Movement_ScottApproachPlayerNorth
addobject LOCALID_SCOTT
applymovement LOCALID_SCOTT, MauvilleCity_Movement_ScottApproachPlayerNorth
waitmovement 0
return
MauvilleCity_EventScript_ScottApproachPlayerEast:: @ 81DF601
setobjectxyperm 11, 12, 13
addobject 11
applymovement 11, MauvilleCity_Movement_ScottApproachPlayerEast
setobjectxyperm LOCALID_SCOTT, 12, 13
addobject LOCALID_SCOTT
applymovement LOCALID_SCOTT, MauvilleCity_Movement_ScottApproachPlayerEast
waitmovement 0
return
MauvilleCity_EventScript_ScottExitNorth:: @ 81DF616
applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitNorth
applymovement 11, MauvilleCity_Movement_ScottExitNorth
applymovement LOCALID_SCOTT, MauvilleCity_Movement_ScottExitNorth
waitmovement 0
return
MauvilleCity_EventScript_ScottExitEast:: @ 81DF628
applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitEast
applymovement 11, MauvilleCity_Movement_ScottExitEast
applymovement LOCALID_SCOTT, MauvilleCity_Movement_ScottExitEast
waitmovement 0
return
MauvilleCity_EventScript_BattleWally:: @ 81DF63A
msgbox MauvilleCity_Text_WallyHereICome, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_WALLY_MAUVILLE, MauvilleCity_Text_WallyDefeat
applymovement 6, Common_Movement_WalkInPlaceFastestRight
applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox MauvilleCity_Text_WallyIllGoBackToVerdanturf, MSGBOX_DEFAULT
applymovement 6, Common_Movement_FacePlayer
applymovement LOCALID_WALLY, Common_Movement_FacePlayer
waitmovement 0
msgbox MauvilleCity_Text_ThankYouNotEnoughToBattle, MSGBOX_DEFAULT
applymovement 6, Common_Movement_WalkInPlaceFastestRight
applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox MauvilleCity_Text_UncleNoNeedToBeDown, MSGBOX_DEFAULT
return
@@ -223,7 +227,7 @@ MauvilleCity_EventScript_DeclineWallyBattle:: @ 81DF683
end
MauvilleCity_EventScript_WallyRequestBattleAgain:: @ 81DF690
applymovement 6, Common_Movement_FacePlayer
applymovement LOCALID_WALLY, Common_Movement_FacePlayer
waitmovement 0
msgbox MauvilleCity_Text_WallyPleaseBattleMe, MSGBOX_YESNO
goto MauvilleCity_EventScript_BattleWallyPrompt