dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename map scene vars and partially document Oak's lab

Browse Source
This commit is contained in:
PikalaxALT
2019-10-18 12:49:59 -04:00
parent 9903f7a77a
commit 4f15cb02d2
89 changed files with 475 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeruleanCity/events_bad.inc
-43
View File
@@ -1,43 +0,0 @@
CeruleanCity_EventObjects:
object_event 1, 60, 0, 31, 0, 12, 0, 3, 8, 17, 0, 0, 0
object_event 2, 49, 0, 33, 0, 6, 0, 3, 1, 17, 0, 0, 0
object_event 3, 16, 0, 16, 0, 21, 0, 3, 3, 49, 0, 0, 0
object_event 4, 30, 0, 9, 0, 23, 0, 3, 2, 17, 0, 0, 0
object_event 5, 129, 0, 32, 0, 29, 0, 3, 8, 17, 0, 0, 0
object_event 6, 22, 0, 33, 0, 29, 0, 3, 9, 17, 0, 0, 0
object_event 7, 18, 0, 34, 0, 22, 0, 3, 8, 17, 0, 0, 0
object_event 8, 72, 0, 22, 0, 0, 0, 3, 8, 17, 0, 0, 0
object_event 9, 95, 0, 26, 0, 32, 0, 3, 8, 17, 0, 0, 0
object_event 10, 65375, 0, 50, 0, 18, 0, 10, 0, 0, 0, 27, 0
object_event 11, 23, 0, 12, 0, 30, 0, 3, 7, 17, 0, 0, 0
object_event 12, 41, 0, 1, 0, 13, 0, 3, 8, 17, 0, 0, 0
CeruleanCity_MapWarps:
warp_def 10, 11, 0, 1, MAP_CERULEAN_CITY_HOUSE1
warp_def 30, 11, 0, 1, MAP_CERULEAN_CITY_HOUSE2
warp_def 15, 17, 0, 1, MAP_CERULEAN_CITY_HOUSE3
warp_def 22, 19, 0, 1, MAP_CERULEAN_CITY_POKEMONCENTER_1F
warp_def 31, 21, 0, 1, MAP_CERULEAN_CITY_GYM
warp_def 13, 28, 3, 1, MAP_CERULEAN_CITY_BIKESHOP
warp_def 29, 28, 0, 1, MAP_CERULEAN_CITY_MART
warp_def 1, 12, 0, 0, MAP_CERULEAN_CAVE_1F
warp_def 10, 8, 3, 3, MAP_CERULEAN_CITY_HOUSE1
warp_def 31, 8, 3, 3, MAP_CERULEAN_CITY_HOUSE2
warp_def 31, 9, 3, 3, MAP_CERULEAN_CITY_HOUSE2
warp_def 14, 28, 3, 1, MAP_CERULEAN_CITY_BIKESHOP
warp_def 23, 28, 0, 0, MAP_CERULEAN_CITY_HOUSE4
warp_def 17, 11, 0, 0, MAP_CERULEAN_CITY_HOUSE5
CeruleanCity_MapCoordEvents:
coord_event 22, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_16649A
coord_event 23, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_1664A6
coord_event 24, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_1664B9
coord_event 33, 5, 3, VAR_0x407D, , CeruleanCity_EventScript_166683
coord_event 33, 7, 3, VAR_0x407D, , CeruleanCity_EventScript_1666A3
CeruleanCity_MapBGEvents:
bg_hidden_item_event 18, 7, 3, ITEM_RARE_CANDY,
CeruleanCity_MapEvents::
map_events CeruleanCity_EventObjects, CeruleanCity_MapWarps, CeruleanCity_MapCoordEvents, CeruleanCity_MapBGEvents
data/maps/CeruleanCity/map.json
+5 -5
View File
@@ -297,7 +297,7 @@
"x": 22,
"y": 6,
"elevation": 3,
"var": "VAR_0x4052",
"var": "VAR_MAP_SCENE_CERULEAN_CITY_RIVAL",
"var_value": 0,
"script": "CeruleanCity_EventScript_16649A"
},
@@ -306,7 +306,7 @@
"x": 23,
"y": 6,
"elevation": 3,
"var": "VAR_0x4052",
"var": "VAR_MAP_SCENE_CERULEAN_CITY_RIVAL",
"var_value": 0,
"script": "CeruleanCity_EventScript_1664A6"
},
@@ -315,7 +315,7 @@
"x": 24,
"y": 6,
"elevation": 3,
"var": "VAR_0x4052",
"var": "VAR_MAP_SCENE_CERULEAN_CITY_RIVAL",
"var_value": 0,
"script": "CeruleanCity_EventScript_1664B9"
},
@@ -324,7 +324,7 @@
"x": 33,
"y": 5,
"elevation": 3,
"var": "VAR_0x407D",
"var": "VAR_MAP_SCENE_CERULEAN_CITY_ROCKET",
"var_value": 0,
"script": "CeruleanCity_EventScript_166683"
},
@@ -333,7 +333,7 @@
"x": 33,
"y": 7,
"elevation": 3,
"var": "VAR_0x407D",
"var": "VAR_MAP_SCENE_CERULEAN_CITY_ROCKET",
"var_value": 0,
"script": "CeruleanCity_EventScript_1666A3"
}
data/maps/CeruleanCity/scripts.inc
+4 -4
View File
@@ -36,7 +36,7 @@ CeruleanCity_EventScript_1664B9:: @ 81664B9
EventScript_1664CC:: @ 81664CC
textcolor 0
setvar VAR_0x4054, 2
setvar VAR_MAP_SCENE_ROUTE22, 2
playbgm MUS_RIVAL1, 0
addobject 8
applymovement 8, Movement_1665D3
@@ -62,7 +62,7 @@ EventScript_1664CC:: @ 81664CC
compare_var_to_value VAR_0x4001, 2
call_if 1, EventScript_1665B5
msgbox gUnknown_817ECD4
setvar VAR_0x4052, 1
setvar VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1
setflag FLAG_0x29B
giveitem ITEM_FAME_CHECKER
msgbox gUnknown_817ED5D
@@ -180,7 +180,7 @@ CeruleanCity_EventScript_166603:: @ 8166603
playbgm MUS_ROCKET, 0
waitbuttonpress
trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70
setvar VAR_0x407D, 1
setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1
goto EventScript_16662E
end
@@ -231,7 +231,7 @@ EventScript_1666C3:: @ 81666C3
msgbox Text_17EE0E
setvar VAR_LAST_TALKED, 2
trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70
setvar VAR_0x407D, 1
setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1
goto EventScript_16662E
end