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

Merge branch 'master' into doc-cinnabar

Browse Source
This commit is contained in:
GriffinR
2020-01-22 11:38:44 -05:00
committed by GitHub
parent 84c198ac76 c75296640d
commit fbf0c4616c
53 changed files with 871 additions and 810 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/scripts/day_care.inc
+52 -181
View File
@@ -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?$"
data/scripts/obtain_item.inc
+8 -8
View File
@@ -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
data/scripts/route23.inc
+91 -90
View File
@@ -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
data/scripts/test.inc
+10 -10
View File
@@ -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 "$"
data/scripts/trainer_tower.inc
+1 -1
View File
@@ -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