diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/event_scripts.s | 2 | ||||
| -rw-r--r-- | data/mystery_event_msg.s | 363 | ||||
| -rw-r--r-- | data/mystery_event_script_cmd_table.s | 22 | ||||
| -rw-r--r-- | data/script_funcs.s | 21 | ||||
| -rw-r--r-- | data/scripts/maps/PetalburgCity_Gym.inc | 4 | ||||
| -rw-r--r-- | data/specials.inc | 4 |
6 files changed, 192 insertions, 224 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index f4048124d..556ebcd01 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1771,7 +1771,7 @@ EventScript_271D92:: @ 8271D92 EventScript_271DAC:: @ 8271DAC message gUnknown_0827266F waitmessage - special sp109_CreatePCMenu + special ScrSpecial_CreatePCMenu waitstate goto EventScript_271DBC end diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index c89f96506..68267a5e3 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -8,368 +8,335 @@ .include "asm/macros/event.inc" .include "constants/constants.inc" - .section .rodata - -gText_MysteryGiftBerry:: @ 8674AE4 - .string "Obtained a {STR_VAR_2} BERRY!\nDad has it at PETALBURG GYM.$" - -gText_MysteryGiftBerryTransform:: @ 8674B16 - .string "The {STR_VAR_1} BERRY transformed into\none {STR_VAR_2} BERRY.$" - -gText_MysteryGiftBerryObtained:: @ 8674B42 - .string "The {STR_VAR_1} BERRY has already been\nobtained.$" - -gText_MysteryGiftSpecialRibbon:: @ 8674B6A - .string "A special RIBBON was awarded to\nyour party POKéMON.$" - -gText_MysteryGiftNationalDex:: @ 8674B9E - .string "The POKéDEX has been upgraded\nwith the NATIONAL MODE.$" - -gText_MysteryGiftRareWord:: @ 8674BD4 - .string "A rare word has been added.$" - -gText_MysteryGiftSentOver:: @ 8674BF0 - .string "{STR_VAR_1} was sent over!$" - -gText_MysteryGiftFullParty:: @ 8674C02 - .string "Your party is full.\n{STR_VAR_1} could not be sent over.$" - -gText_MysteryGiftNewTrainer:: @ 8674C31 - .string "A new TRAINER has arrived in\nHOENN.$" - .string "A new adversary has arrived in the\nBATTLE TOWER.$" - -gText_MysteryGiftCantBeUsed:: @ 8674C86 - .string "This data can’t be used in\nthis version.$" .align 2 -gUnknown_08674CB0:: @ 8674CB0 - setvaddress gUnknown_08674CB0 - setorcopyvar 0x800D, 1 - specialvar 0x8008, sub_813986C - setorcopyvar 0x800D, 0 - specialvar 0x8009, sub_813986C - subvar 0x8008, 32777 - buffernumberstring 0, 0x8008 + +MysteryEventScript_StampCard:: @ 8674CB0 + setvaddress MysteryEventScript_StampCard + setorcopyvar VAR_RESULT, 1 + specialvar VAR_0x8008, sub_813986C + setorcopyvar VAR_RESULT, 0 + specialvar VAR_0x8009, sub_813986C + subvar VAR_0x8008, 32777 + buffernumberstring 0, VAR_0x8008 lock faceplayer - vmessage gText_MysteryGiftStampCard + vmessage sText_MysteryGiftStampCard waitmessage waitbuttonpress release end -gText_MysteryGiftStampCard:: +sText_MysteryGiftStampCard: .string "Thank you for using the STAMP CARD\nSystem.\pYou have {STR_VAR_1} more to collect to\nfill your STAMP CARD.$" -gUnknown_08674D3D:: @ 8674D3D - setvaddress gUnknown_08674D3D - checkflag 0x1E4 - vgoto_if 0, EventScript_674D4C +MysteryEventScript_SurfPichu:: @ 8674D3D + setvaddress MysteryEventScript_SurfPichu + checkflag FLAG_MYSTERY_EVENT_DONE + vgoto_if 0, SurfPichu_GiveIfPossible gotoram -EventScript_674D4C:: @ 8674D4C - specialvar 0x40DD, CalculatePlayerPartyCount - compare_var_to_value 0x40DD, 6 - vgoto_if 1, EventScript_674D73 - setflag 0x1E4 - vcall EventScript_674D7E +SurfPichu_GiveIfPossible: @ 8674D4C + specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount + compare_var_to_value VAR_EVENT_PICHU_SLOT, 6 + vgoto_if 1, SurfPichu_FullParty + setflag FLAG_MYSTERY_EVENT_DONE + vcall SurfPichu_GiveEgg lock faceplayer - vmessage gText_MysteryGiftEgg + vmessage sText_MysteryGiftEgg waitmessage waitbuttonpress - playfanfare 370 + playfanfare MUS_FANFA4 waitfanfare release end -EventScript_674D73:: @ 8674D73 +SurfPichu_FullParty: @ 8674D73 lock faceplayer - vmessage gText_MysteryGiftEgg_2 + vmessage sText_FullParty waitmessage waitbuttonpress release end -EventScript_674D7E:: @ 8674D7E +SurfPichu_GiveEgg: @ 8674D7E giveegg SPECIES_PICHU - setmonobedient 0x40DD - setmonmetlocation 0x40DD, 255 - compare_var_to_value 0x40DD, 1 - vgoto_if 1, EventScript_674DC0 - compare_var_to_value 0x40DD, 2 - vgoto_if 1, EventScript_674DC6 - compare_var_to_value 0x40DD, 3 - vgoto_if 1, EventScript_674DCC - compare_var_to_value 0x40DD, 4 - vgoto_if 1, EventScript_674DD2 - compare_var_to_value 0x40DD, 5 - vgoto_if 1, EventScript_674DD8 + setmonobedient VAR_EVENT_PICHU_SLOT + setmonmetlocation VAR_EVENT_PICHU_SLOT, 255 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 1 + vgoto_if 1, SurfPichu_Slot1 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 2 + vgoto_if 1, SurfPichu_Slot2 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 3 + vgoto_if 1, SurfPichu_Slot3 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 4 + vgoto_if 1, SurfPichu_Slot4 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 5 + vgoto_if 1, SurfPichu_Slot5 return -EventScript_674DC0:: @ 8674DC0 - setmonmove 1, 2, 57 +SurfPichu_Slot1: @ 8674DC0 + setmonmove 1, 2, MOVE_SURF return -EventScript_674DC6:: @ 8674DC6 - setmonmove 2, 2, 57 +SurfPichu_Slot2:: @ 8674DC6 + setmonmove 2, 2, MOVE_SURF return -EventScript_674DCC:: @ 8674DCC - setmonmove 3, 2, 57 +SurfPichu_Slot3: @ 8674DCC + setmonmove 3, 2, MOVE_SURF return -EventScript_674DD2:: @ 8674DD2 - setmonmove 4, 2, 57 +SurfPichu_Slot4: @ 8674DD2 + setmonmove 4, 2, MOVE_SURF return -EventScript_674DD8:: @ 8674DD8 - setmonmove 5, 2, 57 +SurfPichu_Slot5: @ 8674DD8 + setmonmove 5, 2, MOVE_SURF return -gText_MysteryGiftEgg:: +sText_MysteryGiftEgg: .string "Thank you for using the MYSTERY\nGIFT System.\pFrom the POKéMON CENTER we\nhave a gift--a POKéMON EGG!\pPlease raise it with love and\nkindness.$" -gText_MysteryGiftEgg_2:: +sText_FullParty: .string "Oh, your party appears to be full.\pPlease come see me after storing\na POKéMON on a PC.$" -gUnknown_08674EC1:: @ 8674EC1 - setvaddress gUnknown_08674EC1 - special sub_81652B4 - compare_var_to_value 0x800D, 0 - vgoto_if 1, EventScript_674EDF +MysteryEventScript_VisitingTrainer:: @ 8674EC1 + setvaddress MysteryEventScript_VisitingTrainer + special ValidateEReaderTrainer + compare_var_to_value VAR_RESULT, 0 + vgoto_if 1, MysteryEventScript_VisitingTrainerArrived lock faceplayer - vmessage gText_MysteryGiftVisitingTrainer + vmessage sText_MysteryGiftVisitingTrainer waitmessage waitbuttonpress release end -EventScript_674EDF:: @ 8674EDF +MysteryEventScript_VisitingTrainerArrived: @ 8674EDF lock faceplayer - vmessage gText_MysteryGiftVisitingTrainer_2 + vmessage sText_MysteryGiftVisitingTrainer_2 waitmessage waitbuttonpress release end -gText_MysteryGiftVisitingTrainer:: +sText_MysteryGiftVisitingTrainer: .string "Thank you for using the MYSTERY\nGIFT System.\pBy holding this WONDER CARD, you\nmay take part in a survey at a\lPOKéMON MART.\pUse these surveys to invite\nTRAINERS to SOOTOPOLIS CITY.\p…Let me give you a secret\npassword for a survey:\p“GIVE ME\nAWESOME TRAINER”\pWrite that in on a survey and send\nit to the WIRELESS\lCOMMUNICATION SYSTEM.$" - -gText_MysteryGiftVisitingTrainer_2:: + +sText_MysteryGiftVisitingTrainer_2: .string "Thank you for using the MYSTERY\nGIFT System.\pA TRAINER has arrived in\nSOOTOPOLIS CITY looking for you.\pWe hope you will enjoy\nbattling the visiting TRAINER.\pYou may invite other TRAINERS by\nentering other passwords.\pTry looking for other passwords\nthat may work.$" -gUnknown_0867513C:: @ 867513C - setvaddress gUnknown_0867513C - checkflag 0x1E4 - vgoto_if 1, EventScript_675179 - setorcopyvar 0x800D, 2 - specialvar 0x8008, sub_813986C - compare_var_to_value 0x8008, 3 - vgoto_if 0, EventScript_675179 +MysteryEventScript_BattleCard:: @ 867513C + setvaddress MysteryEventScript_BattleCard + checkflag FLAG_MYSTERY_EVENT_DONE + vgoto_if 1, MysteryEventScript_BattleCardInfo + setorcopyvar VAR_RESULT, 2 + specialvar VAR_0x8008, sub_813986C + compare_var_to_value VAR_0x8008, 3 + vgoto_if 0, MysteryEventScript_BattleCardInfo lock faceplayer - vmessage gText_MysteryGiftBattleCountCard_2 + vmessage sText_MysteryGiftBattleCountCard_2 waitmessage waitbuttonpress - giveitem_std 13 + giveitem_std ITEM_POTION release - setflag 0x1E4 + setflag FLAG_MYSTERY_EVENT_DONE end -EventScript_675179:: @ 8675179 +MysteryEventScript_BattleCardInfo: @ 8675179 lock faceplayer - vmessage gText_MysteryGiftBattleCountCard + vmessage sText_MysteryGiftBattleCountCard waitmessage waitbuttonpress release end -gText_MysteryGiftBattleCountCard:: +sText_MysteryGiftBattleCountCard: .string "Thank you for using the MYSTERY\nGIFT System.\pYour BATTLE COUNT CARD keeps\ntrack of your battle record against\lTRAINERS with the same CARD.\pLook for and battle TRAINERS who\nhave the same CARD as you.\pYou may check the overall rankings\nby reading the NEWS.\pPlease do give it a try!$" -gText_MysteryGiftBattleCountCard_2:: +sText_MysteryGiftBattleCountCard_2: .string "Thank you for using the MYSTERY\nGIFT System.\pCongratulations!\pYou have won a prize for winning\nthree battles!\pWe hope you will be inspired to\nbattle some more.$" -gUnknown_0867533C:: @ 867533C - setvaddress gUnknown_0867533C +MysteryEventScript_AuroraTicket:: @ 867533C + setvaddress MysteryEventScript_AuroraTicket lock faceplayer - checkflag 0x13A - vgoto_if 1, EventScript_6753A0 - checkflag 0x1AD - vgoto_if 1, EventScript_6753A0 - checkitem 371, 1 - compare_var_to_value 0x800D, 1 - vgoto_if 1, EventScript_6753A0 - vmessage gText_MysteryGiftTicket1 + checkflag FLAG_0x13A + vgoto_if 1, AuroraTicket_Obtained + checkflag FLAG_0x1AD + vgoto_if 1, AuroraTicket_Obtained + checkitem ITEM_AURORA_TICKET, 1 + compare_var_to_value VAR_RESULT, 1 + vgoto_if 1, AuroraTicket_Obtained + vmessage sText_AuroraTicket1 waitmessage waitbuttonpress - checkitemspace 371, 1 - compare_var_to_value 0x800D, 0 - vgoto_if 1, EventScript_675397 - giveitem_std 371 - setflag 0x8D5 - setflag 0x13A - vmessage gText_MysteryGiftTicket1_1 + checkitemspace ITEM_AURORA_TICKET, 1 + compare_var_to_value VAR_RESULT, 0 + vgoto_if 1, AuroraTicket_NoBagSpace + giveitem_std ITEM_AURORA_TICKET + setflag FLAG_0x8D5 + setflag FLAG_0x13A + vmessage sText_AuroraTicket2 waitmessage waitbuttonpress release end -EventScript_675397:: @ 8675397 - vmessage gText_MysteryGiftTicket1_3 +AuroraTicket_NoBagSpace: @ 8675397 + vmessage sText_AuroraTicketNoPlace waitmessage waitbuttonpress release end -EventScript_6753A0:: @ 86753A0 - vmessage gText_MysteryGiftTicket1_2 +AuroraTicket_Obtained: @ 86753A0 + vmessage sText_AuroraTicketGot waitmessage waitbuttonpress release end -gText_MysteryGiftTicket1:: +sText_AuroraTicket1: .string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" -gText_MysteryGiftTicket1_1:: +sText_AuroraTicket2: .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" -gText_MysteryGiftTicket1_2:: +sText_AuroraTicketGot: .string "Thank you for using the MYSTERY\nGIFT System.$" -gText_MysteryGiftTicket1_3:: +sText_AuroraTicketNoPlace: .string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" -gUnknown_0867550B:: @ 867550B - setvaddress gUnknown_0867550B +MysteryEventScript_MysticTicket:: @ 867550B + setvaddress MysteryEventScript_MysticTicket lock faceplayer - checkflag 0x13B - vgoto_if 1, EventScript_675578 - checkflag 0x91 - vgoto_if 1, EventScript_675578 - checkflag 0x92 - vgoto_if 1, EventScript_675578 - checkitem 370, 1 - compare_var_to_value 0x800D, 1 - vgoto_if 1, EventScript_675578 - vmessage gText_MysteryGiftTicket2 + checkflag FLAG_0x13B + vgoto_if 1, MysticTicket_Obtained + checkflag FLAG_0x091 + vgoto_if 1, MysticTicket_Obtained + checkflag FLAG_0x092 + vgoto_if 1, MysticTicket_Obtained + checkitem ITEM_MYSTIC_TICKET, 1 + compare_var_to_value VAR_RESULT, 1 + vgoto_if 1, MysticTicket_Obtained + vmessage sText_MysticTicket2 waitmessage waitbuttonpress - checkitemspace 370, 1 - compare_var_to_value 0x800D, 0 - vgoto_if 1, EventScript_67556F - giveitem_std 370 - setflag 0x8E0 - setflag 0x13B - vmessage gText_MysteryGiftTicket2_1 + checkitemspace ITEM_MYSTIC_TICKET, 1 + compare_var_to_value VAR_RESULT, 0 + vgoto_if 1, MysticTicket_NoBagSpace + giveitem_std ITEM_MYSTIC_TICKET + setflag FLAG_0x8E0 + setflag FLAG_0x13B + vmessage sText_MysticTicket1 waitmessage waitbuttonpress release end -EventScript_67556F:: @ 867556F - vmessage gText_MysteryGiftTicket2_3 +MysticTicket_NoBagSpace: @ 867556F + vmessage sText_MysticTicketNoPlace waitmessage waitbuttonpress release end -EventScript_675578:: @ 8675578 - vmessage gText_MysteryGiftTicket2_2 +MysticTicket_Obtained: @ 8675578 + vmessage sText_MysticTicketGot waitmessage waitbuttonpress release end -gText_MysteryGiftTicket2:: +sText_MysticTicket2: .string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" -gText_MysteryGiftTicket2_1:: +sText_MysticTicket1: .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" -gText_MysteryGiftTicket2_2:: +sText_MysticTicketGot: .string "Thank you for using the MYSTERY\nGIFT System.$" -gText_MysteryGiftTicket2_3:: +sText_MysticTicketNoPlace: .string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" -gUnknown_086756E3:: @ 86756E3 - setvaddress gUnknown_086756E3 - addvar 0x403E, 1 - compare_var_to_value 0x403E, 10 - vgoto_if 0, EventScript_6756FD - setvar 0x403E, 0 - -EventScript_6756FD:: @ 86756FD +MysteryEventScript_AlteringCave:: @ 86756E3 + setvaddress MysteryEventScript_AlteringCave + addvar VAR_ALTERING_CAVE_WILD_SET, 1 + compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10 + vgoto_if 0, MysteryEventScript_AlteringCave_ + setvar VAR_ALTERING_CAVE_WILD_SET, 0 +MysteryEventScript_AlteringCave_: @ 86756FD lock faceplayer - vmessage gText_MysteryGiftAlteringCave + vmessage sText_MysteryGiftAlteringCave waitmessage waitbuttonpress release end -gText_MysteryGiftAlteringCave:: +sText_MysteryGiftAlteringCave:: .string "Thank you for using the MYSTERY\nGIFT System.\pThere appears to be a rumor about\nrare POKéMON sightings.\pThe sightings reportedly came from\nthe ALTERING CAVE on ROUTE 103.\pPerhaps it would be worthwhile for\nyou to investigate this rumor.$" -gUnknown_086757F4:: @ 86757F4 - setvaddress gUnknown_086757F4 +MysteryEventScript_OldSeaMap:: @ 86757F4 + setvaddress MysteryEventScript_OldSeaMap lock faceplayer - checkflag 0x13C - vgoto_if 1, EventScript_675858 - checkflag 0x1CA - vgoto_if 1, EventScript_675858 - checkitem 376, 1 - compare_var_to_value 0x800D, 1 - vgoto_if 1, EventScript_675858 - vmessage gText_MysteryGiftOldSeaMap + checkflag FLAG_0x13C + vgoto_if 1, OldSeaMap_Obtained + checkflag FLAG_0x1CA + vgoto_if 1, OldSeaMap_Obtained + checkitem ITEM_OLD_SEA_MAP, 1 + compare_var_to_value VAR_RESULT, 1 + vgoto_if 1, OldSeaMap_Obtained + vmessage sText_MysteryGiftOldSeaMap waitmessage waitbuttonpress - checkitemspace 376, 1 - compare_var_to_value 0x800D, 0 - vgoto_if 1, EventScript_67584F - giveitem_std 376 - setflag 0x8D6 - setflag 0x13C - vmessage gText_MysteryGiftOldSeaMap_1 + checkitemspace ITEM_OLD_SEA_MAP, 1 + compare_var_to_value VAR_RESULT, 0 + vgoto_if 1, OldSeaMap_NoBagSpace + giveitem_std ITEM_OLD_SEA_MAP + setflag FLAG_0x8D6 + setflag FLAG_0x13C + vmessage sText_MysteryGiftOldSeaMap_1 waitmessage waitbuttonpress release end -EventScript_67584F:: @ 867584F - vmessage gText_MysteryGiftOldSeaMap_3 +OldSeaMap_NoBagSpace: @ 867584F + vmessage sText_MysteryGiftOldSeaMap_3 waitmessage waitbuttonpress release end -EventScript_675858:: @ 8675858 - vmessage gText_MysteryGiftOldSeaMap_2 +OldSeaMap_Obtained: @ 8675858 + vmessage sText_MysteryGiftOldSeaMap_2 waitmessage waitbuttonpress release end -gText_MysteryGiftOldSeaMap:: +sText_MysteryGiftOldSeaMap: .string "Thank you for using the MYSTERY\nGIFT System.\pLet me confirm--you are {PLAYER}?\pWe received this OLD SEA MAP\naddressed to you.$" - -gText_MysteryGiftOldSeaMap_1:: + +sText_MysteryGiftOldSeaMap_1: .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" - -gText_MysteryGiftOldSeaMap_2:: + +sText_MysteryGiftOldSeaMap_2: .string "Thank you for using the MYSTERY\nGIFT System.$" - -gText_MysteryGiftOldSeaMap_3:: + +sText_MysteryGiftOldSeaMap_3: .string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" - .align 2 diff --git a/data/mystery_event_script_cmd_table.s b/data/mystery_event_script_cmd_table.s new file mode 100644 index 000000000..867b05e07 --- /dev/null +++ b/data/mystery_event_script_cmd_table.s @@ -0,0 +1,22 @@ + .section script_data, "aw", %progbits + + .align 2 +gMysteryEventScriptCmdTable:: @ 82DED2C + .4byte MEScrCmd_nop + .4byte MEScrCmd_checkcompat + .4byte MEScrCmd_end + .4byte MEScrCmd_setmsg + .4byte MEScrCmd_setstatus + .4byte MEScrCmd_runscript + .4byte MEScrCmd_initramscript + .4byte MEScrCmd_setenigmaberry + .4byte MEScrCmd_giveribbon + .4byte MEScrCmd_givenationaldex + .4byte MEScrCmd_addrareword + .4byte MEScrCmd_setrecordmixinggift + .4byte MEScrCmd_givepokemon + .4byte MEScrCmd_addtrainer + .4byte MEScrCmd_enableresetrtc + .4byte MEScrCmd_checksum + .4byte MEScrCmd_crc +gMysteryEventScriptCmdTableEnd:: diff --git a/data/script_funcs.s b/data/script_funcs.s deleted file mode 100644 index 276807fa5..000000000 --- a/data/script_funcs.s +++ /dev/null @@ -1,21 +0,0 @@ - .section script_data, "aw", %progbits - - .align 2 -gUnknown_082DED2C:: @ 82DED2C - .4byte sub_8153A80 - .4byte sub_8153A30 - .4byte script_status_stop_and_ret_1 - .4byte sub_8153A94 - .4byte sub_8153A84 - .4byte sub_8153ACC - .4byte sub_8153BE4 - .4byte sub_8153AE8 - .4byte sub_8153BB0 - .4byte sub_8153C4C - .4byte sub_8153C70 - .4byte sub_8153C9C - .4byte sub_8153CC8 - .4byte sub_8153DD4 - .4byte sub_8153E1C - .4byte sub_8153E40 - .4byte sub_8153E88 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 060531c97..627ae904c 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -393,7 +393,7 @@ PetalburgCity_Gym_EventScript_204DCE:: @ 8204DCE checkpcitem ITEM_ENIGMA_BERRY, 1 compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_204E17 - compare VAR_0x402D, 0 + compare VAR_ENIGMA_BERRY_AVAILABLE, 0 goto_eq PetalburgCity_Gym_EventScript_204E17 msgbox PetalburgCity_Gym_Text_2A6D3D, 4 setvar VAR_RESULT, 1 @@ -407,7 +407,7 @@ PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D giveitem_std ITEM_ENIGMA_BERRY compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_272054 - setvar VAR_0x402D, 0 + setvar VAR_ENIGMA_BERRY_AVAILABLE, 0 release end diff --git a/data/specials.inc b/data/specials.inc index a4e678a14..332c58bca 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -257,7 +257,7 @@ gSpecials:: @ 81DBA64 def_special sub_81B9B80 def_special sub_81B9D08 def_special sub_80F9490 - def_special sub_81652B4 + def_special ValidateEReaderTrainer def_special sub_8139228 def_special sub_80F94E8 def_special sub_816AE58 @@ -273,7 +273,7 @@ gSpecials:: @ 81DBA64 def_special ShowBerryBlenderRecordWindow def_special ResetTrickHouseEndRoomFlag def_special SetTrickHouseEndRoomFlag - def_special sp109_CreatePCMenu + def_special ScrSpecial_CreatePCMenu def_special AccessHallOfFamePC def_special Special_ShowDiploma def_special CheckLeadMonCool |