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/FiveIsland_ResortGorgeous_House/map.json
+2
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_RESORT_GORGEOUS_HOUSE_SELPHY",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
"x": 4,
@@ -30,6 +31,7 @@
"flag": "FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY"
},
{
"local_id": "LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
"x": 6,
data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
+10 -13
View File
@@ -1,6 +1,3 @@
.equ LOCALID_SELPHY, 1
.equ LOCALID_BUTLER, 2
.equ SHOWN_REQUESTED_MON, FLAG_TEMP_2
FiveIsland_ResortGorgeous_House_MapScripts::
@@ -39,12 +36,12 @@ FiveIsland_ResortGorgeous_House_EventScript_CheckForRequestedMon::
FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon::
special SampleResortGorgeousMonAndReward
msgbox FiveIsland_ResortGorgeous_House_Text_MonYouCaughtForMeThankYou
addobject LOCALID_BUTLER
applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerEnter
addobject LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER
applymovement LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerEnter
waitmovement 0
textcolor NPC_TEXT_COLOR_MALE
msgbox FiveIsland_ResortGorgeous_House_Text_ButlerYesMyLady
applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_RESORT_GORGEOUS_HOUSE_SELPHY, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
textcolor NPC_TEXT_COLOR_FEMALE
msgbox FiveIsland_ResortGorgeous_House_Text_SelphyGiveTokenOfAppreciation
@@ -55,7 +52,7 @@ FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon::
call_if_eq VAR_FACING, DIR_SOUTH, FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth
call_if_eq VAR_FACING, DIR_EAST, FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast
call_if_eq VAR_FACING, DIR_WEST, FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerWest
copyobjectxytoperm LOCALID_BUTLER
copyobjectxytoperm LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER
msgbox FiveIsland_ResortGorgeous_House_Text_ButlerPleaseAcceptThisAsHerThanks
giveitem VAR_RESORT_GORGEOUS_REWARD
goto_if_eq VAR_RESULT, FALSE, FiveIsland_ResortGorgeous_House_EventScript_NoRoomForReward
@@ -65,30 +62,30 @@ FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon::
end
FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerNorth::
applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth
applymovement LOCALID_RESORT_GORGEOUS_HOUSE_SELPHY, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth
waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth::
applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth
applymovement LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth
waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast::
applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast
applymovement LOCALID_RESORT_GORGEOUS_HOUSE_SELPHY, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast
waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerWest::
applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerWest
applymovement LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerWest
waitmovement 0
return