dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move local IDs to map.json

Browse Source
This commit is contained in:
GriffinR
2024-10-14 23:10:37 -04:00
parent 4dc5c47799
commit 50babdb07f
192 changed files with 863 additions and 891 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/PewterCity/scripts.inc
+34 -38
View File
@@ -1,7 +1,3 @@
.equ LOCALID_MUSEUM_GUIDE, 2
.equ LOCALID_GYM_GUIDE, 5
.equ LOCALID_AIDE, 7
PewterCity_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, PewterCity_OnTransition
.byte 0
@@ -22,40 +18,40 @@ PewterCity_EventScript_GymGuide::
call_if_eq VAR_FACING, DIR_EAST, PewterCity_EventScript_WalkToGymEast
msgbox PewterCity_Text_GoTakeOnBrock
closemessage
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GymGuideExit
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GymGuideExit
waitmovement 0
fadedefaultbgm
removeobject LOCALID_GYM_GUIDE
removeobject LOCALID_PEWTER_GYM_GUIDE
clearflag FLAG_HIDE_PEWTER_CITY_GYM_GUIDE
release
end
PewterCity_EventScript_WalkToGymEast::
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWaitForGuideEast
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadEast
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadEast
waitmovement 0
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymEast
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymEast
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymEast
waitmovement 0
return
@ Unused
PewterCity_EventScript_WalkToGymWest::
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWaitForGuideWest
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadWest
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadWest
waitmovement 0
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymWest
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymWest
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymWest
waitmovement 0
return
@ Unused
PewterCity_EventScript_WalkToGymNorth::
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWaitForGuideNorth
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadNorth
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadNorth
waitmovement 0
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymNorth
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymNorth
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymNorth
waitmovement 0
return
@@ -292,44 +288,44 @@ PewterCity_EventScript_GymGuideTrigger::
call_if_eq VAR_TEMP_1, 2, PewterCity_EventScript_WalkToGymBottom
msgbox PewterCity_Text_GoTakeOnBrock
closemessage
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GymGuideExit
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GymGuideExit
waitmovement 0
fadedefaultbgm
removeobject LOCALID_GYM_GUIDE
removeobject LOCALID_PEWTER_GYM_GUIDE
clearflag FLAG_HIDE_PEWTER_CITY_GYM_GUIDE
releaseall
end
PewterCity_EventScript_WalkToGymTop::
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadTop
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadTop
waitmovement 0
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymTop
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymTop
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymTop
waitmovement 0
return
PewterCity_EventScript_WalkToGymMid::
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadMid
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadMid
waitmovement 0
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymMid
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymMid
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymMid
waitmovement 0
return
PewterCity_EventScript_WalkToGymBottom::
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadBottom
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadBottom
waitmovement 0
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymBottom
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymBottom
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymBottom
waitmovement 0
return
@ Unused
PewterCity_EventScript_WalkToGymRight::
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideApproachPlayerRight
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideApproachPlayerRight
waitmovement 0
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymRight
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymRight
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymRight
waitmovement 0
return
@@ -448,34 +444,34 @@ PewterCity_EventScript_MuseumGuide::
msgbox PewterCity_Text_ThisIsTheMuseum
closemessage
delay 10
applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_MuseumGuideExit
applymovement LOCALID_PEWTER_MUSEUM_GUIDE, PewterCity_Movement_MuseumGuideExit
waitmovement 0
fadedefaultbgm
removeobject LOCALID_MUSEUM_GUIDE
removeobject LOCALID_PEWTER_MUSEUM_GUIDE
clearflag FLAG_HIDE_PEWTER_MUSEUM_GUIDE
release
end
PewterCity_EventScript_LeadToMuseumNorth::
applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumNorth
applymovement LOCALID_PEWTER_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumNorth
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumNorth
waitmovement 0
return
PewterCity_EventScript_LeadToMuseumSouth::
applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumSouth
applymovement LOCALID_PEWTER_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumSouth
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumSouth
waitmovement 0
return
PewterCity_EventScript_LeadToMuseumWest::
applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumWest
applymovement LOCALID_PEWTER_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumWest
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumWest
waitmovement 0
return
PewterCity_EventScript_LeadToMuseumEast::
applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumEast
applymovement LOCALID_PEWTER_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumEast
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumEast
waitmovement 0
return
@@ -691,9 +687,9 @@ PewterCity_EventScript_AideGiveRunningShoes::
call_if_eq VAR_TEMP_1, 3, PewterCity_EventScript_AideNoticePlayer
waitse
playse SE_PIN
applymovement LOCALID_AIDE, Common_Movement_ExclamationMark
applymovement LOCALID_PEWTER_AIDE, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_AIDE, Common_Movement_Delay48
applymovement LOCALID_PEWTER_AIDE, Common_Movement_Delay48
waitmovement 0
msgbox PewterCity_Text_OhPlayer
call_if_eq VAR_TEMP_1, 0, PewterCity_EventScript_AideApproachPlayer0
@@ -722,13 +718,13 @@ PewterCity_EventScript_AideGiveRunningShoes::
textcolor NPC_TEXT_COLOR_NEUTRAL
msgbox PewterCity_Text_RunningShoesLetterFromMom
closemessage
removeobject LOCALID_AIDE
removeobject LOCALID_PEWTER_AIDE
setflag FLAG_SYS_B_DASH
setvar VAR_MAP_SCENE_PEWTER_CITY, 2
return
PewterCity_EventScript_AideNoticePlayer::
applymovement LOCALID_AIDE, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PEWTER_AIDE, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
@@ -746,7 +742,7 @@ PewterCity_EventScript_AideApproachPlayer1::
PewterCity_EventScript_AideApproachPlayer2::
closemessage
applymovement LOCALID_AIDE, PewterCity_Movement_AideApproachPlayerMid
applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideApproachPlayerMid
waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
@@ -754,29 +750,29 @@ PewterCity_EventScript_AideApproachPlayer2::
PewterCity_EventScript_AideApproachPlayer3::
closemessage
applymovement LOCALID_AIDE, PewterCity_Movement_AideApproachPlayerBottom
applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideApproachPlayerBottom
waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
PewterCity_EventScript_AideExit0::
applymovement LOCALID_AIDE, PewterCity_Movement_AideExit0
applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideExit0
waitmovement 0
return
PewterCity_EventScript_AideExit1::
applymovement LOCALID_AIDE, PewterCity_Movement_AideExit1
applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideExit1
waitmovement 0
return
PewterCity_EventScript_AideExit2::
applymovement LOCALID_AIDE, PewterCity_Movement_AideExit2
applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideExit2
waitmovement 0
return
PewterCity_EventScript_AideExit3::
applymovement LOCALID_AIDE, PewterCity_Movement_AideExit3
applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideExit3
waitmovement 0
return