Merge branch 'master' of https://github.com/pret/pokeemerald

2017-11-20 18:27:23 +00:00
parent 625be4bf04 1e4f12e6fa
commit caf952e02e
27 changed files with 1034 additions and 2405 deletions
--- a/data/scripts/field_move_scripts.inc
+++ b/data/scripts/field_move_scripts.inc
@@ -116,7 +116,7 @@ Route111_EventScript_2907FB:: @ 82907FB
 	specialvar VAR_RESULT, sub_81393FC
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route111_EventScript_290829
-	special rock_smash_wild_pokemon_encounter
+	special RockSmashWildEncounter
 	compare_var_to_value VAR_RESULT, 0
 	goto_eq Route111_EventScript_290829
 	waitstate
--- a/data/scripts/maps/SeafloorCavern_Room9.inc
+++ b/data/scripts/maps/SeafloorCavern_Room9.inc
@@ -127,7 +127,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
 	clearflag FLAG_0x3E6
 	clearflag FLAG_0x3E5
 	setflag FLAG_0x347
-	setflag FLAG_0x053
+	setflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
 	clearflag FLAG_0x3B0
 	clearflag FLAG_0x3B1
 	setflag FLAG_SYS_WEATHER_CTRL
--- a/data/scripts/maps/SootopolisCity.inc
+++ b/data/scripts/maps/SootopolisCity.inc
@@ -545,7 +545,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
 	waitstate
 	clearflag FLAG_SYS_WEATHER_CTRL
 	setvar VAR_0x40CA, 3
-	clearflag FLAG_0x053
+	clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
 	fadenewbgm BGM_RUNECITY
 	delay 120
 	clearflag FLAG_SPECIAL_FLAG_0x4000
@@ -598,7 +598,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
 	waitstate
 	clearflag FLAG_SYS_WEATHER_CTRL
 	setvar VAR_0x40CA, 2
-	clearflag FLAG_0x053
+	clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
 	fadenewbgm BGM_NAMINORI
 	delay 120
 	clearflag FLAG_SPECIAL_FLAG_0x4000
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -181,7 +181,7 @@ gSpecials:: @ 81DBA64
 	def_special sub_813BF60
 	def_special sub_813BA60
 	def_special sub_813BF7C
-	def_special rock_smash_wild_pokemon_encounter
+	def_special RockSmashWildEncounter
 	def_special GabbyAndTyGetBattleNum
 	def_special GabbyAndTyAfterInterview
 	def_special GabbyAndTyBeforeInterview
--- a/data/wild_encounter.s
+++ b/data/wild_encounter.s
@@ -9,14 +9,14 @@

 	.incbin "baserom.gba", 0x55370c, 0x188

-gUnknown_08553894:: @ 8553894
+gBattlePyramidWildMonHeaders:: @ 8553894
 	.incbin "baserom.gba", 0x553894, 0x180

-gUnknown_08553A14:: @ 8553A14
+gBattlePikeWildMonHeaders:: @ 8553A14
 	.incbin "baserom.gba", 0x553a14, 0x64

-gUnknown_08553A78:: @ 8553A78
+gWildFeebasRoute119Data:: @ 8553A78
 	.incbin "baserom.gba", 0x553a78, 0x4

-gUnknown_08553A7C:: @ 8553A7C
+gRoute119WaterTileData:: @ 8553A7C
 	.incbin "baserom.gba", 0x553a7c, 0x14