diff options
18 files changed, 332 insertions, 327 deletions
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json index 75a1fddf9..abc4e18dd 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStoreElevator_EventScript_220624", + "script": "LilycoveCity_DepartmentStoreElevator_EventScript_Attendant", "flag": "0" } ], diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc index d7061d7e4..b7d6e4a49 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc @@ -1,11 +1,11 @@ LilycoveCity_DepartmentStoreElevator_MapScripts:: @ 8220623 .byte 0 -LilycoveCity_DepartmentStoreElevator_EventScript_220624:: @ 8220624 +LilycoveCity_DepartmentStoreElevator_EventScript_Attendant:: @ 8220624 lock faceplayer setvar VAR_0x8004, 0 - call_if_unset FLAG_TEMP_2, LilycoveCity_DepartmentStoreElevator_EventScript_2207FC + call_if_unset FLAG_TEMP_2, LilycoveCity_DepartmentStoreElevator_EventScript_SetFloor copyvar VAR_0x8005, VAR_DEPT_STORE_FLOOR special ShowDeptStoreElevatorFloorSelect message gText_WhichFloorWouldYouLike @@ -13,105 +13,106 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220624:: @ 8220624 setvar VAR_0x8004, 0 specialvar VAR_RESULT, GetDeptStoreDefaultFloorChoice switch VAR_RESULT - case 0, LilycoveCity_DepartmentStoreElevator_EventScript_220689 - case 1, LilycoveCity_DepartmentStoreElevator_EventScript_220695 - case 2, LilycoveCity_DepartmentStoreElevator_EventScript_2206A1 - case 3, LilycoveCity_DepartmentStoreElevator_EventScript_2206AD - case 4, LilycoveCity_DepartmentStoreElevator_EventScript_2206B9 + case 0, LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom5th + case 1, LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom4th + case 2, LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom3rd + case 3, LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom2nd + case 4, LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom1st end -LilycoveCity_DepartmentStoreElevator_EventScript_220689:: @ 8220689 +@ Below scripts ensure the cursor for floor select always starts on the current floor +LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom5th:: @ 8220689 multichoicedefault 0, 0, MULTI_FLOORS, 0, 0 - goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5 + goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor end -LilycoveCity_DepartmentStoreElevator_EventScript_220695:: @ 8220695 +LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom4th:: @ 8220695 multichoicedefault 0, 0, MULTI_FLOORS, 1, 0 - goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5 + goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor end -LilycoveCity_DepartmentStoreElevator_EventScript_2206A1:: @ 82206A1 +LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom3rd:: @ 82206A1 multichoicedefault 0, 0, MULTI_FLOORS, 2, 0 - goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5 + goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor end -LilycoveCity_DepartmentStoreElevator_EventScript_2206AD:: @ 82206AD +LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom2nd:: @ 82206AD multichoicedefault 0, 0, MULTI_FLOORS, 3, 0 - goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5 + goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor end -LilycoveCity_DepartmentStoreElevator_EventScript_2206B9:: @ 82206B9 +LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom1st:: @ 82206B9 multichoicedefault 0, 0, MULTI_FLOORS, 4, 0 - goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5 + goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor end -LilycoveCity_DepartmentStoreElevator_EventScript_2206C5:: @ 82206C5 +LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor:: @ 82206C5 switch VAR_RESULT - case 0, LilycoveCity_DepartmentStoreElevator_EventScript_2207B8 - case 1, LilycoveCity_DepartmentStoreElevator_EventScript_220790 - case 2, LilycoveCity_DepartmentStoreElevator_EventScript_220768 - case 3, LilycoveCity_DepartmentStoreElevator_EventScript_220740 - case 4, LilycoveCity_DepartmentStoreElevator_EventScript_220718 - case 5, LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 - case MULTI_B_PRESSED, LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 + case 0, LilycoveCity_DepartmentStoreElevator_EventScript_5thFloor + case 1, LilycoveCity_DepartmentStoreElevator_EventScript_4thFloor + case 2, LilycoveCity_DepartmentStoreElevator_EventScript_3rdFloor + case 3, LilycoveCity_DepartmentStoreElevator_EventScript_2ndFloor + case 4, LilycoveCity_DepartmentStoreElevator_EventScript_1stFloor + case 5, LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect + case MULTI_B_PRESSED, LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect end -LilycoveCity_DepartmentStoreElevator_EventScript_220718:: @ 8220718 +LilycoveCity_DepartmentStoreElevator_EventScript_1stFloor:: @ 8220718 setvar VAR_0x8006, DEPT_STORE_FLOORNUM_1F setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_1F - goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 - call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect + call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_1F - goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 + goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect end -LilycoveCity_DepartmentStoreElevator_EventScript_220740:: @ 8220740 +LilycoveCity_DepartmentStoreElevator_EventScript_2ndFloor:: @ 8220740 setvar VAR_0x8006, DEPT_STORE_FLOORNUM_2F setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_2F - goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 - call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect + call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_2F - goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 + goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect end -LilycoveCity_DepartmentStoreElevator_EventScript_220768:: @ 8220768 +LilycoveCity_DepartmentStoreElevator_EventScript_3rdFloor:: @ 8220768 setvar VAR_0x8006, DEPT_STORE_FLOORNUM_3F setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_3F - goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 - call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect + call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_3F - goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 + goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect end -LilycoveCity_DepartmentStoreElevator_EventScript_220790:: @ 8220790 +LilycoveCity_DepartmentStoreElevator_EventScript_4thFloor:: @ 8220790 setvar VAR_0x8006, DEPT_STORE_FLOORNUM_4F setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_4F - goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 - call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect + call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_4F - goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 + goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect end -LilycoveCity_DepartmentStoreElevator_EventScript_2207B8:: @ 82207B8 +LilycoveCity_DepartmentStoreElevator_EventScript_5thFloor:: @ 82207B8 setvar VAR_0x8006, DEPT_STORE_FLOORNUM_5F setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_5F - goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 - call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect + call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_5F - goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 + goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect end -LilycoveCity_DepartmentStoreElevator_EventScript_2207E0:: @ 82207E0 +LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect:: @ 82207E0 special CloseDeptStoreElevatorWindow release end -LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5 +LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator:: @ 82207E5 special CloseDeptStoreElevatorWindow closemessage applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown @@ -122,7 +123,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5 setflag FLAG_TEMP_2 return -LilycoveCity_DepartmentStoreElevator_EventScript_2207FC:: @ 82207FC +LilycoveCity_DepartmentStoreElevator_EventScript_SetFloor:: @ 82207FC special SetDeptStoreFloor return diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json index 06159b81a..44f54006c 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_220268", + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_Man", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_22028C", + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_ThirstyMan", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_22022F", + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_SaleWoman", "flag": "FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN" }, { @@ -84,7 +84,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_220295" + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_VendingMachine" }, { "type": "sign", @@ -92,7 +92,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_220295" + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_VendingMachine" } ] }
\ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index 44b9b2d24..0cb3e79fe 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -4,32 +4,32 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 8220207 LilycoveCity_DepartmentStoreRooftop_OnTransition: @ 822020D getpricereduction POKENEWS_LILYCOVE - compare VAR_RESULT, 1 - call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220227 - compare VAR_RESULT, 0 - call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_22022B + compare VAR_RESULT, TRUE + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_ShowSaleWoman + compare VAR_RESULT, FALSE + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_HideSaleWoman end -LilycoveCity_DepartmentStoreRooftop_EventScript_220227:: @ 8220227 +LilycoveCity_DepartmentStoreRooftop_EventScript_ShowSaleWoman:: @ 8220227 clearflag FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN return -LilycoveCity_DepartmentStoreRooftop_EventScript_22022B:: @ 822022B +LilycoveCity_DepartmentStoreRooftop_EventScript_HideSaleWoman:: @ 822022B setflag FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN return -LilycoveCity_DepartmentStoreRooftop_EventScript_22022F:: @ 822022F +LilycoveCity_DepartmentStoreRooftop_EventScript_SaleWoman:: @ 822022F lock faceplayer message gText_HowMayIServeYou waitmessage - pokemartdecoration LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248 + pokemartdecoration LilycoveCity_DepartmentStoreRooftop_PokemartDecor_ClearOutSale msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248: @ 8220248 +LilycoveCity_DepartmentStoreRooftop_PokemartDecor_ClearOutSale: @ 8220248 .2byte DECOR_MUD_BALL .2byte DECOR_FENCE_LENGTH .2byte DECOR_FENCE_WIDTH @@ -48,189 +48,189 @@ LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248: @ 8220248 release end -LilycoveCity_DepartmentStoreRooftop_EventScript_220268:: @ 8220268 +LilycoveCity_DepartmentStoreRooftop_EventScript_Man:: @ 8220268 lock faceplayer getpricereduction POKENEWS_LILYCOVE - compare VAR_RESULT, 1 - call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220282 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_220463, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_ManClearOutSale + msgbox LilycoveCity_DepartmentStoreRooftop_Text_SetDatesForClearOutSales, MSGBOX_DEFAULT release end -LilycoveCity_DepartmentStoreRooftop_EventScript_220282:: @ 8220282 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2204C9, MSGBOX_DEFAULT +LilycoveCity_DepartmentStoreRooftop_EventScript_ManClearOutSale:: @ 8220282 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_BeenWaitingForClearOutSale, MSGBOX_DEFAULT release end -LilycoveCity_DepartmentStoreRooftop_EventScript_22028C:: @ 822028C - msgbox LilycoveCity_DepartmentStoreRooftop_Text_220552, MSGBOX_NPC +LilycoveCity_DepartmentStoreRooftop_EventScript_ThirstyMan:: @ 822028C + msgbox LilycoveCity_DepartmentStoreRooftop_Text_BoneDryThirsty, MSGBOX_NPC end -LilycoveCity_DepartmentStoreRooftop_EventScript_220295:: @ 8220295 +LilycoveCity_DepartmentStoreRooftop_EventScript_VendingMachine:: @ 8220295 lockall - message LilycoveCity_DepartmentStoreRooftop_Text_22056D + message LilycoveCity_DepartmentStoreRooftop_Text_WhichDrinkWouldYouLike waitmessage showmoneybox 0, 0, 0 - goto LilycoveCity_DepartmentStoreRooftop_EventScript_2202A6 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseDrink end -LilycoveCity_DepartmentStoreRooftop_EventScript_2202A6:: @ 82202A6 +LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseDrink:: @ 82202A6 multichoice 16, 0, MULTI_VENDING_MACHINE, 0 copyvar VAR_TEMP_1, VAR_RESULT switch VAR_TEMP_1 - case 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2202E4 - case 1, LilycoveCity_DepartmentStoreRooftop_EventScript_2202EF - case 2, LilycoveCity_DepartmentStoreRooftop_EventScript_2202FA - msgbox LilycoveCity_DepartmentStoreRooftop_Text_220603, MSGBOX_DEFAULT - goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E + case 0, LilycoveCity_DepartmentStoreRooftop_EventScript_FreshWater + case 1, LilycoveCity_DepartmentStoreRooftop_EventScript_SodaPop + case 2, LilycoveCity_DepartmentStoreRooftop_EventScript_Lemonade + msgbox LilycoveCity_DepartmentStoreRooftop_Text_DecidedAgainstBuyingDrink, MSGBOX_DEFAULT + goto LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine end -LilycoveCity_DepartmentStoreRooftop_EventScript_2202E4:: @ 82202E4 +LilycoveCity_DepartmentStoreRooftop_EventScript_FreshWater:: @ 82202E4 setvar VAR_TEMP_0, ITEM_FRESH_WATER - goto LilycoveCity_DepartmentStoreRooftop_EventScript_22032F + goto LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink end -LilycoveCity_DepartmentStoreRooftop_EventScript_2202EF:: @ 82202EF +LilycoveCity_DepartmentStoreRooftop_EventScript_SodaPop:: @ 82202EF setvar VAR_TEMP_0, ITEM_SODA_POP - goto LilycoveCity_DepartmentStoreRooftop_EventScript_22032F + goto LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink end -LilycoveCity_DepartmentStoreRooftop_EventScript_2202FA:: @ 82202FA +LilycoveCity_DepartmentStoreRooftop_EventScript_Lemonade:: @ 82202FA setvar VAR_TEMP_0, ITEM_LEMONADE - goto LilycoveCity_DepartmentStoreRooftop_EventScript_22032F + goto LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink end -LilycoveCity_DepartmentStoreRooftop_EventScript_220305:: @ 8220305 +LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneyFreshWater:: @ 8220305 checkmoney 200, 0 return -LilycoveCity_DepartmentStoreRooftop_EventScript_22030C:: @ 822030C +LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneySodaPop:: @ 822030C checkmoney 300, 0 return -LilycoveCity_DepartmentStoreRooftop_EventScript_220313:: @ 8220313 +LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneyLemonade:: @ 8220313 checkmoney 350, 0 return -LilycoveCity_DepartmentStoreRooftop_EventScript_22031A:: @ 822031A +LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneyFreshWater:: @ 822031A takemoney 200, 0 return -LilycoveCity_DepartmentStoreRooftop_EventScript_220321:: @ 8220321 +LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneySodaPop:: @ 8220321 takemoney 300, 0 return -LilycoveCity_DepartmentStoreRooftop_EventScript_220328:: @ 8220328 +LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneyLemonade:: @ 8220328 takemoney 350, 0 return -LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F +LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink:: @ 822032F compare VAR_TEMP_1, 0 - call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220305 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneyFreshWater compare VAR_TEMP_1, 1 - call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_22030C + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneySodaPop compare VAR_TEMP_1, 2 - call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220313 - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220442 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneyLemonade + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NotEnoughMoneyForDrink checkitemspace VAR_TEMP_0, 1 - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink compare VAR_TEMP_1, 0 - call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_22031A + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneyFreshWater compare VAR_TEMP_1, 1 - call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220321 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneySodaPop compare VAR_TEMP_1, 2 - call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220328 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneyLemonade updatemoneybox 0, 0 bufferitemname 0, VAR_TEMP_0 playse SE_JIHANKI - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205A1, MSGBOX_DEFAULT + msgbox LilycoveCity_DepartmentStoreRooftop_Text_CanOfDrinkDroppedDown, MSGBOX_DEFAULT giveitem VAR_TEMP_0, 1 bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, STDSTRING_ITEMS msgbox gText_PutItemInPocket, MSGBOX_DEFAULT - random 64 + random 64 @ 1/64 chance of an additional drink dropping compare VAR_RESULT, 0 - goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_220436 + goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseNewDrink checkitemspace VAR_TEMP_0, 1 - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink playse SE_JIHANKI - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, MSGBOX_DEFAULT + msgbox LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown, MSGBOX_DEFAULT giveitem VAR_TEMP_0, 1 bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, STDSTRING_ITEMS msgbox gText_PutItemInPocket, MSGBOX_DEFAULT - random 64 + random 64 @ 1/64 * the prev 1/64 chance of a third additional drink dropping, ~ 0.02% chance compare VAR_RESULT, 0 - goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_220436 + goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseNewDrink checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink playse SE_JIHANKI - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, MSGBOX_DEFAULT + msgbox LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown, MSGBOX_DEFAULT giveitem VAR_TEMP_0, 1 bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, STDSTRING_ITEMS msgbox gText_PutItemInPocket, MSGBOX_DEFAULT - goto LilycoveCity_DepartmentStoreRooftop_EventScript_220436 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseNewDrink end -LilycoveCity_DepartmentStoreRooftop_EventScript_220436:: @ 8220436 - message LilycoveCity_DepartmentStoreRooftop_Text_22056D +LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseNewDrink:: @ 8220436 + message LilycoveCity_DepartmentStoreRooftop_Text_WhichDrinkWouldYouLike waitmessage - goto LilycoveCity_DepartmentStoreRooftop_EventScript_2202A6 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseDrink end -LilycoveCity_DepartmentStoreRooftop_EventScript_220442:: @ 8220442 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205F1, MSGBOX_DEFAULT - goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E +LilycoveCity_DepartmentStoreRooftop_EventScript_NotEnoughMoneyForDrink:: @ 8220442 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_NotEnoughMoney, MSGBOX_DEFAULT + goto LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine end -LilycoveCity_DepartmentStoreRooftop_EventScript_220450:: @ 8220450 +LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink:: @ 8220450 msgbox gText_TheBagIsFull, MSGBOX_DEFAULT - goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E + goto LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine end -LilycoveCity_DepartmentStoreRooftop_EventScript_22045E:: @ 822045E +LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine:: @ 822045E hidemoneybox nop nop releaseall end -LilycoveCity_DepartmentStoreRooftop_Text_220463: @ 8220463 +LilycoveCity_DepartmentStoreRooftop_Text_SetDatesForClearOutSales: @ 8220463 .string "Don't they have set dates for their\n" .string "clear-out sales?\p" .string "I watch TV, but they never show any\n" .string "commercials.$" -LilycoveCity_DepartmentStoreRooftop_Text_2204C9: @ 82204C9 +LilycoveCity_DepartmentStoreRooftop_Text_BeenWaitingForClearOutSale: @ 82204C9 .string "Yes! I've been waiting a long time for\n" .string "this clear-out sale.\p" .string "They have items that you can only get\n" .string "here. I'm going to load up, that I am!$" -LilycoveCity_DepartmentStoreRooftop_Text_220552: @ 8220552 +LilycoveCity_DepartmentStoreRooftop_Text_BoneDryThirsty: @ 8220552 .string "Ohh… I'm bone-dry thirsty!$" -LilycoveCity_DepartmentStoreRooftop_Text_22056D: @ 822056D +LilycoveCity_DepartmentStoreRooftop_Text_WhichDrinkWouldYouLike: @ 822056D .string "It's a VENDING MACHINE.\n" .string "Which drink would you like?$" -LilycoveCity_DepartmentStoreRooftop_Text_2205A1: @ 82205A1 +LilycoveCity_DepartmentStoreRooftop_Text_CanOfDrinkDroppedDown: @ 82205A1 .string "Clang!\p" .string "A can of {STR_VAR_1} dropped down.$" -LilycoveCity_DepartmentStoreRooftop_Text_2205C2: @ 82205C2 +LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown: @ 82205C2 .string "Clang!\p" .string "Score! An extra can of {STR_VAR_1}\n" .string "dropped down!$" -LilycoveCity_DepartmentStoreRooftop_Text_2205F1: @ 82205F1 +LilycoveCity_DepartmentStoreRooftop_Text_NotEnoughMoney: @ 82205F1 .string "Not enough money…$" -LilycoveCity_DepartmentStoreRooftop_Text_220603: @ 8220603 +LilycoveCity_DepartmentStoreRooftop_Text_DecidedAgainstBuyingDrink: @ 8220603 .string "Decided against buying a drink.$" diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.json b/data/maps/LilycoveCity_DepartmentStore_1F/map.json index 564377f7f..0fc05dd5a 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F693", + "script": "LilycoveCity_DepartmentStore_1F_EventScript_Greeter", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F69C", + "script": "LilycoveCity_DepartmentStore_1F_EventScript_LotteryClerk", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F82F", + "script": "LilycoveCity_DepartmentStore_1F_EventScript_PokefanF", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F838", + "script": "LilycoveCity_DepartmentStore_1F_EventScript_LittleGirl", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F841", + "script": "LilycoveCity_DepartmentStore_1F_EventScript_PokefanM", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F84A", + "script": "LilycoveCity_DepartmentStore_1F_EventScript_Azumarill", "flag": "0" } ], @@ -131,7 +131,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F85D" + "script": "LilycoveCity_DepartmentStore_1F_EventScript_FloorNamesSign" } ] }
\ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index 3f9378b7a..117dc6034 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -1,27 +1,27 @@ LilycoveCity_DepartmentStore_1F_MapScripts:: @ 821F692 .byte 0 -LilycoveCity_DepartmentStore_1F_EventScript_21F693:: @ 821F693 - msgbox LilycoveCity_DepartmentStore_1F_Text_21F866, MSGBOX_NPC +LilycoveCity_DepartmentStore_1F_EventScript_Greeter:: @ 821F693 + msgbox LilycoveCity_DepartmentStore_1F_Text_WelcomeToDeptStore, MSGBOX_NPC end -LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C +LilycoveCity_DepartmentStore_1F_EventScript_LotteryClerk:: @ 821F69C lock faceplayer dotimebasedevents - compare VAR_POKELOT_PRIZE_ITEM, 0 - goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_21F7F7 - goto_if_set FLAG_DAILY_PICKED_LOTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_21F78D - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6390, MSGBOX_YESNO + compare VAR_POKELOT_PRIZE_ITEM, ITEM_NONE + goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_GivePrizeFromEarlier + goto_if_set FLAG_DAILY_PICKED_LOTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_ComeBackTomorrow + msgbox LilycoveCity_DepartmentStore_1F_Text_LotteryCornerDrawTicket, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F797 + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain setflag FLAG_DAILY_PICKED_LOTO_TICKET - message LilycoveCity_DepartmentStore_1F_Text_2A64C8 + message LilycoveCity_DepartmentStore_1F_Text_PleasePickTicket waitmessage special RetrieveLotteryNumber copyvar VAR_0x8008, VAR_RESULT special BufferLottoTicketNumber - msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, MSGBOX_DEFAULT + msgbox LilycoveCity_DepartmentStore_1F_Text_TicketNumberIsXPleaseWait, MSGBOX_DEFAULT applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 playse SE_PC_ON @@ -33,142 +33,142 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C applymovement 2, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x8004, 0 - goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7A1 + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_NoMatch incrementgamestat GAME_STAT_WON_POKEMON_LOTTERY compare VAR_0x8006, 0 - call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F77B + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_TicketMatchPartyMon compare VAR_0x8006, 1 - call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F784 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_TicketMatchPCMon bufferitemname 0, VAR_0x8005 compare VAR_0x8004, 1 - call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7B9 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_TwoDigitMatch compare VAR_0x8004, 2 - call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7C2 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_ThreeDigitMatch compare VAR_0x8004, 3 - call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7CB + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_FourDigitMatch compare VAR_0x8004, 4 - call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7D4 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_FullMatch giveitem_std VAR_0x8005 - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7DD - special sub_80EE2CC - goto LilycoveCity_DepartmentStore_1F_EventScript_21F7AF + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_RecordPrizeNoRoom + special TryPutLotteryWinnerReportOnAir + goto LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain2 end -LilycoveCity_DepartmentStore_1F_EventScript_21F77B:: @ 821F77B - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6592, MSGBOX_DEFAULT +LilycoveCity_DepartmentStore_1F_EventScript_TicketMatchPartyMon:: @ 821F77B + msgbox LilycoveCity_DepartmentStore_1F_Text_TicketMatchesPartyMon, MSGBOX_DEFAULT return -LilycoveCity_DepartmentStore_1F_EventScript_21F784:: @ 821F784 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A65E6, MSGBOX_DEFAULT +LilycoveCity_DepartmentStore_1F_EventScript_TicketMatchPCMon:: @ 821F784 + msgbox LilycoveCity_DepartmentStore_1F_Text_TicketMatchesPCMon, MSGBOX_DEFAULT return -LilycoveCity_DepartmentStore_1F_EventScript_21F78D:: @ 821F78D - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6496, MSGBOX_DEFAULT +LilycoveCity_DepartmentStore_1F_EventScript_ComeBackTomorrow:: @ 821F78D + msgbox LilycoveCity_DepartmentStore_1F_Text_ComeBackTomorrow, MSGBOX_DEFAULT release end -LilycoveCity_DepartmentStore_1F_EventScript_21F797:: @ 821F797 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A64B1, MSGBOX_DEFAULT +LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain:: @ 821F797 + msgbox LilycoveCity_DepartmentStore_1F_Text_PleaseVisitAgain, MSGBOX_DEFAULT release end -LilycoveCity_DepartmentStore_1F_EventScript_21F7A1:: @ 821F7A1 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A663C, MSGBOX_DEFAULT - goto LilycoveCity_DepartmentStore_1F_EventScript_21F7AF +LilycoveCity_DepartmentStore_1F_EventScript_NoMatch:: @ 821F7A1 + msgbox LilycoveCity_DepartmentStore_1F_Text_NoNumbersMatched, MSGBOX_DEFAULT + goto LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain2 end -LilycoveCity_DepartmentStore_1F_EventScript_21F7AF:: @ 821F7AF - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6831, MSGBOX_DEFAULT +LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain2:: @ 821F7AF + msgbox LilycoveCity_DepartmentStore_1F_Text_PleaseVisitAgain2, MSGBOX_DEFAULT release end -LilycoveCity_DepartmentStore_1F_EventScript_21F7B9:: @ 821F7B9 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6664, MSGBOX_DEFAULT +LilycoveCity_DepartmentStore_1F_EventScript_TwoDigitMatch:: @ 821F7B9 + msgbox LilycoveCity_DepartmentStore_1F_Text_TwoDigitsMatched, MSGBOX_DEFAULT return -LilycoveCity_DepartmentStore_1F_EventScript_21F7C2:: @ 821F7C2 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A66A7, MSGBOX_DEFAULT +LilycoveCity_DepartmentStore_1F_EventScript_ThreeDigitMatch:: @ 821F7C2 + msgbox LilycoveCity_DepartmentStore_1F_Text_ThreeDigitsMatched, MSGBOX_DEFAULT return -LilycoveCity_DepartmentStore_1F_EventScript_21F7CB:: @ 821F7CB - msgbox LilycoveCity_DepartmentStore_1F_Text_2A66ED, MSGBOX_DEFAULT +LilycoveCity_DepartmentStore_1F_EventScript_FourDigitMatch:: @ 821F7CB + msgbox LilycoveCity_DepartmentStore_1F_Text_FourDigitsMatched, MSGBOX_DEFAULT return -LilycoveCity_DepartmentStore_1F_EventScript_21F7D4:: @ 821F7D4 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6731, MSGBOX_DEFAULT +LilycoveCity_DepartmentStore_1F_EventScript_FullMatch:: @ 821F7D4 + msgbox LilycoveCity_DepartmentStore_1F_Text_AllFiveDigitsMatched, MSGBOX_DEFAULT return -LilycoveCity_DepartmentStore_1F_EventScript_21F7DD:: @ 821F7DD +LilycoveCity_DepartmentStore_1F_EventScript_RecordPrizeNoRoom:: @ 821F7DD copyvar VAR_POKELOT_PRIZE_PLACE, VAR_0x8004 copyvar VAR_POKELOT_PRIZE_ITEM, VAR_0x8005 - goto LilycoveCity_DepartmentStore_1F_EventScript_21F7ED + goto LilycoveCity_DepartmentStore_1F_EventScript_NoRoomForPrize end -LilycoveCity_DepartmentStore_1F_EventScript_21F7ED:: @ 821F7ED - msgbox LilycoveCity_DepartmentStore_1F_Text_2A678C, MSGBOX_DEFAULT +LilycoveCity_DepartmentStore_1F_EventScript_NoRoomForPrize:: @ 821F7ED + msgbox LilycoveCity_DepartmentStore_1F_Text_NoRoomForThis, MSGBOX_DEFAULT release end -LilycoveCity_DepartmentStore_1F_EventScript_21F7F7:: @ 821F7F7 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A67E1, MSGBOX_DEFAULT +LilycoveCity_DepartmentStore_1F_EventScript_GivePrizeFromEarlier:: @ 821F7F7 + msgbox LilycoveCity_DepartmentStore_1F_Text_PrizeWeveBeenHolding, MSGBOX_DEFAULT giveitem_std VAR_POKELOT_PRIZE_ITEM - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7ED + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_NoRoomForPrize copyvar VAR_0x8004, VAR_POKELOT_PRIZE_PLACE copyvar VAR_0x8005, VAR_POKELOT_PRIZE_ITEM - special sub_80EE2CC - setvar VAR_POKELOT_PRIZE_ITEM, 0 + special TryPutLotteryWinnerReportOnAir + setvar VAR_POKELOT_PRIZE_ITEM, ITEM_NONE setvar VAR_POKELOT_PRIZE_PLACE, 0 release end -LilycoveCity_DepartmentStore_1F_EventScript_21F82F:: @ 821F82F - msgbox LilycoveCity_DepartmentStore_1F_Text_21F88C, MSGBOX_NPC +LilycoveCity_DepartmentStore_1F_EventScript_PokefanF:: @ 821F82F + msgbox LilycoveCity_DepartmentStore_1F_Text_IBuyAllSortsOfThings, MSGBOX_NPC end -LilycoveCity_DepartmentStore_1F_EventScript_21F838:: @ 821F838 - msgbox LilycoveCity_DepartmentStore_1F_Text_21F8F5, MSGBOX_NPC +LilycoveCity_DepartmentStore_1F_EventScript_LittleGirl:: @ 821F838 + msgbox LilycoveCity_DepartmentStore_1F_Text_MomBuyingMeFurniture, MSGBOX_NPC end -LilycoveCity_DepartmentStore_1F_EventScript_21F841:: @ 821F841 - msgbox LilycoveCity_DepartmentStore_1F_Text_21F92B, MSGBOX_NPC +LilycoveCity_DepartmentStore_1F_EventScript_PokefanM:: @ 821F841 + msgbox LilycoveCity_DepartmentStore_1F_Text_BuyingSomethingForAzumarill, MSGBOX_NPC end -LilycoveCity_DepartmentStore_1F_EventScript_21F84A:: @ 821F84A +LilycoveCity_DepartmentStore_1F_EventScript_Azumarill:: @ 821F84A lock faceplayer waitse playmoncry SPECIES_AZUMARILL, 0 - msgbox LilycoveCity_DepartmentStore_1F_Text_21F974, MSGBOX_DEFAULT + msgbox LilycoveCity_DepartmentStore_1F_Text_Azumarill, MSGBOX_DEFAULT waitmoncry release end -LilycoveCity_DepartmentStore_1F_EventScript_21F85D:: @ 821F85D - msgbox LilycoveCity_DepartmentStore_1F_Text_21F98A, MSGBOX_SIGN +LilycoveCity_DepartmentStore_1F_EventScript_FloorNamesSign:: @ 821F85D + msgbox LilycoveCity_DepartmentStore_1F_Text_FloorNamesSign, MSGBOX_SIGN end -LilycoveCity_DepartmentStore_1F_Text_21F866: @ 821F866 +LilycoveCity_DepartmentStore_1F_Text_WelcomeToDeptStore: @ 821F866 .string "Welcome to LILYCOVE DEPARTMENT STORE.$" -LilycoveCity_DepartmentStore_1F_Text_21F88C: @ 821F88C +LilycoveCity_DepartmentStore_1F_Text_IBuyAllSortsOfThings: @ 821F88C .string "Whenever I come to the DEPARTMENT\n" .string "STORE, I always end up buying all sorts\l" .string "of things because it's so fun.$" -LilycoveCity_DepartmentStore_1F_Text_21F8F5: @ 821F8F5 +LilycoveCity_DepartmentStore_1F_Text_MomBuyingMeFurniture: @ 821F8F5 .string "Today, my mom is going to buy me some\n" .string "nice furniture.$" -LilycoveCity_DepartmentStore_1F_Text_21F92B: @ 821F92B +LilycoveCity_DepartmentStore_1F_Text_BuyingSomethingForAzumarill: @ 821F92B .string "I'm buying something for my AZUMARILL\n" .string "as a reward for winning a CONTEST.$" -LilycoveCity_DepartmentStore_1F_Text_21F974: @ 821F974 +LilycoveCity_DepartmentStore_1F_Text_Azumarill: @ 821F974 .string "AZUMARILL: Maririroo!$" -LilycoveCity_DepartmentStore_1F_Text_21F98A: @ 821F98A +LilycoveCity_DepartmentStore_1F_Text_FloorNamesSign: @ 821F98A .string "1F: SERVICE COUNTER\n" .string " LOTTERY CORNER\p" .string "2F: TRAINER'S ZONE\p" @@ -177,7 +177,8 @@ LilycoveCity_DepartmentStore_1F_Text_21F98A: @ 821F98A .string "5F: POKé DOLL FLOOR\p" .string "ROOFTOP: ROOFTOP PLAZA$" -LilycoveCity_DepartmentStore_1F_Text_21FA13: @ 821FA13 +@ Unused +LilycoveCity_DepartmentStore_1F_Text_WirelessCommIsFun: @ 821FA13 .string "Wireless Communication is a\n" .string "lot of fun, isn't it?\p" .string "I think it lets you do things that\n" @@ -186,7 +187,8 @@ LilycoveCity_DepartmentStore_1F_Text_21FA13: @ 821FA13 .string "with people you couldn't before.\p" .string "I think it's going to be exciting!$" -LilycoveCity_DepartmentStore_1F_Text_21FAE5: @ 821FAE5 +@ Unused +LilycoveCity_DepartmentStore_1F_Text_SpreadWordAboutWirelessComm: @ 821FAE5 .string "I want to spread the word about how\n" .string "fun Wireless Communication can be.$" diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.json b/data/maps/LilycoveCity_DepartmentStore_2F/map.json index 3238eeee8..fd30dc516 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB2D", + "script": "LilycoveCity_DepartmentStore_2F_EventScript_Cook", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB36", + "script": "LilycoveCity_DepartmentStore_2F_EventScript_PokefanF", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB3F", + "script": "LilycoveCity_DepartmentStore_2F_EventScript_Sailor", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB7A", + "script": "LilycoveCity_DepartmentStore_2F_EventScript_ClerkRight", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB48", + "script": "LilycoveCity_DepartmentStore_2F_EventScript_ClerkLeft", "flag": "0" } ], diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc index 33f0bff9a..9ced6b347 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc @@ -1,30 +1,30 @@ LilycoveCity_DepartmentStore_2F_MapScripts:: @ 821FB2C .byte 0 -LilycoveCity_DepartmentStore_2F_EventScript_21FB2D:: @ 821FB2D - msgbox LilycoveCity_DepartmentStore_2F_Text_21FBAC, MSGBOX_NPC +LilycoveCity_DepartmentStore_2F_EventScript_Cook:: @ 821FB2D + msgbox LilycoveCity_DepartmentStore_2F_Text_LearnToUseItemsProperly, MSGBOX_NPC end -LilycoveCity_DepartmentStore_2F_EventScript_21FB36:: @ 821FB36 - msgbox LilycoveCity_DepartmentStore_2F_Text_21FBDF, MSGBOX_NPC +LilycoveCity_DepartmentStore_2F_EventScript_PokefanF:: @ 821FB36 + msgbox LilycoveCity_DepartmentStore_2F_Text_GoodGiftForHusband, MSGBOX_NPC end -LilycoveCity_DepartmentStore_2F_EventScript_21FB3F:: @ 821FB3F - msgbox LilycoveCity_DepartmentStore_2F_Text_21FC23, MSGBOX_NPC +LilycoveCity_DepartmentStore_2F_EventScript_Sailor:: @ 821FB3F + msgbox LilycoveCity_DepartmentStore_2F_Text_StockUpOnItems, MSGBOX_NPC end -LilycoveCity_DepartmentStore_2F_EventScript_21FB48:: @ 821FB48 +LilycoveCity_DepartmentStore_2F_EventScript_ClerkLeft:: @ 821FB48 lock faceplayer message gText_HowMayIServeYou waitmessage - pokemart LilycoveCity_DepartmentStore_2F_Pokemart_21FB60 + pokemart LilycoveCity_DepartmentStore_2F_Pokemart1 msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -LilycoveCity_DepartmentStore_2F_Pokemart_21FB60: @ 821FB60 +LilycoveCity_DepartmentStore_2F_Pokemart1: @ 821FB60 .2byte ITEM_POKE_BALL .2byte ITEM_GREAT_BALL .2byte ITEM_ULTRA_BALL @@ -40,18 +40,18 @@ LilycoveCity_DepartmentStore_2F_Pokemart_21FB60: @ 821FB60 release end -LilycoveCity_DepartmentStore_2F_EventScript_21FB7A:: @ 821FB7A +LilycoveCity_DepartmentStore_2F_EventScript_ClerkRight:: @ 821FB7A lock faceplayer message gText_HowMayIServeYou waitmessage - pokemart LilycoveCity_DepartmentStore_2F_Pokemart_21FB94 + pokemart LilycoveCity_DepartmentStore_2F_Pokemart2 msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -LilycoveCity_DepartmentStore_2F_Pokemart_21FB94: @ 821FB94 +LilycoveCity_DepartmentStore_2F_Pokemart2: @ 821FB94 .2byte ITEM_POTION .2byte ITEM_SUPER_POTION .2byte ITEM_HYPER_POTION @@ -66,15 +66,15 @@ LilycoveCity_DepartmentStore_2F_Pokemart_21FB94: @ 821FB94 release end -LilycoveCity_DepartmentStore_2F_Text_21FBAC: @ 821FBAC +LilycoveCity_DepartmentStore_2F_Text_LearnToUseItemsProperly: @ 821FBAC .string "Learn to use items properly.\n" .string "That's basic, really.$" -LilycoveCity_DepartmentStore_2F_Text_21FBDF: @ 821FBDF +LilycoveCity_DepartmentStore_2F_Text_GoodGiftForHusband: @ 821FBDF .string "My husband is waiting at home.\n" .string "What would make a good gift for him?$" -LilycoveCity_DepartmentStore_2F_Text_21FC23: @ 821FC23 +LilycoveCity_DepartmentStore_2F_Text_StockUpOnItems: @ 821FC23 .string "I'm leaving on a long journey soon.\n" .string "I need to stock up on items.$" diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.json b/data/maps/LilycoveCity_DepartmentStore_3F/map.json index 9ecf5104a..cf25e1798 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCB6", + "script": "LilycoveCity_DepartmentStore_3F_EventScript_TriathleteM", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCBF", + "script": "LilycoveCity_DepartmentStore_3F_EventScript_PokefanM", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCC8", + "script": "LilycoveCity_DepartmentStore_3F_EventScript_Woman", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FC65", + "script": "LilycoveCity_DepartmentStore_3F_EventScript_ClerkLeft", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FC8C", + "script": "LilycoveCity_DepartmentStore_3F_EventScript_ClerkRight", "flag": "0" } ], diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc index 23c24b681..bec38867c 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc @@ -1,17 +1,17 @@ LilycoveCity_DepartmentStore_3F_MapScripts:: @ 821FC64 .byte 0 -LilycoveCity_DepartmentStore_3F_EventScript_21FC65:: @ 821FC65 +LilycoveCity_DepartmentStore_3F_EventScript_ClerkLeft:: @ 821FC65 lock faceplayer message gText_HowMayIServeYou waitmessage - pokemart LilycoveCity_DepartmentStore_3F_Pokemart_21FC7C + pokemart LilycoveCity_DepartmentStore_3F_Pokemart_Vitamins msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end -LilycoveCity_DepartmentStore_3F_Pokemart_21FC7C: @ 821FC7C +LilycoveCity_DepartmentStore_3F_Pokemart_Vitamins: @ 821FC7C .2byte ITEM_PROTEIN .2byte ITEM_CALCIUM .2byte ITEM_IRON @@ -22,18 +22,18 @@ LilycoveCity_DepartmentStore_3F_Pokemart_21FC7C: @ 821FC7C release end -LilycoveCity_DepartmentStore_3F_EventScript_21FC8C:: @ 821FC8C +LilycoveCity_DepartmentStore_3F_EventScript_ClerkRight:: @ 821FC8C lock faceplayer message gText_HowMayIServeYou waitmessage - pokemart LilycoveCity_DepartmentStore_3F_Pokemart_21FCA4 + pokemart LilycoveCity_DepartmentStore_3F_Pokemart_StatBoosters msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -LilycoveCity_DepartmentStore_3F_Pokemart_21FCA4: @ 821FCA4 +LilycoveCity_DepartmentStore_3F_Pokemart_StatBoosters: @ 821FCA4 .2byte ITEM_X_SPEED .2byte ITEM_X_SPECIAL .2byte ITEM_X_ATTACK @@ -45,31 +45,31 @@ LilycoveCity_DepartmentStore_3F_Pokemart_21FCA4: @ 821FCA4 release end -LilycoveCity_DepartmentStore_3F_EventScript_21FCB6:: @ 821FCB6 - msgbox LilycoveCity_DepartmentStore_3F_Text_21FCD1, MSGBOX_NPC +LilycoveCity_DepartmentStore_3F_EventScript_TriathleteM:: @ 821FCB6 + msgbox LilycoveCity_DepartmentStore_3F_Text_ItemsBestForTougheningPokemon, MSGBOX_NPC end -LilycoveCity_DepartmentStore_3F_EventScript_21FCBF:: @ 821FCBF - msgbox LilycoveCity_DepartmentStore_3F_Text_21FD3B, MSGBOX_NPC +LilycoveCity_DepartmentStore_3F_EventScript_PokefanM:: @ 821FCBF + msgbox LilycoveCity_DepartmentStore_3F_Text_WantMoreEndurance, MSGBOX_NPC end -LilycoveCity_DepartmentStore_3F_EventScript_21FCC8:: @ 821FCC8 - msgbox LilycoveCity_DepartmentStore_3F_Text_21FDB4, MSGBOX_NPC +LilycoveCity_DepartmentStore_3F_EventScript_Woman:: @ 821FCC8 + msgbox LilycoveCity_DepartmentStore_3F_Text_GaveCarbosToSpeedUpMon, MSGBOX_NPC end -LilycoveCity_DepartmentStore_3F_Text_21FCD1: @ 821FCD1 +LilycoveCity_DepartmentStore_3F_Text_ItemsBestForTougheningPokemon: @ 821FCD1 .string "For quickly toughening up POKéMON,\n" .string "items are the best.\p" .string "PROTEIN boosts ATTACK,\n" .string "and CALCIUM raises SP. ATK.$" -LilycoveCity_DepartmentStore_3F_Text_21FD3B: @ 821FD3B +LilycoveCity_DepartmentStore_3F_Text_WantMoreEndurance: @ 821FD3B .string "I want my POKéMON to have more\n" .string "endurance.\p" .string "I'm trying to decide whether to raise\n" .string "DEFENSE with IRON, or SP. DEF with ZINC.$" -LilycoveCity_DepartmentStore_3F_Text_21FDB4: @ 821FDB4 +LilycoveCity_DepartmentStore_3F_Text_GaveCarbosToSpeedUpMon: @ 821FDB4 .string "I gave a CARBOS to my POKéMON,\n" .string "and its SPEED went up.$" diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.json b/data/maps/LilycoveCity_DepartmentStore_4F/map.json index 2abccb783..a95cf6c3e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDEB", + "script": "LilycoveCity_DepartmentStore_4F_EventScript_Gentleman", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDF4", + "script": "LilycoveCity_DepartmentStore_4F_EventScript_Woman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDFD", + "script": "LilycoveCity_DepartmentStore_4F_EventScript_Youngster", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FE06", + "script": "LilycoveCity_DepartmentStore_4F_EventScript_ClerkLeft", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FE2C", + "script": "LilycoveCity_DepartmentStore_4F_EventScript_ClerkRight", "flag": "0" } ], diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc index 25bc7c33c..441697a7c 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc @@ -1,72 +1,72 @@ LilycoveCity_DepartmentStore_4F_MapScripts:: @ 821FDEA .byte 0 -LilycoveCity_DepartmentStore_4F_EventScript_21FDEB:: @ 821FDEB - msgbox LilycoveCity_DepartmentStore_4F_Text_21FE50, MSGBOX_NPC +LilycoveCity_DepartmentStore_4F_EventScript_Gentleman:: @ 821FDEB + msgbox LilycoveCity_DepartmentStore_4F_Text_AttackOrDefenseTM, MSGBOX_NPC end -LilycoveCity_DepartmentStore_4F_EventScript_21FDF4:: @ 821FDF4 - msgbox LilycoveCity_DepartmentStore_4F_Text_21FEC7, MSGBOX_NPC +LilycoveCity_DepartmentStore_4F_EventScript_Woman:: @ 821FDF4 + msgbox LilycoveCity_DepartmentStore_4F_Text_FiftyDifferentTMs, MSGBOX_NPC end -LilycoveCity_DepartmentStore_4F_EventScript_21FDFD:: @ 821FDFD - msgbox LilycoveCity_DepartmentStore_4F_Text_21FF2D, MSGBOX_NPC +LilycoveCity_DepartmentStore_4F_EventScript_Youngster:: @ 821FDFD + msgbox LilycoveCity_DepartmentStore_4F_Text_PokemonOnlyHaveFourMoves, MSGBOX_NPC end -LilycoveCity_DepartmentStore_4F_EventScript_21FE06:: @ 821FE06 +LilycoveCity_DepartmentStore_4F_EventScript_ClerkLeft:: @ 821FE06 lock faceplayer message gText_HowMayIServeYou waitmessage - pokemart LilycoveCity_DepartmentStore_4F_Pokemart_21FE20 + pokemart LilycoveCity_DepartmentStore_4F_Pokemart_AttackTMs msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -LilycoveCity_DepartmentStore_4F_Pokemart_21FE20: @ 821FE20 - .2byte ITEM_TM38 - .2byte ITEM_TM25 - .2byte ITEM_TM14 - .2byte ITEM_TM15 +LilycoveCity_DepartmentStore_4F_Pokemart_AttackTMs: @ 821FE20 + .2byte ITEM_TM38 @ Fire Blast + .2byte ITEM_TM25 @ Thunder + .2byte ITEM_TM14 @ Blizzard + .2byte ITEM_TM15 @ Hyper Beam .2byte ITEM_NONE release end -LilycoveCity_DepartmentStore_4F_EventScript_21FE2C:: @ 821FE2C +LilycoveCity_DepartmentStore_4F_EventScript_ClerkRight:: @ 821FE2C lock faceplayer message gText_HowMayIServeYou waitmessage - pokemart LilycoveCity_DepartmentStore_4F_Pokemart_21FE44 + pokemart LilycoveCity_DepartmentStore_4F_Pokemart_DefenseTMs msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -LilycoveCity_DepartmentStore_4F_Pokemart_21FE44: @ 821FE44 - .2byte ITEM_TM17 - .2byte ITEM_TM20 - .2byte ITEM_TM33 - .2byte ITEM_TM16 +LilycoveCity_DepartmentStore_4F_Pokemart_DefenseTMs: @ 821FE44 + .2byte ITEM_TM17 @ Protect + .2byte ITEM_TM20 @ Safeguard + .2byte ITEM_TM33 @ Reflect + .2byte ITEM_TM16 @ Light Screen .2byte ITEM_NONE release end -LilycoveCity_DepartmentStore_4F_Text_21FE50: @ 821FE50 +LilycoveCity_DepartmentStore_4F_Text_AttackOrDefenseTM: @ 821FE50 .string "Hmm…\p" .string "An attacking move…\n" .string "Or a defensive move…\p" .string "It's no easy matter to decide which TM\n" .string "moves should be taught to POKéMON…$" -LilycoveCity_DepartmentStore_4F_Text_21FEC7: @ 821FEC7 +LilycoveCity_DepartmentStore_4F_Text_FiftyDifferentTMs: @ 821FEC7 .string "There are so many different kinds of\n" .string "TM moves.\p" .string "A catalog I read said there are fifty\n" .string "different kinds.$" -LilycoveCity_DepartmentStore_4F_Text_21FF2D: @ 821FF2D +LilycoveCity_DepartmentStore_4F_Text_PokemonOnlyHaveFourMoves: @ 821FF2D .string "I'd like to get all the different TMs,\n" .string "but a POKéMON learns only four moves.$" diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json index a49de9255..98d15787e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_5F_EventScript_2200BC", + "script": "LilycoveCity_DepartmentStore_5F_EventScript_LittleGirl", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_5F_EventScript_22006C", + "script": "LilycoveCity_DepartmentStore_5F_EventScript_PokefanF", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_5F_EventScript_21FFA6", + "script": "LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarLeft", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_5F_EventScript_21FFDC", + "script": "LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidLeft", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_5F_EventScript_22000A", + "script": "LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidRight", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_5F_EventScript_22003A", + "script": "LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarRight", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStore_5F_EventScript_220075", + "script": "LilycoveCity_DepartmentStore_5F_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index 79943cec3..012fe12f5 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -1,19 +1,21 @@ LilycoveCity_DepartmentStore_5F_MapScripts:: @ 821FF7A - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_DepartmentStore_5F_MapScript2_21FF80 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_DepartmentStore_5F_OnWarp .byte 0 -LilycoveCity_DepartmentStore_5F_MapScript2_21FF80: @ 821FF80 - map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 1, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A - map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 2, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A - map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 3, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A +@ During the unusual weather from Kyogre/Groudon awakening the dept store rooftop is inaccessible +@ Likely done to avoid dealing with showing the weather. Technically the rooftop is indoors +LilycoveCity_DepartmentStore_5F_OnWarp: @ 821FF80 + map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 1, LilycoveCity_DepartmentStore_5F_EventScript_BlockRoofStairs + map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 2, LilycoveCity_DepartmentStore_5F_EventScript_BlockRoofStairs + map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 3, LilycoveCity_DepartmentStore_5F_EventScript_BlockRoofStairs .2byte 0 -LilycoveCity_DepartmentStore_5F_EventScript_21FF9A:: @ 821FF9A +LilycoveCity_DepartmentStore_5F_EventScript_BlockRoofStairs:: @ 821FF9A setobjectxy 7, 16, 2 turnobject 7, DIR_NORTH end -LilycoveCity_DepartmentStore_5F_EventScript_21FFA6:: @ 821FFA6 +LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarLeft:: @ 821FFA6 lock faceplayer message gText_HowMayIServeYou @@ -41,7 +43,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Dolls: @ 821FFC0 release end -LilycoveCity_DepartmentStore_5F_EventScript_21FFDC:: @ 821FFDC +LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidLeft:: @ 821FFDC lock faceplayer message gText_HowMayIServeYou @@ -66,7 +68,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Cushions: @ 821FFF4 release end -LilycoveCity_DepartmentStore_5F_EventScript_22000A:: @ 822000A +LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidRight:: @ 822000A lock faceplayer message gText_HowMayIServeYou @@ -91,7 +93,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Posters: @ 8220024 release end -LilycoveCity_DepartmentStore_5F_EventScript_22003A:: @ 822003A +LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarRight:: @ 822003A lock faceplayer message gText_HowMayIServeYou @@ -117,53 +119,53 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Mats: @ 8220054 release end -LilycoveCity_DepartmentStore_5F_EventScript_22006C:: @ 822006C - msgbox LilycoveCity_DepartmentStore_5F_Text_2200C5, MSGBOX_NPC +LilycoveCity_DepartmentStore_5F_EventScript_PokefanF:: @ 822006C + msgbox LilycoveCity_DepartmentStore_5F_Text_PlaceFullOfCuteDolls, MSGBOX_NPC end -LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075 +LilycoveCity_DepartmentStore_5F_EventScript_Woman:: @ 8220075 lockall applymovement 7, Common_Movement_FacePlayer waitmovement 0 compare VAR_SOOTOPOLIS_CITY_STATE, 0 - goto_if_eq LilycoveCity_DepartmentStore_5F_EventScript_22009C + goto_if_eq LilycoveCity_DepartmentStore_5F_EventScript_WomanNormal compare VAR_SOOTOPOLIS_CITY_STATE, 4 - goto_if_ge LilycoveCity_DepartmentStore_5F_EventScript_22009C - goto LilycoveCity_DepartmentStore_5F_EventScript_2200A7 + goto_if_ge LilycoveCity_DepartmentStore_5F_EventScript_WomanNormal + goto LilycoveCity_DepartmentStore_5F_EventScript_WomanLegendaryWeather end -LilycoveCity_DepartmentStore_5F_EventScript_22009C:: @ 822009C - msgbox LilycoveCity_DepartmentStore_5F_Text_22016B, MSGBOX_DEFAULT +LilycoveCity_DepartmentStore_5F_EventScript_WomanNormal:: @ 822009C + msgbox LilycoveCity_DepartmentStore_5F_Text_SellManyCuteMatsHere, MSGBOX_DEFAULT closemessage releaseall end -LilycoveCity_DepartmentStore_5F_EventScript_2200A7:: @ 82200A7 - msgbox LilycoveCity_DepartmentStore_5F_Text_2201C4, MSGBOX_DEFAULT +LilycoveCity_DepartmentStore_5F_EventScript_WomanLegendaryWeather:: @ 82200A7 + msgbox LilycoveCity_DepartmentStore_5F_Text_ClosedRooftopForWeather, MSGBOX_DEFAULT closemessage applymovement 7, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end -LilycoveCity_DepartmentStore_5F_EventScript_2200BC:: @ 82200BC - msgbox LilycoveCity_DepartmentStore_5F_Text_220122, MSGBOX_NPC +LilycoveCity_DepartmentStore_5F_EventScript_LittleGirl:: @ 82200BC + msgbox LilycoveCity_DepartmentStore_5F_Text_GettingDollInsteadOfPokemon, MSGBOX_NPC end -LilycoveCity_DepartmentStore_5F_Text_2200C5: @ 82200C5 +LilycoveCity_DepartmentStore_5F_Text_PlaceFullOfCuteDolls: @ 82200C5 .string "This place is full of cute DOLLS.\p" .string "I should buy some for me, instead of\n" .string "just for my children.$" -LilycoveCity_DepartmentStore_5F_Text_220122: @ 8220122 +LilycoveCity_DepartmentStore_5F_Text_GettingDollInsteadOfPokemon: @ 8220122 .string "I'm not big enough to raise POKéMON,\n" .string "so I'm getting a cute DOLL instead.$" -LilycoveCity_DepartmentStore_5F_Text_22016B: @ 822016B +LilycoveCity_DepartmentStore_5F_Text_SellManyCuteMatsHere: @ 822016B .string "They sell many cute MATS here.\p" .string "I wonder which one I should get?\n" .string "Maybe I'll buy them all…$" -LilycoveCity_DepartmentStore_5F_Text_2201C4: @ 82201C4 +LilycoveCity_DepartmentStore_5F_Text_ClosedRooftopForWeather: @ 82201C4 .string "I think they closed the rooftop\n" .string "because the weather is wild today.$" diff --git a/data/specials.inc b/data/specials.inc index 5017c3dc3..c8fd515db 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -353,7 +353,7 @@ gSpecials:: @ 81DBA64 def_special ScriptRandom def_special sub_81AFDD0 def_special TryPutTreasureInvestigatorsOnAir - def_special sub_80EE2CC + def_special TryPutLotteryWinnerReportOnAir def_special sub_80EE72C def_special sub_80EE7C0 def_special ShowGlassWorkshopMenu diff --git a/data/text/lottery_corner.inc b/data/text/lottery_corner.inc index 674fed52e..102e6b4a2 100644 --- a/data/text/lottery_corner.inc +++ b/data/text/lottery_corner.inc @@ -1,4 +1,4 @@ -LilycoveCity_DepartmentStore_1F_Text_2A6390: @ 82A6390 +LilycoveCity_DepartmentStore_1F_Text_LotteryCornerDrawTicket: @ 82A6390 .string "This is the POKéMON LOTTERY CORNER.\p" .string "All shoppers at our DEPARTMENT STORE\n" .string "get to draw a POKéMON LOTO TICKET.\p" @@ -8,70 +8,70 @@ LilycoveCity_DepartmentStore_1F_Text_2A6390: @ 82A6390 .string "Would you like to draw a POKéMON\n" .string "LOTO TICKET?$" -LilycoveCity_DepartmentStore_1F_Text_2A6496: @ 82A6496 +LilycoveCity_DepartmentStore_1F_Text_ComeBackTomorrow: @ 82A6496 .string "Please come back tomorrow.$" -LilycoveCity_DepartmentStore_1F_Text_2A64B1: @ 82A64B1 +LilycoveCity_DepartmentStore_1F_Text_PleaseVisitAgain: @ 82A64B1 .string "Please do visit again.$" -LilycoveCity_DepartmentStore_1F_Text_2A64C8: @ 82A64C8 +LilycoveCity_DepartmentStore_1F_Text_PleasePickTicket: @ 82A64C8 .string "Please pick a LOTO TICKET.\n" .string "…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" -LilycoveCity_DepartmentStore_1F_Text_2A650B: @ 82A650B +LilycoveCity_DepartmentStore_1F_Text_TicketNumberIsXPleaseWait: @ 82A650B .string "The LOTO TICKET number is {STR_VAR_1}.\p" .string "I need to run a check on this number\n" .string "to see if it matches any of your\l" .string "POKéMON's ID numbers. Please wait.$" -LilycoveCity_DepartmentStore_1F_Text_2A6592: @ 82A6592 +LilycoveCity_DepartmentStore_1F_Text_TicketMatchesPartyMon: @ 82A6592 .string "Congratulations!\p" .string "The ID number of your team's\n" .string "{STR_VAR_1} matches your\l" .string "LOTO TICKET's number!$" -LilycoveCity_DepartmentStore_1F_Text_2A65E6: @ 82A65E6 +LilycoveCity_DepartmentStore_1F_Text_TicketMatchesPCMon: @ 82A65E6 .string "Congratulations!\p" .string "The ID number of your PC-boxed\n" .string "{STR_VAR_1} matches your\l" .string "LOTO TICKET's number!$" -LilycoveCity_DepartmentStore_1F_Text_2A663C: @ 82A663C +LilycoveCity_DepartmentStore_1F_Text_NoNumbersMatched: @ 82A663C .string "I'm sorry.\n" .string "None of the numbers matched.$" -LilycoveCity_DepartmentStore_1F_Text_2A6664: @ 82A6664 +LilycoveCity_DepartmentStore_1F_Text_TwoDigitsMatched: @ 82A6664 .string "Two digits matched, so you win the\n" .string "third prize!\l" .string "You've won the {STR_VAR_1}!$" -LilycoveCity_DepartmentStore_1F_Text_2A66A7: @ 82A66A7 +LilycoveCity_DepartmentStore_1F_Text_ThreeDigitsMatched: @ 82A66A7 .string "Three digits matched, so you win the\n" .string "second prize!\l" .string "You've won the {STR_VAR_1}!$" -LilycoveCity_DepartmentStore_1F_Text_2A66ED: @ 82A66ED +LilycoveCity_DepartmentStore_1F_Text_FourDigitsMatched: @ 82A66ED .string "Four digits matched, so you win the\n" .string "first prize!\l" .string "You've won the {STR_VAR_1}!$" -LilycoveCity_DepartmentStore_1F_Text_2A6731: @ 82A6731 +LilycoveCity_DepartmentStore_1F_Text_AllFiveDigitsMatched: @ 82A6731 .string "Oh, my goodness, all five digits\n" .string "matched!\p" .string "You've won the jackpot prize!\n" .string "You've won the {STR_VAR_1}!$" -LilycoveCity_DepartmentStore_1F_Text_2A678C: @ 82A678C +LilycoveCity_DepartmentStore_1F_Text_NoRoomForThis: @ 82A678C .string "Oh?\n" .string "You seem to have no room for this.\p" .string "Please make room in your BAG and\n" .string "let me know.$" -LilycoveCity_DepartmentStore_1F_Text_2A67E1: @ 82A67E1 +LilycoveCity_DepartmentStore_1F_Text_PrizeWeveBeenHolding: @ 82A67E1 .string "{PLAYER}?\n" .string "Yes, I've been expecting you.\p" .string "This is the prize we've been holding\n" .string "for you.$" -LilycoveCity_DepartmentStore_1F_Text_2A6831: @ 82A6831 +LilycoveCity_DepartmentStore_1F_Text_PleaseVisitAgain2: @ 82A6831 .string "Please do visit again.$" diff --git a/include/tv.h b/include/tv.h index 8f697afe9..d0ca648be 100644 --- a/include/tv.h +++ b/include/tv.h @@ -13,7 +13,7 @@ void sub_80EE8C8(u16 winStreak, u8 facility); void DoTVShow(void); void DoTVShowInSearchOfTrainers(void); void TryPutTreasureInvestigatorsOnAir(void); -void sub_80EE2CC(void); +void TryPutLotteryWinnerReportOnAir(void); void sub_80EE72C(void); void IncrementDailyPlantedBerries(void); void IncrementDailyPickedBerries(void); @@ -2298,7 +2298,7 @@ void sub_80EE184(void) } } -void sub_80EE2CC(void) +void TryPutLotteryWinnerReportOnAir(void) { TVShow *show; |