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/OneIsland_PokemonCenter_1F/map.json
+3
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_ONE_ISLAND_NURSE",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_NURSE",
"x": 5,
@@ -30,6 +31,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BILL",
"x": 14,
@@ -44,6 +46,7 @@
"flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL"
},
{
"local_id": "LOCALID_CELIO",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_CELIO",
"x": 15,
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+16 -19
View File
@@ -1,6 +1,3 @@
.equ LOCALID_BILL, 2
.equ LOCALID_CELIO, 3
OneIsland_PokemonCenter_1F_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
@@ -39,15 +36,15 @@ OneIsland_PokemonCenter_1F_EventScript_SetCelioQuestDone::
return
OneIsland_PokemonCenter_1F_EventScript_SetBillCelioFirstMeetingPos::
setobjectxyperm LOCALID_BILL, 9, 8
setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_UP
setobjectxyperm LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, 9, 8
setobjectmovementtype LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, MOVEMENT_TYPE_FACE_UP
setobjectxyperm LOCALID_CELIO, 15, 6
setobjectmovementtype LOCALID_CELIO, MOVEMENT_TYPE_FACE_UP
return
OneIsland_PokemonCenter_1F_EventScript_SetBillCelioReadyToLeavePos::
setobjectxyperm LOCALID_BILL, 14, 7
setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_LEFT
setobjectxyperm LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, 14, 7
setobjectmovementtype LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, MOVEMENT_TYPE_FACE_LEFT
setobjectxyperm LOCALID_CELIO, 14, 8
setobjectmovementtype LOCALID_CELIO, MOVEMENT_TYPE_FACE_LEFT
return
@@ -60,7 +57,7 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToCelio
applymovement LOCALID_BILL, OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio
applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_BillHeyThereCelio
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
@@ -74,11 +71,11 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene::
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_CelioCantBelieveYouCameOut
msgbox OneIsland_PokemonCenter_1F_Text_BillHowsYourResearchComing
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_ThisIsMyBuddyCelio
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
@@ -92,10 +89,10 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene::
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_CelioPCsCantLinkWithYours
closemessage
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_BillLetMeHelpYou
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
@@ -112,7 +109,7 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene::
setflag FLAG_SYS_SEVII_MAP_123
msgbox OneIsland_PokemonCenter_1F_Text_BillCatchYouLater
closemessage
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
applymovement LOCALID_CELIO, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
@@ -192,7 +189,7 @@ OneIsland_PokemonCenter_1F_EventScript_Bill::
end
OneIsland_PokemonCenter_1F_EventScript_BillGoTakeStroll::
applymovement LOCALID_BILL, Common_Movement_FacePlayer
applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_FacePlayer
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_GotPCWorkingStrollAWhileMore
release
@@ -440,7 +437,7 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerBottom::
OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene::
textcolor NPC_TEXT_COLOR_MALE
playse SE_PIN
applymovement LOCALID_BILL, Common_Movement_ExclamationMark
applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_ExclamationMark
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_BillOhHeyPlayer
closemessage
@@ -453,14 +450,14 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene::
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_CelioJobWentQuick
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
applymovement LOCALID_CELIO, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_BillYouveLearnedALot
msgbox OneIsland_PokemonCenter_1F_Text_CelioOhReallyEhehe
closemessage
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
delay 10
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
@@ -468,7 +465,7 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene::
delay 15
msgbox OneIsland_PokemonCenter_1F_Text_BillWeShouldHeadBackToKanto
closemessage
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
delay 15
applymovement LOCALID_CELIO, Common_Movement_WalkInPlaceFasterLeft
@@ -479,7 +476,7 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene::
closemessage
delay 25
applymovement LOCALID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerExit
applymovement LOCALID_BILL, OneIsland_PokemonCenter_1F_Movement_BillExit
applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, OneIsland_PokemonCenter_1F_Movement_BillExit
waitmovement 0
playse SE_EXIT
setflag FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL