diff options
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/day_care.inc | 233 | ||||
| -rw-r--r-- | data/scripts/fame_checker.inc | 8 | ||||
| -rw-r--r-- | data/scripts/flavor_text.inc | 113 | ||||
| -rw-r--r-- | data/scripts/item_ball_scripts.inc | 2 | ||||
| -rw-r--r-- | data/scripts/obtain_item.inc | 16 | ||||
| -rw-r--r-- | data/scripts/route23.inc | 181 | ||||
| -rw-r--r-- | data/scripts/safari_zone.inc | 37 | ||||
| -rw-r--r-- | data/scripts/test.inc | 20 | ||||
| -rw-r--r-- | data/scripts/trainer_tower.inc | 2 |
9 files changed, 317 insertions, 295 deletions
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 9937bf704..8e3318c35 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -1,93 +1,93 @@ -Route5_PokemonDayCare_EventScript_1BF398:: @ 81BF398 +Route5_PokemonDayCare_EventScript_DaycareMan:: @ 81BF398 goto_if_questlog EventScript_ReleaseEnd lock faceplayer showmoneybox 0, 0, 0 specialvar VAR_RESULT, IsThereMonInRoute5Daycare - compare VAR_RESULT, 1 - goto_if_eq EventScript_1BF46E - msgbox Text_19DD66, MSGBOX_YESNO + compare VAR_RESULT, TRUE + goto_if_eq Route5_PokemonDayCare_EventScript_CheckOnMon + msgbox Route5_PokemonDayCare_Text_WantMeToRaiseMon, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_1BF3DD - msgbox Text_19DDB2 - goto EventScript_1BF541 + goto_if_eq Route5_PokemonDayCare_EventScript_TryGiveMon + msgbox Route5_PokemonDayCare_Text_ComeAgain + goto Route5_PokemonDayCare_EventScript_CloseMoneyBox end -EventScript_1BF3DD:: @ 81BF3DD +Route5_PokemonDayCare_EventScript_TryGiveMon:: @ 81BF3DD specialvar VAR_RESULT, CountPartyNonEggMons compare VAR_RESULT, 1 - goto_if_eq EventScript_1BF452 - msgbox Text_19DDBE + goto_if_eq Route5_PokemonDayCare_EventScript_OnlyOneMonInParty + msgbox Route5_PokemonDayCare_Text_WhichMonShouldIRaise fadescreen FADE_TO_BLACK hidemoneybox 0, 0 special ChooseSendDaycareMon waitstate showmoneybox 0, 0, 0 - compare VAR_0x8004, 6 - goto_if_ge EventScript_1BF444 + compare VAR_0x8004, PARTY_SIZE + goto_if_ge Route5_PokemonDayCare_EventScript_ComeAgain specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot compare VAR_RESULT, 0 - goto_if_eq EventScript_1BF460 - specialvar VAR_0x8005, GetSelectedMonNickAndSpecies - msgbox Text_19DDF9 + goto_if_eq Route5_PokemonDayCare_EventScript_OnlyOneAliveMonInParty + specialvar VAR_0x8005, GetSelectedMonNicknameAndSpecies + msgbox Route5_PokemonDayCare_Text_LookAfterMonForAWhile waitse playmoncry VAR_0x8005, 0 - msgbox Text_19DE24 + msgbox Route5_PokemonDayCare_Text_ComeSeeMeInAWhile waitmoncry special PutMonInRoute5Daycare incrementgamestat GAME_STAT_USED_DAYCARE - goto EventScript_1BF541 + goto Route5_PokemonDayCare_EventScript_CloseMoneyBox end -EventScript_1BF444:: @ 81BF444 - msgbox Text_19DDDC - goto EventScript_1BF541 +Route5_PokemonDayCare_EventScript_ComeAgain:: @ 81BF444 + msgbox Route5_PokemonDayCare_Text_ComeAnytimeYouLike + goto Route5_PokemonDayCare_EventScript_CloseMoneyBox end -EventScript_1BF452:: @ 81BF452 - msgbox Text_19DEF5 - goto EventScript_1BF541 +Route5_PokemonDayCare_EventScript_OnlyOneMonInParty:: @ 81BF452 + msgbox Route5_PokemonDayCare_Text_OnlyHaveOneMonWithYou + goto Route5_PokemonDayCare_EventScript_CloseMoneyBox end -EventScript_1BF460:: @ 81BF460 - msgbox Text_19DF1D - goto EventScript_1BF541 +Route5_PokemonDayCare_EventScript_OnlyOneAliveMonInParty:: @ 81BF460 + msgbox Route5_PokemonDayCare_Text_WhatWillYouBattleWith + goto Route5_PokemonDayCare_EventScript_CloseMoneyBox end -EventScript_1BF46E:: @ 81BF46E +Route5_PokemonDayCare_EventScript_CheckOnMon:: @ 81BF46E setvar VAR_0x8004, 0 specialvar VAR_RESULT, GetNumLevelsGainedForRoute5DaycareMon compare VAR_RESULT, 0 - call_if_ne EventScript_1BF4AA + call_if_ne Route5_PokemonDayCare_EventScript_MonHasGrownByXLevels compare VAR_RESULT, 0 - call_if_eq EventScript_1BF4B3 + call_if_eq Route5_PokemonDayCare_EventScript_NotEnoughTime special GetCostToWithdrawRoute5DaycareMon - msgbox Text_19DE80, MSGBOX_YESNO + msgbox Route5_PokemonDayCare_Text_OweMeXForMonsReturn, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_1BF4BC - goto EventScript_1BF444 + goto_if_eq Route5_PokemonDayCare_EventScript_TryRetrieveMon + goto Route5_PokemonDayCare_EventScript_ComeAgain end -EventScript_1BF4AA:: @ 81BF4AA - msgbox Text_19DF56 +Route5_PokemonDayCare_EventScript_MonHasGrownByXLevels:: @ 81BF4AA + msgbox Route5_PokemonDayCare_Text_MonHasGrownByXLevels return -EventScript_1BF4B3:: @ 81BF4B3 - msgbox Text_19DE3C +Route5_PokemonDayCare_EventScript_NotEnoughTime:: @ 81BF4B3 + msgbox Route5_PokemonDayCare_Text_MonNeedsToSpendMoreTime return -EventScript_1BF4BC:: @ 81BF4BC +Route5_PokemonDayCare_EventScript_TryRetrieveMon:: @ 81BF4BC specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, PARTY_SIZE - goto_if_eq EventScript_1BF533 + goto_if_eq Route5_PokemonDayCare_EventScript_NoRoomInParty specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 - compare VAR_RESULT, 1 - goto_if_eq EventScript_1BF4EA - msgbox Text_19E001 - goto EventScript_1BF541 + compare VAR_RESULT, TRUE + goto_if_eq Route5_PokemonDayCare_EventScript_RetrieveMon + msgbox Route5_PokemonDayCare_Text_DontHaveEnoughMoney + goto Route5_PokemonDayCare_EventScript_CloseMoneyBox end -EventScript_1BF4EA:: @ 81BF4EA +Route5_PokemonDayCare_EventScript_RetrieveMon:: @ 81BF4EA setvar VAR_0x8004, 0 specialvar VAR_RESULT, TakePokemonFromRoute5Daycare special SubtractMoneyFromVar0x8005 @@ -97,159 +97,30 @@ EventScript_1BF4EA:: @ 81BF4EA subvar VAR_RESULT, 1 getpartymonname 0, VAR_RESULT copyvar VAR_RESULT, VAR_0x8008 - msgbox Text_19DEAF + msgbox Route5_PokemonDayCare_Text_ThankYouHeresMon textcolor 3 waitse playmoncry VAR_RESULT, 0 - msgbox Text_19DECF + msgbox Route5_PokemonDayCare_Text_PlayerGotMonBack call EventScript_1A6675 waitmoncry - goto EventScript_1BF541 + goto Route5_PokemonDayCare_EventScript_CloseMoneyBox end -EventScript_1BF533:: @ 81BF533 - msgbox Text_19DFC2 - goto EventScript_1BF541 +Route5_PokemonDayCare_EventScript_NoRoomInParty:: @ 81BF533 + msgbox Route5_PokemonDayCare_Text_YouveGotNoRoomForIt + goto Route5_PokemonDayCare_EventScript_CloseMoneyBox end -EventScript_1BF541:: @ 81BF541 +Route5_PokemonDayCare_EventScript_CloseMoneyBox:: @ 81BF541 hidemoneybox 0, 0 release end -EventScript_81BF546:: @ 81BF546 +EventScript_EggHatch:: @ 81BF546 lockall - msgbox Text_1BFB5A + msgbox DayCare_Text_Huh special EggHatch waitstate releaseall end - -gUnknown_81BF555:: @ 81BF555 - .string "I'm the DAY-CARE MAN.\p" - .string "I help take care of the precious\n" - .string "POKéMON of TRAINERS.\p" - .string "If you'd like me to raise your\n" - .string "POKéMON, have a word with my wife.$" - -gUnknown_81BF5E3:: @ 81BF5E3 - .string "Ah, it's you!\p" - .string "We were raising your POKéMON, and\n" - .string "my goodness, were we surprised!\p" - .string "Your POKéMON had an EGG!\p" - .string "We don't know how it got there,\n" - .string "but your POKéMON had it.\p" - .string "You do want it, yes?$" - -gUnknown_81BF69A:: @ 81BF69A - .string "Ah, it's you! Good to see you.\n" - .string "Your {STR_VAR_1}'s doing fine.$" - -gUnknown_81BF6CF:: @ 81BF6CF - .string "Well then, I'll keep it.\n" - .string "Thanks!$" - -gUnknown_81BF6F0:: @ 81BF6F0 - .string "You have no room for it…\n" - .string "Come back when you've made room.$" - -Text_1BF72A:: @ 81BF72A - .string "{PLAYER} received the EGG from\n" - .string "the DAY-CARE MAN.$" - -gUnknown_81BF755:: @ 81BF755 - .string "Take good care of it.$" - -Text_1BF76B:: @ 81BF76B - .string "ポケモンを ひきとりたい ときは\n" - .string "ばさんに いって おくれ$" - -gUnknown_81BF789:: @ 81BF789 - .string "Ah, it's you! Your {STR_VAR_1} and\n" - .string "{STR_VAR_2} are doing fine.$" - -gUnknown_81BF7B6:: @ 81BF7B6 - .string "I really will keep it.\n" - .string "You do want this, yes?$" - -gUnknown_81BF7E4:: @ 81BF7E4 - .string "I'm the DAY-CARE LADY.\p" - .string "We can raise POKéMON for you.\p" - .string "Would you like us to raise one?$" - -gUnknown_81BF839:: @ 81BF839 - .string "Which POKéMON should we raise for\n" - .string "you?$" - -gUnknown_81BF860:: @ 81BF860 - .string "Fine, we'll raise your {STR_VAR_1}\n" - .string "for a while.\p" - .string "Come back for it later.$" - -gUnknown_81BF89F:: @ 81BF89F - .string "We can raise two of your POKéMON.\p" - .string "Would you like us to raise one\n" - .string "more POKéMON for you?$" - -gUnknown_81BF8F6:: @ 81BF8F6 - .string "My husband was looking for you.$" - -gUnknown_81BF916:: @ 81BF916 - .string "Oh, fine, then.\n" - .string "Come again.$" - -gUnknown_81BF932:: @ 81BF932 - .string "You don't have enough money…$" - -gUnknown_81BF94F:: @ 81BF94F - .string "Will you take back the other one,\n" - .string "too?$" - -gUnknown_81BF976:: @ 81BF976 - .string "Fine.\n" - .string "Come again.$" - -gUnknown_81BF988:: @ 81BF988 - .string "Ah, it's you!\n" - .string "Good to see you.\p" - .string "Your POKéMON can only be doing\n" - .string "good!$" - -gUnknown_81BF9CC:: @ 81BF9CC - .string "By level, your {STR_VAR_1} has\n" - .string "grown by {STR_VAR_2}.$" - -gUnknown_81BF9EF:: @ 81BF9EF - .string "Your POKéMON party is full.\n" - .string "Make room, then come see me.$" - -Text_1BFA28:: @ 81BFA28 - .string "どっちの ポケモンを ひきとるかい？$" - -gUnknown_81BFA3B:: @ 81BFA3B - .string "If you want your {STR_VAR_1} back,\n" - .string "it will cost ¥{STR_VAR_2}.$" - -gUnknown_81BFA67:: @ 81BFA67 - .string "Perfect!\n" - .string "Here's your POKéMON.$" - -gUnknown_81BFA85:: @ 81BFA85 - .string "{PLAYER} took back {STR_VAR_1} from\n" - .string "the DAY-CARE LADY.$" - -gUnknown_81BFAAD:: @ 81BFAAD - .string "Oh? But you have just one\n" - .string "POKéMON.\p" - .string "Come back another time.$" - -gUnknown_81BFAE8:: @ 81BFAE8 - .string "Will you take your POKéMON back?$" - -gUnknown_81BFB09:: @ 81BFB09 - .string "If you leave me that POKéMON,\n" - .string "what will you battle with?\p" - .string "Come back another time.$" - -Text_1BFB5A:: @ 81BFB5A - .string "Huh?$" diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index 0d058b2d5..e141634eb 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -101,20 +101,20 @@ CeladonCity_Condominiums_2F_EventScript_1ACE9D:: @ 81ACE9D release end -FuchsiaCity_Building1_EventScript_1ACEB8:: @ 81ACEB8 +FuchsiaCity_WardensHouse_EventScript_PokemonJournalKoga:: @ 81ACEB8 lock faceplayer famechecker FAMECHECKER_KOGA, 4 textcolor 3 - msgbox gUnknown_81B16A8 + msgbox PokemonJournal_Text_SpecialFeatureKoga release end -SafariZone_Building3_EventScript_1ACED3:: @ 81ACED3 +SafariZone_North_RestHouse_EventScript_BaldingMan:: @ 81ACED3 lock faceplayer famechecker FAMECHECKER_KOGA, 5 - msgbox Text_177C47 + msgbox SafariZone_West_Text_KogaPatrolsSafariEverySoOften release end diff --git a/data/scripts/flavor_text.inc b/data/scripts/flavor_text.inc new file mode 100644 index 000000000..7ea879b04 --- /dev/null +++ b/data/scripts/flavor_text.inc @@ -0,0 +1,113 @@ +@ Flavor text for interacting with various background objects + +gUnknown_81A7606:: @ 81A7606 + msgbox gUnknown_81C0DB0, MSGBOX_SIGN + end + +gUnknown_81A760F:: @ 81A760F + msgbox gUnknown_81C0DFD, MSGBOX_SIGN + end + +gUnknown_81A7618:: @ 81A7618 + msgbox gUnknown_81C0F99, MSGBOX_SIGN + end + +gUnknown_81A7621:: @ 81A7621 + msgbox gUnknown_81C12A7, MSGBOX_SIGN + end + +gUnknown_81A762A:: @ 81A762A + msgbox gUnknown_81C10C1, MSGBOX_SIGN + end + +gUnknown_81A7633:: @ 81A7633 + msgbox gUnknown_81C1273, MSGBOX_SIGN + end + +gUnknown_81A763C:: @ 81A763C + msgbox gUnknown_81C0FD8, MSGBOX_SIGN + end + +gUnknown_81A7645:: @ 81A7645 + msgbox gUnknown_81C12D6, MSGBOX_SIGN + end + +gUnknown_81A764E:: @ 81A764E + msgbox gUnknown_81C1300, MSGBOX_SIGN + end + +gUnknown_81A7657:: @ 81A7657 + msgbox Text_DishesPlatesNeatlyLinedUp, MSGBOX_SIGN + end + +gUnknown_81A7660:: @ 81A7660 + msgbox gUnknown_81C0E40, MSGBOX_SIGN + end + +gUnknown_81A7669:: @ 81A7669 + msgbox gUnknown_81C0E73, MSGBOX_SIGN + end + +gUnknown_81A7672:: @ 81A7672 + msgbox gUnknown_81C0EAC, MSGBOX_SIGN + end + +gUnknown_81A767B:: @ 81A767B + msgbox gUnknown_81C101B, MSGBOX_SIGN + end + +gUnknown_81A7684:: @ 81A7684 + msgbox gUnknown_81C1060, MSGBOX_SIGN + end + +gUnknown_81A768D:: @ 81A768D + msgbox gUnknown_81C109C, MSGBOX_SIGN + end + +gUnknown_81A7696:: @ 81A7696 + msgbox gUnknown_81C10FC, MSGBOX_SIGN + end + +gUnknown_81A769F:: @ 81A769F + msgbox gUnknown_81C1134, MSGBOX_SIGN + end + +gUnknown_81A76A8:: @ 81A76A8 + msgbox gUnknown_81C116E, MSGBOX_SIGN + end + +gUnknown_81A76B1:: @ 81A76B1 + msgbox gUnknown_81C1194, MSGBOX_SIGN + end + +gUnknown_81A76BA:: @ 81A76BA + msgbox gUnknown_81C11BA, MSGBOX_SIGN + end + +gUnknown_81A76C3:: @ 81A76C3 + msgbox gUnknown_81C11DC, MSGBOX_SIGN + end + +gUnknown_81A76CC:: @ 81A76CC + msgbox gUnknown_81C1217, MSGBOX_SIGN + end + +gUnknown_81A76D5:: @ 81A76D5 + msgbox gUnknown_81C124B, MSGBOX_SIGN + end + +gUnknown_81A76DE:: @ 81A76DE + msgbox gUnknown_81C0ECB, MSGBOX_SIGN + end + +gUnknown_81A76E7:: @ 81A76E7 + msgbox gUnknown_81C0EF7, MSGBOX_SIGN + end + +gUnknown_81A76F0:: @ 81A76F0 + msgbox gUnknown_81C0F19, MSGBOX_SIGN + end + +gUnknown_81A76F9:: @ 81A76F9 + msgbox gUnknown_81C0F59, MSGBOX_SIGN + end diff --git a/data/scripts/item_ball_scripts.inc b/data/scripts/item_ball_scripts.inc index ed8aef9d4..f6662368c 100644 --- a/data/scripts/item_ball_scripts.inc +++ b/data/scripts/item_ball_scripts.inc @@ -398,7 +398,7 @@ CeruleanCave_B1F_EventScript_ItemUltraBall:: @ 81BEA95 finditem ITEM_ULTRA_BALL end -FuchsiaCity_Building1_EventScript_ItemRareCandy:: @ 81BEAA2 +FuchsiaCity_WardensHouse_EventScript_ItemRareCandy:: @ 81BEAA2 finditem ITEM_RARE_CANDY end diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc index 2452c5c5c..3ada6109c 100644 --- a/data/scripts/obtain_item.inc +++ b/data/scripts/obtain_item.inc @@ -35,31 +35,31 @@ EventScript_BufferPocketNameTryFanfare:: @ 81A66BC end EventScript_BufferItemsPocket:: @ 81A66F9 - getstdstring 2, 24 + getstdstring 2, STDSTRING_ITEMS_POCKET compare VAR_0x8007, TRUE call_if_eq EventScript_PlayFanfareObtainedItem return EventScript_BufferKeyItemsPocket:: @ 81A6709 - getstdstring 2, 25 + getstdstring 2, STDSTRING_KEY_ITEMS_POCKET compare VAR_0x8007, TRUE call_if_eq EventScript_PlayFanfareObtainedItem return EventScript_BufferPokeBallsPocket:: @ 81A6719 - getstdstring 2, 26 + getstdstring 2, STDSTRING_POKEBALLS_POCKET compare VAR_0x8007, TRUE call_if_eq EventScript_PlayFanfareObtainedItem return EventScript_BufferTMCase:: @ 81A6729 - getstdstring 2, 27 + getstdstring 2, STDSTRING_TM_CASE compare VAR_0x8007, TRUE call_if_eq EventScript_PlayFanfareObtainedTMHM return EventScript_BufferBerryPouch:: @ 81A6739 - getstdstring 2, 28 + getstdstring 2, STDSTRING_BERRY_POUCH compare VAR_0x8007, TRUE call_if_eq EventScript_PlayFanfareObtainedItem return @@ -218,7 +218,7 @@ EventScript_TryPickUpHiddenCoins:: compare VAR_RESULT, FALSE goto_if_eq EventScript_HiddenCoinsButCaseIsFull addcoins VAR_0x8006 - getstdstring 1, 0x17 + getstdstring 1, STDSTRING_COINS call EventScript_PlayFanfareObtainedItem call EventScript_FoundCoins waitfanfare @@ -230,7 +230,7 @@ EventScript_TryPickUpHiddenCoins:: EventScript_HiddenCoinsButCaseIsFull:: getnumberstring 0, VAR_0x8006 - getstdstring 1, 0x17 + getstdstring 1, STDSTRING_COINS msgbox Text_FoundXCoins msgbox Text_CoinCaseIsFull setvar VAR_RESULT, 0 @@ -239,7 +239,7 @@ EventScript_HiddenCoinsButCaseIsFull:: EventScript_NoCaseForHiddenCoins:: getnumberstring 0, VAR_0x8006 - getstdstring 1, 0x17 + getstdstring 1, STDSTRING_COINS msgbox Text_FoundXCoins msgbox Text_NothingToPutThemIn setvar VAR_RESULT, 0 diff --git a/data/scripts/route23.inc b/data/scripts/route23.inc index 682fa7b1d..cfdfe53a7 100644 --- a/data/scripts/route23.inc +++ b/data/scripts/route23.inc @@ -1,11 +1,11 @@ -EventScript_1A77C9:: @ 81A77C9 +Route23_EventScript_MissingBoulderBadge:: @ 81A77C9 msgbox Text_OnlySkilledTrainersAllowedThrough playse SE_BOO msgbox Text_CantLetYouPass release end -EventScript_1A77DE:: @ 81A77DE +Route23_EventScript_MissingBadge:: @ 81A77DE message Text_OnlyPassWithBadgeDontHaveYet waitmessage playse SE_BOO @@ -15,7 +15,7 @@ EventScript_1A77DE:: @ 81A77DE release end -EventScript_1A77EC:: @ 81A77EC +Route23_EventScript_AlreadyRecognizedBoulderBadge:: @ 81A77EC message Text_OhThatsBadgeGoRightAhead waitmessage playfanfare MUS_FANFA1 @@ -24,80 +24,81 @@ EventScript_1A77EC:: @ 81A77EC release end -EventScript_1A77F9:: @ 81A77F9 +Route23_EventScript_AlreadyRecognizedBadge:: @ 81A77F9 msgbox Text_OnlyPassWithBadgeOhGoAhead release end -EventScript_1A7803:: @ 81A7803 +@ Duplicate of the below, only used for Boulder Badge +Route22_NorthEntrance_EventScript_BadgeGuard:: @ 81A7803 compare VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 - goto_if_ge EventScript_1A77EC + goto_if_ge Route23_EventScript_AlreadyRecognizedBoulderBadge switch VAR_TEMP_1 - case 1, EventScript_1A78D5 - case 2, EventScript_1A78E4 - case 3, EventScript_1A78F3 - case 4, EventScript_1A7902 - case 5, EventScript_1A7911 - case 6, EventScript_1A7920 - case 7, EventScript_1A792F - case 8, EventScript_1A793E + case 1, Route23_EventScript_CheckBoulderBadge + case 2, Route23_EventScript_CheckCascadeBadge + case 3, Route23_EventScript_CheckThunderBadge + case 4, Route23_EventScript_CheckRainbowBadge + case 5, Route23_EventScript_CheckSoulBadge + case 6, Route23_EventScript_CheckMarshBadge + case 7, Route23_EventScript_CheckVolcanoBadge + case 8, Route23_EventScript_CheckEarthBadge end -EventScript_1A786C:: @ 81A786C +Route23_EventScript_BadgeGuard:: @ 81A786C compare VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 - goto_if_ge EventScript_1A77F9 + goto_if_ge Route23_EventScript_AlreadyRecognizedBadge switch VAR_TEMP_1 - case 1, EventScript_1A78D5 - case 2, EventScript_1A78E4 - case 3, EventScript_1A78F3 - case 4, EventScript_1A7902 - case 5, EventScript_1A7911 - case 6, EventScript_1A7920 - case 7, EventScript_1A792F - case 8, EventScript_1A793E + case 1, Route23_EventScript_CheckBoulderBadge + case 2, Route23_EventScript_CheckCascadeBadge + case 3, Route23_EventScript_CheckThunderBadge + case 4, Route23_EventScript_CheckRainbowBadge + case 5, Route23_EventScript_CheckSoulBadge + case 6, Route23_EventScript_CheckMarshBadge + case 7, Route23_EventScript_CheckVolcanoBadge + case 8, Route23_EventScript_CheckEarthBadge end -EventScript_1A78D5:: @ 81A78D5 - goto_if_set FLAG_BADGE01_GET, EventScript_1A794D - goto EventScript_1A77C9 +Route23_EventScript_CheckBoulderBadge:: @ 81A78D5 + goto_if_set FLAG_BADGE01_GET, Route23_EventScript_RecognizeBoulderBadge + goto Route23_EventScript_MissingBoulderBadge end -EventScript_1A78E4:: @ 81A78E4 - goto_if_set FLAG_BADGE02_GET, EventScript_1A795F - goto EventScript_1A77DE +Route23_EventScript_CheckCascadeBadge:: @ 81A78E4 + goto_if_set FLAG_BADGE02_GET, Route23_EventScript_RecognizeBadge + goto Route23_EventScript_MissingBadge end -EventScript_1A78F3:: @ 81A78F3 - goto_if_set FLAG_BADGE03_GET, EventScript_1A795F - goto EventScript_1A77DE +Route23_EventScript_CheckThunderBadge:: @ 81A78F3 + goto_if_set FLAG_BADGE03_GET, Route23_EventScript_RecognizeBadge + goto Route23_EventScript_MissingBadge end -EventScript_1A7902:: @ 81A7902 - goto_if_set FLAG_BADGE04_GET, EventScript_1A795F - goto EventScript_1A77DE +Route23_EventScript_CheckRainbowBadge:: @ 81A7902 + goto_if_set FLAG_BADGE04_GET, Route23_EventScript_RecognizeBadge + goto Route23_EventScript_MissingBadge end -EventScript_1A7911:: @ 81A7911 - goto_if_set FLAG_BADGE05_GET, EventScript_1A795F - goto EventScript_1A77DE +Route23_EventScript_CheckSoulBadge:: @ 81A7911 + goto_if_set FLAG_BADGE05_GET, Route23_EventScript_RecognizeBadge + goto Route23_EventScript_MissingBadge end -EventScript_1A7920:: @ 81A7920 - goto_if_set FLAG_BADGE06_GET, EventScript_1A795F - goto EventScript_1A77DE +Route23_EventScript_CheckMarshBadge:: @ 81A7920 + goto_if_set FLAG_BADGE06_GET, Route23_EventScript_RecognizeBadge + goto Route23_EventScript_MissingBadge end -EventScript_1A792F:: @ 81A792F - goto_if_set FLAG_BADGE07_GET, EventScript_1A795F - goto EventScript_1A77DE +Route23_EventScript_CheckVolcanoBadge:: @ 81A792F + goto_if_set FLAG_BADGE07_GET, Route23_EventScript_RecognizeBadge + goto Route23_EventScript_MissingBadge end -EventScript_1A793E:: @ 81A793E - goto_if_set FLAG_BADGE08_GET, EventScript_1A795F - goto EventScript_1A77DE +Route23_EventScript_CheckEarthBadge:: @ 81A793E + goto_if_set FLAG_BADGE08_GET, Route23_EventScript_RecognizeBadge + goto Route23_EventScript_MissingBadge end -EventScript_1A794D:: @ 81A794D +Route23_EventScript_RecognizeBoulderBadge:: @ 81A794D message Text_OhThatsBadgeGoRightAhead waitmessage playfanfare MUS_FANFA1 @@ -107,92 +108,92 @@ EventScript_1A794D:: @ 81A794D release end -EventScript_1A795F:: @ 81A795F +Route23_EventScript_RecognizeBadge:: @ 81A795F msgbox Text_OnlyPassWithBadgeOhGoAhead copyvar VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 release end -EventScript_1A796E:: @ 81A796E +Route23_EventScript_BadgeGuardTrigger:: @ 81A796E textcolor 0 applymovement VAR_0x8009, Movement_WalkInPlaceFastestLeft waitmovement 0 switch VAR_TEMP_1 - case 1, EventScript_1A79D8 - case 2, EventScript_1A79E7 - case 3, EventScript_1A79F6 - case 4, EventScript_1A7A05 - case 5, EventScript_1A7A14 - case 6, EventScript_1A7A23 - case 7, EventScript_1A7A32 - case 8, EventScript_1A7A41 + case 1, Route23_EventScript_CheckBoulderBadgeTrigger + case 2, Route23_EventScript_CheckCascadeBadgeTrigger + case 3, Route23_EventScript_CheckThunderBadgeTrigger + case 4, Route23_EventScript_CheckRainbowBadgeTrigger + case 5, Route23_EventScript_CheckSoulBadgeTrigger + case 6, Route23_EventScript_CheckMarshBadgeTrigger + case 7, Route23_EventScript_CheckVolcanoBadgeTrigger + case 8, Route23_EventScript_CheckEarthBadgeTrigger end -EventScript_1A79D8:: @ 81A79D8 - goto_if_set FLAG_BADGE01_GET, EventScript_1A7A96 - goto EventScript_1A7A50 +Route23_EventScript_CheckBoulderBadgeTrigger:: @ 81A79D8 + goto_if_set FLAG_BADGE01_GET, Route23_EventScript_RecognizeBoulderBadgeTrigger + goto Route23_EventScript_MissingBoulderBadgeTrigger end -EventScript_1A79E7:: @ 81A79E7 - goto_if_set FLAG_BADGE02_GET, EventScript_1A7AA8 - goto EventScript_1A7A77 +Route23_EventScript_CheckCascadeBadgeTrigger:: @ 81A79E7 + goto_if_set FLAG_BADGE02_GET, Route23_EventScript_RecognizeBadgeTrigger + goto Route23_EventScript_MissingBadgeTrigger end -EventScript_1A79F6:: @ 81A79F6 - goto_if_set FLAG_BADGE03_GET, EventScript_1A7AA8 - goto EventScript_1A7A77 +Route23_EventScript_CheckThunderBadgeTrigger:: @ 81A79F6 + goto_if_set FLAG_BADGE03_GET, Route23_EventScript_RecognizeBadgeTrigger + goto Route23_EventScript_MissingBadgeTrigger end -EventScript_1A7A05:: @ 81A7A05 - goto_if_set FLAG_BADGE04_GET, EventScript_1A7AA8 - goto EventScript_1A7A77 +Route23_EventScript_CheckRainbowBadgeTrigger:: @ 81A7A05 + goto_if_set FLAG_BADGE04_GET, Route23_EventScript_RecognizeBadgeTrigger + goto Route23_EventScript_MissingBadgeTrigger end -EventScript_1A7A14:: @ 81A7A14 - goto_if_set FLAG_BADGE05_GET, EventScript_1A7AA8 - goto EventScript_1A7A77 +Route23_EventScript_CheckSoulBadgeTrigger:: @ 81A7A14 + goto_if_set FLAG_BADGE05_GET, Route23_EventScript_RecognizeBadgeTrigger + goto Route23_EventScript_MissingBadgeTrigger end -EventScript_1A7A23:: @ 81A7A23 - goto_if_set FLAG_BADGE06_GET, EventScript_1A7AA8 - goto EventScript_1A7A77 +Route23_EventScript_CheckMarshBadgeTrigger:: @ 81A7A23 + goto_if_set FLAG_BADGE06_GET, Route23_EventScript_RecognizeBadgeTrigger + goto Route23_EventScript_MissingBadgeTrigger end -EventScript_1A7A32:: @ 81A7A32 - goto_if_set FLAG_BADGE07_GET, EventScript_1A7AA8 - goto EventScript_1A7A77 +Route23_EventScript_CheckVolcanoBadgeTrigger:: @ 81A7A32 + goto_if_set FLAG_BADGE07_GET, Route23_EventScript_RecognizeBadgeTrigger + goto Route23_EventScript_MissingBadgeTrigger end -EventScript_1A7A41:: @ 81A7A41 - goto_if_set FLAG_BADGE08_GET, EventScript_1A7AA8 - goto EventScript_1A7A77 +Route23_EventScript_CheckEarthBadgeTrigger:: @ 81A7A41 + goto_if_set FLAG_BADGE08_GET, Route23_EventScript_RecognizeBadgeTrigger + goto Route23_EventScript_MissingBadgeTrigger end -EventScript_1A7A50:: @ 81A7A50 +Route23_EventScript_MissingBoulderBadgeTrigger:: @ 81A7A50 msgbox Text_OnlySkilledTrainersAllowedThrough playse SE_BOO msgbox Text_CantLetYouPass closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A7AB7 + applymovement OBJ_EVENT_ID_PLAYER, Route23_Movement_WalkDown applymovement VAR_0x8009, Movement_WalkInPlaceFastestDown waitmovement 0 releaseall end -EventScript_1A7A77:: @ 81A7A77 +Route23_EventScript_MissingBadgeTrigger:: @ 81A7A77 message Text_OnlyPassWithBadgeDontHaveYet waitmessage playse SE_BOO waitbuttonpress closemessage waitse - applymovement OBJ_EVENT_ID_PLAYER, Movement_1A7AB7 + applymovement OBJ_EVENT_ID_PLAYER, Route23_Movement_WalkDown applymovement VAR_0x8009, Movement_WalkInPlaceFastestDown waitmovement 0 releaseall end -EventScript_1A7A96:: @ 81A7A96 +Route23_EventScript_RecognizeBoulderBadgeTrigger:: @ 81A7A96 message Text_OhThatsBadgeGoRightAhead waitmessage playfanfare MUS_FANFA1 @@ -202,12 +203,12 @@ EventScript_1A7A96:: @ 81A7A96 releaseall end -EventScript_1A7AA8:: @ 81A7AA8 +Route23_EventScript_RecognizeBadgeTrigger:: @ 81A7AA8 msgbox Text_OnlyPassWithBadgeOhGoAhead copyvar VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 releaseall end -Movement_1A7AB7:: @ 81A7AB7 +Route23_Movement_WalkDown:: @ 81A7AB7 walk_down step_end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc new file mode 100644 index 000000000..15c735821 --- /dev/null +++ b/data/scripts/safari_zone.inc @@ -0,0 +1,37 @@ +SafariZone_EventScript_OutOfBallsMidBattle:: @ 81BFB87 + setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 3 + special ExitSafariMode + setwarp MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 255, 4, 1 + end + +SafariZone_EventScript_Exit:: @ 81BFB98 + setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 1 + special ExitSafariMode + warp MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 255, 4, 1 + waitstate + end + +SafariZone_EventScript_RetirePrompt:: @ 81BFBAA + lockall + msgbox SafariZone_Text_WouldYouLikeToExit, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq SafariZone_EventScript_Retire + releaseall + end + +SafariZone_EventScript_Retire:: @ 81BFBC0 + goto SafariZone_EventScript_Exit + +SafariZone_EventScript_TimesUp:: @ 81BFBC5 + lockall + playse SE_PINPON + msgbox SafariZone_Text_TimesUp + goto SafariZone_EventScript_Exit + end + +SafariZone_EventScript_OutOfBalls:: @ 81BFBD7 + lockall + playse SE_PINPON + msgbox SafariZone_Text_OutOfBalls + goto SafariZone_EventScript_Exit + end diff --git a/data/scripts/test.inc b/data/scripts/test.inc index 55578f159..bd0497209 100644 --- a/data/scripts/test.inc +++ b/data/scripts/test.inc @@ -1,27 +1,27 @@ -EventScript_1C5550:: @ 81C5552 - msgbox Text_1C556D, MSGBOX_NPC +Test_EventScript_NPC:: @ 81C5552 + msgbox Test_Text_WelcomeToWorldOfPokemon, MSGBOX_NPC end -EventScript_1C555B:: @ 81C555B - msgbox Text_1C558D, MSGBOX_SIGN +Test_EventScript_Sign:: @ 81C555B + msgbox Test_Text_ThisIsASignpost, MSGBOX_SIGN end -EventScript_1C5564:: @ 81C5564 - msgbox Text_1C55A4, MSGBOX_SIGN +Test_EventScript_CoordEvent:: @ 81C5564 + msgbox Test_Text_ThisIsACoordEvent, MSGBOX_SIGN end -Text_1C556D:: @ 81C556D +Test_Text_WelcomeToWorldOfPokemon:: @ 81C556D .string "テストよう メッセージです！\n" .string "ポケモンの せかいへ ようこそ！$" -Text_1C558D:: @ 81C558D +Test_Text_ThisIsASignpost:: @ 81C558D .string "テストよう メッセージです！\n" .string "かんばん です$" -Text_1C55A4:: @ 81C55A4 +Test_Text_ThisIsACoordEvent:: @ 81C55A4 .string "テストよう メッセージです！\n" .string "ざひょう チェックの イベントです$" .align 2 -Text_1C55C8:: @ 81C55C8 +Test_Text_Empty:: @ 81C55C8 .string "$" diff --git a/data/scripts/trainer_tower.inc b/data/scripts/trainer_tower.inc index dd85dc53a..2a5a84f72 100644 --- a/data/scripts/trainer_tower.inc +++ b/data/scripts/trainer_tower.inc @@ -320,7 +320,7 @@ EventScript_1C5410: message Text_ObtainedTheX waitfanfare waitmessage - getstdstring 2, 24 + getstdstring 2, STDSTRING_ITEMS_POCKET msgbox Text_PutItemAway call EventScript_1A6675 goto EventScript_1C544F |