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/SilphCo_7F/map.json
+2
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_SILPH_CO_RIVAL",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLUE",
"x": 2,
@@ -114,6 +115,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_SILPH_CO_7F_WORKER_M2",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_WORKER_M",
"x": 9,
data/maps/SilphCo_7F/scripts.inc
+8 -11
View File
@@ -1,6 +1,3 @@
.set LOCALID_RIVAL, 1
.set LOCALID_WORKER_M2, 8
SilphCo_7F_MapScripts::
map_script MAP_SCRIPT_ON_LOAD, SilphCo_7F_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, SilphCo_7F_OnTransition
@@ -17,7 +14,7 @@ SilphCo_7F_OnTransition::
end
SilphCo_7F_EventScript_SetObjRocketsGone::
setobjectmovementtype LOCALID_WORKER_M2, MOVEMENT_TYPE_FACE_UP
setobjectmovementtype LOCALID_SILPH_CO_7F_WORKER_M2, MOVEMENT_TYPE_FACE_UP
return
SilphCo_7F_EventScript_RivalTriggerTop::
@@ -35,16 +32,16 @@ SilphCo_7F_EventScript_RivalTriggerBottom::
SilphCo_7F_EventScript_RivalScene::
textcolor NPC_TEXT_COLOR_MALE
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
applymovement LOCALID_SILPH_CO_RIVAL, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_RIVAL, Common_Movement_Delay48
applymovement LOCALID_SILPH_CO_RIVAL, Common_Movement_Delay48
waitmovement 0
msgbox SilphCo_7F_Text_RivalWhatKeptYou
call_if_eq VAR_TEMP_1, 0, SilphCo_7F_EventScript_RivalApproachTop
call_if_eq VAR_TEMP_1, 1, SilphCo_7F_EventScript_RivalApproachBottom
msgbox SilphCo_7F_Text_RivalIntro
setvar VAR_LAST_TALKED, LOCALID_RIVAL
setvar VAR_LAST_TALKED, LOCALID_SILPH_CO_RIVAL
call_if_eq VAR_STARTER_MON, 2, SilphCo_7F_EventScript_RivalSquirtle
call_if_eq VAR_STARTER_MON, 1, SilphCo_7F_EventScript_RivalBulbasaur
call_if_eq VAR_STARTER_MON, 0, SilphCo_7F_EventScript_RivalCharmander
@@ -55,7 +52,7 @@ SilphCo_7F_EventScript_RivalScene::
call_if_eq VAR_TEMP_1, 1, SilphCo_7F_EventScript_RivalExitBottom
playse SE_WARP_IN
fadedefaultbgm
removeobject LOCALID_RIVAL
removeobject LOCALID_SILPH_CO_RIVAL
waitse
setvar VAR_MAP_SCENE_SILPH_CO_7F, 1
releaseall
@@ -63,7 +60,7 @@ SilphCo_7F_EventScript_RivalScene::
SilphCo_7F_EventScript_RivalApproachTop::
closemessage
applymovement LOCALID_RIVAL, SilphCo_7F_Movement_RivalApproachTop
applymovement LOCALID_SILPH_CO_RIVAL, SilphCo_7F_Movement_RivalApproachTop
waitmovement 0
return
@@ -83,12 +80,12 @@ SilphCo_7F_EventScript_RivalCharmander::
return
SilphCo_7F_EventScript_RivalExitTop::
applymovement LOCALID_RIVAL, SilphCo_7F_Movement_RivalExitTop
applymovement LOCALID_SILPH_CO_RIVAL, SilphCo_7F_Movement_RivalExitTop
waitmovement 0
return
SilphCo_7F_EventScript_RivalExitBottom::
applymovement LOCALID_RIVAL, SilphCo_7F_Movement_RivalExitBottom
applymovement LOCALID_SILPH_CO_RIVAL, SilphCo_7F_Movement_RivalExitBottom
waitmovement 0
return