more overworld work

2018-02-12 18:26:26 +01:00
parent 382442c4c8
commit f22be4d010
15 changed files with 613 additions and 1530 deletions
--- a/data/field_screen.s
+++ b/data/field_screen.s
@@ -483,7 +483,7 @@ gUnknown_0854FE64:: @ 854FE64
 	.2byte 0x00c8, 0x0048, 0x0040, 0x0038, 0x0030, 0x0028, 0x0020, 0x0018, 0x0000, 0x0000

 	.align 2
-gUnknown_0854FE78:: @ 854FE78
+gMaxFlashLevel:: @ 854FE78
 	.4byte 0x00000008

 	.align 2
--- a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc
+++ b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc
@@ -28,7 +28,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77
 	end

 BattleFrontier_BattlePyramidEmptySquare_EventScript_252A8F:: @ 8252A8F
-	special AddMapNamePopUpWindowTask
+	special ShowMapNamePopup
 	setvar VAR_0x400F, 0
 	end

--- a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc
+++ b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc
@@ -64,7 +64,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255180:: @ 8255180
 	end

 BattleFrontier_BattlePyramidTop_EventScript_25518A:: @ 825518A
-	special AddMapNamePopUpWindowTask
+	special ShowMapNamePopup
 	setvar VAR_0x400F, 0
 	end

--- a/data/specials.inc
+++ b/data/specials.inc
@@ -417,8 +417,8 @@ gSpecials:: @ 81DBA64
 	def_special sub_813B880
 	def_special sub_81A085C
 	def_special ShouldTryGetTrainerScript
-	def_special AddMapNamePopUpWindowTask
-	def_special AddMapNamePopUpWindowTask
+	def_special ShowMapNamePopup
+	def_special ShowMapNamePopup
 	def_special sub_81BE994
 	def_special sub_81BE79C
 	def_special sub_81BE7F4