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

12 files changed, 71 insertions, 71 deletions

diff --git a/engine/events/buena.asm b/engine/events/buena.asm
index 96290a882..26043b534 100644
--- a/engine/events/buena.asm
+++ b/engine/events/buena.asm
@@ -1,8 +1,8 @@
 Special_BuenasPassword: ; 8af6b
 	xor a
 	ld [wWhichIndexSet], a
-	ld hl, .MenuDataHeader
-	call CopyMenuDataHeader
+	ld hl, .MenuHeader
+	call CopyMenuHeader
 	ld a, [wBuenasPassword]
 	ld c, a
 	farcall GetBuenasPassword
@@ -28,16 +28,16 @@ Special_BuenasPassword: ; 8af6b
 	ret
 ; 8afa9
 
-.MenuDataHeader: ; 0x8afa9
+.MenuHeader: ; 0x8afa9
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 10, 7
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 ; 0x8afb1
 
 	db 0
 
-.MenuData2: ; 0x8afb2
+.MenuData: ; 0x8afb2
 	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	db 0 ; items
 	dw .PasswordIndices
@@ -187,8 +187,8 @@ Special_BuenaPrize: ; 8afd4
 ; 0x8b090
 
 Buena_DisplayBlueCardBalance: ; 8b090
-	ld hl, BlueCardBalanceMenuDataHeader
-	call LoadMenuDataHeader
+	ld hl, BlueCardBalanceMenuHeader
+	call LoadMenuHeader
 	ret
 ; 8b097
 
@@ -202,8 +202,8 @@ PrintBlueCardBalance: ; 8b097
 	push de
 	xor a
 	ld [hBGMapMode], a
-	ld hl, BlueCardBalanceMenuDataHeader
-	call CopyMenuDataHeader
+	ld hl, BlueCardBalanceMenuHeader
+	call CopyMenuHeader
 	call MenuBox
 	call UpdateSprites
 	call MenuBoxCoord2Tile
@@ -227,25 +227,25 @@ PrintBlueCardBalance: ; 8b097
 	db "Points@"
 ; 8b0d1
 
-BlueCardBalanceMenuDataHeader: ; 0x8b0d1
+BlueCardBalanceMenuHeader: ; 0x8b0d1
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 11, 11, 13
 ; 8b0d6
 
 Buena_PlacePrizeMenuBox: ; 8b0d6
-	ld hl, .menudataheader
-	call LoadMenuDataHeader
+	ld hl, .MenuHeader
+	call LoadMenuHeader
 	ret
 ; 8b0dd
 
-.menudataheader ; 0x8b0dd
+.MenuHeader ; 0x8b0dd
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 17, TEXTBOX_Y - 1
 ; 8b0e2
 
 Buena_PrizeMenu: ; 8b0e2
-	ld hl, .MenuDataHeader
-	call CopyMenuDataHeader
+	ld hl, .MenuHeader
+	call CopyMenuHeader
 	ld a, [MenuSelection]
 	ld [wMenuCursorBuffer], a
 	xor a
@@ -270,16 +270,16 @@ Buena_PrizeMenu: ; 8b0e2
 	ret
 ; 8b113
 
-.MenuDataHeader: ; 0x8b113
+.MenuHeader: ; 0x8b113
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 1, 1, 16, 9
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 ; 0x8b11b
 
 	db 0
 
-.MenuData2: ; 0x8b11c
+.MenuData: ; 0x8b11c
 	db SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 4, 13 ; rows, columns
 	db 1 ; spacing
diff --git a/engine/events/buena_menu.asm b/engine/events/buena_menu.asm
index cf6fecf72..5436b590e 100644
--- a/engine/events/buena_menu.asm
+++ b/engine/events/buena_menu.asm
@@ -11,8 +11,8 @@ Special_AskRememberPassword: ; 4ae12
 .DoMenu: ; 4ae1f
 	lb bc, 14, 7
 	push bc
-	ld hl, YesNoMenuDataHeader
-	call CopyMenuDataHeader
+	ld hl, YesNoMenuHeader
+	call CopyMenuHeader
 	pop bc
 	ld a, b
 	ld [wMenuBorderLeftCoord], a
diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm
index e0426c5bd..fba2cb0ef 100755
--- a/engine/events/elevator.asm
+++ b/engine/events/elevator.asm
@@ -119,12 +119,12 @@ Elevator_GoToFloor: ; 134c0
 ; 134dd
 
 Elevator_AskWhichFloor: ; 134dd
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	ld hl, Elevator_WhichFloorText
 	call PrintText
 	call Elevator_GetCurrentFloorText
-	ld hl, Elevator_MenuDataHeader
-	call CopyMenuDataHeader
+	ld hl, Elevator_MenuHeader
+	call CopyMenuHeader
 	call InitScrollingMenu
 	call UpdateSprites
 	xor a
@@ -187,14 +187,14 @@ Elevator_GetCurrentFloorString: ; 1353f
 	ret
 ; 13550
 
-Elevator_MenuDataHeader: ; 0x13550
+Elevator_MenuHeader: ; 0x13550
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 12, 1, 18, 9
-	dw Elevator_MenuData2
+	dw Elevator_MenuData
 	db 1 ; default option
 ; 0x13558
 
-Elevator_MenuData2: ; 0x13558
+Elevator_MenuData: ; 0x13558
 	db SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 4, 0 ; rows, columns
 	db 1 ; horizontal spacing
diff --git a/engine/events/kurt.asm b/engine/events/kurt.asm
index 13bde6f7e..6547a7f30 100644
--- a/engine/events/kurt.asm
+++ b/engine/events/kurt.asm
@@ -23,7 +23,7 @@ Kurt_PrintTextHowMany: ; 8800c
 ; 0x88018
 
 Special_SelectApricornForKurt: ; 88018
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	ld c, $1
 	xor a
 	ld [wMenuScrollPosition], a
@@ -59,8 +59,8 @@ Special_SelectApricornForKurt: ; 88018
 Kurt_SelectApricorn: ; 88055
 	farcall FindApricornsInBag
 	jr c, .nope
-	ld hl, .MenuDataHeader
-	call CopyMenuDataHeader
+	ld hl, .MenuHeader
+	call CopyMenuHeader
 	ld a, [MenuSelection]
 	ld [wMenuCursorBuffer], a
 	xor a
@@ -83,16 +83,16 @@ Kurt_SelectApricorn: ; 88055
 	ret
 ; 88086
 
-.MenuDataHeader: ; 0x88086
+.MenuHeader: ; 0x88086
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 1, 1, 13, 10
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 ; 0x8808e
 
 	db 0 ; XXX
 
-.MenuData2: ; 0x8808f
+.MenuData: ; 0x8808f
 	db SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 4, 7
 	db 1
@@ -129,8 +129,8 @@ Kurt_SelectQuantity: ; 880c2
 	ld [wItemQuantityBuffer], a
 	ld a, $1
 	ld [wItemQuantityChangeBuffer], a
-	ld hl, .MenuDataHeader
-	call LoadMenuDataHeader
+	ld hl, .MenuHeader
+	call LoadMenuHeader
 .loop
 	xor a
 	ld [hBGMapMode], a
@@ -157,7 +157,7 @@ Kurt_SelectQuantity: ; 880c2
 	ret
 ; 8810d
 
-.MenuDataHeader: ; 0x8810d
+.MenuHeader: ; 0x8810d
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 6, 9, SCREEN_WIDTH - 1, 12
 	dw NULL
diff --git a/engine/events/mom.asm b/engine/events/mom.asm
index 31350ed0e..d8719e58d 100644
--- a/engine/events/mom.asm
+++ b/engine/events/mom.asm
@@ -103,9 +103,9 @@ Special_BankOfMom: ; 16218
 .AccessBankOfMom: ; 162a8
 	ld hl, UnknownText_0x1665d
 	call PrintText
-	call LoadStandardMenuDataHeader
-	ld hl, MenuDataHeader_0x166b5
-	call CopyMenuDataHeader
+	call LoadStandardMenuHeader
+	ld hl, MenuHeader_0x166b5
+	call CopyMenuHeader
 	call VerticalMenu
 	call CloseWindow
 	jr c, .cancel
@@ -147,7 +147,7 @@ Special_BankOfMom: ; 16218
 	ld [hl], a
 	ld a, 5
 	ld [wMomBankDigitCursorPosition], a
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	call Mom_SetUpDepositMenu
 	call Mom_Wait10Frames
 	call Mom_WithdrawDepositMenuJoypad
@@ -214,7 +214,7 @@ Special_BankOfMom: ; 16218
 	ld [hl], a
 	ld a, 5
 	ld [wMomBankDigitCursorPosition], a
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	call Mom_SetUpWithdrawMenu
 	call Mom_Wait10Frames
 	call Mom_WithdrawDepositMenuJoypad
@@ -727,14 +727,14 @@ Mom_HeldString: ; 166b0
 	db "HELD@"
 ; 166b5
 
-MenuDataHeader_0x166b5: ; 0x166b5
+MenuHeader_0x166b5: ; 0x166b5
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 10, 10
-	dw MenuData2_0x166bd
+	dw MenuData_0x166bd
 	db 1 ; default option
 ; 0x166bd
 
-MenuData2_0x166bd: ; 0x166bd
+MenuData_0x166bd: ; 0x166bd
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "GET@"
diff --git a/engine/events/move_deleter.asm b/engine/events/move_deleter.asm
index 3e06113ae..d5e4c56bf 100644
--- a/engine/events/move_deleter.asm
+++ b/engine/events/move_deleter.asm
@@ -19,7 +19,7 @@ Special_MoveDeletion:
 	jr z, .onlyonemove
 	ld hl, .AskWhichMoveText
 	call PrintText
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	farcall ChooseMoveToDelete
 	push af
 	call ReturnToMapWithSpeechTextbox
diff --git a/engine/events/move_tutor.asm b/engine/events/move_tutor.asm
index be5f37564..31cb20bbb 100644
--- a/engine/events/move_tutor.asm
+++ b/engine/events/move_tutor.asm
@@ -52,8 +52,8 @@ Special_MoveTutor: ; 4925b
 	ret
 
 CheckCanLearnMoveTutorMove: ; 492b9
-	ld hl, .MenuDataHeader
-	call LoadMenuDataHeader
+	ld hl, .MenuHeader
+	call LoadMenuHeader
 
 	predef CanLearnTMHMMove
 
@@ -98,6 +98,6 @@ CheckCanLearnMoveTutorMove: ; 492b9
 	scf
 	ret
 
-.MenuDataHeader: ; 0x4930a
+.MenuHeader: ; 0x4930a
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index 44a50034a..686f8560d 100755
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -578,7 +578,7 @@ FlyFunction: ; ca3b
 .outdoors
 	xor a
 	ld [hMapAnims], a
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	call ClearSprites
 	farcall _FlyMap
 	ld a, e
diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm
index 213427119..ce50e80ac 100755
--- a/engine/events/pokecenter_pc.asm
+++ b/engine/events/pokecenter_pc.asm
@@ -7,7 +7,7 @@ Special_PokemonCenterPC: ; 1559a
 	ld hl, PokecenterPCText_AccessWhosePC
 	call PC_DisplayTextWaitMenu
 	ld hl, .TopMenu
-	call LoadMenuDataHeader
+	call LoadMenuHeader
 .loop
 	xor a
 	ld [hBGMapMode], a
@@ -29,10 +29,10 @@ Special_PokemonCenterPC: ; 1559a
 .TopMenu:
 	db MENU_BACKUP_TILES | MENU_NO_CLICK_SFX ; flags
 	menu_coords 0, 0, 15, 12
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 0 ; items
 	dw .WhichPC
@@ -213,7 +213,7 @@ Function15715: ; 15715
 	ld [wPCItemsCursor], a
 	ld [wPCItemsScrollPosition], a
 	ld hl, PlayersPCMenuData
-	call LoadMenuDataHeader
+	call LoadMenuHeader
 .asm_15722
 	call UpdateTimePals
 	call DoNthMenu
@@ -234,10 +234,10 @@ PlayersPCMenuData: ; 0x15736
 	db MENU_BACKUP_TILES ; flags
 	db  0,  0 ; top left corner coords (y, x)
 	db 12, 15 ; bottom right corner coords (y, x)
-	dw .PlayersPCMenuData2
+	dw .PlayersPCMenuData
 	db 1 ; default selected option
 
-.PlayersPCMenuData2:
+.PlayersPCMenuData:
 	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 0 ; # items?
 	dw .PlayersPCMenuList1
@@ -306,7 +306,7 @@ UnknownText_0x157cc: ; 0x157cc
 ; 0x157d1
 
 PlayerWithdrawItemMenu: ; 0x157d1
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	farcall ClearPCItemScreen
 .loop
 	call PCItemsJoypad
@@ -382,7 +382,7 @@ PlayerWithdrawItemMenu: ; 0x157d1
 	db "@"
 
 PlayerTossItemMenu: ; 0x1585f
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	farcall ClearPCItemScreen
 .loop
 	call PCItemsJoypad
@@ -416,7 +416,7 @@ PlayerDepositItemMenu: ; 0x1588b
 	call .CheckItemsInBag
 	jr c, .nope
 	call DisableSpriteUpdates
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	farcall DepositSellInitPackBuffers
 .loop
 	farcall DepositSellPack
@@ -558,7 +558,7 @@ PCItemsJoypad: ; 0x15985
 	ld a, $0
 	ld [wSpriteUpdatesEnabled], a
 	ld hl, .PCItemsMenuData
-	call CopyMenuDataHeader
+	call CopyMenuHeader
 	hlcoord 0, 0
 	ld b, 10
 	ld c, 18
@@ -621,10 +621,10 @@ PCItemsJoypad: ; 0x15985
 .PCItemsMenuData:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 4, 1, 18, 10
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db SCROLLINGMENU_ENABLE_SELECT | SCROLLINGMENU_ENABLE_FUNCTION3 | SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 4, 8 ; rows/cols?
 	db 2 ; horizontal spacing?
diff --git a/engine/events/pokepic.asm b/engine/events/pokepic.asm
index e9e14bbf4..be1cad82a 100755
--- a/engine/events/pokepic.asm
+++ b/engine/events/pokepic.asm
@@ -1,6 +1,6 @@
 Pokepic:: ; 244e3
-	ld hl, PokepicMenuDataHeader
-	call CopyMenuDataHeader
+	ld hl, PokepicMenuHeader
+	call CopyMenuHeader
 	call MenuBox
 	call UpdateSprites
 	call ApplyTilemap
@@ -28,8 +28,8 @@ Pokepic:: ; 244e3
 	ret
 
 ClosePokepic:: ; 24528
-	ld hl, PokepicMenuDataHeader
-	call CopyMenuDataHeader
+	ld hl, PokepicMenuHeader
+	call CopyMenuHeader
 	call ClearMenuBoxInterior
 	call WaitBGMap
 	call GetMemSGBLayout
@@ -41,7 +41,7 @@ ClosePokepic:: ; 24528
 	call LoadStandardFont
 	ret
 
-PokepicMenuDataHeader: ; 0x24547
+PokepicMenuHeader: ; 0x24547
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 6, 4, 14, 13
 	dw NULL
diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm
index eff1ab8f6..42dce7c65 100644
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -1811,7 +1811,7 @@ CoinVendor_IntroScript: ; 0xbcde0
 
 .loop ; 0xbcde4
 	special Special_DisplayMoneyAndCoinBalance
-	loadmenudata .MenuDataHeader
+	loadmenuheader .MenuHeader
 	verticalmenu
 	closewindow
 	if_equal 1, .Buy50
@@ -1869,13 +1869,13 @@ CoinVendor_IntroScript: ; 0xbcde0
 ; 0xbce54
 
 
-.MenuDataHeader:
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 4, 15, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 3 ; items
 	db " 50 :  ¥1000@"
diff --git a/engine/events/unown_walls.asm b/engine/events/unown_walls.asm
index 4d59a2f7a..903b7bb2b 100644
--- a/engine/events/unown_walls.asm
+++ b/engine/events/unown_walls.asm
@@ -105,7 +105,7 @@ SpecialKabutoChamber: ; 8ae4e
 
 Special_DisplayUnownWords: ; 8ae68
 	ld a, [ScriptVar]
-	ld hl, MenuDataHeaders_UnownWalls
+	ld hl, MenuHeaders_UnownWalls
 	and a
 	jr z, .load
 
@@ -117,7 +117,7 @@ Special_DisplayUnownWords: ; 8ae68
 	jr nz, .loop
 
 .load
-	call LoadMenuDataHeader
+	call LoadMenuHeader
 	xor a
 	ld [hBGMapMode], a
 	call MenuBox