From fbc3eee1f2a432d497e1213aef3b6b7b369ec871 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 6 Nov 2019 14:06:06 -0500 Subject: Document Fossil Maniac and Berry Master route houses --- data/maps/DesertUnderpass/map.json | 2 +- data/maps/DesertUnderpass/scripts.inc | 16 +-- data/maps/MirageTower_4F/scripts.inc | 4 +- data/maps/Route111/scripts.inc | 2 +- data/maps/Route114_FossilManiacsHouse/map.json | 10 +- data/maps/Route114_FossilManiacsHouse/scripts.inc | 28 ++--- data/maps/Route114_FossilManiacsTunnel/map.json | 6 +- data/maps/Route114_FossilManiacsTunnel/scripts.inc | 46 +++---- data/maps/Route123_BerryMastersHouse/map.json | 4 +- data/maps/Route123_BerryMastersHouse/scripts.inc | 140 ++++++++++----------- 10 files changed, 130 insertions(+), 128 deletions(-) (limited to 'data/maps') diff --git a/data/maps/DesertUnderpass/map.json b/data/maps/DesertUnderpass/map.json index ca4b894d4..a3a80d41e 100644 --- a/data/maps/DesertUnderpass/map.json +++ b/data/maps/DesertUnderpass/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DesertUnderpass_EventScript_23AF41", + "script": "DesertUnderpass_EventScript_Fossil", "flag": "FLAG_HIDE_DESERT_UNDERPASS_FOSSIL" } ], diff --git a/data/maps/DesertUnderpass/scripts.inc b/data/maps/DesertUnderpass/scripts.inc index 8e89075e5..437f5de4b 100644 --- a/data/maps/DesertUnderpass/scripts.inc +++ b/data/maps/DesertUnderpass/scripts.inc @@ -6,29 +6,31 @@ DesertUnderpass_OnTransition: @ 823AF3D setflag FLAG_LANDMARK_DESERT_UNDERPASS end -DesertUnderpass_EventScript_23AF41:: @ 823AF41 +DesertUnderpass_EventScript_Fossil:: @ 823AF41 lock faceplayer - goto_if_set FLAG_CHOSE_CLAW_FOSSIL, DesertUnderpass_EventScript_23AF57 - goto_if_set FLAG_CHOSE_ROOT_FOSSIL, DesertUnderpass_EventScript_23AF68 + goto_if_set FLAG_CHOSE_ROOT_FOSSIL, DesertUnderpass_EventScript_GiveClawFossil + goto_if_set FLAG_CHOSE_CLAW_FOSSIL, DesertUnderpass_EventScript_GiveRootFossil release end -DesertUnderpass_EventScript_23AF57:: @ 823AF57 +DesertUnderpass_EventScript_GiveClawFossil:: @ 823AF57 giveitem_std ITEM_CLAW_FOSSIL removeobject 1 release end -DesertUnderpass_EventScript_23AF68:: @ 823AF68 +DesertUnderpass_EventScript_GiveRootFossil:: @ 823AF68 giveitem_std ITEM_ROOT_FOSSIL removeobject 1 release end -DesertUnderpass_Text_23AF79:: @ 823AF79 +@ Unused +DesertUnderpass_Text_FoundRootFossil:: @ 823AF79 .string "{PLAYER} found the ROOT FOSSIL.$" -DesertUnderpass_Text_23AF93:: @ 823AF93 +@ Unused +DesertUnderpass_Text_FoundClawFossil:: @ 823AF93 .string "{PLAYER} found the CLAW FOSSIL.$" diff --git a/data/maps/MirageTower_4F/scripts.inc b/data/maps/MirageTower_4F/scripts.inc index 3c2c59355..ac3afdce6 100644 --- a/data/maps/MirageTower_4F/scripts.inc +++ b/data/maps/MirageTower_4F/scripts.inc @@ -13,7 +13,7 @@ MirageTower_4F_EventScript_23AD48:: @ 823AD48 setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL removeobject 1 delay 30 - setflag FLAG_CHOSE_CLAW_FOSSIL + setflag FLAG_CHOSE_ROOT_FOSSIL goto MirageTower_4F_EventScript_23ADCA end @@ -34,7 +34,7 @@ MirageTower_4F_EventScript_23AD89:: @ 823AD89 setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL removeobject 2 delay 30 - setflag FLAG_CHOSE_ROOT_FOSSIL + setflag FLAG_CHOSE_CLAW_FOSSIL goto MirageTower_4F_EventScript_23ADCA end diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 037ddb18c..91d13e88c 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -136,7 +136,7 @@ Route111_EventScript_1F0E60:: @ 81F0E60 waitstate setvar VAR_MIRAGE_TOWER_STATE, 2 clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL - goto_if_set FLAG_CHOSE_ROOT_FOSSIL, Route111_EventScript_1F0EA7 + goto_if_set FLAG_CHOSE_CLAW_FOSSIL, Route111_EventScript_1F0EA7 msgbox Route111_Text_1F1C74, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json index 0c5c5ea77..7a629f44a 100644 --- a/data/maps/Route114_FossilManiacsHouse/map.json +++ b/data/maps/Route114_FossilManiacsHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route114_FossilManiacsHouse_EventScript_22AD3A", + "script": "Route114_FossilManiacsHouse_EventScript_FossilManiacsBrother", "flag": "0" } ], @@ -59,7 +59,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "Route114_FossilManiacsHouse_EventScript_22AD73" + "script": "Route114_FossilManiacsHouse_EventScript_RockDisplay" }, { "type": "sign", @@ -67,7 +67,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "Route114_FossilManiacsHouse_EventScript_22AD73" + "script": "Route114_FossilManiacsHouse_EventScript_RockDisplay" }, { "type": "sign", @@ -75,7 +75,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "Route114_FossilManiacsHouse_EventScript_22AD7C" + "script": "Route114_FossilManiacsHouse_EventScript_Bookshelf" }, { "type": "sign", @@ -83,7 +83,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "Route114_FossilManiacsHouse_EventScript_22AD7C" + "script": "Route114_FossilManiacsHouse_EventScript_Bookshelf" } ] } \ No newline at end of file diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc index 83fade3e6..5313f8705 100644 --- a/data/maps/Route114_FossilManiacsHouse/scripts.inc +++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc @@ -6,32 +6,32 @@ Route114_FossilManiacsHouse_OnTransition: @ 822AD36 setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE end -Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A +Route114_FossilManiacsHouse_EventScript_FossilManiacsBrother:: @ 822AD3A lock faceplayer - goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_22AD69 - msgbox Route114_FossilManiacsHouse_Text_22AD85, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_ReceivedDig + msgbox Route114_FossilManiacsHouse_Text_HaveThisToDigLikeMyBrother, MSGBOX_DEFAULT giveitem_std ITEM_TM28 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM28 release end -Route114_FossilManiacsHouse_EventScript_22AD69:: @ 822AD69 - msgbox Route114_FossilManiacsHouse_Text_22AE48, MSGBOX_DEFAULT +Route114_FossilManiacsHouse_EventScript_ReceivedDig:: @ 822AD69 + msgbox Route114_FossilManiacsHouse_Text_DigReturnsYouToEntrance, MSGBOX_DEFAULT release end -Route114_FossilManiacsHouse_EventScript_22AD73:: @ 822AD73 - msgbox Route114_FossilManiacsHouse_Text_22AE92, MSGBOX_SIGN +Route114_FossilManiacsHouse_EventScript_RockDisplay:: @ 822AD73 + msgbox Route114_FossilManiacsHouse_Text_RocksFillDisplayCase, MSGBOX_SIGN end -Route114_FossilManiacsHouse_EventScript_22AD7C:: @ 822AD7C - msgbox Route114_FossilManiacsHouse_Text_22AEC2, MSGBOX_SIGN +Route114_FossilManiacsHouse_EventScript_Bookshelf:: @ 822AD7C + msgbox Route114_FossilManiacsHouse_Text_CrammedWithBooks, MSGBOX_SIGN end -Route114_FossilManiacsHouse_Text_22AD85: @ 822AD85 +Route114_FossilManiacsHouse_Text_HaveThisToDigLikeMyBrother: @ 822AD85 .string "My big brother's the FOSSIL MANIAC…\n" .string "He's a nice guy who loves FOSSILS…\p" .string "He loves digging holes, too…\n" @@ -39,15 +39,15 @@ Route114_FossilManiacsHouse_Text_22AD85: @ 822AD85 .string "You can have this, so you can DIG\n" .string "holes just like my big brother…$" -Route114_FossilManiacsHouse_Text_22AE48: @ 822AE48 +Route114_FossilManiacsHouse_Text_DigReturnsYouToEntrance: @ 822AE48 .string "If you make a POKéMON DIG inside a\n" .string "cave, you're returned to the entrance…$" -Route114_FossilManiacsHouse_Text_22AE92: @ 822AE92 +Route114_FossilManiacsHouse_Text_RocksFillDisplayCase: @ 822AE92 .string "Rocks in peculiar shapes fill\n" .string "the display case…$" -Route114_FossilManiacsHouse_Text_22AEC2: @ 822AEC2 +Route114_FossilManiacsHouse_Text_CrammedWithBooks: @ 822AEC2 .string "THE COMPOSITION OF STRATA…\n" .string "HOW RAIN SHAPES THE LAND…\l" .string "STONES, SOIL, AND ROCK…\p" diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json index d0992f8fa..da3241ed1 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.json +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route114_FossilManiacsTunnel_EventScript_22AF87", + "script": "Route114_FossilManiacsTunnel_EventScript_FossilManiac", "flag": "0" } ], @@ -59,7 +59,7 @@ "elevation": 3, "var": "VAR_FOSSIL_MANIAC_STATE", "var_value": "1", - "script": "Route114_FossilManiacsTunnel_EventScript_22AF66" + "script": "Route114_FossilManiacsTunnel_EventScript_ManiacMentionCaveIn" }, { "type": "trigger", @@ -68,7 +68,7 @@ "elevation": 3, "var": "VAR_FOSSIL_MANIAC_STATE", "var_value": "1", - "script": "Route114_FossilManiacsTunnel_EventScript_22AF66" + "script": "Route114_FossilManiacsTunnel_EventScript_ManiacMentionCaveIn" } ], "bg_events": [] diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index 8c5ec779d..3bea9a501 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -1,61 +1,61 @@ Route114_FossilManiacsTunnel_MapScripts:: @ 822AF28 map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsTunnel_OnTransition - map_script MAP_SCRIPT_ON_LOAD, Route114_FossilManiacsTunnel_MapScript1_22AF49 + map_script MAP_SCRIPT_ON_LOAD, Route114_FossilManiacsTunnel_OnLoad .byte 0 Route114_FossilManiacsTunnel_OnTransition: @ 822AF33 - call_if_set FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_22AF3D + call_if_set FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_MoveFossilManiac end -Route114_FossilManiacsTunnel_EventScript_22AF3D:: @ 822AF3D +Route114_FossilManiacsTunnel_EventScript_MoveFossilManiac:: @ 822AF3D setobjectxyperm 1, 6, 5 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN return -Route114_FossilManiacsTunnel_MapScript1_22AF49: @ 822AF49 - call_if_unset FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_22AF53 +Route114_FossilManiacsTunnel_OnLoad: @ 822AF49 + call_if_unset FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_CloseDesertUnderpass end -Route114_FossilManiacsTunnel_EventScript_22AF53:: @ 822AF53 +Route114_FossilManiacsTunnel_EventScript_CloseDesertUnderpass:: @ 822AF53 setmetatile 6, 1, METATILE_Fallarbor_RedRockWall, 1 setmetatile 6, 2, METATILE_Fallarbor_RedRockWall, 1 return -Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66 +Route114_FossilManiacsTunnel_EventScript_ManiacMentionCaveIn:: @ 822AF66 lockall applymovement 1, Common_Movement_WalkInPlaceFastestUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox Route114_FossilManiacsTunnel_Text_22B1F7, MSGBOX_DEFAULT + msgbox Route114_FossilManiacsTunnel_Text_NotSafeThatWay, MSGBOX_DEFAULT setvar VAR_FOSSIL_MANIAC_STATE, 2 releaseall end -Route114_FossilManiacsTunnel_EventScript_22AF87:: @ 822AF87 +Route114_FossilManiacsTunnel_EventScript_FossilManiac:: @ 822AF87 lock faceplayer - goto_if_set FLAG_RECEIVED_REVIVED_FOSSIL_MON, Route114_FossilManiacsTunnel_EventScript_22AFC6 + goto_if_set FLAG_RECEIVED_REVIVED_FOSSIL_MON, Route114_FossilManiacsTunnel_EventScript_PlayerRevivedFossil checkitem ITEM_ROOT_FOSSIL, 1 - compare VAR_RESULT, 1 - goto_if_eq Route114_FossilManiacsTunnel_EventScript_22AFBC + compare VAR_RESULT, TRUE + goto_if_eq Route114_FossilManiacsTunnel_EventScript_PlayerHasFossil checkitem ITEM_CLAW_FOSSIL, 1 - compare VAR_RESULT, 1 - goto_if_eq Route114_FossilManiacsTunnel_EventScript_22AFBC - msgbox Route114_FossilManiacsTunnel_Text_22AFD0, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route114_FossilManiacsTunnel_EventScript_PlayerHasFossil + msgbox Route114_FossilManiacsTunnel_Text_LookInDesertForFossils, MSGBOX_DEFAULT release end -Route114_FossilManiacsTunnel_EventScript_22AFBC:: @ 822AFBC - msgbox Route114_FossilManiacsTunnel_Text_22B0D6, MSGBOX_DEFAULT +Route114_FossilManiacsTunnel_EventScript_PlayerHasFossil:: @ 822AFBC + msgbox Route114_FossilManiacsTunnel_Text_DevonCorpRevivingFossils, MSGBOX_DEFAULT release end -Route114_FossilManiacsTunnel_EventScript_22AFC6:: @ 822AFC6 - msgbox Route114_FossilManiacsTunnel_Text_22B1CC, MSGBOX_DEFAULT +Route114_FossilManiacsTunnel_EventScript_PlayerRevivedFossil:: @ 822AFC6 + msgbox Route114_FossilManiacsTunnel_Text_FossilsAreWonderful, MSGBOX_DEFAULT release end -Route114_FossilManiacsTunnel_Text_22AFD0: @ 822AFD0 +Route114_FossilManiacsTunnel_Text_LookInDesertForFossils: @ 822AFD0 .string "I'm the FOSSIL MANIAC…\n" .string "I'm a nice guy who loves FOSSILS…\p" .string "Do you want a FOSSIL?\p" @@ -66,7 +66,7 @@ Route114_FossilManiacsTunnel_Text_22AFD0: @ 822AFD0 .string "are boulders and sand that may hide\l" .string "FOSSILS…$" -Route114_FossilManiacsTunnel_Text_22B0D6: @ 822B0D6 +Route114_FossilManiacsTunnel_Text_DevonCorpRevivingFossils: @ 822B0D6 .string "You found a FOSSIL, didn't you?\n" .string "That's so nice… It's so dreamy…\p" .string "What are you going to do with that\n" @@ -77,11 +77,11 @@ Route114_FossilManiacsTunnel_Text_22B0D6: @ 822B0D6 .string "I love my FOSSILS, so I would never\n" .string "do anything like that…$" -Route114_FossilManiacsTunnel_Text_22B1CC: @ 822B1CC +Route114_FossilManiacsTunnel_Text_FossilsAreWonderful: @ 822B1CC .string "FOSSILS are so… Wonderful…\n" .string "It's so dreamy…$" -Route114_FossilManiacsTunnel_Text_22B1F7: @ 822B1F7 +Route114_FossilManiacsTunnel_Text_NotSafeThatWay: @ 822B1F7 .string "Oh…\n" .string "It's not safe that way…\p" .string "I was digging away, you see…\n" diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json index c87feb2bc..b7f2523af 100644 --- a/data/maps/Route123_BerryMastersHouse/map.json +++ b/data/maps/Route123_BerryMastersHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route123_BerryMastersHouse_EventScript_26F845", + "script": "Route123_BerryMastersHouse_EventScript_BerryMaster", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route123_BerryMastersHouse_EventScript_26F8C0", + "script": "Route123_BerryMastersHouse_EventScript_BerryMastersWife", "flag": "0" } ], diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index 979509440..9e63dc608 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -6,141 +6,141 @@ Route123_BerryMastersHouse_OnTransition: @ 826F841 setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE end -Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 +Route123_BerryMastersHouse_EventScript_BerryMaster:: @ 826F845 lock faceplayer dotimebasedevents - goto_if_set FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY, Route123_BerryMastersHouse_EventScript_26F8B6 - msgbox Route123_BerryMastersHouse_Text_2A7386, MSGBOX_DEFAULT - random 10 - addvar VAR_RESULT, 20 + goto_if_set FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY, Route123_BerryMastersHouse_EventScript_ReceivedBerryToday + msgbox Route123_BerryMastersHouse_Text_YoureDeservingOfBerry, MSGBOX_DEFAULT + random NUM_BERRY_MASTER_BERRIES + addvar VAR_RESULT, NUM_BERRY_MASTER_BERRIES_SKIPPED addvar VAR_RESULT, FIRST_BERRY_INDEX giveitem_std VAR_RESULT - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_BERRY_MASTER_RECEIVED_BERRY - msgbox Route123_BerryMastersHouse_Text_2A7428, MSGBOX_DEFAULT - random 10 - addvar VAR_RESULT, 20 + msgbox Route123_BerryMastersHouse_Text_WhyBeStingyTakeAnother, MSGBOX_DEFAULT + random NUM_BERRY_MASTER_BERRIES + addvar VAR_RESULT, NUM_BERRY_MASTER_BERRIES_SKIPPED addvar VAR_RESULT, FIRST_BERRY_INDEX giveitem_std VAR_RESULT - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull - msgbox Route123_BerryMastersHouse_Text_2A7445, MSGBOX_DEFAULT + msgbox Route123_BerryMastersHouse_Text_VisitPrettyPetalFlowerShop, MSGBOX_DEFAULT release end -Route123_BerryMastersHouse_EventScript_26F8B6:: @ 826F8B6 - msgbox Route123_BerryMastersHouse_Text_2A749E, MSGBOX_DEFAULT +Route123_BerryMastersHouse_EventScript_ReceivedBerryToday:: @ 826F8B6 + msgbox Route123_BerryMastersHouse_Text_DoneForToday, MSGBOX_DEFAULT release end -Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0 +Route123_BerryMastersHouse_EventScript_BerryMastersWife:: @ 826F8C0 lock faceplayer dotimebasedevents - goto_if_set FLAG_DAILY_BERRY_MASTERS_WIFE, Route123_BerryMastersHouse_EventScript_26FA6F - msgbox Route123_BerryMastersHouse_Text_2A74E6, MSGBOX_DEFAULT + goto_if_set FLAG_DAILY_BERRY_MASTERS_WIFE, Route123_BerryMastersHouse_EventScript_ReceivedWifeBerryToday + msgbox Route123_BerryMastersHouse_Text_HeardAGoodSayingLately, MSGBOX_DEFAULT setvar VAR_0x8004, EASY_CHAT_TYPE_GOOD_SAYING call Common_ShowEasyChatScreen lock faceplayer - compare VAR_RESULT, 1 - goto_if_eq Route123_BerryMastersHouse_EventScript_26F909 - compare VAR_RESULT, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_26F8F7 + compare VAR_RESULT, TRUE + goto_if_eq Route123_BerryMastersHouse_EventScript_GavePhrase + compare VAR_RESULT, FALSE + goto_if_eq Route123_BerryMastersHouse_EventScript_CancelPhrase end -Route123_BerryMastersHouse_EventScript_26F8F7:: @ 826F8F7 - msgbox Route123_BerryMastersHouse_Text_2A7682, MSGBOX_DEFAULT - msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT +Route123_BerryMastersHouse_EventScript_CancelPhrase:: @ 826F8F7 + msgbox Route123_BerryMastersHouse_Text_Ah, MSGBOX_DEFAULT + msgbox Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife, MSGBOX_DEFAULT release end -Route123_BerryMastersHouse_EventScript_26F909:: @ 826F909 - compare VAR_0x8004, 0 - goto_if_eq Route123_BerryMastersHouse_EventScript_26F94C - compare VAR_0x8004, 1 - goto_if_eq Route123_BerryMastersHouse_EventScript_26F97A - compare VAR_0x8004, 2 - goto_if_eq Route123_BerryMastersHouse_EventScript_26F9AB - compare VAR_0x8004, 3 - goto_if_eq Route123_BerryMastersHouse_EventScript_26F9DC - compare VAR_0x8004, 4 - goto_if_eq Route123_BerryMastersHouse_EventScript_26FA0D - compare VAR_0x8004, 5 - goto_if_eq Route123_BerryMastersHouse_EventScript_26FA3E +Route123_BerryMastersHouse_EventScript_GavePhrase:: @ 826F909 + compare VAR_0x8004, NOT_SPECIAL_PHRASE + goto_if_eq Route123_BerryMastersHouse_EventScript_GiveNormalBerry + compare VAR_0x8004, PHRASE_GREAT_BATTLE + goto_if_eq Route123_BerryMastersHouse_EventScript_GiveSpelonBerry + compare VAR_0x8004, PHRASE_CHALLENGE_CONTEST + goto_if_eq Route123_BerryMastersHouse_EventScript_GivePamtreBerry + compare VAR_0x8004, PHRASE_OVERWHELMING_LATIAS + goto_if_eq Route123_BerryMastersHouse_EventScript_GiveWatmelBerry + compare VAR_0x8004, PHRASE_COOL_LATIOS + goto_if_eq Route123_BerryMastersHouse_EventScript_GiveDurinBerry + compare VAR_0x8004, PHRASE_SUPER_HUSTLE + goto_if_eq Route123_BerryMastersHouse_EventScript_GiveBelueBerry end -Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C - msgbox Route123_BerryMastersHouse_Text_2A75D0, MSGBOX_DEFAULT - random 10 +Route123_BerryMastersHouse_EventScript_GiveNormalBerry:: @ 826F94C + msgbox Route123_BerryMastersHouse_Text_GoodSayingTakeThis, MSGBOX_DEFAULT + random NUM_BERRY_MASTER_WIFE_BERRIES addvar VAR_RESULT, FIRST_BERRY_INDEX giveitem_std VAR_RESULT - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull - goto Route123_BerryMastersHouse_EventScript_26FA79 + goto Route123_BerryMastersHouse_EventScript_GaveBerry release end -Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A - goto_if_set FLAG_RECEIVED_SPELON_BERRY, Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT +Route123_BerryMastersHouse_EventScript_GiveSpelonBerry:: @ 826F97A + goto_if_set FLAG_RECEIVED_SPELON_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry + msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_SPELON_BERRY - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SPELON_BERRY - goto Route123_BerryMastersHouse_EventScript_26FA79 + goto Route123_BerryMastersHouse_EventScript_GaveBerry end -Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB - goto_if_set FLAG_RECEIVED_PAMTRE_BERRY, Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT +Route123_BerryMastersHouse_EventScript_GivePamtreBerry:: @ 826F9AB + goto_if_set FLAG_RECEIVED_PAMTRE_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry + msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_PAMTRE_BERRY - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_PAMTRE_BERRY - goto Route123_BerryMastersHouse_EventScript_26FA79 + goto Route123_BerryMastersHouse_EventScript_GaveBerry end -Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC - goto_if_set FLAG_RECEIVED_WATMEL_BERRY, Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT +Route123_BerryMastersHouse_EventScript_GiveWatmelBerry:: @ 826F9DC + goto_if_set FLAG_RECEIVED_WATMEL_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry + msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_WATMEL_BERRY - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_WATMEL_BERRY - goto Route123_BerryMastersHouse_EventScript_26FA79 + goto Route123_BerryMastersHouse_EventScript_GaveBerry end -Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D - goto_if_set FLAG_RECEIVED_DURIN_BERRY, Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT +Route123_BerryMastersHouse_EventScript_GiveDurinBerry:: @ 826FA0D + goto_if_set FLAG_RECEIVED_DURIN_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry + msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_DURIN_BERRY - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_DURIN_BERRY - goto Route123_BerryMastersHouse_EventScript_26FA79 + goto Route123_BerryMastersHouse_EventScript_GaveBerry end -Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E - goto_if_set FLAG_RECEIVED_BELUE_BERRY, Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT +Route123_BerryMastersHouse_EventScript_GiveBelueBerry:: @ 826FA3E + goto_if_set FLAG_RECEIVED_BELUE_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry + msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_BELUE_BERRY - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_BELUE_BERRY - goto Route123_BerryMastersHouse_EventScript_26FA79 + goto Route123_BerryMastersHouse_EventScript_GaveBerry end -Route123_BerryMastersHouse_EventScript_26FA6F:: @ 826FA6F - msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT +Route123_BerryMastersHouse_EventScript_ReceivedWifeBerryToday:: @ 826FA6F + msgbox Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife, MSGBOX_DEFAULT release end -Route123_BerryMastersHouse_EventScript_26FA79:: @ 826FA79 +Route123_BerryMastersHouse_EventScript_GaveBerry:: @ 826FA79 setflag FLAG_DAILY_BERRY_MASTERS_WIFE - msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT + msgbox Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife, MSGBOX_DEFAULT release end -- cgit v1.2.3