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

.travis.yml

@@ -14,8 +14,10 @@ cache:
   apt: true
 install:
   - pushd $HOME
-  - travis_retry wget https://github.com/devkitPro/buildscripts/releases/download/devkitARM_r50/devkitARM_r50-linux.tar.xz
+  - travis_retry wget https://github.com/devkitPro/buildscripts/releases/download/devkitARM_r52/devkitARM_r52-linux.tar.xz
   - tar xJf devkitARM*.tar.xz
+  - travis_retry wget https://github.com/devkitPro/devkitarm-rules/releases/download/v1.0.0/devkitarm-rules-1.0.0.tar.xz
+  - tar xJf devkitarm-rules-*.tar.xz -C $DEVKITARM
   - travis_retry git clone https://github.com/pret/agbcc.git
   - cd agbcc && ./build.sh && ./install.sh $TRAVIS_BUILD_DIR
   - popd

common_syms/pokedex.txt

@@ -1,2 +1,2 @@
 gUnusedPokedexU8
-gUnknown_030060B4
+gPokedexVBlankCB

data/maps/AlteringCave/map.json

@@ -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",

data/maps/BirthIsland_Exterior/map.json

@@ -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",

data/maps/BirthIsland_Harbor/map.json

@@ -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",

data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc

@@ -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

data/maps/NavelRock_B1F/map.json

@@ -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",

data/maps/NavelRock_Bottom/map.json

@@ -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",

data/maps/NavelRock_Down01/map.json

@@ -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",

data/maps/NavelRock_Down02/map.json

@@ -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",

data/maps/NavelRock_Down03/map.json

@@ -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",

data/maps/NavelRock_Down04/map.json

@@ -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",

data/maps/NavelRock_Down05/map.json

@@ -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",

data/maps/NavelRock_Down06/map.json

@@ -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",

data/maps/NavelRock_Down07/map.json

@@ -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",

data/maps/NavelRock_Down08/map.json

@@ -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",

data/maps/NavelRock_Down09/map.json

@@ -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",

data/maps/NavelRock_Down10/map.json

@@ -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",

data/maps/NavelRock_Down11/map.json

@@ -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",

data/maps/NavelRock_Entrance/map.json

@@ -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",

data/maps/NavelRock_Exterior/map.json

@@ -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",

data/maps/NavelRock_Fork/map.json

@@ -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",

data/maps/NavelRock_Harbor/map.json

@@ -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",

data/maps/NavelRock_Top/map.json

@@ -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",

data/maps/NavelRock_Up1/map.json

@@ -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",

data/maps/NavelRock_Up2/map.json

@@ -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",

data/maps/NavelRock_Up3/map.json

@@ -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",

data/maps/NavelRock_Up4/map.json

@@ -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",

data/scripts/abnormal_weather.inc

@@ -172,7 +172,7 @@ AbnormalWeather_StartGroudonWeather:: @ 8273D1B
 
 AbnormalWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F
 	lockall
-	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_KYOGRE_LOCATIONS_START
+	compare VAR_ABNORMAL_WEATHER_LOCATION, MARINE_CAVE_LOCATIONS_START
 	goto_if_ge AbnormalWeather_EventScript_ShowRainEndedMessage
 	goto AbnormalWeather_EventScript_ShowSunEndedMessage
 	end

data/scripts/secret_base.inc

@@ -301,7 +301,7 @@ SecretBase_EventScript_PutAwayDecoration:: @ 8275D2E
 	end
 
 SecretBase_EventScript_PutAwayDecorationLoop:: @ 8275D39
-	special sub_8129708
+	special PutAwayDecorationIteration
 	compare VAR_RESULT, 1
 	goto_if_eq SecretBase_EventScript_PutAwayDecorationEnd
 	addvar VAR_0x8004, 1

data/specials.inc

@@ -31,7 +31,7 @@ gSpecials:: @ 81DBA64
 	def_special GetObjectEventLocalIdByFlag
 	def_special GetSecretBaseTypeInFrontOfPlayer
 	def_special SetSecretBaseOwnerGfxId
-	def_special sub_8129708
+	def_special PutAwayDecorationIteration
 	def_special EnterNewlyCreatedSecretBase
 	def_special SetBattledOwnerFromResult
 	def_special DoSecretBasePCTurnOffEffect
@@ -504,7 +504,7 @@ gSpecials:: @ 81DBA64
 	def_special GetMartEmployeeObjectEventId
 	def_special sub_80A08CC
 	def_special Unused_SetWeatherSunny
-	def_special sub_81AFDA0
+	def_special SetUnlockedPokedexFlags
 	def_special IsTrainerRegistered
 	def_special ShouldDoBrailleRegicePuzzle
 	def_special EnableNationalPokedex