Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rangi
2018-01-23 16:08:43 -05:00
parent 8f2878c37e
commit ead103d2c6
76 changed files with 774 additions and 774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
maps/CeladonDeptStore6F.asm
View File

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

16
maps/CeladonGameCornerPrizeRoom.asm
View File

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

40
maps/DragonShrine.asm
View File

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

8
maps/EarlsPokemonAcademy.asm
View File

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

8
maps/GoldenrodCity.asm
View File

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

8
maps/GoldenrodDeptStore6F.asm
View File

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

16
maps/GoldenrodGameCorner.asm
View File

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

16
maps/PokecomCenterAdminRoomMobile.asm
View File

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