dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove address comments

Browse Source
This commit is contained in:
GriffinR
2022-06-24 21:10:48 -04:00
parent d73f39ae40
commit 9cde4e0f74
802 changed files with 20272 additions and 20272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/TwoIsland/scripts.inc
+34 -34
View File
@@ -1,63 +1,63 @@
TwoIsland_MapScripts:: @ 8167564
TwoIsland_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_OnTransition
.byte 0
TwoIsland_OnTransition:: @ 816756A
TwoIsland_OnTransition::
setworldmapflag FLAG_WORLD_MAP_TWO_ISLAND
setflag FLAG_VISITED_TWO_ISLAND
call TwoIsland_EventScript_SetShopState
end
TwoIsland_EventScript_SetShopState:: @ 8167576
TwoIsland_EventScript_SetShopState::
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
TwoIsland_EventScript_SetShopStateAfterHoennLink:: @ 8167597
TwoIsland_EventScript_SetShopStateAfterHoennLink::
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
TwoIsland_EventScript_SetShopStateAfterChampion:: @ 81675B8
TwoIsland_EventScript_SetShopStateAfterChampion::
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
TwoIsland_EventScript_SetShopStateAfterLostelleRescue:: @ 81675D9
TwoIsland_EventScript_SetShopStateAfterLostelleRescue::
goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, TwoIsland_EventScript_SetShopInitial
goto TwoIsland_EventScript_SetShopExpanded1
end
TwoIsland_EventScript_SetShopStateDefault:: @ 81675E8
TwoIsland_EventScript_SetShopStateDefault::
goto TwoIsland_EventScript_SetShopInitial
end
TwoIsland_EventScript_SetShopInitial:: @ 81675EE
TwoIsland_EventScript_SetShopInitial::
setvar VAR_MAP_SCENE_TWO_ISLAND, 1
return
TwoIsland_EventScript_SetShopExpanded1:: @ 81675F4
TwoIsland_EventScript_SetShopExpanded1::
setvar VAR_MAP_SCENE_TWO_ISLAND, 2
clearflag FLAG_HIDE_TWO_ISLAND_WOMAN
return
TwoIsland_EventScript_SetShopExpanded2:: @ 81675FD
TwoIsland_EventScript_SetShopExpanded2::
setvar VAR_MAP_SCENE_TWO_ISLAND, 3
clearflag FLAG_HIDE_TWO_ISLAND_BEAUTY
return
TwoIsland_EventScript_SetShopExpanded3:: @ 8167606
TwoIsland_EventScript_SetShopExpanded3::
setvar VAR_MAP_SCENE_TWO_ISLAND, 4
clearflag FLAG_HIDE_TWO_ISLAND_SUPER_NERD
return
TwoIsland_EventScript_Clerk:: @ 816760F
TwoIsland_EventScript_Clerk::
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
@@ -70,7 +70,7 @@ TwoIsland_EventScript_Clerk:: @ 816760F
goto TwoIsland_EventScript_ClerkShopInitial
end
TwoIsland_EventScript_ClerkShopExpanded3:: @ 8167646
TwoIsland_EventScript_ClerkShopExpanded3::
goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_3, TwoIsland_EventScript_ClerkShopSkipIntro
setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_3
message TwoIsland_Text_BringingItemsFromDistantLands
@@ -78,7 +78,7 @@ TwoIsland_EventScript_ClerkShopExpanded3:: @ 8167646
goto TwoIsland_EventScript_ShopExpanded3
end
TwoIsland_EventScript_ClerkShopExpanded2:: @ 816765E
TwoIsland_EventScript_ClerkShopExpanded2::
goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_2, TwoIsland_EventScript_ClerkShopSkipIntro
setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2
message TwoIsland_Text_HopeYouGiveItYourBest
@@ -86,7 +86,7 @@ TwoIsland_EventScript_ClerkShopExpanded2:: @ 816765E
goto TwoIsland_EventScript_ShopExpanded2
end
TwoIsland_EventScript_ClerkShopExpanded1:: @ 8167676
TwoIsland_EventScript_ClerkShopExpanded1::
goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_1, TwoIsland_EventScript_ClerkShopSkipIntro
setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1
message TwoIsland_Text_AddedMerchandiseForLostelle
@@ -94,7 +94,7 @@ TwoIsland_EventScript_ClerkShopExpanded1:: @ 8167676
goto TwoIsland_EventScript_ShopExpanded1
end
TwoIsland_EventScript_ClerkShopInitial:: @ 816768E
TwoIsland_EventScript_ClerkShopInitial::
goto_if_set FLAG_TWO_ISLAND_SHOP_INTRODUCED, TwoIsland_EventScript_ClerkShopSkipIntro
setflag FLAG_TWO_ISLAND_SHOP_INTRODUCED
message TwoIsland_Text_WelcomeToShopMerchandiseLimited
@@ -102,7 +102,7 @@ TwoIsland_EventScript_ClerkShopInitial:: @ 816768E
goto TwoIsland_EventScript_ShopInitial
end
TwoIsland_EventScript_ClerkShopSkipIntro:: @ 81676A6
TwoIsland_EventScript_ClerkShopSkipIntro::
message Text_MayIHelpYou
waitmessage
compare VAR_MAP_SCENE_TWO_ISLAND, 4
@@ -114,28 +114,28 @@ TwoIsland_EventScript_ClerkShopSkipIntro:: @ 81676A6
goto TwoIsland_EventScript_ShopInitial
end
TwoIsland_EventScript_ShopInitial:: @ 81676D3
TwoIsland_EventScript_ShopInitial::
pokemart TwoIsland_Items_ShopInitial
msgbox Text_PleaseComeAgain
release
end
.align 2
TwoIsland_Items_ShopInitial:: @ 81676E4
TwoIsland_Items_ShopInitial::
.2byte ITEM_GREAT_BALL
.2byte ITEM_FRESH_WATER
.2byte ITEM_NONE
release
end
TwoIsland_EventScript_ShopExpanded1:: @ 81676EC
TwoIsland_EventScript_ShopExpanded1::
pokemart TwoIsland_Items_ShopExpanded1
msgbox Text_PleaseComeAgain
release
end
.align 2
TwoIsland_Items_ShopExpanded1:: @ 81676FC
TwoIsland_Items_ShopExpanded1::
.2byte ITEM_ULTRA_BALL
.2byte ITEM_GREAT_BALL
.2byte ITEM_SODA_POP
@@ -144,14 +144,14 @@ TwoIsland_Items_ShopExpanded1:: @ 81676FC
release
end
TwoIsland_EventScript_ShopExpanded2:: @ 8167708
TwoIsland_EventScript_ShopExpanded2::
pokemart TwoIsland_Items_ShopExpanded2
msgbox Text_PleaseComeAgain
release
end
.align 2
TwoIsland_Items_ShopExpanded2:: @ 8167718
TwoIsland_Items_ShopExpanded2::
.2byte ITEM_ULTRA_BALL
.2byte ITEM_GREAT_BALL
.2byte ITEM_LEMONADE
@@ -162,14 +162,14 @@ TwoIsland_Items_ShopExpanded2:: @ 8167718
release
end
TwoIsland_EventScript_ShopExpanded3:: @ 8167728
TwoIsland_EventScript_ShopExpanded3::
pokemart TwoIsland_Items_ShopExpanded3
msgbox Text_PleaseComeAgain
release
end
.align 2
TwoIsland_Items_ShopExpanded3:: @ 8167738
TwoIsland_Items_ShopExpanded3::
.2byte ITEM_ULTRA_BALL
.2byte ITEM_REPEAT_BALL
.2byte ITEM_TIMER_BALL
@@ -182,15 +182,15 @@ TwoIsland_Items_ShopExpanded3:: @ 8167738
release
end
TwoIsland_EventScript_Sailor:: @ 816774C
TwoIsland_EventScript_Sailor::
msgbox TwoIsland_Text_FellowMovedFromCeladonCity, MSGBOX_NPC
end
TwoIsland_EventScript_Woman:: @ 8167755
TwoIsland_EventScript_Woman::
msgbox TwoIsland_Text_ShopkeepersBrotherWorksGameCorner, MSGBOX_NPC
end
TwoIsland_EventScript_Beauty:: @ 816775E
TwoIsland_EventScript_Beauty::
lock
faceplayer
famechecker FAMECHECKER_BRUNO, 4
@@ -198,26 +198,26 @@ TwoIsland_EventScript_Beauty:: @ 816775E
release
end
TwoIsland_EventScript_SuperNerd:: @ 8167777
TwoIsland_EventScript_SuperNerd::
msgbox TwoIsland_Text_BuyRareItemsHere, MSGBOX_NPC
end
TwoIsland_EventScript_Boy:: @ 8167780
TwoIsland_EventScript_Boy::
msgbox TwoIsland_Text_OldWomanLivesOutOnCape, MSGBOX_NPC
end
TwoIsland_EventScript_LittleBoy:: @ 8167789
TwoIsland_EventScript_LittleBoy::
msgbox TwoIsland_Text_HaveYouTriedJumpingGame, MSGBOX_NPC
end
TwoIsland_EventScript_IslandSign:: @ 8167792
TwoIsland_EventScript_IslandSign::
msgbox TwoIsland_Text_IslandSign, MSGBOX_SIGN
end
TwoIsland_EventScript_JoyfulGameCornerSign:: @ 816779B
TwoIsland_EventScript_JoyfulGameCornerSign::
msgbox TwoIsland_Text_JoyfulGameCornerSign, MSGBOX_SIGN
end
TwoIsland_EventScript_FastCurrentSign:: @ 81677A4
TwoIsland_EventScript_FastCurrentSign::
msgbox TwoIsland_Text_DangerFastCurrent, MSGBOX_SIGN
end
data/maps/TwoIsland/text.inc
+13 -13
View File
@@ -1,23 +1,23 @@
TwoIsland_Text_IslandSign:: @ 8181A88
TwoIsland_Text_IslandSign::
.string "TWO ISLAND\n"
.string "Boon Island for Two$"
TwoIsland_Text_JoyfulGameCornerSign:: @ 8181AA7
TwoIsland_Text_JoyfulGameCornerSign::
.string "Skip & Chomp!\n"
.string "Joyful GAME CORNER$"
TwoIsland_Text_DangerFastCurrent:: @ 8181AC8
TwoIsland_Text_DangerFastCurrent::
.string "DANGER! FAST CURRENT!\n"
.string "Fishing and surfing prohibited!$"
TwoIsland_Text_WelcomeToShopMerchandiseLimited:: @ 8181AFE
TwoIsland_Text_WelcomeToShopMerchandiseLimited::
.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.$"
TwoIsland_Text_AddedMerchandiseForLostelle:: @ 8181B7C
TwoIsland_Text_AddedMerchandiseForLostelle::
.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 @@ TwoIsland_Text_AddedMerchandiseForLostelle:: @ 8181B7C
.string "The people of THREE ISLAND\n"
.string "helped me add to my merchandise.$"
TwoIsland_Text_HopeYouGiveItYourBest:: @ 8181C77
TwoIsland_Text_HopeYouGiveItYourBest::
.string "Hi! I'm giving it my best here.\n"
.string "I hope you do too, {PLAYER}.$"
TwoIsland_Text_BringingItemsFromDistantLands:: @ 8181CAE
TwoIsland_Text_BringingItemsFromDistantLands::
.string "Oh, hello, {PLAYER}!\n"
.string "Welcome!\p"
.string "I've started bringing in items from\n"
@@ -39,7 +39,7 @@ TwoIsland_Text_BringingItemsFromDistantLands:: @ 8181CAE
.string "I've got some rare items in, too.\n"
.string "Please have a look!$"
TwoIsland_Text_FellowMovedFromCeladonCity:: @ 8181D2F
TwoIsland_Text_FellowMovedFromCeladonCity::
.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 @@ TwoIsland_Text_FellowMovedFromCeladonCity:: @ 8181D2F
.string "You have to wonder if he knew what\n"
.string "he was getting into.$"
TwoIsland_Text_ShopkeepersBrotherWorksGameCorner:: @ 8181DCA
TwoIsland_Text_ShopkeepersBrotherWorksGameCorner::
.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.$"
TwoIsland_Text_BrunoCameToIslandWhileBack:: @ 8181E47
TwoIsland_Text_BrunoCameToIslandWhileBack::
.string "Listen, listen.\n"
.string "Did you know?\p"
.string "A famous TRAINER came to the\n"
@@ -64,17 +64,17 @@ TwoIsland_Text_BrunoCameToIslandWhileBack:: @ 8181E47
.string "found out that they were all sold\l"
.string "out of Rage Candybars.$"
TwoIsland_Text_BuyRareItemsHere:: @ 8181F28
TwoIsland_Text_BuyRareItemsHere::
.string "The discerning TRAINER knows to\n"
.string "buy rare items here!$"
TwoIsland_Text_OldWomanLivesOutOnCape:: @ 8181F5D
TwoIsland_Text_OldWomanLivesOutOnCape::
.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.$"
TwoIsland_Text_HaveYouTriedJumpingGame:: @ 8181FCE
TwoIsland_Text_HaveYouTriedJumpingGame::
.string "Boing! Boing!\n"
.string "Have you tried the jumping game?\p"
.string "The POKéMON you can enter…\n"