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/Route111/map.json
View File

@@ -31,6 +31,7 @@
],
"object_events": [
{
"local_id": "LOCALID_ROUTE111_VICTOR",
"graphics_id": "OBJ_EVENT_GFX_MAN_1",
"x": 13,
"y": 114,
@@ -44,6 +45,7 @@
"flag": "FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE"
},
{
"local_id": "LOCALID_ROUTE111_VICTORIA",
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_F",
"x": 13,
"y": 113,
@@ -57,6 +59,7 @@
"flag": "FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE"
},
{
"local_id": "LOCALID_ROUTE111_VIVI",
"graphics_id": "OBJ_EVENT_GFX_LASS",
"x": 13,
"y": 113,
@@ -70,6 +73,7 @@
"flag": "FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE"
},
{
"local_id": "LOCALID_ROUTE111_VICKY",
"graphics_id": "OBJ_EVENT_GFX_EXPERT_F",
"x": 13,
"y": 113,
@@ -623,6 +627,7 @@
"flag": "FLAG_HIDE_ROUTE_111_PLAYER_DESCENT"
},
{
"local_id": "LOCALID_ROUTE111_ROCK_SMASH_MAN",
"graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
"x": 19,
"y": 101,

48
data/maps/Route111/scripts.inc
View File

@@ -1,11 +1,3 @@
.set LOCALID_VICTOR, 1
.set LOCALID_VICTORIA, 2
.set LOCALID_VIVI, 3
.set LOCALID_VICKY, 4
.set LOCALID_ROCK_SMASH_MAN, 46
@ Note: LOCALID_ROUTE111_PLAYER_FALLING is a local id for this map used elsewhere. It's defined in event_objects.h
Route111_MapScripts::
map_script MAP_SCRIPT_ON_LOAD, Route111_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, Route111_OnTransition
@@ -277,68 +269,68 @@ Route111_EventScript_Victor::
Route111_EventScript_BattleWinstrates::
msgbox Route111_Text_VictorIntro, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_VictorDefeat
applymovement LOCALID_VICTOR, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_ROUTE111_VICTOR, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
call Route111_EventScript_OpenWinstrateDoor
msgbox Route111_Text_VictorPostBattle, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_VICTOR, Route111_Movement_WinstrateEnterHouse
applymovement LOCALID_ROUTE111_VICTOR, Route111_Movement_WinstrateEnterHouse
waitmovement 0
removeobject LOCALID_VICTOR
removeobject LOCALID_ROUTE111_VICTOR
call Route111_EventScript_CloseWinstrateDoor
applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_WaitForNextWinstrate
waitmovement 0
call Route111_EventScript_OpenWinstrateDoor
addobject LOCALID_VICTORIA
applymovement LOCALID_VICTORIA, Route111_Movement_WinstrateExitHouse
addobject LOCALID_ROUTE111_VICTORIA
applymovement LOCALID_ROUTE111_VICTORIA, Route111_Movement_WinstrateExitHouse
waitmovement 0
call Route111_EventScript_CloseWinstrateDoor
msgbox Route111_Text_VictoriaIntro, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_VictoriaDefeat
applymovement LOCALID_VICTORIA, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_ROUTE111_VICTORIA, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
call Route111_EventScript_OpenWinstrateDoor
msgbox Route111_Text_VictoriaPostBattle, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_VICTORIA, Route111_Movement_WinstrateEnterHouse
applymovement LOCALID_ROUTE111_VICTORIA, Route111_Movement_WinstrateEnterHouse
waitmovement 0
removeobject LOCALID_VICTORIA
removeobject LOCALID_ROUTE111_VICTORIA
call Route111_EventScript_CloseWinstrateDoor
applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_WaitForNextWinstrate
waitmovement 0
call Route111_EventScript_OpenWinstrateDoor
addobject LOCALID_VIVI
applymovement LOCALID_VIVI, Route111_Movement_WinstrateExitHouse
addobject LOCALID_ROUTE111_VIVI
applymovement LOCALID_ROUTE111_VIVI, Route111_Movement_WinstrateExitHouse
waitmovement 0
call Route111_EventScript_CloseWinstrateDoor
msgbox Route111_Text_ViviIntro, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_VIVI, Route111_Text_ViviDefeat
applymovement LOCALID_VIVI, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_ROUTE111_VIVI, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
call Route111_EventScript_OpenWinstrateDoor
msgbox Route111_Text_ViviPostBattle, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_VIVI, Route111_Movement_WinstrateEnterHouse
applymovement LOCALID_ROUTE111_VIVI, Route111_Movement_WinstrateEnterHouse
waitmovement 0
removeobject LOCALID_VIVI
removeobject LOCALID_ROUTE111_VIVI
call Route111_EventScript_CloseWinstrateDoor
applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_WaitForNextWinstrate
waitmovement 0
call Route111_EventScript_OpenWinstrateDoor
addobject LOCALID_VICKY
applymovement LOCALID_VICKY, Route111_Movement_WinstrateExitHouse
addobject LOCALID_ROUTE111_VICKY
applymovement LOCALID_ROUTE111_VICKY, Route111_Movement_WinstrateExitHouse
waitmovement 0
call Route111_EventScript_CloseWinstrateDoor
msgbox Route111_Text_VickyIntro, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_VICKY, Route111_Text_VickyDefeat
msgbox Route111_Text_VickyPostBattle, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_VICKY, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_ROUTE111_VICKY, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
call Route111_EventScript_OpenWinstrateDoor
applymovement LOCALID_VICKY, Route111_Movement_WinstrateEnterHouse
applymovement LOCALID_ROUTE111_VICKY, Route111_Movement_WinstrateEnterHouse
waitmovement 0
removeobject LOCALID_VICKY
removeobject LOCALID_ROUTE111_VICKY
call Route111_EventScript_CloseWinstrateDoor
release
end
@@ -427,11 +419,11 @@ Route111_EventScript_HikerMirageTowerVisible::
Route111_EventScript_RockSmashTipFatMan::
lockall
applymovement LOCALID_ROCK_SMASH_MAN, Common_Movement_FacePlayer
applymovement LOCALID_ROUTE111_ROCK_SMASH_MAN, Common_Movement_FacePlayer
waitmovement 0
msgbox Route111_Text_MauvilleUncleToldMeToTakeRockSmash, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_ROCK_SMASH_MAN, Common_Movement_FaceOriginalDirection
applymovement LOCALID_ROUTE111_ROCK_SMASH_MAN, Common_Movement_FaceOriginalDirection
waitmovement 0
releaseall
end