Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-10-26 19:11:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion

Browse Source
This commit is contained in:
DizzyEggg
2020-04-15 13:28:10 +02:00
parent 4032160641 a12de6e480
commit 09dcff81f8
377 changed files with 8941 additions and 8689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/maps/AlteringCave/map.json
View File

@@ -3,7 +3,7 @@
"name": "AlteringCave",
"layout": "LAYOUT_ALTERING_CAVE",
"music": "MUS_RG_NANADUNGEON",
"region_map_section": "MAPSEC_ALTERING_CAVE_2",
"region_map_section": "MAPSEC_ALTERING_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_UNDERGROUND",

2
data/maps/BirthIsland_Exterior/map.json
View File

@@ -3,7 +3,7 @@
"name": "BirthIsland_Exterior",
"layout": "LAYOUT_BIRTH_ISLAND_EXTERIOR",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_BIRTH_ISLAND_2",
"region_map_section": "MAPSEC_BIRTH_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_INDOOR",

2
data/maps/BirthIsland_Harbor/map.json
View File

@@ -3,7 +3,7 @@
"name": "BirthIsland_Harbor",
"layout": "LAYOUT_ISLAND_HARBOR",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_BIRTH_ISLAND_2",
"region_map_section": "MAPSEC_BIRTH_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_INDOOR",

2
data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
View File

@@ -584,7 +584,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_ReceivePokedex:: @ 81FA3AC
message LittlerootTown_ProfessorBirchsLab_Text_ReceivedPokedex
waitfanfare
setflag FLAG_SYS_POKEDEX_GET
special sub_81AFDA0 @ sets flags that are never read
special SetUnlockedPokedexFlags
setflag FLAG_RECEIVED_POKEDEX_FROM_BIRCH
setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 1
return

2
data/maps/NavelRock_B1F/map.json
View File

@@ -3,7 +3,7 @@
"name": "NavelRock_B1F",
"layout": "LAYOUT_NAVEL_ROCK_B1F",
"music": "MUS_RG_NANADUNGEON",
"region_map_section": "MAPSEC_NAVEL_ROCK2",
"region_map_section": "MAPSEC_NAVEL_ROCK",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_UNDERGROUND",

2
data/maps/NavelRock_Bottom/map.json
View File

@@ -3,7 +3,7 @@
"name": "NavelRock_Bottom",
"layout": "LAYOUT_NAVEL_ROCK_BOTTOM",
"music": "MUS_RG_NANADUNGEON",
"region_map_section": "MAPSEC_NAVEL_ROCK2",
"region_map_section": "MAPSEC_NAVEL_ROCK",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_UNDERGROUND",

2
data/maps/NavelRock_Down01/map.json
View File

@@ -3,7 +3,7 @@
"name": "NavelRock_Down01",
"layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
"music": "MUS_RG_NANADUNGEON",
"region_map_section": "MAPSEC_NAVEL_ROCK2",
"region_map_section": "MAPSEC_NAVEL_ROCK",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_UNDERGROUND",

2
data/maps/NavelRock_Down02/map.json
View File

@@ -3,7 +3,7 @@
"name": "NavelRock_Down02",
"layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
"music": "MUS_RG_NANADUNGEON",
"region_map_section": "MAPSEC_NAVEL_ROCK2",
"region_map_section": "MAPSEC_NAVEL_ROCK",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_UNDERGROUND",

2
data/maps/NavelRock_Down03/map.json
View File

@@ -3,7 +3,7 @@
"name": "NavelRock_Down03",
"layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
"music": "MUS_RG_NANADUNGEON",
"region_map_section": "MAPSEC_NAVEL_ROCK2",
"region_map_section": "MAPSEC_NAVEL_ROCK",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_UNDERGROUND",

2
data/maps/NavelRock_Down04/map.json
View File

@@ -3,7 +3,7 @@
"name": "NavelRock_Down04",
"layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
"music": "MUS_RG_NANADUNGEON",
"region_map_section": "MAPSEC_NAVEL_ROCK2",
"region_map_section": "MAPSEC_NAVEL_ROCK",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_UNDERGROUND",

2
data/maps/NavelRock_Down05/map.json
View File

@@ -3,7 +3,7 @@
"name": "NavelRock_Down05",
"layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
"music": "MUS_RG_NANADUNGEON",
"region_map_section": "MAPSEC_NAVEL_ROCK2",
"region_map_section": "MAPSEC_NAVEL_ROCK",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_UNDERGROUND",

2
data/maps/NavelRock_Down06/map.json
View File

@@ -3,7 +3,7 @@
"name": "NavelRock_Down06",
"layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
"music": "MUS_RG_NANADUNGEON",
"region_map_section": "MAPSEC_NAVEL_ROCK2",
"region_map_section": "MAPSEC_NAVEL_ROCK",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_UNDERGROUND",

2
data/maps/NavelRock_Down07/map.json
View File

@@ -3,7 +3,7 @@
"name": "NavelRock_Down07",
"layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
"music": "MUS_RG_NANADUNGEON",
"region_map_section": "MAPSEC_NAVEL_ROCK2",
"region_map_section": "MAPSEC_NAVEL_ROCK",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_UNDERGROUND",

2
data/maps/NavelRock_Down08/map.json
View File

@@ -3,7 +3,7 @@
"name": "NavelRock_Down08",
"layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
"music": "MUS_RG_NANADUNGEON",
"region_map_section": "MAPSEC_NAVEL_ROCK2",
"region_map_section": "MAPSEC_NAVEL_ROCK",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_UNDERGROUND",

2
data/maps/NavelRock_Down09/map.json
View File

@@ -3,7 +3,7 @@
"name": "NavelRock_Down09",
"layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
"music": "MUS_RG_NANADUNGEON",
"region_map_section": "MAPSEC_NAVEL_ROCK2",
"region_map_section": "MAPSEC_NAVEL_ROCK",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_UNDERGROUND",

2
data/maps/NavelRock_Down10/map.json
View File

@@ -3,7 +3,7 @@
"name": "NavelRock_Down10",
"layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
"music": "MUS_RG_NANADUNGEON",
"region_map_section": "MAPSEC_NAVEL_ROCK2",
"region_map_section": "MAPSEC_NAVEL_ROCK",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_UNDERGROUND",

2
data/maps/NavelRock_Down11/map.json
View File

@@ -3,7 +3,7 @@
"name": "NavelRock_Down11",
"layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
"music": "MUS_RG_NANADUNGEON",
"region_map_section": "MAPSEC_NAVEL_ROCK2",
"region_map_section": "MAPSEC_NAVEL_ROCK",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_UNDERGROUND",

2
data/maps/NavelRock_Entrance/map.json
View File

@@ -3,7 +3,7 @@
"name": "NavelRock_Entrance",
"layout": "LAYOUT_NAVEL_ROCK_ENTRANCE",
"music": "MUS_RG_NANADUNGEON",
"region_map_section": "MAPSEC_NAVEL_ROCK2",
"region_map_section": "MAPSEC_NAVEL_ROCK",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_UNDERGROUND",

2
data/maps/NavelRock_Exterior/map.json
View File

@@ -3,7 +3,7 @@
"name": "NavelRock_Exterior",
"layout": "LAYOUT_NAVEL_ROCK_EXTERIOR",
"music": "MUS_RG_NANASHIMA",
"region_map_section": "MAPSEC_NAVEL_ROCK2",
"region_map_section": "MAPSEC_NAVEL_ROCK",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_INDOOR",

2
data/maps/NavelRock_Fork/map.json
View File

@@ -3,7 +3,7 @@
"name": "NavelRock_Fork",
"layout": "LAYOUT_NAVEL_ROCK_FORK",
"music": "MUS_RG_NANADUNGEON",
"region_map_section": "MAPSEC_NAVEL_ROCK2",
"region_map_section": "MAPSEC_NAVEL_ROCK",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_UNDERGROUND",

2
data/maps/NavelRock_Harbor/map.json
View File

@@ -3,7 +3,7 @@
"name": "NavelRock_Harbor",
"layout": "LAYOUT_ISLAND_HARBOR",
"music": "MUS_RG_NANASHIMA",
"region_map_section": "MAPSEC_NAVEL_ROCK2",
"region_map_section": "MAPSEC_NAVEL_ROCK",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_INDOOR",

2
data/maps/NavelRock_Top/map.json
View File

@@ -3,7 +3,7 @@
"name": "NavelRock_Top",
"layout": "LAYOUT_NAVEL_ROCK_TOP",
"music": "MUS_RG_NANADUNGEON",
"region_map_section": "MAPSEC_NAVEL_ROCK2",
"region_map_section": "MAPSEC_NAVEL_ROCK",
"requires_flash": false,
"weather": "WEATHER_SHADE",
"map_type": "MAP_TYPE_UNDERGROUND",

2
data/maps/NavelRock_Up1/map.json
View File

@@ -3,7 +3,7 @@
"name": "NavelRock_Up1",
"layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
"music": "MUS_RG_NANADUNGEON",
"region_map_section": "MAPSEC_NAVEL_ROCK2",
"region_map_section": "MAPSEC_NAVEL_ROCK",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_UNDERGROUND",

2
data/maps/NavelRock_Up2/map.json
View File

@@ -3,7 +3,7 @@
"name": "NavelRock_Up2",
"layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
"music": "MUS_RG_NANADUNGEON",
"region_map_section": "MAPSEC_NAVEL_ROCK2",
"region_map_section": "MAPSEC_NAVEL_ROCK",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_UNDERGROUND",

2
data/maps/NavelRock_Up3/map.json
View File

@@ -3,7 +3,7 @@
"name": "NavelRock_Up3",
"layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
"music": "MUS_RG_NANADUNGEON",
"region_map_section": "MAPSEC_NAVEL_ROCK2",
"region_map_section": "MAPSEC_NAVEL_ROCK",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_UNDERGROUND",

2
data/maps/NavelRock_Up4/map.json
View File

@@ -3,7 +3,7 @@
"name": "NavelRock_Up4",
"layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
"music": "MUS_RG_NANADUNGEON",
"region_map_section": "MAPSEC_NAVEL_ROCK2",
"region_map_section": "MAPSEC_NAVEL_ROCK",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_UNDERGROUND",