Skip to content

Commit ae5a325

Browse files
committed
Label more map scripts
1 parent cad029f commit ae5a325

9 files changed

+247
-247
lines changed

maps/NationalPark.asm

+67-67
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@ NationalParkLassScript:
2525
NationalParkPokefanFScript:
2626
jumptextfaceplayer NationalParkPokefanFText
2727

28-
TeacherScript_0x5c008:
28+
NationalParkTeacher1Script:
2929
faceplayer
3030
opentext
3131
checkevent EVENT_GOT_QUICK_CLAW
32-
iftrue UnknownScript_0x5c01d
33-
writetext UnknownText_0x5c265
32+
iftrue .GotQuickClaw
33+
writetext NationalParkTeacher1Text
3434
buttonsound
3535
verbosegiveitem QUICK_CLAW
36-
iffalse UnknownScript_0x5c021
36+
iffalse .NoRoom
3737
setevent EVENT_GOT_QUICK_CLAW
38-
UnknownScript_0x5c01d:
39-
writetext UnknownText_0x5c30d
38+
.GotQuickClaw:
39+
writetext NationalParkTeacher1Text_GotQuickClaw
4040
waitbutton
41-
UnknownScript_0x5c021:
41+
.NoRoom:
4242
closetext
4343
end
4444

@@ -48,8 +48,8 @@ NationalParkYoungster1Script:
4848
NationalParkYoungster2Script:
4949
jumptextfaceplayer NationalParkYoungster2Text
5050

51-
NationalParkTeacherScript:
52-
jumptextfaceplayer NationalParkTeacherText
51+
NationalParkTeacher2Script:
52+
jumptextfaceplayer NationalParkTeacher2Text
5353

5454
NationalParkPersian:
5555
faceplayer
@@ -60,10 +60,10 @@ NationalParkPersian:
6060
closetext
6161
end
6262

63-
GameboyKidScript_0x5c037:
63+
NationalParkGameboyKidScript:
6464
faceplayer
6565
opentext
66-
writetext UnknownText_0x5c42a
66+
writetext NationalParkGameboyKidText
6767
waitbutton
6868
closetext
6969
turnobject NATIONALPARK_GAMEBOY_KID, DOWN
@@ -77,29 +77,29 @@ TrainerSchoolboyJack1:
7777
endifjustbattled
7878
opentext
7979
checkflag ENGINE_JACK
80-
iftrue UnknownScript_0x5c088
80+
iftrue .Rematch
8181
checkcellnum PHONE_SCHOOLBOY_JACK
82-
iftrue UnknownScript_0x5c108
82+
iftrue .NumberAccepted
8383
checkevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER
84-
iftrue UnknownScript_0x5c071
84+
iftrue .AskAgain
8585
writetext UnknownText_0x5c4f3
8686
buttonsound
8787
setevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER
88-
scall UnknownScript_0x5c0fc
89-
jump UnknownScript_0x5c074
88+
scall .AskNumber1
89+
jump .RequestNumber
9090

91-
UnknownScript_0x5c071:
92-
scall UnknownScript_0x5c100
93-
UnknownScript_0x5c074:
91+
.AskAgain:
92+
scall .AskNumber2
93+
.RequestNumber:
9494
askforphonenumber PHONE_SCHOOLBOY_JACK
95-
ifequal PHONE_CONTACTS_FULL, UnknownScript_0x5c110
96-
ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x5c10c
95+
ifequal PHONE_CONTACTS_FULL, .PhoneFull
96+
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
9797
trainertotext SCHOOLBOY, JACK1, MEM_BUFFER_0
98-
scall UnknownScript_0x5c104
99-
jump UnknownScript_0x5c108
98+
scall .RegisteredNumber
99+
jump .NumberAccepted
100100

101-
UnknownScript_0x5c088:
102-
scall UnknownScript_0x5c114
101+
.Rematch:
102+
scall .RematchStd
103103
winlosstext SchoolboyJack1BeatenText, 0
104104
copybytetovar wJackFightCount
105105
ifequal 4, .Fight4
@@ -158,31 +158,31 @@ UnknownScript_0x5c088:
158158
clearflag ENGINE_JACK
159159
end
160160

161-
UnknownScript_0x5c0fc:
161+
.AskNumber1:
162162
jumpstd asknumber1m
163163
end
164164

165-
UnknownScript_0x5c100:
165+
.AskNumber2:
166166
jumpstd asknumber2m
167167
end
168168

169-
UnknownScript_0x5c104:
169+
.RegisteredNumber:
170170
jumpstd registerednumberm
171171
end
172172

173-
UnknownScript_0x5c108:
173+
.NumberAccepted:
174174
jumpstd numberacceptedm
175175
end
176176

177-
UnknownScript_0x5c10c:
177+
.NumberDeclined:
178178
jumpstd numberdeclinedm
179179
end
180180

181-
UnknownScript_0x5c110:
181+
.PhoneFull:
182182
jumpstd phonefullm
183183
end
184184

185-
UnknownScript_0x5c114:
185+
.RematchStd:
186186
jumpstd rematchm
187187
end
188188

@@ -205,74 +205,74 @@ TrainerPokefanfBeverly1:
205205
endifjustbattled
206206
opentext
207207
checkflag ENGINE_BEVERLY_HAS_NUGGET
208-
iftrue UnknownScript_0x5c177
208+
iftrue .GiveNugget
209209
checkcellnum PHONE_POKEFAN_BEVERLY
210-
iftrue UnknownScript_0x5c19b
210+
iftrue .NumberAccepted
211211
checkpoke MARILL
212-
iffalse UnknownScript_0x5c189
212+
iffalse .NoMarill
213213
checkevent EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER
214-
iftrue UnknownScript_0x5c160
214+
iftrue .AskAgain
215215
writetext UnknownText_0x5c5bd
216216
buttonsound
217217
setevent EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER
218-
scall UnknownScript_0x5c18f
219-
jump UnknownScript_0x5c163
218+
scall .AskNumber1
219+
jump .RequestNumber
220220

221-
UnknownScript_0x5c160:
222-
scall UnknownScript_0x5c193
223-
UnknownScript_0x5c163:
221+
.AskAgain:
222+
scall .AskNumber2
223+
.RequestNumber:
224224
askforphonenumber PHONE_POKEFAN_BEVERLY
225-
ifequal PHONE_CONTACTS_FULL, UnknownScript_0x5c1a3
226-
ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x5c19f
225+
ifequal PHONE_CONTACTS_FULL, .PhoneFull
226+
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
227227
trainertotext POKEFANF, BEVERLY1, MEM_BUFFER_0
228-
scall UnknownScript_0x5c197
229-
jump UnknownScript_0x5c19b
228+
scall .RegisteredNumber
229+
jump .NumberAccepted
230230

231-
UnknownScript_0x5c177:
232-
scall UnknownScript_0x5c1a7
231+
.GiveNugget:
232+
scall .Gift
233233
verbosegiveitem NUGGET
234-
iffalse UnknownScript_0x5c186
234+
iffalse .NoRoom
235235
clearflag ENGINE_BEVERLY_HAS_NUGGET
236-
jump UnknownScript_0x5c19b
236+
jump .NumberAccepted
237237

238-
UnknownScript_0x5c186:
239-
jump UnknownScript_0x5c1ab
238+
.NoRoom:
239+
jump .PackFull
240240

241-
UnknownScript_0x5c189:
241+
.NoMarill:
242242
writetext UnknownText_0x5c68a
243243
waitbutton
244244
closetext
245245
end
246246

247-
UnknownScript_0x5c18f:
247+
.AskNumber1:
248248
jumpstd asknumber1f
249249
end
250250

251-
UnknownScript_0x5c193:
251+
.AskNumber2:
252252
jumpstd asknumber2f
253253
end
254254

255-
UnknownScript_0x5c197:
255+
.RegisteredNumber:
256256
jumpstd registerednumberf
257257
end
258258

259-
UnknownScript_0x5c19b:
259+
.NumberAccepted:
260260
jumpstd numberacceptedf
261261
end
262262

263-
UnknownScript_0x5c19f:
263+
.NumberDeclined:
264264
jumpstd numberdeclinedf
265265
end
266266

267-
UnknownScript_0x5c1a3:
267+
.PhoneFull:
268268
jumpstd phonefullf
269269
end
270270

271-
UnknownScript_0x5c1a7:
271+
.Gift:
272272
jumpstd giftf
273273
end
274274

275-
UnknownScript_0x5c1ab:
275+
.PackFull:
276276
jumpstd packfullf
277277
end
278278

@@ -322,7 +322,7 @@ NationalParkPokefanFText:
322322
cont "It cheers me up."
323323
done
324324

325-
UnknownText_0x5c265:
325+
NationalParkTeacher1Text:
326326
text "Pay attention,"
327327
line "please!"
328328

@@ -342,7 +342,7 @@ UnknownText_0x5c265:
342342
line "this."
343343
done
344344

345-
UnknownText_0x5c30d:
345+
NationalParkTeacher1Text_GotQuickClaw:
346346
text "Let a #MON hold"
347347
line "that QUICK CLAW."
348348

@@ -363,7 +363,7 @@ NationalParkYoungster2Text:
363363
cont "sticker if I win."
364364
done
365365

366-
NationalParkTeacherText:
366+
NationalParkTeacher2Text:
367367
text "I take walks in"
368368
line "the PARK, but I"
369369

@@ -378,7 +378,7 @@ NationalParkPersianText:
378378
text "PERSIAN: Fufushaa!"
379379
done
380380

381-
UnknownText_0x5c42a:
381+
NationalParkGameboyKidText:
382382
text "I'm printing out"
383383
line "my #DEX."
384384

@@ -531,15 +531,15 @@ NationalPark_MapEvents:
531531
db 14 ; object events
532532
object_event 15, 24, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NationalParkLassScript, -1
533533
object_event 14, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPokefanFScript, -1
534-
object_event 27, 40, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5c008, -1
534+
object_event 27, 40, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NationalParkTeacher1Script, -1
535535
object_event 11, 41, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkYoungster1Script, -1
536536
object_event 10, 41, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NationalParkYoungster2Script, -1
537-
object_event 17, 41, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkTeacherScript, -1
537+
object_event 17, 41, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkTeacher2Script, -1
538538
object_event 26, 40, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPersian, -1
539539
object_event 27, 23, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyJack1, -1
540540
object_event 18, 29, SPRITE_POKEFAN_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanfBeverly1, -1
541541
object_event 16, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1
542542
object_event 8, 14, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassKrise, -1
543543
object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL
544-
object_event 26, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x5c037, -1
544+
object_event 26, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkGameboyKidScript, -1
545545
object_event 1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkTMDig, EVENT_NATIONAL_PARK_TM_DIG

0 commit comments

Comments
 (0)