From e80ddc46758bfef075b749af2802ce5d646bd9cd Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 26 Feb 2020 01:46:21 -0500 Subject: Document Two Island scripts --- data/maps/TwoIsland/map.json | 20 ++--- data/maps/TwoIsland/scripts.inc | 162 ++++++++++++++++++++-------------------- data/maps/TwoIsland/text.inc | 26 +++---- 3 files changed, 104 insertions(+), 104 deletions(-) (limited to 'data/maps/TwoIsland') diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 668886176..8a258b635 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -31,7 +31,7 @@ "movement_range_y": 2, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_16760F", + "script": "TwoIsland_EventScript_Clerk", "flag": "0" }, { @@ -44,7 +44,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_167755", + "script": "TwoIsland_EventScript_Woman", "flag": "FLAG_HIDE_TWO_ISLAND_WOMAN" }, { @@ -57,7 +57,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_16775E", + "script": "TwoIsland_EventScript_Beauty", "flag": "FLAG_HIDE_TWO_ISLAND_BEAUTY" }, { @@ -70,7 +70,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_16774C", + "script": "TwoIsland_EventScript_Sailor", "flag": "0" }, { @@ -83,7 +83,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_167777", + "script": "TwoIsland_EventScript_SuperNerd", "flag": "FLAG_HIDE_TWO_ISLAND_SUPER_NERD" }, { @@ -122,7 +122,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_167789", + "script": "TwoIsland_EventScript_LittleBoy", "flag": "0" }, { @@ -135,7 +135,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_167780", + "script": "TwoIsland_EventScript_Boy", "flag": "0" } ], @@ -176,21 +176,21 @@ "x": 29, "y": 8, "elevation": 0, - "script": "TwoIsland_EventScript_167792" + "script": "TwoIsland_EventScript_IslandSign" }, { "type": "bg_event_type_0", "x": 40, "y": 10, "elevation": 0, - "script": "TwoIsland_EventScript_16779B" + "script": "TwoIsland_EventScript_JoyfulGameCornerSign" }, { "type": "bg_event_type_0", "x": 8, "y": 3, "elevation": 0, - "script": "TwoIsland_EventScript_1677A4" + "script": "TwoIsland_EventScript_FastCurrentSign" } ] } diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index acfb2c38b..530fd3928 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -5,137 +5,137 @@ TwoIsland_MapScripts:: @ 8167564 TwoIsland_OnTransition:: @ 816756A setworldmapflag FLAG_WORLD_MAP_TWO_ISLAND setflag FLAG_VISITED_TWO_ISLAND - call EventScript_167576 + call TwoIsland_EventScript_SetShopState end -EventScript_167576:: @ 8167576 - goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_167597 - goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_1675B8 - goto_if_set FLAG_RESCUED_LOSTELLE, EventScript_1675D9 - goto EventScript_1675E8 +TwoIsland_EventScript_SetShopState:: @ 8167576 + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, TwoIsland_EventScript_SetShopStateAfterHoennLink + goto_if_set FLAG_SYS_GAME_CLEAR, TwoIsland_EventScript_SetShopStateAfterChampion + goto_if_set FLAG_RESCUED_LOSTELLE, TwoIsland_EventScript_SetShopStateAfterLostelleRescue + goto TwoIsland_EventScript_SetShopStateDefault end -EventScript_167597:: @ 8167597 - goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1675EE - goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_1, EventScript_1675F4 - goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_2, EventScript_1675FD - goto EventScript_167606 +TwoIsland_EventScript_SetShopStateAfterHoennLink:: @ 8167597 + goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, TwoIsland_EventScript_SetShopInitial + goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_1, TwoIsland_EventScript_SetShopExpanded1 + goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_2, TwoIsland_EventScript_SetShopExpanded2 + goto TwoIsland_EventScript_SetShopExpanded3 end -EventScript_1675B8:: @ 81675B8 - goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1675EE - goto_if_unset FLAG_RESCUED_LOSTELLE, EventScript_1675EE - goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_1, EventScript_1675F4 - goto EventScript_1675FD +TwoIsland_EventScript_SetShopStateAfterChampion:: @ 81675B8 + goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, TwoIsland_EventScript_SetShopInitial + goto_if_unset FLAG_RESCUED_LOSTELLE, TwoIsland_EventScript_SetShopInitial + goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_1, TwoIsland_EventScript_SetShopExpanded1 + goto TwoIsland_EventScript_SetShopExpanded2 end -EventScript_1675D9:: @ 81675D9 - goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1675EE - goto EventScript_1675F4 +TwoIsland_EventScript_SetShopStateAfterLostelleRescue:: @ 81675D9 + goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, TwoIsland_EventScript_SetShopInitial + goto TwoIsland_EventScript_SetShopExpanded1 end -EventScript_1675E8:: @ 81675E8 - goto EventScript_1675EE +TwoIsland_EventScript_SetShopStateDefault:: @ 81675E8 + goto TwoIsland_EventScript_SetShopInitial end -EventScript_1675EE:: @ 81675EE +TwoIsland_EventScript_SetShopInitial:: @ 81675EE setvar VAR_MAP_SCENE_TWO_ISLAND, 1 return -EventScript_1675F4:: @ 81675F4 +TwoIsland_EventScript_SetShopExpanded1:: @ 81675F4 setvar VAR_MAP_SCENE_TWO_ISLAND, 2 clearflag FLAG_HIDE_TWO_ISLAND_WOMAN return -EventScript_1675FD:: @ 81675FD +TwoIsland_EventScript_SetShopExpanded2:: @ 81675FD setvar VAR_MAP_SCENE_TWO_ISLAND, 3 clearflag FLAG_HIDE_TWO_ISLAND_BEAUTY return -EventScript_167606:: @ 8167606 +TwoIsland_EventScript_SetShopExpanded3:: @ 8167606 setvar VAR_MAP_SCENE_TWO_ISLAND, 4 clearflag FLAG_HIDE_TWO_ISLAND_SUPER_NERD return -TwoIsland_EventScript_16760F:: @ 816760F +TwoIsland_EventScript_Clerk:: @ 816760F goto_if_questlog EventScript_ReleaseEnd lock faceplayer compare VAR_MAP_SCENE_TWO_ISLAND, 4 - goto_if_eq EventScript_167646 + goto_if_eq TwoIsland_EventScript_ClerkShopExpanded3 compare VAR_MAP_SCENE_TWO_ISLAND, 3 - goto_if_eq EventScript_16765E + goto_if_eq TwoIsland_EventScript_ClerkShopExpanded2 compare VAR_MAP_SCENE_TWO_ISLAND, 2 - goto_if_eq EventScript_167676 - goto EventScript_16768E + goto_if_eq TwoIsland_EventScript_ClerkShopExpanded1 + goto TwoIsland_EventScript_ClerkShopInitial end -EventScript_167646:: @ 8167646 - goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_3, EventScript_1676A6 +TwoIsland_EventScript_ClerkShopExpanded3:: @ 8167646 + goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_3, TwoIsland_EventScript_ClerkShopSkipIntro setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_3 - message Text_181CAE + message TwoIsland_Text_BringingItemsFromDistantLands waitmessage - goto EventScript_167728 + goto TwoIsland_EventScript_ShopExpanded3 end -EventScript_16765E:: @ 816765E - goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_2, EventScript_1676A6 +TwoIsland_EventScript_ClerkShopExpanded2:: @ 816765E + goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_2, TwoIsland_EventScript_ClerkShopSkipIntro setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2 - message Text_181C77 + message TwoIsland_Text_HopeYouGiveItYourBest waitmessage - goto EventScript_167708 + goto TwoIsland_EventScript_ShopExpanded2 end -EventScript_167676:: @ 8167676 - goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_1, EventScript_1676A6 +TwoIsland_EventScript_ClerkShopExpanded1:: @ 8167676 + goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_1, TwoIsland_EventScript_ClerkShopSkipIntro setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1 - message Text_181B7C + message TwoIsland_Text_AddedMerchandiseForLostelle waitmessage - goto EventScript_1676EC + goto TwoIsland_EventScript_ShopExpanded1 end -EventScript_16768E:: @ 816768E - goto_if_set FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1676A6 +TwoIsland_EventScript_ClerkShopInitial:: @ 816768E + goto_if_set FLAG_TWO_ISLAND_SHOP_INTRODUCED, TwoIsland_EventScript_ClerkShopSkipIntro setflag FLAG_TWO_ISLAND_SHOP_INTRODUCED - message Text_181AFE + message TwoIsland_Text_WelcomeToShopMerchandiseLimited waitmessage - goto EventScript_1676D3 + goto TwoIsland_EventScript_ShopInitial end -EventScript_1676A6:: @ 81676A6 +TwoIsland_EventScript_ClerkShopSkipIntro:: @ 81676A6 message Text_MayIHelpYou waitmessage compare VAR_MAP_SCENE_TWO_ISLAND, 4 - goto_if_eq EventScript_167728 + goto_if_eq TwoIsland_EventScript_ShopExpanded3 compare VAR_MAP_SCENE_TWO_ISLAND, 3 - goto_if_eq EventScript_167708 + goto_if_eq TwoIsland_EventScript_ShopExpanded2 compare VAR_MAP_SCENE_TWO_ISLAND, 2 - goto_if_eq EventScript_1676EC - goto EventScript_1676D3 + goto_if_eq TwoIsland_EventScript_ShopExpanded1 + goto TwoIsland_EventScript_ShopInitial end -EventScript_1676D3:: @ 81676D3 - pokemart Items_1676E4 +TwoIsland_EventScript_ShopInitial:: @ 81676D3 + pokemart TwoIsland_Items_ShopInitial msgbox Text_PleaseComeAgain release end .align 2 -Items_1676E4:: @ 81676E4 +TwoIsland_Items_ShopInitial:: @ 81676E4 .2byte ITEM_GREAT_BALL .2byte ITEM_FRESH_WATER .2byte ITEM_NONE release end -EventScript_1676EC:: @ 81676EC - pokemart Items_1676FC +TwoIsland_EventScript_ShopExpanded1:: @ 81676EC + pokemart TwoIsland_Items_ShopExpanded1 msgbox Text_PleaseComeAgain release end .align 2 -Items_1676FC:: @ 81676FC +TwoIsland_Items_ShopExpanded1:: @ 81676FC .2byte ITEM_ULTRA_BALL .2byte ITEM_GREAT_BALL .2byte ITEM_SODA_POP @@ -144,14 +144,14 @@ Items_1676FC:: @ 81676FC release end -EventScript_167708:: @ 8167708 - pokemart Items_167718 +TwoIsland_EventScript_ShopExpanded2:: @ 8167708 + pokemart TwoIsland_Items_ShopExpanded2 msgbox Text_PleaseComeAgain release end .align 2 -Items_167718:: @ 8167718 +TwoIsland_Items_ShopExpanded2:: @ 8167718 .2byte ITEM_ULTRA_BALL .2byte ITEM_GREAT_BALL .2byte ITEM_LEMONADE @@ -162,14 +162,14 @@ Items_167718:: @ 8167718 release end -EventScript_167728:: @ 8167728 - pokemart Items_167738 +TwoIsland_EventScript_ShopExpanded3:: @ 8167728 + pokemart TwoIsland_Items_ShopExpanded3 msgbox Text_PleaseComeAgain release end .align 2 -Items_167738:: @ 8167738 +TwoIsland_Items_ShopExpanded3:: @ 8167738 .2byte ITEM_ULTRA_BALL .2byte ITEM_REPEAT_BALL .2byte ITEM_TIMER_BALL @@ -182,42 +182,42 @@ Items_167738:: @ 8167738 release end -TwoIsland_EventScript_16774C:: @ 816774C - msgbox gUnknown_8181D2F, MSGBOX_NPC +TwoIsland_EventScript_Sailor:: @ 816774C + msgbox TwoIsland_Text_FellowMovedFromCeladonCity, MSGBOX_NPC end -TwoIsland_EventScript_167755:: @ 8167755 - msgbox gUnknown_8181DCA, MSGBOX_NPC +TwoIsland_EventScript_Woman:: @ 8167755 + msgbox TwoIsland_Text_ShopkeepersBrotherWorksGameCorner, MSGBOX_NPC end -TwoIsland_EventScript_16775E:: @ 816775E +TwoIsland_EventScript_Beauty:: @ 816775E lock faceplayer famechecker FAMECHECKER_BRUNO, 4 - msgbox gUnknown_8181E47 + msgbox TwoIsland_Text_BrunoCameToIslandWhileBack release end -TwoIsland_EventScript_167777:: @ 8167777 - msgbox gUnknown_8181F28, MSGBOX_NPC +TwoIsland_EventScript_SuperNerd:: @ 8167777 + msgbox TwoIsland_Text_BuyRareItemsHere, MSGBOX_NPC end -TwoIsland_EventScript_167780:: @ 8167780 - msgbox gUnknown_8181F5D, MSGBOX_NPC +TwoIsland_EventScript_Boy:: @ 8167780 + msgbox TwoIsland_Text_OldWomanLivesOutOnCape, MSGBOX_NPC end -TwoIsland_EventScript_167789:: @ 8167789 - msgbox gUnknown_8181FCE, MSGBOX_NPC +TwoIsland_EventScript_LittleBoy:: @ 8167789 + msgbox TwoIsland_Text_HaveYouTriedJumpingGame, MSGBOX_NPC end -TwoIsland_EventScript_167792:: @ 8167792 - msgbox gUnknown_8181A88, MSGBOX_SIGN +TwoIsland_EventScript_IslandSign:: @ 8167792 + msgbox TwoIsland_Text_IslandSign, MSGBOX_SIGN end -TwoIsland_EventScript_16779B:: @ 816779B - msgbox gUnknown_8181AA7, MSGBOX_SIGN +TwoIsland_EventScript_JoyfulGameCornerSign:: @ 816779B + msgbox TwoIsland_Text_JoyfulGameCornerSign, MSGBOX_SIGN end -TwoIsland_EventScript_1677A4:: @ 81677A4 - msgbox gUnknown_8181AC8, MSGBOX_SIGN +TwoIsland_EventScript_FastCurrentSign:: @ 81677A4 + msgbox TwoIsland_Text_DangerFastCurrent, MSGBOX_SIGN end diff --git a/data/maps/TwoIsland/text.inc b/data/maps/TwoIsland/text.inc index fca7d80ee..c0834abb8 100644 --- a/data/maps/TwoIsland/text.inc +++ b/data/maps/TwoIsland/text.inc @@ -1,23 +1,23 @@ -gUnknown_8181A88:: @ 8181A88 +TwoIsland_Text_IslandSign:: @ 8181A88 .string "TWO ISLAND\n" .string "Boon Island for Two$" -gUnknown_8181AA7:: @ 8181AA7 +TwoIsland_Text_JoyfulGameCornerSign:: @ 8181AA7 .string "Skip & Chomp!\n" .string "Joyful GAME CORNER$" -gUnknown_8181AC8:: @ 8181AC8 +TwoIsland_Text_DangerFastCurrent:: @ 8181AC8 .string "DANGER! FAST CURRENT!\n" .string "Fishing and surfing prohibited!$" -Text_181AFE:: @ 8181AFE +TwoIsland_Text_WelcomeToShopMerchandiseLimited:: @ 8181AFE .string "Oh!\n" .string "Hello, welcome to my shop!\p" .string "We've only opened up recently.\p" .string "Our merchandise is limited, but I\n" .string "hope we can serve your needs.$" -Text_181B7C:: @ 8181B7C +TwoIsland_Text_AddedMerchandiseForLostelle:: @ 8181B7C .string "I can't tell you how grateful I am\n" .string "for your rescue of LOSTELLE.\p" .string "Thanks to your feat, the people of\n" @@ -27,11 +27,11 @@ Text_181B7C:: @ 8181B7C .string "The people of THREE ISLAND\n" .string "helped me add to my merchandise.$" -Text_181C77:: @ 8181C77 +TwoIsland_Text_HopeYouGiveItYourBest:: @ 8181C77 .string "Hi! I'm giving it my best here.\n" .string "I hope you do too, {PLAYER}.$" -Text_181CAE:: @ 8181CAE +TwoIsland_Text_BringingItemsFromDistantLands:: @ 8181CAE .string "Oh, hello, {PLAYER}!\n" .string "Welcome!\p" .string "I've started bringing in items from\n" @@ -39,7 +39,7 @@ Text_181CAE:: @ 8181CAE .string "I've got some rare items in, too.\n" .string "Please have a look!$" -gUnknown_8181D2F:: @ 8181D2F +TwoIsland_Text_FellowMovedFromCeladonCity:: @ 8181D2F .string "That fellow there, he moved here\n" .string "from CELADON CITY.\p" .string "He started up a shop with his\n" @@ -47,13 +47,13 @@ gUnknown_8181D2F:: @ 8181D2F .string "You have to wonder if he knew what\n" .string "he was getting into.$" -gUnknown_8181DCA:: @ 8181DCA +TwoIsland_Text_ShopkeepersBrotherWorksGameCorner:: @ 8181DCA .string "The shopkeeper's brother took\n" .string "a job at the GAME CORNER.\p" .string "He's trying to pull together money\n" .string "so they can buy more merchandise.$" -gUnknown_8181E47:: @ 8181E47 +TwoIsland_Text_BrunoCameToIslandWhileBack:: @ 8181E47 .string "Listen, listen.\n" .string "Did you know?\p" .string "A famous TRAINER came to the\n" @@ -64,17 +64,17 @@ gUnknown_8181E47:: @ 8181E47 .string "found out that they were all sold\l" .string "out of Rage Candybars.$" -gUnknown_8181F28:: @ 8181F28 +TwoIsland_Text_BuyRareItemsHere:: @ 8181F28 .string "The discerning TRAINER knows to\n" .string "buy rare items here!$" -gUnknown_8181F5D:: @ 8181F5D +TwoIsland_Text_OldWomanLivesOutOnCape:: @ 8181F5D .string "There's an old woman who lives in\n" .string "a cottage out on the cape.\p" .string "She gives the eye to POKéMON.\n" .string "It's a bit unnerving.$" -gUnknown_8181FCE:: @ 8181FCE +TwoIsland_Text_HaveYouTriedJumpingGame:: @ 8181FCE .string "Boing! Boing!\n" .string "Have you tried the jumping game?\p" .string "The POKéMON you can enter…\n" -- cgit v1.2.3