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/MtEmber_Exterior/map.json
+2
View File
@@ -30,6 +30,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_MT_EMBER_GRUNT1",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
"x": 41,
@@ -44,6 +45,7 @@
"flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS"
},
{
"local_id": "LOCALID_MT_EMBER_GRUNT2",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
"x": 42,
data/maps/MtEmber_Exterior/scripts.inc
+11 -14
View File
@@ -1,6 +1,3 @@
.set LOCALID_GRUNT1, 2
.set LOCALID_GRUNT2, 3
MtEmber_Exterior_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, MtEmber_Exterior_OnTransition
map_script MAP_SCRIPT_ON_LOAD, MtEmber_Exterior_OnLoad
@@ -12,8 +9,8 @@ MtEmber_Exterior_OnTransition::
end
MtEmber_Exterior_EventScript_RocketsFaceDown::
setobjectmovementtype LOCALID_GRUNT1, MOVEMENT_TYPE_FACE_DOWN
setobjectmovementtype LOCALID_GRUNT2, MOVEMENT_TYPE_FACE_DOWN
setobjectmovementtype LOCALID_MT_EMBER_GRUNT1, MOVEMENT_TYPE_FACE_DOWN
setobjectmovementtype LOCALID_MT_EMBER_GRUNT2, MOVEMENT_TYPE_FACE_DOWN
return
MtEmber_Exterior_OnLoad::
@@ -38,7 +35,7 @@ MtEmber_Exterior_EventScript_Grunt1Defeated::
end
MtEmber_Exterior_EventScript_BattleGrunt1::
applymovement LOCALID_GRUNT1, Common_Movement_FacePlayer
applymovement LOCALID_MT_EMBER_GRUNT1, Common_Movement_FacePlayer
waitmovement 0
playbgm MUS_ENCOUNTER_ROCKET, 0
msgbox MtEmber_Exterior_Text_Grunt1Intro
@@ -52,8 +49,8 @@ MtEmber_Exterior_EventScript_DefeatedBothGrunts::
msgbox MtEmber_Exterior_Text_WellRegroupDontStepInsideThere
closemessage
fadescreen FADE_TO_BLACK
removeobject LOCALID_GRUNT1
removeobject LOCALID_GRUNT2
removeobject LOCALID_MT_EMBER_GRUNT1
removeobject LOCALID_MT_EMBER_GRUNT2
fadescreen FADE_FROM_BLACK
release
end
@@ -65,7 +62,7 @@ MtEmber_Exterior_EventScript_Grunt2::
goto_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4, MtEmber_Exterior_EventScript_BattleGrunt2
msgbox MtEmber_Exterior_Text_YoureInTheWayGetLost
closemessage
applymovement LOCALID_GRUNT2, Common_Movement_FaceOriginalDirection
applymovement LOCALID_MT_EMBER_GRUNT2, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -91,18 +88,18 @@ MtEmber_Exterior_EventScript_RocketPasswordScene::
message MtEmber_Exterior_Text_WhatsPasswordAgain
waitmessage
playse SE_PIN
applymovement LOCALID_GRUNT2, Common_Movement_QuestionMark
applymovement LOCALID_MT_EMBER_GRUNT2, Common_Movement_QuestionMark
waitmovement 0
waitbuttonpress
msgbox MtEmber_Exterior_Text_FirstPasswordGoldeen
applymovement LOCALID_GRUNT1, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_MT_EMBER_GRUNT1, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_GRUNT1, Common_Movement_ExclamationMark
applymovement LOCALID_MT_EMBER_GRUNT1, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_GRUNT1, Common_Movement_Delay48
applymovement LOCALID_MT_EMBER_GRUNT1, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_GRUNT2, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_MT_EMBER_GRUNT2, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
call MtEmber_Exterior_EventScript_RocketsFaceDown
msgbox MtEmber_Exterior_Text_SnoopsBeenListeningIn