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

Name unused house maps/map groups

Browse Source
This commit is contained in:
GriffinR
2021-05-13 12:51:45 -04:00
parent 75f2be2e29
commit 7deccc36b7
15 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+4 -4
View File
@@ -440,7 +440,7 @@ gStdScriptsEnd::
.include "data/maps/Route5_PokemonDayCare/scripts.inc"
.include "data/maps/Route5_SouthEntrance/scripts.inc"
.include "data/maps/Route6_NorthEntrance/scripts.inc"
.include "data/maps/UnknownMap_18_01/scripts.inc"
.include "data/maps/Route6_UnusedHouse/scripts.inc"
.include "data/maps/Route7_EastEntrance/scripts.inc"
.include "data/maps/Route8_WestEntrance/scripts.inc"
.include "data/maps/Route10_PokemonCenter_1F/scripts.inc"
@@ -457,16 +457,16 @@ gStdScriptsEnd::
.include "data/maps/Route16_NorthEntrance_2F/scripts.inc"
.include "data/maps/Route18_EastEntrance_1F/scripts.inc"
.include "data/maps/Route18_EastEntrance_2F/scripts.inc"
.include "data/maps/UnusedHouse_27_00/scripts.inc"
.include "data/maps/Route19_UnusedHouse/scripts.inc"
.include "data/maps/Route22_NorthEntrance/scripts.inc"
.include "data/maps/UnusedHouse_29_00/scripts.inc"
.include "data/maps/Route23_UnusedHouse/scripts.inc"
.include "data/maps/Route25_SeaCottage/scripts.inc"
.include "data/maps/SevenIsland_House_Room1/scripts.inc"
.include "data/maps/SevenIsland_House_Room2/scripts.inc"
.include "data/maps/SevenIsland_Mart/scripts.inc"
.include "data/maps/SevenIsland_PokemonCenter_1F/scripts.inc"
.include "data/maps/SevenIsland_PokemonCenter_2F/scripts.inc"
.include "data/maps/UnusedHouse_31_05/scripts.inc"
.include "data/maps/SevenIsland_UnusedHouse/scripts.inc"
.include "data/maps/SevenIsland_Harbor/scripts.inc"
.include "data/maps/OneIsland_PokemonCenter_1F/scripts.inc"
.include "data/maps/OneIsland_PokemonCenter_2F/scripts.inc"
data/maps/UnusedHouse_27_00/map.json → data/maps/Route19_UnusedHouse/map.json
+2 -2
View File
@@ -1,6 +1,6 @@
{
"id": "MAP_UNUSED_HOUSE_27_00",
"name": "UnusedHouse_27_00",
"id": "MAP_ROUTE19_UNUSED_HOUSE",
"name": "Route19_UnusedHouse",
"layout": "LAYOUT_HOUSE2",
"music": "MUS_ROUTE3",
"region_map_section": "MAPSEC_ROUTE_19",
data/maps/Route19_UnusedHouse/scripts.inc
+2
View File
@@ -0,0 +1,2 @@
Route19_UnusedHouse_MapScripts:: @ 81704FA
.byte 0
data/maps/UnusedHouse_29_00/map.json → data/maps/Route23_UnusedHouse/map.json
+2 -2
View File
@@ -1,6 +1,6 @@
{
"id": "MAP_UNUSED_HOUSE_29_00",
"name": "UnusedHouse_29_00",
"id": "MAP_ROUTE23_UNUSED_HOUSE",
"name": "Route23_UnusedHouse",
"layout": "LAYOUT_HOUSE2",
"music": "MUS_VICTORY_ROAD",
"region_map_section": "MAPSEC_ROUTE_23",
data/maps/Route23_UnusedHouse/scripts.inc
+2
View File
@@ -0,0 +1,2 @@
Route23_UnusedHouse_MapScripts:: @ 8170522
.byte 0
data/maps/UnknownMap_18_01/map.json → data/maps/Route6_UnusedHouse/map.json
+2 -2
View File
@@ -1,6 +1,6 @@
{
"id": "MAP_UNKNOWN_MAP_18_01",
"name": "UnknownMap_18_01",
"id": "MAP_ROUTE6_UNUSED_HOUSE",
"name": "Route6_UnusedHouse",
"layout": "LAYOUT_HOUSE2",
"music": "MUS_ROUTE3",
"region_map_section": "MAPSEC_ROUTE_6",
data/maps/Route6_UnusedHouse/scripts.inc
+2
View File
@@ -0,0 +1,2 @@
Route6_UnusedHouse_MapScripts:: @ 816FA8C
.byte 0
data/maps/UnusedHouse_31_05/map.json → data/maps/SevenIsland_UnusedHouse/map.json
+2 -2
View File
@@ -1,6 +1,6 @@
{
"id": "MAP_UNUSED_HOUSE_31_05",
"name": "UnusedHouse_31_05",
"id": "MAP_SEVEN_ISLAND_UNUSED_HOUSE",
"name": "SevenIsland_UnusedHouse",
"layout": "LAYOUT_HOUSE4",
"music": "MUS_SEVII_67",
"region_map_section": "MAPSEC_SEVEN_ISLAND",
data/maps/SevenIsland_UnusedHouse/scripts.inc
+2
View File
@@ -0,0 +1,2 @@
SevenIsland_UnusedHouse_MapScripts:: @ 8170BE3
.byte 0
data/maps/UnknownMap_18_01/scripts.inc
-2
View File
@@ -1,2 +0,0 @@
UnknownMap_18_01_MapScripts:: @ 816FA8C
.byte 0
data/maps/UnusedHouse_27_00/scripts.inc
-2
View File
@@ -1,2 +0,0 @@
UnusedHouse_27_00_MapScripts:: @ 81704FA
.byte 0
data/maps/UnusedHouse_29_00/scripts.inc
-2
View File
@@ -1,2 +0,0 @@
UnusedHouse_29_00_MapScripts:: @ 8170522
.byte 0
data/maps/UnusedHouse_31_05/scripts.inc
-2
View File
@@ -1,2 +0,0 @@
UnusedHouse_31_05_MapScripts:: @ 8170BE3
.byte 0
data/maps/map_groups.json
+8 -8
View File
@@ -27,9 +27,9 @@
"gMapGroup_IndoorRoute15",
"gMapGroup_IndoorRoute16",
"gMapGroup_IndoorRoute18",
"gMapGroup_IndoorUnused1",
"gMapGroup_IndoorRoute19",
"gMapGroup_IndoorRoute22",
"gMapGroup_IndoorUnused2",
"gMapGroup_IndoorRoute23",
"gMapGroup_IndoorRoute25",
"gMapGroup_IndoorSevenIsland",
"gMapGroup_IndoorOneIsland",
@@ -436,7 +436,7 @@
],
"gMapGroup_IndoorRoute6": [
"Route6_NorthEntrance",
"UnknownMap_18_01"
"Route6_UnusedHouse"
],
"gMapGroup_IndoorRoute7": [
"Route7_EastEntrance"
@@ -470,14 +470,14 @@
"Route18_EastEntrance_1F",
"Route18_EastEntrance_2F"
],
"gMapGroup_IndoorUnused1": [
"UnusedHouse_27_00"
"gMapGroup_IndoorRoute19": [
"Route19_UnusedHouse"
],
"gMapGroup_IndoorRoute22": [
"Route22_NorthEntrance"
],
"gMapGroup_IndoorUnused2": [
"UnusedHouse_29_00"
"gMapGroup_IndoorRoute23": [
"Route23_UnusedHouse"
],
"gMapGroup_IndoorRoute25": [
"Route25_SeaCottage"
@@ -488,7 +488,7 @@
"SevenIsland_Mart",
"SevenIsland_PokemonCenter_1F",
"SevenIsland_PokemonCenter_2F",
"UnusedHouse_31_05",
"SevenIsland_UnusedHouse",
"SevenIsland_Harbor"
],
"gMapGroup_IndoorOneIsland": [
include/constants/map_groups.h
+6 -6
View File
@@ -397,7 +397,7 @@
// gMapGroup_IndoorRoute6
#define MAP_ROUTE6_NORTH_ENTRANCE (0 | (18 << 8))
#define MAP_UNKNOWN_MAP_18_01 (1 | (18 << 8))
#define MAP_ROUTE6_UNUSED_HOUSE (1 | (18 << 8))
// gMapGroup_IndoorRoute7
#define MAP_ROUTE7_EAST_ENTRANCE (0 | (19 << 8))
@@ -431,14 +431,14 @@
#define MAP_ROUTE18_EAST_ENTRANCE_1F (0 | (26 << 8))
#define MAP_ROUTE18_EAST_ENTRANCE_2F (1 | (26 << 8))
// gMapGroup_IndoorUnused1
#define MAP_UNUSED_HOUSE_27_00 (0 | (27 << 8))
// gMapGroup_IndoorRoute19
#define MAP_ROUTE19_UNUSED_HOUSE (0 | (27 << 8))
// gMapGroup_IndoorRoute22
#define MAP_ROUTE22_NORTH_ENTRANCE (0 | (28 << 8))
// gMapGroup_IndoorUnused2
#define MAP_UNUSED_HOUSE_29_00 (0 | (29 << 8))
// gMapGroup_IndoorRoute23
#define MAP_ROUTE23_UNUSED_HOUSE (0 | (29 << 8))
// gMapGroup_IndoorRoute25
#define MAP_ROUTE25_SEA_COTTAGE (0 | (30 << 8))
@@ -449,7 +449,7 @@
#define MAP_SEVEN_ISLAND_MART (2 | (31 << 8))
#define MAP_SEVEN_ISLAND_POKEMON_CENTER_1F (3 | (31 << 8))
#define MAP_SEVEN_ISLAND_POKEMON_CENTER_2F (4 | (31 << 8))
#define MAP_UNUSED_HOUSE_31_05 (5 | (31 << 8))
#define MAP_SEVEN_ISLAND_UNUSED_HOUSE (5 | (31 << 8))
#define MAP_SEVEN_ISLAND_HARBOR (6 | (31 << 8))
// gMapGroup_IndoorOneIsland