dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Continue adding local IDs to map.json files

Browse Source
This commit is contained in:
GriffinR
2024-10-12 09:59:56 -04:00
parent a2a3255bdd
commit cb66ea6653
169 changed files with 1233 additions and 1325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
data/maps/MeteorFalls_1F_1R/map.json
View File

@@ -67,6 +67,7 @@
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP"
},
{
"local_id": "LOCALID_METEOR_FALLS_MAGMA_GRUNT_1",
"graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M",
"x": 12,
"y": 20,
@@ -80,6 +81,7 @@
"flag": "FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA"
},
{
"local_id": "LOCALID_METEOR_FALLS_MAGMA_GRUNT_2",
"graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M",
"x": 14,
"y": 21,
@@ -93,6 +95,7 @@
"flag": "FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA"
},
{
"local_id": "LOCALID_METEOR_FALLS_ARCHIE",
"graphics_id": "OBJ_EVENT_GFX_ARCHIE",
"x": 6,
"y": 20,
@@ -106,6 +109,7 @@
"flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA"
},
{
"local_id": "LOCALID_METEOR_FALLS_AQUA_GRUNT_1",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 6,
"y": 20,
@@ -119,6 +123,7 @@
"flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA"
},
{
"local_id": "LOCALID_METEOR_FALLS_AQUA_GRUNT_2",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 6,
"y": 21,

68
data/maps/MeteorFalls_1F_1R/scripts.inc
View File

@@ -1,9 +1,3 @@
.set LOCALID_MAGMA_GRUNT_1, 5
.set LOCALID_MAGMA_GRUNT_2, 6
.set LOCALID_ARCHIE, 7
.set LOCALID_AQUA_GRUNT_1, 8
.set LOCALID_AQUA_GRUNT_2, 9
MeteorFalls_1F_1R_MapScripts::
map_script MAP_SCRIPT_ON_LOAD, MeteorFalls_1F_1R_OnLoad
.byte 0
@@ -25,70 +19,70 @@ MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceDown
waitmovement 0
delay 30
applymovement LOCALID_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceDown
applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceDown
waitmovement 0
msgbox MeteorFalls_1F_1R_Text_WithThisMeteorite, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_MAGMA_GRUNT_2, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_2, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
playse SE_PIN
applymovement LOCALID_MAGMA_GRUNT_1, Common_Movement_ExclamationMark
applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_MAGMA_GRUNT_1, Common_Movement_Delay48
applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, Common_Movement_Delay48
waitmovement 0
msgbox MeteorFalls_1F_1R_Text_DontExpectMercyFromMagma, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_MAGMA_GRUNT_1, MeteorFalls_1F_1R_Movement_MagmaGruntApproachPlayer
applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, MeteorFalls_1F_1R_Movement_MagmaGruntApproachPlayer
waitmovement 0
msgbox MeteorFalls_1F_1R_Text_HoldItRightThereMagma, MSGBOX_DEFAULT
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_MAGMA_GRUNT_2, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_2, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
addobject LOCALID_ARCHIE
addobject LOCALID_AQUA_GRUNT_1
addobject LOCALID_AQUA_GRUNT_2
addobject LOCALID_METEOR_FALLS_ARCHIE
addobject LOCALID_METEOR_FALLS_AQUA_GRUNT_1
addobject LOCALID_METEOR_FALLS_AQUA_GRUNT_2
playbgm MUS_ENCOUNTER_AQUA, FALSE
applymovement LOCALID_ARCHIE, MeteorFalls_1F_1R_Movement_ArchieArrive
applymovement LOCALID_AQUA_GRUNT_1, MeteorFalls_1F_1R_Movement_AquaGrunt1Arrive
applymovement LOCALID_AQUA_GRUNT_2, MeteorFalls_1F_1R_Movement_AquaGrunt2Arrive
applymovement LOCALID_METEOR_FALLS_ARCHIE, MeteorFalls_1F_1R_Movement_ArchieArrive
applymovement LOCALID_METEOR_FALLS_AQUA_GRUNT_1, MeteorFalls_1F_1R_Movement_AquaGrunt1Arrive
applymovement LOCALID_METEOR_FALLS_AQUA_GRUNT_2, MeteorFalls_1F_1R_Movement_AquaGrunt2Arrive
waitmovement 0
applymovement LOCALID_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_MAGMA_GRUNT_2, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_2, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
msgbox MeteorFalls_1F_1R_Text_BeSeeingYouTeamAqua, MSGBOX_DEFAULT
closemessage
applymovement OBJ_EVENT_ID_PLAYER, MeteorFalls_1F_1R_Movement_PushPlayerOutOfWay
applymovement LOCALID_MAGMA_GRUNT_1, MeteorFalls_1F_1R_Movement_MagmaGrunt1Exit
applymovement LOCALID_MAGMA_GRUNT_2, MeteorFalls_1F_1R_Movement_MagmaGrunt2Exit
applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, MeteorFalls_1F_1R_Movement_MagmaGrunt1Exit
applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_2, MeteorFalls_1F_1R_Movement_MagmaGrunt2Exit
waitmovement 0
removeobject LOCALID_MAGMA_GRUNT_1
removeobject LOCALID_MAGMA_GRUNT_2
applymovement LOCALID_ARCHIE, MeteorFalls_1F_1R_Movement_ArchieApproachPlayer
removeobject LOCALID_METEOR_FALLS_MAGMA_GRUNT_1
removeobject LOCALID_METEOR_FALLS_MAGMA_GRUNT_2
applymovement LOCALID_METEOR_FALLS_ARCHIE, MeteorFalls_1F_1R_Movement_ArchieApproachPlayer
waitmovement 0
msgbox MeteorFalls_1F_1R_Text_ArchieSeenYouBefore, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_AQUA_GRUNT_1, MeteorFalls_1F_1R_Movement_AquaGrunt1ApproachArchie
applymovement LOCALID_AQUA_GRUNT_2, MeteorFalls_1F_1R_Movement_AquaGrunt2ApproachArchie
applymovement LOCALID_METEOR_FALLS_AQUA_GRUNT_1, MeteorFalls_1F_1R_Movement_AquaGrunt1ApproachArchie
applymovement LOCALID_METEOR_FALLS_AQUA_GRUNT_2, MeteorFalls_1F_1R_Movement_AquaGrunt2ApproachArchie
waitmovement 0
msgbox MeteorFalls_1F_1R_Text_BossWeShouldChaseMagma, MSGBOX_DEFAULT
applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_METEOR_FALLS_ARCHIE, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox MeteorFalls_1F_1R_Text_ArchieYesNoTellingWhatMagmaWillDo, MSGBOX_DEFAULT
applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_METEOR_FALLS_ARCHIE, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
msgbox MeteorFalls_1F_1R_Text_ArchieFarewell, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_ARCHIE, MeteorFalls_1F_1R_Movement_ArchieExit
applymovement LOCALID_AQUA_GRUNT_1, MeteorFalls_1F_1R_Movement_AquaGrunt1Exit
applymovement LOCALID_AQUA_GRUNT_2, MeteorFalls_1F_1R_Movement_AquaGrunt2Exit
applymovement LOCALID_METEOR_FALLS_ARCHIE, MeteorFalls_1F_1R_Movement_ArchieExit
applymovement LOCALID_METEOR_FALLS_AQUA_GRUNT_1, MeteorFalls_1F_1R_Movement_AquaGrunt1Exit
applymovement LOCALID_METEOR_FALLS_AQUA_GRUNT_2, MeteorFalls_1F_1R_Movement_AquaGrunt2Exit
waitmovement 0
fadedefaultbgm
removeobject LOCALID_ARCHIE
removeobject LOCALID_AQUA_GRUNT_1
removeobject LOCALID_AQUA_GRUNT_2
removeobject LOCALID_METEOR_FALLS_ARCHIE
removeobject LOCALID_METEOR_FALLS_AQUA_GRUNT_1
removeobject LOCALID_METEOR_FALLS_AQUA_GRUNT_2
setflag FLAG_HIDE_ROUTE_112_TEAM_MAGMA
setflag FLAG_MET_ARCHIE_METEOR_FALLS
setflag FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT