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/PokemonLeague_ChampionsRoom/map.json
+2
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_CHAMPIONS_ROOM_RIVAL",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLUE",
"x": 6,
@@ -30,6 +31,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_CHAMPIONS_ROOM_PROF_OAK",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_PROF_OAK",
"x": 6,
data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+7 -10
View File
@@ -1,6 +1,3 @@
.equ LOCALID_RIVAL, 1
.equ LOCALID_PROF_OAK, 2
PokemonLeague_ChampionsRoom_MapScripts::
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_ChampionsRoom_OnWarp
map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_ChampionsRoom_OnResume
@@ -67,29 +64,29 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom::
setflag FLAG_TEMP_4
msgbox PokemonLeague_ChampionsRoom_Text_PostBattle
playbgm MUS_SLOW_PALLET, 0
addobject LOCALID_PROF_OAK
addobject LOCALID_CHAMPIONS_ROOM_PROF_OAK
msgbox PokemonLeague_ChampionsRoom_Text_OakPlayer
closemessage
applymovement LOCALID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerWatchOakEnter
applymovement LOCALID_RIVAL, PokemonLeague_ChampionsRoom_Movement_RivalWatchOakEnter
applymovement LOCALID_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakEnter
applymovement LOCALID_CHAMPIONS_ROOM_RIVAL, PokemonLeague_ChampionsRoom_Movement_RivalWatchOakEnter
applymovement LOCALID_CHAMPIONS_ROOM_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakEnter
waitmovement 0
delay 25
specialvar VAR_RESULT, GetStarterSpecies
bufferspeciesname STR_VAR_1, VAR_RESULT
msgbox PokemonLeague_ChampionsRoom_Text_OakCongratulations
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_CHAMPIONS_ROOM_PROF_OAK, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_CHAMPIONS_ROOM_RIVAL, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
msgbox PokemonLeague_ChampionsRoom_Text_OakImDisappointedRival
closemessage
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_CHAMPIONS_ROOM_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
delay 20
msgbox PokemonLeague_ChampionsRoom_Text_OakPlayerComeWithMe
closemessage
delay 13
applymovement LOCALID_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakExit
applymovement LOCALID_CHAMPIONS_ROOM_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakExit
applymovement LOCALID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerExit
waitmovement 0
setvar VAR_TEMP_1, 1