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/PewterCity/map.json
+7 -7
View File
@@ -173,7 +173,7 @@
"x": 42,
"y": 21,
"elevation": 3,
"var": "VAR_0x406C",
"var": "VAR_MAP_SCENE_PEWTER_CITY",
"var_value": 0,
"script": "PewterCity_EventScript_165D8E"
},
@@ -182,7 +182,7 @@
"x": 42,
"y": 22,
"elevation": 3,
"var": "VAR_0x406C",
"var": "VAR_MAP_SCENE_PEWTER_CITY",
"var_value": 0,
"script": "PewterCity_EventScript_165D9A"
},
@@ -191,7 +191,7 @@
"x": 42,
"y": 23,
"elevation": 3,
"var": "VAR_0x406C",
"var": "VAR_MAP_SCENE_PEWTER_CITY",
"var_value": 0,
"script": "PewterCity_EventScript_165DA6"
},
@@ -200,7 +200,7 @@
"x": 43,
"y": 23,
"elevation": 3,
"var": "VAR_0x406C",
"var": "VAR_MAP_SCENE_PEWTER_CITY",
"var_value": 0,
"script": "PewterCity_EventScript_165DB2"
},
@@ -209,7 +209,7 @@
"x": 46,
"y": 21,
"elevation": 3,
"var": "VAR_0x406C",
"var": "VAR_MAP_SCENE_PEWTER_CITY",
"var_value": 1,
"script": "PewterCity_EventScript_1662B7"
},
@@ -218,7 +218,7 @@
"x": 46,
"y": 22,
"elevation": 3,
"var": "VAR_0x406C",
"var": "VAR_MAP_SCENE_PEWTER_CITY",
"var_value": 1,
"script": "PewterCity_EventScript_1662C4"
},
@@ -227,7 +227,7 @@
"x": 46,
"y": 23,
"elevation": 3,
"var": "VAR_0x406C",
"var": "VAR_MAP_SCENE_PEWTER_CITY",
"var_value": 1,
"script": "PewterCity_EventScript_1662D1"
}
data/maps/PewterCity/scripts.inc
+3 -3
View File
@@ -4,7 +4,7 @@ PewterCity_MapScripts:: @ 8165B8E
PewterCity_MapScript1_165B94:: @ 8165B94
setworldmapflag FLAG_WORLD_MAP_PEWTER_CITY
setvar VAR_0x4061, 0
setvar VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F, 0
end
PewterCity_EventScript_165B9D:: @ 8165B9D
@@ -1468,8 +1468,8 @@ EventScript_1662DE:: @ 81662DE
msgbox gUnknown_817EA36
closemessage
removeobject 7
setflag FLAG_0x82F
setvar VAR_0x406C, 2
setflag FLAG_SYS_RUNNING_SHOES
setvar VAR_MAP_SCENE_PEWTER_CITY, 2
return
EventScript_1663CA:: @ 81663CA