diff options
Diffstat (limited to 'data')
26 files changed, 319 insertions, 319 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 6d80d4eae..9b40a0851 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -175,8 +175,8 @@ gStdScripts_End:: @ 81DC2CC .include "data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc" .include "data/maps/FallarborTown_PokemonCenter_1F/scripts.inc" .include "data/maps/FallarborTown_PokemonCenter_2F/scripts.inc" - .include "data/maps/FallarborTown_House1/scripts.inc" - .include "data/maps/FallarborTown_House2/scripts.inc" + .include "data/maps/FallarborTown_CozmosHouse/scripts.inc" + .include "data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc" .include "data/maps/VerdanturfTown_BattleTentLobby/scripts.inc" .include "data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc" .include "data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc" diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index 72abed5ef..2cf560839 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -61,10 +61,10 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507D2:: @ 82507D2 msgbox BattleFrontier_BattlePyramidLobby_Text_2525F4, MSGBOX_DEFAULT BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA - special sub_81B95E0 - compare VAR_RESULT, 1 + special DoBattlePyramidMonsHaveHeldItem + compare VAR_RESULT, TRUE call_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250DDB - clearflag FLAG_SPECIAL_FLAG_0x4004 + clearflag FLAG_STORING_ITEMS_IN_PYRAMID_BAG setvar VAR_0x8004, 8 special CallFrontierUtilFunc special LoadPlayerParty @@ -494,8 +494,8 @@ BattleFrontier_BattlePyramidLobby_Movement_250DD8: @ 8250DD8 BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB msgbox BattleFrontier_BattlePyramidLobby_Text_2517FC, MSGBOX_DEFAULT - setflag FLAG_SPECIAL_FLAG_0x4004 - special sub_81C6A94 + setflag FLAG_STORING_ITEMS_IN_PYRAMID_BAG + special TryStoreHeldItemsInPyramidBag compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250E00 message BattleFrontier_BattlePyramidLobby_Text_2518C6 @@ -525,7 +525,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250E40:: @ 8250E40 end BattleFrontier_BattlePyramidLobby_EventScript_250E50:: @ 8250E50 - special sub_81B9620 + special BattlePyramidChooseMonHeldItems waitstate message BattleFrontier_BattlePyramidLobby_Text_25197E waitmessage @@ -533,8 +533,8 @@ BattleFrontier_BattlePyramidLobby_EventScript_250E50:: @ 8250E50 end BattleFrontier_BattlePyramidLobby_EventScript_250E60:: @ 8250E60 - special sub_81B95E0 - compare VAR_RESULT, 1 + special DoBattlePyramidMonsHaveHeldItem + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250E6F return diff --git a/data/maps/BattleFrontier_Lounge1/scripts.inc b/data/maps/BattleFrontier_Lounge1/scripts.inc index dee3fd431..ed9628e5e 100644 --- a/data/maps/BattleFrontier_Lounge1/scripts.inc +++ b/data/maps/BattleFrontier_Lounge1/scripts.inc @@ -11,7 +11,7 @@ BattleFrontier_Lounge1_EventScript_25E775:: @ 825E775 end BattleFrontier_Lounge1_EventScript_25E792:: @ 825E792 - special sub_81B94B0 + special ChoosePartyMon waitstate compare VAR_0x8004, 255 goto_if_ne BattleFrontier_Lounge1_EventScript_25E7BF diff --git a/data/maps/BattleFrontier_Lounge5/scripts.inc b/data/maps/BattleFrontier_Lounge5/scripts.inc index 020c8fdfb..391dc673d 100644 --- a/data/maps/BattleFrontier_Lounge5/scripts.inc +++ b/data/maps/BattleFrontier_Lounge5/scripts.inc @@ -7,7 +7,7 @@ BattleFrontier_Lounge5_EventScript_NatureGirl:: @ 82645C6 msgbox BattleFrontier_Lounge5_Text_NatureGirlGreeting, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq BattleFrontier_Lounge5_EventScript_NatureGirlNoneShown - special sub_81B94B0 + special ChoosePartyMon waitstate lock faceplayer diff --git a/data/maps/BattleFrontier_Lounge6/scripts.inc b/data/maps/BattleFrontier_Lounge6/scripts.inc index 8f695aee3..cef384958 100644 --- a/data/maps/BattleFrontier_Lounge6/scripts.inc +++ b/data/maps/BattleFrontier_Lounge6/scripts.inc @@ -12,7 +12,7 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED msgbox BattleFrontier_Lounge6_Text_26508D, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq BattleFrontier_Lounge6_EventScript_26506B - special sub_81B94B0 + special ChoosePartyMon waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 diff --git a/data/maps/BattleFrontier_Lounge7/scripts.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc index 854a1d360..b874c5d4e 100644 --- a/data/maps/BattleFrontier_Lounge7/scripts.inc +++ b/data/maps/BattleFrontier_Lounge7/scripts.inc @@ -265,7 +265,7 @@ BattleFrontier_Lounge7_EventScript_265696:: @ 8265696 fadescreen 1 special CloseBattlePointsWindow special CloseBattleFrontierTutorWindow - special OpenPartyMenuForMoveTutor + special ChooseMonForMoveTutor waitstate compare VAR_RESULT, 0 goto_if_eq BattleFrontier_Lounge7_EventScript_265645 diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index 863319184..9f4acc988 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -104,14 +104,14 @@ "x": 6, "y": 17, "elevation": 0, - "dest_map": "MAP_FALLARBOR_TOWN_HOUSE1", + "dest_map": "MAP_FALLARBOR_TOWN_COZMOS_HOUSE", "dest_warp_id": 0 }, { "x": 1, "y": 6, "elevation": 0, - "dest_map": "MAP_FALLARBOR_TOWN_HOUSE2", + "dest_map": "MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE", "dest_warp_id": 0 } ], diff --git a/data/maps/FallarborTown_House1/map.json b/data/maps/FallarborTown_CozmosHouse/map.json index e5e75c631..4895efed4 100644 --- a/data/maps/FallarborTown_House1/map.json +++ b/data/maps/FallarborTown_CozmosHouse/map.json @@ -1,6 +1,6 @@ { - "id": "MAP_FALLARBOR_TOWN_HOUSE1", - "name": "FallarborTown_House1", + "id": "MAP_FALLARBOR_TOWN_COZMOS_HOUSE", + "name": "FallarborTown_CozmosHouse", "layout": "LAYOUT_HOUSE1", "music": "MUS_TONEKUSA", "region_map_section": "MAPSEC_FALLARBOR_TOWN", @@ -24,8 +24,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_House1_EventScript_200F13", - "flag": "FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO" + "script": "FallarborTown_CozmosHouse_EventScript_200F13", + "flag": "FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO" }, { "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_House1_EventScript_200FBC", + "script": "FallarborTown_CozmosHouse_EventScript_200FBC", "flag": "0" } ], diff --git a/data/maps/FallarborTown_CozmosHouse/scripts.inc b/data/maps/FallarborTown_CozmosHouse/scripts.inc new file mode 100644 index 000000000..a2578bf3f --- /dev/null +++ b/data/maps/FallarborTown_CozmosHouse/scripts.inc @@ -0,0 +1,121 @@ +FallarborTown_CozmosHouse_MapScripts:: @ 8200F12 + .byte 0 + +FallarborTown_CozmosHouse_EventScript_200F13:: @ 8200F13 + lock + faceplayer + goto_if_set FLAG_RECEIVED_TM27, FallarborTown_CozmosHouse_EventScript_200FB2 + checkitem ITEM_METEORITE, 1 + compare VAR_RESULT, 1 + goto_if_eq FallarborTown_CozmosHouse_EventScript_200F38 + msgbox FallarborTown_CozmosHouse_Text_200FEE, MSGBOX_DEFAULT + release + end + +FallarborTown_CozmosHouse_EventScript_200F38:: @ 8200F38 + call_if_unset FLAG_TEMP_2, FallarborTown_CozmosHouse_EventScript_200F8B + call_if_set FLAG_TEMP_2, FallarborTown_CozmosHouse_EventScript_200F9C + compare VAR_RESULT, 0 + goto_if_eq FallarborTown_CozmosHouse_EventScript_200FA5 + msgbox FallarborTown_CozmosHouse_Text_201159, MSGBOX_DEFAULT + giveitem_std ITEM_TM27 + compare VAR_RESULT, 0 + goto_if_eq Common_EventScript_ShowBagIsFull + setvar VAR_0x8004, ITEM_METEORITE + call Common_EventScript_PlayerHandedOverTheItem + setflag FLAG_RECEIVED_TM27 + msgbox FallarborTown_CozmosHouse_Text_2011A5, MSGBOX_DEFAULT + release + end + +FallarborTown_CozmosHouse_EventScript_200F8B:: @ 8200F8B + msgbox FallarborTown_CozmosHouse_Text_200FEE, MSGBOX_DEFAULT + msgbox FallarborTown_CozmosHouse_Text_2010A2, MSGBOX_YESNO + return + +FallarborTown_CozmosHouse_EventScript_200F9C:: @ 8200F9C + msgbox FallarborTown_CozmosHouse_Text_201249, MSGBOX_YESNO + return + +FallarborTown_CozmosHouse_EventScript_200FA5:: @ 8200FA5 + setflag FLAG_TEMP_2 + msgbox FallarborTown_CozmosHouse_Text_201212, MSGBOX_DEFAULT + release + end + +FallarborTown_CozmosHouse_EventScript_200FB2:: @ 8200FB2 + msgbox FallarborTown_CozmosHouse_Text_2011A5, MSGBOX_DEFAULT + release + end + +FallarborTown_CozmosHouse_EventScript_200FBC:: @ 8200FBC + lock + faceplayer + goto_if_set FLAG_RECEIVED_TM27, FallarborTown_CozmosHouse_EventScript_200FE4 + goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_CozmosHouse_EventScript_200FDA + msgbox FallarborTown_CozmosHouse_Text_2012BC, MSGBOX_DEFAULT + release + end + +FallarborTown_CozmosHouse_EventScript_200FDA:: @ 8200FDA + msgbox FallarborTown_CozmosHouse_Text_201310, MSGBOX_DEFAULT + release + end + +FallarborTown_CozmosHouse_EventScript_200FE4:: @ 8200FE4 + msgbox FallarborTown_CozmosHouse_Text_20134B, MSGBOX_DEFAULT + release + end + +FallarborTown_CozmosHouse_Text_200FEE: @ 8200FEE + .string "PROF. COZMO: Oh…\n" + .string "I never should have let myself be\l" + .string "conned into telling TEAM MAGMA where\l" + .string "you can find METEORITES…\p" + .string "That METEORITE from METEOR FALLS…\n" + .string "It's never going to be mine now…$" + +FallarborTown_CozmosHouse_Text_2010A2: @ 82010A2 + .string "Oh!\n" + .string "Hah?\p" + .string "That item…\p" + .string "Could it be?\p" + .string "Is it the METEORITE that TEAM MAGMA\n" + .string "took from METEOR FALLS?\p" + .string "Please, may I have it?\p" + .string "I'm not asking for it for free.\n" + .string "How about in exchange for this TM?$" + +FallarborTown_CozmosHouse_Text_201159: @ 8201159 + .string "PROF. COZMO: This TM, it represents\n" + .string "my feeling of gratitude.\l" + .string "Please use it!$" + +FallarborTown_CozmosHouse_Text_2011A5: @ 82011A5 + .string "PROF. COZMO: Oh, I can't believe it.\n" + .string "This is really, really great!\p" + .string "This is really going to help my research!$" + +FallarborTown_CozmosHouse_Text_201212: @ 8201212 + .string "PROF. COZMO: Oh, but…\n" + .string "I'm crushed with disappointment…$" + +FallarborTown_CozmosHouse_Text_201249: @ 8201249 + .string "PROF. COZMO: Please, may I have that\n" + .string "METEORITE?\p" + .string "I'm not asking for it for free.\n" + .string "How about in exchange for this TM?$" + +FallarborTown_CozmosHouse_Text_2012BC: @ 82012BC + .string "PROF. COZMO went off to METEOR FALLS\n" + .string "on ROUTE 114 with some people from\l" + .string "TEAM MAGMA.$" + +FallarborTown_CozmosHouse_Text_201310: @ 8201310 + .string "Poor PROF. COZMO…\n" + .string "He's so depressed… I feel sorry for him.$" + +FallarborTown_CozmosHouse_Text_20134B: @ 820134B + .string "Look at PROF. COZMO…\n" + .string "He's so happy! I think it's cute.$" + diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc deleted file mode 100644 index e3299e096..000000000 --- a/data/maps/FallarborTown_House1/scripts.inc +++ /dev/null @@ -1,121 +0,0 @@ -FallarborTown_House1_MapScripts:: @ 8200F12 - .byte 0 - -FallarborTown_House1_EventScript_200F13:: @ 8200F13 - lock - faceplayer - goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_200FB2 - checkitem ITEM_METEORITE, 1 - compare VAR_RESULT, 1 - goto_if_eq FallarborTown_House1_EventScript_200F38 - msgbox FallarborTown_House1_Text_200FEE, MSGBOX_DEFAULT - release - end - -FallarborTown_House1_EventScript_200F38:: @ 8200F38 - call_if_unset FLAG_TEMP_2, FallarborTown_House1_EventScript_200F8B - call_if_set FLAG_TEMP_2, FallarborTown_House1_EventScript_200F9C - compare VAR_RESULT, 0 - goto_if_eq FallarborTown_House1_EventScript_200FA5 - msgbox FallarborTown_House1_Text_201159, MSGBOX_DEFAULT - giveitem_std ITEM_TM27 - compare VAR_RESULT, 0 - goto_if_eq Common_EventScript_ShowBagIsFull - setvar VAR_0x8004, ITEM_METEORITE - call Common_EventScript_PlayerHandedOverTheItem - setflag FLAG_RECEIVED_TM27 - msgbox FallarborTown_House1_Text_2011A5, MSGBOX_DEFAULT - release - end - -FallarborTown_House1_EventScript_200F8B:: @ 8200F8B - msgbox FallarborTown_House1_Text_200FEE, MSGBOX_DEFAULT - msgbox FallarborTown_House1_Text_2010A2, MSGBOX_YESNO - return - -FallarborTown_House1_EventScript_200F9C:: @ 8200F9C - msgbox FallarborTown_House1_Text_201249, MSGBOX_YESNO - return - -FallarborTown_House1_EventScript_200FA5:: @ 8200FA5 - setflag FLAG_TEMP_2 - msgbox FallarborTown_House1_Text_201212, MSGBOX_DEFAULT - release - end - -FallarborTown_House1_EventScript_200FB2:: @ 8200FB2 - msgbox FallarborTown_House1_Text_2011A5, MSGBOX_DEFAULT - release - end - -FallarborTown_House1_EventScript_200FBC:: @ 8200FBC - lock - faceplayer - goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_200FE4 - goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_House1_EventScript_200FDA - msgbox FallarborTown_House1_Text_2012BC, MSGBOX_DEFAULT - release - end - -FallarborTown_House1_EventScript_200FDA:: @ 8200FDA - msgbox FallarborTown_House1_Text_201310, MSGBOX_DEFAULT - release - end - -FallarborTown_House1_EventScript_200FE4:: @ 8200FE4 - msgbox FallarborTown_House1_Text_20134B, MSGBOX_DEFAULT - release - end - -FallarborTown_House1_Text_200FEE: @ 8200FEE - .string "PROF. COZMO: Oh…\n" - .string "I never should have let myself be\l" - .string "conned into telling TEAM MAGMA where\l" - .string "you can find METEORITES…\p" - .string "That METEORITE from METEOR FALLS…\n" - .string "It's never going to be mine now…$" - -FallarborTown_House1_Text_2010A2: @ 82010A2 - .string "Oh!\n" - .string "Hah?\p" - .string "That item…\p" - .string "Could it be?\p" - .string "Is it the METEORITE that TEAM MAGMA\n" - .string "took from METEOR FALLS?\p" - .string "Please, may I have it?\p" - .string "I'm not asking for it for free.\n" - .string "How about in exchange for this TM?$" - -FallarborTown_House1_Text_201159: @ 8201159 - .string "PROF. COZMO: This TM, it represents\n" - .string "my feeling of gratitude.\l" - .string "Please use it!$" - -FallarborTown_House1_Text_2011A5: @ 82011A5 - .string "PROF. COZMO: Oh, I can't believe it.\n" - .string "This is really, really great!\p" - .string "This is really going to help my research!$" - -FallarborTown_House1_Text_201212: @ 8201212 - .string "PROF. COZMO: Oh, but…\n" - .string "I'm crushed with disappointment…$" - -FallarborTown_House1_Text_201249: @ 8201249 - .string "PROF. COZMO: Please, may I have that\n" - .string "METEORITE?\p" - .string "I'm not asking for it for free.\n" - .string "How about in exchange for this TM?$" - -FallarborTown_House1_Text_2012BC: @ 82012BC - .string "PROF. COZMO went off to METEOR FALLS\n" - .string "on ROUTE 114 with some people from\l" - .string "TEAM MAGMA.$" - -FallarborTown_House1_Text_201310: @ 8201310 - .string "Poor PROF. COZMO…\n" - .string "He's so depressed… I feel sorry for him.$" - -FallarborTown_House1_Text_20134B: @ 820134B - .string "Look at PROF. COZMO…\n" - .string "He's so happy! I think it's cute.$" - diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc deleted file mode 100644 index d0305ad4b..000000000 --- a/data/maps/FallarborTown_House2/scripts.inc +++ /dev/null @@ -1,102 +0,0 @@ -FallarborTown_House2_MapScripts:: @ 8201382 - .byte 0 - -FallarborTown_House2_EventScript_201383:: @ 8201383 - lockall - applymovement 1, Common_Movement_FacePlayer - waitmovement 0 - goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_2013A8 - msgbox FallarborTown_House2_Text_20145C, MSGBOX_DEFAULT - setflag FLAG_TEMP_1 - goto FallarborTown_House2_EventScript_2013A8 - end - -FallarborTown_House2_EventScript_2013A8:: @ 82013A8 - checkitem ITEM_HEART_SCALE, 1 - compare VAR_RESULT, 0 - goto_if_eq FallarborTown_House2_EventScript_201452 - msgbox FallarborTown_House2_Text_201541, MSGBOX_YESNO - switch VAR_RESULT - case 0, FallarborTown_House2_EventScript_201452 - goto FallarborTown_House2_EventScript_2013D6 - end - -FallarborTown_House2_EventScript_2013D6:: @ 82013D6 - msgbox FallarborTown_House2_Text_2015A5, MSGBOX_DEFAULT - special sub_81B951C - waitstate - compare VAR_0x8004, 255 - goto_if_eq FallarborTown_House2_EventScript_201452 - special sub_81B98DC - compare VAR_RESULT, 1 - goto_if_eq FallarborTown_House2_EventScript_201444 - compare VAR_0x8005, 0 - goto_if_eq FallarborTown_House2_EventScript_201436 - goto FallarborTown_House2_EventScript_20140C - end - -FallarborTown_House2_EventScript_20140C:: @ 820140C - msgbox FallarborTown_House2_Text_2015C3, MSGBOX_DEFAULT - special TeachMoveRelearnerMove - waitstate - compare VAR_0x8004, 0 - goto_if_eq FallarborTown_House2_EventScript_2013D6 - msgbox FallarborTown_House2_Text_201627, MSGBOX_DEFAULT - takeitem ITEM_HEART_SCALE, 1 - goto FallarborTown_House2_EventScript_201452 - end - -FallarborTown_House2_EventScript_201436:: @ 8201436 - msgbox FallarborTown_House2_Text_2015DE, MSGBOX_DEFAULT - goto FallarborTown_House2_EventScript_2013D6 - end - -FallarborTown_House2_EventScript_201444:: @ 8201444 - msgbox FallarborTown_House2_Text_201697, MSGBOX_DEFAULT - goto FallarborTown_House2_EventScript_2013D6 - end - -FallarborTown_House2_EventScript_201452:: @ 8201452 - msgbox FallarborTown_House2_Text_201653, MSGBOX_DEFAULT - releaseall - end - -FallarborTown_House2_Text_20145C: @ 820145C - .string "I'm the MOVE TUTOR.\p" - .string "I know all the moves that POKéMON\n" - .string "learn--every one of them--and I can\l" - .string "teach POKéMON those moves.\p" - .string "I can teach a move to a POKéMON\n" - .string "of yours if you'd like.\p" - .string "I'll do it for a HEART SCALE.\n" - .string "I'm collecting those now.$" - -FallarborTown_House2_Text_201541: @ 8201541 - .string "Oh! That's it! That's an honest to\n" - .string "goodness HEART SCALE!\p" - .string "Let me guess, you want me to teach\n" - .string "a move?$" - -FallarborTown_House2_Text_2015A5: @ 82015A5 - .string "Which POKéMON needs tutoring?$" - -FallarborTown_House2_Text_2015C3: @ 82015C3 - .string "Which move should I teach?$" - -FallarborTown_House2_Text_2015DE: @ 82015DE - .string "Sorry…\p" - .string "It doesn't appear as if I have any move\n" - .string "I can teach that POKéMON.$" - -FallarborTown_House2_Text_201627: @ 8201627 - .string "{PLAYER} handed over one HEART SCALE\n" - .string "in exchange.$" - -FallarborTown_House2_Text_201653: @ 8201653 - .string "If your POKéMON need to learn a move,\n" - .string "come back with a HEART SCALE.$" - -FallarborTown_House2_Text_201697: @ 8201697 - .string "Hunh? There isn't a single move that\n" - .string "I can teach an EGG.$" - diff --git a/data/maps/FallarborTown_House2/map.json b/data/maps/FallarborTown_MoveRelearnersHouse/map.json index fe0ce67a0..c444c1e38 100644 --- a/data/maps/FallarborTown_House2/map.json +++ b/data/maps/FallarborTown_MoveRelearnersHouse/map.json @@ -1,6 +1,6 @@ { - "id": "MAP_FALLARBOR_TOWN_HOUSE2", - "name": "FallarborTown_House2", + "id": "MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE", + "name": "FallarborTown_MoveRelearnersHouse", "layout": "LAYOUT_HOUSE2", "music": "MUS_TONEKUSA", "region_map_section": "MAPSEC_FALLARBOR_TOWN", @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_House2_EventScript_201383", + "script": "FallarborTown_MoveRelearnersHouse_EventScript_MoveRelearner", "flag": "0" } ], diff --git a/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc b/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc new file mode 100644 index 000000000..7ef8b6597 --- /dev/null +++ b/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc @@ -0,0 +1,102 @@ +FallarborTown_MoveRelearnersHouse_MapScripts:: @ 8201382 + .byte 0 + +FallarborTown_MoveRelearnersHouse_EventScript_MoveRelearner:: @ 8201383 + lockall + applymovement 1, Common_Movement_FacePlayer + waitmovement 0 + goto_if_set FLAG_TEMP_1, FallarborTown_MoveRelearnersHouse_EventScript_AskTeachMove + msgbox FallarborTown_MoveRelearnersHouse_Text_ImTheMoveTutor, MSGBOX_DEFAULT + setflag FLAG_TEMP_1 + goto FallarborTown_MoveRelearnersHouse_EventScript_AskTeachMove + end + +FallarborTown_MoveRelearnersHouse_EventScript_AskTeachMove:: @ 82013A8 + checkitem ITEM_HEART_SCALE, 1 + compare VAR_RESULT, 0 + goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale + msgbox FallarborTown_MoveRelearnersHouse_Text_ThatsAHeartScaleWantMeToTeachMove, MSGBOX_YESNO + switch VAR_RESULT + case 0, FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale + goto FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon + end + +FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon:: @ 82013D6 + msgbox FallarborTown_MoveRelearnersHouse_Text_TutorWhichMon, MSGBOX_DEFAULT + special ChooseMonForMoveRelearner + waitstate + compare VAR_0x8004, 255 + goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale + special IsSelectedMonEgg + compare VAR_RESULT, TRUE + goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_CantTeachEgg + compare VAR_0x8005, 0 + goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_NoMoveToTeachMon + goto FallarborTown_MoveRelearnersHouse_EventScript_ChooseMove + end + +FallarborTown_MoveRelearnersHouse_EventScript_ChooseMove:: @ 820140C + msgbox FallarborTown_MoveRelearnersHouse_Text_TeachWhichMove, MSGBOX_DEFAULT + special TeachMoveRelearnerMove + waitstate + compare VAR_0x8004, 0 + goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon + msgbox FallarborTown_MoveRelearnersHouse_Text_HandedOverHeartScale, MSGBOX_DEFAULT + takeitem ITEM_HEART_SCALE, 1 + goto FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale + end + +FallarborTown_MoveRelearnersHouse_EventScript_NoMoveToTeachMon:: @ 8201436 + msgbox FallarborTown_MoveRelearnersHouse_Text_DontHaveMoveToTeachPokemon, MSGBOX_DEFAULT + goto FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon + end + +FallarborTown_MoveRelearnersHouse_EventScript_CantTeachEgg:: @ 8201444 + msgbox FallarborTown_MoveRelearnersHouse_Text_CantTeachEgg, MSGBOX_DEFAULT + goto FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon + end + +FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale:: @ 8201452 + msgbox FallarborTown_MoveRelearnersHouse_Text_ComeBackWithHeartScale, MSGBOX_DEFAULT + releaseall + end + +FallarborTown_MoveRelearnersHouse_Text_ImTheMoveTutor: @ 820145C + .string "I'm the MOVE TUTOR.\p" + .string "I know all the moves that POKéMON\n" + .string "learn--every one of them--and I can\l" + .string "teach POKéMON those moves.\p" + .string "I can teach a move to a POKéMON\n" + .string "of yours if you'd like.\p" + .string "I'll do it for a HEART SCALE.\n" + .string "I'm collecting those now.$" + +FallarborTown_MoveRelearnersHouse_Text_ThatsAHeartScaleWantMeToTeachMove: @ 8201541 + .string "Oh! That's it! That's an honest to\n" + .string "goodness HEART SCALE!\p" + .string "Let me guess, you want me to teach\n" + .string "a move?$" + +FallarborTown_MoveRelearnersHouse_Text_TutorWhichMon: @ 82015A5 + .string "Which POKéMON needs tutoring?$" + +FallarborTown_MoveRelearnersHouse_Text_TeachWhichMove: @ 82015C3 + .string "Which move should I teach?$" + +FallarborTown_MoveRelearnersHouse_Text_DontHaveMoveToTeachPokemon: @ 82015DE + .string "Sorry…\p" + .string "It doesn't appear as if I have any move\n" + .string "I can teach that POKéMON.$" + +FallarborTown_MoveRelearnersHouse_Text_HandedOverHeartScale: @ 8201627 + .string "{PLAYER} handed over one HEART SCALE\n" + .string "in exchange.$" + +FallarborTown_MoveRelearnersHouse_Text_ComeBackWithHeartScale: @ 8201653 + .string "If your POKéMON need to learn a move,\n" + .string "come back with a HEART SCALE.$" + +FallarborTown_MoveRelearnersHouse_Text_CantTeachEgg: @ 8201697 + .string "Hunh? There isn't a single move that\n" + .string "I can teach an EGG.$" + diff --git a/data/maps/FortreeCity_House1/scripts.inc b/data/maps/FortreeCity_House1/scripts.inc index e6a617677..260a75a78 100644 --- a/data/maps/FortreeCity_House1/scripts.inc +++ b/data/maps/FortreeCity_House1/scripts.inc @@ -12,7 +12,7 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB msgbox FortreeCity_House1_Text_21637B, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq FortreeCity_House1_EventScript_21633D - special sub_81B94B0 + special ChoosePartyMon waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json index f4adbabe8..30c5a413f 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/map.json +++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_MoveDeletersHouse_EventScript_21EA0B", + "script": "LilycoveCity_MoveDeletersHouse_EventScript_MoveDeleter", "flag": "0" } ], diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc index e94fa43f1..bf34bd049 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -1,110 +1,110 @@ LilycoveCity_MoveDeletersHouse_MapScripts:: @ 821EA0A .byte 0 -LilycoveCity_MoveDeletersHouse_EventScript_21EA0B:: @ 821EA0B +LilycoveCity_MoveDeletersHouse_EventScript_MoveDeleter:: @ 821EA0B lockall applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EAFD, MSGBOX_YESNO + msgbox LilycoveCity_MoveDeletersHouse_Text_ICanMakeMonForgetMove, MSGBOX_YESNO switch VAR_RESULT - case 1, LilycoveCity_MoveDeletersHouse_EventScript_21EA3B - case 0, LilycoveCity_MoveDeletersHouse_EventScript_21EAE6 + case 1, LilycoveCity_MoveDeletersHouse_EventScript_ChooseMonAndMoveToForget + case 0, LilycoveCity_MoveDeletersHouse_EventScript_ComeAgain releaseall end -LilycoveCity_MoveDeletersHouse_EventScript_21EA3B:: @ 821EA3B - msgbox LilycoveCity_MoveDeletersHouse_Text_21EB65, MSGBOX_DEFAULT - special sub_81B94B0 +LilycoveCity_MoveDeletersHouse_EventScript_ChooseMonAndMoveToForget:: @ 821EA3B + msgbox LilycoveCity_MoveDeletersHouse_Text_WhichMonShouldForget, MSGBOX_DEFAULT + special ChoosePartyMon waitstate compare VAR_0x8004, 255 - goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EAE6 - special sub_81B98DC + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_ComeAgain + special IsSelectedMonEgg + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_EggCantForgetMoves + special GetNumMovesSelectedMonHas compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EADC - special sub_81B96D0 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EACF - msgbox LilycoveCity_MoveDeletersHouse_Text_21EB89, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_MonOnlyKnowsOneMove + msgbox LilycoveCity_MoveDeletersHouse_Text_WhichMoveShouldBeForgotten, MSGBOX_DEFAULT fadescreen 1 - special sub_81B968C + special MoveDeleterChooseMoveToForget fadescreen 0 - compare VAR_0x8005, 4 - goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EA3B - special sub_81B9718 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EBDA, MSGBOX_YESNO + compare VAR_0x8005, MAX_MON_MOVES + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_ChooseMonAndMoveToForget + special BufferMoveDeleterNicknameAndMove + msgbox LilycoveCity_MoveDeletersHouse_Text_MonsMoveShouldBeForgotten, MSGBOX_YESNO switch VAR_RESULT - case 1, LilycoveCity_MoveDeletersHouse_EventScript_21EAB0 - case 0, LilycoveCity_MoveDeletersHouse_EventScript_21EAE6 + case 1, LilycoveCity_MoveDeletersHouse_EventScript_TryForgetMove + case 0, LilycoveCity_MoveDeletersHouse_EventScript_ComeAgain releaseall end -LilycoveCity_MoveDeletersHouse_EventScript_21EAB0:: @ 821EAB0 - special sub_81B9918 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EAF0 - special sub_81B9770 +LilycoveCity_MoveDeletersHouse_EventScript_TryForgetMove:: @ 821EAB0 + special IsLastMonThatKnowsSurf + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_LastMonWithSurf + special MoveDeleterForgetMove playfanfare MUS_ME_WASURE waitfanfare - msgbox LilycoveCity_MoveDeletersHouse_Text_21EC06, MSGBOX_DEFAULT + msgbox LilycoveCity_MoveDeletersHouse_Text_MonHasForgottenMove, MSGBOX_DEFAULT releaseall end -LilycoveCity_MoveDeletersHouse_EventScript_21EACF:: @ 821EACF - special sub_81B9718 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EBA9, MSGBOX_DEFAULT +LilycoveCity_MoveDeletersHouse_EventScript_MonOnlyKnowsOneMove:: @ 821EACF + special BufferMoveDeleterNicknameAndMove + msgbox LilycoveCity_MoveDeletersHouse_Text_MonOnlyKnowsOneMove, MSGBOX_DEFAULT releaseall end -LilycoveCity_MoveDeletersHouse_EventScript_21EADC:: @ 821EADC - msgbox LilycoveCity_MoveDeletersHouse_Text_21EC78, MSGBOX_DEFAULT +LilycoveCity_MoveDeletersHouse_EventScript_EggCantForgetMoves:: @ 821EADC + msgbox LilycoveCity_MoveDeletersHouse_Text_EggCantForgetMoves, MSGBOX_DEFAULT releaseall end -LilycoveCity_MoveDeletersHouse_EventScript_21EAE6:: @ 821EAE6 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EC3F, MSGBOX_DEFAULT +LilycoveCity_MoveDeletersHouse_EventScript_ComeAgain:: @ 821EAE6 + msgbox LilycoveCity_MoveDeletersHouse_Text_ComeAgain, MSGBOX_DEFAULT releaseall end -LilycoveCity_MoveDeletersHouse_EventScript_21EAF0:: @ 821EAF0 - special sub_81B9718 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EC9C, MSGBOX_DEFAULT +LilycoveCity_MoveDeletersHouse_EventScript_LastMonWithSurf:: @ 821EAF0 + special BufferMoveDeleterNicknameAndMove + msgbox LilycoveCity_MoveDeletersHouse_Text_CantForgetSurf, MSGBOX_DEFAULT releaseall end -LilycoveCity_MoveDeletersHouse_Text_21EAFD: @ 821EAFD +LilycoveCity_MoveDeletersHouse_Text_ICanMakeMonForgetMove: @ 821EAFD .string "Uh…\n" .string "Oh, yes, I'm the MOVE DELETER.\p" .string "I can make POKéMON forget their moves.\p" .string "Would you like me to do that?$" -LilycoveCity_MoveDeletersHouse_Text_21EB65: @ 821EB65 +LilycoveCity_MoveDeletersHouse_Text_WhichMonShouldForget: @ 821EB65 .string "Which POKéMON should forget a move?$" -LilycoveCity_MoveDeletersHouse_Text_21EB89: @ 821EB89 +LilycoveCity_MoveDeletersHouse_Text_WhichMoveShouldBeForgotten: @ 821EB89 .string "Which move should be forgotten?$" -LilycoveCity_MoveDeletersHouse_Text_21EBA9: @ 821EBA9 +LilycoveCity_MoveDeletersHouse_Text_MonOnlyKnowsOneMove: @ 821EBA9 .string "{STR_VAR_1} knows only one move\n" .string "so it can't be forgotten…$" -LilycoveCity_MoveDeletersHouse_Text_21EBDA: @ 821EBDA +LilycoveCity_MoveDeletersHouse_Text_MonsMoveShouldBeForgotten: @ 821EBDA .string "Hm! {STR_VAR_1}'s {STR_VAR_2}?\n" .string "That move should be forgotten?$" -LilycoveCity_MoveDeletersHouse_Text_21EC06: @ 821EC06 +LilycoveCity_MoveDeletersHouse_Text_MonHasForgottenMove: @ 821EC06 .string "It worked to perfection!\p" .string "{STR_VAR_1} has forgotten\n" .string "{STR_VAR_2} completely.$" -LilycoveCity_MoveDeletersHouse_Text_21EC3F: @ 821EC3F +LilycoveCity_MoveDeletersHouse_Text_ComeAgain: @ 821EC3F .string "Come again if there are moves that\n" .string "need to be forgotten.$" -LilycoveCity_MoveDeletersHouse_Text_21EC78: @ 821EC78 +LilycoveCity_MoveDeletersHouse_Text_EggCantForgetMoves: @ 821EC78 .string "What?\n" .string "No EGG should know any moves.$" -LilycoveCity_MoveDeletersHouse_Text_21EC9C: @ 821EC9C +LilycoveCity_MoveDeletersHouse_Text_CantForgetSurf: @ 821EC9C .string "Hm!\p" .string "Your {STR_VAR_1} doesn't seem willing\n" .string "to forget SURF.$" diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 11e9b5c9f..71ee724b5 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -71,7 +71,7 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B removeobject 1 setflag FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA setflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY - clearflag FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO + clearflag FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO setflag FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO clearflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY releaseall diff --git a/data/maps/PacifidlogTown_House3/scripts.inc b/data/maps/PacifidlogTown_House3/scripts.inc index 9633ddc8b..543b9de35 100644 --- a/data/maps/PacifidlogTown_House3/scripts.inc +++ b/data/maps/PacifidlogTown_House3/scripts.inc @@ -12,7 +12,7 @@ PacifidlogTown_House3_EventScript_203C11:: @ 8203C11 msgbox PacifidlogTown_House3_Text_203CBE, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq PacifidlogTown_House3_EventScript_203C93 - special sub_81B94B0 + special ChoosePartyMon waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 diff --git a/data/maps/RustboroCity_House1/scripts.inc b/data/maps/RustboroCity_House1/scripts.inc index f0a0f4827..4ae0a355c 100644 --- a/data/maps/RustboroCity_House1/scripts.inc +++ b/data/maps/RustboroCity_House1/scripts.inc @@ -12,7 +12,7 @@ RustboroCity_House1_EventScript_21593F:: @ 821593F msgbox RustboroCity_House1_Text_2159E8, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq RustboroCity_House1_EventScript_2159BD - special sub_81B94B0 + special ChoosePartyMon waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc index 1203c2333..e6bde2f55 100644 --- a/data/maps/SlateportCity_House1/scripts.inc +++ b/data/maps/SlateportCity_House1/scripts.inc @@ -13,7 +13,7 @@ SlateportCity_House1_EventScript_209AA5:: @ 8209AA5 SlateportCity_House1_EventScript_209AC6:: @ 8209AC6 msgbox SlateportCity_House1_Text_209BFF, MSGBOX_DEFAULT - special sub_81B94B0 + special ChoosePartyMon waitstate compare VAR_0x8004, 255 goto_if_ne SlateportCity_House1_EventScript_209AF3 diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc index 17debe321..496b16d11 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc @@ -6,7 +6,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_22722B:: @ 822722B lock faceplayer msgbox SootopolisCity_LotadAndSeedotHouse_Text_227369, MSGBOX_DEFAULT - special sub_81B94B0 + special ChoosePartyMon waitstate copyvar VAR_RESULT, VAR_0x8004 compare VAR_RESULT, 255 @@ -55,7 +55,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC:: @ 82272BC lock faceplayer msgbox SootopolisCity_LotadAndSeedotHouse_Text_227676, MSGBOX_DEFAULT - special sub_81B94B0 + special ChoosePartyMon waitstate copyvar VAR_RESULT, VAR_0x8004 compare VAR_RESULT, 255 diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 4088ddbb5..7b78a80db 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -132,8 +132,8 @@ "FallarborTown_BattleTentBattleRoom", "FallarborTown_PokemonCenter_1F", "FallarborTown_PokemonCenter_2F", - "FallarborTown_House1", - "FallarborTown_House2" + "FallarborTown_CozmosHouse", + "FallarborTown_MoveRelearnersHouse" ], "gMapGroup6": [ "VerdanturfTown_BattleTentLobby", diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 6962d17f8..ccda6afce 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -911,7 +911,7 @@ EventScript_DoLinkRoomExit:: @ 8277513 CableClub_EventScript_UnionRoomAttendant:: @ 827751B lock faceplayer - setvar VAR_FRONTIER_FACILITY, 8 + setvar VAR_FRONTIER_FACILITY, FACILITY_UNION_ROOM goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements specialvar VAR_RESULT, IsBadEggInParty compare VAR_RESULT, TRUE @@ -1019,7 +1019,7 @@ CableClub_EventScript_DontAskAboutLinking:: @ 827769A CableClub_EventScript_DirectCornerAttendant:: @ 82776A4 lock faceplayer - setvar VAR_FRONTIER_FACILITY, 9 + setvar VAR_FRONTIER_FACILITY, FACILITY_MULTI_OR_EREADER @ Set preemptively for multi battles, ignored otherwise goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements specialvar VAR_RESULT, IsBadEggInParty compare VAR_RESULT, TRUE diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index b6ba75e0d..0d4244023 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -289,7 +289,7 @@ MoveTutor_EventScript_ExplosionTaught:: @ 82C831C end MoveTutor_EventScript_OpenPartyMenu:: @ 82C8326 - special OpenPartyMenuForMoveTutor + special ChooseMonForMoveTutor waitstate lock faceplayer diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index f053b3299..c88208708 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -204,7 +204,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL setflag FLAG_HIDE_METEOR_FALLS_TEAM_AQUA setflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN - setflag FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO + setflag FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M setflag FLAG_HIDE_ROUTE_128_STEVEN setflag FLAG_HIDE_ROUTE_128_ARCHIE diff --git a/data/specials.inc b/data/specials.inc index dbf075493..96d1e61cc 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -170,7 +170,7 @@ gSpecials:: @ 81DBA64 def_special ChooseStarter def_special StartWallyTutorialBattle def_special ChangePokemonNickname - def_special sub_81B94B0 + def_special ChoosePartyMon def_special GetFirstFreePokeblockSlot def_special DoBerryBlending def_special PlayRoulette @@ -230,11 +230,11 @@ gSpecials:: @ 81DBA64 def_special SetDeptStoreFloor def_special DoLotteryCornerComputerEffect def_special EndLotteryCornerComputerEffect - def_special sub_81B951C - def_special sub_81B968C - def_special sub_81B9770 - def_special sub_81B9718 - def_special sub_81B96D0 + def_special ChooseMonForMoveRelearner + def_special MoveDeleterChooseMoveToForget + def_special MoveDeleterForgetMove + def_special BufferMoveDeleterNicknameAndMove + def_special GetNumMovesSelectedMonHas def_special TeachMoveRelearnerMove def_special GetRecordedCyclingRoadResults def_special Special_BeginCyclingRoadChallenge @@ -338,7 +338,7 @@ gSpecials:: @ 81DBA64 def_special SetRoute123Weather def_special ScriptGetMultiplayerId def_special ScriptGetPartyMonSpecies - def_special sub_81B98DC + def_special IsSelectedMonEgg def_special TryInitBattleTowerAwardManEventObject def_special MoveOutOfSecretBaseFromOutside def_special LoadPlayerBag @@ -457,10 +457,10 @@ gSpecials:: @ 81DBA64 def_special ShowScrollableMultichoice def_special sub_813A630 def_special BufferBattleTowerElevatorFloors - def_special sub_81C6A94 + def_special TryStoreHeldItemsInPyramidBag def_special sub_81C4F24 - def_special sub_81B95E0 - def_special sub_81B9620 + def_special DoBattlePyramidMonsHaveHeldItem + def_special BattlePyramidChooseMonHeldItems def_special SetBattleTowerLinkPlayerGfx def_special ShowNatureGirlMessage def_special ShowBattlePointsWindow @@ -485,7 +485,7 @@ gSpecials:: @ 81DBA64 def_special BufferBattleFrontierTutorMoveName def_special CloseBattleFrontierTutorWindow def_special sub_813ADD4 - def_special OpenPartyMenuForMoveTutor + def_special ChooseMonForMoveTutor def_special GetBattleFrontierTutorMoveIndex def_special sub_813AF48 def_special DoDeoxysRockInteraction @@ -529,7 +529,7 @@ gSpecials:: @ 81DBA64 def_special ShowTrainerHillRecords def_special sub_80B4808 def_special ResetHealLocationFromDewford - def_special sub_81B9918 + def_special IsLastMonThatKnowsSurf def_special CountPartyAliveNonEggMons def_special TryPrepareSecondApproachingTrainer def_special RemoveRecordsWindow |