Skip to content

Commit 266016f

Browse files
PhoenixBoundPhoenixBound
committed
Fix stuff
This merges in @xwater 's scripts while fixing my stupidity. Will add to gym leader scripts pronto.
2 parents 27ff539 + a5c1a81 commit 266016f

6 files changed

+708
-5
lines changed

‎src/Text/E4/scr_champ-maybe.rbc ‎src/Text/E4/scr_champ-final.rbc

+6-5
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ return
143143
' Strings
144144
'---------
145145
#org 0x178F2F
146-
= Why?\nWhy did I lose?\pI never made any mistakes raising\nmy POK�MON[.]\pDarn it! You're the new POK�MON\nLEAGUE CHAMPION!\pAlthough I don't like to admit it[.]
146+
= = BUTTS. BUTTS BUTTS BUTTS BUTTS\nBUTTS BUTTS BUTTS BUTTS BUTTS\lBUTTS BUTTS BUTTS. YOU'RE BUTTS.[.]
147147

148148
#org 0x178FC6
149149
= OAK: [player]!
@@ -152,19 +152,20 @@ return
152152
= OAK: So, you've won!\nSincerely, congratulations!\pYou're the new POK�MON LEAGUE\nCHAMPION!\pYou've grown up so much since you\nfirst left with [buffer1] to work\lon the POK�DEX.\p[player], you have come of age!
153153

154154
#org 0x17908F
155-
= OAK: [rival][.]\nI'm disappointed in you.\pI came when I heard you'd beaten\nthe ELITE FOUR.\pBut, when I got here, you had\nalready lost!\p[rival], do you understand why\nyou lost?\pYou have forgotten to treat your\nPOK�MON with love and trust.\pWithout them, you will never\nbecome a CHAMP again!
155+
= OAK: [rival][.]\nI'm disappointed in you.\pI came when I heard you'd become\nthe WETTEST.\pBut, when I got here, you had\nalready lost!\p[rival], do you understand why\nyou lost?\pYou have forgotten to treat your\nPOK�MON with love and trust.\pWithout them, you will never\nbecome a CHAMP again!
156156

157157
#org 0x1791A3
158158
= OAK: [player].\pYou understand that your victory\nwas not just your own doing.\pThe bond you share with your\nPOK�MON is marvelous.\p[player]!\nCome with me!
159159

160160
#org 0x178B6C
161-
= [rival]: Hey, [player]!\pI was looking forward to seeing\nyou, [player].\pMy rival should be strong to keep\nme sharp.\pWhile working on my POK�DEX, I\nlooked all over for POK�MON.\pNot only that, I assembled teams\nthat would beat any POK�MON type.\pAnd now[.]\pI'm the POK�MON LEAGUE CHAMPION!\p[player]!\nDo you know what that means?\pI'll tell you.\pI am the most powerful TRAINER in\nthe world!
161+
= [rival]: Hey, [player]!\pI was looking forward to seeing\nyou, [player].\pI hope you become the very best.\nLike no one ever was. To catch\lthem may be a good test, but to\ltrain them should be your cause
162162

163163
#org 0x178CD4
164-
= [rival]: Hey, [player]!\pYou came back, [player]!\nHahah, that is so great!\pMy rival should be strong to keep\nme sharp.\pWhile working on my POK�DEX, I\nlooked all over for POK�MON.\pNot only that, I assembled teams\nthat would beat any POK�MON type.\pAnd now[.]\pI'm the POK�MON LEAGUE CHAMPION!\p[player]!\nDo you know what that means?\pI'll tell you.\pI am the most powerful TRAINER in\nthe world!
164+
= [rival]: Hey, [player]!\pYou came back, [player]!\nHahah, that is so great!\pI hope you become the very best.\nLike no one ever was. To catch\lthem may be a good test, but to\ltrain them should be your cause
165165

166166
#org 0x178E3F
167-
= NO!\nThat can't be!\lYou beat me at my best!\pAfter all that work to become\nthe LEAGUE CHAMP?\pMy reign is over already?\nIt's not fair!
167+
= It was brief, but it was nice to\nbe chief. You did it.\pGrats [player]
168+
168169

169170

170171
'-----------

‎src/Text/regular/src_cela_Erika_illusionarythade.rbc

+167
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
1+
#include stditems.rbh
2+
3+
'---------------
4+
#org 0x16D061
5+
setvar 0x8004 0x5
6+
setvar 0x8005 0x2
7+
special 0x174
8+
trainerbattle 0x1 0x1A1 0x0 0x8197114 0x8197260 0x816D0A0
9+
checkflag 0x293
10+
if 0x0 goto 0x816D0C6
11+
setvar 0x8004 0x5
12+
setvar 0x8005 0x4
13+
special 0x173
14+
msgbox 0x81972B8 MSG_KEEPOPEN '"You are cataloging POK�MON?\nI mus..."
15+
release
16+
end
17+
18+
'---------------
19+
#org 0x16D0A0
20+
setvar 0x8004 0x5
21+
setvar 0x8005 0x1
22+
special 0x173
23+
clearflag 0x9E
24+
setflag 0x4B3
25+
setflag 0x823
26+
setvar 0x8008 0x4
27+
call 0x81A6B18
28+
goto 0x816D0C6
29+
30+
'---------------
31+
#org 0x16D0C6
32+
msgbox 0x8197327 MSG_KEEPOPEN '"The RAINBOWBADGE will make\nPOK�MO..."
33+
checkitemroom ITEM_TM19 0x1
34+
compare LASTRESULT 0x0
35+
if 0x1 goto 0x816D107
36+
additem ITEM_TM19 0x1
37+
loadpointer 0x0 0x81973BA '"[player] received TM19\nfrom ERIKA..."
38+
giveitem2 ITEM_TM19 0x1 0x101
39+
setflag 0x293
40+
msgbox 0x81973D7 MSG_KEEPOPEN '"TM19 contains GIGA DRAIN.\pHalf th..."
41+
release
42+
end
43+
44+
'---------------
45+
#org 0x1A6B18
46+
copyvar 0x8000 0x8008
47+
compare 0x8000 0x1
48+
if 0x1 goto 0x81A6B76
49+
compare 0x8000 0x2
50+
if 0x1 goto 0x81A6B7A
51+
compare 0x8000 0x3
52+
if 0x1 goto 0x81A6B81
53+
compare 0x8000 0x4
54+
if 0x1 goto 0x81A6B8B
55+
compare 0x8000 0x5
56+
if 0x1 goto 0x81A6BA1
57+
compare 0x8000 0x6
58+
if 0x1 goto 0x81A6BB4
59+
compare 0x8000 0x7
60+
if 0x1 goto 0x81A6BCA
61+
compare 0x8000 0x8
62+
if 0x1 goto 0x81A6BE0
63+
end
64+
65+
'---------------
66+
#org 0x16D107
67+
msgbox 0x819745D MSG_KEEPOPEN '"You should make room for this."
68+
release
69+
end
70+
71+
'---------------
72+
#org 0x1A6B76
73+
cleartrainerflag 0x8E
74+
return
75+
76+
'---------------
77+
#org 0x1A6B7A
78+
cleartrainerflag 0x96
79+
cleartrainerflag 0xEA
80+
return
81+
82+
'---------------
83+
#org 0x1A6B81
84+
cleartrainerflag 0x8D
85+
cleartrainerflag 0xDC
86+
cleartrainerflag 0x1A7
87+
return
88+
89+
'---------------
90+
#org 0x1A6B8B
91+
cleartrainerflag 0x84
92+
cleartrainerflag 0x85
93+
cleartrainerflag 0xA0
94+
cleartrainerflag 0x109
95+
cleartrainerflag 0x10A
96+
cleartrainerflag 0x10B
97+
cleartrainerflag 0x192
98+
return
99+
100+
'---------------
101+
#org 0x1A6BA1
102+
cleartrainerflag 0x126
103+
cleartrainerflag 0x127
104+
cleartrainerflag 0x120
105+
cleartrainerflag 0x121
106+
cleartrainerflag 0x124
107+
cleartrainerflag 0x125
108+
return
109+
110+
'---------------
111+
#org 0x1A6BB4
112+
cleartrainerflag 0x118
113+
cleartrainerflag 0x119
114+
cleartrainerflag 0x11A
115+
cleartrainerflag 0x11B
116+
cleartrainerflag 0x1CE
117+
cleartrainerflag 0x1CF
118+
cleartrainerflag 0x1D0
119+
return
120+
121+
'---------------
122+
#org 0x1A6BCA
123+
cleartrainerflag 0xB1
124+
cleartrainerflag 0xB2
125+
cleartrainerflag 0xB3
126+
cleartrainerflag 0xB4
127+
cleartrainerflag 0xD5
128+
cleartrainerflag 0xD6
129+
cleartrainerflag 0xD7
130+
return
131+
132+
'---------------
133+
#org 0x1A6BE0
134+
cleartrainerflag 0x128
135+
cleartrainerflag 0x129
136+
cleartrainerflag 0x142
137+
cleartrainerflag 0x143
138+
cleartrainerflag 0x144
139+
cleartrainerflag 0x188
140+
cleartrainerflag 0x190
141+
cleartrainerflag 0x191
142+
return
143+
144+
145+
'---------
146+
' Strings
147+
'---------
148+
#org 0x197114
149+
= YAAAAS Queen! Shining, Shimmering,\nSplendid! Listen. I'm Thade.\lWelcome to my beautiful gym. Do\lyou have what it takes?\c\h0B[Ke]�
150+
151+
#org 0x197260
152+
= Oh!\nI concede defeat.\lYou are remarkably strong.\pI must confer on you the\nRAINBOWBADGE.
153+
154+
#org 0x1972B8
155+
= You are cataloging POK�MON?\nI must say I'm impressed.\pI would never collect POK�MON if\nthey were unattractive.
156+
157+
#org 0x197327
158+
= The RAINBOWBADGE will make\nPOK�MON up to Lv. 50 obey.\pIt also allows POK�MON to use\nSTRENGTH in and out of battle.\pPlease also take this with you.
159+
160+
#org 0x1973BA
161+
= [player] received TM19\nfrom ERIKA.
162+
163+
#org 0x1973D7
164+
= TM19 contains GIGA DRAIN.\pIt's super lit.
165+
166+
#org 0x19745D
167+
= You should make room for this.

‎src/Text/regular/src_cinn_blane_EK0.rbc

+166
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
1+
#include stditems.rbh
2+
3+
'---------------
4+
#org 0x16D9D4
5+
setvar 0x8004 0x8
6+
setvar 0x8005 0x2
7+
special 0x174
8+
trainerbattle 0x1 0x1A3 0x0 0x8199543 0x81995FA 0x816DA06
9+
checkflag 0x24E
10+
if 0x0 goto 0x816DA34
11+
msgbox 0x819971D MSG_KEEPOPEN '"TM38 contains FIRE BLAST.\nTeach i..."
12+
release
13+
end
14+
15+
'---------------
16+
#org 0x16DA06
17+
setvar 0x8004 0x8
18+
setvar 0x8005 0x1
19+
special 0x173
20+
setflag 0x4B6
21+
setflag 0x826
22+
sethealingplace 0x9
23+
setvar 0x4071 0x1
24+
clearflag 0x62
25+
setvar 0x8008 0x7
26+
call 0x81A6B18
27+
goto 0x816DA34
28+
29+
'---------------
30+
#org 0x16DA34
31+
msgbox 0x819969E MSG_KEEPOPEN '"Hah!\pThe VOLCANOBADGE heightens t..."
32+
checkitemroom ITEM_TM38 0x1
33+
compare LASTRESULT 0x0
34+
if 0x1 goto 0x816DA75
35+
additem ITEM_TM38 0x1
36+
loadpointer 0x0 0x81996FF '"[player] received TM38\nfrom BLAIN..."
37+
giveitem2 ITEM_TM38 0x1 0x101
38+
setflag 0x24E
39+
msgbox 0x8199652 MSG_KEEPOPEN '"FIRE BLAST is the ultimate fire\nt..."
40+
release
41+
end
42+
43+
'---------------
44+
#org 0x1A6B18
45+
copyvar 0x8000 0x8008
46+
compare 0x8000 0x1
47+
if 0x1 goto 0x81A6B76
48+
compare 0x8000 0x2
49+
if 0x1 goto 0x81A6B7A
50+
compare 0x8000 0x3
51+
if 0x1 goto 0x81A6B81
52+
compare 0x8000 0x4
53+
if 0x1 goto 0x81A6B8B
54+
compare 0x8000 0x5
55+
if 0x1 goto 0x81A6BA1
56+
compare 0x8000 0x6
57+
if 0x1 goto 0x81A6BB4
58+
compare 0x8000 0x7
59+
if 0x1 goto 0x81A6BCA
60+
compare 0x8000 0x8
61+
if 0x1 goto 0x81A6BE0
62+
end
63+
64+
'---------------
65+
#org 0x16DA75
66+
msgbox 0x8199789 MSG_KEEPOPEN '"Make space for this, child!"
67+
release
68+
end
69+
70+
'---------------
71+
#org 0x1A6B76
72+
cleartrainerflag 0x8E
73+
return
74+
75+
'---------------
76+
#org 0x1A6B7A
77+
cleartrainerflag 0x96
78+
cleartrainerflag 0xEA
79+
return
80+
81+
'---------------
82+
#org 0x1A6B81
83+
cleartrainerflag 0x8D
84+
cleartrainerflag 0xDC
85+
cleartrainerflag 0x1A7
86+
return
87+
88+
'---------------
89+
#org 0x1A6B8B
90+
cleartrainerflag 0x84
91+
cleartrainerflag 0x85
92+
cleartrainerflag 0xA0
93+
cleartrainerflag 0x109
94+
cleartrainerflag 0x10A
95+
cleartrainerflag 0x10B
96+
cleartrainerflag 0x192
97+
return
98+
99+
'---------------
100+
#org 0x1A6BA1
101+
cleartrainerflag 0x126
102+
cleartrainerflag 0x127
103+
cleartrainerflag 0x120
104+
cleartrainerflag 0x121
105+
cleartrainerflag 0x124
106+
cleartrainerflag 0x125
107+
return
108+
109+
'---------------
110+
#org 0x1A6BB4
111+
cleartrainerflag 0x118
112+
cleartrainerflag 0x119
113+
cleartrainerflag 0x11A
114+
cleartrainerflag 0x11B
115+
cleartrainerflag 0x1CE
116+
cleartrainerflag 0x1CF
117+
cleartrainerflag 0x1D0
118+
return
119+
120+
'---------------
121+
#org 0x1A6BCA
122+
cleartrainerflag 0xB1
123+
cleartrainerflag 0xB2
124+
cleartrainerflag 0xB3
125+
cleartrainerflag 0xB4
126+
cleartrainerflag 0xD5
127+
cleartrainerflag 0xD6
128+
cleartrainerflag 0xD7
129+
return
130+
131+
'---------------
132+
#org 0x1A6BE0
133+
cleartrainerflag 0x128
134+
cleartrainerflag 0x129
135+
cleartrainerflag 0x142
136+
cleartrainerflag 0x143
137+
cleartrainerflag 0x144
138+
cleartrainerflag 0x188
139+
cleartrainerflag 0x190
140+
cleartrainerflag 0x191
141+
return
142+
143+
144+
'---------
145+
' Strings
146+
'---------
147+
#org 0x199543
148+
= Miki, wet or dry, there is no in\ndamp. Wet, you must be, dry will\llead to the Dark Side, yes.\c\h0B[Ke]�
149+
150+
#org 0x1995FA
151+
= Non-wetification leads to hate\nNot even ashes remain!\pYou have earned the VOLCANOBADGE.
152+
153+
#org 0x19971D
154+
= TM38 contains FIRE BLAST.\nTeach it to FIRE-type POK�MON.\pVULPIX or CHARMELEON would be\nideal for that move.
155+
156+
#org 0x19969E
157+
= Hah!\pThe VOLCANOBADGE heightens the\nSPECIAL stats of your POK�MON.\pHere, you can have this, too!
158+
159+
#org 0x1996FF
160+
= [player] received TM38\nfrom BLAINE.
161+
162+
#org 0x199652
163+
= FIRE BLAST is the ultimate fire\ntechnique.\pDon't waste it on WATER POK�MON.
164+
165+
#org 0x199789
166+
= Make space for this, child!

0 commit comments

Comments
 (0)