diff options
Diffstat (limited to 'data/maps/Route123_BerryMastersHouse/scripts.inc')
| -rw-r--r-- | data/maps/Route123_BerryMastersHouse/scripts.inc | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index d81cf9aee..fc96eda9e 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -1,5 +1,5 @@ Route123_BerryMastersHouse_MapScripts:: @ 81639DF - map_script 3, Route123_BerryMastersHouse_MapScript1_1639E5 + map_script MAP_SCRIPT_ON_TRANSITION, Route123_BerryMastersHouse_MapScript1_1639E5 .byte 0 Route123_BerryMastersHouse_MapScript1_1639E5:: @ 81639E5 @@ -9,40 +9,40 @@ Route123_BerryMastersHouse_MapScript1_1639E5:: @ 81639E5 Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 lock faceplayer - dodailyevents + dotimebasedevents goto_if_set FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER, Route123_BerryMastersHouse_EventScript_163A5A - msgbox Route123_BerryMastersHouse_Text_1C5BC4, 4 + msgbox Route123_BerryMastersHouse_Text_1C5BC4, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 20 addvar VAR_RESULT, 133 - giveitem_std VAR_RESULT + giveitem VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER - msgbox Route123_BerryMastersHouse_Text_1C5C66, 4 + msgbox Route123_BerryMastersHouse_Text_1C5C66, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 20 addvar VAR_RESULT, 133 - giveitem_std VAR_RESULT + giveitem VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B - msgbox Route123_BerryMastersHouse_Text_1C5C83, 4 + goto_if_eq Common_EventScript_ShowBagIsFull + msgbox Route123_BerryMastersHouse_Text_1C5C83, MSGBOX_DEFAULT release end Route123_BerryMastersHouse_EventScript_163A5A:: @ 8163A5A - msgbox Route123_BerryMastersHouse_Text_1C5CDC, 4 + msgbox Route123_BerryMastersHouse_Text_1C5CDC, MSGBOX_DEFAULT release end Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 lock faceplayer - dodailyevents + dotimebasedevents goto_if_set FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE, Route123_BerryMastersHouse_EventScript_163C13 - msgbox Route123_BerryMastersHouse_Text_1C5D24, 4 + msgbox Route123_BerryMastersHouse_Text_1C5D24, MSGBOX_DEFAULT setvar VAR_0x8004, 13 - call Route123_BerryMastersHouse_EventScript_1A00F3 + call Common_EventScript_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 @@ -52,8 +52,8 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 end Route123_BerryMastersHouse_EventScript_163A9B:: @ 8163A9B - msgbox Route123_BerryMastersHouse_Text_1C5EC0, 4 - msgbox Route123_BerryMastersHouse_Text_1C5E59, 4 + msgbox Route123_BerryMastersHouse_Text_1C5EC0, MSGBOX_DEFAULT + msgbox Route123_BerryMastersHouse_Text_1C5E59, MSGBOX_DEFAULT release end @@ -73,73 +73,73 @@ Route123_BerryMastersHouse_EventScript_163AAD:: @ 8163AAD end Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 - msgbox Route123_BerryMastersHouse_Text_1C5E0E, 4 + msgbox Route123_BerryMastersHouse_Text_1C5E0E, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, ITEM_CHERI_BERRY - giveitem_std VAR_RESULT + giveitem VAR_RESULT compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull goto Route123_BerryMastersHouse_EventScript_163C1D release end Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E goto_if_set FLAG_RECEIVED_SPELON_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 - msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem_std ITEM_SPELON_BERRY + msgbox Route123_BerryMastersHouse_Text_1C5DC1, MSGBOX_DEFAULT + giveitem ITEM_SPELON_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SPELON_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F goto_if_set FLAG_RECEIVED_PAMTRE_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 - msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem_std ITEM_PAMTRE_BERRY + msgbox Route123_BerryMastersHouse_Text_1C5DC1, MSGBOX_DEFAULT + giveitem ITEM_PAMTRE_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_PAMTRE_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 goto_if_set FLAG_RECEIVED_WATMEL_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 - msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem_std ITEM_WATMEL_BERRY + msgbox Route123_BerryMastersHouse_Text_1C5DC1, MSGBOX_DEFAULT + giveitem ITEM_WATMEL_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_WATMEL_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 goto_if_set FLAG_RECEIVED_DURIN_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 - msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem_std ITEM_DURIN_BERRY + msgbox Route123_BerryMastersHouse_Text_1C5DC1, MSGBOX_DEFAULT + giveitem ITEM_DURIN_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_DURIN_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 goto_if_set FLAG_RECEIVED_BELUE_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 - msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem_std ITEM_BELUE_BERRY + msgbox Route123_BerryMastersHouse_Text_1C5DC1, MSGBOX_DEFAULT + giveitem ITEM_BELUE_BERRY compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_BELUE_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163C13:: @ 8163C13 - msgbox Route123_BerryMastersHouse_Text_1C5E59, 4 + msgbox Route123_BerryMastersHouse_Text_1C5E59, MSGBOX_DEFAULT release end Route123_BerryMastersHouse_EventScript_163C1D:: @ 8163C1D setflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE - msgbox Route123_BerryMastersHouse_Text_1C5E59, 4 + msgbox Route123_BerryMastersHouse_Text_1C5E59, MSGBOX_DEFAULT release end |