dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Standardize prebattle -> intro

Browse Source
This commit is contained in:
GriffinR
2020-01-08 15:12:10 -05:00
committed by huderlem
parent 6a470ddfda
commit c27a4778ee
18 changed files with 172 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/PetalburgCity_Gym/scripts.inc
+16 -16
View File
@@ -411,7 +411,7 @@ PetalburgCity_Gym_EventScript_GiveEnigmaBerry:: @ 8204E1D
end
PetalburgCity_Gym_EventScript_NormanBattle:: @ 8204E3B
msgbox PetalburgCity_Gym_Text_NormanPreBattle, MSGBOX_DEFAULT
msgbox PetalburgCity_Gym_Text_NormanIntro, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_NORMAN_1, PetalburgCity_Gym_Text_NormanDefeat
message PetalburgCity_Gym_Text_ReceivedBalanceBadge
waitmessage
@@ -958,7 +958,7 @@ PetalburgCity_Gym_EventScript_RightGymLeadersRoomDoor:: @ 8205387
end
PetalburgCity_Gym_EventScript_Randall:: @ 82053BA
trainerbattle_single TRAINER_RANDALL, PetalburgCity_Gym_Text_RandallPreBattle, PetalburgCity_Gym_Text_RandallDefeat, PetalburgCity_Gym_EventScript_SlideOpenSpeedRoomDoors
trainerbattle_single TRAINER_RANDALL, PetalburgCity_Gym_Text_RandallIntro, PetalburgCity_Gym_Text_RandallDefeat, PetalburgCity_Gym_EventScript_SlideOpenSpeedRoomDoors
goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_RandallPostBadge
msgbox PetalburgCity_Gym_Text_RandallPostBattle, MSGBOX_AUTOCLOSE
end
@@ -975,7 +975,7 @@ PetalburgCity_Gym_EventScript_RandallPostBadge:: @ 82053ED
end
PetalburgCity_Gym_EventScript_Parker:: @ 82053F6
trainerbattle_single TRAINER_PARKER, PetalburgCity_Gym_Text_ParkerPreBattle, PetalburgCity_Gym_Text_ParkerDefeat, PetalburgCity_Gym_EventScript_SlideOpenConfusionRoomDoors
trainerbattle_single TRAINER_PARKER, PetalburgCity_Gym_Text_ParkerIntro, PetalburgCity_Gym_Text_ParkerDefeat, PetalburgCity_Gym_EventScript_SlideOpenConfusionRoomDoors
goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_ParkerPostBadge
msgbox PetalburgCity_Gym_Text_ParkerPostBattle, MSGBOX_AUTOCLOSE
end
@@ -992,7 +992,7 @@ PetalburgCity_Gym_EventScript_ParkerPostBadge:: @ 8205429
end
PetalburgCity_Gym_EventScript_George:: @ 8205432
trainerbattle_single TRAINER_GEORGE, PetalburgCity_Gym_Text_GeorgePreBattle, PetalburgCity_Gym_Text_GeorgeDefeat, PetalburgCity_Gym_EventScript_SlideOpenRecoveryRoomDoors
trainerbattle_single TRAINER_GEORGE, PetalburgCity_Gym_Text_GeorgeIntro, PetalburgCity_Gym_Text_GeorgeDefeat, PetalburgCity_Gym_EventScript_SlideOpenRecoveryRoomDoors
goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_GeorgePostBadge
msgbox PetalburgCity_Gym_Text_GeorgePostBattle, MSGBOX_AUTOCLOSE
end
@@ -1009,7 +1009,7 @@ PetalburgCity_Gym_EventScript_GeorgePostBadge:: @ 8205465
end
PetalburgCity_Gym_EventScript_Berke:: @ 820546E
trainerbattle_single TRAINER_BERKE, PetalburgCity_Gym_Text_BerkePreBattle, PetalburgCity_Gym_Text_BerkeDefeat, PetalburgCity_Gym_EventScript_SlideOpenOHKORoomDoors
trainerbattle_single TRAINER_BERKE, PetalburgCity_Gym_Text_BerkeIntro, PetalburgCity_Gym_Text_BerkeDefeat, PetalburgCity_Gym_EventScript_SlideOpenOHKORoomDoors
goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_BerkePostBadge
msgbox PetalburgCity_Gym_Text_BerkePostBattle, MSGBOX_AUTOCLOSE
end
@@ -1026,7 +1026,7 @@ PetalburgCity_Gym_EventScript_BerkePostBadge:: @ 82054A1
end
PetalburgCity_Gym_EventScript_Mary:: @ 82054AA
trainerbattle_single TRAINER_MARY, PetalburgCity_Gym_Text_MaryPreBattle, PetalburgCity_Gym_Text_MaryDefeat, PetalburgCity_Gym_EventScript_SlideOpenAccuracyRoomDoors
trainerbattle_single TRAINER_MARY, PetalburgCity_Gym_Text_MaryIntro, PetalburgCity_Gym_Text_MaryDefeat, PetalburgCity_Gym_EventScript_SlideOpenAccuracyRoomDoors
goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_MaryPostBadge
msgbox PetalburgCity_Gym_Text_MaryPostBattle, MSGBOX_AUTOCLOSE
end
@@ -1043,7 +1043,7 @@ PetalburgCity_Gym_EventScript_MaryPostBadge:: @ 82054DD
end
PetalburgCity_Gym_EventScript_Alexia:: @ 82054E6
trainerbattle_single TRAINER_ALEXIA, PetalburgCity_Gym_Text_AlexiaPreBattle, PetalburgCity_Gym_Text_AlexiaDefeat, PetalburgCity_Gym_EventScript_SlideOpenDefenseRoomDoors
trainerbattle_single TRAINER_ALEXIA, PetalburgCity_Gym_Text_AlexiaIntro, PetalburgCity_Gym_Text_AlexiaDefeat, PetalburgCity_Gym_EventScript_SlideOpenDefenseRoomDoors
goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_AlexiaPostBadge
msgbox PetalburgCity_Gym_Text_AlexiaPostBattle, MSGBOX_AUTOCLOSE
end
@@ -1060,7 +1060,7 @@ PetalburgCity_Gym_EventScript_AlexiaPostBadge:: @ 8205519
end
PetalburgCity_Gym_EventScript_Jody:: @ 8205522
trainerbattle_single TRAINER_JODY, PetalburgCity_Gym_Text_JodyPreBattle, PetalburgCity_Gym_Text_JodyDefeat, PetalburgCity_Gym_EventScript_SlideOpenStrengthRoomDoors
trainerbattle_single TRAINER_JODY, PetalburgCity_Gym_Text_JodyIntro, PetalburgCity_Gym_Text_JodyDefeat, PetalburgCity_Gym_EventScript_SlideOpenStrengthRoomDoors
goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_JodyPostBadge
msgbox PetalburgCity_Gym_Text_JodyPostBattle, MSGBOX_AUTOCLOSE
end
@@ -1357,7 +1357,7 @@ PetalburgCity_Gym_Text_YouHaveGottenStronger: @ 8205F87
.string "I can tell by the number of BADGES\n"
.string "that you've earned.$"
PetalburgCity_Gym_Text_NormanPreBattle: @ 8205FE5
PetalburgCity_Gym_Text_NormanIntro: @ 8205FE5
.string "DAD: Hm…\n"
.string "So, you did get four GYM BADGES.\p"
.string "Fine, as I promised, we will have\n"
@@ -1453,7 +1453,7 @@ PetalburgCity_Gym_Text_GymGuidePostVictory: @ 82066F3
.string "Like, whoa!\n"
.string "What a stunning turn of events!$"
PetalburgCity_Gym_Text_RandallPreBattle: @ 820674F
PetalburgCity_Gym_Text_RandallIntro: @ 820674F
.string "The ability to attack before the\n"
.string "opponent…\p"
.string "Just that alone puts me at a great\n"
@@ -1476,7 +1476,7 @@ PetalburgCity_Gym_Text_RandallPostBadge: @ 820685E
.string "That's what I think being a\n"
.string "GYM LEADER is all about.$"
PetalburgCity_Gym_Text_ParkerPreBattle: @ 82068FD
PetalburgCity_Gym_Text_ParkerIntro: @ 82068FD
.string "This is the CONFUSION ROOM.\p"
.string "Let me see how well bonded you are\n"
.string "with your POKéMON!$"
@@ -1493,7 +1493,7 @@ PetalburgCity_Gym_Text_ParkerPostBadge: @ 82069D9
.string "After you beat our LEADER, the\n"
.string "training has become a lot tougher.$"
PetalburgCity_Gym_Text_GeorgePreBattle: @ 8206A1B
PetalburgCity_Gym_Text_GeorgeIntro: @ 8206A1B
.string "Just when you think you're going to\n"
.string "win, your opponent restores HP…\p"
.string "Can you just imagine how awful that\n"
@@ -1518,7 +1518,7 @@ PetalburgCity_Gym_Text_GeorgePostBadge: @ 8206BB1
.string "I'm going to keep training at GYMS.\n"
.string "One day, I'll become a LEADER.$"
PetalburgCity_Gym_Text_BerkePreBattle: @ 8206BF4
PetalburgCity_Gym_Text_BerkeIntro: @ 8206BF4
.string "I'm not going to take it easy just\n"
.string "because you're our LEADER's kid.\p"
.string "I'll show you how horrid it is for\n"
@@ -1541,7 +1541,7 @@ PetalburgCity_Gym_Text_BerkePostBadge: @ 8206D56
.string "the TRAINERS of PETALBURG CITY have\l"
.string "become a lot tougher.$"
PetalburgCity_Gym_Text_MaryPreBattle: @ 8206DB2
PetalburgCity_Gym_Text_MaryIntro: @ 8206DB2
.string "Giggle…\n"
.string "This is the ACCURACY ROOM.\p"
.string "It's pretty nasty when every attack\n"
@@ -1564,7 +1564,7 @@ PetalburgCity_Gym_Text_MaryPostBadge: @ 8206ED8
.string "We're striving to become soul mates\n"
.string "with our POKéMON.$"
PetalburgCity_Gym_Text_AlexiaPreBattle: @ 8206F44
PetalburgCity_Gym_Text_AlexiaIntro: @ 8206F44
.string "The higher the DEFENSE, the more\n"
.string "reckless I can be in attack.$"
@@ -1584,7 +1584,7 @@ PetalburgCity_Gym_Text_AlexiaPostBattle: @ 8206F9F
PetalburgCity_Gym_Text_AlexiaPostBadge: @ 8207069
.string "Hi! Have you tried using SURF?$"
PetalburgCity_Gym_Text_JodyPreBattle: @ 8207088
PetalburgCity_Gym_Text_JodyIntro: @ 8207088
.string "Our GYM LEADER told us to go all out\n"
.string "and beat you.\p"
.string "Even if you happen to be the\n"