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

Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452)

Browse Source 
# Conflicts:
#	data/player_names.asm
#	engine/battle/menu.asm
#	engine/billspc.asm
#	engine/billspctop.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/delete_save_change_clock.asm
#	engine/events/buena.asm
#	engine/events/elevator.asm
#	engine/events/kurt.asm
#	engine/events/mom.asm
#	engine/events/move_tutor.asm
#	engine/events/pokecenter_pc.asm
#	engine/events/pokepic.asm
#	engine/events/std_scripts.asm
#	engine/events/unown_walls.asm
#	engine/init_gender.asm
#	engine/intro_menu.asm
#	engine/mail.asm
#	engine/main_menu.asm
#	engine/mart.asm
#	engine/menu_2.asm
#	engine/mon_menu.asm
#	engine/pack.asm
#	engine/slot_machine.asm
#	engine/start_menu.asm
#	home/menu.asm
#	maps/CeladonDeptStore6F.asm
#	maps/CeladonGameCornerPrizeRoom.asm
#	maps/DragonShrine.asm
#	maps/EarlsPokemonAcademy.asm
#	maps/GoldenrodCity.asm
#	maps/GoldenrodDeptStore6F.asm
#	maps/GoldenrodGameCorner.asm
#	maps/GoldenrodPokeComCenter2FMobile.asm
#	mobile/mobile_12.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_22.asm
#	mobile/mobile_22_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_45.asm
#	mobile/mobile_45_sprite_engine.asm
#	mobile/mobile_46.asm
#	mobile/mobile_5c.asm
#	mobile/mobile_5f.asm
#	mobile/mobile_menu.asm
This commit is contained in:
Remy Oukaour
2018-01-14 23:43:51 -05:00
parent dfcca93b45 d38ed29a46
commit 14c8cf5b48
51 changed files with 571 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
maps/CeladonDeptStore6F.asm
View File

@@ -80,13 +80,13 @@ CeladonDeptStore6FVendingMachine:
jump .Start
.MenuData:
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 2, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
db $80 ; flags
db STATICMENU_CURSOR ; flags
db 4 ; items
db "FRESH WATER ¥200@"
db "SODA POP ¥300@"

8
maps/CeladonGameCornerPrizeRoom.asm
View File

@@ -103,13 +103,13 @@ CeladonPrizeRoom_NoCoinCase:
end
CeladonPrizeRoom_TMMenuDataHeader:
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 2, 15, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
db $80 ; flags
db STATICMENU_CURSOR ; flags
db 4 ; items
db "TM32 1500@"
db "TM29 3500@"
@@ -189,13 +189,13 @@ CeladonGameCornerPrizeRoomPokemonVendor:
jump .loop
.MenuDataHeader:
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 2, 17, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
db $80 ; flags
db STATICMENU_CURSOR ; flags
db 4 ; items
db "PIKACHU 2222@"
db "PORYGON 5555@"

20
maps/DragonShrine.asm
View File

@@ -266,65 +266,65 @@ DragonShrineElder3Script:
end
DragonShrineQuestion1_MenuDataHeader:
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 8, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
db $81 ; flags
db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
db 3 ; items
db "Pal@"
db "Underling@"
db "Friend@"
DragonShrineQuestion2_MenuDataHeader:
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 9, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
db $81 ; flags
db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
db 3 ; items
db "Strategy@"
db "Raising@"
db "Cheating@"
DragonShrineQuestion3_MenuDataHeader:
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 5, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
db $81 ; flags
db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
db 3 ; items
db "Weak person@"
db "Tough person@"
db "Anybody@"
DragonShrineQuestion4_MenuDataHeader:
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 8, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
db $81 ; flags
db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
db 3 ; items
db "Love@"
db "Violence@"
db "Knowledge@"
DragonShrineQuestion5_MenuDataHeader:
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 12, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
db $81 ; flags
db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
db 3 ; items
db "Tough@"
db "Both@"

4
maps/EarlsPokemonAcademy.asm
View File

@@ -103,13 +103,13 @@ AcademyBlackboard:
jump .Loop
.BlackboardMenuData:
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 11, 8
dw .MenuData2
db 1 ; default option
.MenuData2:
db $80 ; flags
db STATICMENU_CURSOR ; flags
dn 3, 2 ; rows, columns
db 5 ; spacing
dba .Text

4
maps/GoldenrodCity.asm
View File

@@ -95,13 +95,13 @@ MoveTutor:
jump .Incompatible
.MoveMenuDataHeader:
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 2, 15, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
db $80 ; flags
db STATICMENU_CURSOR ; flags
db 4 ; items
db "FLAMETHROWER@"
db "THUNDERBOLT@"

4
maps/GoldenrodDeptStore6F.asm
View File

@@ -69,13 +69,13 @@ GoldenrodVendingMachine:
jump .Start
.MenuData:
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 2, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
db $80 ; flags
db STATICMENU_CURSOR ; flags
db 4 ; items
db "FRESH WATER ¥200@"
db "SODA POP ¥300@"

8
maps/GoldenrodGameCorner.asm
View File

@@ -139,13 +139,13 @@ GoldenrodGameCornerPrizeVendor_NoCoinCaseScript:
end
GoldenrodGameCornerTMVendorMenuData:
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 2, 15, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
db $80 ; flags
db STATICMENU_CURSOR ; flags
db 4 ; items
db "TM25 5500@"
db "TM14 5500@"
@@ -225,13 +225,13 @@ GoldenrodGameCornerPrizeMonVendorScript:
jump .loop
.MenuDataHeader:
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 2, 17, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
db $80 ; flags
db STATICMENU_CURSOR ; flags
db 4 ; items
db "ABRA 100@"
db "CUBONE 800@"

8
maps/GoldenrodPokeComCenter2FMobile.asm
View File

@@ -49,13 +49,13 @@ UnknownScript_0x62600:
end
MenuDataHeader_0x62602:
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 15, 8
dw .MenuData2
db 1 ; default option
.MenuData2:
db $80 ; flags
db STATICMENU_CURSOR ; flags
db 3 ; items
db "# つうしん クラブ@" ; # COM CLUB
db "モバイルセンター@" ; MOBILE CENTER
@@ -91,13 +91,13 @@ UnknownScript_0x6264a:
end
MenuDataHeader_0x6264c:
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 15, 8
dw .MenuData2
db 1 ; default option
.MenuData2:
db $80 ; flags
db STATICMENU_CURSOR ; flags
db 3 ; items
db "でんわ", $1f,"つかうとき@" ; Use phone
db "でんわ", $4a,"つながらないとき@" ; Don't use phone