MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440)

8 files changed, 60 insertions, 60 deletions

diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
index 5a5e37afc..188f977bb 100644
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -25,7 +25,7 @@ CeladonDeptStore6FVendingMachine:
 	writetext CeladonVendingText
 .Start:
 	special Special_PlaceMoneyTopRight
-	loadmenudata .MenuData
+	loadmenuheader .MenuHeader
 	verticalmenu
 	closewindow
 	if_equal 1, .FreshWater
@@ -79,13 +79,13 @@ CeladonDeptStore6FVendingMachine:
 	waitbutton
 	jump .Start
 
-.MenuData:
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 2, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "FRESH WATER  ¥200@"
diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
index 1caed4b19..b8d3ce032 100644
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -25,7 +25,7 @@ CeladonGameCornerPrizeRoomTMVendor:
 	writetext CeladonPrizeRoom_AskWhichPrizeText
 CeladonPrizeRoom_tmcounterloop:
 	special Special_DisplayCoinCaseBalance
-	loadmenudata CeladonPrizeRoom_TMMenuDataHeader
+	loadmenuheader CeladonPrizeRoom_TMMenuHeader
 	verticalmenu
 	closewindow
 	if_equal 1, .doubleteam
@@ -102,13 +102,13 @@ CeladonPrizeRoom_NoCoinCase:
 	closetext
 	end
 
-CeladonPrizeRoom_TMMenuDataHeader:
+CeladonPrizeRoom_TMMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 2, 15, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "TM32    1500@"
@@ -126,7 +126,7 @@ CeladonGameCornerPrizeRoomPokemonVendor:
 .loop
 	writetext CeladonPrizeRoom_AskWhichPrizeText
 	special Special_DisplayCoinCaseBalance
-	loadmenudata .MenuDataHeader
+	loadmenuheader .MenuHeader
 	verticalmenu
 	closewindow
 	if_equal 1, .pikachu
@@ -188,13 +188,13 @@ CeladonGameCornerPrizeRoomPokemonVendor:
 	takecoins 8888
 	jump .loop
 
-.MenuDataHeader:
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 2, 17, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "PIKACHU    2222@"
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index 8be52840d..54797c90f 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -30,7 +30,7 @@ DragonShrine_MapScripts:
 	setevent EVENT_RECEIVED_BALLS_FROM_KURT
 	writetext DragonShrineQuestion1Text
 	buttonsound
-	loadmenudata DragonShrineQuestion1_MenuDataHeader
+	loadmenuheader DragonShrineQuestion1_MenuHeader
 	verticalmenu
 	closewindow
 	if_equal 1, .RightAnswer
@@ -42,7 +42,7 @@ DragonShrine_MapScripts:
 	setevent EVENT_DRAGON_SHRINE_QUESTION_2
 	writetext DragonShrineQuestion2Text
 	buttonsound
-	loadmenudata DragonShrineQuestion2_MenuDataHeader
+	loadmenuheader DragonShrineQuestion2_MenuHeader
 	verticalmenu
 	closewindow
 	if_equal 1, .RightAnswer
@@ -52,7 +52,7 @@ DragonShrine_MapScripts:
 	setevent EVENT_DRAGON_SHRINE_QUESTION_3
 	writetext DragonShrineQuestion3Text
 	buttonsound
-	loadmenudata DragonShrineQuestion3_MenuDataHeader
+	loadmenuheader DragonShrineQuestion3_MenuHeader
 	verticalmenu
 	closewindow
 	if_equal 1, .WrongAnswer
@@ -62,7 +62,7 @@ DragonShrine_MapScripts:
 	setevent EVENT_DRAGON_SHRINE_QUESTION_4
 	writetext DragonShrineQuestion4Text
 	buttonsound
-	loadmenudata DragonShrineQuestion4_MenuDataHeader
+	loadmenuheader DragonShrineQuestion4_MenuHeader
 	verticalmenu
 	closewindow
 	if_equal 1, .RightAnswer
@@ -72,7 +72,7 @@ DragonShrine_MapScripts:
 	setevent EVENT_DRAGON_SHRINE_QUESTION_5
 	writetext DragonShrineQuestion5Text
 	buttonsound
-	loadmenudata DragonShrineQuestion5_MenuDataHeader
+	loadmenuheader DragonShrineQuestion5_MenuHeader
 	verticalmenu
 	closewindow
 	if_equal 1, .WrongAnswer
@@ -265,65 +265,65 @@ DragonShrineElder3Script:
 	closetext
 	end
 
-DragonShrineQuestion1_MenuDataHeader:
+DragonShrineQuestion1_MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 8, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	db 3 ; items
 	db "Pal@"
 	db "Underling@"
 	db "Friend@"
 
-DragonShrineQuestion2_MenuDataHeader:
+DragonShrineQuestion2_MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 9, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	db 3 ; items
 	db "Strategy@"
 	db "Raising@"
 	db "Cheating@"
 
-DragonShrineQuestion3_MenuDataHeader:
+DragonShrineQuestion3_MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 5, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	db 3 ; items
 	db "Weak person@"
 	db "Tough person@"
 	db "Anybody@"
 
-DragonShrineQuestion4_MenuDataHeader:
+DragonShrineQuestion4_MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 8, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	db 3 ; items
 	db "Love@"
 	db "Violence@"
 	db "Knowledge@"
 
-DragonShrineQuestion5_MenuDataHeader:
+DragonShrineQuestion5_MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 12, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	db 3 ; items
 	db "Tough@"
diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm
index 1936858dd..9f2d40ad5 100644
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -66,7 +66,7 @@ AcademyBlackboard:
 	opentext
 	writetext AcademyBlackboardText
 .Loop:
-	loadmenudata .BlackboardMenuData
+	loadmenuheader .BlackboardMenuHeader
 	_2dmenu
 	closewindow
 	if_equal 1, .Poison
@@ -102,13 +102,13 @@ AcademyBlackboard:
 	waitbutton
 	jump .Loop
 
-.BlackboardMenuData:
+.BlackboardMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 11, 8
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	dn 3, 2 ; rows, columns
 	db 5 ; spacing
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index 8b64a4435..f8be7e5ca 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -65,7 +65,7 @@ MoveTutor:
 	checkcoins 4000
 	if_equal HAVE_LESS, .NotEnoughMoney
 	writetext UnknownText_0x1990ce
-	loadmenudata .MoveMenuDataHeader
+	loadmenuheader .MoveMenuHeader
 	verticalmenu
 	closewindow
 	if_equal MOVETUTOR_FLAMETHROWER, .Flamethrower
@@ -94,13 +94,13 @@ MoveTutor:
 	if_equal FALSE, .TeachMove
 	jump .Incompatible
 
-.MoveMenuDataHeader:
+.MoveMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 2, 15, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "FLAMETHROWER@"
diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm
index 73cb0f17e..49cd09ebd 100644
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -14,7 +14,7 @@ GoldenrodVendingMachine:
 	writetext GoldenrodVendingText
 .Start:
 	special Special_PlaceMoneyTopRight
-	loadmenudata .MenuData
+	loadmenuheader .MenuHeader
 	verticalmenu
 	closewindow
 	if_equal 1, .FreshWater
@@ -68,13 +68,13 @@ GoldenrodVendingMachine:
 	waitbutton
 	jump .Start
 
-.MenuData:
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 2, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "FRESH WATER  ¥200@"
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index d467e84c3..cc04df7fb 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -61,7 +61,7 @@ GoldenrodGmeCornerTMVendorScript:
 	writetext GoldenrodGameCornerPrizeVendorWhichPrizeText
 GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36
 	special Special_DisplayCoinCaseBalance
-	loadmenudata GoldenrodGameCornerTMVendorMenuData
+	loadmenuheader GoldenrodGameCornerTMVendorMenuHeader
 	verticalmenu
 	closewindow
 	if_equal 1, .Thunder
@@ -138,13 +138,13 @@ GoldenrodGameCornerPrizeVendor_NoCoinCaseScript:
 	closetext
 	end
 
-GoldenrodGameCornerTMVendorMenuData:
+GoldenrodGameCornerTMVendorMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 2, 15, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "TM25    5500@"
@@ -162,7 +162,7 @@ GoldenrodGameCornerPrizeMonVendorScript:
 .loop
 	writetext GoldenrodGameCornerPrizeVendorWhichPrizeText
 	special Special_DisplayCoinCaseBalance
-	loadmenudata .MenuDataHeader
+	loadmenuheader .MenuHeader
 	verticalmenu
 	closewindow
 	if_equal 1, .abra
@@ -224,13 +224,13 @@ GoldenrodGameCornerPrizeMonVendorScript:
 	takecoins 1500
 	jump .loop
 
-.MenuDataHeader:
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 2, 17, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "ABRA        100@"
diff --git a/maps/PokecomCenterAdminRoomMobile.asm b/maps/PokecomCenterAdminRoomMobile.asm
index 53a1043f8..063d4b2ac 100644
--- a/maps/PokecomCenterAdminRoomMobile.asm
+++ b/maps/PokecomCenterAdminRoomMobile.asm
@@ -25,7 +25,7 @@ PokecomCenterAdminRoomMobileSignpost0Script:
 	waitbutton
 UnknownScript_0x625df:
 	reloadmappart
-	loadmenudata MenuDataHeader_0x62602
+	loadmenuheader MenuHeader_0x62602
 	verticalmenu
 	closewindow
 	if_equal 1, UnknownScript_0x625f0
@@ -48,13 +48,13 @@ UnknownScript_0x62600:
 	closetext
 	end
 
-MenuDataHeader_0x62602:
+MenuHeader_0x62602:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 15, 8
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 3 ; items
 	db "#　つうしん　クラブ@" ; # COM CLUB
@@ -67,7 +67,7 @@ PokecomCenterAdminRoomMobileSignpost1Script:
 	waitbutton
 UnknownScript_0x62629:
 	reloadmappart
-	loadmenudata MenuDataHeader_0x6264c
+	loadmenuheader MenuHeader_0x6264c
 	verticalmenu
 	closewindow
 	if_equal 1, UnknownScript_0x6263a
@@ -90,13 +90,13 @@ UnknownScript_0x6264a:
 	closetext
 	end
 
-MenuDataHeader_0x6264c:
+MenuHeader_0x6264c:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 15, 8
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 3 ; items
 	db "でんわ<WO>つかうとき@" ; Use phone