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

@@ -39,6 +39,7 @@
"flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_MOM"
},
{
"local_id": "LOCALID_PETALBURG_WALLY",
"graphics_id": "OBJ_EVENT_GFX_WALLY",
"x": 15,
"y": 10,
@@ -52,6 +53,7 @@
"flag": "FLAG_HIDE_PETALBURG_CITY_WALLY"
},
{
"local_id": "LOCALID_PETALBURG_BOY",
"graphics_id": "OBJ_EVENT_GFX_BOY_1",
"x": 8,
"y": 22,
@@ -78,6 +80,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_PETALBURG_WALLYS_DAD",
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_M",
"x": 15,
"y": 10,
@@ -117,6 +120,7 @@
"flag": "FLAG_ITEM_PETALBURG_CITY_ETHER"
},
{
"local_id": "LOCALID_GYM_BOY",
"graphics_id": "OBJ_EVENT_GFX_BOY_2",
"x": 12,
"y": 15,
@@ -130,6 +134,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_PETALBURG_SCOTT",
"graphics_id": "OBJ_EVENT_GFX_SCOTT",
"x": 13,
"y": 12,

56
data/maps/PetalburgCity/scripts.inc
View File

@@ -1,9 +1,3 @@
.set LOCALID_WALLY, 2
.set LOCALID_BOY, 3
.set LOCALID_WALLYS_DAD, 5
.set LOCALID_GYM_BOY, 8
.set LOCALID_SCOTT, 9
PetalburgCity_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_OnFrame
@@ -39,15 +33,15 @@ PetalburgCity_EventScript_WallyTutorial::
lockall
special SavePlayerParty
special LoadWallyZigzagoon
applymovement LOCALID_WALLY, PetalburgCity_Movement_WallyTutorialWally
applymovement LOCALID_PETALBURG_WALLY, PetalburgCity_Movement_WallyTutorialWally
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WallyTutorialPlayer
waitmovement 0
msgbox Route102_Text_WatchMeCatchPokemon, MSGBOX_DEFAULT
special StartWallyTutorialBattle
waitstate
msgbox Route102_Text_WallyIDidIt, MSGBOX_DEFAULT
applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFasterLeft, MAP_PETALBURG_CITY
waitmovement LOCALID_WALLY, MAP_PETALBURG_CITY
applymovement LOCALID_PETALBURG_WALLY, Common_Movement_WalkInPlaceFasterLeft, MAP_PETALBURG_CITY
waitmovement LOCALID_PETALBURG_WALLY, MAP_PETALBURG_CITY
msgbox Route102_Text_LetsGoBack, MSGBOX_DEFAULT
closemessage
clearflag FLAG_HIDE_MAP_NAME_POPUP
@@ -64,14 +58,14 @@ PetalburgCity_EventScript_WallyTutorial::
PetalburgCity_EventScript_WalkToWallyHouse::
lockall
setflag FLAG_HIDE_MAP_NAME_POPUP
applymovement LOCALID_WALLYS_DAD, PetalburgCity_Movement_WalkToWallyHouseWallysDad
applymovement LOCALID_PETALBURG_WALLYS_DAD, PetalburgCity_Movement_WalkToWallyHouseWallysDad
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WalkToWallyHousePlayer
waitmovement 0
setvar VAR_0x8004, 7
setvar VAR_0x8005, 5
opendoor VAR_0x8004, VAR_0x8005
waitdooranim
applymovement LOCALID_WALLYS_DAD, PetalburgCity_Movement_WalkInsideHouseWallysDad
applymovement LOCALID_PETALBURG_WALLYS_DAD, PetalburgCity_Movement_WalkInsideHouseWallysDad
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WalkInsideHousePlayer
waitmovement 0
setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD
@@ -91,7 +85,7 @@ PetalburgCity_EventScript_Boy::
faceplayer
msgbox PetalburgCity_Text_WaterReflection, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_BOY, Common_Movement_FaceOriginalDirection
applymovement LOCALID_PETALBURG_BOY, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -504,57 +498,57 @@ PetalburgCity_Movement_PlayerWalkToGym3:
PetalburgCity_EventScript_Scott0::
lockall
addobject LOCALID_SCOTT
addobject LOCALID_PETALBURG_SCOTT
setvar VAR_0x8008, 0
setobjectxy LOCALID_SCOTT, 13, 10
setobjectxy LOCALID_PETALBURG_SCOTT, 13, 10
goto PetalburgCity_EventScript_Scott
end
PetalburgCity_EventScript_Scott1::
lockall
addobject LOCALID_SCOTT
addobject LOCALID_PETALBURG_SCOTT
setvar VAR_0x8008, 1
setobjectxy LOCALID_SCOTT, 13, 11
setobjectxy LOCALID_PETALBURG_SCOTT, 13, 11
goto PetalburgCity_EventScript_Scott
end
PetalburgCity_EventScript_Scott2::
lockall
addobject LOCALID_SCOTT
addobject LOCALID_PETALBURG_SCOTT
setvar VAR_0x8008, 2
setobjectxy LOCALID_SCOTT, 13, 12
setobjectxy LOCALID_PETALBURG_SCOTT, 13, 12
goto PetalburgCity_EventScript_Scott
end
PetalburgCity_EventScript_Scott3::
lockall
addobject LOCALID_SCOTT
addobject LOCALID_PETALBURG_SCOTT
setvar VAR_0x8008, 3
setobjectxy LOCALID_SCOTT, 13, 13
setobjectxy LOCALID_PETALBURG_SCOTT, 13, 13
goto PetalburgCity_EventScript_Scott
end
PetalburgCity_EventScript_Scott::
applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottStartWalkLeft
applymovement LOCALID_PETALBURG_SCOTT, PetalburgCity_Movement_ScottStartWalkLeft
waitmovement 0
playse SE_PIN
applymovement LOCALID_SCOTT, Common_Movement_ExclamationMark
applymovement LOCALID_PETALBURG_SCOTT, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_SCOTT, Common_Movement_Delay48
applymovement LOCALID_PETALBURG_SCOTT, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottApproachPlayer
applymovement LOCALID_PETALBURG_SCOTT, PetalburgCity_Movement_ScottApproachPlayer
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
setvar VAR_SCOTT_STATE, 1
msgbox PetalburgCity_Text_AreYouATrainer, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PETALBURG_SCOTT, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
delay 30
msgbox PetalburgCity_Text_WellMaybeNot, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PETALBURG_SCOTT, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
delay 30
msgbox PetalburgCity_Text_ImLookingForTalentedTrainers, MSGBOX_DEFAULT
@@ -564,31 +558,31 @@ PetalburgCity_EventScript_Scott::
call_if_eq VAR_0x8008, 2, PetalburgCity_EventScript_ScottExit2
call_if_eq VAR_0x8008, 3, PetalburgCity_EventScript_ScottExit3
setvar VAR_SCOTT_PETALBURG_ENCOUNTER, 1
removeobject LOCALID_SCOTT
removeobject LOCALID_PETALBURG_SCOTT
releaseall
end
PetalburgCity_EventScript_ScottExit0::
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit0
applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottExit0
applymovement LOCALID_PETALBURG_SCOTT, PetalburgCity_Movement_ScottExit0
waitmovement 0
return
PetalburgCity_EventScript_ScottExit1::
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit1
applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottExit1
applymovement LOCALID_PETALBURG_SCOTT, PetalburgCity_Movement_ScottExit1
waitmovement 0
return
PetalburgCity_EventScript_ScottExit2::
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit2
applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottExit2
applymovement LOCALID_PETALBURG_SCOTT, PetalburgCity_Movement_ScottExit2
waitmovement 0
return
PetalburgCity_EventScript_ScottExit3::
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit3
applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottExit3
applymovement LOCALID_PETALBURG_SCOTT, PetalburgCity_Movement_ScottExit3
waitmovement 0
return