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/CinnabarIsland_PokemonCenter_1F/map.json
+2
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_CINNABAR_NURSE",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_NURSE",
"x": 7,
@@ -100,6 +101,7 @@
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
},
{
"local_id": "LOCALID_CINNABAR_POKEMON_CENTER_BILL",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BILL",
"x": 11,
data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
+4 -6
View File
@@ -1,5 +1,3 @@
.set LOCALID_BILL, 7
CinnabarIsland_PokemonCenter_1F_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
@@ -43,7 +41,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_Bill::
call_if_eq VAR_FACING, DIR_SOUTH, CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillSouth
call_if_eq VAR_FACING, DIR_EAST, CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillEast
call_if_eq VAR_FACING, DIR_WEST, CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillWest
removeobject LOCALID_BILL
removeobject LOCALID_CINNABAR_POKEMON_CENTER_BILL
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1
clearflag FLAG_HIDE_CINNABAR_BILL
warp MAP_CINNABAR_ISLAND, 14, 11
@@ -52,19 +50,19 @@ CinnabarIsland_PokemonCenter_1F_EventScript_Bill::
end
CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillSouth::
applymovement LOCALID_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExit
applymovement LOCALID_CINNABAR_POKEMON_CENTER_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExit
applymovement LOCALID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitSouth
waitmovement 0
return
CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillEast::
applymovement LOCALID_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExitEast
applymovement LOCALID_CINNABAR_POKEMON_CENTER_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExitEast
applymovement LOCALID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitEast
waitmovement 0
return
CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillWest::
applymovement LOCALID_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExit
applymovement LOCALID_CINNABAR_POKEMON_CENTER_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExit
applymovement LOCALID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitWest
waitmovement 0
return