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/ThreeIsland/map.json
+10 -1
View File
@@ -27,6 +27,7 @@
],
"object_events": [
{
"local_id": "LOCALID_THREE_ISLAND_ANTIBIKER1",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_MAN",
"x": 7,
@@ -41,6 +42,7 @@
"flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS"
},
{
"local_id": "LOCALID_THREE_ISLAND_ANTIBIKER2",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_MAN",
"x": 8,
@@ -55,6 +57,7 @@
"flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS"
},
{
"local_id": "LOCALID_PAXTON",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BIKER",
"x": 8,
@@ -69,6 +72,7 @@
"flag": "FLAG_HIDE_THREE_ISLAND_LONE_BIKER"
},
{
"local_id": "LOCALID_THREE_ISLAND_BIKER3",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BIKER",
"x": 9,
@@ -83,6 +87,7 @@
"flag": "FLAG_HIDE_THREE_ISLAND_BIKERS"
},
{
"local_id": "LOCALID_THREE_ISLAND_BIKER1",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BIKER",
"x": 9,
@@ -97,6 +102,7 @@
"flag": "FLAG_HIDE_THREE_ISLAND_BIKERS"
},
{
"local_id": "LOCALID_THREE_ISLAND_BIKER4",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BIKER",
"x": 10,
@@ -111,6 +117,7 @@
"flag": "FLAG_HIDE_THREE_ISLAND_BIKERS"
},
{
"local_id": "LOCALID_THREE_ISLAND_BIKER2",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BIKER",
"x": 10,
@@ -125,6 +132,7 @@
"flag": "FLAG_HIDE_THREE_ISLAND_BIKERS"
},
{
"local_id": "LOCALID_THREE_ISLAND_BIKER5",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BIKER",
"x": 11,
@@ -209,6 +217,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_THREE_ISLAND_BIKER6",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BIKER",
"x": 15,
@@ -392,7 +401,7 @@
"x": 14,
"y": 28,
"respawn_map": "MAP_THREE_ISLAND_POKEMON_CENTER_1F",
"respawn_npc": 1
"respawn_npc": "LOCALID_THREE_ISLAND_NURSE"
}
]
}
data/maps/ThreeIsland/scripts.inc
+38 -48
View File
@@ -1,13 +1,3 @@
.equ LOCALID_ANTIBIKER1, 1
.equ LOCALID_ANTIBIKER2, 2
.equ LOCALID_PAXTON, 3
.equ LOCALID_BIKER1, 5
.equ LOCALID_BIKER2, 7
.equ LOCALID_BIKER3, 4
.equ LOCALID_BIKER4, 6
.equ LOCALID_BIKER5, 8
.equ LOCALID_BIKER6, 14
ThreeIsland_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_OnTransition
.byte 0
@@ -23,8 +13,8 @@ ThreeIsland_EventScript_HideAntiBikers::
return
ThreeIsland_EventScript_SetAntiBikersMovementAfterBikers::
setobjectmovementtype LOCALID_ANTIBIKER1, MOVEMENT_TYPE_LOOK_AROUND
setobjectmovementtype LOCALID_ANTIBIKER2, MOVEMENT_TYPE_LOOK_AROUND
setobjectmovementtype LOCALID_THREE_ISLAND_ANTIBIKER1, MOVEMENT_TYPE_LOOK_AROUND
setobjectmovementtype LOCALID_THREE_ISLAND_ANTIBIKER2, MOVEMENT_TYPE_LOOK_AROUND
return
ThreeIsland_EventScript_Biker::
@@ -44,14 +34,14 @@ ThreeIsland_EventScript_AntiBiker1::
end
ThreeIsland_EventScript_AntiBiker1GotFullRestore::
applymovement LOCALID_ANTIBIKER1, Common_Movement_FacePlayer
applymovement LOCALID_THREE_ISLAND_ANTIBIKER1, Common_Movement_FacePlayer
waitmovement 0
msgbox ThreeIsland_Text_YouveGotImpressiveMons
release
end
ThreeIsland_EventScript_GiveFullRestore::
applymovement LOCALID_ANTIBIKER1, Common_Movement_FacePlayer
applymovement LOCALID_THREE_ISLAND_ANTIBIKER1, Common_Movement_FacePlayer
waitmovement 0
msgbox ThreeIsland_Text_ThankYouOhYourMonGotHurt
checkitemspace ITEM_FULL_RESTORE
@@ -71,25 +61,25 @@ ThreeIsland_EventScript_NoRoomForFullRestore::
ThreeIsland_EventScript_BikerArgumentScene::
call_if_eq VAR_TEMP_1, 1, ThreeIsland_EventScript_PlayerFaceLeft
call_if_eq VAR_TEMP_1, 2, ThreeIsland_EventScript_PlayerFaceLeft
applymovement LOCALID_ANTIBIKER1, ThreeIsland_Movement_SpeakRight
applymovement LOCALID_THREE_ISLAND_ANTIBIKER1, ThreeIsland_Movement_SpeakRight
waitmovement 0
msgbox ThreeIsland_Text_GoBackToKanto
call_if_eq VAR_TEMP_1, 0, ThreeIsland_EventScript_PlayerFaceRight
call_if_eq VAR_TEMP_1, 1, ThreeIsland_EventScript_PlayerFaceRight
call_if_eq VAR_TEMP_1, 2, ThreeIsland_EventScript_PlayerFaceBiker
applymovement LOCALID_BIKER1, ThreeIsland_Movement_SpeakLeft
applymovement LOCALID_THREE_ISLAND_BIKER1, ThreeIsland_Movement_SpeakLeft
waitmovement 0
msgbox ThreeIsland_Text_BossIsOnHisWay
call_if_eq VAR_TEMP_1, 0, ThreeIsland_EventScript_PlayerFaceUp
call_if_eq VAR_TEMP_1, 1, ThreeIsland_EventScript_PlayerFaceUp
call_if_eq VAR_TEMP_1, 2, ThreeIsland_EventScript_PlayerFaceAntiBiker
applymovement LOCALID_ANTIBIKER2, ThreeIsland_Movement_SpeakRight
applymovement LOCALID_THREE_ISLAND_ANTIBIKER2, ThreeIsland_Movement_SpeakRight
waitmovement 0
msgbox ThreeIsland_Text_GetOffIslandNow
call_if_eq VAR_TEMP_1, 0, ThreeIsland_EventScript_PlayerFaceRight
call_if_eq VAR_TEMP_1, 1, ThreeIsland_EventScript_PlayerFaceRight
call_if_eq VAR_TEMP_1, 2, ThreeIsland_EventScript_PlayerFaceBiker
applymovement LOCALID_BIKER3, ThreeIsland_Movement_SpeakLeft
applymovement LOCALID_THREE_ISLAND_BIKER3, ThreeIsland_Movement_SpeakLeft
waitmovement 0
msgbox ThreeIsland_Text_WhosGonnaMakeMe
return
@@ -136,7 +126,7 @@ ThreeIsland_EventScript_AntiBiker2::
end
ThreeIsland_EventScript_AntiBiker2BikersGone::
applymovement LOCALID_ANTIBIKER2, Common_Movement_FacePlayer
applymovement LOCALID_THREE_ISLAND_ANTIBIKER2, Common_Movement_FacePlayer
waitmovement 0
msgbox ThreeIsland_Text_LostelleWentOffTowardsBondBridge
release
@@ -145,19 +135,19 @@ ThreeIsland_EventScript_AntiBiker2BikersGone::
ThreeIsland_EventScript_BikerBossIntroTrigger::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_ANTIBIKER1, ThreeIsland_Movement_SpeakRight
applymovement LOCALID_THREE_ISLAND_ANTIBIKER1, ThreeIsland_Movement_SpeakRight
waitmovement 0
msgbox ThreeIsland_Text_AreYouBossGoBackToKanto
applymovement LOCALID_PAXTON, ThreeIsland_Movement_SpeakLeft
waitmovement 0
msgbox ThreeIsland_Text_JustGotHerePal
applymovement LOCALID_ANTIBIKER1, ThreeIsland_Movement_SpeakRight
applymovement LOCALID_THREE_ISLAND_ANTIBIKER1, ThreeIsland_Movement_SpeakRight
waitmovement 0
msgbox ThreeIsland_Text_FollowersRaisingHavoc
applymovement LOCALID_PAXTON, ThreeIsland_Movement_SpeakLeft
waitmovement 0
msgbox ThreeIsland_Text_OughtToBeThankingUs
applymovement LOCALID_ANTIBIKER1, ThreeIsland_Movement_SpeakRight
applymovement LOCALID_THREE_ISLAND_ANTIBIKER1, ThreeIsland_Movement_SpeakRight
waitmovement 0
msgbox ThreeIsland_Text_YouCowardsToughInPack
setvar VAR_MAP_SCENE_THREE_ISLAND, 3
@@ -204,45 +194,45 @@ ThreeIsland_EventScript_BattleBikersTriggerRight::
ThreeIsland_EventScript_BattleBikersScene::
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_BIKER1, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_THREE_ISLAND_BIKER1, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_BIKER1, Common_Movement_ExclamationMark
applymovement LOCALID_THREE_ISLAND_BIKER1, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_BIKER1, Common_Movement_Delay48
applymovement LOCALID_THREE_ISLAND_BIKER1, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_BIKER1, ThreeIsland_Movement_BikerApproach
applymovement LOCALID_THREE_ISLAND_BIKER1, ThreeIsland_Movement_BikerApproach
waitmovement 0
playbgm MUS_ENCOUNTER_BOY, 0
msgbox ThreeIsland_Text_WannaMakeSomethingOfYourStaring, MSGBOX_YESNO
goto_if_eq VAR_RESULT, NO, ThreeIsland_EventScript_LeaveBikersAlone
msgbox ThreeIsland_Text_Biker1Intro
setvar VAR_LAST_TALKED, LOCALID_BIKER1
setvar VAR_LAST_TALKED, LOCALID_THREE_ISLAND_BIKER1
trainerbattle_no_intro TRAINER_BIKER_GOON, ThreeIsland_Text_Biker1Defeat
applymovement LOCALID_BIKER1, ThreeIsland_Movement_BikerSpeak
applymovement LOCALID_THREE_ISLAND_BIKER1, ThreeIsland_Movement_BikerSpeak
waitmovement 0
msgbox ThreeIsland_Text_Biker1PostBattle
closemessage
applymovement LOCALID_BIKER2, ThreeIsland_Movement_BikerApproach
applymovement LOCALID_THREE_ISLAND_BIKER2, ThreeIsland_Movement_BikerApproach
waitmovement 0
playbgm MUS_ENCOUNTER_BOY, 0
msgbox ThreeIsland_Text_Biker2Intro
setvar VAR_LAST_TALKED, LOCALID_BIKER2
setvar VAR_LAST_TALKED, LOCALID_THREE_ISLAND_BIKER2
trainerbattle_no_intro TRAINER_BIKER_GOON_2, ThreeIsland_Text_Biker2Defeat
applymovement LOCALID_BIKER2, ThreeIsland_Movement_BikerSpeak
applymovement LOCALID_THREE_ISLAND_BIKER2, ThreeIsland_Movement_BikerSpeak
waitmovement 0
msgbox ThreeIsland_Text_Biker2PostBattle
closemessage
applymovement LOCALID_BIKER3, ThreeIsland_Movement_BikerApproach
applymovement LOCALID_THREE_ISLAND_BIKER3, ThreeIsland_Movement_BikerApproach
waitmovement 0
playbgm MUS_ENCOUNTER_BOY, 0
msgbox ThreeIsland_Text_Biker3Intro
setvar VAR_LAST_TALKED, LOCALID_BIKER3
setvar VAR_LAST_TALKED, LOCALID_THREE_ISLAND_BIKER3
trainerbattle_no_intro TRAINER_BIKER_GOON_3, ThreeIsland_Text_Biker3Defeat
applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_THREE_ISLAND_BIKER3, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
applymovement LOCALID_BIKER4, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_BIKER5, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_THREE_ISLAND_BIKER4, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_THREE_ISLAND_BIKER5, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox ThreeIsland_Text_Biker3PostBattle
closemessage
@@ -260,45 +250,45 @@ ThreeIsland_EventScript_BattleBikersScene::
closemessage
fadescreen FADE_TO_BLACK
removeobject LOCALID_PAXTON
removeobject LOCALID_BIKER1
removeobject LOCALID_BIKER2
removeobject LOCALID_BIKER3
removeobject LOCALID_BIKER4
removeobject LOCALID_BIKER5
removeobject LOCALID_BIKER6
removeobject LOCALID_THREE_ISLAND_BIKER1
removeobject LOCALID_THREE_ISLAND_BIKER2
removeobject LOCALID_THREE_ISLAND_BIKER3
removeobject LOCALID_THREE_ISLAND_BIKER4
removeobject LOCALID_THREE_ISLAND_BIKER5
removeobject LOCALID_THREE_ISLAND_BIKER6
fadescreen FADE_FROM_BLACK
setvar VAR_MAP_SCENE_THREE_ISLAND, 4
releaseall
end
ThreeIsland_EventScript_PaxtonApproachLeft::
applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_THREE_ISLAND_BIKER3, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachLeft
waitmovement 0
return
ThreeIsland_EventScript_PaxtonApproachMidLeft::
applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_THREE_ISLAND_BIKER3, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMidLeft
waitmovement 0
return
ThreeIsland_EventScript_PaxtonApproachMid::
applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_THREE_ISLAND_BIKER3, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMid
applymovement LOCALID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton
waitmovement 0
return
ThreeIsland_EventScript_PaxtonApproachMidRight::
applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_THREE_ISLAND_BIKER3, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton
applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMidRight
waitmovement 0
return
ThreeIsland_EventScript_PaxtonApproachRight::
applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_THREE_ISLAND_BIKER3, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton
applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachRight
waitmovement 0
@@ -309,7 +299,7 @@ ThreeIsland_EventScript_LeaveBikersAlone::
closemessage
applymovement LOCALID_PLAYER, ThreeIsland_Movement_PlayerLeaveBikers
waitmovement 0
applymovement LOCALID_BIKER1, ThreeIsland_Movement_Biker1ReturnToPack
applymovement LOCALID_THREE_ISLAND_BIKER1, ThreeIsland_Movement_Biker1ReturnToPack
waitmovement 0
fadedefaultbgm
releaseall