diff options
Diffstat (limited to 'maps/CeladonDeptStore6F.asm')
| -rw-r--r-- | maps/CeladonDeptStore6F.asm | 73 |
1 files changed, 33 insertions, 40 deletions
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 9a8c0bde8..bc67437e5 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const CELADONDEPTSTORE6F_SUPER_NERD const CELADONDEPTSTORE6F_YOUNGSTER CeladonDeptStore6F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .HideRooftopStairs .HideRooftopStairs: @@ -24,19 +22,19 @@ CeladonDeptStore6FVendingMachine: opentext writetext CeladonVendingText .Start: - special Special_PlaceMoneyTopRight - loadmenudata .MenuData + special PlaceMoneyTopRight + loadmenu .MenuHeader verticalmenu closewindow - if_equal 1, .FreshWater - if_equal 2, .SodaPop - if_equal 3, .Lemonade + ifequal 1, .FreshWater + ifequal 2, .SodaPop + ifequal 3, .Lemonade closetext end .FreshWater: checkmoney YOUR_MONEY, 200 - if_equal HAVE_LESS, .NotEnoughMoney + ifequal HAVE_LESS, .NotEnoughMoney giveitem FRESH_WATER iffalse .NotEnoughSpace takemoney YOUR_MONEY, 200 @@ -45,7 +43,7 @@ CeladonDeptStore6FVendingMachine: .SodaPop: checkmoney YOUR_MONEY, 300 - if_equal HAVE_LESS, .NotEnoughMoney + ifequal HAVE_LESS, .NotEnoughMoney giveitem SODA_POP iffalse .NotEnoughSpace takemoney YOUR_MONEY, 300 @@ -54,7 +52,7 @@ CeladonDeptStore6FVendingMachine: .Lemonade: checkmoney YOUR_MONEY, 350 - if_equal HAVE_LESS, .NotEnoughMoney + ifequal HAVE_LESS, .NotEnoughMoney giveitem LEMONADE iffalse .NotEnoughSpace takemoney YOUR_MONEY, 350 @@ -79,13 +77,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@" @@ -146,27 +144,22 @@ CeladonDeptStore6FDirectoryText: done CeladonDeptStore6F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 15, 0, 2, CELADON_DEPT_STORE_5F - warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR - -.CoordEvents: - db 0 - -.BGEvents: - db 6 - bg_event 14, 0, BGEVENT_READ, CeladonDeptStore6FDirectory - bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton - bg_event 8, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine - bg_event 9, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine - bg_event 10, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine - bg_event 11, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine - -.ObjectEvents: - db 2 - object_event 9, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1 - object_event 12, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 15, 0, CELADON_DEPT_STORE_5F, 2 + warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 + + db 0 ; coord events + + db 6 ; bg events + bg_event 14, 0, BGEVENT_READ, CeladonDeptStore6FDirectory + bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton + bg_event 8, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine + bg_event 9, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine + bg_event 10, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine + bg_event 11, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine + + db 2 ; object events + object_event 9, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1 + object_event 12, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1 |