ref: 2c98c694e3f1ab7c82c73eaa671d281803130ae7
parent: ac88c43b14338d9481ebc328ca7e76b1bf8d3a19
author: IIMarckus <[email protected]>
date: Thu Jul 9 22:20:21 EDT 2015
Fill out trainer event flags.
--- a/constants/event_flags.asm
+++ b/constants/event_flags.asm
@@ -243,7 +243,7 @@
EVENT_BEAT_BIRD_KEEPER_THEO EQU $3fe
EVENT_BEAT_BIRD_KEEPER_TOBY EQU $3ff
EVENT_BEAT_BIRD_KEEPER_DENIS EQU $400
-EVENT_BEAT_BIRD_KEEPER_VANCE_1 EQU $401
+EVENT_BEAT_BIRD_KEEPER_VANCE EQU $401
EVENT_BEAT_BIRD_KEEPER_HANK EQU $402
EVENT_BEAT_BIRD_KEEPER_ROY EQU $403
EVENT_BEAT_BIRD_KEEPER_BORIS EQU $404
@@ -265,7 +265,7 @@
EVENT_BEAT_SAGE_NEAL EQU $418
EVENT_BEAT_SAGE_LI EQU $419
EVENT_BEAT_CAMPER_ROLAND EQU $41a
-EVENT_BEAT_CAMPER_TODD_1 EQU $41b
+EVENT_BEAT_CAMPER_TODD EQU $41b
EVENT_BEAT_CAMPER_IVAN EQU $41c
EVENT_BEAT_CAMPER_ELLIOT EQU $41d
EVENT_BEAT_CAMPER_BARRY EQU $41e
@@ -304,15 +304,15 @@
EVENT_BEAT_FIREBREATHER_RAY EQU $44c
EVENT_BEAT_FIREBREATHER_LYLE EQU $44d
EVENT_BEAT_FISHER_JUSTIN EQU $44e
-EVENT_BEAT_FISHER_RALPH_1 EQU $44f
+EVENT_BEAT_FISHER_RALPH EQU $44f
EVENT_BEAT_FISHER_ARNOLD EQU $450
EVENT_BEAT_FISHER_KYLE EQU $451
EVENT_BEAT_FISHER_HENRY EQU $452
EVENT_BEAT_FISHER_MARVIN EQU $453
-EVENT_BEAT_FISHER_TULLY_1 EQU $454
+EVENT_BEAT_FISHER_TULLY EQU $454
EVENT_BEAT_FISHER_ANDRE EQU $455
EVENT_BEAT_FISHER_RAYMOND EQU $456
-EVENT_BEAT_FISHER_WILTON_1 EQU $457
+EVENT_BEAT_FISHER_WILTON EQU $457
EVENT_BEAT_FISHER_EDGAR EQU $458
EVENT_BEAT_FISHER_JONAH EQU $459
EVENT_BEAT_FISHER_MARTIN EQU $45a
@@ -323,7 +323,7 @@
EVENT_BEAT_TWINS_ANN_AND_ANNE EQU $465
EVENT_BEAT_TWINS_JO_AND_ZOE EQU $468
EVENT_BEAT_TWINS_MEG_AND_PEG EQU $46a
-EVENT_BEAT_SCHOOLBOY_JACK_1 EQU $46c
+EVENT_BEAT_SCHOOLBOY_JACK EQU $46c
EVENT_BEAT_SCHOOLBOY_KIP EQU $46d
EVENT_BEAT_SCHOOLBOY_ALAN EQU $46e
EVENT_BEAT_SCHOOLBOY_JOHNNY EQU $46f
@@ -332,11 +332,11 @@
EVENT_BEAT_SCHOOLBOY_DUDLEY EQU $472
EVENT_BEAT_SCHOOLBOY_JOE EQU $473
EVENT_BEAT_SCHOOLBOY_BILLY EQU $474
-EVENT_BEAT_SCHOOLBOY_CHAD_1 EQU $475
+EVENT_BEAT_SCHOOLBOY_CHAD EQU $475
EVENT_BEAT_SCHOOLBOY_NATE EQU $476
EVENT_BEAT_SCHOOLBOY_RICKY EQU $477
-EVENT_BEAT_PICNICKER_LIZ_1 EQU $47e
-EVENT_BEAT_PICNICKER_GINA_1 EQU $47f
+EVENT_BEAT_PICNICKER_LIZ EQU $47e
+EVENT_BEAT_PICNICKER_GINA EQU $47f
EVENT_BEAT_PICNICKER_BROOKE EQU $480
EVENT_BEAT_PICNICKER_KIM EQU $481
EVENT_BEAT_PICNICKER_CINDY EQU $482
@@ -343,14 +343,14 @@
EVENT_BEAT_PICNICKER_HOPE EQU $483
EVENT_BEAT_PICNICKER_SHARON EQU $484
EVENT_BEAT_PICNICKER_DEBRA EQU $485
-EVENT_BEAT_PICNICKER_ERIN_1 EQU $487
+EVENT_BEAT_PICNICKER_ERIN EQU $487
EVENT_BEAT_PICNICKER_HEIDI EQU $48a
EVENT_BEAT_PICNICKER_EDNA EQU $48b
EVENT_BEAT_PICNICKER_TANYA EQU $490
-EVENT_BEAT_PICNICKER_TIFFANY_3 EQU $491
+EVENT_BEAT_PICNICKER_TIFFANY EQU $491
EVENT_BEAT_GUITARIST_CLYDE EQU $493
EVENT_BEAT_GUITARIST_VINCENT EQU $494
-EVENT_BEAT_JUGGLER_IRWIN_1 EQU $495
+EVENT_BEAT_JUGGLER_IRWIN EQU $495
EVENT_BEAT_JUGGLER_FRITZ EQU $496
EVENT_BEAT_JUGGLER_HORTON EQU $497
EVENT_BEAT_GENTLEMAN_PRESTON EQU $49a
@@ -365,8 +365,9 @@
EVENT_BEAT_BLACKBELT_YOSHI EQU $4a5
EVENT_BEAT_BLACKBELT_LAO EQU $4a7
EVENT_BEAT_BLACKBELT_NOB EQU $4a8
+EVENT_BEAT_BLACKBELT_KIYO EQU $4a9
EVENT_BEAT_BLACKBELT_LUNG EQU $4aa
-EVENT_BEAT_BLACKBELT_KENJI_3 EQU $4ab
+EVENT_BEAT_BLACKBELT_KENJI EQU $4ab
EVENT_BEAT_BLACKBELT_WAI EQU $4ac
EVENT_BEAT_BEAUTY_VICTORIA EQU $4ad
EVENT_BEAT_BEAUTY_SAMANTHA EQU $4ae
@@ -449,7 +450,7 @@
EVENT_BEAT_LASS_BRIDGET EQU $516
EVENT_BEAT_LASS_ALICE EQU $517
EVENT_BEAT_LASS_KRISE EQU $518
-EVENT_BEAT_LASS_CONNIE_1 EQU $519
+EVENT_BEAT_LASS_CONNIE EQU $519
EVENT_BEAT_LASS_LINDA EQU $51a
EVENT_BEAT_LASS_LAURA EQU $51b
EVENT_BEAT_LASS_SHANNON EQU $51c
@@ -459,11 +460,11 @@
EVENT_BEAT_HIKER_RUSSELL EQU $525
EVENT_BEAT_HIKER_PHILLIP EQU $526
EVENT_BEAT_HIKER_LEONARD EQU $527
-EVENT_BEAT_HIKER_ANTHONY_2 EQU $528
+EVENT_BEAT_HIKER_ANTHONY EQU $528
EVENT_BEAT_HIKER_BENJAMIN EQU $529
EVENT_BEAT_HIKER_ERIK EQU $52a
EVENT_BEAT_HIKER_MICHAEL EQU $52b
-EVENT_BEAT_HIKER_PARRY_3 EQU $52c
+EVENT_BEAT_HIKER_PARRY EQU $52c
EVENT_BEAT_HIKER_TIMOTHY EQU $52d
EVENT_BEAT_HIKER_BAILEY EQU $52e
EVENT_BEAT_HIKER_TIM EQU $530
@@ -475,13 +476,15 @@
EVENT_BEAT_BUG_CATCHER_DON EQU $538
EVENT_BEAT_BUG_CATCHER_ROB EQU $539
EVENT_BEAT_BUG_CATCHER_ED EQU $53a
-EVENT_BEAT_BUG_CATCHER_WADE_1 EQU $53b
+EVENT_BEAT_BUG_CATCHER_WADE EQU $53b
EVENT_BEAT_BUG_CATCHER_BENNY EQU $53c
EVENT_BEAT_BUG_CATCHER_AL EQU $53d
EVENT_BEAT_BUG_CATCHER_JOSH EQU $53e
-EVENT_BEAT_BUG_CATCHER_ARNIE_1 EQU $53f
+EVENT_BEAT_BUG_CATCHER_ARNIE EQU $53f
EVENT_BEAT_BUG_CATCHER_KEN EQU $540
EVENT_BEAT_BUG_CATCHER_DOUG EQU $543
+EVENT_BEAT_OFFICER_KEITH EQU $546
+EVENT_BEAT_OFFICER_DIRK EQU $547
EVENT_BEAT_COOLTRAINERM_NICK EQU $548
EVENT_BEAT_COOLTRAINERM_AARON EQU $549
EVENT_BEAT_COOLTRAINERM_PAUL EQU $54a
@@ -489,10 +492,11 @@
EVENT_BEAT_COOLTRAINERM_MIKE EQU $54c
EVENT_BEAT_COOLTRAINERM_RYAN EQU $54f
EVENT_BEAT_COOLTRAINERM_JAKE EQU $550
-EVENT_BEAT_COOLTRAINERM_GAVEN_3 EQU $551
+EVENT_BEAT_COOLTRAINERM_GAVEN EQU $551
EVENT_BEAT_COOLTRAINERM_BLAKE EQU $552
EVENT_BEAT_COOLTRAINERM_BRIAN EQU $553
EVENT_BEAT_COOLTRAINERM_SEAN EQU $557
+EVENT_BEAT_COOLTRAINERM_KEVIN EQU $558
EVENT_BEAT_COOLTRAINERM_ALLEN EQU $55a
EVENT_BEAT_COOLTRAINERF_GWEN EQU $55b
EVENT_BEAT_COOLTRAINERF_LOIS EQU $55c
@@ -502,8 +506,8 @@
EVENT_BEAT_COOLTRAINERF_IRENE EQU $560
EVENT_BEAT_COOLTRAINERF_KELLY EQU $561
EVENT_BEAT_COOLTRAINERF_JOYCE EQU $562
-EVENT_BEAT_COOLTRAINERF_BETH_1 EQU $563
-EVENT_BEAT_COOLTRAINERF_REENA_1 EQU $564
+EVENT_BEAT_COOLTRAINERF_BETH EQU $563
+EVENT_BEAT_COOLTRAINERF_REENA EQU $564
EVENT_BEAT_COOLTRAINERF_MEGAN EQU $565
EVENT_BEAT_COOLTRAINERF_CAROL EQU $567
EVENT_BEAT_COOLTRAINERF_QUINN EQU $568
@@ -510,10 +514,14 @@
EVENT_BEAT_COOLTRAINERF_EMMA EQU $569
EVENT_BEAT_COOLTRAINERF_CYBIL EQU $56a
EVENT_BEAT_COOLTRAINERF_JENN EQU $56b
-EVENT_BEAT_ROCKET_EXECUTIVEF EQU $56f
-EVENT_BEAT_ROCKET_EXECUTIVEM EQU $572
+EVENT_BEAT_ROCKET_EXECUTIVEF_1 EQU $56f
+EVENT_BEAT_ROCKET_EXECUTIVEF_2 EQU $570
+EVENT_BEAT_ROCKET_EXECUTIVEM_1 EQU $571
+EVENT_BEAT_ROCKET_EXECUTIVEM_2 EQU $572
+EVENT_BEAT_ROCKET_EXECUTIVEM_3 EQU $573
+EVENT_BEAT_ROCKET_EXECUTIVEM_4 EQU $574
EVENT_BEAT_SAILOR_EUGENE EQU $575
-EVENT_BEAT_SAILOR_HUEY_1 EQU $576
+EVENT_BEAT_SAILOR_HUEY EQU $576
EVENT_BEAT_SAILOR_TERRELL EQU $577
EVENT_BEAT_SAILOR_KENT EQU $578
EVENT_BEAT_SAILOR_ERNEST EQU $579
@@ -520,7 +528,9 @@
EVENT_BEAT_SAILOR_JEFF EQU $57a
EVENT_BEAT_SAILOR_GARRETT EQU $57b
EVENT_BEAT_SAILOR_KENNETH EQU $57c
+EVENT_BEAT_SAILOR_STANLY EQU $57d
EVENT_BEAT_SAILOR_HARRY EQU $57e
+EVENT_BEAT_SUPER_NERD_STAN EQU $581
EVENT_BEAT_SUPER_NERD_ERIC EQU $582
EVENT_BEAT_SUPER_NERD_SAM EQU $586
EVENT_BEAT_SUPER_NERD_TOM EQU $587
@@ -546,7 +556,7 @@
EVENT_BEAT_SWIMMERM_CAMERON EQU $5a4
EVENT_BEAT_SWIMMERM_SETH EQU $5a5
EVENT_BEAT_SWIMMERM_PARKER EQU $5a8
-EVENT_BEAT_YOUNGSTER_JOEY_1 EQU $5a9
+EVENT_BEAT_YOUNGSTER_JOEY EQU $5a9
EVENT_BEAT_YOUNGSTER_MIKEY EQU $5aa
EVENT_BEAT_YOUNGSTER_ALBERT EQU $5ab
EVENT_BEAT_YOUNGSTER_GORDON EQU $5ac
@@ -559,6 +569,9 @@
EVENT_BEAT_TEACHER_COLETTE EQU $5b5
EVENT_BEAT_TEACHER_HILLARY EQU $5b6
EVENT_BEAT_TEACHER_SHIRLEY EQU $5b7
+EVENT_BEAT_ELITE_4_WILL EQU $5b8
+EVENT_BEAT_ELITE_4_KOGA EQU $5b9
+EVENT_BEAT_ELITE_4_BRUNO EQU $5ba
EVENT_BEAT_ELITE_4_KAREN EQU $5bb
EVENT_BEAT_CHAMPION_LANCE EQU $5bc
EVENT_BEAT_COOLTRAINERM_DARIN EQU $5bd
@@ -566,7 +579,9 @@
EVENT_BEAT_TWINS_LEA_AND_PIA EQU $5bf
EVENT_BEAT_BUG_CATCHER_WAYNE EQU $5c0
EVENT_BEAT_BEAUTY_OLIVIA EQU $5c1
-EVENT_BEAT_POKEMANIAC_MILER EQU $5c4
+EVENT_BEAT_POKEFANF_JAIME EQU $5c2
+EVENT_BEAT_CAMPER_QUENTIN EQU $5c3
+EVENT_BEAT_POKEMANIAC_MILLER EQU $5c4
EVENT_BEAT_SUPER_NERD_HUGH EQU $5c5
EVENT_BEAT_SUPER_NERD_MARKUS EQU $5c6
EVENT_BEAT_POKEFANM_REX EQU $5c7
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -62,7 +62,7 @@
TrainerTwinsAmyandmay1:
; bit/flag number
- dw $464
+ dw EVENT_BEAT_TWINS_AMY_AND_MAY
; trainer group && trainer id
db TWINS, AMYANDMAY1
@@ -89,7 +89,7 @@
TrainerTwinsAmyandmay2:
; bit/flag number
- dw $464
+ dw EVENT_BEAT_TWINS_AMY_AND_MAY
; trainer group && trainer id
db TWINS, AMYANDMAY2
@@ -116,7 +116,7 @@
TrainerBug_catcherBug_catcher_benny:
; bit/flag number
- dw $53c
+ dw EVENT_BEAT_BUG_CATCHER_BENNY
; trainer group && trainer id
db BUG_CATCHER, BUG_CATCHER_BENNY
@@ -143,7 +143,7 @@
TrainerBug_catcherAl:
; bit/flag number
- dw $53d
+ dw EVENT_BEAT_BUG_CATCHER_AL
; trainer group && trainer id
db BUG_CATCHER, AL
@@ -170,7 +170,7 @@
TrainerBug_catcherJosh:
; bit/flag number
- dw $53e
+ dw EVENT_BEAT_BUG_CATCHER_JOSH
; trainer group && trainer id
db BUG_CATCHER, JOSH
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -88,7 +88,7 @@
TrainerCooltrainermPaul:
; bit/flag number
- dw $54a
+ dw EVENT_BEAT_COOLTRAINERM_PAUL
; trainer group && trainer id
db COOLTRAINERM, PAUL
@@ -115,7 +115,7 @@
TrainerCooltrainermMike:
; bit/flag number
- dw $54c
+ dw EVENT_BEAT_COOLTRAINERM_MIKE
; trainer group && trainer id
db COOLTRAINERM, MIKE
@@ -142,7 +142,7 @@
TrainerCooltrainerfLola:
; bit/flag number
- dw $55e
+ dw EVENT_BEAT_COOLTRAINERF_LOLA
; trainer group && trainer id
db COOLTRAINERF, LOLA
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -60,7 +60,7 @@
TrainerCooltrainermCody:
; bit/flag number
- dw $54b
+ dw EVENT_BEAT_COOLTRAINERM_CODY
; trainer group && trainer id
db COOLTRAINERM, CODY
@@ -87,7 +87,7 @@
TrainerCooltrainerfFran:
; bit/flag number
- dw $55d
+ dw EVENT_BEAT_COOLTRAINERF_FRAN
; trainer group && trainer id
db COOLTRAINERF, FRAN
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -1,4 +1,4 @@
-BrunosRoom_MapScriptHeader: ; 0x180986
+BrunosRoom_MapScriptHeader:
; trigger count
db 2
@@ -12,30 +12,26 @@
; callbacks
dbw 1, UnknownScript_0x180998
-; 0x180993
-UnknownScript_0x180993: ; 0x180993
+UnknownScript_0x180993:
priorityjump UnknownScript_0x1809ad
end
-; 0x180997
-UnknownScript_0x180997: ; 0x180997
+UnknownScript_0x180997:
end
-; 0x180998
-UnknownScript_0x180998: ; 0x180998
+UnknownScript_0x180998:
checkevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
iffalse UnknownScript_0x1809a2
changeblock $4, $e, $2a
-UnknownScript_0x1809a2: ; 0x1809a2
+UnknownScript_0x1809a2:
checkevent EVENT_BRUNOS_ROOM_EXIT_OPEN
iffalse UnknownScript_0x1809ac
changeblock $4, $2, $16
-UnknownScript_0x1809ac: ; 0x1809ac
+UnknownScript_0x1809ac:
return
-; 0x1809ad
-UnknownScript_0x1809ad: ; 0x1809ad
+UnknownScript_0x1809ad:
applymovement $0, MovementData_0x1809f9
refreshscreen $86
playsound SFX_STRENGTH
@@ -47,12 +43,11 @@
setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
waitbutton
end
-; 0x1809c5
-BrunoScript_0x1809c5: ; 0x1809c5
+BrunoScript_0x1809c5:
faceplayer
loadfont
- checkevent $05ba
+ checkevent EVENT_BEAT_ELITE_4_BRUNO
iftrue UnknownScript_0x1809f3
writetext UnknownText_0x1809fe
closetext
@@ -61,7 +56,7 @@
loadtrainer BRUNO, 1
startbattle
returnafterbattle
- setevent $05ba
+ setevent EVENT_BEAT_ELITE_4_BRUNO
loadfont
writetext UnknownText_0x180b3c
closetext
@@ -73,24 +68,21 @@
setevent EVENT_BRUNOS_ROOM_EXIT_OPEN
waitbutton
end
-; 0x1809f3
-UnknownScript_0x1809f3: ; 0x1809f3
+UnknownScript_0x1809f3:
writetext UnknownText_0x180b3c
closetext
loadmovesprites
end
-; 0x1809f9
-MovementData_0x1809f9: ; 0x1809f9
+MovementData_0x1809f9:
step_up
step_up
step_up
step_up
step_end
-; 0x1809fe
-UnknownText_0x1809fe: ; 0x1809fe
+UnknownText_0x1809fe:
text "I am BRUNO of the"
line "ELITE FOUR."
@@ -119,15 +111,13 @@
para "Hoo hah!"
done
-; 0x180b23
-UnknownText_0x180b23: ; 0x180b23
+UnknownText_0x180b23:
text "Why? How could we"
line "lose?"
done
-; 0x180b3c
-UnknownText_0x180b3c: ; 0x180b3c
+UnknownText_0x180b3c:
text "Having lost, I"
line "have no right to"
cont "say anything…"
@@ -135,9 +125,8 @@
para "Go face your next"
line "challenge!"
done
-; 0x180b88
-BrunosRoom_MapEventHeader: ; 0x180b88
+BrunosRoom_MapEventHeader:
; filler
db 0, 0
@@ -157,4 +146,3 @@
; people-events
db 1
person_event SPRITE_BRUNO, 11, 9, $6, $0, 255, 255, $b0, 0, BrunoScript_0x1809c5, $ffff
-; 0x180baf
--- a/maps/CeladonGym.asm
+++ b/maps/CeladonGym.asm
@@ -43,7 +43,7 @@
TrainerLassMichelle:
; bit/flag number
- dw $51d
+ dw EVENT_BEAT_LASS_MICHELLE
; trainer group && trainer id
db LASS, MICHELLE
@@ -70,7 +70,7 @@
TrainerPicnickerTanya:
; bit/flag number
- dw $490
+ dw EVENT_BEAT_PICNICKER_TANYA
; trainer group && trainer id
db PICNICKER, TANYA
@@ -97,7 +97,7 @@
TrainerBeautyJulia:
; bit/flag number
- dw $4ba
+ dw EVENT_BEAT_BEAUTY_JULIA
; trainer group && trainer id
db BEAUTY, JULIA
@@ -124,7 +124,7 @@
TrainerTwinsJoandzoe1:
; bit/flag number
- dw $468
+ dw EVENT_BEAT_TWINS_JO_AND_ZOE
; trainer group && trainer id
db TWINS, JOANDZOE1
@@ -151,7 +151,7 @@
TrainerTwinsJoandzoe2:
; bit/flag number
- dw $468
+ dw EVENT_BEAT_TWINS_JO_AND_ZOE
; trainer group && trainer id
db TWINS, JOANDZOE2
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -81,7 +81,7 @@
TrainerSwimmerfDiana:
; bit/flag number
- dw $3f9
+ dw EVENT_BEAT_SWIMMERF_DIANA
; trainer group && trainer id
db SWIMMERF, DIANA
@@ -108,7 +108,7 @@
TrainerSwimmerfBriana:
; bit/flag number
- dw $3fa
+ dw EVENT_BEAT_SWIMMERF_BRIANA
; trainer group && trainer id
db SWIMMERF, BRIANA
@@ -135,7 +135,7 @@
TrainerSwimmermParker:
; bit/flag number
- dw $5a8
+ dw EVENT_BEAT_SWIMMERM_PARKER
; trainer group && trainer id
db SWIMMERM, PARKER
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -77,7 +77,7 @@
TrainerBlackbeltYoshi:
; bit/flag number
- dw $4a5
+ dw EVENT_BEAT_BLACKBELT_YOSHI
; trainer group && trainer id
db BLACKBELT_T, YOSHI
@@ -104,7 +104,7 @@
TrainerBlackbeltLao:
; bit/flag number
- dw $4a7
+ dw EVENT_BEAT_BLACKBELT_LAO
; trainer group && trainer id
db BLACKBELT_T, LAO
@@ -131,7 +131,7 @@
TrainerBlackbeltNob:
; bit/flag number
- dw $4a8
+ dw EVENT_BEAT_BLACKBELT_NOB
; trainer group && trainer id
db BLACKBELT_T, NOB
@@ -158,7 +158,7 @@
TrainerBlackbeltLung:
; bit/flag number
- dw $4aa
+ dw EVENT_BEAT_BLACKBELT_LUNG
; trainer group && trainer id
db BLACKBELT_T, LUNG
--- a/maps/DanceTheatre.asm
+++ b/maps/DanceTheatre.asm
@@ -1,14 +1,13 @@
-DanceTheatre_MapScriptHeader: ; 0x99460
+DanceTheatre_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x99462
-TrainerKimono_girlNaoko2: ; 0x99462
+TrainerKimono_girlNaoko2:
; bit/flag number
- dw $4df
+ dw EVENT_BEAT_KIMONO_GIRL_NAOKO
; trainer group && trainer id
db KIMONO_GIRL, NAOKO2
@@ -24,9 +23,8 @@
; script when talk again
dw Kimono_girlNaoko2Script
-; 0x9946e
-Kimono_girlNaoko2Script: ; 0x9946e
+Kimono_girlNaoko2Script:
talkaftercancel
loadfont
writetext UnknownText_0x99579
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x99476
-TrainerKimono_girlSayo: ; 0x99476
+TrainerKimono_girlSayo:
; bit/flag number
- dw $4e0
+ dw EVENT_BEAT_KIMONO_GIRL_SAYO
; trainer group && trainer id
db KIMONO_GIRL, SAYO
@@ -53,9 +50,8 @@
; script when talk again
dw Kimono_girlSayoScript
-; 0x99482
-Kimono_girlSayoScript: ; 0x99482
+Kimono_girlSayoScript:
talkaftercancel
loadfont
writetext UnknownText_0x9960b
@@ -62,11 +58,10 @@
closetext
loadmovesprites
end
-; 0x9948a
-TrainerKimono_girlZuki: ; 0x9948a
+TrainerKimono_girlZuki:
; bit/flag number
- dw $4e1
+ dw EVENT_BEAT_KIMONO_GIRL_ZUKI
; trainer group && trainer id
db KIMONO_GIRL, ZUKI
@@ -82,9 +77,8 @@
; script when talk again
dw Kimono_girlZukiScript
-; 0x99496
-Kimono_girlZukiScript: ; 0x99496
+Kimono_girlZukiScript:
talkaftercancel
loadfont
writetext UnknownText_0x99688
@@ -91,11 +85,10 @@
closetext
loadmovesprites
end
-; 0x9949e
-TrainerKimono_girlKuni: ; 0x9949e
+TrainerKimono_girlKuni:
; bit/flag number
- dw $4e2
+ dw EVENT_BEAT_KIMONO_GIRL_KUNI
; trainer group && trainer id
db KIMONO_GIRL, KUNI
@@ -111,9 +104,8 @@
; script when talk again
dw Kimono_girlKuniScript
-; 0x994aa
-Kimono_girlKuniScript: ; 0x994aa
+Kimono_girlKuniScript:
talkaftercancel
loadfont
writetext UnknownText_0x99714
@@ -120,11 +112,10 @@
closetext
loadmovesprites
end
-; 0x994b2
-TrainerKimono_girlMiki: ; 0x994b2
+TrainerKimono_girlMiki:
; bit/flag number
- dw $4e3
+ dw EVENT_BEAT_KIMONO_GIRL_MIKI
; trainer group && trainer id
db KIMONO_GIRL, MIKI
@@ -140,9 +131,8 @@
; script when talk again
dw Kimono_girlMikiScript
-; 0x994be
-Kimono_girlMikiScript: ; 0x994be
+Kimono_girlMikiScript:
talkaftercancel
loadfont
writetext UnknownText_0x997a8
@@ -149,9 +139,8 @@
closetext
loadmovesprites
end
-; 0x994c6
-GentlemanScript_0x994c6: ; 0x994c6
+GentlemanScript_0x994c6:
faceplayer
loadfont
writetext UnknownText_0x9980a
@@ -169,9 +158,8 @@
checkevent EVENT_BEAT_KIMONO_GIRL_MIKI
iffalse UnknownScript_0x994f3
jump UnknownScript_0x99505
-; 0x994f3
-UnknownScript_0x994f3: ; 0x994f3
+UnknownScript_0x994f3:
checkflag $0063
iftrue UnknownScript_0x994ff
writetext UnknownText_0x99891
@@ -178,16 +166,14 @@
closetext
loadmovesprites
end
-; 0x994ff
-UnknownScript_0x994ff: ; 0x994ff
+UnknownScript_0x994ff:
writetext UnknownText_0x998d4
closetext
loadmovesprites
end
-; 0x99505
-UnknownScript_0x99505: ; 0x99505
+UnknownScript_0x99505:
writetext UnknownText_0x9991a
keeptextopen
verbosegiveitem HM_SURF, 1
@@ -196,16 +182,14 @@
closetext
loadmovesprites
end
-; 0x99515
-UnknownScript_0x99515: ; 0x99515
+UnknownScript_0x99515:
writetext UnknownText_0x999d5
closetext
loadmovesprites
end
-; 0x9951b
-RhydonScript_0x9951b: ; 0x9951b
+RhydonScript_0x9951b:
loadfont
writetext UnknownText_0x99a0a
cry RHYDON
@@ -212,41 +196,34 @@
closetext
loadmovesprites
end
-; 0x99525
-CooltrainerMScript_0x99525: ; 0x99525
+CooltrainerMScript_0x99525:
jumptextfaceplayer UnknownText_0x99a24
-; 0x99528
-GrannyScript_0x99528: ; 0x99528
+GrannyScript_0x99528:
jumptextfaceplayer UnknownText_0x99aaa
-; 0x9952b
-MapDanceTheatreSignpost1Script: ; 0x9952b
+MapDanceTheatreSignpost1Script:
jumptext UnknownText_0x99b79
-; 0x9952e
-Kimono_girlNaoko2SeenText: ; 0x9952e
+Kimono_girlNaoko2SeenText:
text "You have lovely"
line "#MON. May I see"
cont "them in battle?"
done
-; 0x9955f
-Kimono_girlNaoko2BeatenText: ; 0x9955f
+Kimono_girlNaoko2BeatenText:
text "Oh, you are very"
line "strong."
done
-; 0x99579
-UnknownText_0x99579: ; 0x99579
+UnknownText_0x99579:
text "I enjoyed that"
line "bout. I would like"
cont "to see you again."
done
-; 0x995ae
-Kimono_girlSayoSeenText: ; 0x995ae
+Kimono_girlSayoSeenText:
text "I always dance"
line "with my #MON."
@@ -253,15 +230,13 @@
para "Of course, I also"
line "train them."
done
-; 0x995ea
-Kimono_girlSayoBeatenText: ; 0x995ea
+Kimono_girlSayoBeatenText:
text "Oh, so close!"
line "I almost had you."
done
-; 0x9960b
-UnknownText_0x9960b: ; 0x9960b
+UnknownText_0x9960b:
text "Rhythm is impor-"
line "tant for both"
@@ -268,9 +243,8 @@
para "dancing and #-"
line "MON."
done
-; 0x9963f
-Kimono_girlZukiSeenText: ; 0x9963f
+Kimono_girlZukiSeenText:
text "Isn't my barrette"
line "pretty?"
@@ -277,35 +251,30 @@
para "Oh. A #MON"
line "battle?"
done
-; 0x9966c
-Kimono_girlZukiBeatenText: ; 0x9966c
+Kimono_girlZukiBeatenText:
text "I don't have any"
line "#MON left…"
done
-; 0x99688
-UnknownText_0x99688: ; 0x99688
+UnknownText_0x99688:
text "I put a different"
line "flower in my bar-"
cont "rette every month."
done
-; 0x996c0
-Kimono_girlKuniSeenText: ; 0x996c0
+Kimono_girlKuniSeenText:
text "Oh, you're a cute"
line "trainer. Would you"
cont "like to battle?"
done
-; 0x996f5
-Kimono_girlKuniBeatenText: ; 0x996f5
+Kimono_girlKuniBeatenText:
text "You're stronger"
line "than you look."
done
-; 0x99714
-UnknownText_0x99714: ; 0x99714
+UnknownText_0x99714:
text "I trained a lot,"
line "so I thought I was"
@@ -312,22 +281,19 @@
para "a capable trainer."
line "I guess I'm not."
done
-; 0x9975c
-Kimono_girlMikiSeenText: ; 0x9975c
+Kimono_girlMikiSeenText:
text "Do you like my"
line "dancing? I'm good"
cont "at #MON too."
done
-; 0x9978a
-Kimono_girlMikiBeatenText: ; 0x9978a
+Kimono_girlMikiBeatenText:
text "Ooh, you're good"
line "at #MON too."
done
-; 0x997a8
-UnknownText_0x997a8: ; 0x997a8
+UnknownText_0x997a8:
text "I can keep dancing"
line "because there are"
@@ -337,9 +303,8 @@
para "My #MON keep my"
line "spirits up too."
done
-; 0x9980a
-UnknownText_0x9980a: ; 0x9980a
+UnknownText_0x9980a:
text "Not only are the"
line "KIMONO GIRLS great"
@@ -353,9 +318,8 @@
para "never even left a"
line "scratch…"
done
-; 0x99891
-UnknownText_0x99891: ; 0x99891
+UnknownText_0x99891:
text "Lad! If you can"
line "defeat all the"
@@ -362,9 +326,8 @@
para "KIMONO GIRLS, I'll"
line "give you a gift."
done
-; 0x998d4
-UnknownText_0x998d4: ; 0x998d4
+UnknownText_0x998d4:
text "Lassie, if you can"
line "defeat all the"
@@ -371,9 +334,8 @@
para "KIMONO GIRLS, I'll"
line "give you a gift."
done
-; 0x9991a
-UnknownText_0x9991a: ; 0x9991a
+UnknownText_0x9991a:
text "The way you bat-"
line "tled, it was like"
cont "watching a dance."
@@ -385,9 +347,8 @@
line "this. Don't worry"
cont "--take it!"
done
-; 0x9999b
-UnknownText_0x9999b: ; 0x9999b
+UnknownText_0x9999b:
text "That's SURF."
para "It's a move that"
@@ -394,22 +355,19 @@
line "lets #MON swim"
cont "across water."
done
-; 0x999d5
-UnknownText_0x999d5: ; 0x999d5
+UnknownText_0x999d5:
text "I wish my #MON"
line "were as elegant as"
cont "the KIMONO GIRLS…"
done
-; 0x99a0a
-UnknownText_0x99a0a: ; 0x99a0a
+UnknownText_0x99a0a:
text "RHYDON: Gugooh"
line "gugogooh!"
done
-; 0x99a24
-UnknownText_0x99a24: ; 0x99a24
+UnknownText_0x99a24:
text "That man's always"
line "with his RHYDON."
@@ -422,9 +380,8 @@
cont "nized swimming"
cont "#MON?"
done
-; 0x99aaa
-UnknownText_0x99aaa: ; 0x99aaa
+UnknownText_0x99aaa:
text "The KIMONO GIRLS"
line "are so beautiful…"
@@ -442,16 +399,14 @@
line "something, any-"
cont "thing is possible."
done
-; 0x99b79
-UnknownText_0x99b79: ; 0x99b79
+UnknownText_0x99b79:
text "It's a fancy panel"
line "that's decorated"
cont "with flowers."
done
-; 0x99baa
-DanceTheatre_MapEventHeader: ; 0x99baa
+DanceTheatre_MapEventHeader:
; filler
db 0, 0
@@ -479,4 +434,3 @@
person_event SPRITE_RHYDON, 12, 10, $16, $0, 255, 255, $90, 0, RhydonScript_0x9951b, $ffff
person_event SPRITE_COOLTRAINER_M, 14, 14, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x99525, $ffff
person_event SPRITE_GRANNY, 10, 7, $7, $0, 255, 255, $0, 0, GrannyScript_0x99528, $ffff
-; 0x99c39
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -1,4 +1,4 @@
-DragonsDenB1F_MapScriptHeader: ; 0x18c890
+DragonsDenB1F_MapScriptHeader:
; trigger count
db 2
@@ -12,37 +12,31 @@
; callbacks
dbw 5, UnknownScript_0x18c89f
-; 0x18c89d
-UnknownScript_0x18c89d: ; 0x18c89d
+UnknownScript_0x18c89d:
end
-; 0x18c89e
-UnknownScript_0x18c89e: ; 0x18c89e
+UnknownScript_0x18c89e:
end
-; 0x18c89f
-UnknownScript_0x18c89f: ; 0x18c89f
+UnknownScript_0x18c89f:
checkevent EVENT_BEAT_RIVAL_IN_MT_MOON
iftrue UnknownScript_0x18c8a8
disappear $4
return
-; 0x18c8a8
-UnknownScript_0x18c8a8: ; 0x18c8a8
+UnknownScript_0x18c8a8:
checkcode VAR_WEEKDAY
if_equal TUESDAY, UnknownScript_0x18c8b5
if_equal THURSDAY, UnknownScript_0x18c8b5
disappear $4
return
-; 0x18c8b5
-UnknownScript_0x18c8b5: ; 0x18c8b5
+UnknownScript_0x18c8b5:
appear $4
return
-; 0x18c8b8
-UnknownScript_0x18c8b8: ; 0x18c8b8
+UnknownScript_0x18c8b8:
appear $3
loadfont
writetext UnknownText_0x18c9b8
@@ -69,13 +63,12 @@
closetext
loadmovesprites
jump UnknownScript_0x18c8f9
-; 0x18c8f4
-UnknownScript_0x18c8f4: ; 0x18c8f4
+UnknownScript_0x18c8f4:
writetext UnknownText_0x18ca8b
closetext
loadmovesprites
-UnknownScript_0x18c8f9: ; 0x18c8f9
+UnknownScript_0x18c8f9:
applymovement $3, MovementData_0x18c9b3
special Functionc48f
pause 30
@@ -83,11 +76,10 @@
disappear $3
dotrigger $0
end
-; 0x18c90a
-TrainerCooltrainermDarin: ; 0x18c90a
+TrainerCooltrainermDarin:
; bit/flag number
- dw $5bd
+ dw EVENT_BEAT_COOLTRAINERM_DARIN
; trainer group && trainer id
db COOLTRAINERM, DARIN
@@ -103,9 +95,8 @@
; script when talk again
dw CooltrainermDarinScript
-; 0x18c916
-CooltrainermDarinScript: ; 0x18c916
+CooltrainermDarinScript:
talkaftercancel
loadfont
writetext UnknownText_0x18cd82
@@ -112,11 +103,10 @@
closetext
loadmovesprites
end
-; 0x18c91e
-TrainerCooltrainerfCara: ; 0x18c91e
+TrainerCooltrainerfCara:
; bit/flag number
- dw $5be
+ dw EVENT_BEAT_COOLTRAINERF_CARA
; trainer group && trainer id
db COOLTRAINERF, CARA
@@ -132,9 +122,8 @@
; script when talk again
dw CooltrainerfCaraScript
-; 0x18c92a
-CooltrainerfCaraScript: ; 0x18c92a
+CooltrainerfCaraScript:
talkaftercancel
loadfont
writetext UnknownText_0x18ce11
@@ -141,11 +130,10 @@
closetext
loadmovesprites
end
-; 0x18c932
-TrainerTwinsLeaandpia1: ; 0x18c932
+TrainerTwinsLeaandpia1:
; bit/flag number
- dw $5bf
+ dw EVENT_BEAT_TWINS_LEA_AND_PIA
; trainer group && trainer id
db TWINS, LEAANDPIA1
@@ -161,9 +149,8 @@
; script when talk again
dw TwinsLeaandpia1Script
-; 0x18c93e
-TwinsLeaandpia1Script: ; 0x18c93e
+TwinsLeaandpia1Script:
talkaftercancel
loadfont
writetext UnknownText_0x18ced3
@@ -170,11 +157,10 @@
closetext
loadmovesprites
end
-; 0x18c946
-TrainerTwinsLeaandpia2: ; 0x18c946
+TrainerTwinsLeaandpia2:
; bit/flag number
- dw $5bf
+ dw EVENT_BEAT_TWINS_LEA_AND_PIA
; trainer group && trainer id
db TWINS, LEAANDPIA1
@@ -190,9 +176,8 @@
; script when talk again
dw TwinsLeaandpia2Script
-; 0x18c952
-TwinsLeaandpia2Script: ; 0x18c952
+TwinsLeaandpia2Script:
talkaftercancel
loadfont
writetext UnknownText_0x18cf0f
@@ -199,9 +184,8 @@
closetext
loadmovesprites
end
-; 0x18c95a
-PokeBallScript_0x18c95a: ; 0x18c95a
+PokeBallScript_0x18c95a:
giveitem DRAGON_FANG, $1
iffalse UnknownScript_0x18c970
disappear $2
@@ -213,9 +197,8 @@
itemnotify
loadmovesprites
end
-; 0x18c970
-UnknownScript_0x18c970: ; 0x18c970
+UnknownScript_0x18c970:
loadfont
itemtotext DRAGON_FANG, $0
writetext UnknownText_0x18cf41
@@ -224,9 +207,8 @@
closetext
loadmovesprites
end
-; 0x18c97e
-SilverScript_0x18c97e: ; 0x18c97e
+SilverScript_0x18c97e:
playmusic MUSIC_RIVAL_ENCOUNTER
faceplayer
loadfont
@@ -238,65 +220,54 @@
setevent $0000
special RestartMapMusic
end
-; 0x18c995
-UnknownScript_0x18c995: ; 0x18c995
+UnknownScript_0x18c995:
writetext UnknownText_0x18cd2d
closetext
loadmovesprites
special RestartMapMusic
end
-; 0x18c99e
-MapDragonsDenB1FSignpost0Script: ; 0x18c99e
+MapDragonsDenB1FSignpost0Script:
jumptext UnknownText_0x18cc2e
-; 0x18c9a1
-ItemFragment_0x18c9a1: ; 0x18c9a1
+ItemFragment_0x18c9a1:
db CALCIUM, 1
-; 0x18c9a3
-ItemFragment_0x18c9a3: ; 0x18c9a3
+ItemFragment_0x18c9a3:
db MAX_ELIXER, 1
-; 0x18c9a5
-MapDragonsDenB1FSignpostItem1: ; 0x18c9a5
+MapDragonsDenB1FSignpostItem1:
dw $00a0
db REVIVE
-; 0x18c9a8
-MapDragonsDenB1FSignpostItem2: ; 0x18c9a8
+MapDragonsDenB1FSignpostItem2:
dw $00a1
db MAX_POTION
-; 0x18c9ab
-MapDragonsDenB1FSignpostItem3: ; 0x18c9ab
+MapDragonsDenB1FSignpostItem3:
dw $00a2
db MAX_ELIXER
-; 0x18c9ae
-MovementData_0x18c9ae: ; 0x18c9ae
+MovementData_0x18c9ae:
slow_step_right
slow_step_right
slow_step_right
slow_step_right
step_end
-; 0x18c9b3
-MovementData_0x18c9b3: ; 0x18c9b3
+MovementData_0x18c9b3:
slow_step_left
slow_step_left
slow_step_left
slow_step_left
step_end
-; 0x18c9b8
-UnknownText_0x18c9b8: ; 0x18c9b8
+UnknownText_0x18c9b8:
text "Wait!"
done
-; 0x18c9bf
-UnknownText_0x18c9bf: ; 0x18c9bf
+UnknownText_0x18c9bf:
text "CLAIR: I'm sorry"
line "about this."
@@ -303,15 +274,13 @@
para "Here, take this as"
line "my apology."
done
-; 0x18c9fb
-UnknownText_0x18c9fb: ; 0x18c9fb
+UnknownText_0x18c9fb:
text "<PLAYER> received"
line "TM24."
done
-; 0x18ca0d
-UnknownText_0x18ca0d: ; 0x18ca0d
+UnknownText_0x18ca0d:
text "That contains"
line "DRAGONBREATH."
@@ -323,9 +292,8 @@
line "it, you don't have"
cont "to take it."
done
-; 0x18ca8b
-UnknownText_0x18ca8b: ; 0x18ca8b
+UnknownText_0x18ca8b:
text "Oh? You don't have"
line "any room for this."
@@ -335,9 +303,8 @@
para "room, then come"
line "see me there."
done
-; 0x18caf1
-UnknownText_0x18caf1: ; 0x18caf1
+UnknownText_0x18caf1:
text "CLAIR: What's the"
line "matter? Aren't you"
@@ -369,9 +336,8 @@
para "Give it everything"
line "you've got."
done
-; 0x18cc2e
-UnknownText_0x18cc2e: ; 0x18cc2e
+UnknownText_0x18cc2e:
text "DRAGON SHRINE"
para "A shrine honoring"
@@ -380,9 +346,8 @@
para "said to have lived"
line "in DRAGON'S DEN."
done
-; 0x18cc83
-UnknownText_0x18cc83: ; 0x18cc83
+UnknownText_0x18cc83:
text "…"
line "What? <PLAYER>?"
@@ -401,9 +366,8 @@
para "the greatest #-"
line "MON trainer…"
done
-; 0x18cd2d
-UnknownText_0x18cd2d: ; 0x18cd2d
+UnknownText_0x18cd2d:
text "…"
para "Whew…"
@@ -411,20 +375,17 @@
para "Learn to stay out"
line "of my way…"
done
-; 0x18cd53
-CooltrainermDarinSeenText: ; 0x18cd53
+CooltrainermDarinSeenText:
text "You! How dare you"
line "enter uninvited!"
done
-; 0x18cd77
-CooltrainermDarinBeatenText: ; 0x18cd77
+CooltrainermDarinBeatenText:
text "S-strong!"
done
-; 0x18cd82
-UnknownText_0x18cd82: ; 0x18cd82
+UnknownText_0x18cd82:
text "The SHRINE ahead"
line "is home to the"
@@ -434,20 +395,17 @@
para "You're not allowed"
line "to just go in!"
done
-; 0x18cde4
-CooltrainerfCaraSeenText: ; 0x18cde4
+CooltrainerfCaraSeenText:
text "You shouldn't be"
line "in here!"
done
-; 0x18cdfe
-CooltrainerfCaraBeatenText: ; 0x18cdfe
+CooltrainerfCaraBeatenText:
text "Oh yikes, I lost!"
done
-; 0x18ce11
-UnknownText_0x18ce11: ; 0x18ce11
+UnknownText_0x18ce11:
text "Soon I'm going to"
line "get permission"
@@ -463,59 +421,50 @@
para "our MASTER's"
line "approval."
done
-; 0x18ceab
-TwinsLeaandpia1SeenText: ; 0x18ceab
+TwinsLeaandpia1SeenText:
text "It's a stranger we"
line "don't know."
done
-; 0x18cec9
-TwinsLeaandpia1BeatenText: ; 0x18cec9
+TwinsLeaandpia1BeatenText:
text "Ouchies."
done
-; 0x18ced3
-UnknownText_0x18ced3: ; 0x18ced3
+UnknownText_0x18ced3:
text "It was like having"
line "to battle LANCE."
done
-; 0x18cef8
-TwinsLeaandpia2SeenText: ; 0x18cef8
+TwinsLeaandpia2SeenText:
text "Who are you?"
done
-; 0x18cf06
-TwinsLeaandpia2BeatenText: ; 0x18cf06
+TwinsLeaandpia2BeatenText:
text "Meanie."
done
-; 0x18cf0f
-UnknownText_0x18cf0f: ; 0x18cf0f
+UnknownText_0x18cf0f:
text "We'll tell on you."
para "MASTER will be"
line "angry with you."
done
-; 0x18cf41
-UnknownText_0x18cf41: ; 0x18cf41
+UnknownText_0x18cf41:
text "<PLAYER> found"
line "@"
text_from_ram StringBuffer3
text "!"
done
-; 0x18cf51
-UnknownText_0x18cf51: ; 0x18cf51
+UnknownText_0x18cf51:
text "But <PLAYER> can't"
line "carry any more"
cont "items."
done
-; 0x18cf73
-DragonsDenB1F_MapEventHeader: ; 0x18cf73
+DragonsDenB1F_MapEventHeader:
; filler
db 0, 0
@@ -546,4 +495,3 @@
person_event SPRITE_TWIN, 22, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia2, $ffff
person_event SPRITE_POKE_BALL, 8, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a1, $07bf
person_event SPRITE_POKE_BALL, 24, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a3, $07c0
-; 0x18d014
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -92,7 +92,7 @@
TrainerSageJeffrey:
; bit/flag number
- dw $415
+ dw EVENT_BEAT_SAGE_JEFFREY
; trainer group && trainer id
db SAGE, JEFFREY
@@ -119,7 +119,7 @@
TrainerSagePing:
; bit/flag number
- dw $416
+ dw EVENT_BEAT_SAGE_PING
; trainer group && trainer id
db SAGE, PING
@@ -146,7 +146,7 @@
TrainerMediumMartha:
; bit/flag number
- dw $58b
+ dw EVENT_BEAT_MEDIUM_MARTHA
; trainer group && trainer id
db MEDIUM, MARTHA
@@ -173,7 +173,7 @@
TrainerMediumGrace:
; bit/flag number
- dw $58c
+ dw EVENT_BEAT_MEDIUM_GRACE
; trainer group && trainer id
db MEDIUM, GRACE
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -1,4 +1,4 @@
-FastShipB1F_MapScriptHeader: ; 0x76730
+FastShipB1F_MapScriptHeader:
; trigger count
db 2
@@ -8,17 +8,14 @@
; callback count
db 0
-; 0x7673a
-UnknownScript_0x7673a: ; 0x7673a
+UnknownScript_0x7673a:
end
-; 0x7673b
-UnknownScript_0x7673b: ; 0x7673b
+UnknownScript_0x7673b:
end
-; 0x7673c
-UnknownScript_0x7673c: ; 0x7673c
+UnknownScript_0x7673c:
checkevent $072f
iftrue UnknownScript_0x76766
applymovement $3, MovementData_0x76876
@@ -27,9 +24,8 @@
pause 5
disappear $3
end
-; 0x76751
-UnknownScript_0x76751: ; 0x76751
+UnknownScript_0x76751:
checkevent $072e
iftrue UnknownScript_0x76766
applymovement $2, MovementData_0x76871
@@ -38,13 +34,11 @@
pause 5
disappear $2
end
-; 0x76766
-UnknownScript_0x76766: ; 0x76766
+UnknownScript_0x76766:
end
-; 0x76767
-SailorScript_0x76767: ; 0x76767
+SailorScript_0x76767:
faceplayer
loadfont
checkevent $0030
@@ -59,16 +53,14 @@
setevent $0034
clearevent $072d
end
-; 0x76787
-UnknownScript_0x76787: ; 0x76787
+UnknownScript_0x76787:
writetext UnknownText_0x76907
closetext
loadmovesprites
end
-; 0x7678d
-UnknownScript_0x7678d: ; 0x7678d
+UnknownScript_0x7678d:
writetext UnknownText_0x7692e
checkevent $0032
iffalse UnknownScript_0x76799
@@ -75,26 +67,23 @@
closetext
loadmovesprites
end
-; 0x76799
-UnknownScript_0x76799: ; 0x76799
+UnknownScript_0x76799:
keeptextopen
writetext UnknownText_0x7696d
closetext
loadmovesprites
end
-; 0x767a0
-UnknownScript_0x767a0: ; 0x767a0
+UnknownScript_0x767a0:
writetext UnknownText_0x7699d
closetext
loadmovesprites
end
-; 0x767a6
-TrainerSailorJeff: ; 0x767a6
+TrainerSailorJeff:
; bit/flag number
- dw $57a
+ dw EVENT_BEAT_SAILOR_JEFF
; trainer group && trainer id
db SAILOR, JEFF
@@ -110,9 +99,8 @@
; script when talk again
dw SailorJeffScript
-; 0x767b2
-SailorJeffScript: ; 0x767b2
+SailorJeffScript:
talkaftercancel
loadfont
writetext UnknownText_0x76a38
@@ -119,11 +107,10 @@
closetext
loadmovesprites
end
-; 0x767ba
-TrainerPicnickerDebra: ; 0x767ba
+TrainerPicnickerDebra:
; bit/flag number
- dw $485
+ dw EVENT_BEAT_PICNICKER_DEBRA
; trainer group && trainer id
db PICNICKER, DEBRA
@@ -139,9 +126,8 @@
; script when talk again
dw PicnickerDebraScript
-; 0x767c6
-PicnickerDebraScript: ; 0x767c6
+PicnickerDebraScript:
talkaftercancel
loadfont
writetext UnknownText_0x76a99
@@ -148,11 +134,10 @@
closetext
loadmovesprites
end
-; 0x767ce
-TrainerJugglerFritz: ; 0x767ce
+TrainerJugglerFritz:
; bit/flag number
- dw $496
+ dw EVENT_BEAT_JUGGLER_FRITZ
; trainer group && trainer id
db JUGGLER, FRITZ
@@ -168,9 +153,8 @@
; script when talk again
dw JugglerFritzScript
-; 0x767da
-JugglerFritzScript: ; 0x767da
+JugglerFritzScript:
talkaftercancel
loadfont
writetext UnknownText_0x76b02
@@ -177,11 +161,10 @@
closetext
loadmovesprites
end
-; 0x767e2
-TrainerSailorGarrett: ; 0x767e2
+TrainerSailorGarrett:
; bit/flag number
- dw $57b
+ dw EVENT_BEAT_SAILOR_GARRETT
; trainer group && trainer id
db SAILOR, GARRETT
@@ -197,9 +180,8 @@
; script when talk again
dw SailorGarrettScript
-; 0x767ee
-SailorGarrettScript: ; 0x767ee
+SailorGarrettScript:
talkaftercancel
loadfont
writetext UnknownText_0x76b7a
@@ -206,11 +188,10 @@
closetext
loadmovesprites
end
-; 0x767f6
-TrainerFisherJonah: ; 0x767f6
+TrainerFisherJonah:
; bit/flag number
- dw $459
+ dw EVENT_BEAT_FISHER_JONAH
; trainer group && trainer id
db FISHER, JONAH
@@ -226,9 +207,8 @@
; script when talk again
dw FisherJonahScript
-; 0x76802
-FisherJonahScript: ; 0x76802
+FisherJonahScript:
talkaftercancel
loadfont
writetext UnknownText_0x76c22
@@ -235,11 +215,10 @@
closetext
loadmovesprites
end
-; 0x7680a
-TrainerBlackbeltWai: ; 0x7680a
+TrainerBlackbeltWai:
; bit/flag number
- dw $4ac
+ dw EVENT_BEAT_BLACKBELT_WAI
; trainer group && trainer id
db BLACKBELT_T, WAI
@@ -255,9 +234,8 @@
; script when talk again
dw BlackbeltWaiScript
-; 0x76816
-BlackbeltWaiScript: ; 0x76816
+BlackbeltWaiScript:
talkaftercancel
loadfont
writetext UnknownText_0x76c9e
@@ -264,11 +242,10 @@
closetext
loadmovesprites
end
-; 0x7681e
-TrainerSailorKenneth: ; 0x7681e
+TrainerSailorKenneth:
; bit/flag number
- dw $57c
+ dw EVENT_BEAT_SAILOR_KENNETH
; trainer group && trainer id
db SAILOR, KENNETH
@@ -284,9 +261,8 @@
; script when talk again
dw SailorKennethScript
-; 0x7682a
-SailorKennethScript: ; 0x7682a
+SailorKennethScript:
talkaftercancel
loadfont
writetext UnknownText_0x76d5f
@@ -293,11 +269,10 @@
closetext
loadmovesprites
end
-; 0x76832
-TrainerTeacherShirley: ; 0x76832
+TrainerTeacherShirley:
; bit/flag number
- dw $5b7
+ dw EVENT_BEAT_TEACHER_SHIRLEY
; trainer group && trainer id
db TEACHER, SHIRLEY
@@ -313,9 +288,8 @@
; script when talk again
dw TeacherShirleyScript
-; 0x7683e
-TeacherShirleyScript: ; 0x7683e
+TeacherShirleyScript:
talkaftercancel
loadfont
writetext UnknownText_0x76de1
@@ -322,11 +296,10 @@
closetext
loadmovesprites
end
-; 0x76846
-TrainerSchoolboyNate: ; 0x76846
+TrainerSchoolboyNate:
; bit/flag number
- dw $476
+ dw EVENT_BEAT_SCHOOLBOY_NATE
; trainer group && trainer id
db SCHOOLBOY, NATE
@@ -342,9 +315,8 @@
; script when talk again
dw SchoolboyNateScript
-; 0x76852
-SchoolboyNateScript: ; 0x76852
+SchoolboyNateScript:
talkaftercancel
loadfont
writetext UnknownText_0x76e3d
@@ -351,11 +323,10 @@
closetext
loadmovesprites
end
-; 0x7685a
-TrainerSchoolboyRicky: ; 0x7685a
+TrainerSchoolboyRicky:
; bit/flag number
- dw $477
+ dw EVENT_BEAT_SCHOOLBOY_RICKY
; trainer group && trainer id
db SCHOOLBOY, RICKY
@@ -371,9 +342,8 @@
; script when talk again
dw SchoolboyRickyScript
-; 0x76866
-SchoolboyRickyScript: ; 0x76866
+SchoolboyRickyScript:
talkaftercancel
loadfont
writetext UnknownText_0x76eb6
@@ -380,28 +350,25 @@
closetext
loadmovesprites
end
-; 0x7686e
FashShipB1FTrashcan:
jumpstd trashcan
-MovementData_0x76871: ; 0x76871
+MovementData_0x76871:
fix_facing
big_step_right
remove_fixed_facing
turn_head_down
step_end
-; 0x76876
-MovementData_0x76876: ; 0x76876
+MovementData_0x76876:
fix_facing
big_step_left
remove_fixed_facing
turn_head_down
step_end
-; 0x7687b
-UnknownText_0x7687b: ; 0x7687b
+UnknownText_0x7687b:
text "Hey, kid. Could I"
line "get you to look"
cont "for my buddy?"
@@ -414,17 +381,15 @@
line "him, but I'm on"
cont "duty right now."
done
-; 0x76907
-UnknownText_0x76907: ; 0x76907
+UnknownText_0x76907:
text "Oh, gee…"
para "The CAPTAIN will"
line "be furious…"
done
-; 0x7692e
-UnknownText_0x7692e: ; 0x7692e
+UnknownText_0x7692e:
text "Thanks, kid!"
line "I chewed him out"
@@ -431,17 +396,15 @@
para "good so he'll quit"
line "slacking off!"
done
-; 0x7696d
-UnknownText_0x7696d: ; 0x7696d
+UnknownText_0x7696d:
text "A little girl?"
para "I may have seen"
line "her go by here."
done
-; 0x7699d
-UnknownText_0x7699d: ; 0x7699d
+UnknownText_0x7699d:
text "The dining room is"
line "up ahead."
@@ -449,41 +412,35 @@
line "end lead to the"
cont "CAPTAIN's cabin."
done
-; 0x769ed
-SailorJeffSeenText: ; 0x769ed
+SailorJeffSeenText:
text "Nothing beats a"
line "battle when I'm"
cont "on my break."
done
-; 0x76a1a
-SailorJeffBeatenText: ; 0x76a1a
+SailorJeffBeatenText:
text "Win or lose, my"
line "break's over!"
done
-; 0x76a38
-UnknownText_0x76a38: ; 0x76a38
+UnknownText_0x76a38:
text "I guess I can't"
line "win if I don't get"
cont "serious."
done
-; 0x76a63
-PicnickerDebraSeenText: ; 0x76a63
+PicnickerDebraSeenText:
text "I'm so bored."
line "Want to battle?"
done
-; 0x76a81
-PicnickerDebraBeatenText: ; 0x76a81
+PicnickerDebraBeatenText:
text "Yow! You're too"
line "strong!"
done
-; 0x76a99
-UnknownText_0x76a99: ; 0x76a99
+UnknownText_0x76a99:
text "SAFFRON, CELADON…"
line "I hear there are"
@@ -490,21 +447,18 @@
para "many big cities"
line "in KANTO."
done
-; 0x76ad7
-JugglerFritzSeenText: ; 0x76ad7
+JugglerFritzSeenText:
text "Urrf…"
line "I'm seasick!"
done
-; 0x76aea
-JugglerFritzBeatenText: ; 0x76aea
+JugglerFritzBeatenText:
text "I can't move any-"
line "more…"
done
-; 0x76b02
-UnknownText_0x76b02: ; 0x76b02
+UnknownText_0x76b02:
text "No more ships for"
line "me. Next time,"
@@ -511,21 +465,18 @@
para "I'm taking the"
line "MAGNET TRAIN."
done
-; 0x76b40
-SailorGarrettSeenText: ; 0x76b40
+SailorGarrettSeenText:
text "This is where we"
line "sailors work!"
done
-; 0x76b60
-SailorGarrettBeatenText: ; 0x76b60
+SailorGarrettBeatenText:
text "I lost on my home"
line "field…"
done
-; 0x76b7a
-UnknownText_0x76b7a: ; 0x76b7a
+UnknownText_0x76b7a:
text "We get different"
line "passengers from"
@@ -532,9 +483,8 @@
para "VERMILION CITY to"
line "OLIVINE CITY."
done
-; 0x76bbc
-FisherJonahSeenText: ; 0x76bbc
+FisherJonahSeenText:
text "Even though we're"
line "out on the sea, I"
cont "can't fish!"
@@ -542,21 +492,18 @@
para "This is boring!"
line "Let's battle!"
done
-; 0x76c08
-FisherJonahBeatenText: ; 0x76c08
+FisherJonahBeatenText:
text "I… I'm not bored"
line "anymore…"
done
-; 0x76c22
-UnknownText_0x76c22: ; 0x76c22
+UnknownText_0x76c22:
text "I plan to fish off"
line "VERMILION's pier."
done
-; 0x76c47
-BlackbeltWaiSeenText: ; 0x76c47
+BlackbeltWaiSeenText:
text "I'm building up my"
line "legs by bracing"
@@ -563,15 +510,13 @@
para "against the ship's"
line "rocking!"
done
-; 0x76c85
-BlackbeltWaiBeatenText: ; 0x76c85
+BlackbeltWaiBeatenText:
text "Rocked and rolled"
line "over!"
done
-; 0x76c9e
-UnknownText_0x76c9e: ; 0x76c9e
+UnknownText_0x76c9e:
text "I couldn't find"
line "the KARATE KING in"
cont "JOHTO."
@@ -580,9 +525,8 @@
line "be training in a"
cont "cave somewhere."
done
-; 0x76cf9
-SailorKennethSeenText: ; 0x76cf9
+SailorKennethSeenText:
text "I'm a sailor man!"
para "But I'm training"
@@ -589,15 +533,13 @@
line "#MON, so I can"
cont "become the CHAMP!"
done
-; 0x76d3c
-SailorKennethBeatenText: ; 0x76d3c
+SailorKennethBeatenText:
text "My lack of train-"
line "ing is obvious…"
done
-; 0x76d5f
-UnknownText_0x76d5f: ; 0x76d5f
+UnknownText_0x76d5f:
text "Eight BADGES!"
line "They must prove"
@@ -607,64 +549,54 @@
para "No wonder you're"
line "so good!"
done
-; 0x76db6
-TeacherShirleySeenText: ; 0x76db6
+TeacherShirleySeenText:
text "Don't lay a finger"
line "on my students!"
done
-; 0x76dd9
-TeacherShirleyBeatenText: ; 0x76dd9
+TeacherShirleyBeatenText:
text "Aaack!"
done
-; 0x76de1
-UnknownText_0x76de1: ; 0x76de1
+UnknownText_0x76de1:
text "We're on a field"
line "trip to the RUINS"
cont "outside VIOLET."
done
-; 0x76e14
-SchoolboyNateSeenText: ; 0x76e14
+SchoolboyNateSeenText:
text "Do you know the"
line "RUINS OF ALPH?"
done
-; 0x76e34
-SchoolboyNateBeatenText: ; 0x76e34
+SchoolboyNateBeatenText:
text "Yaargh!"
done
-; 0x76e3d
-UnknownText_0x76e3d: ; 0x76e3d
+UnknownText_0x76e3d:
text "Radios pick up"
line "strange signals"
cont "inside the RUINS."
done
-; 0x76e6f
-SchoolboyRickySeenText: ; 0x76e6f
+SchoolboyRickySeenText:
text "There are some odd"
line "stone panels in"
cont "the RUINS OF ALPH."
done
-; 0x76ea6
-SchoolboyRickyBeatenText: ; 0x76ea6
+SchoolboyRickyBeatenText:
text "I was done in!"
done
-; 0x76eb6
-UnknownText_0x76eb6: ; 0x76eb6
+UnknownText_0x76eb6:
text "I read that there"
line "are four of those"
cont "stone panels."
done
-; 0x76ee9
-FastShipB1F_MapEventHeader: ; 0x76ee9
+FastShipB1F_MapEventHeader:
; filler
db 0, 0
@@ -696,4 +628,3 @@
person_event SPRITE_TEACHER, 15, 13, $7, $0, 255, 255, $82, 3, TrainerTeacherShirley, $073b
person_event SPRITE_YOUNGSTER, 13, 18, $3, $0, 255, 255, $92, 1, TrainerSchoolboyNate, $073b
person_event SPRITE_YOUNGSTER, 15, 18, $a, $0, 255, 255, $92, 1, TrainerSchoolboyRicky, $073b
-; 0x76faa
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -1,14 +1,13 @@
-FastShipCabins_NNW_NNE_NE_MapScriptHeader: ; 0x75577
+FastShipCabins_NNW_NNE_NE_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x75579
-TrainerCooltrainermSean: ; 0x75579
+TrainerCooltrainermSean:
; bit/flag number
- dw $557
+ dw EVENT_BEAT_COOLTRAINERM_SEAN
; trainer group && trainer id
db COOLTRAINERM, SEAN
@@ -24,9 +23,8 @@
; script when talk again
dw CooltrainermSeanScript
-; 0x75585
-CooltrainermSeanScript: ; 0x75585
+CooltrainermSeanScript:
talkaftercancel
loadfont
writetext UnknownText_0x7567b
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x7558d
-TrainerCooltrainerfCarol: ; 0x7558d
+TrainerCooltrainerfCarol:
; bit/flag number
- dw $567
+ dw EVENT_BEAT_COOLTRAINERF_CAROL
; trainer group && trainer id
db COOLTRAINERF, CAROL
@@ -53,9 +50,8 @@
; script when talk again
dw CooltrainerfCarolScript
-; 0x75599
-CooltrainerfCarolScript: ; 0x75599
+CooltrainerfCarolScript:
talkaftercancel
loadfont
writetext UnknownText_0x756f7
@@ -62,11 +58,10 @@
closetext
loadmovesprites
end
-; 0x755a1
-TrainerPokemaniacEthan: ; 0x755a1
+TrainerPokemaniacEthan:
; bit/flag number
- dw $4eb
+ dw EVENT_BEAT_POKEMANIAC_ETHAN
; trainer group && trainer id
db POKEMANIAC, ETHAN
@@ -82,9 +77,8 @@
; script when talk again
dw PokemaniacEthanScript
-; 0x755ad
-PokemaniacEthanScript: ; 0x755ad
+PokemaniacEthanScript:
talkaftercancel
loadfont
writetext UnknownText_0x7574b
@@ -91,11 +85,10 @@
closetext
loadmovesprites
end
-; 0x755b5
-TrainerHikerNoland: ; 0x755b5
+TrainerHikerNoland:
; bit/flag number
- dw $531
+ dw EVENT_BEAT_HIKER_NOLAND
; trainer group && trainer id
db HIKER, NOLAND
@@ -111,9 +104,8 @@
; script when talk again
dw HikerNolandScript
-; 0x755c1
-HikerNolandScript: ; 0x755c1
+HikerNolandScript:
talkaftercancel
loadfont
writetext UnknownText_0x757d4
@@ -120,11 +112,10 @@
closetext
loadmovesprites
end
-; 0x755c9
-TrainerGentlemanEdward: ; 0x755c9
+TrainerGentlemanEdward:
; bit/flag number
- dw $49b
+ dw EVENT_BEAT_GENTLEMAN_EDWARD
; trainer group && trainer id
db GENTLEMAN, EDWARD
@@ -140,9 +131,8 @@
; script when talk again
dw GentlemanEdwardScript
-; 0x755d5
-GentlemanEdwardScript: ; 0x755d5
+GentlemanEdwardScript:
talkaftercancel
loadfont
writetext UnknownText_0x75937
@@ -149,11 +139,10 @@
closetext
loadmovesprites
end
-; 0x755dd
-TrainerBurglarCorey: ; 0x755dd
+TrainerBurglarCorey:
; bit/flag number
- dw $42f
+ dw EVENT_BEAT_BURGLAR_COREY
; trainer group && trainer id
db BURGLAR, COREY
@@ -169,9 +158,8 @@
; script when talk again
dw BurglarCoreyScript
-; 0x755e9
-BurglarCoreyScript: ; 0x755e9
+BurglarCoreyScript:
talkaftercancel
loadfont
writetext UnknownText_0x75996
@@ -178,9 +166,8 @@
closetext
loadmovesprites
end
-; 0x755f1
-SailorScript_0x755f1: ; 0x755f1
+SailorScript_0x755f1:
playmusic MUSIC_HIKER_ENCOUNTER
faceplayer
loadfont
@@ -192,7 +179,7 @@
startbattle
reloadmap
special HealParty
- setevent $057d
+ setevent EVENT_BEAT_SAILOR_STANLY
loadfont
writetext UnknownText_0x758b1
closetext
@@ -206,28 +193,25 @@
disappear $6
waitbutton
end
-; 0x75629
-UnknownScript_0x75629: ; 0x75629
+UnknownScript_0x75629:
applymovement $6, MovementData_0x7563c
playsound SFX_EXIT_BUILDING
disappear $6
waitbutton
end
-; 0x75634
FastShipCabins_NNW_NNE_NETrashcan:
jumpstd trashcan
-MovementData_0x75637: ; 0x75637
+MovementData_0x75637:
step_left
step_left
step_up
step_up
step_end
-; 0x7563c
-MovementData_0x7563c: ; 0x7563c
+MovementData_0x7563c:
step_down
step_left
step_left
@@ -235,20 +219,17 @@
step_up
step_up
step_end
-; 0x75643
-CooltrainermSeanSeenText: ; 0x75643
+CooltrainermSeanSeenText:
text "I'm going to KANTO"
line "to test my skills."
done
-; 0x75669
-CooltrainermSeanBeatenText: ; 0x75669
+CooltrainermSeanBeatenText:
text "I wanted to win!"
done
-; 0x7567b
-UnknownText_0x7567b: ; 0x7567b
+UnknownText_0x7567b:
text "Trainers from"
line "JOHTO can battle"
@@ -255,39 +236,33 @@
para "with KANTO GYM"
line "LEADERS."
done
-; 0x756b3
-CooltrainerfCarolSeenText: ; 0x756b3
+CooltrainerfCarolSeenText:
text "I'm training to"
line "become the CHAMP!"
done
-; 0x756d5
-CooltrainerfCarolBeatenText: ; 0x756d5
+CooltrainerfCarolBeatenText:
text "What's so differ-"
line "ent between us?"
done
-; 0x756f7
-UnknownText_0x756f7: ; 0x756f7
+UnknownText_0x756f7:
text "I'm going to beat"
line "you someday!"
done
-; 0x75716
-PokemaniacEthanSeenText: ; 0x75716
+PokemaniacEthanSeenText:
text "Do you know LILY?"
line "She's a hot DJ in"
cont "KANTO."
done
-; 0x75741
-PokemaniacEthanBeatenText: ; 0x75741
+PokemaniacEthanBeatenText:
text "Gyaaaah!"
done
-; 0x7574b
-UnknownText_0x7574b: ; 0x7574b
+UnknownText_0x7574b:
text "LILY's nice, but"
line "MARY's the best!"
@@ -295,21 +270,18 @@
line "out JOHTO's radio"
cont "programs!"
done
-; 0x75797
-HikerNolandSeenText: ; 0x75797
+HikerNolandSeenText:
text "Are you alone?"
line "Then let's battle!"
done
-; 0x757b9
-HikerNolandBeatenText: ; 0x757b9
+HikerNolandBeatenText:
text "That's too much to"
line "handle!"
done
-; 0x757d4
-UnknownText_0x757d4: ; 0x757d4
+UnknownText_0x757d4:
text "I wonder if there"
line "are any mountains"
@@ -316,9 +288,8 @@
para "worth climbing in"
line "KANTO?"
done
-; 0x75812
-UnknownText_0x75812: ; 0x75812
+UnknownText_0x75812:
text "Yeah, I'm a sail-"
line "or, all right."
@@ -332,36 +303,31 @@
para "Ah, forget it!"
line "Let's battle!"
done
-; 0x75897
-UnknownText_0x75897: ; 0x75897
+UnknownText_0x75897:
text "Sorry! It's all my"
line "fault!"
done
-; 0x758b1
-UnknownText_0x758b1: ; 0x758b1
+UnknownText_0x758b1:
text "Being a sailor, I"
line "have to do phys-"
cont "ical labor. It's"
cont "exhausting!"
done
-; 0x758f1
-GentlemanEdwardSeenText: ; 0x758f1
+GentlemanEdwardSeenText:
text "Oh, no. I've lost"
line "something that's"
cont "very important."
done
-; 0x75923
-GentlemanEdwardBeatenText: ; 0x75923
+GentlemanEdwardBeatenText:
text "I… I can't find"
line "it…"
done
-; 0x75937
-UnknownText_0x75937: ; 0x75937
+UnknownText_0x75937:
text "I give up."
line "You don't have to"
@@ -368,21 +334,18 @@
para "look. Just forget"
line "about it!"
done
-; 0x75970
-BurglarCoreySeenText: ; 0x75970
+BurglarCoreySeenText:
text "Yeehaw!"
line "Lucky!"
done
-; 0x75980
-BurglarCoreyBeatenText: ; 0x75980
+BurglarCoreyBeatenText:
text "How unlucky!"
line "I lost!"
done
-; 0x75996
-UnknownText_0x75996: ; 0x75996
+UnknownText_0x75996:
text "I found a pretty"
line "coin here."
@@ -389,9 +352,8 @@
para "Someone must have"
line "lost it…"
done
-; 0x759ce
-FastShipCabins_NNW_NNE_NE_MapEventHeader: ; 0x759ce
+FastShipCabins_NNW_NNE_NE_MapEventHeader:
; filler
db 0, 0
@@ -419,4 +381,3 @@
person_event SPRITE_SAILOR, 30, 8, $3, $0, 255, 255, $90, 0, SailorScript_0x755f1, $072d
person_event SPRITE_GENTLEMAN, 34, 11, $3, $0, 255, 255, $92, 1, TrainerGentlemanEdward, $073a
person_event SPRITE_PHARMACIST, 34, 6, $7, $0, 255, 255, $a2, 4, TrainerBurglarCorey, $073b
-; 0x75a4d
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -1,16 +1,14 @@
-FastShipCabins_SE_SSE_CaptainsCabin_MapScriptHeader: ; 0x75ea4
+FastShipCabins_SE_SSE_CaptainsCabin_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x75ea6
-UnknownScript_0x75ea6: ; 0x75ea6
+UnknownScript_0x75ea6:
end
-; 0x75ea7
-CaptainScript_0x75ea7: ; 0x75ea7
+CaptainScript_0x75ea7:
faceplayer
loadfont
checkevent $0030
@@ -19,16 +17,14 @@
closetext
loadmovesprites
end
-; 0x75eb5
-UnknownScript_0x75eb5: ; 0x75eb5
+UnknownScript_0x75eb5:
writetext UnknownText_0x76064
closetext
loadmovesprites
end
-; 0x75ebb
-TwinScript_0x75ebb: ; 0x75ebb
+TwinScript_0x75ebb:
spriteface $5, RIGHT
loadfont
writetext UnknownText_0x761e0
@@ -59,14 +55,13 @@
closetext
loadmovesprites
jump UnknownScript_0x75f09
-; 0x75f03
-UnknownScript_0x75f03: ; 0x75f03
+UnknownScript_0x75f03:
loadfont
writetext UnknownText_0x762c6
closetext
loadmovesprites
-UnknownScript_0x75f09: ; 0x75f09
+UnknownScript_0x75f09:
spriteface $5, DOWN
applymovement $3, MovementData_0x76010
loadfont
@@ -75,9 +70,8 @@
setevent $072b
domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $0
jump UnknownScript_0x75f37
-; 0x75f1f
-GentlemanScript_0x75f1f: ; 0x75f1f
+GentlemanScript_0x75f1f:
faceplayer
loadfont
checkevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
@@ -89,15 +83,14 @@
loadmovesprites
domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $0
end
-; 0x75f37
-UnknownScript_0x75f37: ; 0x75f37
+UnknownScript_0x75f37:
writetext UnknownText_0x7619b
keeptextopen
verbosegiveitem METAL_COAT, 1
iffalse UnknownScript_0x75f44
setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
-UnknownScript_0x75f44: ; 0x75f44
+UnknownScript_0x75f44:
loadmovesprites
waitbutton
playsound SFX_ELEVATOR_END
@@ -109,27 +102,24 @@
setevent $0032
loadmovesprites
end
-; 0x75f58
-UnknownScript_0x75f58: ; 0x75f58
+UnknownScript_0x75f58:
writetext UnknownText_0x7619b
keeptextopen
verbosegiveitem METAL_COAT, 1
iffalse UnknownScript_0x75f65
setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
-UnknownScript_0x75f65: ; 0x75f65
+UnknownScript_0x75f65:
loadmovesprites
end
-; 0x75f67
-UnknownScript_0x75f67: ; 0x75f67
+UnknownScript_0x75f67:
writetext UnknownText_0x761be
closetext
loadmovesprites
end
-; 0x75f6d
-TwinScript_0x75f6d: ; 0x75f6d
+TwinScript_0x75f6d:
faceplayer
loadfont
writetext UnknownText_0x7630d
@@ -136,11 +126,10 @@
closetext
loadmovesprites
end
-; 0x75f75
-TrainerPokefanmColin: ; 0x75f75
+TrainerPokefanmColin:
; bit/flag number
- dw $4d5
+ dw EVENT_BEAT_POKEFANM_COLIN
; trainer group && trainer id
db POKEFANM, COLIN
@@ -156,9 +145,8 @@
; script when talk again
dw PokefanmColinScript
-; 0x75f81
-PokefanmColinScript: ; 0x75f81
+PokefanmColinScript:
talkaftercancel
loadfont
writetext UnknownText_0x7635b
@@ -165,11 +153,10 @@
closetext
loadmovesprites
end
-; 0x75f89
-TrainerTwinsMegandpeg1: ; 0x75f89
+TrainerTwinsMegandpeg1:
; bit/flag number
- dw $46a
+ dw EVENT_BEAT_TWINS_MEG_AND_PEG
; trainer group && trainer id
db TWINS, MEGANDPEG1
@@ -185,9 +172,8 @@
; script when talk again
dw TwinsMegandpeg1Script
-; 0x75f95
-TwinsMegandpeg1Script: ; 0x75f95
+TwinsMegandpeg1Script:
talkaftercancel
loadfont
writetext UnknownText_0x763c2
@@ -194,11 +180,10 @@
closetext
loadmovesprites
end
-; 0x75f9d
-TrainerTwinsMegandpeg2: ; 0x75f9d
+TrainerTwinsMegandpeg2:
; bit/flag number
- dw $46a
+ dw EVENT_BEAT_TWINS_MEG_AND_PEG
; trainer group && trainer id
db TWINS, MEGANDPEG2
@@ -214,9 +199,8 @@
; script when talk again
dw TwinsMegandpeg2Script
-; 0x75fa9
-TwinsMegandpeg2Script: ; 0x75fa9
+TwinsMegandpeg2Script:
talkaftercancel
loadfont
writetext UnknownText_0x76428
@@ -223,11 +207,10 @@
closetext
loadmovesprites
end
-; 0x75fb1
-TrainerPsychicRodney: ; 0x75fb1
+TrainerPsychicRodney:
; bit/flag number
- dw $445
+ dw EVENT_BEAT_PSYCHIC_RODNEY
; trainer group && trainer id
db PSYCHIC_T, RODNEY
@@ -243,9 +226,8 @@
; script when talk again
dw PsychicRodneyScript
-; 0x75fbd
-PsychicRodneyScript: ; 0x75fbd
+PsychicRodneyScript:
talkaftercancel
loadfont
writetext UnknownText_0x76497
@@ -252,11 +234,10 @@
closetext
loadmovesprites
end
-; 0x75fc5
-TrainerPokefanmJeremy: ; 0x75fc5
+TrainerPokefanmJeremy:
; bit/flag number
- dw $4d4
+ dw EVENT_BEAT_POKEFANM_JEREMY
; trainer group && trainer id
db POKEFANM, JEREMY
@@ -272,9 +253,8 @@
; script when talk again
dw PokefanmJeremyScript
-; 0x75fd1
-PokefanmJeremyScript: ; 0x75fd1
+PokefanmJeremyScript:
talkaftercancel
loadfont
writetext UnknownText_0x7651c
@@ -281,11 +261,10 @@
closetext
loadmovesprites
end
-; 0x75fd9
-TrainerPokefanfGeorgia: ; 0x75fd9
+TrainerPokefanfGeorgia:
; bit/flag number
- dw $4dd
+ dw EVENT_BEAT_POKEFANF_GEORGIA
; trainer group && trainer id
db POKEFANF, GEORGIA
@@ -301,9 +280,8 @@
; script when talk again
dw PokefanfGeorgiaScript
-; 0x75fe5
-PokefanfGeorgiaScript: ; 0x75fe5
+PokefanfGeorgiaScript:
talkaftercancel
loadfont
writetext UnknownText_0x76596
@@ -310,11 +288,10 @@
closetext
loadmovesprites
end
-; 0x75fed
-TrainerSupernerdShawn: ; 0x75fed
+TrainerSupernerdShawn:
; bit/flag number
- dw $589
+ dw EVENT_BEAT_SUPER_NERD_SHAWN
; trainer group && trainer id
db SUPER_NERD, SHAWN
@@ -330,9 +307,8 @@
; script when talk again
dw SupernerdShawnScript
-; 0x75ff9
-SupernerdShawnScript: ; 0x75ff9
+SupernerdShawnScript:
talkaftercancel
loadfont
writetext UnknownText_0x7660f
@@ -339,12 +315,11 @@
closetext
loadmovesprites
end
-; 0x76001
FastShipCaptainsCabinTrashcan:
jumpstd trashcan
-MovementData_0x76004: ; 0x76004
+MovementData_0x76004:
big_step_right
big_step_up
big_step_up
@@ -353,21 +328,18 @@
big_step_up
big_step_up
step_end
-; 0x7600c
-MovementData_0x7600c: ; 0x7600c
+MovementData_0x7600c:
step_up
step_up
turn_head_left
step_end
-; 0x76010
-MovementData_0x76010: ; 0x76010
+MovementData_0x76010:
step_down
step_end
-; 0x76012
-UnknownText_0x76012: ; 0x76012
+UnknownText_0x76012:
text "Whew! Thanks for"
line "coming along."
@@ -375,9 +347,8 @@
line "tle girl amused"
cont "was exhausting."
done
-; 0x76064
-UnknownText_0x76064: ; 0x76064
+UnknownText_0x76064:
text "How do you like"
line "S.S.AQUA's ride?"
@@ -385,9 +356,8 @@
line "skates across the"
cont "waves."
done
-; 0x760ae
-UnknownText_0x760ae: ; 0x760ae
+UnknownText_0x760ae:
text "Oh, hello…"
para "I still can't find"
@@ -402,9 +372,8 @@
para "be bugging some-"
line "one. I'm worried…"
done
-; 0x76143
-UnknownText_0x76143: ; 0x76143
+UnknownText_0x76143:
text "<PLAY_G>, was it?"
line "I heard you enter-"
cont "tained my grand-"
@@ -413,21 +382,18 @@
para "I want to thank"
line "you for that."
done
-; 0x7619b
-UnknownText_0x7619b: ; 0x7619b
+UnknownText_0x7619b:
text "I know! I'd like"
line "you to have this!"
done
-; 0x761be
-UnknownText_0x761be: ; 0x761be
+UnknownText_0x761be:
text "We're traveling"
line "around the world."
done
-; 0x761e0
-UnknownText_0x761e0: ; 0x761e0
+UnknownText_0x761e0:
text "CAPTAIN, play with"
line "me, please?"
@@ -434,9 +400,8 @@
para "I'm bored! I want"
line "to play more!"
done
-; 0x7621f
-UnknownText_0x7621f: ; 0x7621f
+UnknownText_0x7621f:
text "Hi! Will you play"
line "with me?"
@@ -450,9 +415,8 @@
para "I have to go find"
line "Grandpa!"
done
-; 0x76284
-UnknownText_0x76284: ; 0x76284
+UnknownText_0x76284:
text "Grandpa, here I"
line "am! I was playing"
@@ -459,9 +423,8 @@
para "with the CAPTAIN"
line "and this guy!"
done
-; 0x762c6
-UnknownText_0x762c6: ; 0x762c6
+UnknownText_0x762c6:
text "Grandpa, here I"
line "am! I was playing"
@@ -468,26 +431,22 @@
para "with the CAPTAIN"
line "and this big girl!"
done
-; 0x7630d
-UnknownText_0x7630d: ; 0x7630d
+UnknownText_0x7630d:
text "I had lots of fun"
line "playing!"
done
-; 0x76329
-PokefanmColinSeenText: ; 0x76329
+PokefanmColinSeenText:
text "Hey, kid! Want to"
line "battle with me?"
done
-; 0x7634c
-PokefanmColinBeatenText: ; 0x7634c
+PokefanmColinBeatenText:
text "You're strong!"
done
-; 0x7635b
-UnknownText_0x7635b: ; 0x7635b
+UnknownText_0x7635b:
text "You're traveling"
line "all alone?"
@@ -494,135 +453,115 @@
para "Isn't your mom"
line "worried?"
done
-; 0x7638e
-TwinsMegandpeg1SeenText: ; 0x7638e
+TwinsMegandpeg1SeenText:
text "You think I'm a"
line "baby?"
cont "That's not fair!"
done
-; 0x763b4
-TwinsMegandpeg1BeatenText: ; 0x763b4
+TwinsMegandpeg1BeatenText:
text "Oh! We lost!"
done
-; 0x763c2
-UnknownText_0x763c2: ; 0x763c2
+UnknownText_0x763c2:
text "Baby is a rude"
line "name to call us"
cont "girls!"
done
-; 0x763e9
-TwinsMegandpeg2SeenText: ; 0x763e9
+TwinsMegandpeg2SeenText:
text "I'm not a baby!"
para "That's not nice to"
line "say to a lady!"
done
-; 0x7641a
-TwinsMegandpeg2BeatenText: ; 0x7641a
+TwinsMegandpeg2BeatenText:
text "Oh! We lost!"
done
-; 0x76428
-UnknownText_0x76428: ; 0x76428
+UnknownText_0x76428:
text "Sometimes, kids"
line "are smarter than"
cont "grown-ups!"
done
-; 0x76455
-PsychicRodneySeenText: ; 0x76455
+PsychicRodneySeenText:
text "Ssh! My brain is"
line "picking up radio"
cont "signals!"
done
-; 0x76481
-PsychicRodneyBeatenText: ; 0x76481
+PsychicRodneyBeatenText:
text "…I hear some-"
line "thing!"
done
-; 0x76497
-UnknownText_0x76497: ; 0x76497
+UnknownText_0x76497:
text "I get it. You can"
line "hear JOHTO's radio"
cont "on the FAST SHIP."
done
-; 0x764ce
-PokefanmJeremySeenText: ; 0x764ce
+PokefanmJeremySeenText:
text "What do you think?"
line "My #MON are"
cont "beautiful, yes?"
done
-; 0x764fe
-PokefanmJeremyBeatenText: ; 0x764fe
+PokefanmJeremyBeatenText:
text "Oh, no! My beauti-"
line "ful #MON!"
done
-; 0x7651c
-UnknownText_0x7651c: ; 0x7651c
+UnknownText_0x7651c:
text "I must go to the"
line "#MON SALON and"
cont "fix them up nice!"
done
-; 0x7654f
-PokefanfGeorgiaSeenText: ; 0x7654f
+PokefanfGeorgiaSeenText:
text "I'm going to shop"
line "at the DEPT.STORE"
cont "and then…"
done
-; 0x7657d
-PokefanfGeorgiaBeatenText: ; 0x7657d
+PokefanfGeorgiaBeatenText:
text "What was I going"
line "to do?"
done
-; 0x76596
-UnknownText_0x76596: ; 0x76596
+UnknownText_0x76596:
text "Oh, yes! I have to"
line "get my #MON out"
cont "of DAY-CARE!"
done
-; 0x765c7
-SupernerdShawnSeenText: ; 0x765c7
+SupernerdShawnSeenText:
text "What kinds of #"
line "BALLS do you have"
cont "with you?"
done
-; 0x765f4
-SupernerdShawnBeatenText: ; 0x765f4
+SupernerdShawnBeatenText:
text "Wait! Stop! Don't!"
line "Please!"
done
-; 0x7660f
-UnknownText_0x7660f: ; 0x7660f
+UnknownText_0x7660f:
text "You should use the"
line "right BALLS to fit"
cont "the situation."
done
-; 0x76645
-UnknownText_0x76645: ; 0x76645
+UnknownText_0x76645:
text "FAST SHIP S.S.AQUA"
line "has arrived in"
cont "VERMILION CITY."
done
-; 0x76678
-FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader: ; 0x76678
+FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader:
; filler
db 0, 0
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -1,14 +1,13 @@
-FastShipCabins_SW_SSW_NW_MapScriptHeader: ; 0x75a4d
+FastShipCabins_SW_SSW_NW_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x75a4f
-TrainerFirebreatherLyle: ; 0x75a4f
+TrainerFirebreatherLyle:
; bit/flag number
- dw $44d
+ dw EVENT_BEAT_FIREBREATHER_LYLE
; trainer group && trainer id
db FIREBREATHER, LYLE
@@ -24,9 +23,8 @@
; script when talk again
dw FirebreatherLyleScript
-; 0x75a5b
-FirebreatherLyleScript: ; 0x75a5b
+FirebreatherLyleScript:
talkaftercancel
loadfont
writetext UnknownText_0x75b52
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x75a63
-TrainerBug_catcherKen: ; 0x75a63
+TrainerBug_catcherKen:
; bit/flag number
- dw $540
+ dw EVENT_BEAT_BUG_CATCHER_KEN
; trainer group && trainer id
db BUG_CATCHER, KEN
@@ -53,9 +50,8 @@
; script when talk again
dw Bug_catcherKenScript
-; 0x75a6f
-Bug_catcherKenScript: ; 0x75a6f
+Bug_catcherKenScript:
talkaftercancel
loadfont
writetext UnknownText_0x75bd5
@@ -62,11 +58,10 @@
closetext
loadmovesprites
end
-; 0x75a77
-TrainerBeautyCassie: ; 0x75a77
+TrainerBeautyCassie:
; bit/flag number
- dw $4b2
+ dw EVENT_BEAT_BEAUTY_CASSIE
; trainer group && trainer id
db BEAUTY, CASSIE
@@ -82,9 +77,8 @@
; script when talk again
dw BeautyCassieScript
-; 0x75a83
-BeautyCassieScript: ; 0x75a83
+BeautyCassieScript:
talkaftercancel
loadfont
writetext UnknownText_0x75c43
@@ -91,11 +85,10 @@
closetext
loadmovesprites
end
-; 0x75a8b
-TrainerGuitaristClyde: ; 0x75a8b
+TrainerGuitaristClyde:
; bit/flag number
- dw $493
+ dw EVENT_BEAT_GUITARIST_CLYDE
; trainer group && trainer id
db GUITARIST, CLYDE
@@ -111,9 +104,8 @@
; script when talk again
dw GuitaristClydeScript
-; 0x75a97
-GuitaristClydeScript: ; 0x75a97
+GuitaristClydeScript:
talkaftercancel
special Function10630f
iftrue UnknownScript_0x75aa5
@@ -122,15 +114,13 @@
closetext
loadmovesprites
end
-; 0x75aa5
-UnknownScript_0x75aa5: ; 0x75aa5
+UnknownScript_0x75aa5:
loadfont
writetext UnknownText_0x75cfe
closetext
loadmovesprites
end
-; 0x75aac
FastShipBed:
loadfont
@@ -155,11 +145,10 @@
iftrue UnknownScript_0x75ae2
checkevent $0030
iftrue UnknownScript_0x75ae2
-UnknownScript_0x75ae1: ; 0x75ae1
+UnknownScript_0x75ae1:
end
-; 0x75ae2
-UnknownScript_0x75ae2: ; 0x75ae2
+UnknownScript_0x75ae2:
playsound SFX_ELEVATOR_END
pause 30
checkevent $002f
@@ -170,9 +159,8 @@
loadmovesprites
setevent $0031
end
-; 0x75af7
-UnknownScript_0x75af7: ; 0x75af7
+UnknownScript_0x75af7:
loadfont
writetext FastShipArrivedOlivineText
closetext
@@ -179,25 +167,22 @@
loadmovesprites
setevent $0031
end
-; 0x75b01
-FastShipCabinsNorthwestCabinTrashcan: ; 0x75b01
+FastShipCabinsNorthwestCabinTrashcan:
jumpstd trashcan
-FirebreatherLyleSeenText: ; 0x75b04
+FirebreatherLyleSeenText:
text "I'm going to KANTO"
line "to put on fire-"
cont "breathing shows!"
done
-; 0x75b38
-FirebreatherLyleBeatenText: ; 0x75b38
+FirebreatherLyleBeatenText:
text "Fizzle… The"
line "flame's tiny…"
done
-; 0x75b52
-UnknownText_0x75b52: ; 0x75b52
+UnknownText_0x75b52:
text "I guess fire is"
line "weak on the sea."
@@ -204,41 +189,35 @@
para "It doesn't matter?"
line "Really?"
done
-; 0x75b8e
-Bug_catcherKenSeenText: ; 0x75b8e
+Bug_catcherKenSeenText:
text "I'm visiting my"
line "grandma to catch"
cont "me some bugs!"
done
-; 0x75bbd
-Bug_catcherKenBeatenText: ; 0x75bbd
+Bug_catcherKenBeatenText:
text "Ooh, wow."
line "You're tough!"
done
-; 0x75bd5
-UnknownText_0x75bd5: ; 0x75bd5
+UnknownText_0x75bd5:
text "You can find lots"
line "of #MON in the"
cont "trees of JOHTO!"
done
-; 0x75c07
-BeautyCassieSeenText: ; 0x75c07
+BeautyCassieSeenText:
text "I'm trying to"
line "forget my woes."
cont "Let's battle!"
done
-; 0x75c32
-BeautyCassieBeatenText: ; 0x75c32
+BeautyCassieBeatenText:
text "My heart weeps…"
done
-; 0x75c43
-UnknownText_0x75c43: ; 0x75c43
+UnknownText_0x75c43:
text "A voyage is best"
line "for getting over"
cont "a broken heart."
@@ -247,9 +226,8 @@
line "trip is too short"
cont "for grieving."
done
-; 0x75ca6
-GuitaristClydeSeenText: ; 0x75ca6
+GuitaristClydeSeenText:
text "I'm going to audi-"
line "tion my songs at"
@@ -256,15 +234,13 @@
para "GOLDENROD's RADIO"
line "STATION."
done
-; 0x75ce4
-GuitaristClydeBeatenText: ; 0x75ce4
+GuitaristClydeBeatenText:
text "Yowza!"
line "Total distortion!"
done
-; 0x75cfe
-UnknownText_0x75cfe: ; 0x75cfe
+UnknownText_0x75cfe:
text "I was going to"
line "make my debut at"
cont "the BATTLE TOWER…"
@@ -273,9 +249,8 @@
line "to VERMILION and"
cont "redo my training…"
done
-; 0x75d65
-UnknownText_0x75d65: ; 0x75d65
+UnknownText_0x75d65:
text "Speaking of the"
line "RADIO STATION,"
@@ -282,7 +257,6 @@
para "what's this week's"
line "lucky number?"
done
-; 0x75da4
FastShipBedText1:
text "A comfy bed!"
@@ -306,7 +280,7 @@
cont "VERMILION CITY."
done
-FastShipCabins_SW_SSW_NW_MapEventHeader: ; 0x75e42
+FastShipCabins_SW_SSW_NW_MapEventHeader:
; filler
db 0, 0
@@ -333,4 +307,3 @@
person_event SPRITE_BUG_CATCHER, 19, 10, $a, $0, 255, 255, $b2, 2, TrainerBug_catcherKen, $073b
person_event SPRITE_BUENA, 30, 5, $a, $0, 255, 255, $92, 3, TrainerBeautyCassie, $073a
person_event SPRITE_ROCKER, 32, 7, $1e, $0, 255, 255, $82, 2, TrainerGuitaristClyde, $073b
-; 0x75ea4
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -88,7 +88,7 @@
TrainerLassCarrie:
; bit/flag number
- dw $515
+ dw EVENT_BEAT_LASS_CARRIE
; trainer group && trainer id
db LASS, CARRIE
@@ -128,7 +128,7 @@
TrainerLassBridget:
; bit/flag number
- dw $516
+ dw EVENT_BEAT_LASS_BRIDGET
; trainer group && trainer id
db LASS, BRIDGET
@@ -155,7 +155,7 @@
TrainerBeautyVictoria:
; bit/flag number
- dw $4ad
+ dw EVENT_BEAT_BEAUTY_VICTORIA
; trainer group && trainer id
db BEAUTY, VICTORIA
@@ -182,7 +182,7 @@
TrainerBeautySamantha:
; bit/flag number
- dw $4ae
+ dw EVENT_BEAT_BEAUTY_SAMANTHA
; trainer group && trainer id
db BEAUTY, SAMANTHA
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -1,4 +1,4 @@
-HallOfFame_MapScriptHeader: ; 0x181445
+HallOfFame_MapScriptHeader:
; trigger count
db 2
@@ -8,18 +8,15 @@
; callback count
db 0
-; 0x18144f
-UnknownScript_0x18144f: ; 0x18144f
+UnknownScript_0x18144f:
priorityjump UnknownScript_0x181454
end
-; 0x181453
-UnknownScript_0x181453: ; 0x181453
+UnknownScript_0x181453:
end
-; 0x181454
-UnknownScript_0x181454: ; 0x181454
+UnknownScript_0x181454:
follow $2, $0
applymovement $2, MovementData_0x181499
stopfollow
@@ -45,12 +42,11 @@
checkevent EVENT_GOT_SS_TICKET_FROM_ELM
iftrue UnknownScript_0x181497
specialphonecall $5
-UnknownScript_0x181497: ; 0x181497
+UnknownScript_0x181497:
halloffame
end
-; 0x181499
-MovementData_0x181499: ; 0x181499
+MovementData_0x181499:
step_up
step_up
step_up
@@ -62,14 +58,12 @@
step_right
turn_head_left
step_end
-; 0x1814a4
-MovementData_0x1814a4: ; 0x1814a4
+MovementData_0x1814a4:
slow_step_up
step_end
-; 0x1814a6
-UnknownText_0x1814a6: ; 0x1814a6
+UnknownText_0x1814a6:
text "LANCE: It's been a"
line "long time since I"
cont "last came here."
@@ -114,9 +108,8 @@
para "and your partners"
line "as CHAMPIONS!"
done
-; 0x181678
-HallOfFame_MapEventHeader: ; 0x181678
+HallOfFame_MapEventHeader:
; filler
db 0, 0
@@ -134,4 +127,3 @@
; people-events
db 1
person_event SPRITE_LANCE, 16, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, $ffff
-; 0x181695
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -1,4 +1,4 @@
-IlexForest_MapScriptHeader: ; 0x6eafe
+IlexForest_MapScriptHeader:
; trigger count
db 0
@@ -8,9 +8,8 @@
; callbacks
dbw 2, UnknownScript_0x6eb03
-; 0x6eb03
-UnknownScript_0x6eb03: ; 0x6eb03
+UnknownScript_0x6eb03:
checkevent EVENT_GOT_HM01_CUT
iftrue UnknownScript_0x6eb34
copybytetovar FarfetchdPosition
@@ -24,71 +23,60 @@
if_equal $8, UnknownScript_0x6eb66
if_equal $9, UnknownScript_0x6eb6d
if_equal $a, UnknownScript_0x6eb74
-UnknownScript_0x6eb34: ; 0x6eb34
+UnknownScript_0x6eb34:
return
-; 0x6eb35
-UnknownScript_0x6eb35: ; 0x6eb35
+UnknownScript_0x6eb35:
moveperson $2, $e, $1f
appear $2
return
-; 0x6eb3c
-UnknownScript_0x6eb3c: ; 0x6eb3c
+UnknownScript_0x6eb3c:
moveperson $2, $f, $19
appear $2
return
-; 0x6eb43
-UnknownScript_0x6eb43: ; 0x6eb43
+UnknownScript_0x6eb43:
moveperson $2, $14, $18
appear $2
return
-; 0x6eb4a
-UnknownScript_0x6eb4a: ; 0x6eb4a
+UnknownScript_0x6eb4a:
moveperson $2, $1d, $16
appear $2
return
-; 0x6eb51
-UnknownScript_0x6eb51: ; 0x6eb51
+UnknownScript_0x6eb51:
moveperson $2, $1c, $1f
appear $2
return
-; 0x6eb58
-UnknownScript_0x6eb58: ; 0x6eb58
+UnknownScript_0x6eb58:
moveperson $2, $18, $23
appear $2
return
-; 0x6eb5f
-UnknownScript_0x6eb5f: ; 0x6eb5f
+UnknownScript_0x6eb5f:
moveperson $2, $16, $1f
appear $2
return
-; 0x6eb66
-UnknownScript_0x6eb66: ; 0x6eb66
+UnknownScript_0x6eb66:
moveperson $2, $f, $1d
appear $2
return
-; 0x6eb6d
-UnknownScript_0x6eb6d: ; 0x6eb6d
+UnknownScript_0x6eb6d:
moveperson $2, $a, $23
appear $2
return
-; 0x6eb74
-UnknownScript_0x6eb74: ; 0x6eb74
+UnknownScript_0x6eb74:
moveperson $2, $6, $1c
appear $2
return
-; 0x6eb7b
-YoungsterScript_0x6eb7b: ; 0x6eb7b
+YoungsterScript_0x6eb7b:
faceplayer
loadfont
checkevent $0029
@@ -97,16 +85,14 @@
closetext
loadmovesprites
end
-; 0x6eb89
-UnknownScript_0x6eb89: ; 0x6eb89
+UnknownScript_0x6eb89:
writetext UnknownText_0x6f019
closetext
loadmovesprites
end
-; 0x6eb8f
-BirdScript_0x6eb8f: ; 0x6eb8f
+BirdScript_0x6eb8f:
copybytetovar FarfetchdPosition
if_equal $1, UnknownScript_0x6ebba
if_equal $2, UnknownScript_0x6ebd9
@@ -118,7 +104,7 @@
if_equal $8, UnknownScript_0x6ed0e
if_equal $9, UnknownScript_0x6ed50
if_equal $a, UnknownScript_0x6ed96
-UnknownScript_0x6ebba: ; 0x6ebba
+UnknownScript_0x6ebba:
faceplayer
loadfont
writetext UnknownText_0x6f06f
@@ -133,9 +119,8 @@
appear $2
loadvar FarfetchdPosition, $2
end
-; 0x6ebd9
-UnknownScript_0x6ebd9: ; 0x6ebd9
+UnknownScript_0x6ebd9:
scall UnknownScript_0x6eda1
if_equal $0, UnknownScript_0x6ebf1
applymovement $2, MovementData_0x6ee95
@@ -144,9 +129,8 @@
appear $2
loadvar FarfetchdPosition, $3
end
-; 0x6ebf1
-UnknownScript_0x6ebf1: ; 0x6ebf1
+UnknownScript_0x6ebf1:
applymovement $2, MovementData_0x6ee9e
moveperson $2, $f, $1d
disappear $2
@@ -153,9 +137,8 @@
appear $2
loadvar FarfetchdPosition, $8
end
-; 0x6ec02
-UnknownScript_0x6ec02: ; 0x6ec02
+UnknownScript_0x6ec02:
scall UnknownScript_0x6eda1
if_equal $2, UnknownScript_0x6ec1a
applymovement $2, MovementData_0x6eea4
@@ -164,9 +147,8 @@
appear $2
loadvar FarfetchdPosition, $4
end
-; 0x6ec1a
-UnknownScript_0x6ec1a: ; 0x6ec1a
+UnknownScript_0x6ec1a:
applymovement $2, MovementData_0x6eeab
moveperson $2, $f, $19
disappear $2
@@ -173,9 +155,8 @@
appear $2
loadvar FarfetchdPosition, $2
end
-; 0x6ec2b
-UnknownScript_0x6ec2b: ; 0x6ec2b
+UnknownScript_0x6ec2b:
scall UnknownScript_0x6eda1
if_equal $1, UnknownScript_0x6ec43
applymovement $2, MovementData_0x6eeb1
@@ -184,9 +165,8 @@
appear $2
loadvar FarfetchdPosition, $5
end
-; 0x6ec43
-UnknownScript_0x6ec43: ; 0x6ec43
+UnknownScript_0x6ec43:
applymovement $2, MovementData_0x6eeb8
moveperson $2, $14, $18
disappear $2
@@ -193,9 +173,8 @@
appear $2
loadvar FarfetchdPosition, $3
end
-; 0x6ec54
-UnknownScript_0x6ec54: ; 0x6ec54
+UnknownScript_0x6ec54:
scall UnknownScript_0x6eda1
if_equal $1, UnknownScript_0x6ec85
if_equal $2, UnknownScript_0x6ec74
@@ -206,9 +185,8 @@
appear $2
loadvar FarfetchdPosition, $6
end
-; 0x6ec74
-UnknownScript_0x6ec74: ; 0x6ec74
+UnknownScript_0x6ec74:
applymovement $2, MovementData_0x6eec7
moveperson $2, $16, $1f
disappear $2
@@ -215,9 +193,8 @@
appear $2
loadvar FarfetchdPosition, $7
end
-; 0x6ec85
-UnknownScript_0x6ec85: ; 0x6ec85
+UnknownScript_0x6ec85:
applymovement $2, MovementData_0x6eecc
moveperson $2, $1d, $16
disappear $2
@@ -224,9 +201,8 @@
appear $2
loadvar FarfetchdPosition, $4
end
-; 0x6ec96
-UnknownScript_0x6ec96: ; 0x6ec96
+UnknownScript_0x6ec96:
applymovement $2, MovementData_0x6eed2
moveperson $2, $1d, $16
disappear $2
@@ -233,9 +209,8 @@
appear $2
loadvar FarfetchdPosition, $4
end
-; 0x6eca7
-UnknownScript_0x6eca7: ; 0x6eca7
+UnknownScript_0x6eca7:
scall UnknownScript_0x6eda1
if_equal $3, UnknownScript_0x6ecbf
applymovement $2, MovementData_0x6eee6
@@ -244,9 +219,8 @@
appear $2
loadvar FarfetchdPosition, $7
end
-; 0x6ecbf
-UnknownScript_0x6ecbf: ; 0x6ecbf
+UnknownScript_0x6ecbf:
applymovement $2, MovementData_0x6eeef
moveperson $2, $1c, $1f
disappear $2
@@ -253,9 +227,8 @@
appear $2
loadvar FarfetchdPosition, $5
end
-; 0x6ecd0
-UnknownScript_0x6ecd0: ; 0x6ecd0
+UnknownScript_0x6ecd0:
scall UnknownScript_0x6eda1
if_equal $0, UnknownScript_0x6ecfd
if_equal $2, UnknownScript_0x6ecec
@@ -265,9 +238,8 @@
appear $2
loadvar FarfetchdPosition, $8
end
-; 0x6ecec
-UnknownScript_0x6ecec: ; 0x6ecec
+UnknownScript_0x6ecec:
applymovement $2, MovementData_0x6ef00
moveperson $2, $18, $23
disappear $2
@@ -274,9 +246,8 @@
appear $2
loadvar FarfetchdPosition, $6
end
-; 0x6ecfd
-UnknownScript_0x6ecfd: ; 0x6ecfd
+UnknownScript_0x6ecfd:
applymovement $2, MovementData_0x6ef09
moveperson $2, $1c, $1f
disappear $2
@@ -283,9 +254,8 @@
appear $2
loadvar FarfetchdPosition, $5
end
-; 0x6ed0e
-UnknownScript_0x6ed0e: ; 0x6ed0e
+UnknownScript_0x6ed0e:
scall UnknownScript_0x6eda1
if_equal $1, UnknownScript_0x6ed3f
if_equal $2, UnknownScript_0x6ed3f
@@ -296,9 +266,8 @@
appear $2
loadvar FarfetchdPosition, $9
end
-; 0x6ed2e
-UnknownScript_0x6ed2e: ; 0x6ed2e
+UnknownScript_0x6ed2e:
applymovement $2, MovementData_0x6ef18
moveperson $2, $16, $1f
disappear $2
@@ -305,9 +274,8 @@
appear $2
loadvar FarfetchdPosition, $7
end
-; 0x6ed3f
-UnknownScript_0x6ed3f: ; 0x6ed3f
+UnknownScript_0x6ed3f:
applymovement $2, MovementData_0x6ef1e
moveperson $2, $f, $19
disappear $2
@@ -314,9 +282,8 @@
appear $2
loadvar FarfetchdPosition, $2
end
-; 0x6ed50
-UnknownScript_0x6ed50: ; 0x6ed50
+UnknownScript_0x6ed50:
scall UnknownScript_0x6eda1
if_equal $0, UnknownScript_0x6ed85
if_equal $3, UnknownScript_0x6ed74
@@ -329,9 +296,8 @@
setevent $06f7
setevent $0029
end
-; 0x6ed74
-UnknownScript_0x6ed74: ; 0x6ed74
+UnknownScript_0x6ed74:
applymovement $2, MovementData_0x6ef33
moveperson $2, $f, $1d
disappear $2
@@ -338,9 +304,8 @@
appear $2
loadvar FarfetchdPosition, $8
end
-; 0x6ed85
-UnknownScript_0x6ed85: ; 0x6ed85
+UnknownScript_0x6ed85:
applymovement $2, MovementData_0x6ef3d
moveperson $2, $f, $1d
disappear $2
@@ -347,9 +312,8 @@
appear $2
loadvar FarfetchdPosition, $8
end
-; 0x6ed96
-UnknownScript_0x6ed96: ; 0x6ed96
+UnknownScript_0x6ed96:
faceplayer
loadfont
writetext UnknownText_0x6f086
@@ -357,9 +321,8 @@
closetext
loadmovesprites
end
-; 0x6eda1
-UnknownScript_0x6eda1: ; 0x6eda1
+UnknownScript_0x6eda1:
faceplayer
loadfont
writetext UnknownText_0x6f086
@@ -368,9 +331,8 @@
loadmovesprites
checkcode VAR_FACING
end
-; 0x6edae
-BlackBeltScript_0x6edae: ; 0x6edae
+BlackBeltScript_0x6edae:
faceplayer
loadfont
checkevent EVENT_GOT_HM01_CUT
@@ -389,16 +351,14 @@
clearevent $06f6
clearevent $06f7
end
-; 0x6edd8
-UnknownScript_0x6edd8: ; 0x6edd8
+UnknownScript_0x6edd8:
writetext UnknownText_0x6f1c0
closetext
loadmovesprites
end
-; 0x6edde
-RockerScript_0x6edde: ; 0x6edde
+RockerScript_0x6edde:
faceplayer
loadfont
checkevent EVENT_GOT_TM02_HEADBUTT
@@ -408,17 +368,16 @@
verbosegiveitem TM_HEADBUTT, 1
iffalse UnknownScript_0x6edf7
setevent EVENT_GOT_TM02_HEADBUTT
-UnknownScript_0x6edf3: ; 0x6edf3
+UnknownScript_0x6edf3:
writetext UnknownText_0x6f26d
closetext
-UnknownScript_0x6edf7: ; 0x6edf7
+UnknownScript_0x6edf7:
loadmovesprites
end
-; 0x6edf9
-TrainerBug_catcherWayne: ; 0x6edf9
+TrainerBug_catcherWayne:
; bit/flag number
- dw $5c0
+ dw EVENT_BEAT_BUG_CATCHER_WAYNE
; trainer group && trainer id
db BUG_CATCHER, WAYNE
@@ -434,9 +393,8 @@
; script when talk again
dw Bug_catcherWayneScript
-; 0x6ee05
-Bug_catcherWayneScript: ; 0x6ee05
+Bug_catcherWayneScript:
talkaftercancel
loadfont
writetext UnknownText_0x6f571
@@ -443,67 +401,55 @@
closetext
loadmovesprites
end
-; 0x6ee0d
-LassScript_0x6ee0d: ; 0x6ee0d
+LassScript_0x6ee0d:
jumptextfaceplayer UnknownText_0x6f2af
-; 0x6ee10
-ItemFragment_0x6ee10: ; 0x6ee10
+ItemFragment_0x6ee10:
db REVIVE, 1
-; 0x6ee12
-ItemFragment_0x6ee12: ; 0x6ee12
+ItemFragment_0x6ee12:
db X_ATTACK, 1
-; 0x6ee14
-ItemFragment_0x6ee14: ; 0x6ee14
+ItemFragment_0x6ee14:
db ANTIDOTE, 1
-; 0x6ee16
-ItemFragment_0x6ee16: ; 0x6ee16
+ItemFragment_0x6ee16:
db ETHER, 1
-; 0x6ee18
-MapIlexForestSignpostItem1: ; 0x6ee18
+MapIlexForestSignpostItem1:
dw $0088
db ETHER
-; 0x6ee1b
-MapIlexForestSignpostItem2: ; 0x6ee1b
+MapIlexForestSignpostItem2:
dw $0089
db SUPER_POTION
-; 0x6ee1e
-MapIlexForestSignpostItem3: ; 0x6ee1e
+MapIlexForestSignpostItem3:
dw $008a
db FULL_HEAL
-; 0x6ee21
IlexForestBoulder:
; unused
jumpstd strengthboulder
-MapIlexForestSignpost0Script: ; 0x6ee24
+MapIlexForestSignpost0Script:
jumptext UnknownText_0x6f2de
-; 0x6ee27
-MapIlexForestSignpost4Script: ; 0x6ee27
+MapIlexForestSignpost4Script:
checkevent $00c0
iftrue UnknownScript_0x6ee30
jump UnknownScript_0x6ee35
-; 0x6ee30
-UnknownScript_0x6ee30: ; 0x6ee30
+UnknownScript_0x6ee30:
checkitem GS_BALL
iftrue UnknownScript_0x6ee38
-UnknownScript_0x6ee35: ; 0x6ee35
+UnknownScript_0x6ee35:
jumptext UnknownText_0x6f358
-; 0x6ee38
-UnknownScript_0x6ee38: ; 0x6ee38
+UnknownScript_0x6ee38:
loadfont
writetext UnknownText_0x6f394
yesorno
@@ -510,9 +456,8 @@
iftrue UnknownScript_0x6ee42
loadmovesprites
end
-; 0x6ee42
-UnknownScript_0x6ee42: ; 0x6ee42
+UnknownScript_0x6ee42:
takeitem GS_BALL, 1
clearevent $00c0
setevent $07a4
@@ -544,11 +489,10 @@
loadmovesprites
applymovement $7, MovementData_0x6ef53
disappear $7
-UnknownScript_0x6ee8e: ; 0x6ee8e
+UnknownScript_0x6ee8e:
end
-; 0x6ee8f
-MovementData_0x6ee8f: ; 0x6ee8f
+MovementData_0x6ee8f:
big_step_up
big_step_up
big_step_up
@@ -555,9 +499,8 @@
big_step_up
big_step_up
step_end
-; 0x6ee95
-MovementData_0x6ee95: ; 0x6ee95
+MovementData_0x6ee95:
big_step_up
big_step_up
big_step_right
@@ -567,9 +510,8 @@
big_step_right
big_step_down
step_end
-; 0x6ee9e
-MovementData_0x6ee9e: ; 0x6ee9e
+MovementData_0x6ee9e:
big_step_down
big_step_down
big_step_down
@@ -576,9 +518,8 @@
big_step_down
big_step_down
step_end
-; 0x6eea4
-MovementData_0x6eea4: ; 0x6eea4
+MovementData_0x6eea4:
big_step_right
big_step_right
big_step_right
@@ -586,9 +527,8 @@
big_step_right
big_step_right
step_end
-; 0x6eeab
-MovementData_0x6eeab: ; 0x6eeab
+MovementData_0x6eeab:
big_step_up
big_step_left
big_step_left
@@ -595,9 +535,8 @@
big_step_left
big_step_left
step_end
-; 0x6eeb1
-MovementData_0x6eeb1: ; 0x6eeb1
+MovementData_0x6eeb1:
big_step_down
big_step_down
big_step_down
@@ -605,17 +544,15 @@
big_step_down
big_step_down
step_end
-; 0x6eeb8
-MovementData_0x6eeb8: ; 0x6eeb8
+MovementData_0x6eeb8:
big_step_left
jump_step_left
big_step_left
big_step_left
step_end
-; 0x6eebd
-MovementData_0x6eebd: ; 0x6eebd
+MovementData_0x6eebd:
big_step_down
big_step_down
big_step_down
@@ -626,17 +563,15 @@
big_step_left
big_step_left
step_end
-; 0x6eec7
-MovementData_0x6eec7: ; 0x6eec7
+MovementData_0x6eec7:
big_step_left
big_step_left
big_step_left
big_step_left
step_end
-; 0x6eecc
-MovementData_0x6eecc: ; 0x6eecc
+MovementData_0x6eecc:
big_step_up
big_step_up
big_step_up
@@ -643,9 +578,8 @@
big_step_right
big_step_up
step_end
-; 0x6eed2
-MovementData_0x6eed2: ; 0x6eed2
+MovementData_0x6eed2:
big_step_right
turn_head_up
db $3e ; movement
@@ -666,9 +600,8 @@
big_step_up
big_step_up
step_end
-; 0x6eee6
-MovementData_0x6eee6: ; 0x6eee6
+MovementData_0x6eee6:
big_step_left
big_step_left
big_step_left
@@ -678,9 +611,8 @@
big_step_up
big_step_up
step_end
-; 0x6eeef
-MovementData_0x6eeef: ; 0x6eeef
+MovementData_0x6eeef:
big_step_right
big_step_right
big_step_right
@@ -690,9 +622,8 @@
big_step_up
big_step_up
step_end
-; 0x6eef8
-MovementData_0x6eef8: ; 0x6eef8
+MovementData_0x6eef8:
big_step_up
big_step_up
big_step_left
@@ -701,9 +632,8 @@
big_step_left
big_step_left
step_end
-; 0x6ef00
-MovementData_0x6ef00: ; 0x6ef00
+MovementData_0x6ef00:
big_step_down
big_step_down
big_step_left
@@ -713,9 +643,8 @@
big_step_right
big_step_right
step_end
-; 0x6ef09
-MovementData_0x6ef09: ; 0x6ef09
+MovementData_0x6ef09:
big_step_right
big_step_right
big_step_right
@@ -723,9 +652,8 @@
big_step_right
big_step_right
step_end
-; 0x6ef10
-MovementData_0x6ef10: ; 0x6ef10
+MovementData_0x6ef10:
big_step_down
big_step_left
big_step_down
@@ -734,9 +662,8 @@
big_step_down
big_step_down
step_end
-; 0x6ef18
-MovementData_0x6ef18: ; 0x6ef18
+MovementData_0x6ef18:
big_step_right
big_step_right
big_step_right
@@ -743,17 +670,15 @@
big_step_right
big_step_right
step_end
-; 0x6ef1e
-MovementData_0x6ef1e: ; 0x6ef1e
+MovementData_0x6ef1e:
big_step_up
big_step_up
big_step_up
big_step_up
step_end
-; 0x6ef23
-MovementData_0x6ef23: ; 0x6ef23
+MovementData_0x6ef23:
big_step_left
big_step_left
fix_facing
@@ -770,9 +695,8 @@
big_step_up
big_step_up
step_end
-; 0x6ef33
-MovementData_0x6ef33: ; 0x6ef33
+MovementData_0x6ef33:
big_step_right
big_step_right
big_step_right
@@ -783,9 +707,8 @@
big_step_up
big_step_up
step_end
-; 0x6ef3d
-MovementData_0x6ef3d: ; 0x6ef3d
+MovementData_0x6ef3d:
big_step_left
big_step_left
fix_facing
@@ -803,32 +726,28 @@
big_step_up
big_step_up
step_end
-; 0x6ef4e
-MovementData_0x6ef4e: ; 0x6ef4e
+MovementData_0x6ef4e:
step_up
step_up
step_up
step_up
step_end
-; 0x6ef53
-MovementData_0x6ef53: ; 0x6ef53
+MovementData_0x6ef53:
step_down
step_down
step_down
step_down
step_end
-; 0x6ef58
-MovementData_0x6ef58: ; 0x6ef58
+MovementData_0x6ef58:
fix_facing
slow_step_down
remove_fixed_facing
step_end
-; 0x6ef5c
-UnknownText_0x6ef5c: ; 0x6ef5c
+UnknownText_0x6ef5c:
text "Oh, man… My boss"
line "is going to be"
cont "steaming…"
@@ -846,9 +765,8 @@
para "It's too big, dark"
line "and scary for me…"
done
-; 0x6f019
-UnknownText_0x6f019: ; 0x6f019
+UnknownText_0x6f019:
text "Wow! Thanks a"
line "whole bunch!"
@@ -857,20 +775,17 @@
cont "cause I don't have"
cont "a BADGE."
done
-; 0x6f06f
-UnknownText_0x6f06f: ; 0x6f06f
+UnknownText_0x6f06f:
text "It's the missing"
line "#MON!"
done
-; 0x6f086
-UnknownText_0x6f086: ; 0x6f086
+UnknownText_0x6f086:
text "FARFETCH'D: Kwaa!"
done
-; 0x6f099
-UnknownText_0x6f099: ; 0x6f099
+UnknownText_0x6f099:
text "Ah! My FARFETCH'D!"
para "You found it for"
@@ -890,9 +805,8 @@
para "I know! Here, take"
line "this."
done
-; 0x6f141
-UnknownText_0x6f141: ; 0x6f141
+UnknownText_0x6f141:
text "That's the CUT HM."
line "Teach that to a"
@@ -905,9 +819,8 @@
para "GYM BADGE from"
line "AZALEA to use it."
done
-; 0x6f1c0
-UnknownText_0x6f1c0: ; 0x6f1c0
+UnknownText_0x6f1c0:
text "Do you want to"
line "apprentice as a"
@@ -917,9 +830,8 @@
para "You'll be first-"
line "rate in ten years!"
done
-; 0x6f21b
-UnknownText_0x6f21b: ; 0x6f21b
+UnknownText_0x6f21b:
text "What am I doing?"
para "I'm shaking trees"
@@ -928,24 +840,21 @@
para "It's fun. Here,"
line "you try it too!"
done
-; 0x6f26d
-UnknownText_0x6f26d: ; 0x6f26d
+UnknownText_0x6f26d:
text "Rattle trees with"
line "HEADBUTT. Some-"
cont "times, sleeping"
cont "#MON fall out."
done
-; 0x6f2af
-UnknownText_0x6f2af: ; 0x6f2af
+UnknownText_0x6f2af:
text "Did something"
line "happen to the"
cont "forest's guardian?"
done
-; 0x6f2de
-UnknownText_0x6f2de: ; 0x6f2de
+UnknownText_0x6f2de:
text "ILEX FOREST is"
line "so overgrown with"
@@ -956,9 +865,8 @@
line "for items that may"
cont "have been dropped."
done
-; 0x6f358
-UnknownText_0x6f358: ; 0x6f358
+UnknownText_0x6f358:
text "ILEX FOREST"
line "SHRINE…"
@@ -966,9 +874,8 @@
line "the forest's"
cont "protector…"
done
-; 0x6f394
-UnknownText_0x6f394: ; 0x6f394
+UnknownText_0x6f394:
text "ILEX FOREST"
line "SHRINE…"
@@ -987,15 +894,13 @@
para "Want to put the GS"
line "BALL here?"
done
-; 0x6f43b
-UnknownText_0x6f43b: ; 0x6f43b
+UnknownText_0x6f43b:
text "<PLAYER> put in the"
line "GS BALL."
done
-; 0x6f452
-UnknownText_0x6f452: ; 0x6f452
+UnknownText_0x6f452:
text "Whew, wasn't that"
line "something!"
@@ -1014,9 +919,8 @@
para "I'm going!"
done
-; 0x6f515
-Bug_catcherWayneSeenText: ; 0x6f515
+Bug_catcherWayneSeenText:
text "Don't sneak up on"
line "me like that!"
@@ -1023,15 +927,13 @@
para "You frightened a"
line "#MON away!"
done
-; 0x6f551
-Bug_catcherWayneBeatenText: ; 0x6f551
+Bug_catcherWayneBeatenText:
text "I hadn't seen that"
line "#MON before…"
done
-; 0x6f571
-UnknownText_0x6f571: ; 0x6f571
+UnknownText_0x6f571:
text "A #MON I've"
line "never seen before"
@@ -1043,9 +945,8 @@
line "HEADBUTT in other"
cont "places too."
done
-; 0x6f5e7
-IlexForest_MapEventHeader: ; 0x6f5e7
+IlexForest_MapEventHeader:
; filler
db 0, 0
@@ -1079,4 +980,3 @@
person_event SPRITE_POKE_BALL, 21, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee12, $07b9
person_event SPRITE_POKE_BALL, 11, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee14, $07ba
person_event SPRITE_POKE_BALL, 5, 31, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee16, $07bb
-; 0x6f6a4
--- a/maps/IndigoPlateauPokeCenter1F.asm
+++ b/maps/IndigoPlateauPokeCenter1F.asm
@@ -34,9 +34,9 @@
clearevent EVENT_KARENS_ROOM_EXIT_OPEN
clearevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
clearevent $0312
- clearevent $05b8
- clearevent $05b9
- clearevent $05ba
+ clearevent EVENT_BEAT_ELITE_4_WILL
+ clearevent EVENT_BEAT_ELITE_4_KOGA
+ clearevent EVENT_BEAT_ELITE_4_BRUNO
clearevent EVENT_BEAT_ELITE_4_KAREN
clearevent EVENT_BEAT_CHAMPION_LANCE
setevent $075f
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -1,4 +1,4 @@
-KarensRoom_MapScriptHeader: ; 0x180baf
+KarensRoom_MapScriptHeader:
; trigger count
db 2
@@ -12,30 +12,26 @@
; callbacks
dbw 1, UnknownScript_0x180bc1
-; 0x180bbc
-UnknownScript_0x180bbc: ; 0x180bbc
+UnknownScript_0x180bbc:
priorityjump UnknownScript_0x180bd6
end
-; 0x180bc0
-UnknownScript_0x180bc0: ; 0x180bc0
+UnknownScript_0x180bc0:
end
-; 0x180bc1
-UnknownScript_0x180bc1: ; 0x180bc1
+UnknownScript_0x180bc1:
checkevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED
iffalse UnknownScript_0x180bcb
changeblock $4, $e, $2a
-UnknownScript_0x180bcb: ; 0x180bcb
+UnknownScript_0x180bcb:
checkevent EVENT_KARENS_ROOM_EXIT_OPEN
iffalse UnknownScript_0x180bd5
changeblock $4, $2, $16
-UnknownScript_0x180bd5: ; 0x180bd5
+UnknownScript_0x180bd5:
return
-; 0x180bd6
-UnknownScript_0x180bd6: ; 0x180bd6
+UnknownScript_0x180bd6:
applymovement $0, MovementData_0x180c22
refreshscreen $86
playsound SFX_STRENGTH
@@ -47,9 +43,8 @@
setevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED
waitbutton
end
-; 0x180bee
-KarenScript_0x180bee: ; 0x180bee
+KarenScript_0x180bee:
faceplayer
loadfont
checkevent EVENT_BEAT_ELITE_4_KAREN
@@ -73,24 +68,21 @@
setevent EVENT_KARENS_ROOM_EXIT_OPEN
waitbutton
end
-; 0x180c1c
-UnknownScript_0x180c1c: ; 0x180c1c
+UnknownScript_0x180c1c:
writetext UnknownText_0x180d29
closetext
loadmovesprites
end
-; 0x180c22
-MovementData_0x180c22: ; 0x180c22
+MovementData_0x180c22:
step_up
step_up
step_up
step_up
step_end
-; 0x180c27
-UnknownText_0x180c27: ; 0x180c27
+UnknownText_0x180c27:
text "I am KAREN of the"
line "ELITE FOUR."
@@ -112,16 +104,14 @@
para "Let's go."
done
-; 0x180cf8
-UnknownText_0x180cf8: ; 0x180cf8
+UnknownText_0x180cf8:
text "Well, aren't you"
line "good. I like that"
cont "in a trainer."
done
-; 0x180d29
-UnknownText_0x180d29: ; 0x180d29
+UnknownText_0x180d29:
text "Strong #MON."
para "Weak #MON."
@@ -143,9 +133,8 @@
para "Go on--the CHAM-"
line "PION is waiting."
done
-; 0x180e05
-KarensRoom_MapEventHeader: ; 0x180e05
+KarensRoom_MapEventHeader:
; filler
db 0, 0
@@ -165,4 +154,3 @@
; people-events
db 1
person_event SPRITE_KAREN, 11, 9, $6, $0, 255, 255, $80, 0, KarenScript_0x180bee, $ffff
-; 0x180e2c
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -1,4 +1,4 @@
-KogasRoom_MapScriptHeader: ; 0x18071b
+KogasRoom_MapScriptHeader:
; trigger count
db 2
@@ -12,30 +12,26 @@
; callbacks
dbw 1, UnknownScript_0x18072d
-; 0x180728
-UnknownScript_0x180728: ; 0x180728
+UnknownScript_0x180728:
priorityjump UnknownScript_0x180742
end
-; 0x18072c
-UnknownScript_0x18072c: ; 0x18072c
+UnknownScript_0x18072c:
end
-; 0x18072d
-UnknownScript_0x18072d: ; 0x18072d
+UnknownScript_0x18072d:
checkevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED
iffalse UnknownScript_0x180737
changeblock $4, $e, $2a
-UnknownScript_0x180737: ; 0x180737
+UnknownScript_0x180737:
checkevent EVENT_KOGAS_ROOM_EXIT_OPEN
iffalse UnknownScript_0x180741
changeblock $4, $2, $16
-UnknownScript_0x180741: ; 0x180741
+UnknownScript_0x180741:
return
-; 0x180742
-UnknownScript_0x180742: ; 0x180742
+UnknownScript_0x180742:
applymovement $0, MovementData_0x18078e
refreshscreen $86
playsound SFX_STRENGTH
@@ -47,12 +43,11 @@
setevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED
waitbutton
end
-; 0x18075a
-KogaScript_0x18075a: ; 0x18075a
+KogaScript_0x18075a:
faceplayer
loadfont
- checkevent $05b9
+ checkevent EVENT_BEAT_ELITE_4_KOGA
iftrue UnknownScript_0x180788
writetext UnknownText_0x180793
closetext
@@ -61,7 +56,7 @@
loadtrainer KOGA, 1
startbattle
returnafterbattle
- setevent $05b9
+ setevent EVENT_BEAT_ELITE_4_KOGA
loadfont
writetext UnknownText_0x1808ca
closetext
@@ -73,24 +68,21 @@
setevent EVENT_KOGAS_ROOM_EXIT_OPEN
waitbutton
end
-; 0x180788
-UnknownScript_0x180788: ; 0x180788
+UnknownScript_0x180788:
writetext UnknownText_0x1808ca
closetext
loadmovesprites
end
-; 0x18078e
-MovementData_0x18078e: ; 0x18078e
+MovementData_0x18078e:
step_up
step_up
step_up
step_up
step_end
-; 0x180793
-UnknownText_0x180793: ; 0x180793
+UnknownText_0x180793:
text "Fwahahahaha!"
para "I am KOGA of the"
@@ -118,16 +110,14 @@
para "force--you shall"
line "see soon enough!"
done
-; 0x1808a9
-UnknownText_0x1808a9: ; 0x1808a9
+UnknownText_0x1808a9:
text "Ah!"
line "You have proven"
cont "your worth!"
done
-; 0x1808ca
-UnknownText_0x1808ca: ; 0x1808ca
+UnknownText_0x1808ca:
text "I subjected you to"
line "everything I could"
cont "muster."
@@ -140,9 +130,8 @@
line "room, and put your"
cont "abilities to test!"
done
-; 0x18095f
-KogasRoom_MapEventHeader: ; 0x18095f
+KogasRoom_MapEventHeader:
; filler
db 0, 0
@@ -162,4 +151,3 @@
; people-events
db 1
person_event SPRITE_KOGA, 11, 9, $6, $0, 255, 255, $90, 0, KogaScript_0x18075a, $ffff
-; 0x180986
--- a/maps/LakeofRage.asm
+++ b/maps/LakeofRage.asm
@@ -138,7 +138,7 @@
TrainerFisherAndre:
; bit/flag number
- dw $455
+ dw EVENT_BEAT_FISHER_ANDRE
; trainer group && trainer id
db FISHER, ANDRE
@@ -165,7 +165,7 @@
TrainerFisherRaymond:
; bit/flag number
- dw $456
+ dw EVENT_BEAT_FISHER_RAYMOND
; trainer group && trainer id
db FISHER, RAYMOND
@@ -192,7 +192,7 @@
TrainerCooltrainermAaron:
; bit/flag number
- dw $549
+ dw EVENT_BEAT_COOLTRAINERM_AARON
; trainer group && trainer id
db COOLTRAINERM, AARON
@@ -219,7 +219,7 @@
TrainerCooltrainerfLois:
; bit/flag number
- dw $55c
+ dw EVENT_BEAT_COOLTRAINERF_LOIS
; trainer group && trainer id
db COOLTRAINERF, LOIS
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -1,4 +1,4 @@
-LancesRoom_MapScriptHeader: ; 0x180e2c
+LancesRoom_MapScriptHeader:
; trigger count
db 2
@@ -12,30 +12,26 @@
; callbacks
dbw 1, UnknownScript_0x180e3e
-; 0x180e39
-UnknownScript_0x180e39: ; 0x180e39
+UnknownScript_0x180e39:
priorityjump UnknownScript_0x180e53
end
-; 0x180e3d
-UnknownScript_0x180e3d: ; 0x180e3d
+UnknownScript_0x180e3d:
end
-; 0x180e3e
-UnknownScript_0x180e3e: ; 0x180e3e
+UnknownScript_0x180e3e:
checkevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
iffalse UnknownScript_0x180e48
changeblock $4, $16, $34
-UnknownScript_0x180e48: ; 0x180e48
+UnknownScript_0x180e48:
checkevent $0312
iffalse UnknownScript_0x180e52
changeblock $4, $0, $b
-UnknownScript_0x180e52: ; 0x180e52
+UnknownScript_0x180e52:
return
-; 0x180e53
-UnknownScript_0x180e53: ; 0x180e53
+UnknownScript_0x180e53:
applymovement $0, MovementData_0x180f33
refreshscreen $86
playsound SFX_STRENGTH
@@ -46,18 +42,16 @@
dotrigger $1
setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
end
-; 0x180e6a
-UnknownScript_0x180e6a: ; 0x180e6a
+UnknownScript_0x180e6a:
special Functionc48f
applymovement $0, MovementData_0x180f38
jump LanceScript_0x180e7b
-; 0x180e74
-UnknownScript_0x180e74: ; 0x180e74
+UnknownScript_0x180e74:
special Functionc48f
applymovement $0, MovementData_0x180f3c
-LanceScript_0x180e7b: ; 0x180e7b
+LanceScript_0x180e7b:
spriteface $2, LEFT
loadfont
writetext UnknownText_0x180f67
@@ -135,82 +129,70 @@
pause 15
warpfacing $1, GROUP_HALL_OF_FAME, MAP_HALL_OF_FAME, $4, $d
end
-; 0x180f33
-MovementData_0x180f33: ; 0x180f33
+MovementData_0x180f33:
step_up
step_up
step_up
step_up
step_end
-; 0x180f38
-MovementData_0x180f38: ; 0x180f38
+MovementData_0x180f38:
step_up
step_up
turn_head_right
step_end
-; 0x180f3c
-MovementData_0x180f3c: ; 0x180f3c
+MovementData_0x180f3c:
step_up
step_left
step_up
turn_head_right
step_end
-; 0x180f41
-MovementData_0x180f41: ; 0x180f41
+MovementData_0x180f41:
big_step_up
big_step_up
big_step_up
turn_head_down
step_end
-; 0x180f46
-MovementData_0x180f46: ; 0x180f46
+MovementData_0x180f46:
step_up
step_up
step_end
-; 0x180f49
-MovementData_0x180f49: ; 0x180f49
+MovementData_0x180f49:
step_left
turn_head_right
step_end
-; 0x180f4c
-MovementData_0x180f4c: ; 0x180f4c
+MovementData_0x180f4c:
big_step_up
turn_head_right
step_end
-; 0x180f4f
-MovementData_0x180f4f: ; 0x180f4f
+MovementData_0x180f4f:
step_up
step_left
turn_head_down
step_end
-; 0x180f53
-MovementData_0x180f53: ; 0x180f53
+MovementData_0x180f53:
step_up
step_end
-; 0x180f55
-MovementData_0x180f55: ; 0x180f55
+MovementData_0x180f55:
step_up
step_end
-; 0x180f57
-MovementData_0x180f57: ; 0x180f57
+MovementData_0x180f57:
step_up
step_right
turn_head_up
step_end
-; 0x180f5b
-MovementData_0x180f5b: ; 0x180f5b
+MovementData_0x180f5b:
big_step_right
big_step_right
big_step_left
@@ -223,9 +205,8 @@
big_step_left
turn_head_up
step_end
-; 0x180f67
-UnknownText_0x180f67: ; 0x180f67
+UnknownText_0x180f67:
text "LANCE: I've been"
line "waiting for you."
@@ -256,9 +237,8 @@
line "on master, accept"
cont "your challenge!"
done
-; 0x1810a4
-UnknownText_0x1810a4: ; 0x1810a4
+UnknownText_0x1810a4:
text "…It's over."
para "But it's an odd"
@@ -274,9 +254,8 @@
para "of a great new"
line "CHAMPION!"
done
-; 0x181132
-UnknownText_0x181132: ; 0x181132
+UnknownText_0x181132:
text "…Whew."
para "You have become"
@@ -295,9 +274,8 @@
para "grow strong with"
line "your #MON."
done
-; 0x1811dd
-UnknownText_0x1811dd: ; 0x1811dd
+UnknownText_0x1811dd:
text "MARY: Oh, no!"
line "It's all over!"
@@ -304,9 +282,8 @@
para "PROF.OAK, if you"
line "weren't so slow…"
done
-; 0x18121b
-UnknownText_0x18121b: ; 0x18121b
+UnknownText_0x18121b:
text "PROF.OAK: Ah,"
line "<PLAY_G>!"
@@ -338,16 +315,14 @@
para "Congratulations,"
line "<PLAY_G>!"
done
-; 0x18134b
-UnknownText_0x18134b: ; 0x18134b
+UnknownText_0x18134b:
text "MARY: Let's inter-"
line "view the brand new"
cont "CHAMPION!"
done
-; 0x18137b
-UnknownText_0x18137b: ; 0x18137b
+UnknownText_0x18137b:
text "LANCE: This is"
line "getting to be a"
cont "bit too noisy…"
@@ -355,16 +330,14 @@
para "<PLAY_G>, could you"
line "come with me?"
done
-; 0x1813c5
-UnknownText_0x1813c5: ; 0x1813c5
+UnknownText_0x1813c5:
text "MARY: Oh, wait!"
line "We haven't done"
cont "the interview!"
done
-; 0x1813f4
-LancesRoom_MapEventHeader: ; 0x1813f4
+LancesRoom_MapEventHeader:
; filler
db 0, 0
@@ -388,4 +361,3 @@
person_event SPRITE_LANCE, 7, 9, $6, $0, 255, 255, $0, 0, LanceScript_0x180e7b, $ffff
person_event SPRITE_TEACHER, 11, 8, $7, $0, 255, 255, $a0, 0, ObjectEvent, $075f
person_event SPRITE_OAK, 11, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, $075f
-; 0x181445
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -63,7 +63,7 @@
TrainerSkierRoxanne:
; bit/flag number
- dw $592
+ dw EVENT_BEAT_SKIER_ROXANNE
; trainer group && trainer id
db SKIER, ROXANNE
@@ -90,7 +90,7 @@
TrainerSkierClarissa:
; bit/flag number
- dw $593
+ dw EVENT_BEAT_SKIER_CLARISSA
; trainer group && trainer id
db SKIER, CLARISSA
@@ -117,7 +117,7 @@
TrainerBoarderRonald:
; bit/flag number
- dw $40e
+ dw EVENT_BEAT_BOARDER_RONALD
; trainer group && trainer id
db BOARDER, RONALD
@@ -144,7 +144,7 @@
TrainerBoarderBrad:
; bit/flag number
- dw $40f
+ dw EVENT_BEAT_BOARDER_BRAD
; trainer group && trainer id
db BOARDER, BRAD
@@ -171,7 +171,7 @@
TrainerBoarderDouglas:
; bit/flag number
- dw $410
+ dw EVENT_BEAT_BOARDER_DOUGLAS
; trainer group && trainer id
db BOARDER, DOUGLAS
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -1,14 +1,13 @@
-MountMortar1FInside_MapScriptHeader: ; 0x7de4f
+MountMortar1FInside_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7de51
-TrainerPokemaniacMiller: ; 0x7de51
+TrainerPokemaniacMiller:
; bit/flag number
- dw $5c4
+ dw EVENT_BEAT_POKEMANIAC_MILLER
; trainer group && trainer id
db POKEMANIAC, MILLER
@@ -24,9 +23,8 @@
; script when talk again
dw PokemaniacMillerScript
-; 0x7de5d
-PokemaniacMillerScript: ; 0x7de5d
+PokemaniacMillerScript:
talkaftercancel
loadfont
writetext UnknownText_0x7debd
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x7de65
-TrainerSupernerdMarkus: ; 0x7de65
+TrainerSupernerdMarkus:
; bit/flag number
- dw $5c6
+ dw EVENT_BEAT_SUPER_NERD_MARKUS
; trainer group && trainer id
db SUPER_NERD, MARKUS
@@ -53,9 +50,8 @@
; script when talk again
dw SupernerdMarkusScript
-; 0x7de71
-SupernerdMarkusScript: ; 0x7de71
+SupernerdMarkusScript:
talkaftercancel
loadfont
writetext UnknownText_0x7df97
@@ -62,58 +58,47 @@
closetext
loadmovesprites
end
-; 0x7de79
MountMortar1FBoulder:
jumpstd strengthboulder
-ItemFragment_0x7de7c: ; 0x7de7c
+ItemFragment_0x7de7c:
db ESCAPE_ROPE, 1
-; 0x7de7e
-ItemFragment_0x7de7e: ; 0x7de7e
+ItemFragment_0x7de7e:
db MAX_REVIVE, 1
-; 0x7de80
-ItemFragment_0x7de80: ; 0x7de80
+ItemFragment_0x7de80:
db HYPER_POTION, 1
-; 0x7de82
-ItemFragment_0x7de82: ; 0x7de82
+ItemFragment_0x7de82:
db MAX_POTION, 1
-; 0x7de84
-ItemFragment_0x7de84: ; 0x7de84
+ItemFragment_0x7de84:
db NUGGET, 1
-; 0x7de86
-ItemFragment_0x7de86: ; 0x7de86
+ItemFragment_0x7de86:
db IRON, 1
-; 0x7de88
-ItemFragment_0x7de88: ; 0x7de88
+ItemFragment_0x7de88:
db ULTRA_BALL, 1
-; 0x7de8a
-MapMountMortar1FInsideSignpostItem0: ; 0x7de8a
+MapMountMortar1FInsideSignpostItem0:
dw $0091
db MAX_REPEL
-; 0x7de8d
-PokemaniacMillerSeenText: ; 0x7de8d
+PokemaniacMillerSeenText:
text "I'm not losing"
line "this time!"
done
-; 0x7dea7
-PokemaniacMillerBeatenText: ; 0x7dea7
+PokemaniacMillerBeatenText:
text "I lost to some"
line "kid…?"
done
-; 0x7debd
-UnknownText_0x7debd: ; 0x7debd
+UnknownText_0x7debd:
text "A while back, this"
line "karate dude wanted"
@@ -129,20 +114,17 @@
para "his training. I"
line "wonder how he is?"
done
-; 0x7df6a
-SupernerdMarkusSeenText: ; 0x7df6a
+SupernerdMarkusSeenText:
text "Hey! HUGH!"
done
-; 0x7df76
-SupernerdMarkusBeatenText: ; 0x7df76
+SupernerdMarkusBeatenText:
text "I mistook you for"
line "someone else…"
done
-; 0x7df97
-UnknownText_0x7df97: ; 0x7df97
+UnknownText_0x7df97:
text "I came to explore"
line "MT.MORTAR, but I"
@@ -155,9 +137,8 @@
para "SEADRA that knows"
line "WATERFALL?"
done
-; 0x7e01d
-MountMortar1FInside_MapEventHeader: ; 0x7e01d
+MountMortar1FInside_MapEventHeader:
; filler
db 0, 0
@@ -189,4 +170,3 @@
person_event SPRITE_SUPER_NERD, 32, 28, $a, $0, 255, 255, $b2, 3, TrainerSupernerdMarkus, $ffff
person_event SPRITE_POKE_BALL, 20, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de86, $07c8
person_event SPRITE_POKE_BALL, 21, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de88, $07c9
-; 0x7e0c8
--- a/maps/MountMortar2FInside.asm
+++ b/maps/MountMortar2FInside.asm
@@ -1,14 +1,13 @@
-MountMortar2FInside_MapScriptHeader: ; 0x7e0c8
+MountMortar2FInside_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x7e0ca
-TrainerSupernerdHugh: ; 0x7e0ca
+TrainerSupernerdHugh:
; bit/flag number
- dw $5c5
+ dw EVENT_BEAT_SUPER_NERD_HUGH
; trainer group && trainer id
db SUPER_NERD, HUGH
@@ -24,9 +23,8 @@
; script when talk again
dw SupernerdHughScript
-; 0x7e0d6
-SupernerdHughScript: ; 0x7e0d6
+SupernerdHughScript:
talkaftercancel
loadfont
writetext UnknownText_0x7e10e
@@ -33,49 +31,39 @@
closetext
loadmovesprites
end
-; 0x7e0de
-ItemFragment_0x7e0de: ; 0x7e0de
+ItemFragment_0x7e0de:
db MAX_POTION, 1
-; 0x7e0e0
-ItemFragment_0x7e0e0: ; 0x7e0e0
+ItemFragment_0x7e0e0:
db RARE_CANDY, 1
-; 0x7e0e2
-ItemFragment_0x7e0e2: ; 0x7e0e2
+ItemFragment_0x7e0e2:
db TM_DEFENSE_CURL, 1
-; 0x7e0e4
-ItemFragment_0x7e0e4: ; 0x7e0e4
+ItemFragment_0x7e0e4:
db DRAGON_SCALE, 1
-; 0x7e0e6
-ItemFragment_0x7e0e6: ; 0x7e0e6
+ItemFragment_0x7e0e6:
db ELIXER, 1
-; 0x7e0e8
-ItemFragment_0x7e0e8: ; 0x7e0e8
+ItemFragment_0x7e0e8:
db ESCAPE_ROPE, 1
-; 0x7e0ea
-MapMountMortar2FInsideSignpostItem0: ; 0x7e0ea
+MapMountMortar2FInsideSignpostItem0:
dw $0092
db FULL_RESTORE
-; 0x7e0ed
-SupernerdHughSeenText: ; 0x7e0ed
+SupernerdHughSeenText:
text "Yo! MARKUS!"
done
-; 0x7e0fa
-SupernerdHughBeatenText: ; 0x7e0fa
+SupernerdHughBeatenText:
text "Sorry, my mistake."
done
-; 0x7e10e
-UnknownText_0x7e10e: ; 0x7e10e
+UnknownText_0x7e10e:
text "I'm investigating"
line "MT.MORTAR, but my"
cont "pal's gone AWOL."
@@ -86,9 +74,8 @@
para "SLOWPOKE that can"
line "use STRENGTH?"
done
-; 0x7e184
-MountMortar2FInside_MapEventHeader: ; 0x7e184
+MountMortar2FInside_MapEventHeader:
; filler
db 0, 0
@@ -113,4 +100,3 @@
person_event SPRITE_POKE_BALL, 15, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e6, $0684
person_event SPRITE_POKE_BALL, 9, 32, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e8, $0685
person_event SPRITE_SUPER_NERD, 30, 17, $a, $0, 255, 255, $b2, 2, TrainerSupernerdHugh, $ffff
-; 0x7e1f4
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -11,7 +11,7 @@
loadfont
checkevent EVENT_GOT_TYROGUE_FROM_KIYO
iftrue UnknownScript_0x7e231
- checkevent $04a9
+ checkevent EVENT_BEAT_BLACKBELT_KIYO
iftrue UnknownScript_0x7e217
writetext UnknownText_0x7e24d
closetext
@@ -20,7 +20,7 @@
loadtrainer BLACKBELT_T, KIYO
startbattle
returnafterbattle
- setevent $04a9
+ setevent EVENT_BEAT_BLACKBELT_KIYO
loadfont
UnknownScript_0x7e217: ; 0x7e217
writetext UnknownText_0x7e2c0
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -1,20 +1,17 @@
-NationalPark_MapScriptHeader: ; 0x5c000
+NationalPark_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x5c002
-LassScript_0x5c002: ; 0x5c002
+LassScript_0x5c002:
jumptextfaceplayer UnknownText_0x5c1d3
-; 0x5c005
-PokefanFScript_0x5c005: ; 0x5c005
+PokefanFScript_0x5c005:
jumptextfaceplayer UnknownText_0x5c22e
-; 0x5c008
-TeacherScript_0x5c008: ; 0x5c008
+TeacherScript_0x5c008:
faceplayer
loadfont
checkevent EVENT_GOT_QUICK_CLAW
@@ -24,27 +21,23 @@
verbosegiveitem QUICK_CLAW, 1
iffalse UnknownScript_0x5c021
setevent EVENT_GOT_QUICK_CLAW
-UnknownScript_0x5c01d: ; 0x5c01d
+UnknownScript_0x5c01d:
writetext UnknownText_0x5c30d
closetext
-UnknownScript_0x5c021: ; 0x5c021
+UnknownScript_0x5c021:
loadmovesprites
end
-; 0x5c023
-YoungsterScript_0x5c023: ; 0x5c023
+YoungsterScript_0x5c023:
jumptextfaceplayer UnknownText_0x5c35d
-; 0x5c026
-YoungsterScript_0x5c026: ; 0x5c026
+YoungsterScript_0x5c026:
jumptextfaceplayer UnknownText_0x5c38f
-; 0x5c029
-TeacherScript_0x5c029: ; 0x5c029
+TeacherScript_0x5c029:
jumptextfaceplayer UnknownText_0x5c3bc
-; 0x5c02c
-GrowlitheScript_0x5c02c: ; 0x5c02c
+GrowlitheScript_0x5c02c:
faceplayer
loadfont
writetext UnknownText_0x5c416
@@ -52,9 +45,8 @@
closetext
loadmovesprites
end
-; 0x5c037
-GameboyKidScript_0x5c037: ; 0x5c037
+GameboyKidScript_0x5c037:
faceplayer
loadfont
writetext UnknownText_0x5c42a
@@ -62,11 +54,10 @@
loadmovesprites
spriteface $e, DOWN
end
-; 0x5c042
-TrainerSchoolboyJack1: ; 0x5c042
+TrainerSchoolboyJack1:
; bit/flag number
- dw $46c
+ dw EVENT_BEAT_SCHOOLBOY_JACK
; trainer group && trainer id
db SCHOOLBOY, JACK1
@@ -82,9 +73,8 @@
; script when talk again
dw SchoolboyJack1Script
-; 0x5c04e
-SchoolboyJack1Script: ; 0x5c04e
+SchoolboyJack1Script:
writecode VAR_CALLERID, $5
talkaftercancel
loadfont
@@ -99,11 +89,10 @@
setevent $025f
scall UnknownScript_0x5c0fc
jump UnknownScript_0x5c074
-; 0x5c071
-UnknownScript_0x5c071: ; 0x5c071
+UnknownScript_0x5c071:
scall UnknownScript_0x5c100
-UnknownScript_0x5c074: ; 0x5c074
+UnknownScript_0x5c074:
askforphonenumber $5
if_equal $1, UnknownScript_0x5c110
if_equal $2, UnknownScript_0x5c10c
@@ -110,9 +99,8 @@
trainertotext SCHOOLBOY, JACK1, $0
scall UnknownScript_0x5c104
jump UnknownScript_0x5c108
-; 0x5c088
-UnknownScript_0x5c088: ; 0x5c088
+UnknownScript_0x5c088:
scall UnknownScript_0x5c114
winlosstext SchoolboyJack1BeatenText, $0000
copybytetovar wd9f2
@@ -121,19 +109,19 @@
if_equal $2, UnknownScript_0x5c0b3
if_equal $1, UnknownScript_0x5c0b9
if_equal $0, UnknownScript_0x5c0bf
-UnknownScript_0x5c0a7: ; 0x5c0a7
+UnknownScript_0x5c0a7:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x5c0f3
-UnknownScript_0x5c0ad: ; 0x5c0ad
+UnknownScript_0x5c0ad:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x5c0e6
-UnknownScript_0x5c0b3: ; 0x5c0b3
+UnknownScript_0x5c0b3:
checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x5c0d9
-UnknownScript_0x5c0b9: ; 0x5c0b9
+UnknownScript_0x5c0b9:
checkflag $0047
iftrue UnknownScript_0x5c0cc
-UnknownScript_0x5c0bf: ; 0x5c0bf
+UnknownScript_0x5c0bf:
loadtrainer SCHOOLBOY, JACK1
startbattle
returnafterbattle
@@ -140,9 +128,8 @@
loadvar wd9f2, $1
clearflag $0065
end
-; 0x5c0cc
-UnknownScript_0x5c0cc: ; 0x5c0cc
+UnknownScript_0x5c0cc:
loadtrainer SCHOOLBOY, JACK2
startbattle
returnafterbattle
@@ -149,9 +136,8 @@
loadvar wd9f2, $2
clearflag $0065
end
-; 0x5c0d9
-UnknownScript_0x5c0d9: ; 0x5c0d9
+UnknownScript_0x5c0d9:
loadtrainer SCHOOLBOY, JACK3
startbattle
returnafterbattle
@@ -158,9 +144,8 @@
loadvar wd9f2, $3
clearflag $0065
end
-; 0x5c0e6
-UnknownScript_0x5c0e6: ; 0x5c0e6
+UnknownScript_0x5c0e6:
loadtrainer SCHOOLBOY, JACK4
startbattle
returnafterbattle
@@ -167,54 +152,45 @@
loadvar wd9f2, $4
clearflag $0065
end
-; 0x5c0f3
-UnknownScript_0x5c0f3: ; 0x5c0f3
+UnknownScript_0x5c0f3:
loadtrainer SCHOOLBOY, JACK5
startbattle
returnafterbattle
clearflag $0065
end
-; 0x5c0fc
-UnknownScript_0x5c0fc: ; 0x5c0fc
+UnknownScript_0x5c0fc:
jumpstd asknumber1m
end
-; 0x5c100
-UnknownScript_0x5c100: ; 0x5c100
+UnknownScript_0x5c100:
jumpstd asknumber2m
end
-; 0x5c104
-UnknownScript_0x5c104: ; 0x5c104
+UnknownScript_0x5c104:
jumpstd registerednumberm
end
-; 0x5c108
-UnknownScript_0x5c108: ; 0x5c108
+UnknownScript_0x5c108:
jumpstd numberacceptedm
end
-; 0x5c10c
-UnknownScript_0x5c10c: ; 0x5c10c
+UnknownScript_0x5c10c:
jumpstd numberdeclinedm
end
-; 0x5c110
-UnknownScript_0x5c110: ; 0x5c110
+UnknownScript_0x5c110:
jumpstd phonefullm
end
-; 0x5c114
-UnknownScript_0x5c114: ; 0x5c114
+UnknownScript_0x5c114:
jumpstd rematchm
end
-; 0x5c118
-TrainerPokefanmWilliam: ; 0x5c118
+TrainerPokefanmWilliam:
; bit/flag number
- dw $4cd
+ dw EVENT_BEAT_POKEFANM_WILLIAM
; trainer group && trainer id
db POKEFANM, WILLIAM
@@ -230,9 +206,8 @@
; script when talk again
dw PokefanmWilliamScript
-; 0x5c124
-PokefanmWilliamScript: ; 0x5c124
+PokefanmWilliamScript:
talkaftercancel
loadfont
writetext UnknownText_0x5c645
@@ -239,11 +214,10 @@
closetext
loadmovesprites
end
-; 0x5c12c
-TrainerPokefanfBeverly1: ; 0x5c12c
+TrainerPokefanfBeverly1:
; bit/flag number
- dw $4d9
+ dw EVENT_BEAT_POKEFANF_BEVERLY
; trainer group && trainer id
db POKEFANF, BEVERLY1
@@ -259,9 +233,8 @@
; script when talk again
dw PokefanfBeverly1Script
-; 0x5c138
-PokefanfBeverly1Script: ; 0x5c138
+PokefanfBeverly1Script:
writecode VAR_CALLERID, $6
talkaftercancel
loadfont
@@ -278,11 +251,10 @@
setevent EVENT_SHOWED_BEVERLY_MARILL
scall UnknownScript_0x5c18f
jump UnknownScript_0x5c163
-; 0x5c160
-UnknownScript_0x5c160: ; 0x5c160
+UnknownScript_0x5c160:
scall UnknownScript_0x5c193
-UnknownScript_0x5c163: ; 0x5c163
+UnknownScript_0x5c163:
askforphonenumber $6
if_equal $1, UnknownScript_0x5c1a3
if_equal $2, UnknownScript_0x5c19f
@@ -289,70 +261,58 @@
trainertotext POKEFANF, BEVERLY1, $0
scall UnknownScript_0x5c197
jump UnknownScript_0x5c19b
-; 0x5c177
-UnknownScript_0x5c177: ; 0x5c177
+UnknownScript_0x5c177:
scall UnknownScript_0x5c1a7
verbosegiveitem NUGGET, 1
iffalse UnknownScript_0x5c186
clearflag $007d
jump UnknownScript_0x5c19b
-; 0x5c186
-UnknownScript_0x5c186: ; 0x5c186
+UnknownScript_0x5c186:
jump UnknownScript_0x5c1ab
-; 0x5c189
-UnknownScript_0x5c189: ; 0x5c189
+UnknownScript_0x5c189:
writetext UnknownText_0x5c68a
closetext
loadmovesprites
end
-; 0x5c18f
-UnknownScript_0x5c18f: ; 0x5c18f
+UnknownScript_0x5c18f:
jumpstd asknumber1f
end
-; 0x5c193
-UnknownScript_0x5c193: ; 0x5c193
+UnknownScript_0x5c193:
jumpstd asknumber2f
end
-; 0x5c197
-UnknownScript_0x5c197: ; 0x5c197
+UnknownScript_0x5c197:
jumpstd registerednumberf
end
-; 0x5c19b
-UnknownScript_0x5c19b: ; 0x5c19b
+UnknownScript_0x5c19b:
jumpstd numberacceptedf
end
-; 0x5c19f
-UnknownScript_0x5c19f: ; 0x5c19f
+UnknownScript_0x5c19f:
jumpstd numberdeclinedf
end
-; 0x5c1a3
-UnknownScript_0x5c1a3: ; 0x5c1a3
+UnknownScript_0x5c1a3:
jumpstd phonefullf
end
-; 0x5c1a7
-UnknownScript_0x5c1a7: ; 0x5c1a7
+UnknownScript_0x5c1a7:
jumpstd giftf
end
-; 0x5c1ab
-UnknownScript_0x5c1ab: ; 0x5c1ab
+UnknownScript_0x5c1ab:
jumpstd packfullf
end
-; 0x5c1af
-TrainerLassKrise: ; 0x5c1af
+TrainerLassKrise:
; bit/flag number
- dw $518
+ dw EVENT_BEAT_LASS_KRISE
; trainer group && trainer id
db LASS, KRISE
@@ -368,9 +328,8 @@
; script when talk again
dw LassKriseScript
-; 0x5c1bb
-LassKriseScript: ; 0x5c1bb
+LassKriseScript:
talkaftercancel
loadfont
writetext UnknownText_0x5c71d
@@ -377,35 +336,28 @@
closetext
loadmovesprites
end
-; 0x5c1c3
-MapNationalParkSignpost0Script: ; 0x5c1c3
+MapNationalParkSignpost0Script:
jumptext UnknownText_0x5c750
-; 0x5c1c6
-MapNationalParkSignpost1Script: ; 0x5c1c6
+MapNationalParkSignpost1Script:
jumptext UnknownText_0x5c771
-; 0x5c1c9
-MapNationalParkSignpost3Script: ; 0x5c1c9
+MapNationalParkSignpost3Script:
jumptext UnknownText_0x5c7c6
-; 0x5c1cc
-ItemFragment_0x5c1cc: ; 0x5c1cc
+ItemFragment_0x5c1cc:
db PARLYZ_HEAL, 1
-; 0x5c1ce
-ItemFragment_0x5c1ce: ; 0x5c1ce
+ItemFragment_0x5c1ce:
db TM_DIG, 1
-; 0x5c1d0
-MapNationalParkSignpostItem2: ; 0x5c1d0
+MapNationalParkSignpostItem2:
dw $0084
db FULL_HEAL
-; 0x5c1d3
-UnknownText_0x5c1d3: ; 0x5c1d3
+UnknownText_0x5c1d3:
text "Look! Check out my"
line "bag!"
@@ -415,16 +367,14 @@
para "#DEX and stuck"
line "them on my bag."
done
-; 0x5c22e
-UnknownText_0x5c22e: ; 0x5c22e
+UnknownText_0x5c22e:
text "This is MAIL I got"
line "from my daughter."
cont "It cheers me up."
done
-; 0x5c265
-UnknownText_0x5c265: ; 0x5c265
+UnknownText_0x5c265:
text "Pay attention,"
line "please!"
@@ -443,9 +393,8 @@
para "want you to have"
line "this."
done
-; 0x5c30d
-UnknownText_0x5c30d: ; 0x5c30d
+UnknownText_0x5c30d:
text "Let a #MON hold"
line "that QUICK CLAW."
@@ -453,23 +402,20 @@
line "strike first"
cont "during battle."
done
-; 0x5c35d
-UnknownText_0x5c35d: ; 0x5c35d
+UnknownText_0x5c35d:
text "I'm playing with"
line "stickers I printed"
cont "from my #DEX."
done
-; 0x5c38f
-UnknownText_0x5c38f: ; 0x5c38f
+UnknownText_0x5c38f:
text "I get the other"
line "guy's #DEX"
cont "sticker if I win."
done
-; 0x5c3bc
-UnknownText_0x5c3bc: ; 0x5c3bc
+UnknownText_0x5c3bc:
text "I take walks in"
line "the PARK, but I"
@@ -479,14 +425,12 @@
para "Trainers always"
line "want to battle…"
done
-; 0x5c416
-UnknownText_0x5c416: ; 0x5c416
+UnknownText_0x5c416:
text "PERSIAN: Fufushaa!"
done
-; 0x5c42a
-UnknownText_0x5c42a: ; 0x5c42a
+UnknownText_0x5c42a:
text "I'm printing out"
line "my #DEX."
@@ -496,9 +440,8 @@
para "MAIL and your PC"
line "BOXES."
done
-; 0x5c47e
-SchoolboyJack1SeenText: ; 0x5c47e
+SchoolboyJack1SeenText:
text "The world of"
line "#MON is deep."
@@ -509,14 +452,12 @@
para "But I know more"
line "than you do!"
done
-; 0x5c4e4
-SchoolboyJack1BeatenText: ; 0x5c4e4
+SchoolboyJack1BeatenText:
text "Wha-wha-what?"
done
-; 0x5c4f3
-UnknownText_0x5c4f3: ; 0x5c4f3
+UnknownText_0x5c4f3:
text "There is a lot"
line "to learn."
@@ -528,9 +469,8 @@
para "Traded #MON"
line "level up faster."
done
-; 0x5c552
-PokefanfBeverly1SeenText: ; 0x5c552
+PokefanfBeverly1SeenText:
text "My #MON are"
line "simply darling."
@@ -538,22 +478,19 @@
line "how proud my"
cont "darlings make me."
done
-; 0x5c59e
-PokefanfBeverly1BeatenText: ; 0x5c59e
+PokefanfBeverly1BeatenText:
text "I can beat you in"
line "pride, but…"
done
-; 0x5c5bd
-UnknownText_0x5c5bd: ; 0x5c5bd
+UnknownText_0x5c5bd:
text "I must say, your"
line "#MON are quite"
cont "cute, too."
done
-; 0x5c5e9
-PokefanmWilliamSeenText: ; 0x5c5e9
+PokefanmWilliamSeenText:
text "We adore our #-"
line "MON, even if they"
cont "dislike us."
@@ -561,14 +498,12 @@
para "That's what being"
line "a FAN is about."
done
-; 0x5c639
-PokefanmWilliamBeatenText: ; 0x5c639
+PokefanmWilliamBeatenText:
text "M-my #MON!"
done
-; 0x5c645
-UnknownText_0x5c645: ; 0x5c645
+UnknownText_0x5c645:
text "I lost the battle,"
line "but my #MON win"
@@ -575,9 +510,8 @@
para "the prize for"
line "being most lovely."
done
-; 0x5c68a
-UnknownText_0x5c68a: ; 0x5c68a
+UnknownText_0x5c68a:
text "My friend keeps a"
line "MARILL!"
@@ -587,35 +521,30 @@
para "Oh, I wish for a"
line "MARILL of my own…"
done
-; 0x5c6e4
-LassKriseSeenText: ; 0x5c6e4
+LassKriseSeenText:
text "Hello? Why are you"
line "staring at me?"
para "Oh, a battle?"
done
-; 0x5c715
-LassKriseBeatenText: ; 0x5c715
+LassKriseBeatenText:
text "…Hmmm…"
done
-; 0x5c71d
-UnknownText_0x5c71d: ; 0x5c71d
+UnknownText_0x5c71d:
text "I thought you were"
line "staring at me"
cont "because I'm cute!"
done
-; 0x5c750
-UnknownText_0x5c750: ; 0x5c750
+UnknownText_0x5c750:
text "RELAXATION SQUARE"
line "NATIONAL PARK"
done
-; 0x5c771
-UnknownText_0x5c771: ; 0x5c771
+UnknownText_0x5c771:
text "What is this"
line "notice?"
@@ -625,9 +554,8 @@
para "NATIONAL PARK"
line "WARDEN'S OFFICE"
done
-; 0x5c7c6
-UnknownText_0x5c7c6: ; 0x5c7c6
+UnknownText_0x5c7c6:
text "TRAINER TIPS"
para "Print out MAIL by"
@@ -634,9 +562,8 @@
line "opening it then"
cont "pressing START."
done
-; 0x5c806
-NationalPark_MapEventHeader: ; 0x5c806
+NationalPark_MapEventHeader:
; filler
db 0, 0
@@ -673,4 +600,3 @@
person_event SPRITE_POKE_BALL, 16, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c1cc, $0658
person_event SPRITE_GAMEBOY_KID, 10, 30, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x5c037, $ffff
person_event SPRITE_POKE_BALL, 47, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c1ce, $0659
-; 0x5c8ea
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -1,14 +1,13 @@
-OlivineLighthouse2F_MapScriptHeader: ; 0x5af6f
+OlivineLighthouse2F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x5af71
-TrainerGentlemanAlfred: ; 0x5af71
+TrainerGentlemanAlfred:
; bit/flag number
- dw $49e
+ dw EVENT_BEAT_GENTLEMAN_ALFRED
; trainer group && trainer id
db GENTLEMAN, ALFRED
@@ -24,9 +23,8 @@
; script when talk again
dw GentlemanAlfredScript
-; 0x5af7d
-GentlemanAlfredScript: ; 0x5af7d
+GentlemanAlfredScript:
talkaftercancel
loadfont
writetext UnknownText_0x5b13e
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x5af85
-TrainerSailorHuey1: ; 0x5af85
+TrainerSailorHuey1:
; bit/flag number
- dw $576
+ dw EVENT_BEAT_SAILOR_HUEY
; trainer group && trainer id
db SAILOR, HUEY1
@@ -53,9 +50,8 @@
; script when talk again
dw SailorHuey1Script
-; 0x5af91
-SailorHuey1Script: ; 0x5af91
+SailorHuey1Script:
writecode VAR_CALLERID, $7
talkaftercancel
loadfont
@@ -68,11 +64,10 @@
setevent $0263
scall UnknownScript_0x5b053
jump UnknownScript_0x5afb3
-; 0x5afb0
-UnknownScript_0x5afb0: ; 0x5afb0
+UnknownScript_0x5afb0:
scall UnknownScript_0x5b057
-UnknownScript_0x5afb3: ; 0x5afb3
+UnknownScript_0x5afb3:
askforphonenumber $7
if_equal $1, UnknownScript_0x5b067
if_equal $2, UnknownScript_0x5b063
@@ -79,9 +74,8 @@
trainertotext SAILOR, HUEY1, $0
scall UnknownScript_0x5b05b
jump UnknownScript_0x5b05f
-; 0x5afc7
-UnknownScript_0x5afc7: ; 0x5afc7
+UnknownScript_0x5afc7:
scall UnknownScript_0x5b06b
winlosstext SailorHuey1BeatenText, $0000
copybytetovar wd9f4
@@ -89,16 +83,16 @@
if_equal $2, UnknownScript_0x5afe8
if_equal $1, UnknownScript_0x5afee
if_equal $0, UnknownScript_0x5aff4
-UnknownScript_0x5afe2: ; 0x5afe2
+UnknownScript_0x5afe2:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x5b01b
-UnknownScript_0x5afe8: ; 0x5afe8
+UnknownScript_0x5afe8:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x5b00e
-UnknownScript_0x5afee: ; 0x5afee
+UnknownScript_0x5afee:
checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x5b001
-UnknownScript_0x5aff4: ; 0x5aff4
+UnknownScript_0x5aff4:
loadtrainer SAILOR, HUEY1
startbattle
returnafterbattle
@@ -105,9 +99,8 @@
loadvar wd9f4, $1
clearflag $0066
end
-; 0x5b001
-UnknownScript_0x5b001: ; 0x5b001
+UnknownScript_0x5b001:
loadtrainer SAILOR, HUEY2
startbattle
returnafterbattle
@@ -114,9 +107,8 @@
loadvar wd9f4, $2
clearflag $0066
end
-; 0x5b00e
-UnknownScript_0x5b00e: ; 0x5b00e
+UnknownScript_0x5b00e:
loadtrainer SAILOR, HUEY3
startbattle
returnafterbattle
@@ -123,9 +115,8 @@
loadvar wd9f4, $3
clearflag $0066
end
-; 0x5b01b
-UnknownScript_0x5b01b: ; 0x5b01b
+UnknownScript_0x5b01b:
loadtrainer SAILOR, HUEY4
startbattle
returnafterbattle
@@ -139,13 +130,11 @@
iffalse UnknownScript_0x5b06f
setevent $0265
jump UnknownScript_0x5b05f
-; 0x5b03e
-UnknownScript_0x5b03e: ; 0x5b03e
+UnknownScript_0x5b03e:
end
-; 0x5b03f
-UnknownScript_0x5b03f: ; 0x5b03f
+UnknownScript_0x5b03f:
loadfont
writetext UnknownText_0x5b1b6
closetext
@@ -154,69 +143,57 @@
clearevent EVENT_HUEY_PROTEIN
setevent $0265
jump UnknownScript_0x5b05f
-; 0x5b053
-UnknownScript_0x5b053: ; 0x5b053
+UnknownScript_0x5b053:
jumpstd asknumber1m
end
-; 0x5b057
-UnknownScript_0x5b057: ; 0x5b057
+UnknownScript_0x5b057:
jumpstd asknumber2m
end
-; 0x5b05b
-UnknownScript_0x5b05b: ; 0x5b05b
+UnknownScript_0x5b05b:
jumpstd registerednumberm
end
-; 0x5b05f
-UnknownScript_0x5b05f: ; 0x5b05f
+UnknownScript_0x5b05f:
jumpstd numberacceptedm
end
-; 0x5b063
-UnknownScript_0x5b063: ; 0x5b063
+UnknownScript_0x5b063:
jumpstd numberdeclinedm
end
-; 0x5b067
-UnknownScript_0x5b067: ; 0x5b067
+UnknownScript_0x5b067:
jumpstd phonefullm
end
-; 0x5b06b
-UnknownScript_0x5b06b: ; 0x5b06b
+UnknownScript_0x5b06b:
jumpstd rematchm
end
-; 0x5b06f
-UnknownScript_0x5b06f: ; 0x5b06f
+UnknownScript_0x5b06f:
setevent EVENT_HUEY_PROTEIN
jumpstd packfullm
end
-; 0x5b076
-UnknownScript_0x5b076: ; 0x5b076
+UnknownScript_0x5b076:
jumpstd rematchgiftm
end
-; 0x5b07a
-SailorHuey1SeenText: ; 0x5b07a
+SailorHuey1SeenText:
text "Men of the sea are"
line "always spoiling"
cont "for a good fight!"
done
-; 0x5b0b0
-SailorHuey1BeatenText: ; 0x5b0b0
+SailorHuey1BeatenText:
text "Urf!"
line "I lose!"
done
-; 0x5b0be
; possibly unused
-UnknownText_0x5b0be: ; 0x5b0be
+UnknownText_0x5b0be:
text "What power!"
line "How would you like"
@@ -223,21 +200,18 @@
para "to sail the seas"
line "with me?"
done
-; 0x5b0f8
-GentlemanAlfredSeenText: ; 0x5b0f8
+GentlemanAlfredSeenText:
text "Hm? This is no"
line "place for playing."
done
-; 0x5b11b
-GentlemanAlfredBeatenText: ; 0x5b11b
+GentlemanAlfredBeatenText:
text "Ah! I can see that"
line "you're serious."
done
-; 0x5b13e
-UnknownText_0x5b13e: ; 0x5b13e
+UnknownText_0x5b13e:
text "Up top is a #-"
line "MON that keeps the"
cont "LIGHTHOUSE lit."
@@ -248,9 +222,8 @@
para "can't be cured by"
line "ordinary medicine."
done
-; 0x5b1b6
-UnknownText_0x5b1b6: ; 0x5b1b6
+UnknownText_0x5b1b6:
text "Man! You're as"
line "tough as ever!"
@@ -258,9 +231,8 @@
line "that medicine from"
cont "before."
done
-; 0x5b1fd
-OlivineLighthouse2F_MapEventHeader: ; 0x5b1fd
+OlivineLighthouse2F_MapEventHeader:
; filler
db 0, 0
@@ -283,4 +255,3 @@
db 2
person_event SPRITE_SAILOR, 7, 13, $9, $0, 255, 255, $92, 3, TrainerSailorHuey1, $ffff
person_event SPRITE_GENTLEMAN, 12, 21, $8, $0, 255, 255, $92, 3, TrainerGentlemanAlfred, $ffff
-; 0x5b23b
--- a/maps/OlivineLighthouse3F.asm
+++ b/maps/OlivineLighthouse3F.asm
@@ -1,14 +1,13 @@
-OlivineLighthouse3F_MapScriptHeader: ; 0x5b23b
+OlivineLighthouse3F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x5b23d
-TrainerBird_keeperTheo: ; 0x5b23d
+TrainerBird_keeperTheo:
; bit/flag number
- dw $3fe
+ dw EVENT_BEAT_BIRD_KEEPER_THEO
; trainer group && trainer id
db BIRD_KEEPER, THEO
@@ -24,9 +23,8 @@
; script when talk again
dw Bird_keeperTheoScript
-; 0x5b249
-Bird_keeperTheoScript: ; 0x5b249
+Bird_keeperTheoScript:
talkaftercancel
loadfont
writetext UnknownText_0x5b2df
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x5b251
-TrainerGentlemanPreston: ; 0x5b251
+TrainerGentlemanPreston:
; bit/flag number
- dw $49a
+ dw EVENT_BEAT_GENTLEMAN_PRESTON
; trainer group && trainer id
db GENTLEMAN, PRESTON
@@ -53,9 +50,8 @@
; script when talk again
dw GentlemanPrestonScript
-; 0x5b25d
-GentlemanPrestonScript: ; 0x5b25d
+GentlemanPrestonScript:
talkaftercancel
loadfont
writetext UnknownText_0x5b457
@@ -62,11 +58,10 @@
closetext
loadmovesprites
end
-; 0x5b265
-TrainerSailorTerrell: ; 0x5b265
+TrainerSailorTerrell:
; bit/flag number
- dw $577
+ dw EVENT_BEAT_SAILOR_TERRELL
; trainer group && trainer id
db SAILOR, TERRELL
@@ -82,9 +77,8 @@
; script when talk again
dw SailorTerrellScript
-; 0x5b271
-SailorTerrellScript: ; 0x5b271
+SailorTerrellScript:
talkaftercancel
loadfont
writetext UnknownText_0x5b384
@@ -91,13 +85,11 @@
closetext
loadmovesprites
end
-; 0x5b279
-ItemFragment_0x5b279: ; 0x5b279
+ItemFragment_0x5b279:
db ETHER, 1
-; 0x5b27b
-Bird_keeperTheoSeenText: ; 0x5b27b
+Bird_keeperTheoSeenText:
text "Why are you here?"
line "Are you just going"
@@ -104,15 +96,13 @@
para "to gawk? I suggest"
line "that you leave!"
done
-; 0x5b2c4
-Bird_keeperTheoBeatenText: ; 0x5b2c4
+Bird_keeperTheoBeatenText:
text "You really are"
line "concerned…"
done
-; 0x5b2df
-UnknownText_0x5b2df: ; 0x5b2df
+UnknownText_0x5b2df:
text "How the heck do"
line "you go up?"
@@ -122,22 +112,19 @@
para "but I can't get up"
line "there…"
done
-; 0x5b333
-SailorTerrellSeenText: ; 0x5b333
+SailorTerrellSeenText:
text "Sailors are both"
line "kind and strong."
cont "How about you?"
done
-; 0x5b365
-SailorTerrellBeatenText: ; 0x5b365
+SailorTerrellBeatenText:
text "You are both kind"
line "and strong…"
done
-; 0x5b384
-UnknownText_0x5b384: ; 0x5b384
+UnknownText_0x5b384:
text "Every time I come"
line "back to OLIVINE, I"
cont "visit the GYM."
@@ -148,30 +135,26 @@
para "changed without me"
line "noticing."
done
-; 0x5b3f4
-GentlemanPrestonSeenText: ; 0x5b3f4
+GentlemanPrestonSeenText:
text "I travel the world"
line "to train my #-"
cont "MON. I wish to"
cont "battle with you."
done
-; 0x5b437
-GentlemanPrestonBeatenText: ; 0x5b437
+GentlemanPrestonBeatenText:
text "…sigh… I must"
line "train some more…"
done
-; 0x5b457
-UnknownText_0x5b457: ; 0x5b457
+UnknownText_0x5b457:
text "JASMINE used to"
line "use rock #MON"
cont "like ONIX."
done
-; 0x5b481
-OlivineLighthouse3F_MapEventHeader: ; 0x5b481
+OlivineLighthouse3F_MapEventHeader:
; filler
db 0, 0
@@ -199,4 +182,3 @@
person_event SPRITE_GENTLEMAN, 9, 17, $9, $0, 255, 255, $92, 4, TrainerGentlemanPreston, $ffff
person_event SPRITE_YOUNGSTER, 13, 7, $7, $0, 255, 255, $92, 3, TrainerBird_keeperTheo, $ffff
person_event SPRITE_POKE_BALL, 6, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x5b279, $0664
-; 0x5b4e8
--- a/maps/OlivineLighthouse4F.asm
+++ b/maps/OlivineLighthouse4F.asm
@@ -1,14 +1,13 @@
-OlivineLighthouse4F_MapScriptHeader: ; 0x5b4e8
+OlivineLighthouse4F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x5b4ea
-TrainerLassConnie1: ; 0x5b4ea
+TrainerLassConnie:
; bit/flag number
- dw $519
+ dw EVENT_BEAT_LASS_CONNIE
; trainer group && trainer id
db LASS, CONNIE1
@@ -24,9 +23,8 @@
; script when talk again
dw LassConnie1Script
-; 0x5b4f6
-LassConnie1Script: ; 0x5b4f6
+LassConnie1Script:
talkaftercancel
loadfont
writetext UnknownText_0x5b63c
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x5b4fe
-TrainerSailorKent: ; 0x5b4fe
+TrainerSailorKent:
; bit/flag number
- dw $578
+ dw EVENT_BEAT_SAILOR_KENT
; trainer group && trainer id
db SAILOR, KENT
@@ -53,9 +50,8 @@
; script when talk again
dw SailorKentScript
-; 0x5b50a
-SailorKentScript: ; 0x5b50a
+SailorKentScript:
talkaftercancel
loadfont
writetext UnknownText_0x5b584
@@ -62,9 +58,8 @@
closetext
loadmovesprites
end
-; 0x5b512
-SailorKentSeenText: ; 0x5b512
+SailorKentSeenText:
text "JASMINE must be"
line "worried sick about"
cont "the #MON here."
@@ -72,15 +67,13 @@
para "She won't even"
line "smile these days."
done
-; 0x5b565
-SailorKentBeatenText: ; 0x5b565
+SailorKentBeatenText:
text "I can't manage a"
line "smile either…"
done
-; 0x5b584
-UnknownText_0x5b584: ; 0x5b584
+UnknownText_0x5b584:
text "Speaking of sick,"
line "I've heard there's"
@@ -87,9 +80,8 @@
para "a good PHARMACY in"
line "CIANWOOD."
done
-; 0x5b5c5
-LassConnie1SeenText: ; 0x5b5c5
+LassConnie1SeenText:
text "JASMINE is this"
line "city's GYM LEADER."
@@ -99,14 +91,12 @@
para "Nobody had better"
line "get in my way!"
done
-; 0x5b62b
-LassConnie1BeatenText: ; 0x5b62b
+LassConnie1BeatenText:
text "Aaack! My #MON!"
done
-; 0x5b63c
-UnknownText_0x5b63c: ; 0x5b63c
+UnknownText_0x5b63c:
text "Right. Anybody"
line "would be worried"
cont "if his or her own"
@@ -118,9 +108,8 @@
para "JASMINE can come"
line "back to the GYM."
done
-; 0x5b6c0
-OlivineLighthouse4F_MapEventHeader: ; 0x5b6c0
+OlivineLighthouse4F_MapEventHeader:
; filler
db 0, 0
@@ -146,5 +135,4 @@
; people-events
db 2
person_event SPRITE_SAILOR, 18, 11, $8, $0, 255, 255, $92, 3, TrainerSailorKent, $ffff
- person_event SPRITE_LASS, 6, 15, $6, $0, 255, 255, $92, 1, TrainerLassConnie1, $ffff
-; 0x5b712
+ person_event SPRITE_LASS, 6, 15, $6, $0, 255, 255, $92, 1, TrainerLassConnie, $ffff
--- a/maps/OlivineLighthouse5F.asm
+++ b/maps/OlivineLighthouse5F.asm
@@ -1,14 +1,13 @@
-OlivineLighthouse5F_MapScriptHeader: ; 0x60980
+OlivineLighthouse5F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x60982
-TrainerBird_keeperDenis: ; 0x60982
+TrainerBird_keeperDenis:
; bit/flag number
- dw $400
+ dw EVENT_BEAT_BIRD_KEEPER_DENIS
; trainer group && trainer id
db BIRD_KEEPER, DENIS
@@ -24,9 +23,8 @@
; script when talk again
dw Bird_keeperDenisScript
-; 0x6098e
-Bird_keeperDenisScript: ; 0x6098e
+Bird_keeperDenisScript:
talkaftercancel
loadfont
writetext UnknownText_0x60ac3
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x60996
-TrainerSailorErnest: ; 0x60996
+TrainerSailorErnest:
; bit/flag number
- dw $579
+ dw EVENT_BEAT_SAILOR_ERNEST
; trainer group && trainer id
db SAILOR, ERNEST
@@ -53,9 +50,8 @@
; script when talk again
dw SailorErnestScript
-; 0x609a2
-SailorErnestScript: ; 0x609a2
+SailorErnestScript:
talkaftercancel
loadfont
writetext UnknownText_0x60a1f
@@ -62,27 +58,22 @@
closetext
loadmovesprites
end
-; 0x609aa
-ItemFragment_0x609aa: ; 0x609aa
+ItemFragment_0x609aa:
db RARE_CANDY, 1
-; 0x609ac
-ItemFragment_0x609ac: ; 0x609ac
+ItemFragment_0x609ac:
db SUPER_REPEL, 1
-; 0x609ae
-ItemFragment_0x609ae: ; 0x609ae
+ItemFragment_0x609ae:
db TM_SWAGGER, 1
-; 0x609b0
-MapOlivineLighthouse5FSignpostItem0: ; 0x609b0
+MapOlivineLighthouse5FSignpostItem0:
dw $0085
db HYPER_POTION
-; 0x609b3
-SailorErnestSeenText: ; 0x609b3
+SailorErnestSeenText:
text "I wanted to battle"
line "JASMINE, but she's"
@@ -89,15 +80,13 @@
para "not up to it now."
line "So, how about you?"
done
-; 0x609fe
-SailorErnestBeatenText: ; 0x609fe
+SailorErnestBeatenText:
text "Whoa, whoa. You're"
line "overwhelming!"
done
-; 0x60a1f
-UnknownText_0x60a1f: ; 0x60a1f
+UnknownText_0x60a1f:
text "A GYM LEADER isn't"
line "just about being"
@@ -105,9 +94,8 @@
line "also needs to be"
cont "compassionate."
done
-; 0x60a74
-Bird_keeperDenisSeenText: ; 0x60a74
+Bird_keeperDenisSeenText:
text "We're pretty high"
line "up here. My bird"
@@ -114,14 +102,12 @@
para "#MON are in"
line "prime form."
done
-; 0x60aaf
-Bird_keeperDenisBeatenText: ; 0x60aaf
+Bird_keeperDenisBeatenText:
text "Oops…They crashed…"
done
-; 0x60ac3
-UnknownText_0x60ac3: ; 0x60ac3
+UnknownText_0x60ac3:
text "My #MON learned"
line "how to use FLY in"
cont "CIANWOOD."
@@ -130,9 +116,8 @@
line "loser, I'll FLY"
cont "across the sea…"
done
-; 0x60b20
-OlivineLighthouse5F_MapEventHeader: ; 0x60b20
+OlivineLighthouse5F_MapEventHeader:
; filler
db 0, 0
@@ -160,4 +145,3 @@
person_event SPRITE_POKE_BALL, 16, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x609aa, $0665
person_event SPRITE_POKE_BALL, 19, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x609ac, $0666
person_event SPRITE_POKE_BALL, 17, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x609ae, $0667
-; 0x60b8f
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -37,7 +37,7 @@
TrainerCamperJerry:
; bit/flag number
- dw $42b
+ dw EVENT_BEAT_CAMPER_JERRY
; trainer group && trainer id
db CAMPER, JERRY
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -1,12 +1,11 @@
-RadioTower1F_MapScriptHeader: ; 0x5cd27
+RadioTower1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x5cd29
-ReceptionistScript_0x5cd29: ; 0x5cd29
+ReceptionistScript_0x5cd29:
faceplayer
loadfont
checkflag $0013
@@ -15,16 +14,14 @@
closetext
loadmovesprites
end
-; 0x5cd37
-UnknownScript_0x5cd37: ; 0x5cd37
+UnknownScript_0x5cd37:
writetext UnknownText_0x5ce81
closetext
loadmovesprites
end
-; 0x5cd3d
-GentlemanScript_0x5cd3d: ; 0x5cd3d
+GentlemanScript_0x5cd3d:
faceplayer
loadfont
writetext UnknownText_0x5ceba
@@ -32,7 +29,7 @@
special Functionc434
iffalse UnknownScript_0x5cd4c
special Functionc422
-UnknownScript_0x5cd4c: ; 0x5cd4c
+UnknownScript_0x5cd4c:
special Function4d9d3
checkflag $004e
iftrue UnknownScript_0x5cd84
@@ -56,16 +53,14 @@
if_equal $2, UnknownScript_0x5cd9f
if_equal $3, UnknownScript_0x5cdb4
jump UnknownScript_0x5cdc9
-; 0x5cd84
-UnknownScript_0x5cd84: ; 0x5cd84
+UnknownScript_0x5cd84:
writetext UnknownText_0x5cf7e
closetext
loadmovesprites
end
-; 0x5cd8a
-UnknownScript_0x5cd8a: ; 0x5cd8a
+UnknownScript_0x5cd8a:
writetext UnknownText_0x5cfb5
playsound SFX_1ST_PLACE
waitbutton
@@ -75,9 +70,8 @@
itemnotify
setflag $004e
jump UnknownScript_0x5cd84
-; 0x5cd9f
-UnknownScript_0x5cd9f: ; 0x5cd9f
+UnknownScript_0x5cd9f:
writetext UnknownText_0x5d023
playsound SFX_2ND_PLACE
waitbutton
@@ -87,9 +81,8 @@
itemnotify
setflag $004e
jump UnknownScript_0x5cd84
-; 0x5cdb4
-UnknownScript_0x5cdb4: ; 0x5cdb4
+UnknownScript_0x5cdb4:
writetext UnknownText_0x5d076
playsound SFX_3RD_PLACE
waitbutton
@@ -99,23 +92,20 @@
itemnotify
setflag $004e
jump UnknownScript_0x5cd84
-; 0x5cdc9
-UnknownScript_0x5cdc9: ; 0x5cdc9
+UnknownScript_0x5cdc9:
writetext UnknownText_0x5d0c0
closetext
loadmovesprites
end
-; 0x5cdcf
-UnknownScript_0x5cdcf: ; 0x5cdcf
+UnknownScript_0x5cdcf:
writetext UnknownText_0x5d0e6
closetext
loadmovesprites
end
-; 0x5cdd5
-CooltrainerFScript_0x5cdd5: ; 0x5cdd5
+CooltrainerFScript_0x5cdd5:
faceplayer
loadfont
checkflag $0000
@@ -155,48 +145,41 @@
writetext UnknownText_0x5d3c0
keeptextopen
setflag $0000
-UnknownScript_0x5ce2d: ; 0x5ce2d
+UnknownScript_0x5ce2d:
writetext UnknownText_0x5d3e5
closetext
loadmovesprites
end
-; 0x5ce33
-RadioCardText: ; 0x5ce33
+RadioCardText:
db "RADIO CARD@"
-; 0x5ce3d
-UnknownScript_0x5ce3e: ; 0x5ce3e
+UnknownScript_0x5ce3e:
jumpstd $002f
end
-; 0x5ce42
-UnknownScript_0x5ce42: ; 0x5ce42
+UnknownScript_0x5ce42:
playsound SFX_WRONG
writetext UnknownText_0x5d409
closetext
loadmovesprites
end
-; 0x5ce4b
-UnknownScript_0x5ce4b: ; 0x5ce4b
+UnknownScript_0x5ce4b:
writetext UnknownText_0x5d443
closetext
loadmovesprites
end
-; 0x5ce51
-LassScript_0x5ce51: ; 0x5ce51
+LassScript_0x5ce51:
jumptextfaceplayer UnknownText_0x5d476
-; 0x5ce54
-YoungsterScript_0x5ce54: ; 0x5ce54
+YoungsterScript_0x5ce54:
jumptextfaceplayer UnknownText_0x5d4ac
-; 0x5ce57
-TrainerGruntM3: ; 0x5ce57
+TrainerGruntM3:
; bit/flag number
- dw $4f3
+ dw EVENT_BEAT_ROCKET_GRUNTM_3
; trainer group && trainer id
db GRUNTM, 3
@@ -212,9 +195,8 @@
; script when talk again
dw GruntM3Script
-; 0x5ce63
-GruntM3Script: ; 0x5ce63
+GruntM3Script:
talkaftercancel
loadfont
writetext UnknownText_0x5d5a2
@@ -221,42 +203,35 @@
closetext
loadmovesprites
end
-; 0x5ce6b
-MapRadioTower1FSignpost0Script: ; 0x5ce6b
+MapRadioTower1FSignpost0Script:
jumptext UnknownText_0x5d5e7
-; 0x5ce6e
-MapRadioTower1FSignpost1Script: ; 0x5ce6e
+MapRadioTower1FSignpost1Script:
jumptext UnknownText_0x5d631
-; 0x5ce71
-MovementData_0x5ce71: ; 0x5ce71
+MovementData_0x5ce71:
step_right
turn_head_up
step_end
-; 0x5ce74
-MovementData_0x5ce74: ; 0x5ce74
+MovementData_0x5ce74:
step_left
turn_head_up
step_end
-; 0x5ce77
-UnknownText_0x5ce77: ; 0x5ce77
+UnknownText_0x5ce77:
text "Welcome!"
done
-; 0x5ce81
-UnknownText_0x5ce81: ; 0x5ce81
+UnknownText_0x5ce81:
text "Hello. I'm sorry,"
line "but we're not"
cont "offering any tours"
cont "today."
done
-; 0x5ceba
-UnknownText_0x5ceba: ; 0x5ceba
+UnknownText_0x5ceba:
text "Hi, are you here"
line "for the LUCKY NUM-"
cont "BER SHOW?"
@@ -268,36 +243,31 @@
para "If you get lucky,"
line "you win a prize."
done
-; 0x5cf3a
-UnknownText_0x5cf3a: ; 0x5cf3a
+UnknownText_0x5cf3a:
text "This week's ID"
line "number is @"
text_from_ram StringBuffer3
text "."
done
-; 0x5cf5a
-UnknownText_0x5cf5a: ; 0x5cf5a
+UnknownText_0x5cf5a:
text "Let's see if you"
line "have a match."
done
-; 0x5cf79
-UnknownText_0x5cf79: ; 0x5cf79
+UnknownText_0x5cf79:
text $56
line $56
done
-; 0x5cf7e
-UnknownText_0x5cf7e: ; 0x5cf7e
+UnknownText_0x5cf7e:
text "Please come back"
line "next week for the"
cont "next LUCKY NUMBER."
done
-; 0x5cfb5
-UnknownText_0x5cfb5: ; 0x5cfb5
+UnknownText_0x5cfb5:
text "Wow! You have a"
line "perfect match of"
cont "all five numbers!"
@@ -308,9 +278,8 @@
para "You have won a"
line "MASTER BALL!"
done
-; 0x5d023
-UnknownText_0x5d023: ; 0x5d023
+UnknownText_0x5d023:
text "Hey! You've"
line "matched the last"
cont "three numbers!"
@@ -319,9 +288,8 @@
line "prize, an EXP."
cont "SHARE!"
done
-; 0x5d076
-UnknownText_0x5d076: ; 0x5d076
+UnknownText_0x5d076:
text "Ooh, you've"
line "matched the last"
cont "two numbers."
@@ -329,15 +297,13 @@
para "You've won third"
line "prize, a PP UP."
done
-; 0x5d0c0
-UnknownText_0x5d0c0: ; 0x5d0c0
+UnknownText_0x5d0c0:
text "Nope, none of your"
line "ID numbers match."
done
-; 0x5d0e6
-UnknownText_0x5d0e6: ; 0x5d0e6
+UnknownText_0x5d0e6:
text "You've got no room"
line "for your prize."
@@ -344,9 +310,8 @@
para "Make room and come"
line "back right away."
done
-; 0x5d12d
-UnknownText_0x5d12d: ; 0x5d12d
+UnknownText_0x5d12d:
text "We have a special"
line "quiz campaign on"
cont "right now."
@@ -364,9 +329,8 @@
para "Would you like to"
line "take the quiz?"
done
-; 0x5d1f2
-UnknownText_0x5d1f2: ; 0x5d1f2
+UnknownText_0x5d1f2:
text "Question 1:"
para "Is there a #MON"
@@ -373,9 +337,8 @@
line "that appears only"
cont "in the morning?"
done
-; 0x5d231
-UnknownText_0x5d231: ; 0x5d231
+UnknownText_0x5d231:
text "Correct!"
line "Question 2:"
@@ -385,9 +348,8 @@
para "You can't buy a"
line "BERRY at a MART."
done
-; 0x5d282
-UnknownText_0x5d282: ; 0x5d282
+UnknownText_0x5d282:
text "Bull's-eye!"
line "Question 3:"
@@ -394,9 +356,8 @@
para "Does HM01 contain"
line "the move FLASH?"
done
-; 0x5d2bc
-UnknownText_0x5d2bc: ; 0x5d2bc
+UnknownText_0x5d2bc:
text "So far so good!"
line "Question 4:"
@@ -406,9 +367,8 @@
para "who uses bird"
line "#MON?"
done
-; 0x5d30e
-UnknownText_0x5d30e: ; 0x5d30e
+UnknownText_0x5d30e:
text "Wow! Right again!"
line "Here's the final"
cont "question:"
@@ -419,9 +379,8 @@
para "have CHARMANDER"
line "on their reels?"
done
-; 0x5d37b
-UnknownText_0x5d37b: ; 0x5d37b
+UnknownText_0x5d37b:
text "Bingo! You got it!"
line "Congratulations!"
@@ -428,22 +387,19 @@
para "Here's your prize,"
line "a RADIO CARD!"
done
-; 0x5d3c0
-UnknownText_0x5d3c0: ; 0x5d3c0
+UnknownText_0x5d3c0:
text "<PLAYER>'s #GEAR"
line "can now double as"
cont "a radio!"
done
-; 0x5d3e5
-UnknownText_0x5d3e5: ; 0x5d3e5
+UnknownText_0x5d3e5:
text "Please tune in to"
line "our radio shows."
done
-; 0x5d409
-UnknownText_0x5d409: ; 0x5d409
+UnknownText_0x5d409:
text "Oh, dear."
line "Sorry, but you"
@@ -450,16 +406,14 @@
para "got it wrong."
line "Please try again!"
done
-; 0x5d443
-UnknownText_0x5d443: ; 0x5d443
+UnknownText_0x5d443:
text "Oh. I see. Please"
line "see me if you"
cont "change your mind."
done
-; 0x5d476
-UnknownText_0x5d476: ; 0x5d476
+UnknownText_0x5d476:
text "BEN is a fabulous"
line "DJ."
@@ -466,9 +420,8 @@
para "His sweet voice"
line "makes me melt!"
done
-; 0x5d4ac
-UnknownText_0x5d4ac: ; 0x5d4ac
+UnknownText_0x5d4ac:
text "I love MARY, from"
line "#MON TALK."
@@ -476,9 +429,8 @@
line "she sounds like,"
cont "though."
done
-; 0x5d4f4
-GruntM3SeenText: ; 0x5d4f4
+GruntM3SeenText:
text "We've finally"
line "taken over the"
cont "RADIO TOWER!"
@@ -492,15 +444,13 @@
para "We'll show you"
line "how scary we are!"
done
-; 0x5d582
-GruntM3BeatenText: ; 0x5d582
+GruntM3BeatenText:
text "Too strong! We"
line "must watch you…"
done
-; 0x5d5a2
-UnknownText_0x5d5a2: ; 0x5d5a2
+UnknownText_0x5d5a2:
text "You're too strong."
para "Our plan could be"
@@ -507,9 +457,8 @@
line "ruined. I must"
cont "warn the others…"
done
-; 0x5d5e7
-UnknownText_0x5d5e7: ; 0x5d5e7
+UnknownText_0x5d5e7:
text "1F RECEPTION"
line "2F SALES"
@@ -519,9 +468,8 @@
para "5F DIRECTOR'S"
line " OFFICE"
done
-; 0x5d631
-UnknownText_0x5d631: ; 0x5d631
+UnknownText_0x5d631:
text "LUCKY CHANNEL!"
para "Win with #MON"
@@ -531,9 +479,8 @@
line "to collect differ-"
cont "ent ID numbers!"
done
-; 0x5d68e
-RadioTower1F_MapEventHeader: ; 0x5d68e
+RadioTower1F_MapEventHeader:
; filler
db 0, 0
@@ -559,4 +506,3 @@
person_event SPRITE_ROCKET, 5, 18, $6, $0, 255, 255, $2, 3, TrainerGruntM3, $06ce
person_event SPRITE_GENTLEMAN, 10, 12, $7, $0, 255, 255, $90, 0, GentlemanScript_0x5cd3d, $06cf
person_event SPRITE_COOLTRAINER_F, 10, 16, $7, $0, 255, 255, $a0, 0, CooltrainerFScript_0x5cdd5, $06cf
-; 0x5d6fb
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -1,20 +1,17 @@
-RadioTower2F_MapScriptHeader: ; 0x5d6fb
+RadioTower2F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x5d6fd
-UnknownScript_0x5d6fd: ; 0x5d6fd
+UnknownScript_0x5d6fd:
end
-; 0x5d6fe
-SuperNerdScript_0x5d6fe: ; 0x5d6fe
+SuperNerdScript_0x5d6fe:
jumptextfaceplayer UnknownText_0x5d924
-; 0x5d701
-TeacherScript_0x5d701: ; 0x5d701
+TeacherScript_0x5d701:
faceplayer
loadfont
checkflag $0013
@@ -23,16 +20,14 @@
closetext
loadmovesprites
end
-; 0x5d70f
-UnknownScript_0x5d70f: ; 0x5d70f
+UnknownScript_0x5d70f:
writetext UnknownText_0x5d983
closetext
loadmovesprites
end
-; 0x5d715
-JigglypuffScript_0x5d715: ; 0x5d715
+JigglypuffScript_0x5d715:
loadfont
writetext UnknownText_0x5d9b6
cry JIGGLYPUFF
@@ -39,19 +34,16 @@
closetext
loadmovesprites
end
-; 0x5d71f
-BlackBeltScript_0x5d71f: ; 0x5d71f
+BlackBeltScript_0x5d71f:
jumptextfaceplayer UnknownText_0x5d9cb
-; 0x5d722
-BlackBeltScript_0x5d722: ; 0x5d722
+BlackBeltScript_0x5d722:
jumptextfaceplayer UnknownText_0x5da44
-; 0x5d725
-TrainerGruntM4: ; 0x5d725
+TrainerGruntM4:
; bit/flag number
- dw $4f4
+ dw EVENT_BEAT_ROCKET_GRUNTM_4
; trainer group && trainer id
db GRUNTM, 4
@@ -67,9 +59,8 @@
; script when talk again
dw GruntM4Script
-; 0x5d731
-GruntM4Script: ; 0x5d731
+GruntM4Script:
talkaftercancel
loadfont
writetext UnknownText_0x5db07
@@ -76,11 +67,10 @@
closetext
loadmovesprites
end
-; 0x5d739
-TrainerGruntM5: ; 0x5d739
+TrainerGruntM5:
; bit/flag number
- dw $4f5
+ dw EVENT_BEAT_ROCKET_GRUNTM_5
; trainer group && trainer id
db GRUNTM, 5
@@ -96,9 +86,8 @@
; script when talk again
dw GruntM5Script
-; 0x5d745
-GruntM5Script: ; 0x5d745
+GruntM5Script:
talkaftercancel
loadfont
writetext UnknownText_0x5db99
@@ -105,11 +94,10 @@
closetext
loadmovesprites
end
-; 0x5d74d
-TrainerGruntM6: ; 0x5d74d
+TrainerGruntM6:
; bit/flag number
- dw $4f6
+ dw EVENT_BEAT_ROCKET_GRUNTM_6
; trainer group && trainer id
db GRUNTM, 6
@@ -125,9 +113,8 @@
; script when talk again
dw GruntM6Script
-; 0x5d759
-GruntM6Script: ; 0x5d759
+GruntM6Script:
talkaftercancel
loadfont
writetext UnknownText_0x5dc00
@@ -134,11 +121,10 @@
closetext
loadmovesprites
end
-; 0x5d761
-TrainerGruntF2: ; 0x5d761
+TrainerGruntF2:
; bit/flag number
- dw $511
+ dw EVENT_BEAT_ROCKET_GRUNTF_2
; trainer group && trainer id
db GRUNTF, 2
@@ -154,9 +140,8 @@
; script when talk again
dw GruntF2Script
-; 0x5d76d
-GruntF2Script: ; 0x5d76d
+GruntF2Script:
talkaftercancel
loadfont
writetext UnknownText_0x5dcd0
@@ -163,7 +148,6 @@
closetext
loadmovesprites
end
-; 0x5d775
Buena:
faceplayer
@@ -193,7 +177,7 @@
checkcode VAR_FACING
if_not_equal $3, UnknownScript_0x5d7be
applymovement $0, MovementData_0x5d921
-UnknownScript_0x5d7be: ; 0x5d7be
+UnknownScript_0x5d7be:
spriteface $0, RIGHT
loadfont
writetext UnknownText_0x5dedd
@@ -226,14 +210,13 @@
checkcode VAR_BLUECARDBALANCE
if_equal $1e, UnknownScript_0x5d8a4
end
-; 0x5d800
-UnknownScript_0x5d800: ; 0x5d800
+UnknownScript_0x5d800:
writetext UnknownText_0x5dcf4
keeptextopen
setevent EVENT_MET_BUENA
verbosegiveitem BLUE_CARD, 1
-UnknownScript_0x5d80a: ; 0x5d80a
+UnknownScript_0x5d80a:
writetext UnknownText_0x5de10
closetext
loadmovesprites
@@ -241,12 +224,11 @@
iftrue UnknownScript_0x5d81a
checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
iftrue UnknownScript_0x5d8cc
-UnknownScript_0x5d81a: ; 0x5d81a
+UnknownScript_0x5d81a:
spriteface $b, RIGHT
end
-; 0x5d81e
-UnknownScript_0x5d81e: ; 0x5d81e
+UnknownScript_0x5d81e:
writetext UnknownText_0x5df29
closetext
loadmovesprites
@@ -255,9 +237,8 @@
pause 20
special RestartMapMusic
end
-; 0x5d82f
-UnknownScript_0x5d82f: ; 0x5d82f
+UnknownScript_0x5d82f:
writetext UnknownText_0x5df6c
closetext
loadmovesprites
@@ -265,13 +246,12 @@
iftrue UnknownScript_0x5d83f
checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
iftrue UnknownScript_0x5d8cc
-UnknownScript_0x5d83f: ; 0x5d83f
+UnknownScript_0x5d83f:
spriteface $b, RIGHT
pause 10
end
-; 0x5d845
-UnknownScript_0x5d845: ; 0x5d845
+UnknownScript_0x5d845:
setflag $0060
loadfont
writetext UnknownText_0x5e01c
@@ -288,16 +268,14 @@
pause 20
special RestartMapMusic
end
-; 0x5d865
-UnknownScript_0x5d865: ; 0x5d865
+UnknownScript_0x5d865:
writetext UnknownText_0x5e0c2
closetext
loadmovesprites
end
-; 0x5d86b
-UnknownScript_0x5d86b: ; 0x5d86b
+UnknownScript_0x5d86b:
writetext UnknownText_0x5e192
closetext
loadmovesprites
@@ -305,12 +283,11 @@
iftrue UnknownScript_0x5d87b
checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
iftrue UnknownScript_0x5d8cc
-UnknownScript_0x5d87b: ; 0x5d87b
+UnknownScript_0x5d87b:
spriteface $b, RIGHT
end
-; 0x5d87f
-UnknownScript_0x5d87f: ; 0x5d87f
+UnknownScript_0x5d87f:
writetext UnknownText_0x5e0f1
closetext
loadmovesprites
@@ -318,12 +295,11 @@
iftrue UnknownScript_0x5d88f
checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
iftrue UnknownScript_0x5d8cc
-UnknownScript_0x5d88f: ; 0x5d88f
+UnknownScript_0x5d88f:
spriteface $b, RIGHT
end
-; 0x5d893
-UnknownScript_0x5d893: ; 0x5d893
+UnknownScript_0x5d893:
writetext UnknownText_0x5e131
closetext
loadmovesprites
@@ -331,11 +307,10 @@
iftrue UnknownScript_0x5d8a3
checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
iftrue UnknownScript_0x5d8cc
-UnknownScript_0x5d8a3: ; 0x5d8a3
+UnknownScript_0x5d8a3:
end
-; 0x5d8a4
-UnknownScript_0x5d8a4: ; 0x5d8a4
+UnknownScript_0x5d8a4:
checkcellnum $25
iftrue UnknownScript_0x5d8fe
pause 20
@@ -351,12 +326,11 @@
loadfont
writetext UnknownText_0x5e1ee
jump UnknownScript_0x5d8d0
-; 0x5d8cc
-UnknownScript_0x5d8cc: ; 0x5d8cc
+UnknownScript_0x5d8cc:
loadfont
writetext UnknownText_0x5e2bf
-UnknownScript_0x5d8d0: ; 0x5d8d0
+UnknownScript_0x5d8d0:
askforphonenumber $25
if_equal $1, UnknownScript_0x5d8f6
if_equal $2, UnknownScript_0x5d8ed
@@ -370,26 +344,23 @@
spriteface $b, RIGHT
addcellnum $25
end
-; 0x5d8ed
-UnknownScript_0x5d8ed: ; 0x5d8ed
+UnknownScript_0x5d8ed:
writetext UnknownText_0x5e33c
closetext
loadmovesprites
spriteface $b, RIGHT
end
-; 0x5d8f6
-UnknownScript_0x5d8f6: ; 0x5d8f6
+UnknownScript_0x5d8f6:
writetext UnknownText_0x5e35e
closetext
loadmovesprites
spriteface $b, RIGHT
-UnknownScript_0x5d8fe: ; 0x5d8fe
+UnknownScript_0x5d8fe:
end
-; 0x5d8ff
-ReceptionistScript_0x5d8ff: ; 0x5d8ff
+ReceptionistScript_0x5d8ff:
faceplayer
loadfont
checkitem BLUE_CARD
@@ -399,64 +370,54 @@
special SpecialBuenaPrize
loadmovesprites
end
-; 0x5d90f
-UnknownScript_0x5d90f: ; 0x5d90f
+UnknownScript_0x5d90f:
writetext UnknownText_0x5e3d8
keeptextopen
loadmovesprites
end
-; 0x5d915
-MapRadioTower2FSignpost0Script: ; 0x5d915
+MapRadioTower2FSignpost0Script:
jumptext UnknownText_0x5e426
-; 0x5d918
-MapRadioTower2FSignpost1Script: ; 0x5d918
+MapRadioTower2FSignpost1Script:
jumptext UnknownText_0x5e430
-; 0x5d91b
-MapRadioTower2FSignpost5Script: ; 0x5d91b
+MapRadioTower2FSignpost5Script:
jumptext UnknownText_0x5e463
-; 0x5d91e
RadioTower2FBookshelf:
jumpstd magazinebookshelf
-MovementData_0x5d921: ; 0x5d921
+MovementData_0x5d921:
slow_step_down
slow_step_right
step_end
-; 0x5d924
-UnknownText_0x5d924: ; 0x5d924
+UnknownText_0x5d924:
text "You can listen to"
line "the radio any-"
cont "where. Tune in!"
done
-; 0x5d956
-UnknownText_0x5d956: ; 0x5d956
+UnknownText_0x5d956:
text "Lullabies on the"
line "radio may make"
cont "#MON sleep."
done
-; 0x5d983
-UnknownText_0x5d983: ; 0x5d983
+UnknownText_0x5d983:
text "Why would they"
line "want to take over"
cont "the RADIO TOWER?"
done
-; 0x5d9b6
-UnknownText_0x5d9b6: ; 0x5d9b6
+UnknownText_0x5d9b6:
text "JIGGLYPUFF:"
line "Jiggly…"
done
-; 0x5d9cb
-UnknownText_0x5d9cb: ; 0x5d9cb
+UnknownText_0x5d9cb:
text "Sorry. Authorized"
line "personnel only"
cont "beyond this point."
@@ -468,9 +429,8 @@
line "wrong with the"
cont "DIRECTOR…"
done
-; 0x5da44
-UnknownText_0x5da44: ; 0x5da44
+UnknownText_0x5da44:
text "Feel free to look"
line "around anywhere."
@@ -478,9 +438,8 @@
line "nice again, just"
cont "as he was before."
done
-; 0x5da9b
-GruntM4SeenText: ; 0x5da9b
+GruntM4SeenText:
text "Three years ago,"
line "TEAM ROCKET was"
cont "forced to disband."
@@ -488,22 +447,19 @@
para "But we're making a"
line "comeback here!"
done
-; 0x5daf1
-GruntM4BeatenText: ; 0x5daf1
+GruntM4BeatenText:
text "Gwah! Don't get"
line "cute!"
done
-; 0x5db07
-UnknownText_0x5db07: ; 0x5db07
+UnknownText_0x5db07:
text "We won't let you"
line "ruin our plans"
cont "for our comeback!"
done
-; 0x5db39
-GruntM5SeenText: ; 0x5db39
+GruntM5SeenText:
text "We're TEAM ROCKET,"
line "the exploiters of"
cont "#MON!"
@@ -511,33 +467,28 @@
para "We love being"
line "evil! Scared?"
done
-; 0x5db80
-GruntM5BeatenText: ; 0x5db80
+GruntM5BeatenText:
text "You think you're a"
line "hero?"
done
-; 0x5db99
-UnknownText_0x5db99: ; 0x5db99
+UnknownText_0x5db99:
text "We're not always"
line "evil. We just do"
cont "whatever we like."
done
-; 0x5dbcd
-GruntM6SeenText: ; 0x5dbcd
+GruntM6SeenText:
text "Hey, hey! Keep out"
line "of our way!"
done
-; 0x5dbed
-GruntM6BeatenText: ; 0x5dbed
+GruntM6BeatenText:
text "Arggh. I give up."
done
-; 0x5dc00
-UnknownText_0x5dc00: ; 0x5dc00
+UnknownText_0x5dc00:
text "Our EXECUTIVES are"
line "trying to take"
cont "this place over."
@@ -546,9 +497,8 @@
line "plan. I wonder"
cont "what that is?"
done
-; 0x5dc64
-GruntF2SeenText: ; 0x5dc64
+GruntF2SeenText:
text "Hahaha!"
para "How boring."
@@ -560,20 +510,17 @@
para "Come on, keep me"
line "amused!"
done
-; 0x5dcbf
-GruntF2BeatenText: ; 0x5dcbf
+GruntF2BeatenText:
text "Wh-who are you?"
done
-; 0x5dcd0
-UnknownText_0x5dcd0: ; 0x5dcd0
+UnknownText_0x5dcd0:
text "You beat me, and"
line "I won't forget it!"
done
-; 0x5dcf4
-UnknownText_0x5dcf4: ; 0x5dcf4
+UnknownText_0x5dcf4:
text "BUENA: Hi! I'm"
line "BUENA!"
@@ -601,15 +548,13 @@
para "It's your very own"
line "point card!"
done
-; 0x5de10
-UnknownText_0x5de10: ; 0x5de10
+UnknownText_0x5de10:
text "BUENA: Tune in to"
line "my PASSWORD SHOW!"
done
-; 0x5de35
-UnknownText_0x5de35: ; 0x5de35
+UnknownText_0x5de35:
text "BUENA: Hi!"
line "Did you tune in to"
cont "my radio show?"
@@ -617,9 +562,8 @@
para "Do you remember"
line "today's password?"
done
-; 0x5de84
-UnknownText_0x5de84: ; 0x5de84
+UnknownText_0x5de84:
text "BUENA: Oh, wow!"
line "Thank you!"
@@ -631,9 +575,8 @@
para "Come on, <PLAY_G>."
line "Join the show."
done
-; 0x5dedd
-UnknownText_0x5dedd: ; 0x5dedd
+UnknownText_0x5dedd:
text "BUENA: Everyone"
line "ready?"
@@ -643,9 +586,8 @@
para "password for"
line "<PLAY_G>!"
done
-; 0x5df29
-UnknownText_0x5df29: ; 0x5df29
+UnknownText_0x5df29:
text "BUENA: Come back"
line "after you listen"
@@ -652,9 +594,8 @@
para "to my show, OK?"
line "Catch ya later!"
done
-; 0x5df6c
-UnknownText_0x5df6c: ; 0x5df6c
+UnknownText_0x5df6c:
text "BUENA: Sorry…"
para "You get just one"
@@ -663,9 +604,8 @@
para "Come back tomorrow"
line "for another try!"
done
-; 0x5dfc1
-UnknownText_0x5dfc1: ; 0x5dfc1
+UnknownText_0x5dfc1:
text "BUENA: YIPPEE!"
line "That's right!"
@@ -675,9 +615,8 @@
para "You earned one"
line "point! Congrats!"
done
-; 0x5e01c
-UnknownText_0x5e01c: ; 0x5e01c
+UnknownText_0x5e01c:
text "BUENA: Aww…"
line "That's not it…"
@@ -684,9 +623,8 @@
para "Did you forget the"
line "password?"
done
-; 0x5e054
-UnknownText_0x5e054: ; 0x5e054
+UnknownText_0x5e054:
text "BUENA: Yup! Our"
line "contestant was"
@@ -699,17 +637,15 @@
para "come too!"
line "I'll be waiting!"
done
-; 0x5e0c2
-UnknownText_0x5e0c2: ; 0x5e0c2
+UnknownText_0x5e0c2:
text "BUENA: Huh?"
line "Today's password?"
para "HELP, of course!"
done
-; 0x5e0f1
-UnknownText_0x5e0f1: ; 0x5e0f1
+UnknownText_0x5e0f1:
text "BUENA: Your BLUE"
line "CARD's full."
@@ -716,9 +652,8 @@
para "Trade it in for a"
line "fabulous prize!"
done
-; 0x5e131
-UnknownText_0x5e131: ; 0x5e131
+UnknownText_0x5e131:
text "BUENA: Tune in to"
line "PASSWORD every"
@@ -728,9 +663,8 @@
para "Tune in, then drop"
line "in for a visit!"
done
-; 0x5e192
-UnknownText_0x5e192: ; 0x5e192
+UnknownText_0x5e192:
text "BUENA: Oh? You"
line "forgot to bring"
cont "your BLUE CARD?"
@@ -739,9 +673,8 @@
line "points if you"
cont "don't have it."
done
-; 0x5e1ee
-UnknownText_0x5e1ee: ; 0x5e1ee
+UnknownText_0x5e1ee:
text "BUENA: Oh! Your"
line "BLUE CARD reached"
@@ -761,9 +694,8 @@
para "How would you like"
line "my phone number?"
done
-; 0x5e2bf
-UnknownText_0x5e2bf: ; 0x5e2bf
+UnknownText_0x5e2bf:
text "BUENA: <PLAY_G>,"
line "do you want to"
@@ -770,28 +702,24 @@
para "register my phone"
line "number?"
done
-; 0x5e2f3
-UnknownText_0x5e2f3: ; 0x5e2f3
+UnknownText_0x5e2f3:
text "<PLAYER> registered"
line "BUENA's number."
done
-; 0x5e310
-UnknownText_0x5e310: ; 0x5e310
+UnknownText_0x5e310:
text "BUENA: I look"
line "forward to hearing"
cont "from you!"
done
-; 0x5e33c
-UnknownText_0x5e33c: ; 0x5e33c
+UnknownText_0x5e33c:
text "BUENA: Aww… It's a"
line "special prize…"
done
-; 0x5e35e
-UnknownText_0x5e35e: ; 0x5e35e
+UnknownText_0x5e35e:
text "BUENA: <PLAY_G>,"
line "your phone list"
@@ -798,9 +726,8 @@
para "has no room left"
line "for me…"
done
-; 0x5e392
-UnknownText_0x5e392: ; 0x5e392
+UnknownText_0x5e392:
text "You can cash in"
line "your saved points"
@@ -807,9 +734,8 @@
para "for a lovely prize"
line "of your choice!"
done
-; 0x5e3d8
-UnknownText_0x5e3d8: ; 0x5e3d8
+UnknownText_0x5e3d8:
text "You can't trade in"
line "points without"
cont "your BLUE CARD."
@@ -817,14 +743,12 @@
para "Don't forget your"
line "BLUE CARD!"
done
-; 0x5e426
-UnknownText_0x5e426: ; 0x5e426
+UnknownText_0x5e426:
text "2F SALES"
done
-; 0x5e430
-UnknownText_0x5e430: ; 0x5e430
+UnknownText_0x5e430:
text "PROF.OAK'S #MON"
line "TALK"
@@ -831,15 +755,13 @@
para "The Hottest Show"
line "on the Air!"
done
-; 0x5e463
-UnknownText_0x5e463: ; 0x5e463
+UnknownText_0x5e463:
text "Anywhere, Anytime"
line "#MON Radio"
done
-; 0x5e481
-RadioTower2F_MapEventHeader: ; 0x5e481
+RadioTower2F_MapEventHeader:
; filler
db 0, 0
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -1,4 +1,4 @@
-RadioTower3F_MapScriptHeader: ; 0x5e53e
+RadioTower3F_MapScriptHeader:
; trigger count
db 0
@@ -8,25 +8,21 @@
; callbacks
dbw 1, UnknownScript_0x5e543
-; 0x5e543
-UnknownScript_0x5e543: ; 0x5e543
+UnknownScript_0x5e543:
checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
iftrue UnknownScript_0x5e54a
return
-; 0x5e54a
-UnknownScript_0x5e54a: ; 0x5e54a
+UnknownScript_0x5e54a:
changeblock $e, $2, $2a
changeblock $e, $4, $1
return
-; 0x5e553
-SuperNerdScript_0x5e553: ; 0x5e553
+SuperNerdScript_0x5e553:
jumptextfaceplayer UnknownText_0x5e621
-; 0x5e556
-GymGuyScript_0x5e556: ; 0x5e556
+GymGuyScript_0x5e556:
faceplayer
loadfont
checkevent EVENT_CLEARED_RADIO_TOWER
@@ -35,16 +31,14 @@
closetext
loadmovesprites
end
-; 0x5e564
-UnknownScript_0x5e564: ; 0x5e564
+UnknownScript_0x5e564:
writetext UnknownText_0x5e6eb
closetext
loadmovesprites
end
-; 0x5e56a
-CooltrainerFScript_0x5e56a: ; 0x5e56a
+CooltrainerFScript_0x5e56a:
faceplayer
loadfont
checkevent EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER
@@ -57,16 +51,14 @@
closetext
loadmovesprites
end
-; 0x5e584
-UnknownScript_0x5e584: ; 0x5e584
+UnknownScript_0x5e584:
writetext UnknownText_0x5e7cb
closetext
loadmovesprites
end
-; 0x5e58a
-UnknownScript_0x5e58a: ; 0x5e58a
+UnknownScript_0x5e58a:
writetext UnknownText_0x5e7e2
keeptextopen
verbosegiveitem TM_SUNNY_DAY, 1
@@ -76,19 +68,17 @@
loadmovesprites
setevent EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER
end
-; 0x5e59d
-UnknownScript_0x5e59d: ; 0x5e59d
+UnknownScript_0x5e59d:
writetext UnknownText_0x5e85c
closetext
-UnknownScript_0x5e5a1: ; 0x5e5a1
+UnknownScript_0x5e5a1:
loadmovesprites
end
-; 0x5e5a3
-TrainerGruntM7: ; 0x5e5a3
+TrainerGruntM7:
; bit/flag number
- dw $4f7
+ dw EVENT_BEAT_ROCKET_GRUNTM_7
; trainer group && trainer id
db GRUNTM, 7
@@ -104,9 +94,8 @@
; script when talk again
dw GruntM7Script
-; 0x5e5af
-GruntM7Script: ; 0x5e5af
+GruntM7Script:
talkaftercancel
loadfont
writetext UnknownText_0x5e8d0
@@ -113,11 +102,10 @@
closetext
loadmovesprites
end
-; 0x5e5b7
-TrainerGruntM8: ; 0x5e5b7
+TrainerGruntM8:
; bit/flag number
- dw $4f8
+ dw EVENT_BEAT_ROCKET_GRUNTM_8
; trainer group && trainer id
db GRUNTM, 8
@@ -133,9 +121,8 @@
; script when talk again
dw GruntM8Script
-; 0x5e5c3
-GruntM8Script: ; 0x5e5c3
+GruntM8Script:
talkaftercancel
loadfont
writetext UnknownText_0x5e944
@@ -142,11 +129,10 @@
closetext
loadmovesprites
end
-; 0x5e5cb
-TrainerGruntM9: ; 0x5e5cb
+TrainerGruntM9:
; bit/flag number
- dw $4f9
+ dw EVENT_BEAT_ROCKET_GRUNTM_9
; trainer group && trainer id
db GRUNTM, 9
@@ -162,9 +148,8 @@
; script when talk again
dw GruntM9Script
-; 0x5e5d7
-GruntM9Script: ; 0x5e5d7
+GruntM9Script:
talkaftercancel
loadfont
writetext UnknownText_0x5e9d0
@@ -171,11 +156,10 @@
closetext
loadmovesprites
end
-; 0x5e5df
-TrainerScientistMarc: ; 0x5e5df
+TrainerScientistMarc:
; bit/flag number
- dw $4a2
+ dw EVENT_BEAT_SCIENTIST_MARC
; trainer group && trainer id
db SCIENTIST, MARC
@@ -191,9 +175,8 @@
; script when talk again
dw ScientistMarcScript
-; 0x5e5eb
-ScientistMarcScript: ; 0x5e5eb
+ScientistMarcScript:
talkaftercancel
loadfont
writetext UnknownText_0x5ea61
@@ -200,9 +183,8 @@
closetext
loadmovesprites
end
-; 0x5e5f3
-MapRadioTower3FSignpost2Script:: ; 0x5e5f3
+MapRadioTower3FSignpost2Script::
loadfont
writetext UnknownText_0x5eaa4
closetext
@@ -210,12 +192,11 @@
iftrue UnknownScript_0x5e603
checkitem CARD_KEY
iftrue UnknownScript_0x5e605
-UnknownScript_0x5e603: ; 0x5e603
+UnknownScript_0x5e603:
loadmovesprites
end
-; 0x5e605
-UnknownScript_0x5e605: ; 0x5e605
+UnknownScript_0x5e605:
writetext UnknownText_0x5eabc
closetext
setevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
@@ -226,17 +207,14 @@
loadmovesprites
waitbutton
end
-; 0x5e61b
-MapRadioTower3FSignpost0Script: ; 0x5e61b
+MapRadioTower3FSignpost0Script:
jumptext UnknownText_0x5ead6
-; 0x5e61e
-MapRadioTower3FSignpost1Script: ; 0x5e61e
+MapRadioTower3FSignpost1Script:
jumptext UnknownText_0x5eae4
-; 0x5e621
-UnknownText_0x5e621: ; 0x5e621
+UnknownText_0x5e621:
text "We have recordings"
line "of the cries of"
@@ -246,9 +224,8 @@
para "We must have about"
line "200 kinds."
done
-; 0x5e682
-UnknownText_0x5e682: ; 0x5e682
+UnknownText_0x5e682:
text "To trainers, #-"
line "MON are their"
cont "beloved partners."
@@ -259,9 +236,8 @@
para "trying to control"
line "#MON."
done
-; 0x5e6eb
-UnknownText_0x5e6eb: ; 0x5e6eb
+UnknownText_0x5e6eb:
text "We run 24 hours a"
line "day to broadcast"
@@ -272,9 +248,8 @@
line "run around the"
cont "clock too!"
done
-; 0x5e754
-UnknownText_0x5e754: ; 0x5e754
+UnknownText_0x5e754:
text "The TEAM ROCKET"
line "boss has locked"
cont "himself in."
@@ -287,15 +262,13 @@
para "Please save him!"
done
-; 0x5e7cb
-UnknownText_0x5e7cb: ; 0x5e7cb
+UnknownText_0x5e7cb:
text "Is the DIRECTOR"
line "safe?"
done
-; 0x5e7e2
-UnknownText_0x5e7e2: ; 0x5e7e2
+UnknownText_0x5e7e2:
text "Thank you!"
line "You're my hero!"
@@ -302,23 +275,20 @@
para "This is a token of"
line "my appreciation."
done
-; 0x5e821
-UnknownText_0x5e821: ; 0x5e821
+UnknownText_0x5e821:
text "It's SUNNY DAY."
line "It powers up fire-"
cont "type moves for a"
cont "while."
done
-; 0x5e85c
-UnknownText_0x5e85c: ; 0x5e85c
+UnknownText_0x5e85c:
text "You were simply"
line "marvelous!"
done
-; 0x5e878
-GruntM7SeenText: ; 0x5e878
+GruntM7SeenText:
text "I've been given"
line "strict orders."
@@ -326,14 +296,12 @@
line "one who challenges"
cont "TEAM ROCKET!"
done
-; 0x5e8c8
-GruntM7BeatenText: ; 0x5e8c8
+GruntM7BeatenText:
text "What?!"
done
-; 0x5e8d0
-UnknownText_0x5e8d0: ; 0x5e8d0
+UnknownText_0x5e8d0:
text "I failed in my"
line "duties…"
@@ -340,21 +308,18 @@
para "I'll be docked pay"
line "for this…"
done
-; 0x5e904
-GruntM8SeenText: ; 0x5e904
+GruntM8SeenText:
text "It feels great"
line "ordering #MON"
cont "to commit crimes."
done
-; 0x5e934
-GruntM8BeatenText: ; 0x5e934
+GruntM8BeatenText:
text "You're kidding!"
done
-; 0x5e944
-UnknownText_0x5e944: ; 0x5e944
+UnknownText_0x5e944:
text "I feel lousy over"
line "losing!"
@@ -361,9 +326,8 @@
para "Darn it! I hate"
line "useless #MON!"
done
-; 0x5e97d
-GruntM9SeenText: ; 0x5e97d
+GruntM9SeenText:
text "Why did the shut-"
line "ter open? Did you"
@@ -370,14 +334,12 @@
para "have something to"
line "do with this?"
done
-; 0x5e9c2
-GruntM9BeatenText: ; 0x5e9c2
+GruntM9BeatenText:
text "I'm done for!"
done
-; 0x5e9d0
-UnknownText_0x5e9d0: ; 0x5e9d0
+UnknownText_0x5e9d0:
text "What?! You made it"
line "past our men in"
cont "the UNDERGROUND?"
@@ -384,23 +346,20 @@
para "How could you?"
done
-; 0x5ea14
-ScientistMarcSeenText: ; 0x5ea14
+ScientistMarcSeenText:
text "An unknown child"
line "wandering here?"
para "Who are you?"
done
-; 0x5ea43
-ScientistMarcBeatenText: ; 0x5ea43
+ScientistMarcBeatenText:
text "Tch! I took you"
line "too lightly!"
done
-; 0x5ea61
-UnknownText_0x5ea61: ; 0x5ea61
+UnknownText_0x5ea61:
text "Bwahahaha…"
para "I can transmit as"
@@ -407,32 +366,27 @@
line "strong a signal as"
cont "I need from here."
done
-; 0x5eaa4
-UnknownText_0x5eaa4: ; 0x5eaa4
+UnknownText_0x5eaa4:
text "It's the CARD KEY"
line "slot."
done
-; 0x5eabc
-UnknownText_0x5eabc: ; 0x5eabc
+UnknownText_0x5eabc:
text "<PLAYER> inserted"
line "the CARD KEY."
done
-; 0x5ead6
-UnknownText_0x5ead6: ; 0x5ead6
+UnknownText_0x5ead6:
text "3F PERSONNEL"
done
-; 0x5eae4
-UnknownText_0x5eae4: ; 0x5eae4
+UnknownText_0x5eae4:
text "#MON MUSIC with"
line "Host DJ BEN"
done
-; 0x5eb01
-RadioTower3F_MapEventHeader: ; 0x5eb01
+RadioTower3F_MapEventHeader:
; filler
db 0, 0
@@ -460,4 +414,3 @@
person_event SPRITE_ROCKET, 6, 10, $6, $0, 255, 255, $2, 3, TrainerGruntM8, $06ce
person_event SPRITE_ROCKET, 10, 20, $7, $0, 255, 255, $2, 3, TrainerGruntM9, $06ce
person_event SPRITE_SCIENTIST, 10, 13, $7, $0, 255, 255, $92, 5, TrainerScientistMarc, $06ce
-; 0x5eb80
--- a/maps/RadioTower4F.asm
+++ b/maps/RadioTower4F.asm
@@ -1,16 +1,14 @@
-RadioTower4F_MapScriptHeader: ; 0x5eb80
+RadioTower4F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x5eb82
-FisherScript_0x5eb82: ; 0x5eb82
+FisherScript_0x5eb82:
jumptextfaceplayer UnknownText_0x5ec12
-; 0x5eb85
-TeacherScript_0x5eb85: ; 0x5eb85
+TeacherScript_0x5eb85:
faceplayer
loadfont
checkevent EVENT_GOT_PINK_BOW_FROM_MARY
@@ -21,9 +19,8 @@
closetext
loadmovesprites
end
-; 0x5eb99
-UnknownScript_0x5eb99: ; 0x5eb99
+UnknownScript_0x5eb99:
writetext UnknownText_0x5ecab
keeptextopen
verbosegiveitem PINK_BOW, 1
@@ -33,17 +30,15 @@
loadmovesprites
setevent EVENT_GOT_PINK_BOW_FROM_MARY
end
-; 0x5ebac
-UnknownScript_0x5ebac: ; 0x5ebac
+UnknownScript_0x5ebac:
writetext UnknownText_0x5ed2c
closetext
-UnknownScript_0x5ebb0: ; 0x5ebb0
+UnknownScript_0x5ebb0:
loadmovesprites
end
-; 0x5ebb2
-GrowlitheScript_0x5ebb2: ; 0x5ebb2
+GrowlitheScript_0x5ebb2:
loadfont
writetext UnknownText_0x5ed66
cry MEOWTH
@@ -50,11 +45,10 @@
closetext
loadmovesprites
end
-; 0x5ebbc
-TrainerGruntM10: ; 0x5ebbc
+TrainerGruntM10:
; bit/flag number
- dw $4fa
+ dw EVENT_BEAT_ROCKET_GRUNTM_10
; trainer group && trainer id
db GRUNTM, 10
@@ -70,9 +64,8 @@
; script when talk again
dw GruntM10Script
-; 0x5ebc8
-GruntM10Script: ; 0x5ebc8
+GruntM10Script:
talkaftercancel
loadfont
writetext UnknownText_0x5ede2
@@ -79,11 +72,10 @@
closetext
loadmovesprites
end
-; 0x5ebd0
-TrainerExecutivem2: ; 0x5ebd0
+TrainerExecutivem2:
; bit/flag number
- dw $572
+ dw EVENT_BEAT_ROCKET_EXECUTIVEM_2
; trainer group && trainer id
db EXECUTIVEM, 2
@@ -99,9 +91,8 @@
; script when talk again
dw Executivem2Script
-; 0x5ebdc
-Executivem2Script: ; 0x5ebdc
+Executivem2Script:
talkaftercancel
loadfont
writetext UnknownText_0x5ee69
@@ -108,11 +99,10 @@
closetext
loadmovesprites
end
-; 0x5ebe4
-TrainerGruntF4: ; 0x5ebe4
+TrainerGruntF4:
; bit/flag number
- dw $513
+ dw EVENT_BEAT_ROCKET_GRUNTF_4
; trainer group && trainer id
db GRUNTF, 4
@@ -128,9 +118,8 @@
; script when talk again
dw GruntF4Script
-; 0x5ebf0
-GruntF4Script: ; 0x5ebf0
+GruntF4Script:
talkaftercancel
loadfont
writetext UnknownText_0x5ef31
@@ -137,11 +126,10 @@
closetext
loadmovesprites
end
-; 0x5ebf8
-TrainerScientistRich: ; 0x5ebf8
+TrainerScientistRich:
; bit/flag number
- dw $4a3
+ dw EVENT_BEAT_SCIENTIST_RICH
; trainer group && trainer id
db SCIENTIST, RICH
@@ -157,9 +145,8 @@
; script when talk again
dw ScientistRichScript
-; 0x5ec04
-ScientistRichScript: ; 0x5ec04
+ScientistRichScript:
talkaftercancel
loadfont
writetext UnknownText_0x5efcb
@@ -166,17 +153,14 @@
closetext
loadmovesprites
end
-; 0x5ec0c
-MapRadioTower4FSignpost0Script: ; 0x5ec0c
+MapRadioTower4FSignpost0Script:
jumptext UnknownText_0x5effe
-; 0x5ec0f
-MapRadioTower4FSignpost1Script: ; 0x5ec0f
+MapRadioTower4FSignpost1Script:
jumptext UnknownText_0x5f00d
-; 0x5ec12
-UnknownText_0x5ec12: ; 0x5ec12
+UnknownText_0x5ec12:
text "I listened to the"
line "radio while I was"
cont "at the RUINS."
@@ -184,9 +168,8 @@
para "I heard a strange"
line "broadcast there."
done
-; 0x5ec68
-UnknownText_0x5ec68: ; 0x5ec68
+UnknownText_0x5ec68:
text "MARY: Why? Why do"
line "I have to suffer"
cont "through this?"
@@ -193,9 +176,8 @@
para "MEOWTH, help me!"
done
-; 0x5ecab
-UnknownText_0x5ecab: ; 0x5ecab
+UnknownText_0x5ecab:
text "MARY: Oh! You're"
line "my little savior!"
@@ -202,9 +184,8 @@
para "Will you take this"
line "as my thanks?"
done
-; 0x5ecef
-UnknownText_0x5ecef: ; 0x5ecef
+UnknownText_0x5ecef:
text "MARY: It's just"
line "right for #MON"
@@ -211,9 +192,8 @@
para "that know normal-"
line "type moves."
done
-; 0x5ed2c
-UnknownText_0x5ed2c: ; 0x5ed2c
+UnknownText_0x5ed2c:
text "MARY: Please tune"
line "into me on PROF."
@@ -220,14 +200,12 @@
para "OAK'S #MON TALK"
line "show."
done
-; 0x5ed66
-UnknownText_0x5ed66: ; 0x5ed66
+UnknownText_0x5ed66:
text "MEOWTH: Meowth…"
done
-; 0x5ed77
-GruntM10SeenText: ; 0x5ed77
+GruntM10SeenText:
text "You plan to rescue"
line "the DIRECTOR?"
@@ -235,20 +213,17 @@
line "sible because I'm"
cont "going to beat you!"
done
-; 0x5edcf
-GruntM10BeatenText: ; 0x5edcf
+GruntM10BeatenText:
text "No! Unbelievable!"
done
-; 0x5ede2
-UnknownText_0x5ede2: ; 0x5ede2
+UnknownText_0x5ede2:
text "I don't believe"
line "it! I was beaten!"
done
-; 0x5ee04
-Executivem2SeenText: ; 0x5ee04
+Executivem2SeenText:
text "Stop! I'm known as"
line "the TEAM ROCKET"
cont "fortress!"
@@ -256,15 +231,13 @@
para "You're not taking"
line "another step!"
done
-; 0x5ee50
-Executivem2BeatenText: ; 0x5ee50
+Executivem2BeatenText:
text "The fortress came"
line "down!"
done
-; 0x5ee69
-UnknownText_0x5ee69: ; 0x5ee69
+UnknownText_0x5ee69:
text "You've earned my"
line "respect, so here's"
cont "some advice."
@@ -273,9 +246,8 @@
line "You can still turn"
cont "back."
done
-; 0x5eec4
-GruntF4SeenText: ; 0x5eec4
+GruntF4SeenText:
text "Don't I think"
line "#MON are cute?"
@@ -285,15 +257,13 @@
para "after they beat"
line "yours!"
done
-; 0x5ef15
-GruntF4BeatenText: ; 0x5ef15
+GruntF4BeatenText:
text "Oh, no! They're so"
line "useless!"
done
-; 0x5ef31
-UnknownText_0x5ef31: ; 0x5ef31
+UnknownText_0x5ef31:
text "I love my"
line "beautiful self!"
@@ -300,9 +270,8 @@
para "Who cares about"
line "#MON?"
done
-; 0x5ef62
-ScientistRichSeenText: ; 0x5ef62
+ScientistRichSeenText:
text "Most excellent."
para "This RADIO TOWER"
@@ -309,34 +278,29 @@
line "will fulfill our"
cont "grand design."
done
-; 0x5efa3
-ScientistRichBeatenText: ; 0x5efa3
+ScientistRichBeatenText:
text "Hmmm…"
para "All grand plans"
line "come with snags."
done
-; 0x5efcb
-UnknownText_0x5efcb: ; 0x5efcb
+UnknownText_0x5efcb:
text "Do you honestly"
line "believe you can"
cont "stop TEAM ROCKET?"
done
-; 0x5effe
-UnknownText_0x5effe: ; 0x5effe
+UnknownText_0x5effe:
text "4F PRODUCTION"
done
-; 0x5f00d
-UnknownText_0x5f00d: ; 0x5f00d
+UnknownText_0x5f00d:
text "4F STUDIO 2"
done
-; 0x5f01a
-RadioTower4F_MapEventHeader: ; 0x5f01a
+RadioTower4F_MapEventHeader:
; filler
db 0, 0
@@ -364,4 +328,3 @@
person_event SPRITE_ROCKET, 5, 18, $8, $2, 255, 255, $2, 2, TrainerExecutivem2, $06ce
person_event SPRITE_ROCKET_GIRL, 8, 16, $9, $0, 255, 255, $82, 1, TrainerGruntF4, $06ce
person_event SPRITE_SCIENTIST, 6, 8, $8, $0, 255, 255, $92, 4, TrainerScientistRich, $06ce
-; 0x5f099
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -1,4 +1,4 @@
-RadioTower5F_MapScriptHeader: ; 0x60000
+RadioTower5F_MapScriptHeader:
; trigger count
db 3
@@ -9,21 +9,17 @@
; callback count
db 0
-; 0x6000e
-UnknownScript_0x6000e: ; 0x6000e
+UnknownScript_0x6000e:
end
-; 0x6000f
-UnknownScript_0x6000f: ; 0x6000f
+UnknownScript_0x6000f:
end
-; 0x60010
-UnknownScript_0x60010: ; 0x60010
+UnknownScript_0x60010:
end
-; 0x60011
-UnknownScript_0x60011: ; 0x60011
+UnknownScript_0x60011:
spriteface $2, UP
showemote $0, $2, 15
loadfont
@@ -47,9 +43,8 @@
verbosegiveitem BASEMENT_KEY, 1
loadmovesprites
dotrigger $1
- setevent $0573
+ setevent EVENT_BEAT_ROCKET_EXECUTIVEM_3
end
-; 0x60046
Director:
faceplayer
@@ -61,16 +56,15 @@
loadmovesprites
end
-UnknownScript_0x60054: ; 0x60054
+UnknownScript_0x60054:
writetext UnknownText_0x60824
closetext
loadmovesprites
end
-; 0x6005a
-TrainerExecutivef1: ; 0x6005a
+TrainerExecutivef1:
; bit/flag number
- dw $56f
+ dw EVENT_BEAT_ROCKET_EXECUTIVEF_1
; trainer group && trainer id
db EXECUTIVEF, 1
@@ -86,9 +80,8 @@
; script when talk again
dw Executivef1Script
-; 0x60066
-Executivef1Script: ; 0x60066
+Executivef1Script:
talkaftercancel
loadfont
writetext UnknownText_0x60358
@@ -95,9 +88,8 @@
closetext
loadmovesprites
end
-; 0x6006e
-UnknownScript_0x6006e: ; 0x6006e
+UnknownScript_0x6006e:
applymovement $0, MovementData_0x60125
playmusic MUSIC_ROCKET_ENCOUNTER
spriteface $3, RIGHT
@@ -120,7 +112,7 @@
disappear $4
pause 15
special Function8c0ab
- setevent $0571
+ setevent EVENT_BEAT_ROCKET_EXECUTIVEM_1
setevent EVENT_CLEARED_RADIO_TOWER
clearflag $0013
setevent $06cc
@@ -150,34 +142,29 @@
setevent EVENT_GOT_CLEAR_BELL
setevent $0761
jump UnknownScript_0x600f1
-; 0x600f1
-UnknownScript_0x600f1: ; 0x600f1
+UnknownScript_0x600f1:
applymovement $2, MovementData_0x6011a
playsound SFX_EXIT_BUILDING
disappear $2
end
-; 0x600fb
Ben:
jumptextfaceplayer BenText
-ItemFragment_0x600fe: ; 0x600fe
+ItemFragment_0x600fe:
db ULTRA_BALL, 1
-; 0x60100
-MapRadioTower5FSignpost0Script: ; 0x60100
+MapRadioTower5FSignpost0Script:
jumptext UnknownText_0x608e0
-; 0x60103
-MapRadioTower5FSignpost2Script: ; 0x60103
+MapRadioTower5FSignpost2Script:
jumptext UnknownText_0x608f9
-; 0x60106
RadioTower5FBookshelf:
jumpstd magazinebookshelf
-MovementData_0x60109: ; 0x60109
+MovementData_0x60109:
step_left
step_left
step_left
@@ -184,9 +171,8 @@
step_up
step_up
step_end
-; 0x6010f
-MovementData_0x6010f: ; 0x6010f
+MovementData_0x6010f:
step_down
step_down
step_right
@@ -198,9 +184,8 @@
step_down
step_left
step_end
-; 0x6011a
-MovementData_0x6011a: ; 0x6011a
+MovementData_0x6011a:
step_right
step_up
step_up
@@ -212,21 +197,18 @@
step_up
step_up
step_end
-; 0x60125
-MovementData_0x60125: ; 0x60125
+MovementData_0x60125:
step_left
step_left
step_end
-; 0x60128
-UnknownText_0x60128: ; 0x60128
+UnknownText_0x60128:
text "Y-you! You came to"
line "rescue me?"
done
-; 0x60147
-UnknownText_0x60147: ; 0x60147
+UnknownText_0x60147:
text "Is that what you"
line "were expecting?"
@@ -247,15 +229,13 @@
line "you. But only if"
cont "you can beat me!"
done
-; 0x60223
-UnknownText_0x60223: ; 0x60223
+UnknownText_0x60223:
text "OK, OK. I'll tell"
line "you where he is."
done
-; 0x60246
-UnknownText_0x60246: ; 0x60246
+UnknownText_0x60246:
text "We stashed the"
line "real DIRECTOR in"
@@ -269,9 +249,8 @@
para "But I doubt you'll"
line "get that far."
done
-; 0x602cb
-Executivef1SeenText: ; 0x602cb
+Executivef1SeenText:
text "Remember me from"
line "the HIDEOUT in"
cont "MAHOGANY TOWN?"
@@ -279,9 +258,8 @@
para "I lost then, but I"
line "won't this time."
done
-; 0x6031e
-Executivef1BeatenText: ; 0x6031e
+Executivef1BeatenText:
text "This can't be"
line "happening!"
@@ -288,9 +266,8 @@
para "I fought hard, but"
line "I still lost…"
done
-; 0x60358
-UnknownText_0x60358: ; 0x60358
+UnknownText_0x60358:
text "<PLAYER>, isn't it?"
para "A brat like you"
@@ -303,9 +280,8 @@
line "I really admire"
cont "your power."
done
-; 0x603d1
-UnknownText_0x603d1: ; 0x603d1
+UnknownText_0x603d1:
text "Oh? You managed to"
line "get this far?"
@@ -333,15 +309,13 @@
line "to interfere with"
cont "our plans."
done
-; 0x604f3
-UnknownText_0x604f3: ; 0x604f3
+UnknownText_0x604f3:
text "No! Forgive me,"
line "GIOVANNI!"
done
-; 0x6050e
-UnknownText_0x6050e: ; 0x6050e
+UnknownText_0x6050e:
text "How could this be?"
para "Our dreams have"
@@ -358,9 +332,8 @@
para "Farewell."
done
-; 0x605b2
-UnknownText_0x605b2: ; 0x605b2
+UnknownText_0x605b2:
text "DIRECTOR: <PLAY_G>,"
line "thank you!"
@@ -374,9 +347,8 @@
line "much, but please"
cont "take this."
done
-; 0x6062c
-UnknownText_0x6062c: ; 0x6062c
+UnknownText_0x6062c:
text "There used to be a"
line "tower right here"
cont "in GOLDENROD CITY."
@@ -426,9 +398,8 @@
para "OK, I better go to"
line "my OFFICE."
done
-; 0x60824
-UnknownText_0x60824: ; 0x60824
+UnknownText_0x60824:
text "DIRECTOR: Hello,"
line "<PLAY_G>!"
@@ -445,7 +416,6 @@
line "if people enjoyed"
cont "our programs."
done
-; 0x608be
BenText:
text "BEN: Do you listen"
@@ -452,18 +422,16 @@
line "to our music?"
done
-UnknownText_0x608e0: ; 0x608e0
+UnknownText_0x608e0:
text "5F DIRECTOR'S"
line " OFFICE"
done
-; 0x608f9
-UnknownText_0x608f9: ; 0x608f9
+UnknownText_0x608f9:
text "5F STUDIO 1"
done
-; 0x60906
-RadioTower5F_MapEventHeader: ; 0x60906
+RadioTower5F_MapEventHeader:
; filler
db 0, 0
@@ -492,4 +460,3 @@
person_event SPRITE_ROCKET_GIRL, 6, 21, $8, $0, 255, 255, $82, 1, TrainerExecutivef1, $06ce
person_event SPRITE_ROCKER, 9, 17, $8, $0, 255, 255, $80, 0, Ben, $06d0
person_event SPRITE_POKE_BALL, 9, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x600fe, $07cd
-; 0x60980
--- a/maps/Route1.asm
+++ b/maps/Route1.asm
@@ -1,14 +1,13 @@
-Route1_MapScriptHeader: ; 0x1ac554
+Route1_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1ac556
-TrainerSchoolboyDanny: ; 0x1ac556
+TrainerSchoolboyDanny:
; bit/flag number
- dw $470
+ dw EVENT_BEAT_SCHOOLBOY_DANNY
; trainer group && trainer id
db SCHOOLBOY, DANNY
@@ -24,9 +23,8 @@
; script when talk again
dw SchoolboyDannyScript
-; 0x1ac562
-SchoolboyDannyScript: ; 0x1ac562
+SchoolboyDannyScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ac5d7
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x1ac56a
-TrainerCooltrainerfQuinn: ; 0x1ac56a
+TrainerCooltrainerfQuinn:
; bit/flag number
- dw $568
+ dw EVENT_BEAT_COOLTRAINERF_QUINN
; trainer group && trainer id
db COOLTRAINERF, QUINN
@@ -53,9 +50,8 @@
; script when talk again
dw CooltrainerfQuinnScript
-; 0x1ac576
-CooltrainerfQuinnScript: ; 0x1ac576
+CooltrainerfQuinnScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ac640
@@ -62,30 +58,25 @@
closetext
loadmovesprites
end
-; 0x1ac57e
-MapRoute1Signpost0Script: ; 0x1ac57e
+MapRoute1Signpost0Script:
jumptext UnknownText_0x1ac675
-; 0x1ac581
-FruitTreeScript_0x1ac581: ; 0x1ac581
+FruitTreeScript_0x1ac581:
fruittree $1a
-; 0x1ac583
-SchoolboyDannySeenText: ; 0x1ac583
+SchoolboyDannySeenText:
text "If trainers meet,"
line "the first thing to"
cont "do is battle."
done
-; 0x1ac5b7
-SchoolboyDannyBeatenText: ; 0x1ac5b7
+SchoolboyDannyBeatenText:
text "Awww… I've got a"
line "losing record…"
done
-; 0x1ac5d7
-UnknownText_0x1ac5d7: ; 0x1ac5d7
+UnknownText_0x1ac5d7:
text "For trainers, it's"
line "a given that we'll"
@@ -92,36 +83,31 @@
para "battle whenever we"
line "meet."
done
-; 0x1ac615
-CooltrainerfQuinnSeenText: ; 0x1ac615
+CooltrainerfQuinnSeenText:
text "You there!"
line "Want to battle?"
done
-; 0x1ac631
-CooltrainerfQuinnBeatenText: ; 0x1ac631
+CooltrainerfQuinnBeatenText:
text "Down and out…"
done
-; 0x1ac640
-UnknownText_0x1ac640: ; 0x1ac640
+UnknownText_0x1ac640:
text "You're strong."
para "You obviously must"
line "have trained hard."
done
-; 0x1ac675
-UnknownText_0x1ac675: ; 0x1ac675
+UnknownText_0x1ac675:
text "ROUTE 1"
para "PALLET TOWN -"
line "VIRIDIAN CITY"
done
-; 0x1ac69a
-Route1_MapEventHeader: ; 0x1ac69a
+Route1_MapEventHeader:
; filler
db 0, 0
@@ -140,4 +126,3 @@
person_event SPRITE_YOUNGSTER, 16, 8, $9, $0, 255, 255, $92, 4, TrainerSchoolboyDanny, $ffff
person_event SPRITE_COOLTRAINER_F, 29, 13, $a, $0, 255, 255, $82, 2, TrainerCooltrainerfQuinn, $ffff
person_event SPRITE_FRUIT_TREE, 11, 7, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac581, $ffff
-; 0x1ac6cc
--- a/maps/Route10South.asm
+++ b/maps/Route10South.asm
@@ -1,14 +1,13 @@
-Route10South_MapScriptHeader: ; 0x1ae3f4
+Route10South_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1ae3f6
-TrainerHikerJim: ; 0x1ae3f6
+TrainerHikerJim:
; bit/flag number
- dw $534
+ dw EVENT_BEAT_HIKER_JIM
; trainer group && trainer id
db HIKER, JIM
@@ -24,9 +23,8 @@
; script when talk again
dw HikerJimScript
-; 0x1ae402
-HikerJimScript: ; 0x1ae402
+HikerJimScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ae43b
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x1ae40a
-TrainerPokefanmRobert: ; 0x1ae40a
+TrainerPokefanmRobert:
; bit/flag number
- dw $4cf
+ dw EVENT_BEAT_POKEFANM_ROBERT
; trainer group && trainer id
db POKEFANM, ROBERT
@@ -53,9 +50,8 @@
; script when talk again
dw PokefanmRobertScript
-; 0x1ae416
-PokefanmRobertScript: ; 0x1ae416
+PokefanmRobertScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ae4a9
@@ -62,44 +58,37 @@
closetext
loadmovesprites
end
-; 0x1ae41e
-MapRoute10SouthSignpost0Script: ; 0x1ae41e
+MapRoute10SouthSignpost0Script:
jumptext UnknownText_0x1ae4dc
-; 0x1ae421
-HikerJimSeenText: ; 0x1ae421
+HikerJimSeenText:
text "Hahahah!"
done
-; 0x1ae42b
-HikerJimBeatenText: ; 0x1ae42b
+HikerJimBeatenText:
text "Hahaha-hachoo!"
done
-; 0x1ae43b
-UnknownText_0x1ae43b: ; 0x1ae43b
+UnknownText_0x1ae43b:
text "Hay fever is"
line "making me sneeze!"
cont "Ahahah-CHOO!"
done
-; 0x1ae468
-PokefanmRobertSeenText: ; 0x1ae468
+PokefanmRobertSeenText:
text "You like #MON,"
line "don't you?"
para "Me too!"
done
-; 0x1ae48a
-PokefanmRobertBeatenText: ; 0x1ae48a
+PokefanmRobertBeatenText:
text "I'd have to say"
line "that's my loss."
done
-; 0x1ae4a9
-UnknownText_0x1ae4a9: ; 0x1ae4a9
+UnknownText_0x1ae4a9:
text "Look what you did"
line "to my #MON…"
@@ -106,17 +95,15 @@
para "I won't forget"
line "this…"
done
-; 0x1ae4dc
-UnknownText_0x1ae4dc: ; 0x1ae4dc
+UnknownText_0x1ae4dc:
text "ROUTE 10"
para "CERULEAN CITY -"
line "LAVENDER TOWN"
done
-; 0x1ae504
-Route10South_MapEventHeader: ; 0x1ae504
+Route10South_MapEventHeader:
; filler
db 0, 0
@@ -135,4 +122,3 @@
db 2
person_event SPRITE_POKEFAN_M, 7, 21, $8, $0, 255, 255, $b2, 3, TrainerHikerJim, $ffff
person_event SPRITE_POKEFAN_M, 14, 12, $a, $0, 255, 255, $82, 3, TrainerPokefanmRobert, $ffff
-; 0x1ae52e
--- a/maps/Route11.asm
+++ b/maps/Route11.asm
@@ -1,14 +1,13 @@
-Route11_MapScriptHeader: ; 0x68000
+Route11_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x68002
-TrainerYoungsterOwen: ; 0x68002
+TrainerYoungsterOwen:
; bit/flag number
- dw $5b3
+ dw EVENT_BEAT_YOUNGSTER_OWEN
; trainer group && trainer id
db YOUNGSTER, OWEN
@@ -24,9 +23,8 @@
; script when talk again
dw YoungsterOwenScript
-; 0x6800e
-YoungsterOwenScript: ; 0x6800e
+YoungsterOwenScript:
talkaftercancel
loadfont
writetext UnknownText_0x680b2
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x68016
-TrainerYoungsterJason: ; 0x68016
+TrainerYoungsterJason:
; bit/flag number
- dw $5b4
+ dw EVENT_BEAT_YOUNGSTER_JASON
; trainer group && trainer id
db YOUNGSTER, JASON
@@ -53,9 +50,8 @@
; script when talk again
dw YoungsterJasonScript
-; 0x68022
-YoungsterJasonScript: ; 0x68022
+YoungsterJasonScript:
talkaftercancel
loadfont
writetext UnknownText_0x6814a
@@ -62,11 +58,10 @@
closetext
loadmovesprites
end
-; 0x6802a
-TrainerPsychicHerman: ; 0x6802a
+TrainerPsychicHerman:
; bit/flag number
- dw $43c
+ dw EVENT_BEAT_PSYCHIC_HERMAN
; trainer group && trainer id
db PSYCHIC_T, HERMAN
@@ -82,9 +77,8 @@
; script when talk again
dw PsychicHermanScript
-; 0x68036
-PsychicHermanScript: ; 0x68036
+PsychicHermanScript:
talkaftercancel
loadfont
writetext UnknownText_0x6817b
@@ -91,11 +85,10 @@
closetext
loadmovesprites
end
-; 0x6803e
-TrainerPsychicFidel: ; 0x6803e
+TrainerPsychicFidel:
; bit/flag number
- dw $43d
+ dw EVENT_BEAT_PSYCHIC_FIDEL
; trainer group && trainer id
db PSYCHIC_T, FIDEL
@@ -111,9 +104,8 @@
; script when talk again
dw PsychicFidelScript
-; 0x6804a
-PsychicFidelScript: ; 0x6804a
+PsychicFidelScript:
talkaftercancel
loadfont
writetext UnknownText_0x681ec
@@ -120,23 +112,19 @@
closetext
loadmovesprites
end
-; 0x68052
-MapRoute11Signpost0Script: ; 0x68052
+MapRoute11Signpost0Script:
jumptext UnknownText_0x68238
-; 0x68055
-FruitTreeScript_0x68055: ; 0x68055
+FruitTreeScript_0x68055:
fruittree $18
-; 0x68057
-MapRoute11SignpostItem1: ; 0x68057
+MapRoute11SignpostItem1:
dw $00f5
db REVIVE
-; 0x6805a
-YoungsterOwenSeenText: ; 0x6805a
+YoungsterOwenSeenText:
text "There's no cheat-"
line "ing in #MON."
@@ -143,15 +131,13 @@
para "Let's keep it fair"
line "and square!"
done
-; 0x68097
-YoungsterOwenBeatenText: ; 0x68097
+YoungsterOwenBeatenText:
text "Huh? How did this"
line "happen?"
done
-; 0x680b2
-UnknownText_0x680b2: ; 0x680b2
+UnknownText_0x680b2:
text "I fought fair and"
line "square with honor."
@@ -158,9 +144,8 @@
para "I don't regret"
line "this at all."
done
-; 0x680f3
-YoungsterJasonSeenText: ; 0x680f3
+YoungsterJasonSeenText:
text "It itches and"
line "tickles a bit when"
@@ -167,54 +152,46 @@
para "I wear shorts in"
line "the grass."
done
-; 0x68131
-YoungsterJasonBeatenText: ; 0x68131
+YoungsterJasonBeatenText:
text "Aiyaaah!"
line "I got stomped!"
done
-; 0x6814a
-UnknownText_0x6814a: ; 0x6814a
+UnknownText_0x6814a:
text "I'm going to catch"
line "more #MON in"
cont "the grass."
done
-; 0x68175
-PsychicHermanSeenText: ; 0x68175
+PsychicHermanSeenText:
text "…"
done
-; 0x68178
-PsychicHermanBeatenText: ; 0x68178
+PsychicHermanBeatenText:
text "…"
done
-; 0x6817b
-UnknownText_0x6817b: ; 0x6817b
+UnknownText_0x6817b:
text "…"
para "I lost while I had"
line "my eyes closed…"
done
-; 0x681a1
-PsychicFidelSeenText: ; 0x681a1
+PsychicFidelSeenText:
text "I can see it…"
para "Everything to see"
line "about you…"
done
-; 0x681cd
-PsychicFidelBeatenText: ; 0x681cd
+PsychicFidelBeatenText:
text "I couldn't foresee"
line "your power…"
done
-; 0x681ec
-UnknownText_0x681ec: ; 0x681ec
+UnknownText_0x681ec:
text "Strength in con-"
line "viction…"
@@ -222,14 +199,12 @@
line "cause you believe"
cont "in your #MON."
done
-; 0x68238
-UnknownText_0x68238: ; 0x68238
+UnknownText_0x68238:
text "ROUTE 11"
done
-; 0x68242
-Route11_MapEventHeader: ; 0x68242
+Route11_MapEventHeader:
; filler
db 0, 0
@@ -251,4 +226,3 @@
person_event SPRITE_YOUNGSTER, 11, 32, $6, $0, 255, 255, $92, 1, TrainerPsychicHerman, $ffff
person_event SPRITE_YOUNGSTER, 10, 12, $a, $0, 255, 255, $92, 3, TrainerPsychicFidel, $ffff
person_event SPRITE_FRUIT_TREE, 6, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x68055, $ffff
-; 0x68293
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -1,14 +1,13 @@
-Route12_MapScriptHeader: ; 0x1a6fb3
+Route12_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1a6fb5
-TrainerFisherKyle: ; 0x1a6fb5
+TrainerFisherKyle:
; bit/flag number
- dw $451
+ dw EVENT_BEAT_FISHER_KYLE
; trainer group && trainer id
db FISHER, KYLE
@@ -24,9 +23,8 @@
; script when talk again
dw FisherKyleScript
-; 0x1a6fc1
-FisherKyleScript: ; 0x1a6fc1
+FisherKyleScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a7238
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x1a6fc9
-TrainerFisherMartin: ; 0x1a6fc9
+TrainerFisherMartin:
; bit/flag number
- dw $45a
+ dw EVENT_BEAT_FISHER_MARTIN
; trainer group && trainer id
db FISHER, MARTIN
@@ -53,9 +50,8 @@
; script when talk again
dw FisherMartinScript
-; 0x1a6fd5
-FisherMartinScript: ; 0x1a6fd5
+FisherMartinScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a704c
@@ -62,11 +58,10 @@
closetext
loadmovesprites
end
-; 0x1a6fdd
-TrainerFisherStephen: ; 0x1a6fdd
+TrainerFisherStephen:
; bit/flag number
- dw $45b
+ dw EVENT_BEAT_FISHER_STEPHEN
; trainer group && trainer id
db FISHER, STEPHEN
@@ -82,9 +77,8 @@
; script when talk again
dw FisherStephenScript
-; 0x1a6fe9
-FisherStephenScript: ; 0x1a6fe9
+FisherStephenScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a70d4
@@ -91,11 +85,10 @@
closetext
loadmovesprites
end
-; 0x1a6ff1
-TrainerFisherBarney: ; 0x1a6ff1
+TrainerFisherBarney:
; bit/flag number
- dw $45c
+ dw EVENT_BEAT_FISHER_BARNEY
; trainer group && trainer id
db FISHER, BARNEY
@@ -111,9 +104,8 @@
; script when talk again
dw FisherBarneyScript
-; 0x1a6ffd
-FisherBarneyScript: ; 0x1a6ffd
+FisherBarneyScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a716d
@@ -120,63 +112,52 @@
closetext
loadmovesprites
end
-; 0x1a7005
-MapRoute12Signpost0Script: ; 0x1a7005
+MapRoute12Signpost0Script:
jumptext UnknownText_0x1a72a0
-; 0x1a7008
-MapRoute12Signpost1Script: ; 0x1a7008
+MapRoute12Signpost1Script:
jumptext UnknownText_0x1a72c1
-; 0x1a700b
-ItemFragment_0x1a700b: ; 0x1a700b
+ItemFragment_0x1a700b:
db CALCIUM, 1
-; 0x1a700d
-ItemFragment_0x1a700d: ; 0x1a700d
+ItemFragment_0x1a700d:
db NUGGET, 1
-; 0x1a700f
-MapRoute12SignpostItem2: ; 0x1a700f
+MapRoute12SignpostItem2:
dw $00f3
db ELIXER
-; 0x1a7012
-FisherMartinSeenText: ; 0x1a7012
+FisherMartinSeenText:
text "Patience is the"
line "key to both fish-"
cont "ing and #MON."
done
-; 0x1a7043
-FisherMartinBeatenText: ; 0x1a7043
+FisherMartinBeatenText:
text "Gwaaah!"
done
-; 0x1a704c
-UnknownText_0x1a704c: ; 0x1a704c
+UnknownText_0x1a704c:
text "I'm too impatient"
line "for fishing…"
done
-; 0x1a706b
-FisherStephenSeenText: ; 0x1a706b
+FisherStephenSeenText:
text "I feel so content,"
line "fishing while lis-"
cont "tening to some"
cont "tunes on my radio."
done
-; 0x1a70b4
-FisherStephenBeatenText: ; 0x1a70b4
+FisherStephenBeatenText:
text "My stupid radio"
line "distracted me!"
done
-; 0x1a70d4
-UnknownText_0x1a70d4: ; 0x1a70d4
+UnknownText_0x1a70d4:
text "Have you checked"
line "out KANTO's radio"
@@ -183,22 +164,19 @@
para "programs? We get a"
line "good variety here."
done
-; 0x1a711d
-FisherBarneySeenText: ; 0x1a711d
+FisherBarneySeenText:
text "What's most impor-"
line "tant in our every-"
cont "day lives?"
done
-; 0x1a714e
-FisherBarneyBeatenText: ; 0x1a714e
+FisherBarneyBeatenText:
text "The answer is"
line "coming up next!"
done
-; 0x1a716d
-UnknownText_0x1a716d: ; 0x1a716d
+UnknownText_0x1a716d:
text "I think electric-"
line "ity is the most"
@@ -214,19 +192,16 @@
para "POWER PLANT went"
line "out of commission."
done
-; 0x1a7214
-FisherKyleSeenText: ; 0x1a7214
+FisherKyleSeenText:
text "Do you remember?"
done
-; 0x1a7226
-FisherKyleBeatenText: ; 0x1a7226
+FisherKyleBeatenText:
text "You do remember?"
done
-; 0x1a7238
-UnknownText_0x1a7238: ; 0x1a7238
+UnknownText_0x1a7238:
text "The tug you feel"
line "on the ROD when"
@@ -237,22 +212,19 @@
line "feeling ever for"
cont "an angler like me."
done
-; 0x1a72a0
-UnknownText_0x1a72a0: ; 0x1a72a0
+UnknownText_0x1a72a0:
text "ROUTE 12"
para "NORTH TO LAVENDER"
line "TOWN"
done
-; 0x1a72c1
-UnknownText_0x1a72c1: ; 0x1a72c1
+UnknownText_0x1a72c1:
text "FISHING SPOT"
done
-; 0x1a72cf
-Route12_MapEventHeader: ; 0x1a72cf
+Route12_MapEventHeader:
; filler
db 0, 0
@@ -277,4 +249,3 @@
person_event SPRITE_FISHER, 11, 10, $9, $0, 255, 255, $a2, 3, TrainerFisherKyle, $ffff
person_event SPRITE_POKE_BALL, 47, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a700b, $0788
person_event SPRITE_POKE_BALL, 55, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a700d, $0789
-; 0x1a7337
--- a/maps/Route13.asm
+++ b/maps/Route13.asm
@@ -1,14 +1,13 @@
-Route13_MapScriptHeader: ; 0x1a2430
+Route13_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1a2432
-TrainerPokefanmAlex: ; 0x1a2432
+TrainerPokefanmAlex:
; bit/flag number
- dw $4d8
+ dw EVENT_BEAT_POKEFANM_ALEX
; trainer group && trainer id
db POKEFANM, ALEX
@@ -24,9 +23,8 @@
; script when talk again
dw PokefanmAlexScript
-; 0x1a243e
-PokefanmAlexScript: ; 0x1a243e
+PokefanmAlexScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a24e3
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x1a2446
-TrainerPokefanmJoshua: ; 0x1a2446
+TrainerPokefanmJoshua:
; bit/flag number
- dw $4d0
+ dw EVENT_BEAT_POKEFANM_JOSHUA
; trainer group && trainer id
db POKEFANM, JOSHUA
@@ -53,9 +50,8 @@
; script when talk again
dw PokefanmJoshuaScript
-; 0x1a2452
-PokefanmJoshuaScript: ; 0x1a2452
+PokefanmJoshuaScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a254f
@@ -62,11 +58,10 @@
closetext
loadmovesprites
end
-; 0x1a245a
-TrainerBird_keeperPerry: ; 0x1a245a
+TrainerBird_keeperPerry:
; bit/flag number
- dw $409
+ dw EVENT_BEAT_BIRD_KEEPER_PERRY
; trainer group && trainer id
db BIRD_KEEPER, PERRY
@@ -82,9 +77,8 @@
; script when talk again
dw Bird_keeperPerryScript
-; 0x1a2466
-Bird_keeperPerryScript: ; 0x1a2466
+Bird_keeperPerryScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a25db
@@ -91,11 +85,10 @@
closetext
loadmovesprites
end
-; 0x1a246e
-TrainerBird_keeperBret: ; 0x1a246e
+TrainerBird_keeperBret:
; bit/flag number
- dw $40a
+ dw EVENT_BEAT_BIRD_KEEPER_BRET
; trainer group && trainer id
db BIRD_KEEPER, BRET
@@ -111,9 +104,8 @@
; script when talk again
dw Bird_keeperBretScript
-; 0x1a247a
-Bird_keeperBretScript: ; 0x1a247a
+Bird_keeperBretScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a2662
@@ -120,11 +112,10 @@
closetext
loadmovesprites
end
-; 0x1a2482
-TrainerHikerKenny: ; 0x1a2482
+TrainerHikerKenny:
; bit/flag number
- dw $533
+ dw EVENT_BEAT_HIKER_KENNY
; trainer group && trainer id
db HIKER, KENNY
@@ -140,9 +131,8 @@
; script when talk again
dw HikerKennyScript
-; 0x1a248e
-HikerKennyScript: ; 0x1a248e
+HikerKennyScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a26c2
@@ -149,58 +139,48 @@
closetext
loadmovesprites
end
-; 0x1a2496
-MapRoute13Signpost0Script: ; 0x1a2496
+MapRoute13Signpost0Script:
jumptext UnknownText_0x1a271c
-; 0x1a2499
-MapRoute13Signpost1Script: ; 0x1a2499
+MapRoute13Signpost1Script:
jumptext UnknownText_0x1a275b
-; 0x1a249c
-MapRoute13Signpost2Script: ; 0x1a249c
+MapRoute13Signpost2Script:
jumptext UnknownText_0x1a277d
-; 0x1a249f
-MapRoute13SignpostItem3: ; 0x1a249f
+MapRoute13SignpostItem3:
dw $00f4
db CALCIUM
-; 0x1a24a2
-PokefanmAlexSeenText: ; 0x1a24a2
+PokefanmAlexSeenText:
text "Bow down before my"
line "regal #MON!"
done
-; 0x1a24c2
-PokefanmAlexBeatenText: ; 0x1a24c2
+PokefanmAlexBeatenText:
text "How… How dare you"
line "mock royalty!"
done
-; 0x1a24e3
-UnknownText_0x1a24e3: ; 0x1a24e3
+UnknownText_0x1a24e3:
text "Doesn't everyone"
line "wish to someday be"
cont "a king?"
done
-; 0x1a250f
-PokefanmJoshuaSeenText: ; 0x1a250f
+PokefanmJoshuaSeenText:
text "Nihihi! Would you"
line "like to battle my"
cont "PIKACHU gang?"
done
-; 0x1a2542
-PokefanmJoshuaBeatenText: ; 0x1a2542
+PokefanmJoshuaBeatenText:
text "PI-PIKACHU!"
done
-; 0x1a254f
-UnknownText_0x1a254f: ; 0x1a254f
+UnknownText_0x1a254f:
text "You look like you"
line "have many #MON,"
@@ -207,29 +187,25 @@
para "but PIKACHU is"
line "still the best."
done
-; 0x1a2591
-Bird_keeperPerrySeenText: ; 0x1a2591
+Bird_keeperPerrySeenText:
text "Agility is the key"
line "attribute of bird"
cont "#MON."
done
-; 0x1a25bd
-Bird_keeperPerryBeatenText: ; 0x1a25bd
+Bird_keeperPerryBeatenText:
text "You beat me with"
line "your speed…"
done
-; 0x1a25db
-UnknownText_0x1a25db: ; 0x1a25db
+UnknownText_0x1a25db:
text "Your #MON are"
line "remarkably well-"
cont "trained."
done
-; 0x1a2604
-Bird_keeperBretSeenText: ; 0x1a2604
+Bird_keeperBretSeenText:
text "Check out my #-"
line "MON. Just look at"
@@ -236,33 +212,28 @@
para "their coloring and"
line "their plumage."
done
-; 0x1a2649
-Bird_keeperBretBeatenText: ; 0x1a2649
+Bird_keeperBretBeatenText:
text "Shoot!"
line "Not good enough!"
done
-; 0x1a2662
-UnknownText_0x1a2662: ; 0x1a2662
+UnknownText_0x1a2662:
text "If you groom them,"
line "#MON get happy."
done
-; 0x1a2686
-HikerKennySeenText: ; 0x1a2686
+HikerKennySeenText:
text "I should go to"
line "ROCK TUNNEL to get"
cont "myself an ONIX."
done
-; 0x1a26b9
-HikerKennyBeatenText: ; 0x1a26b9
+HikerKennyBeatenText:
text "I lost…"
done
-; 0x1a26c2
-UnknownText_0x1a26c2: ; 0x1a26c2
+UnknownText_0x1a26c2:
text "Geological fea-"
line "tures don't appear"
cont "to change."
@@ -271,9 +242,8 @@
line "change, little by"
cont "little."
done
-; 0x1a271c
-UnknownText_0x1a271c: ; 0x1a271c
+UnknownText_0x1a271c:
text "TRAINER TIPS"
para "Look! Right there,"
@@ -280,17 +250,15 @@
line "at the left side"
cont "of the post."
done
-; 0x1a275b
-UnknownText_0x1a275b: ; 0x1a275b
+UnknownText_0x1a275b:
text "ROUTE 13"
para "NORTH TO SILENCE"
line "BRIDGE"
done
-; 0x1a277d
-UnknownText_0x1a277d: ; 0x1a277d
+UnknownText_0x1a277d:
text "NORTH TO LAVENDER"
line "TOWN"
@@ -297,9 +265,8 @@
para "WEST TO FUCHSIA"
line "CITY"
done
-; 0x1a27aa
-Route13_MapEventHeader: ; 0x1a27aa
+Route13_MapEventHeader:
; filler
db 0, 0
@@ -323,4 +290,3 @@
person_event SPRITE_POKEFAN_M, 12, 36, $8, $0, 255, 255, $82, 3, TrainerPokefanmJoshua, $ffff
person_event SPRITE_POKEFAN_M, 14, 18, $8, $0, 255, 255, $82, 4, TrainerHikerKenny, $ffff
person_event SPRITE_POKEFAN_M, 10, 29, $9, $0, 255, 255, $82, 4, TrainerPokefanmAlex, $ffff
-; 0x1a2805
--- a/maps/Route14.asm
+++ b/maps/Route14.asm
@@ -1,12 +1,11 @@
-Route14_MapScriptHeader: ; 0x1ad47d
+Route14_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1ad47f
-TeacherScript_0x1ad47f: ; 0x1ad47f
+TeacherScript_0x1ad47f:
faceplayer
loadfont
trade $5
@@ -13,11 +12,10 @@
closetext
loadmovesprites
end
-; 0x1ad486
-TrainerPokefanmCarter: ; 0x1ad486
+TrainerPokefanmCarter:
; bit/flag number
- dw $4d1
+ dw EVENT_BEAT_POKEFANM_CARTER
; trainer group && trainer id
db POKEFANM, CARTER
@@ -33,9 +31,8 @@
; script when talk again
dw PokefanmCarterScript
-; 0x1ad492
-PokefanmCarterScript: ; 0x1ad492
+PokefanmCarterScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ad508
@@ -42,11 +39,10 @@
closetext
loadmovesprites
end
-; 0x1ad49a
-TrainerBird_keeperRoy: ; 0x1ad49a
+TrainerBird_keeperRoy:
; bit/flag number
- dw $403
+ dw EVENT_BEAT_BIRD_KEEPER_ROY
; trainer group && trainer id
db BIRD_KEEPER, ROY
@@ -62,9 +58,8 @@
; script when talk again
dw Bird_keeperRoyScript
-; 0x1ad4a6
-Bird_keeperRoyScript: ; 0x1ad4a6
+Bird_keeperRoyScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ad5a4
@@ -71,11 +66,10 @@
closetext
loadmovesprites
end
-; 0x1ad4ae
-TrainerPokefanmTrevor: ; 0x1ad4ae
+TrainerPokefanmTrevor:
; bit/flag number
- dw $4d2
+ dw EVENT_BEAT_POKEFANM_TREVOR
; trainer group && trainer id
db POKEFANM, TREVOR
@@ -91,9 +85,8 @@
; script when talk again
dw PokefanmTrevorScript
-; 0x1ad4ba
-PokefanmTrevorScript: ; 0x1ad4ba
+PokefanmTrevorScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ad660
@@ -100,9 +93,8 @@
closetext
loadmovesprites
end
-; 0x1ad4c2
-PokefanmCarterSeenText: ; 0x1ad4c2
+PokefanmCarterSeenText:
text "Let me tell you,"
line "I had a hard time"
@@ -109,14 +101,12 @@
para "catching my prized"
line "#MON."
done
-; 0x1ad4ff
-PokefanmCarterBeatenText: ; 0x1ad4ff
+PokefanmCarterBeatenText:
text "Awaaah!"
done
-; 0x1ad508
-UnknownText_0x1ad508: ; 0x1ad508
+UnknownText_0x1ad508:
text "SQUIRTLE, CHARMAN-"
line "DER and BULBASAUR…"
@@ -123,22 +113,19 @@
para "I think that's a"
line "well-balanced mix."
done
-; 0x1ad552
-Bird_keeperRoySeenText: ; 0x1ad552
+Bird_keeperRoySeenText:
text "My dream is to fly"
line "with my beloved"
cont "bird #MON."
done
-; 0x1ad581
-Bird_keeperRoyBeatenText: ; 0x1ad581
+Bird_keeperRoyBeatenText:
text "I can dream, but I"
line "can't ever fly…"
done
-; 0x1ad5a4
-UnknownText_0x1ad5a4: ; 0x1ad5a4
+UnknownText_0x1ad5a4:
text "You have #MON"
line "that know the HM"
@@ -145,9 +132,8 @@
para "move FLY, don't"
line "you? I envy you."
done
-; 0x1ad5e4
-PokefanmTrevorSeenText: ; 0x1ad5e4
+PokefanmTrevorSeenText:
text "Hi. Did you know…?"
para "#MON get more"
@@ -157,15 +143,13 @@
line "place that they"
cont "remember."
done
-; 0x1ad640
-PokefanmTrevorBeatenText: ; 0x1ad640
+PokefanmTrevorBeatenText:
text "Where did I meet"
line "this PSYDUCK?"
done
-; 0x1ad660
-UnknownText_0x1ad660: ; 0x1ad660
+UnknownText_0x1ad660:
text "If only there were"
line "an easy way to"
@@ -172,9 +156,8 @@
para "identify where I"
line "got my #MON…"
done
-; 0x1ad6a1
-Route14_MapEventHeader: ; 0x1ad6a1
+Route14_MapEventHeader:
; filler
db 0, 0
@@ -193,4 +176,3 @@
person_event SPRITE_YOUNGSTER, 31, 15, $a, $0, 255, 255, $92, 3, TrainerBird_keeperRoy, $ffff
person_event SPRITE_POKEFAN_M, 15, 10, $a, $0, 255, 255, $82, 3, TrainerPokefanmTrevor, $ffff
person_event SPRITE_TEACHER, 9, 11, $5, $1, 255, 255, $a0, 4, TeacherScript_0x1ad47f, $ffff
-; 0x1ad6db
--- a/maps/Route15.asm
+++ b/maps/Route15.asm
@@ -1,14 +1,13 @@
-Route15_MapScriptHeader: ; 0x1aa567
+Route15_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1aa569
-TrainerTeacherColette: ; 0x1aa569
+TrainerTeacherColette:
; bit/flag number
- dw $5b5
+ dw EVENT_BEAT_TEACHER_COLETTE
; trainer group && trainer id
db TEACHER, COLETTE
@@ -24,9 +23,8 @@
; script when talk again
dw TeacherColetteScript
-; 0x1aa575
-TeacherColetteScript: ; 0x1aa575
+TeacherColetteScript:
talkaftercancel
loadfont
writetext UnknownText_0x1aa60d
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x1aa57d
-TrainerTeacherHillary: ; 0x1aa57d
+TrainerTeacherHillary:
; bit/flag number
- dw $5b6
+ dw EVENT_BEAT_TEACHER_HILLARY
; trainer group && trainer id
db TEACHER, HILLARY
@@ -53,9 +50,8 @@
; script when talk again
dw TeacherHillaryScript
-; 0x1aa589
-TeacherHillaryScript: ; 0x1aa589
+TeacherHillaryScript:
talkaftercancel
loadfont
writetext UnknownText_0x1aa6ca
@@ -62,11 +58,10 @@
closetext
loadmovesprites
end
-; 0x1aa591
-TrainerSchoolboyKipp: ; 0x1aa591
+TrainerSchoolboyKipp:
; bit/flag number
- dw $46d
+ dw EVENT_BEAT_SCHOOLBOY_KIP
; trainer group && trainer id
db SCHOOLBOY, KIPP
@@ -82,9 +77,8 @@
; script when talk again
dw SchoolboyKippScript
-; 0x1aa59d
-SchoolboyKippScript: ; 0x1aa59d
+SchoolboyKippScript:
talkaftercancel
loadfont
writetext UnknownText_0x1aa740
@@ -91,11 +85,10 @@
closetext
loadmovesprites
end
-; 0x1aa5a5
-TrainerSchoolboyTommy: ; 0x1aa5a5
+TrainerSchoolboyTommy:
; bit/flag number
- dw $471
+ dw EVENT_BEAT_SCHOOLBOY_TOMMY
; trainer group && trainer id
db SCHOOLBOY, TOMMY
@@ -111,9 +104,8 @@
; script when talk again
dw SchoolboyTommyScript
-; 0x1aa5b1
-SchoolboyTommyScript: ; 0x1aa5b1
+SchoolboyTommyScript:
talkaftercancel
loadfont
writetext UnknownText_0x1aa7bc
@@ -120,11 +112,10 @@
closetext
loadmovesprites
end
-; 0x1aa5b9
-TrainerSchoolboyJohnny: ; 0x1aa5b9
+TrainerSchoolboyJohnny:
; bit/flag number
- dw $46f
+ dw EVENT_BEAT_SCHOOLBOY_JOHNNY
; trainer group && trainer id
db SCHOOLBOY, JOHNNY
@@ -140,9 +131,8 @@
; script when talk again
dw SchoolboyJohnnyScript
-; 0x1aa5c5
-SchoolboyJohnnyScript: ; 0x1aa5c5
+SchoolboyJohnnyScript:
talkaftercancel
loadfont
writetext UnknownText_0x1aa84a
@@ -149,11 +139,10 @@
closetext
loadmovesprites
end
-; 0x1aa5cd
-TrainerSchoolboyBilly: ; 0x1aa5cd
+TrainerSchoolboyBilly:
; bit/flag number
- dw $474
+ dw EVENT_BEAT_SCHOOLBOY_BILLY
; trainer group && trainer id
db SCHOOLBOY, BILLY
@@ -169,9 +158,8 @@
; script when talk again
dw SchoolboyBillyScript
-; 0x1aa5d9
-SchoolboyBillyScript: ; 0x1aa5d9
+SchoolboyBillyScript:
talkaftercancel
loadfont
writetext UnknownText_0x1aa8b0
@@ -178,28 +166,23 @@
closetext
loadmovesprites
end
-; 0x1aa5e1
-MapRoute15Signpost0Script: ; 0x1aa5e1
+MapRoute15Signpost0Script:
jumptext UnknownText_0x1aa8e3
-; 0x1aa5e4
-ItemFragment_0x1aa5e4: ; 0x1aa5e4
+ItemFragment_0x1aa5e4:
db PP_UP, 1
-; 0x1aa5e6
-TeacherColetteSeenText: ; 0x1aa5e6
+TeacherColetteSeenText:
text "Have you forgotten"
line "anything?"
done
-; 0x1aa604
-TeacherColetteBeatenText: ; 0x1aa604
+TeacherColetteBeatenText:
text "Kyaaah!"
done
-; 0x1aa60d
-UnknownText_0x1aa60d: ; 0x1aa60d
+UnknownText_0x1aa60d:
text "Before I became a"
line "teacher, I used to"
@@ -206,9 +189,8 @@
para "forget a lot of"
line "things."
done
-; 0x1aa64b
-TeacherHillarySeenText: ; 0x1aa64b
+TeacherHillarySeenText:
text "On sunny days, I"
line "think that the"
@@ -218,34 +200,29 @@
para "schoolyard than"
line "studying in class."
done
-; 0x1aa6b3
-TeacherHillaryBeatenText: ; 0x1aa6b3
+TeacherHillaryBeatenText:
text "I didn't want to"
line "lose…"
done
-; 0x1aa6ca
-UnknownText_0x1aa6ca: ; 0x1aa6ca
+UnknownText_0x1aa6ca:
text "Studying is impor-"
line "tant, but exercise"
cont "is just as vital."
done
-; 0x1aa703
-SchoolboyKippSeenText: ; 0x1aa703
+SchoolboyKippSeenText:
text "Hang on. I have to"
line "phone my mom."
done
-; 0x1aa725
-SchoolboyKippBeatenText: ; 0x1aa725
+SchoolboyKippBeatenText:
text "Sorry, Mom!"
line "I was beaten!"
done
-; 0x1aa740
-UnknownText_0x1aa740: ; 0x1aa740
+UnknownText_0x1aa740:
text "My mom worries so"
line "much about me, I"
@@ -252,28 +229,24 @@
para "have to phone her"
line "all the time."
done
-; 0x1aa784
-SchoolboyTommySeenText: ; 0x1aa784
+SchoolboyTommySeenText:
text "Let's battle."
line "I won't lose!"
done
-; 0x1aa79f
-SchoolboyTommyBeatenText: ; 0x1aa79f
+SchoolboyTommyBeatenText:
text "I forgot to do my"
line "homework!"
done
-; 0x1aa7bc
-UnknownText_0x1aa7bc: ; 0x1aa7bc
+UnknownText_0x1aa7bc:
text "Sayonara! I just"
line "learned that in my"
cont "Japanese class."
done
-; 0x1aa7f1
-SchoolboyJohnnySeenText: ; 0x1aa7f1
+SchoolboyJohnnySeenText:
text "We're on a field"
line "trip to LAVENDER"
@@ -280,49 +253,42 @@
para "RADIO TOWER for"
line "social studies."
done
-; 0x1aa833
-SchoolboyJohnnyBeatenText: ; 0x1aa833
+SchoolboyJohnnyBeatenText:
text "You're wickedly"
line "tough!"
done
-; 0x1aa84a
-UnknownText_0x1aa84a: ; 0x1aa84a
+UnknownText_0x1aa84a:
text "I'm tired of walk-"
line "ing. I need to"
cont "take a break."
done
-; 0x1aa87a
-SchoolboyBillySeenText: ; 0x1aa87a
+SchoolboyBillySeenText:
text "My favorite class"
line "is gym!"
done
-; 0x1aa895
-SchoolboyBillyBeatenText: ; 0x1aa895
+SchoolboyBillyBeatenText:
text "Oh, no!"
line "How could I lose?"
done
-; 0x1aa8b0
-UnknownText_0x1aa8b0: ; 0x1aa8b0
+UnknownText_0x1aa8b0:
text "If #MON were a"
line "subject at school,"
cont "I'd be the best!"
done
-; 0x1aa8e3
-UnknownText_0x1aa8e3: ; 0x1aa8e3
+UnknownText_0x1aa8e3:
text "ROUTE 15"
para "FUCHSIA CITY -"
line "LAVENDER TOWN"
done
-; 0x1aa90a
-Route15_MapEventHeader: ; 0x1aa90a
+Route15_MapEventHeader:
; filler
db 0, 0
@@ -347,4 +313,3 @@
person_event SPRITE_TEACHER, 16, 34, $7, $0, 255, 255, $82, 4, TrainerTeacherColette, $ffff
person_event SPRITE_TEACHER, 14, 24, $a, $0, 255, 255, $82, 3, TrainerTeacherHillary, $ffff
person_event SPRITE_POKE_BALL, 9, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x1aa5e4, $078a
-; 0x1aa97a
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -1,4 +1,4 @@
-Route17_MapScriptHeader: ; 0x1ad0a6
+Route17_MapScriptHeader:
; trigger count
db 0
@@ -8,17 +8,15 @@
; callbacks
dbw 5, UnknownScript_0x1ad0ab
-; 0x1ad0ab
-UnknownScript_0x1ad0ab: ; 0x1ad0ab
+UnknownScript_0x1ad0ab:
setflag $0019
setflag $001a
return
-; 0x1ad0b2
-TrainerBikerCharles: ; 0x1ad0b2
+TrainerBikerCharles:
; bit/flag number
- dw $436
+ dw EVENT_BEAT_BIKER_CHARLES
; trainer group && trainer id
db BIKER, CHARLES
@@ -34,9 +32,8 @@
; script when talk again
dw BikerCharlesScript
-; 0x1ad0be
-BikerCharlesScript: ; 0x1ad0be
+BikerCharlesScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ad293
@@ -43,11 +40,10 @@
closetext
loadmovesprites
end
-; 0x1ad0c6
-TrainerBikerRiley: ; 0x1ad0c6
+TrainerBikerRiley:
; bit/flag number
- dw $437
+ dw EVENT_BEAT_BIKER_RILEY
; trainer group && trainer id
db BIKER, RILEY
@@ -63,9 +59,8 @@
; script when talk again
dw BikerRileyScript
-; 0x1ad0d2
-BikerRileyScript: ; 0x1ad0d2
+BikerRileyScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ad13b
@@ -72,11 +67,10 @@
closetext
loadmovesprites
end
-; 0x1ad0da
-TrainerBikerJoel: ; 0x1ad0da
+TrainerBikerJoel:
; bit/flag number
- dw $438
+ dw EVENT_BEAT_BIKER_JOEL
; trainer group && trainer id
db BIKER, JOEL
@@ -92,9 +86,8 @@
; script when talk again
dw BikerJoelScript
-; 0x1ad0e6
-BikerJoelScript: ; 0x1ad0e6
+BikerJoelScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ad196
@@ -101,11 +94,10 @@
closetext
loadmovesprites
end
-; 0x1ad0ee
-TrainerBikerGlenn: ; 0x1ad0ee
+TrainerBikerGlenn:
; bit/flag number
- dw $439
+ dw EVENT_BEAT_BIKER_GLENN
; trainer group && trainer id
db BIKER, GLENN
@@ -121,9 +113,8 @@
; script when talk again
dw BikerGlennScript
-; 0x1ad0fa
-BikerGlennScript: ; 0x1ad0fa
+BikerGlennScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ad225
@@ -130,50 +121,42 @@
closetext
loadmovesprites
end
-; 0x1ad102
-MapRoute17SignpostItem0: ; 0x1ad102
+MapRoute17SignpostItem0:
dw $00f6
db MAX_ETHER
-; 0x1ad105
-MapRoute17SignpostItem1: ; 0x1ad105
+MapRoute17SignpostItem1:
dw $00f7
db MAX_ELIXER
-; 0x1ad108
-BikerRileySeenText: ; 0x1ad108
+BikerRileySeenText:
text "Hey, you! You're"
line "from JOHTO, huh?"
done
-; 0x1ad12a
-BikerRileyBeatenText: ; 0x1ad12a
+BikerRileyBeatenText:
text "Whoa, you kick!"
done
-; 0x1ad13b
-UnknownText_0x1ad13b: ; 0x1ad13b
+UnknownText_0x1ad13b:
text "Don't get cocky,"
line "you JOHTO punk!"
done
-; 0x1ad15c
-BikerJoelSeenText: ; 0x1ad15c
+BikerJoelSeenText:
text "Wow. That's a cool"
line "BICYCLE!"
done
-; 0x1ad178
-BikerJoelBeatenText: ; 0x1ad178
+BikerJoelBeatenText:
text "But you don't just"
line "look cool…"
done
-; 0x1ad196
-UnknownText_0x1ad196: ; 0x1ad196
+UnknownText_0x1ad196:
text "I look cool, but"
line "I'm weak, so I'm"
cont "not really cool."
@@ -181,47 +164,40 @@
para "I have to train"
line "harder…"
done
-; 0x1ad1e0
-BikerGlennSeenText: ; 0x1ad1e0
+BikerGlennSeenText:
text "Hey! Want to have"
line "a speed battle?"
done
-; 0x1ad203
-BikerGlennBeatenText: ; 0x1ad203
+BikerGlennBeatenText:
text "Yikes! You've got"
line "awesome torque!"
done
-; 0x1ad225
-UnknownText_0x1ad225: ; 0x1ad225
+UnknownText_0x1ad225:
text "Hands-free riding"
line "is considered cool"
cont "on CYCLING ROAD."
done
-; 0x1ad25c
-BikerCharlesSeenText: ; 0x1ad25c
+BikerCharlesSeenText:
text "We're fearless"
line "highway stars!"
done
-; 0x1ad27a
-BikerCharlesBeatenText: ; 0x1ad27a
+BikerCharlesBeatenText:
text "Arrrgh! Crash and"
line "burn!"
done
-; 0x1ad293
-UnknownText_0x1ad293: ; 0x1ad293
+UnknownText_0x1ad293:
text "Reckless driving"
line "causes accidents!"
cont "Take it easy!"
done
-; 0x1ad2c5
-Route17_MapEventHeader: ; 0x1ad2c5
+Route17_MapEventHeader:
; filler
db 0, 0
@@ -244,4 +220,3 @@
person_event SPRITE_BIKER, 72, 13, $6, $0, 255, 255, $b2, 1, TrainerBikerJoel, $ffff
person_event SPRITE_BIKER, 57, 7, $a, $0, 255, 255, $b2, 3, TrainerBikerGlenn, $ffff
person_event SPRITE_BIKER, 84, 10, $9, $0, 255, 255, $b2, 4, TrainerBikerCharles, $ffff
-; 0x1ad313
--- a/maps/Route18.asm
+++ b/maps/Route18.asm
@@ -1,14 +1,13 @@
-Route18_MapScriptHeader: ; 0x1acf2f
+Route18_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1acf31
-TrainerBird_keeperBoris: ; 0x1acf31
+TrainerBird_keeperBoris:
; bit/flag number
- dw $404
+ dw EVENT_BEAT_BIRD_KEEPER_BORIS
; trainer group && trainer id
db BIRD_KEEPER, BORIS
@@ -24,9 +23,8 @@
; script when talk again
dw Bird_keeperBorisScript
-; 0x1acf3d
-Bird_keeperBorisScript: ; 0x1acf3d
+Bird_keeperBorisScript:
talkaftercancel
loadfont
writetext UnknownText_0x1acfa5
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x1acf45
-TrainerBird_keeperBob: ; 0x1acf45
+TrainerBird_keeperBob:
; bit/flag number
- dw $405
+ dw EVENT_BEAT_BIRD_KEEPER_BOB
; trainer group && trainer id
db BIRD_KEEPER, BOB
@@ -53,9 +50,8 @@
; script when talk again
dw Bird_keeperBobScript
-; 0x1acf51
-Bird_keeperBobScript: ; 0x1acf51
+Bird_keeperBobScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ad00d
@@ -62,13 +58,11 @@
closetext
loadmovesprites
end
-; 0x1acf59
-MapRoute18Signpost0Script: ; 0x1acf59
+MapRoute18Signpost0Script:
jumptext UnknownText_0x1ad051
-; 0x1acf5c
-Bird_keeperBorisSeenText: ; 0x1acf5c
+Bird_keeperBorisSeenText:
text "If you're looking"
line "for #MON, you"
@@ -75,33 +69,28 @@
para "have to look in"
line "the tall grass."
done
-; 0x1acf9c
-Bird_keeperBorisBeatenText: ; 0x1acf9c
+Bird_keeperBorisBeatenText:
text "Ayieee!"
done
-; 0x1acfa5
-UnknownText_0x1acfa5: ; 0x1acfa5
+UnknownText_0x1acfa5:
text "Since you're so"
line "strong, it must be"
cont "fun to battle."
done
-; 0x1acfd7
-Bird_keeperBobSeenText: ; 0x1acfd7
+Bird_keeperBobSeenText:
text "CYCLING ROAD is a"
line "quick shortcut to"
cont "CELADON."
done
-; 0x1ad005
-Bird_keeperBobBeatenText: ; 0x1ad005
+Bird_keeperBobBeatenText:
text "…Whew!"
done
-; 0x1ad00d
-UnknownText_0x1ad00d: ; 0x1ad00d
+UnknownText_0x1ad00d:
text "If you don't have"
line "a BICYCLE, you're"
@@ -108,17 +97,15 @@
para "not allowed to use"
line "the shortcut."
done
-; 0x1ad051
-UnknownText_0x1ad051: ; 0x1ad051
+UnknownText_0x1ad051:
text "ROUTE 18"
para "CELADON CITY -"
line "FUCHSIA CITY"
done
-; 0x1ad077
-Route18_MapEventHeader: ; 0x1ad077
+Route18_MapEventHeader:
; filler
db 0, 0
@@ -138,4 +125,3 @@
db 2
person_event SPRITE_YOUNGSTER, 16, 13, $a, $0, 255, 255, $92, 3, TrainerBird_keeperBoris, $ffff
person_event SPRITE_YOUNGSTER, 10, 17, $6, $0, 255, 255, $92, 3, TrainerBird_keeperBob, $ffff
-; 0x1ad0a6
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -1,4 +1,4 @@
-Route19_MapScriptHeader: ; 0x19e9d9
+Route19_MapScriptHeader:
; trigger count
db 0
@@ -8,9 +8,8 @@
; callbacks
dbw 1, UnknownScript_0x19e9de
-; 0x19e9de
-UnknownScript_0x19e9de: ; 0x19e9de
+UnknownScript_0x19e9de:
checkevent $00d7
iftrue UnknownScript_0x19e9fc
changeblock $6, $6, $7a
@@ -19,13 +18,12 @@
changeblock $c, $8, $7a
changeblock $4, $8, $7a
changeblock $a, $a, $7a
-UnknownScript_0x19e9fc: ; 0x19e9fc
+UnknownScript_0x19e9fc:
return
-; 0x19e9fd
-TrainerSwimmerfDawn: ; 0x19e9fd
+TrainerSwimmerfDawn:
; bit/flag number
- dw $3f3
+ dw EVENT_BEAT_SWIMMERF_DAWN
; trainer group && trainer id
db SWIMMERF, DAWN
@@ -41,9 +39,8 @@
; script when talk again
dw SwimmerfDawnScript
-; 0x19ea09
-SwimmerfDawnScript: ; 0x19ea09
+SwimmerfDawnScript:
talkaftercancel
loadfont
writetext UnknownText_0x19ebad
@@ -50,11 +47,10 @@
closetext
loadmovesprites
end
-; 0x19ea11
-TrainerSwimmermHarold: ; 0x19ea11
+TrainerSwimmermHarold:
; bit/flag number
- dw $594
+ dw EVENT_BEAT_SWIMMERM_HAROLD
; trainer group && trainer id
db SWIMMERM, HAROLD
@@ -70,9 +66,8 @@
; script when talk again
dw SwimmermHaroldScript
-; 0x19ea1d
-SwimmermHaroldScript: ; 0x19ea1d
+SwimmermHaroldScript:
talkaftercancel
loadfont
writetext UnknownText_0x19eab4
@@ -79,11 +74,10 @@
closetext
loadmovesprites
end
-; 0x19ea25
-TrainerSwimmermJerome: ; 0x19ea25
+TrainerSwimmermJerome:
; bit/flag number
- dw $5a1
+ dw EVENT_BEAT_SWIMMERM_JEROME
; trainer group && trainer id
db SWIMMERM, JEROME
@@ -99,9 +93,8 @@
; script when talk again
dw SwimmermJeromeScript
-; 0x19ea31
-SwimmermJeromeScript: ; 0x19ea31
+SwimmermJeromeScript:
talkaftercancel
loadfont
writetext UnknownText_0x19ec7e
@@ -108,11 +101,10 @@
closetext
loadmovesprites
end
-; 0x19ea39
-TrainerSwimmermTucker: ; 0x19ea39
+TrainerSwimmermTucker:
; bit/flag number
- dw $5a2
+ dw EVENT_BEAT_SWIMMERM_TUCKER
; trainer group && trainer id
db SWIMMERM, TUCKER
@@ -128,9 +120,8 @@
; script when talk again
dw SwimmermTuckerScript
-; 0x19ea45
-SwimmermTuckerScript: ; 0x19ea45
+SwimmermTuckerScript:
talkaftercancel
loadfont
writetext UnknownText_0x19eb3b
@@ -137,9 +128,8 @@
closetext
loadmovesprites
end
-; 0x19ea4d
-FisherScript_0x19ea4d: ; 0x19ea4d
+FisherScript_0x19ea4d:
faceplayer
loadfont
checkevent $00d7
@@ -148,16 +138,14 @@
closetext
loadmovesprites
end
-; 0x19ea5b
-UnknownScript_0x19ea5b: ; 0x19ea5b
+UnknownScript_0x19ea5b:
writetext UnknownText_0x19ed24
closetext
loadmovesprites
end
-; 0x19ea61
-FisherScript_0x19ea61: ; 0x19ea61
+FisherScript_0x19ea61:
faceplayer
loadfont
checkevent $00d7
@@ -166,36 +154,30 @@
closetext
loadmovesprites
end
-; 0x19ea6f
-UnknownScript_0x19ea6f: ; 0x19ea6f
+UnknownScript_0x19ea6f:
writetext UnknownText_0x19ed7d
closetext
loadmovesprites
end
-; 0x19ea75
-MapRoute19Signpost0Script: ; 0x19ea75
+MapRoute19Signpost0Script:
jumptext UnknownText_0x19edbc
-; 0x19ea78
-MapRoute19Signpost1Script: ; 0x19ea78
+MapRoute19Signpost1Script:
jumptext UnknownText_0x19ede5
-; 0x19ea7b
-SwimmermHaroldSeenText: ; 0x19ea7b
+SwimmermHaroldSeenText:
text "Have you ever gone"
line "swimming in the"
cont "sea at night?"
done
-; 0x19eaad
-SwimmermHaroldBeatenText: ; 0x19eaad
+SwimmermHaroldBeatenText:
text "Glub…"
done
-; 0x19eab4
-UnknownText_0x19eab4: ; 0x19eab4
+UnknownText_0x19eab4:
text "At night, the sea"
line "turns black. It"
@@ -202,9 +184,8 @@
para "feels like it will"
line "swallow you up."
done
-; 0x19eafa
-SwimmermTuckerSeenText: ; 0x19eafa
+SwimmermTuckerSeenText:
text "Pant, pant…"
line "Just… a little…"
@@ -211,33 +192,28 @@
para "farther… to…"
line "FUCHSIA…"
done
-; 0x19eb2d
-SwimmermTuckerBeatenText: ; 0x19eb2d
+SwimmermTuckerBeatenText:
text "I'm drowning!"
done
-; 0x19eb3b
-UnknownText_0x19eb3b: ; 0x19eb3b
+UnknownText_0x19eb3b:
text "I… asked my girl-"
line "friend to swim to"
cont "FUCHSIA… Gasp…"
done
-; 0x19eb6f
-SwimmerfDawnSeenText: ; 0x19eb6f
+SwimmerfDawnSeenText:
text "I'm disgusted by"
line "wimpy people!"
done
-; 0x19eb8e
-SwimmerfDawnBeatenText: ; 0x19eb8e
+SwimmerfDawnBeatenText:
text "I could beat you"
line "at swimming…"
done
-; 0x19ebad
-UnknownText_0x19ebad: ; 0x19ebad
+UnknownText_0x19ebad:
text "It's a quick swim"
line "between FUCHSIA"
@@ -249,9 +225,8 @@
para "is! What a wimp!"
done
-; 0x19ec19
-SwimmermJeromeSeenText: ; 0x19ec19
+SwimmermJeromeSeenText:
text "Swimming?"
line "I'm lousy at it."
@@ -259,22 +234,19 @@
line "around in these"
cont "shallow waters."
done
-; 0x19ec66
-SwimmermJeromeBeatenText: ; 0x19ec66
+SwimmermJeromeBeatenText:
text "I thought I could"
line "win."
done
-; 0x19ec7e
-UnknownText_0x19ec7e: ; 0x19ec7e
+UnknownText_0x19ec7e:
text "I might be bad at"
line "swimming, but I"
cont "love the sea."
done
-; 0x19ecaf
-UnknownText_0x19ecaf: ; 0x19ecaf
+UnknownText_0x19ecaf:
text "Sorry. This road"
line "is closed for"
cont "construction."
@@ -285,22 +257,19 @@
para "better go south"
line "from PALLET TOWN."
done
-; 0x19ed24
-UnknownText_0x19ed24: ; 0x19ed24
+UnknownText_0x19ed24:
text "I'm all sweaty."
line "Time for a swim!"
done
-; 0x19ed45
-UnknownText_0x19ed45: ; 0x19ed45
+UnknownText_0x19ed45:
text "Who knows how long"
line "it would take to"
cont "move this boulder…"
done
-; 0x19ed7d
-UnknownText_0x19ed7d: ; 0x19ed7d
+UnknownText_0x19ed7d:
text "The roadwork is"
line "finally finished."
@@ -307,17 +276,15 @@
para "Now I can go"
line "fishing again."
done
-; 0x19edbc
-UnknownText_0x19edbc: ; 0x19edbc
+UnknownText_0x19edbc:
text "ROUTE 19"
para "FUCHSIA CITY -"
line "SEAFOAM ISLANDS"
done
-; 0x19ede5
-UnknownText_0x19ede5: ; 0x19ede5
+UnknownText_0x19ede5:
text "Please be careful"
line "if you are swim-"
cont "ming to SEAFOAM"
@@ -325,9 +292,8 @@
para "FUCHSIA POLICE"
done
-; 0x19ee31
-Route19_MapEventHeader: ; 0x19ee31
+Route19_MapEventHeader:
; filler
db 0, 0
@@ -351,4 +317,3 @@
person_event SPRITE_SWIMMER_GUY, 27, 12, $7, $0, 255, 255, $82, 0, TrainerSwimmermTucker, $ffff
person_event SPRITE_FISHER, 9, 13, $6, $0, 255, 255, $80, 1, FisherScript_0x19ea4d, $ffff
person_event SPRITE_FISHER, 9, 15, $5, $1, 255, 255, $90, 1, FisherScript_0x19ea61, $ffff
-; 0x19ee94
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -1,14 +1,13 @@
-Route2_MapScriptHeader: ; 0x1ac2ba
+Route2_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1ac2bc
-TrainerBug_catcherRob: ; 0x1ac2bc
+TrainerBug_catcherRob:
; bit/flag number
- dw $539
+ dw EVENT_BEAT_BUG_CATCHER_ROB
; trainer group && trainer id
db BUG_CATCHER, ROB
@@ -24,9 +23,8 @@
; script when talk again
dw Bug_catcherRobScript
-; 0x1ac2c8
-Bug_catcherRobScript: ; 0x1ac2c8
+Bug_catcherRobScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ac34d
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x1ac2d0
-TrainerBug_catcherEd: ; 0x1ac2d0
+TrainerBug_catcherEd:
; bit/flag number
- dw $53a
+ dw EVENT_BEAT_BUG_CATCHER_ED
; trainer group && trainer id
db BUG_CATCHER, ED
@@ -53,9 +50,8 @@
; script when talk again
dw Bug_catcherEdScript
-; 0x1ac2dc
-Bug_catcherEdScript: ; 0x1ac2dc
+Bug_catcherEdScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ac3cf
@@ -62,11 +58,10 @@
closetext
loadmovesprites
end
-; 0x1ac2e4
-TrainerBug_catcherDoug: ; 0x1ac2e4
+TrainerBug_catcherDoug:
; bit/flag number
- dw $543
+ dw EVENT_BEAT_BUG_CATCHER_DOUG
; trainer group && trainer id
db BUG_CATCHER, DOUG
@@ -82,9 +77,8 @@
; script when talk again
dw Bug_catcherDougScript
-; 0x1ac2f0
-Bug_catcherDougScript: ; 0x1ac2f0
+Bug_catcherDougScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ac423
@@ -91,80 +85,65 @@
closetext
loadmovesprites
end
-; 0x1ac2f8
-MapRoute2Signpost0Script: ; 0x1ac2f8
+MapRoute2Signpost0Script:
jumptext UnknownText_0x1ac47a
-; 0x1ac2fb
-MapRoute2Signpost1Script: ; 0x1ac2fb
+MapRoute2Signpost1Script:
jumptext UnknownText_0x1ac49f
-; 0x1ac2fe
-ItemFragment_0x1ac2fe: ; 0x1ac2fe
+ItemFragment_0x1ac2fe:
db DIRE_HIT, 1
-; 0x1ac300
-ItemFragment_0x1ac300: ; 0x1ac300
+ItemFragment_0x1ac300:
db MAX_POTION, 1
-; 0x1ac302
-ItemFragment_0x1ac302: ; 0x1ac302
+ItemFragment_0x1ac302:
db CARBOS, 1
-; 0x1ac304
-ItemFragment_0x1ac304: ; 0x1ac304
+ItemFragment_0x1ac304:
db ELIXER, 1
-; 0x1ac306
-FruitTreeScript_0x1ac306: ; 0x1ac306
+FruitTreeScript_0x1ac306:
fruittree $19
-; 0x1ac308
-MapRoute2SignpostItem2: ; 0x1ac308
+MapRoute2SignpostItem2:
dw $00ed
db MAX_ETHER
-; 0x1ac30b
-MapRoute2SignpostItem3: ; 0x1ac30b
+MapRoute2SignpostItem3:
dw $00ee
db FULL_HEAL
-; 0x1ac30e
-MapRoute2SignpostItem4: ; 0x1ac30e
+MapRoute2SignpostItem4:
dw $00ef
db FULL_RESTORE
-; 0x1ac311
-MapRoute2SignpostItem5: ; 0x1ac311
+MapRoute2SignpostItem5:
dw $00f0
db REVIVE
-; 0x1ac314
-Bug_catcherRobSeenText: ; 0x1ac314
+Bug_catcherRobSeenText:
text "My bug #MON are"
line "tough. Prepare to"
cont "lose!"
done
-; 0x1ac33d
-Bug_catcherRobBeatenText: ; 0x1ac33d
+Bug_catcherRobBeatenText:
text "I was whipped…"
done
-; 0x1ac34d
-UnknownText_0x1ac34d: ; 0x1ac34d
+UnknownText_0x1ac34d:
text "I'm going to look"
line "for stronger bug"
cont "#MON."
done
-; 0x1ac376
-Bug_catcherEdSeenText: ; 0x1ac376
+Bug_catcherEdSeenText:
text "If you walk in"
line "tall grass wearing"
@@ -171,32 +150,27 @@
para "shorts, do you get"
line "nicks and cuts?"
done
-; 0x1ac3bc
-Bug_catcherEdBeatenText: ; 0x1ac3bc
+Bug_catcherEdBeatenText:
text "Ouch, ouch, ouch!"
done
-; 0x1ac3cf
-UnknownText_0x1ac3cf: ; 0x1ac3cf
+UnknownText_0x1ac3cf:
text "They'll really"
line "sting when you"
cont "take a bath."
done
-; 0x1ac3fa
-Bug_catcherDougSeenText: ; 0x1ac3fa
+Bug_catcherDougSeenText:
text "Why don't girls"
line "like bug #MON?"
done
-; 0x1ac419
-Bug_catcherDougBeatenText: ; 0x1ac419
+Bug_catcherDougBeatenText:
text "No good!"
done
-; 0x1ac423
-UnknownText_0x1ac423: ; 0x1ac423
+UnknownText_0x1ac423:
text "Bug #MON squish"
line "like plush toys"
@@ -206,22 +180,19 @@
para "I love how they"
line "feel!"
done
-; 0x1ac47a
-UnknownText_0x1ac47a: ; 0x1ac47a
+UnknownText_0x1ac47a:
text "ROUTE 2"
para "VIRIDIAN CITY -"
line "PEWTER CITY"
done
-; 0x1ac49f
-UnknownText_0x1ac49f: ; 0x1ac49f
+UnknownText_0x1ac49f:
text "DIGLETT'S CAVE"
done
-; 0x1ac4af
-Route2_MapEventHeader: ; 0x1ac4af
+Route2_MapEventHeader:
; filler
db 0, 0
@@ -255,4 +226,3 @@
person_event SPRITE_POKE_BALL, 6, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac302, $0785
person_event SPRITE_POKE_BALL, 54, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac304, $0786
person_event SPRITE_FRUIT_TREE, 18, 14, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac306, $ffff
-; 0x1ac554
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -1,4 +1,4 @@
-Route20_MapScriptHeader: ; 0x1acd20
+Route20_MapScriptHeader:
; trigger count
db 0
@@ -8,16 +8,14 @@
; callbacks
dbw 5, UnknownScript_0x1acd25
-; 0x1acd25
-UnknownScript_0x1acd25: ; 0x1acd25
+UnknownScript_0x1acd25:
setevent $00d7
return
-; 0x1acd29
-TrainerSwimmerfNicole: ; 0x1acd29
+TrainerSwimmerfNicole:
; bit/flag number
- dw $3f5
+ dw EVENT_BEAT_SWIMMERF_NICOLE
; trainer group && trainer id
db SWIMMERF, NICOLE
@@ -33,9 +31,8 @@
; script when talk again
dw SwimmerfNicoleScript
-; 0x1acd35
-SwimmerfNicoleScript: ; 0x1acd35
+SwimmerfNicoleScript:
talkaftercancel
loadfont
writetext UnknownText_0x1acd93
@@ -42,11 +39,10 @@
closetext
loadmovesprites
end
-; 0x1acd3d
-TrainerSwimmerfLori: ; 0x1acd3d
+TrainerSwimmerfLori:
; bit/flag number
- dw $3f6
+ dw EVENT_BEAT_SWIMMERF_LORI
; trainer group && trainer id
db SWIMMERF, LORI
@@ -62,9 +58,8 @@
; script when talk again
dw SwimmerfLoriScript
-; 0x1acd49
-SwimmerfLoriScript: ; 0x1acd49
+SwimmerfLoriScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ace15
@@ -71,11 +66,10 @@
closetext
loadmovesprites
end
-; 0x1acd51
-TrainerSwimmermCameron: ; 0x1acd51
+TrainerSwimmermCameron:
; bit/flag number
- dw $5a4
+ dw EVENT_BEAT_SWIMMERM_CAMERON
; trainer group && trainer id
db SWIMMERM, CAMERON
@@ -91,9 +85,8 @@
; script when talk again
dw SwimmermCameronScript
-; 0x1acd5d
-SwimmermCameronScript: ; 0x1acd5d
+SwimmermCameronScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ace8b
@@ -100,24 +93,20 @@
closetext
loadmovesprites
end
-; 0x1acd65
-MapRoute20Signpost0Script: ; 0x1acd65
+MapRoute20Signpost0Script:
jumptext UnknownText_0x1acec2
-; 0x1acd68
-SwimmerfNicoleSeenText: ; 0x1acd68
+SwimmerfNicoleSeenText:
text "I feel so much"
line "lighter in water."
done
-; 0x1acd8a
-SwimmerfNicoleBeatenText: ; 0x1acd8a
+SwimmerfNicoleBeatenText:
text "Oh, no!"
done
-; 0x1acd93
-UnknownText_0x1acd93: ; 0x1acd93
+UnknownText_0x1acd93:
text "Swimming exercises"
line "your full body."
@@ -124,9 +113,8 @@
para "It's really good"
line "for you."
done
-; 0x1acdd0
-SwimmerfLoriSeenText: ; 0x1acdd0
+SwimmerfLoriSeenText:
text "What an impressive"
line "collection of GYM"
@@ -133,21 +121,18 @@
para "BADGES. We should"
line "battle!"
done
-; 0x1ace10
-SwimmerfLoriBeatenText: ; 0x1ace10
+SwimmerfLoriBeatenText:
text "No!"
done
-; 0x1ace15
-UnknownText_0x1ace15: ; 0x1ace15
+UnknownText_0x1ace15:
text "SURF is no longer"
line "the only HM move"
cont "you use in water."
done
-; 0x1ace4b
-SwimmermCameronSeenText: ; 0x1ace4b
+SwimmermCameronSeenText:
text "I guess it's im-"
line "possible to swim"
@@ -154,21 +139,18 @@
para "all the way to"
line "JOHTO."
done
-; 0x1ace83
-SwimmermCameronBeatenText: ; 0x1ace83
+SwimmermCameronBeatenText:
text "Aiyah!"
done
-; 0x1ace8b
-UnknownText_0x1ace8b: ; 0x1ace8b
+UnknownText_0x1ace8b:
text "Besides the sea, I"
line "can also swim in"
cont "ponds and rivers."
done
-; 0x1acec2
-UnknownText_0x1acec2: ; 0x1acec2
+UnknownText_0x1acec2:
text "What does this"
line "sign say?"
@@ -175,9 +157,8 @@
para "CINNABAR GYM"
line "LEADER: BLAINE"
done
-; 0x1acef8
-Route20_MapEventHeader: ; 0x1acef8
+Route20_MapEventHeader:
; filler
db 0, 0
@@ -197,4 +178,3 @@
person_event SPRITE_SWIMMER_GIRL, 12, 56, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNicole, $ffff
person_event SPRITE_SWIMMER_GIRL, 17, 49, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfLori, $ffff
person_event SPRITE_SWIMMER_GUY, 17, 16, $a, $0, 255, 255, $82, 3, TrainerSwimmermCameron, $ffff
-; 0x1acf2f
--- a/maps/Route21.asm
+++ b/maps/Route21.asm
@@ -1,14 +1,13 @@
-Route21_MapScriptHeader: ; 0x1ac812
+Route21_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1ac814
-TrainerSwimmermSeth: ; 0x1ac814
+TrainerSwimmermSeth:
; bit/flag number
- dw $5a5
+ dw EVENT_BEAT_SWIMMERM_SETH
; trainer group && trainer id
db SWIMMERM, SETH
@@ -24,9 +23,8 @@
; script when talk again
dw SwimmermSethScript
-; 0x1ac820
-SwimmermSethScript: ; 0x1ac820
+SwimmermSethScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ac873
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x1ac828
-TrainerSwimmerfNikki: ; 0x1ac828
+TrainerSwimmerfNikki:
; bit/flag number
- dw $3f8
+ dw EVENT_BEAT_SWIMMERF_NIKKI
; trainer group && trainer id
db SWIMMERF, NIKKI
@@ -53,9 +50,8 @@
; script when talk again
dw SwimmerfNikkiScript
-; 0x1ac834
-SwimmerfNikkiScript: ; 0x1ac834
+SwimmerfNikkiScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ac8f1
@@ -62,11 +58,10 @@
closetext
loadmovesprites
end
-; 0x1ac83c
-TrainerFisherArnold: ; 0x1ac83c
+TrainerFisherArnold:
; bit/flag number
- dw $450
+ dw EVENT_BEAT_FISHER_ARNOLD
; trainer group && trainer id
db FISHER, ARNOLD
@@ -82,9 +77,8 @@
; script when talk again
dw FisherArnoldScript
-; 0x1ac848
-FisherArnoldScript: ; 0x1ac848
+FisherArnoldScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ac95c
@@ -91,64 +85,54 @@
closetext
loadmovesprites
end
-; 0x1ac850
-SwimmermSethSeenText: ; 0x1ac850
+SwimmermSethSeenText:
text "Land ho! Gotta"
line "keep going!"
done
-; 0x1ac86c
-SwimmermSethBeatenText: ; 0x1ac86c
+SwimmermSethBeatenText:
text "Glug…"
done
-; 0x1ac873
-UnknownText_0x1ac873: ; 0x1ac873
+UnknownText_0x1ac873:
text "This arrogant guy"
line "was at CINNABAR's"
cont "volcano."
done
-; 0x1ac8a0
-SwimmerfNikkiSeenText: ; 0x1ac8a0
+SwimmerfNikkiSeenText:
text "If I win, you have"
line "to help me with my"
cont "suntan lotion!"
done
-; 0x1ac8d6
-SwimmerfNikkiBeatenText: ; 0x1ac8d6
+SwimmerfNikkiBeatenText:
text "I'm worried about"
line "sunburn…"
done
-; 0x1ac8f1
-UnknownText_0x1ac8f1: ; 0x1ac8f1
+UnknownText_0x1ac8f1:
text "I have to watch"
line "out for blemishes"
cont "caused by the sun."
done
-; 0x1ac927
-FisherArnoldSeenText: ; 0x1ac927
+FisherArnoldSeenText:
text "I'm bored by fish-"
line "ing. Let's battle!"
done
-; 0x1ac94c
-FisherArnoldBeatenText: ; 0x1ac94c
+FisherArnoldBeatenText:
text "Utter failure…"
done
-; 0x1ac95c
-UnknownText_0x1ac95c: ; 0x1ac95c
+UnknownText_0x1ac95c:
text "I'll just go back"
line "to fishing…"
done
-; 0x1ac97a
-Route21_MapEventHeader: ; 0x1ac97a
+Route21_MapEventHeader:
; filler
db 0, 0
@@ -166,4 +150,3 @@
person_event SPRITE_SWIMMER_GIRL, 20, 15, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNikki, $ffff
person_event SPRITE_SWIMMER_GUY, 34, 6, $9, $0, 255, 255, $82, 4, TrainerSwimmermSeth, $ffff
person_event SPRITE_FISHER, 26, 18, $7, $0, 255, 255, $a2, 1, TrainerFisherArnold, $ffff
-; 0x1ac9a7
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -1,4 +1,4 @@
-Route25_MapScriptHeader: ; 0x19ee94
+Route25_MapScriptHeader:
; trigger count
db 2
@@ -8,17 +8,14 @@
; callback count
db 0
-; 0x19ee9e
-UnknownScript_0x19ee9e: ; 0x19ee9e
+UnknownScript_0x19ee9e:
end
-; 0x19ee9f
-UnknownScript_0x19ee9f: ; 0x19ee9f
+UnknownScript_0x19ee9f:
end
-; 0x19eea0
-UnknownScript_0x19eea0: ; 0x19eea0
+UnknownScript_0x19eea0:
showemote $4, $2, 15
pause 30
showemote $0, $3, 10
@@ -43,9 +40,8 @@
dotrigger $0
special RestartMapMusic
end
-; 0x19eee0
-UnknownScript_0x19eee0: ; 0x19eee0
+UnknownScript_0x19eee0:
showemote $4, $2, 15
pause 30
showemote $0, $3, 10
@@ -70,11 +66,10 @@
dotrigger $0
special RestartMapMusic
end
-; 0x19ef20
-TrainerSchoolboyDudley: ; 0x19ef20
+TrainerSchoolboyDudley:
; bit/flag number
- dw $472
+ dw EVENT_BEAT_SCHOOLBOY_DUDLEY
; trainer group && trainer id
db SCHOOLBOY, DUDLEY
@@ -90,9 +85,8 @@
; script when talk again
dw SchoolboyDudleyScript
-; 0x19ef2c
-SchoolboyDudleyScript: ; 0x19ef2c
+SchoolboyDudleyScript:
talkaftercancel
loadfont
writetext UnknownText_0x19f1b5
@@ -99,11 +93,10 @@
closetext
loadmovesprites
end
-; 0x19ef34
-TrainerLassEllen: ; 0x19ef34
+TrainerLassEllen:
; bit/flag number
- dw $51f
+ dw EVENT_BEAT_LASS_ELLEN
; trainer group && trainer id
db LASS, ELLEN
@@ -119,9 +112,8 @@
; script when talk again
dw LassEllenScript
-; 0x19ef40
-LassEllenScript: ; 0x19ef40
+LassEllenScript:
talkaftercancel
loadfont
writetext UnknownText_0x19f208
@@ -128,11 +120,10 @@
closetext
loadmovesprites
end
-; 0x19ef48
-TrainerSchoolboyJoe: ; 0x19ef48
+TrainerSchoolboyJoe:
; bit/flag number
- dw $473
+ dw EVENT_BEAT_SCHOOLBOY_JOE
; trainer group && trainer id
db SCHOOLBOY, JOE
@@ -148,9 +139,8 @@
; script when talk again
dw SchoolboyJoeScript
-; 0x19ef54
-SchoolboyJoeScript: ; 0x19ef54
+SchoolboyJoeScript:
talkaftercancel
loadfont
writetext UnknownText_0x19f25c
@@ -157,11 +147,10 @@
closetext
loadmovesprites
end
-; 0x19ef5c
-TrainerLassLaura: ; 0x19ef5c
+TrainerLassLaura:
; bit/flag number
- dw $51b
+ dw EVENT_BEAT_LASS_LAURA
; trainer group && trainer id
db LASS, LAURA
@@ -177,9 +166,8 @@
; script when talk again
dw LassLauraScript
-; 0x19ef68
-LassLauraScript: ; 0x19ef68
+LassLauraScript:
talkaftercancel
loadfont
writetext UnknownText_0x19f2a6
@@ -186,11 +174,10 @@
closetext
loadmovesprites
end
-; 0x19ef70
-TrainerCamperLloyd: ; 0x19ef70
+TrainerCamperLloyd:
; bit/flag number
- dw $41f
+ dw EVENT_BEAT_CAMPER_LLOYD
; trainer group && trainer id
db CAMPER, LLOYD
@@ -206,9 +193,8 @@
; script when talk again
dw CamperLloydScript
-; 0x19ef7c
-CamperLloydScript: ; 0x19ef7c
+CamperLloydScript:
talkaftercancel
loadfont
writetext UnknownText_0x19f2f8
@@ -215,11 +201,10 @@
closetext
loadmovesprites
end
-; 0x19ef84
-TrainerLassShannon: ; 0x19ef84
+TrainerLassShannon:
; bit/flag number
- dw $51c
+ dw EVENT_BEAT_LASS_SHANNON
; trainer group && trainer id
db LASS, SHANNON
@@ -235,9 +220,8 @@
; script when talk again
dw LassShannonScript
-; 0x19ef90
-LassShannonScript: ; 0x19ef90
+LassShannonScript:
talkaftercancel
loadfont
writetext UnknownText_0x19f35b
@@ -244,11 +228,10 @@
closetext
loadmovesprites
end
-; 0x19ef98
-TrainerSupernerdPat: ; 0x19ef98
+TrainerSupernerdPat:
; bit/flag number
- dw $588
+ dw EVENT_BEAT_SUPER_NERD_PAT
; trainer group && trainer id
db SUPER_NERD, PAT
@@ -264,9 +247,8 @@
; script when talk again
dw SupernerdPatScript
-; 0x19efa4
-SupernerdPatScript: ; 0x19efa4
+SupernerdPatScript:
talkaftercancel
loadfont
writetext UnknownText_0x19f41a
@@ -273,12 +255,11 @@
closetext
loadmovesprites
end
-; 0x19efac
-CooltrainerMScript_0x19efac: ; 0x19efac
+CooltrainerMScript_0x19efac:
faceplayer
loadfont
- checkevent $0558
+ checkevent EVENT_BEAT_COOLTRAINERM_KEVIN
iftrue UnknownScript_0x19efda
checkevent EVENT_CLEARED_NUGGET_BRIDGE
iftrue UnknownScript_0x19efc7
@@ -287,7 +268,7 @@
verbosegiveitem NUGGET, 1
iffalse UnknownScript_0x19efde
setevent EVENT_CLEARED_NUGGET_BRIDGE
-UnknownScript_0x19efc7: ; 0x19efc7
+UnknownScript_0x19efc7:
writetext UnknownText_0x19f49d
closetext
loadmovesprites
@@ -295,42 +276,36 @@
loadtrainer COOLTRAINERM, KEVIN
startbattle
returnafterbattle
- setevent $0558
+ setevent EVENT_BEAT_COOLTRAINERM_KEVIN
loadfont
-UnknownScript_0x19efda: ; 0x19efda
+UnknownScript_0x19efda:
writetext UnknownText_0x19f520
closetext
-UnknownScript_0x19efde: ; 0x19efde
+UnknownScript_0x19efde:
loadmovesprites
end
-; 0x19efe0
-MapRoute25Signpost0Script: ; 0x19efe0
+MapRoute25Signpost0Script:
jumptext UnknownText_0x19f567
-; 0x19efe3
-ItemFragment_0x19efe3: ; 0x19efe3
+ItemFragment_0x19efe3:
db PROTEIN, 1
-; 0x19efe5
-MapRoute25SignpostItem1: ; 0x19efe5
+MapRoute25SignpostItem1:
dw $00f8
db POTION
-; 0x19efe8
-MovementData_0x19efe8: ; 0x19efe8
+MovementData_0x19efe8:
big_step_down
step_end
-; 0x19efea
-MovementData_0x19efea: ; 0x19efea
+MovementData_0x19efea:
big_step_down
big_step_down
step_end
-; 0x19efed
-MovementData_0x19efed: ; 0x19efed
+MovementData_0x19efed:
step_up
step_up
step_up
@@ -338,9 +313,8 @@
step_left
step_left
step_end
-; 0x19eff4
-MovementData_0x19eff4: ; 0x19eff4
+MovementData_0x19eff4:
step_up
step_up
step_left
@@ -347,21 +321,18 @@
step_left
step_left
step_end
-; 0x19effa
-MovementData_0x19effa: ; 0x19effa
+MovementData_0x19effa:
step_down
step_left
step_end
-; 0x19effd
-MovementData_0x19effd: ; 0x19effd
+MovementData_0x19effd:
step_up
step_left
step_end
-; 0x19f000
-MovementData_0x19f000: ; 0x19f000
+MovementData_0x19f000:
step_left
step_left
step_left
@@ -368,9 +339,8 @@
step_left
step_left
step_end
-; 0x19f006
-UnknownText_0x19f006: ; 0x19f006
+UnknownText_0x19f006:
text "MISTY: Aww! Why"
line "did you have to"
@@ -403,9 +373,8 @@
line "GYM LEADER in"
cont "CERULEAN."
done
-; 0x19f14d
-SchoolboyDudleySeenText: ; 0x19f14d
+SchoolboyDudleySeenText:
text "Beat the six of us"
line "trainers to win a"
cont "fabulous prize!"
@@ -413,106 +382,88 @@
para "Think you've got"
line "what it takes?"
done
-; 0x19f1a2
-SchoolboyDudleyBeatenText: ; 0x19f1a2
+SchoolboyDudleyBeatenText:
text "Whoo! Good stuff."
done
-; 0x19f1b5
-UnknownText_0x19f1b5: ; 0x19f1b5
+UnknownText_0x19f1b5:
text "I did my best."
line "I have no regrets."
done
-; 0x19f1d8
-LassEllenSeenText: ; 0x19f1d8
+LassEllenSeenText:
text "I'm second."
line "Now it's serious!"
done
-; 0x19f1f5
-LassEllenBeatenText: ; 0x19f1f5
+LassEllenBeatenText:
text "How could I lose?"
done
-; 0x19f208
-UnknownText_0x19f208: ; 0x19f208
+UnknownText_0x19f208:
text "I did my best."
line "I have no regrets."
done
-; 0x19f22b
-SchoolboyJoeSeenText: ; 0x19f22b
+SchoolboyJoeSeenText:
text "Here's No. 3!"
line "I won't be easy."
done
-; 0x19f249
-SchoolboyJoeBeatenText: ; 0x19f249
+SchoolboyJoeBeatenText:
text "Ow! Stomped flat!"
done
-; 0x19f25c
-UnknownText_0x19f25c: ; 0x19f25c
+UnknownText_0x19f25c:
text "I did my best."
line "I have no regrets."
done
-; 0x19f27f
-LassLauraSeenText: ; 0x19f27f
+LassLauraSeenText:
text "I'm No. 4!"
line "Getting tired?"
done
-; 0x19f299
-LassLauraBeatenText: ; 0x19f299
+LassLauraBeatenText:
text "I lost too…"
done
-; 0x19f2a6
-UnknownText_0x19f2a6: ; 0x19f2a6
+UnknownText_0x19f2a6:
text "I did my best."
line "I have no regrets."
done
-; 0x19f2c9
-CamperLloydSeenText: ; 0x19f2c9
+CamperLloydSeenText:
text "OK! I'm No. 5."
line "I'll stomp you!"
done
-; 0x19f2e7
-CamperLloydBeatenText: ; 0x19f2e7
+CamperLloydBeatenText:
text "Whoa! Too much."
done
-; 0x19f2f8
-UnknownText_0x19f2f8: ; 0x19f2f8
+UnknownText_0x19f2f8:
text "I did my best."
line "I have no regrets."
done
-; 0x19f31b
-LassShannonSeenText: ; 0x19f31b
+LassShannonSeenText:
text "I'm the last in"
line "line, but I tell"
cont "you, I'm tough!"
done
-; 0x19f34b
-LassShannonBeatenText: ; 0x19f34b
+LassShannonBeatenText:
text "You're kidding."
done
-; 0x19f35b
-UnknownText_0x19f35b: ; 0x19f35b
+UnknownText_0x19f35b:
text "I did my best."
line "I have no regrets."
done
-; 0x19f37e
-SupernerdPatSeenText: ; 0x19f37e
+SupernerdPatSeenText:
text "Mufufufu…"
para "I have nothing to"
@@ -525,21 +476,18 @@
para "were tired out by"
line "all the battles."
done
-; 0x19f401
-SupernerdPatBeatenText: ; 0x19f401
+SupernerdPatBeatenText:
text "Aren't you tired"
line "at all?"
done
-; 0x19f41a
-UnknownText_0x19f41a: ; 0x19f41a
+UnknownText_0x19f41a:
text "I'm sorry… I won't"
line "cheat anymore…"
done
-; 0x19f43b
-UnknownText_0x19f43b: ; 0x19f43b
+UnknownText_0x19f43b:
text "You took on one"
line "more battle than"
@@ -549,9 +497,8 @@
para "As promised, you"
line "win a prize."
done
-; 0x19f49d
-UnknownText_0x19f49d: ; 0x19f49d
+UnknownText_0x19f49d:
text "But after seeing"
line "how you battle, I"
@@ -561,15 +508,13 @@
para "How about it? Let"
line "me take you on."
done
-; 0x19f4fd
-UnknownText_0x19f4fd: ; 0x19f4fd
+UnknownText_0x19f4fd:
text "I've never had a"
line "battle this good!"
done
-; 0x19f520
-UnknownText_0x19f520: ; 0x19f520
+UnknownText_0x19f520:
text "That was a great"
line "battle!"
@@ -577,20 +522,17 @@
line "MON are truly out-"
cont "standing!"
done
-; 0x19f567
-UnknownText_0x19f567: ; 0x19f567
+UnknownText_0x19f567:
text "SEA COTTAGE"
line "BILL'S HOUSE"
done
-; 0x19f581
-UnknownText_0x19f581: ; 0x19f581
+UnknownText_0x19f581:
text "BILL'S HOUSE"
done
-; 0x19f58f
-Route25_MapEventHeader: ; 0x19f58f
+Route25_MapEventHeader:
; filler
db 0, 0
@@ -621,4 +563,3 @@
person_event SPRITE_SUPER_NERD, 11, 35, $6, $0, 255, 255, $b2, 1, TrainerSupernerdPat, $ffff
person_event SPRITE_COOLTRAINER_M, 12, 41, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x19efac, $ffff
person_event SPRITE_POKE_BALL, 8, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x19efe3, $078b
-; 0x19f643
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -1,14 +1,13 @@
-Route26_MapScriptHeader: ; 0x1a4d1d
+Route26_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1a4d1f
-TrainerCooltrainermJake: ; 0x1a4d1f
+TrainerCooltrainermJake:
; bit/flag number
- dw $550
+ dw EVENT_BEAT_COOLTRAINERM_JAKE
; trainer group && trainer id
db COOLTRAINERM, JAKE
@@ -24,9 +23,8 @@
; script when talk again
dw CooltrainermJakeScript
-; 0x1a4d2b
-CooltrainermJakeScript: ; 0x1a4d2b
+CooltrainermJakeScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a4f08
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x1a4d33
-TrainerCooltrainermGaven3: ; 0x1a4d33
+TrainerCooltrainermGaven3:
; bit/flag number
- dw $551
+ dw EVENT_BEAT_COOLTRAINERM_GAVEN
; trainer group && trainer id
db COOLTRAINERM, GAVEN3
@@ -53,9 +50,8 @@
; script when talk again
dw CooltrainermGaven3Script
-; 0x1a4d3f
-CooltrainermGaven3Script: ; 0x1a4d3f
+CooltrainermGaven3Script:
writecode VAR_CALLERID, $b
talkaftercancel
loadfont
@@ -70,11 +66,10 @@
setevent $026b
scall UnknownScript_0x1a4dbf
jump UnknownScript_0x1a4d65
-; 0x1a4d62
-UnknownScript_0x1a4d62: ; 0x1a4d62
+UnknownScript_0x1a4d62:
scall UnknownScript_0x1a4dc3
-UnknownScript_0x1a4d65: ; 0x1a4d65
+UnknownScript_0x1a4d65:
askforphonenumber $b
if_equal $1, UnknownScript_0x1a4dd3
if_equal $2, UnknownScript_0x1a4dcf
@@ -81,9 +76,8 @@
trainertotext COOLTRAINERM, GAVEN3, $0
scall UnknownScript_0x1a4dc7
jump UnknownScript_0x1a4dcb
-; 0x1a4d79
-UnknownScript_0x1a4d79: ; 0x1a4d79
+UnknownScript_0x1a4d79:
scall UnknownScript_0x1a4dd7
winlosstext CooltrainermGaven3BeatenText, $0000
copybytetovar wd9f5
@@ -90,13 +84,13 @@
if_equal $2, UnknownScript_0x1a4d90
if_equal $1, UnknownScript_0x1a4d96
if_equal $0, UnknownScript_0x1a4d9c
-UnknownScript_0x1a4d90: ; 0x1a4d90
+UnknownScript_0x1a4d90:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1a4db6
-UnknownScript_0x1a4d96: ; 0x1a4d96
+UnknownScript_0x1a4d96:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x1a4da9
-UnknownScript_0x1a4d9c: ; 0x1a4d9c
+UnknownScript_0x1a4d9c:
loadtrainer COOLTRAINERM, GAVEN3
startbattle
returnafterbattle
@@ -103,9 +97,8 @@
loadvar wd9f5, $1
clearflag $0067
end
-; 0x1a4da9
-UnknownScript_0x1a4da9: ; 0x1a4da9
+UnknownScript_0x1a4da9:
loadtrainer COOLTRAINERM, GAVEN1
startbattle
returnafterbattle
@@ -112,54 +105,45 @@
loadvar wd9f5, $2
clearflag $0067
end
-; 0x1a4db6
-UnknownScript_0x1a4db6: ; 0x1a4db6
+UnknownScript_0x1a4db6:
loadtrainer COOLTRAINERM, GAVEN2
startbattle
returnafterbattle
clearflag $0067
end
-; 0x1a4dbf
-UnknownScript_0x1a4dbf: ; 0x1a4dbf
+UnknownScript_0x1a4dbf:
jumpstd asknumber1m
end
-; 0x1a4dc3
-UnknownScript_0x1a4dc3: ; 0x1a4dc3
+UnknownScript_0x1a4dc3:
jumpstd asknumber2m
end
-; 0x1a4dc7
-UnknownScript_0x1a4dc7: ; 0x1a4dc7
+UnknownScript_0x1a4dc7:
jumpstd registerednumberm
end
-; 0x1a4dcb
-UnknownScript_0x1a4dcb: ; 0x1a4dcb
+UnknownScript_0x1a4dcb:
jumpstd numberacceptedm
end
-; 0x1a4dcf
-UnknownScript_0x1a4dcf: ; 0x1a4dcf
+UnknownScript_0x1a4dcf:
jumpstd numberdeclinedm
end
-; 0x1a4dd3
-UnknownScript_0x1a4dd3: ; 0x1a4dd3
+UnknownScript_0x1a4dd3:
jumpstd phonefullm
end
-; 0x1a4dd7
-UnknownScript_0x1a4dd7: ; 0x1a4dd7
+UnknownScript_0x1a4dd7:
jumpstd rematchm
end
-; 0x1a4ddb
-TrainerCooltrainerfJoyce: ; 0x1a4ddb
+TrainerCooltrainerfJoyce:
; bit/flag number
- dw $562
+ dw EVENT_BEAT_COOLTRAINERF_JOYCE
; trainer group && trainer id
db COOLTRAINERF, JOYCE
@@ -175,9 +159,8 @@
; script when talk again
dw CooltrainerfJoyceScript
-; 0x1a4de7
-CooltrainerfJoyceScript: ; 0x1a4de7
+CooltrainerfJoyceScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a50d7
@@ -184,11 +167,10 @@
closetext
loadmovesprites
end
-; 0x1a4def
-TrainerCooltrainerfBeth1: ; 0x1a4def
+TrainerCooltrainerfBeth1:
; bit/flag number
- dw $563
+ dw EVENT_BEAT_COOLTRAINERF_BETH
; trainer group && trainer id
db COOLTRAINERF, BETH1
@@ -204,9 +186,8 @@
; script when talk again
dw CooltrainerfBeth1Script
-; 0x1a4dfb
-CooltrainerfBeth1Script: ; 0x1a4dfb
+CooltrainerfBeth1Script:
writecode VAR_CALLERID, $c
talkaftercancel
loadfont
@@ -221,11 +202,10 @@
setevent $026d
scall UnknownScript_0x1a4e7b
jump UnknownScript_0x1a4e21
-; 0x1a4e1e
-UnknownScript_0x1a4e1e: ; 0x1a4e1e
+UnknownScript_0x1a4e1e:
scall UnknownScript_0x1a4e7f
-UnknownScript_0x1a4e21: ; 0x1a4e21
+UnknownScript_0x1a4e21:
askforphonenumber $c
if_equal $1, UnknownScript_0x1a4e8f
if_equal $2, UnknownScript_0x1a4e8b
@@ -232,9 +212,8 @@
trainertotext COOLTRAINERF, BETH1, $0
scall UnknownScript_0x1a4e83
jump UnknownScript_0x1a4e87
-; 0x1a4e35
-UnknownScript_0x1a4e35: ; 0x1a4e35
+UnknownScript_0x1a4e35:
scall UnknownScript_0x1a4e93
winlosstext CooltrainerfBeth1BeatenText, $0000
copybytetovar wd9f6
@@ -241,13 +220,13 @@
if_equal $2, UnknownScript_0x1a4e4c
if_equal $1, UnknownScript_0x1a4e52
if_equal $0, UnknownScript_0x1a4e58
-UnknownScript_0x1a4e4c: ; 0x1a4e4c
+UnknownScript_0x1a4e4c:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1a4e72
-UnknownScript_0x1a4e52: ; 0x1a4e52
+UnknownScript_0x1a4e52:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x1a4e65
-UnknownScript_0x1a4e58: ; 0x1a4e58
+UnknownScript_0x1a4e58:
loadtrainer COOLTRAINERF, BETH1
startbattle
returnafterbattle
@@ -254,9 +233,8 @@
loadvar wd9f6, $1
clearflag $0068
end
-; 0x1a4e65
-UnknownScript_0x1a4e65: ; 0x1a4e65
+UnknownScript_0x1a4e65:
loadtrainer COOLTRAINERF, BETH2
startbattle
returnafterbattle
@@ -263,54 +241,45 @@
loadvar wd9f6, $2
clearflag $0068
end
-; 0x1a4e72
-UnknownScript_0x1a4e72: ; 0x1a4e72
+UnknownScript_0x1a4e72:
loadtrainer COOLTRAINERF, BETH3
startbattle
returnafterbattle
clearflag $0068
end
-; 0x1a4e7b
-UnknownScript_0x1a4e7b: ; 0x1a4e7b
+UnknownScript_0x1a4e7b:
jumpstd asknumber1f
end
-; 0x1a4e7f
-UnknownScript_0x1a4e7f: ; 0x1a4e7f
+UnknownScript_0x1a4e7f:
jumpstd asknumber2f
end
-; 0x1a4e83
-UnknownScript_0x1a4e83: ; 0x1a4e83
+UnknownScript_0x1a4e83:
jumpstd registerednumberf
end
-; 0x1a4e87
-UnknownScript_0x1a4e87: ; 0x1a4e87
+UnknownScript_0x1a4e87:
jumpstd numberacceptedf
end
-; 0x1a4e8b
-UnknownScript_0x1a4e8b: ; 0x1a4e8b
+UnknownScript_0x1a4e8b:
jumpstd numberdeclinedf
end
-; 0x1a4e8f
-UnknownScript_0x1a4e8f: ; 0x1a4e8f
+UnknownScript_0x1a4e8f:
jumpstd phonefullf
end
-; 0x1a4e93
-UnknownScript_0x1a4e93: ; 0x1a4e93
+UnknownScript_0x1a4e93:
jumpstd rematchf
end
-; 0x1a4e97
-TrainerPsychicRichard: ; 0x1a4e97
+TrainerPsychicRichard:
; bit/flag number
- dw $442
+ dw EVENT_BEAT_PSYCHIC_RICHARD
; trainer group && trainer id
db PSYCHIC_T, RICHARD
@@ -326,9 +295,8 @@
; script when talk again
dw PsychicRichardScript
-; 0x1a4ea3
-PsychicRichardScript: ; 0x1a4ea3
+PsychicRichardScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a5278
@@ -335,11 +303,10 @@
closetext
loadmovesprites
end
-; 0x1a4eab
-TrainerFisherScott: ; 0x1a4eab
+TrainerFisherScott:
; bit/flag number
- dw $462
+ dw EVENT_BEAT_FISHER_SCOTT
; trainer group && trainer id
db FISHER, SCOTT
@@ -355,9 +322,8 @@
; script when talk again
dw FisherScottScript
-; 0x1a4eb7
-FisherScottScript: ; 0x1a4eb7
+FisherScottScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a5326
@@ -364,21 +330,17 @@
closetext
loadmovesprites
end
-; 0x1a4ebf
-MapRoute26Signpost0Script: ; 0x1a4ebf
+MapRoute26Signpost0Script:
jumptext UnknownText_0x1a5364
-; 0x1a4ec2
-FruitTreeScript_0x1a4ec2: ; 0x1a4ec2
+FruitTreeScript_0x1a4ec2:
fruittree $e
-; 0x1a4ec4
-ItemFragment_0x1a4ec4: ; 0x1a4ec4
+ItemFragment_0x1a4ec4:
db MAX_ELIXER, 1
-; 0x1a4ec6
-CooltrainermJakeSeenText: ; 0x1a4ec6
+CooltrainermJakeSeenText:
text "I'm making my"
line "final preparations"
@@ -385,14 +347,12 @@
para "for the #MON"
line "LEAGUE."
done
-; 0x1a4efc
-CooltrainermJakeBeatenText: ; 0x1a4efc
+CooltrainermJakeBeatenText:
text "I blew it!"
done
-; 0x1a4f08
-UnknownText_0x1a4f08: ; 0x1a4f08
+UnknownText_0x1a4f08:
text "It's going to be"
line "tough to win at"
cont "the LEAGUE."
@@ -406,22 +366,19 @@
para "FOUR are tougher"
line "than GYM LEADERS."
done
-; 0x1a4f97
-CooltrainermGaven3SeenText: ; 0x1a4f97
+CooltrainermGaven3SeenText:
text "By experiencing"
line "tough battles, you"
cont "gain power."
done
-; 0x1a4fc7
-CooltrainermGaven3BeatenText: ; 0x1a4fc7
+CooltrainermGaven3BeatenText:
text "Gaah! Life is even"
line "tougher!"
done
-; 0x1a4fe4
-UnknownText_0x1a4fe4: ; 0x1a4fe4
+UnknownText_0x1a4fe4:
text "To get to #MON"
line "LEAGUE, you have"
@@ -434,9 +391,8 @@
para "Practically nobody"
line "goes there!"
done
-; 0x1a505c
-CooltrainerfJoyceSeenText: ; 0x1a505c
+CooltrainerfJoyceSeenText:
text "Since you've come"
line "this far, you must"
cont "be good."
@@ -445,15 +401,13 @@
line "this battle every-"
cont "thing I've got!"
done
-; 0x1a50bd
-CooltrainerfJoyceBeatenText: ; 0x1a50bd
+CooltrainerfJoyceBeatenText:
text "No! I don't"
line "believe this!"
done
-; 0x1a50d7
-UnknownText_0x1a50d7: ; 0x1a50d7
+UnknownText_0x1a50d7:
text "I've defeated"
line "eight GYM LEADERS,"
@@ -463,9 +417,8 @@
para "I'll have to try"
line "harder next time."
done
-; 0x1a5136
-CooltrainerfBeth1SeenText: ; 0x1a5136
+CooltrainerfBeth1SeenText:
text "I lost to a train-"
line "er named <RIVAL>."
@@ -479,22 +432,19 @@
para "I felt sorry for"
line "his #MON."
done
-; 0x1a51bf
-CooltrainerfBeth1BeatenText: ; 0x1a51bf
+CooltrainerfBeth1BeatenText:
text "#MON aren't"
line "tools of war."
done
-; 0x1a51d9
-UnknownText_0x1a51d9: ; 0x1a51d9
+UnknownText_0x1a51d9:
text "#MON are in-"
line "valuable, lifelong"
cont "partners."
done
-; 0x1a5204
-PsychicRichardSeenText: ; 0x1a5204
+PsychicRichardSeenText:
text "Wow, look at all"
line "those BADGES!"
cont "I'm impressed."
@@ -505,14 +455,12 @@
para "collecting them,"
line "right?"
done
-; 0x1a526a
-PsychicRichardBeatenText: ; 0x1a526a
+PsychicRichardBeatenText:
text "Good battle!"
done
-; 0x1a5278
-UnknownText_0x1a5278: ; 0x1a5278
+UnknownText_0x1a5278:
text "People and #MON"
line "grow from their"
cont "experiences."
@@ -520,9 +468,8 @@
para "Don't get lazy and"
line "complacent."
done
-; 0x1a52c4
-FisherScottSeenText: ; 0x1a52c4
+FisherScottSeenText:
text "I'm feeling great"
line "today!"
@@ -530,15 +477,13 @@
line "could boot even"
cont "the LEAGUE CHAMP!"
done
-; 0x1a530d
-FisherScottBeatenText: ; 0x1a530d
+FisherScottBeatenText:
text "No! Not in this"
line "battle!"
done
-; 0x1a5326
-UnknownText_0x1a5326: ; 0x1a5326
+UnknownText_0x1a5326:
text "Just like in fish-"
line "ing, it's all over"
@@ -545,17 +490,15 @@
para "in #MON if you"
line "give up."
done
-; 0x1a5364
-UnknownText_0x1a5364: ; 0x1a5364
+UnknownText_0x1a5364:
text "ROUTE 26"
para "#MON LEAGUE"
line "RECEPTION GATE"
done
-; 0x1a5389
-Route26_MapEventHeader: ; 0x1a5389
+Route26_MapEventHeader:
; filler
db 0, 0
@@ -582,4 +525,3 @@
person_event SPRITE_FISHER, 96, 14, $6, $0, 255, 255, $a2, 3, TrainerFisherScott, $ffff
person_event SPRITE_FRUIT_TREE, 58, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a4ec2, $ffff
person_event SPRITE_POKE_BALL, 19, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a4ec4, $06aa
-; 0x1a540b
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -1,4 +1,4 @@
-Route27_MapScriptHeader: ; 0x1a0867
+Route27_MapScriptHeader:
; trigger count
db 2
@@ -8,28 +8,24 @@
; callback count
db 0
-; 0x1a0871
-UnknownScript_0x1a0871: ; 0x1a0871
+UnknownScript_0x1a0871:
end
-; 0x1a0872
-UnknownScript_0x1a0872: ; 0x1a0872
+UnknownScript_0x1a0872:
end
-; 0x1a0873
-UnknownScript_0x1a0873: ; 0x1a0873
+UnknownScript_0x1a0873:
spriteface $a, LEFT
showemote $0, $a, 15
applymovement $a, MovementData_0x1a0a66
jump UnknownScript_0x1a088c
-; 0x1a0881
-UnknownScript_0x1a0881: ; 0x1a0881
+UnknownScript_0x1a0881:
spriteface $a, LEFT
showemote $0, $a, 15
applymovement $a, MovementData_0x1a0a69
-UnknownScript_0x1a088c: ; 0x1a088c
+UnknownScript_0x1a088c:
spriteface $0, RIGHT
loadfont
writetext UnknownText_0x1a0a6b
@@ -39,15 +35,13 @@
loadmovesprites
dotrigger $1
end
-; 0x1a089c
-FisherScript_0x1a089c: ; 0x1a089c
+FisherScript_0x1a089c:
jumptextfaceplayer UnknownText_0x1a0a71
-; 0x1a089f
-TrainerPsychicGilbert: ; 0x1a089f
+TrainerPsychicGilbert:
; bit/flag number
- dw $443
+ dw EVENT_BEAT_PSYCHIC_GILBERT
; trainer group && trainer id
db PSYCHIC_T, GILBERT
@@ -63,9 +57,8 @@
; script when talk again
dw PsychicGilbertScript
-; 0x1a08ab
-PsychicGilbertScript: ; 0x1a08ab
+PsychicGilbertScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a0dd2
@@ -72,11 +65,10 @@
closetext
loadmovesprites
end
-; 0x1a08b3
-TrainerBird_keeperJose2: ; 0x1a08b3
+TrainerBird_keeperJose2:
; bit/flag number
- dw $408
+ dw EVENT_BEAT_BIRD_KEEPER_JOSE
; trainer group && trainer id
db BIRD_KEEPER, JOSE2
@@ -92,9 +84,8 @@
; script when talk again
dw Bird_keeperJose2Script
-; 0x1a08bf
-Bird_keeperJose2Script: ; 0x1a08bf
+Bird_keeperJose2Script:
writecode VAR_CALLERID, $d
talkaftercancel
loadfont
@@ -111,11 +102,10 @@
setevent $026f
scall UnknownScript_0x1a0957
jump UnknownScript_0x1a08eb
-; 0x1a08e8
-UnknownScript_0x1a08e8: ; 0x1a08e8
+UnknownScript_0x1a08e8:
scall UnknownScript_0x1a095b
-UnknownScript_0x1a08eb: ; 0x1a08eb
+UnknownScript_0x1a08eb:
askforphonenumber $d
if_equal $1, UnknownScript_0x1a096b
if_equal $2, UnknownScript_0x1a0967
@@ -122,9 +112,8 @@
trainertotext BIRD_KEEPER, JOSE2, $0
scall UnknownScript_0x1a095f
jump UnknownScript_0x1a0963
-; 0x1a08ff
-UnknownScript_0x1a08ff: ; 0x1a08ff
+UnknownScript_0x1a08ff:
scall UnknownScript_0x1a096f
winlosstext Bird_keeperJose2BeatenText, $0000
copybytetovar wd9f7
@@ -131,13 +120,13 @@
if_equal $2, UnknownScript_0x1a0916
if_equal $1, UnknownScript_0x1a091c
if_equal $0, UnknownScript_0x1a0922
-UnknownScript_0x1a0916: ; 0x1a0916
+UnknownScript_0x1a0916:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1a093c
-UnknownScript_0x1a091c: ; 0x1a091c
+UnknownScript_0x1a091c:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x1a092f
-UnknownScript_0x1a0922: ; 0x1a0922
+UnknownScript_0x1a0922:
loadtrainer BIRD_KEEPER, JOSE2
startbattle
returnafterbattle
@@ -144,9 +133,8 @@
loadvar wd9f7, $1
clearflag $0069
end
-; 0x1a092f
-UnknownScript_0x1a092f: ; 0x1a092f
+UnknownScript_0x1a092f:
loadtrainer BIRD_KEEPER, JOSE1
startbattle
returnafterbattle
@@ -153,76 +141,63 @@
loadvar wd9f7, $2
clearflag $0069
end
-; 0x1a093c
-UnknownScript_0x1a093c: ; 0x1a093c
+UnknownScript_0x1a093c:
loadtrainer BIRD_KEEPER, JOSE3
startbattle
returnafterbattle
clearflag $0069
end
-; 0x1a0945
-UnknownScript_0x1a0945: ; 0x1a0945
+UnknownScript_0x1a0945:
scall UnknownScript_0x1a0973
verbosegiveitem STAR_PIECE, 1
iffalse UnknownScript_0x1a0954
clearflag $007e
jump UnknownScript_0x1a0963
-; 0x1a0954
-UnknownScript_0x1a0954: ; 0x1a0954
+UnknownScript_0x1a0954:
jump UnknownScript_0x1a0977
-; 0x1a0957
-UnknownScript_0x1a0957: ; 0x1a0957
+UnknownScript_0x1a0957:
jumpstd asknumber1m
end
-; 0x1a095b
-UnknownScript_0x1a095b: ; 0x1a095b
+UnknownScript_0x1a095b:
jumpstd asknumber2m
end
-; 0x1a095f
-UnknownScript_0x1a095f: ; 0x1a095f
+UnknownScript_0x1a095f:
jumpstd registerednumberm
end
-; 0x1a0963
-UnknownScript_0x1a0963: ; 0x1a0963
+UnknownScript_0x1a0963:
jumpstd numberacceptedm
end
-; 0x1a0967
-UnknownScript_0x1a0967: ; 0x1a0967
+UnknownScript_0x1a0967:
jumpstd numberdeclinedm
end
-; 0x1a096b
-UnknownScript_0x1a096b: ; 0x1a096b
+UnknownScript_0x1a096b:
jumpstd phonefullm
end
-; 0x1a096f
-UnknownScript_0x1a096f: ; 0x1a096f
+UnknownScript_0x1a096f:
jumpstd rematchm
end
-; 0x1a0973
-UnknownScript_0x1a0973: ; 0x1a0973
+UnknownScript_0x1a0973:
jumpstd giftm
end
-; 0x1a0977
-UnknownScript_0x1a0977: ; 0x1a0977
+UnknownScript_0x1a0977:
jumpstd packfullm
end
-; 0x1a097b
-TrainerCooltrainermBlake: ; 0x1a097b
+TrainerCooltrainermBlake:
; bit/flag number
- dw $552
+ dw EVENT_BEAT_COOLTRAINERM_BLAKE
; trainer group && trainer id
db COOLTRAINERM, BLAKE
@@ -238,9 +213,8 @@
; script when talk again
dw CooltrainermBlakeScript
-; 0x1a0987
-CooltrainermBlakeScript: ; 0x1a0987
+CooltrainermBlakeScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a0b0b
@@ -247,11 +221,10 @@
closetext
loadmovesprites
end
-; 0x1a098f
-TrainerCooltrainermBrian: ; 0x1a098f
+TrainerCooltrainermBrian:
; bit/flag number
- dw $553
+ dw EVENT_BEAT_COOLTRAINERM_BRIAN
; trainer group && trainer id
db COOLTRAINERM, BRIAN
@@ -267,9 +240,8 @@
; script when talk again
dw CooltrainermBrianScript
-; 0x1a099b
-CooltrainermBrianScript: ; 0x1a099b
+CooltrainermBrianScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a0bac
@@ -276,11 +248,10 @@
closetext
loadmovesprites
end
-; 0x1a09a3
-TrainerCooltrainerfReena1: ; 0x1a09a3
+TrainerCooltrainerfReena:
; bit/flag number
- dw $564
+ dw EVENT_BEAT_COOLTRAINERF_REENA
; trainer group && trainer id
db COOLTRAINERF, REENA1
@@ -296,9 +267,8 @@
; script when talk again
dw CooltrainerfReena1Script
-; 0x1a09af
-CooltrainerfReena1Script: ; 0x1a09af
+CooltrainerfReena1Script:
writecode VAR_CALLERID, $e
talkaftercancel
loadfont
@@ -313,11 +283,10 @@
setevent $0271
scall UnknownScript_0x1a0a2f
jump UnknownScript_0x1a09d5
-; 0x1a09d2
-UnknownScript_0x1a09d2: ; 0x1a09d2
+UnknownScript_0x1a09d2:
scall UnknownScript_0x1a0a33
-UnknownScript_0x1a09d5: ; 0x1a09d5
+UnknownScript_0x1a09d5:
askforphonenumber $e
if_equal $1, UnknownScript_0x1a0a43
if_equal $2, UnknownScript_0x1a0a3f
@@ -324,9 +293,8 @@
trainertotext COOLTRAINERF, REENA1, $0
scall UnknownScript_0x1a0a37
jump UnknownScript_0x1a0a3b
-; 0x1a09e9
-UnknownScript_0x1a09e9: ; 0x1a09e9
+UnknownScript_0x1a09e9:
scall UnknownScript_0x1a0a47
winlosstext CooltrainerfReena1BeatenText, $0000
copybytetovar wd9f8
@@ -333,13 +301,13 @@
if_equal $2, UnknownScript_0x1a0a00
if_equal $1, UnknownScript_0x1a0a06
if_equal $0, UnknownScript_0x1a0a0c
-UnknownScript_0x1a0a00: ; 0x1a0a00
+UnknownScript_0x1a0a00:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1a0a26
-UnknownScript_0x1a0a06: ; 0x1a0a06
+UnknownScript_0x1a0a06:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x1a0a19
-UnknownScript_0x1a0a0c: ; 0x1a0a0c
+UnknownScript_0x1a0a0c:
loadtrainer COOLTRAINERF, REENA1
startbattle
returnafterbattle
@@ -346,9 +314,8 @@
loadvar wd9f8, $1
clearflag $006a
end
-; 0x1a0a19
-UnknownScript_0x1a0a19: ; 0x1a0a19
+UnknownScript_0x1a0a19:
loadtrainer COOLTRAINERF, REENA2
startbattle
returnafterbattle
@@ -355,54 +322,45 @@
loadvar wd9f8, $2
clearflag $006a
end
-; 0x1a0a26
-UnknownScript_0x1a0a26: ; 0x1a0a26
+UnknownScript_0x1a0a26:
loadtrainer COOLTRAINERF, REENA3
startbattle
returnafterbattle
clearflag $006a
end
-; 0x1a0a2f
-UnknownScript_0x1a0a2f: ; 0x1a0a2f
+UnknownScript_0x1a0a2f:
jumpstd asknumber1f
end
-; 0x1a0a33
-UnknownScript_0x1a0a33: ; 0x1a0a33
+UnknownScript_0x1a0a33:
jumpstd asknumber2f
end
-; 0x1a0a37
-UnknownScript_0x1a0a37: ; 0x1a0a37
+UnknownScript_0x1a0a37:
jumpstd registerednumberf
end
-; 0x1a0a3b
-UnknownScript_0x1a0a3b: ; 0x1a0a3b
+UnknownScript_0x1a0a3b:
jumpstd numberacceptedf
end
-; 0x1a0a3f
-UnknownScript_0x1a0a3f: ; 0x1a0a3f
+UnknownScript_0x1a0a3f:
jumpstd numberdeclinedf
end
-; 0x1a0a43
-UnknownScript_0x1a0a43: ; 0x1a0a43
+UnknownScript_0x1a0a43:
jumpstd phonefullf
end
-; 0x1a0a47
-UnknownScript_0x1a0a47: ; 0x1a0a47
+UnknownScript_0x1a0a47:
jumpstd rematchf
end
-; 0x1a0a4b
-TrainerCooltrainerfMegan: ; 0x1a0a4b
+TrainerCooltrainerfMegan:
; bit/flag number
- dw $565
+ dw EVENT_BEAT_COOLTRAINERF_MEGAN
; trainer group && trainer id
db COOLTRAINERF, MEGAN
@@ -418,9 +376,8 @@
; script when talk again
dw CooltrainerfMeganScript
-; 0x1a0a57
-CooltrainerfMeganScript: ; 0x1a0a57
+CooltrainerfMeganScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a0cce
@@ -427,37 +384,30 @@
closetext
loadmovesprites
end
-; 0x1a0a5f
-MapRoute27Signpost0Script: ; 0x1a0a5f
+MapRoute27Signpost0Script:
jumptext UnknownText_0x1a0e7f
-; 0x1a0a62
-ItemFragment_0x1a0a62: ; 0x1a0a62
+ItemFragment_0x1a0a62:
db TM_SOLARBEAM, 1
-; 0x1a0a64
-ItemFragment_0x1a0a64: ; 0x1a0a64
+ItemFragment_0x1a0a64:
db RARE_CANDY, 1
-; 0x1a0a66
-MovementData_0x1a0a66: ; 0x1a0a66
+MovementData_0x1a0a66:
step_left
step_left
step_end
-; 0x1a0a69
-MovementData_0x1a0a69: ; 0x1a0a69
+MovementData_0x1a0a69:
step_left
step_end
-; 0x1a0a6b
-UnknownText_0x1a0a6b: ; 0x1a0a6b
+UnknownText_0x1a0a6b:
text "Hey!"
done
-; 0x1a0a71
-UnknownText_0x1a0a71: ; 0x1a0a71
+UnknownText_0x1a0a71:
text "Do you know what"
line "you just did?"
@@ -468,21 +418,18 @@
para "Check your #-"
line "GEAR MAP and see."
done
-; 0x1a0ad9
-CooltrainermBlakeSeenText: ; 0x1a0ad9
+CooltrainermBlakeSeenText:
text "You look pretty"
line "strong."
cont "Let me battle you!"
done
-; 0x1a0b05
-CooltrainermBlakeBeatenText: ; 0x1a0b05
+CooltrainermBlakeBeatenText:
text "Yow!"
done
-; 0x1a0b0b
-UnknownText_0x1a0b0b: ; 0x1a0b0b
+UnknownText_0x1a0b0b:
text "If you prevail on"
line "this harsh trek,"
@@ -493,27 +440,23 @@
line "wanted to say"
cont "something cool."
done
-; 0x1a0b7c
-CooltrainermBrianSeenText: ; 0x1a0b7c
+CooltrainermBrianSeenText:
text "Hm? You're good,"
line "aren't you?"
done
-; 0x1a0b98
-CooltrainermBrianBeatenText: ; 0x1a0b98
+CooltrainermBrianBeatenText:
text "Just as I thought!"
done
-; 0x1a0bac
-UnknownText_0x1a0bac: ; 0x1a0bac
+UnknownText_0x1a0bac:
text "A good trainer can"
line "recognize other"
cont "good trainers."
done
-; 0x1a0bdf
-CooltrainerfReena1SeenText: ; 0x1a0bdf
+CooltrainerfReena1SeenText:
text "You shouldn't"
line "underestimate the"
@@ -520,15 +463,13 @@
para "wild #MON in"
line "these parts."
done
-; 0x1a0c19
-CooltrainerfReena1BeatenText: ; 0x1a0c19
+CooltrainerfReena1BeatenText:
text "Oh! You're much"
line "too strong!"
done
-; 0x1a0c35
-UnknownText_0x1a0c35: ; 0x1a0c35
+UnknownText_0x1a0c35:
text "You're just a kid,"
line "but you're not to"
@@ -535,9 +476,8 @@
para "be underestimated"
line "either."
done
-; 0x1a0c73
-CooltrainerfMeganSeenText: ; 0x1a0c73
+CooltrainerfMeganSeenText:
text "It's rare to see"
line "anyone come here."
@@ -544,15 +484,13 @@
para "Are you training"
line "on your own?"
done
-; 0x1a0cb4
-CooltrainerfMeganBeatenText: ; 0x1a0cb4
+CooltrainerfMeganBeatenText:
text "Oh! You're really"
line "strong!"
done
-; 0x1a0cce
-UnknownText_0x1a0cce: ; 0x1a0cce
+UnknownText_0x1a0cce:
text "I'm checking out"
line "pre- and post-"
cont "evolution #MON."
@@ -565,9 +503,8 @@
line "also learn moves"
cont "later on."
done
-; 0x1a0d55
-PsychicGilbertSeenText: ; 0x1a0d55
+PsychicGilbertSeenText:
text "Don't say a thing!"
para "Let me guess what"
@@ -579,14 +516,12 @@
line "on the #MON"
cont "LEAGUE challenge!"
done
-; 0x1a0dc1
-PsychicGilbertBeatenText: ; 0x1a0dc1
+PsychicGilbertBeatenText:
text "You're too much!"
done
-; 0x1a0dd2
-UnknownText_0x1a0dd2: ; 0x1a0dd2
+UnknownText_0x1a0dd2:
text "With your skills,"
line "you'll do well at"
cont "the LEAGUE."
@@ -594,20 +529,17 @@
para "That's what my"
line "premonition says."
done
-; 0x1a0e22
-Bird_keeperJose2SeenText: ; 0x1a0e22
+Bird_keeperJose2SeenText:
text "Tweet! Tweet!"
line "Tetweet!"
done
-; 0x1a0e3a
-Bird_keeperJose2BeatenText: ; 0x1a0e3a
+Bird_keeperJose2BeatenText:
text "Tweet!"
done
-; 0x1a0e42
-UnknownText_0x1a0e42: ; 0x1a0e42
+UnknownText_0x1a0e42:
text "BIRD KEEPERS like"
line "me mimic bird"
@@ -614,17 +546,15 @@
para "whistles to com-"
line "mand #MON."
done
-; 0x1a0e7f
-UnknownText_0x1a0e7f: ; 0x1a0e7f
+UnknownText_0x1a0e7f:
text "TOHJO FALLS"
para "THE LINK BETWEEN"
line "KANTO AND JOHTO"
done
-; 0x1a0ead
-Route27_MapEventHeader: ; 0x1a0ead
+Route27_MapEventHeader:
; filler
db 0, 0
@@ -647,7 +577,7 @@
db 9
person_event SPRITE_COOLTRAINER_M, 11, 52, $7, $0, 255, 255, $82, 3, TrainerCooltrainermBlake, $ffff
person_event SPRITE_COOLTRAINER_M, 10, 62, $9, $0, 255, 255, $82, 4, TrainerCooltrainermBrian, $ffff
- person_event SPRITE_COOLTRAINER_F, 14, 76, $7, $0, 255, 255, $82, 4, TrainerCooltrainerfReena1, $ffff
+ person_event SPRITE_COOLTRAINER_F, 14, 76, $7, $0, 255, 255, $82, 4, TrainerCooltrainerfReena, $ffff
person_event SPRITE_COOLTRAINER_F, 10, 41, $1f, $0, 255, 255, $82, 2, TrainerCooltrainerfMegan, $ffff
person_event SPRITE_YOUNGSTER, 11, 69, $8, $0, 255, 255, $92, 3, TrainerPsychicGilbert, $ffff
person_event SPRITE_YOUNGSTER, 17, 62, $9, $0, 255, 255, $92, 3, TrainerBird_keeperJose2, $ffff
@@ -654,4 +584,3 @@
person_event SPRITE_POKE_BALL, 16, 64, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a0a62, $06ab
person_event SPRITE_POKE_BALL, 16, 57, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a0a64, $06ac
person_event SPRITE_FISHER, 14, 25, $3, $0, 255, 255, $0, 3, FisherScript_0x1a089c, $ffff
-; 0x1a0f4c
--- a/maps/Route3.asm
+++ b/maps/Route3.asm
@@ -1,14 +1,13 @@
-Route3_MapScriptHeader: ; 0x1adf63
+Route3_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1adf65
-TrainerFirebreatherOtis: ; 0x1adf65
+TrainerFirebreatherOtis:
; bit/flag number
- dw $446
+ dw EVENT_BEAT_FIREBREATHER_OTIS
; trainer group && trainer id
db FIREBREATHER, OTIS
@@ -24,9 +23,8 @@
; script when talk again
dw FirebreatherOtisScript
-; 0x1adf71
-FirebreatherOtisScript: ; 0x1adf71
+FirebreatherOtisScript:
talkaftercancel
loadfont
writetext UnknownText_0x1adff7
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x1adf79
-TrainerYoungsterWarren: ; 0x1adf79
+TrainerYoungsterWarren:
; bit/flag number
- dw $5b1
+ dw EVENT_BEAT_YOUNGSTER_WARREN
; trainer group && trainer id
db YOUNGSTER, WARREN
@@ -53,9 +50,8 @@
; script when talk again
dw YoungsterWarrenScript
-; 0x1adf85
-YoungsterWarrenScript: ; 0x1adf85
+YoungsterWarrenScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ae051
@@ -62,11 +58,10 @@
closetext
loadmovesprites
end
-; 0x1adf8d
-TrainerYoungsterJimmy: ; 0x1adf8d
+TrainerYoungsterJimmy:
; bit/flag number
- dw $5b2
+ dw EVENT_BEAT_YOUNGSTER_JIMMY
; trainer group && trainer id
db YOUNGSTER, JIMMY
@@ -82,9 +77,8 @@
; script when talk again
dw YoungsterJimmyScript
-; 0x1adf99
-YoungsterJimmyScript: ; 0x1adf99
+YoungsterJimmyScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ae0a9
@@ -91,11 +85,10 @@
closetext
loadmovesprites
end
-; 0x1adfa1
-TrainerFirebreatherBurt: ; 0x1adfa1
+TrainerFirebreatherBurt:
; bit/flag number
- dw $449
+ dw EVENT_BEAT_FIREBREATHER_BURT
; trainer group && trainer id
db FIREBREATHER, BURT
@@ -111,9 +104,8 @@
; script when talk again
dw FirebreatherBurtScript
-; 0x1adfad
-FirebreatherBurtScript: ; 0x1adfad
+FirebreatherBurtScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ae118
@@ -120,62 +112,52 @@
closetext
loadmovesprites
end
-; 0x1adfb5
-MapRoute3Signpost0Script: ; 0x1adfb5
+MapRoute3Signpost0Script:
jumptext UnknownText_0x1ae163
-; 0x1adfb8
-FirebreatherOtisSeenText: ; 0x1adfb8
+FirebreatherOtisSeenText:
text "Ah! The weather's"
line "as fine as ever."
done
-; 0x1adfdb
-FirebreatherOtisBeatenText: ; 0x1adfdb
+FirebreatherOtisBeatenText:
text "It's sunny, but"
line "I'm all wet…"
done
-; 0x1adff7
-UnknownText_0x1adff7: ; 0x1adff7
+UnknownText_0x1adff7:
text "When it rains,"
line "it's hard to get"
cont "ignition…"
done
-; 0x1ae021
-YoungsterWarrenSeenText: ; 0x1ae021
+YoungsterWarrenSeenText:
text "Hmmm… I don't know"
line "what to do…"
done
-; 0x1ae040
-YoungsterWarrenBeatenText: ; 0x1ae040
+YoungsterWarrenBeatenText:
text "I knew I'd lose…"
done
-; 0x1ae051
-UnknownText_0x1ae051: ; 0x1ae051
+UnknownText_0x1ae051:
text "You looked strong."
para "I was afraid to"
line "take you on…"
done
-; 0x1ae082
-YoungsterJimmySeenText: ; 0x1ae082
+YoungsterJimmySeenText:
text "I can run like the"
line "wind!"
done
-; 0x1ae09c
-YoungsterJimmyBeatenText: ; 0x1ae09c
+YoungsterJimmyBeatenText:
text "Blown away!"
done
-; 0x1ae0a9
-UnknownText_0x1ae0a9: ; 0x1ae0a9
+UnknownText_0x1ae0a9:
text "I wear shorts the"
line "whole year round."
@@ -182,20 +164,17 @@
para "That's my fashion"
line "policy."
done
-; 0x1ae0e7
-FirebreatherBurtSeenText: ; 0x1ae0e7
+FirebreatherBurtSeenText:
text "Step right up and"
line "take a look!"
done
-; 0x1ae107
-FirebreatherBurtBeatenText: ; 0x1ae107
+FirebreatherBurtBeatenText:
text "Yow! That's hot!"
done
-; 0x1ae118
-UnknownText_0x1ae118: ; 0x1ae118
+UnknownText_0x1ae118:
text "The greatest fire-"
line "breather in KANTO,"
cont "that's me."
@@ -203,17 +182,15 @@
para "But not the best"
line "trainer…"
done
-; 0x1ae163
-UnknownText_0x1ae163: ; 0x1ae163
+UnknownText_0x1ae163:
text "MT.MOON SQUARE"
para "Just go up the"
line "stairs."
done
-; 0x1ae18a
-Route3_MapEventHeader: ; 0x1ae18a
+Route3_MapEventHeader:
; filler
db 0, 0
@@ -234,4 +211,3 @@
person_event SPRITE_YOUNGSTER, 11, 14, $8, $0, 255, 255, $92, 3, TrainerYoungsterWarren, $ffff
person_event SPRITE_YOUNGSTER, 7, 20, $a, $0, 255, 255, $92, 1, TrainerYoungsterJimmy, $ffff
person_event SPRITE_FISHER, 9, 53, $a, $0, 255, 255, $82, 3, TrainerFirebreatherBurt, $ffff
-; 0x1ae1ce
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -1,12 +1,11 @@
-Route30_MapScriptHeader: ; 0x1a1671
+Route30_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1a1673
-YoungsterScript_0x1a1673: ; 0x1a1673
+YoungsterScript_0x1a1673:
waitbutton
playmusic MUSIC_JOHTO_TRAINER_BATTLE
loadfont
@@ -25,11 +24,10 @@
applymovement $7, MovementData_0x1a1802
special RestartMapMusic
end
-; 0x1a169a
-TrainerYoungsterJoey1: ; 0x1a169a
+TrainerYoungsterJoey:
; bit/flag number
- dw $5a9
+ dw EVENT_BEAT_YOUNGSTER_JOEY
; trainer group && trainer id
db YOUNGSTER, JOEY1
@@ -45,9 +43,8 @@
; script when talk again
dw YoungsterJoey1Script
-; 0x1a16a6
-YoungsterJoey1Script: ; 0x1a16a6
+YoungsterJoey1Script:
writecode VAR_CALLERID, $f
talkaftercancel
loadfont
@@ -62,11 +59,10 @@
setevent $0273
scall UnknownScript_0x1a1783
jump UnknownScript_0x1a16cc
-; 0x1a16c9
-UnknownScript_0x1a16c9: ; 0x1a16c9
+UnknownScript_0x1a16c9:
scall UnknownScript_0x1a1787
-UnknownScript_0x1a16cc: ; 0x1a16cc
+UnknownScript_0x1a16cc:
askforphonenumber $f
if_equal $1, UnknownScript_0x1a1797
if_equal $2, UnknownScript_0x1a1793
@@ -73,9 +69,8 @@
trainertotext YOUNGSTER, JOEY1, $0
scall UnknownScript_0x1a178b
jump UnknownScript_0x1a178f
-; 0x1a16e0
-UnknownScript_0x1a16e0: ; 0x1a16e0
+UnknownScript_0x1a16e0:
scall UnknownScript_0x1a179b
winlosstext YoungsterJoey1BeatenText, $0000
copybytetovar wd9f9
@@ -84,19 +79,19 @@
if_equal $2, UnknownScript_0x1a170b
if_equal $1, UnknownScript_0x1a1711
if_equal $0, UnknownScript_0x1a1717
-UnknownScript_0x1a16ff: ; 0x1a16ff
+UnknownScript_0x1a16ff:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x1a174b
-UnknownScript_0x1a1705: ; 0x1a1705
+UnknownScript_0x1a1705:
checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x1a173e
-UnknownScript_0x1a170b: ; 0x1a170b
+UnknownScript_0x1a170b:
checkflag $0047
iftrue UnknownScript_0x1a1731
-UnknownScript_0x1a1711: ; 0x1a1711
+UnknownScript_0x1a1711:
checkflag $0046
iftrue UnknownScript_0x1a1724
-UnknownScript_0x1a1717: ; 0x1a717
+UnknownScript_0x1a1717:
loadtrainer YOUNGSTER, JOEY1
startbattle
returnafterbattle
@@ -103,9 +98,8 @@
loadvar wd9f9, $1
clearflag $006b
end
-; 0x1a1724
-UnknownScript_0x1a1724: ; 0x1a1724
+UnknownScript_0x1a1724:
loadtrainer YOUNGSTER, JOEY2
startbattle
returnafterbattle
@@ -112,9 +106,8 @@
loadvar wd9f9, $2
clearflag $006b
end
-; 0x1a1731
-UnknownScript_0x1a1731: ; 0x1a1731
+UnknownScript_0x1a1731:
loadtrainer YOUNGSTER, JOEY3
startbattle
returnafterbattle
@@ -121,9 +114,8 @@
loadvar wd9f9, $3
clearflag $006b
end
-; 0x1a173e
-UnknownScript_0x1a173e: ; 0x1a173e
+UnknownScript_0x1a173e:
loadtrainer YOUNGSTER, JOEY4
startbattle
returnafterbattle
@@ -130,9 +122,8 @@
loadvar wd9f9, $4
clearflag $006b
end
-; 0x1a174b
-UnknownScript_0x1a174b: ; 0x1a174b
+UnknownScript_0x1a174b:
loadtrainer YOUNGSTER, JOEY5
startbattle
returnafterbattle
@@ -146,13 +137,11 @@
iffalse UnknownScript_0x1a179f
setevent $0266
jump UnknownScript_0x1a178f
-; 0x1a176e
-UnknownScript_0x1a176e: ; 0x1a176e
+UnknownScript_0x1a176e:
end
-; 0x1a176f
-UnknownScript_0x1a176f: ; 0x1a176f
+UnknownScript_0x1a176f:
loadfont
writetext UnknownText_0x1a1bc0
closetext
@@ -161,57 +150,47 @@
clearevent EVENT_JOEY_HP_UP
setevent $0266
jump UnknownScript_0x1a178f
-; 0x1a1783
-UnknownScript_0x1a1783: ; 0x1a1783
+UnknownScript_0x1a1783:
jumpstd asknumber1m
end
-; 0x1a1787
-UnknownScript_0x1a1787: ; 0x1a1787
+UnknownScript_0x1a1787:
jumpstd asknumber2m
end
-; 0x1a178b
-UnknownScript_0x1a178b: ; 0x1a178b
+UnknownScript_0x1a178b:
jumpstd registerednumberm
end
-; 0x1a178f
-UnknownScript_0x1a178f: ; 0x1a178f
+UnknownScript_0x1a178f:
jumpstd numberacceptedm
end
-; 0x1a1793
-UnknownScript_0x1a1793: ; 0x1a1793
+UnknownScript_0x1a1793:
jumpstd numberdeclinedm
end
-; 0x1a1797
-UnknownScript_0x1a1797: ; 0x1a1797
+UnknownScript_0x1a1797:
jumpstd phonefullm
end
-; 0x1a179b
-UnknownScript_0x1a179b: ; 0x1a179b
+UnknownScript_0x1a179b:
jumpstd rematchm
end
-; 0x1a179f
-UnknownScript_0x1a179f: ; 0x1a179f
+UnknownScript_0x1a179f:
setevent EVENT_JOEY_HP_UP
jumpstd packfullm
end
-; 0x1a17a6
-UnknownScript_0x1a17a6: ; 0x1a17a6
+UnknownScript_0x1a17a6:
jumpstd rematchgiftm
end
-; 0x1a17aa
-TrainerYoungsterMikey: ; 0x1a17aa
+TrainerYoungsterMikey:
; bit/flag number
- dw $5aa
+ dw EVENT_BEAT_YOUNGSTER_MIKEY
; trainer group && trainer id
db YOUNGSTER, MIKEY
@@ -227,9 +206,8 @@
; script when talk again
dw YoungsterMikeyScript
-; 0x1a17b6
-YoungsterMikeyScript: ; 0x1a17b6
+YoungsterMikeyScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a197d
@@ -236,11 +214,10 @@
closetext
loadmovesprites
end
-; 0x1a17be
-TrainerBug_catcherDon: ; 0x1a17be
+TrainerBug_catcherDon:
; bit/flag number
- dw $538
+ dw EVENT_BEAT_BUG_CATCHER_DON
; trainer group && trainer id
db BUG_CATCHER, DON
@@ -256,9 +233,8 @@
; script when talk again
dw Bug_catcherDonScript
-; 0x1a17ca
-Bug_catcherDonScript: ; 0x1a17ca
+Bug_catcherDonScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a1a1c
@@ -265,9 +241,8 @@
closetext
loadmovesprites
end
-; 0x1a17d2
-YoungsterScript_0x1a17d2: ; 0x1a17d2
+YoungsterScript_0x1a17d2:
faceplayer
loadfont
checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
@@ -276,82 +251,67 @@
closetext
loadmovesprites
end
-; 0x1a17e0
-UnknownScript_0x1a17e0: ; 0x1a17e0
+UnknownScript_0x1a17e0:
writetext UnknownText_0x1a1a94
closetext
loadmovesprites
end
-; 0x1a17e6
-CooltrainerFScript_0x1a17e6: ; 0x1a17e6
+CooltrainerFScript_0x1a17e6:
jumptextfaceplayer UnknownText_0x1a1ac4
-; 0x1a17e9
-MapRoute30Signpost0Script: ; 0x1a17e9
+MapRoute30Signpost0Script:
jumptext UnknownText_0x1a1b0b
-; 0x1a17ec
-MapRoute30Signpost1Script: ; 0x1a17ec
+MapRoute30Signpost1Script:
jumptext UnknownText_0x1a1b34
-; 0x1a17ef
-MapRoute30Signpost2Script: ; 0x1a17ef
+MapRoute30Signpost2Script:
jumptext UnknownText_0x1a1b55
-; 0x1a17f2
-MapRoute30Signpost3Script: ; 0x1a17f2
+MapRoute30Signpost3Script:
jumptext UnknownText_0x1a1b66
-; 0x1a17f5
-ItemFragment_0x1a17f5: ; 0x1a17f5
+ItemFragment_0x1a17f5:
db ANTIDOTE, 1
-; 0x1a17f7
-FruitTreeScript_0x1a17f7: ; 0x1a17f7
+FruitTreeScript_0x1a17f7:
fruittree $2
-; 0x1a17f9
-FruitTreeScript_0x1a17f9: ; 0x1a17f9
+FruitTreeScript_0x1a17f9:
fruittree $5
-; 0x1a17fb
-MapRoute30SignpostItem4: ; 0x1a17fb
+MapRoute30SignpostItem4:
dw $00a4
db POTION
-; 0x1a17fe
-MovementData_0x1a17fe: ; 0x1a17fe
+MovementData_0x1a17fe:
fix_facing
big_step_up
big_step_down
step_end
-; 0x1a1802
-MovementData_0x1a1802: ; 0x1a1802
+MovementData_0x1a1802:
fix_facing
big_step_down
big_step_up
step_end
-; 0x1a1806
-UnknownText_0x1a1806: ; 0x1a1806
+UnknownText_0x1a1806:
text "Go, RATTATA!"
para "TACKLE!"
done
-; 0x1a181c
-UnknownText_0x1a181c: ; 0x1a181c
+UnknownText_0x1a181c:
text "What? This is a"
line "big battle!"
cont "Leave me alone!"
done
-; 0x1a1849
-YoungsterJoey1SeenText: ; 0x1a1849
+YoungsterJoey1SeenText:
text "I just lost, so"
line "I'm trying to find"
cont "more #MON."
@@ -360,15 +320,13 @@
line "weak! Come on,"
cont "let's battle!"
done
-; 0x1a18a2
-YoungsterJoey1BeatenText: ; 0x1a18a2
+YoungsterJoey1BeatenText:
text "Ack! I lost again!"
line "Doggone it!"
done
-; 0x1a18c2
-UnknownText_0x1a18c2: ; 0x1a18c2
+UnknownText_0x1a18c2:
text "Do I have to have"
line "more #MON in"
@@ -379,9 +337,8 @@
line "with this one no"
cont "matter what!"
done
-; 0x1a1928
-YoungsterMikeySeenText: ; 0x1a1928
+YoungsterMikeySeenText:
text "You're a #MON"
line "trainer, right?"
@@ -388,15 +345,13 @@
para "Then you have to"
line "battle!"
done
-; 0x1a195f
-YoungsterMikeyBeatenText: ; 0x1a195f
+YoungsterMikeyBeatenText:
text "That's strange."
line "I won before."
done
-; 0x1a197d
-UnknownText_0x1a197d: ; 0x1a197d
+UnknownText_0x1a197d:
text "Becoming a good"
line "trainer is really"
cont "tough."
@@ -405,22 +360,19 @@
line "tle other people"
cont "to get better."
done
-; 0x1a19d8
-Bug_catcherDonSeenText: ; 0x1a19d8
+Bug_catcherDonSeenText:
text "Instead of a bug"
line "#MON, I found"
cont "a trainer!"
done
-; 0x1a1a03
-Bug_catcherDonBeatenText: ; 0x1a1a03
+Bug_catcherDonBeatenText:
text "Argh! You're too"
line "strong!"
done
-; 0x1a1a1c
-UnknownText_0x1a1a1c: ; 0x1a1a1c
+UnknownText_0x1a1a1c:
text "I ran out of #"
line "BALLS while I was"
cont "catching #MON."
@@ -428,23 +380,20 @@
para "I should've bought"
line "some more…"
done
-; 0x1a1a6a
-UnknownText_0x1a1a6a: ; 0x1a1a6a
+UnknownText_0x1a1a6a:
text "MR.#MON's"
line "house? It's a bit"
cont "farther ahead."
done
-; 0x1a1a94
-UnknownText_0x1a1a94: ; 0x1a1a94
+UnknownText_0x1a1a94:
text "Everyone's having"
line "fun battling!"
cont "You should too!"
done
-; 0x1a1ac4
-UnknownText_0x1a1ac4: ; 0x1a1ac4
+UnknownText_0x1a1ac4:
text "I'm not a trainer."
para "But if you look"
@@ -451,28 +400,24 @@
line "one in the eyes,"
cont "prepare to battle."
done
-; 0x1a1b0b
-UnknownText_0x1a1b0b: ; 0x1a1b0b
+UnknownText_0x1a1b0b:
text "ROUTE 30"
para "VIOLET CITY -"
line "CHERRYGROVE CITY"
done
-; 0x1a1b34
-UnknownText_0x1a1b34: ; 0x1a1b34
+UnknownText_0x1a1b34:
text "MR.#MON'S HOUSE"
line "STRAIGHT AHEAD!"
done
-; 0x1a1b55
-UnknownText_0x1a1b55: ; 0x1a1b55
+UnknownText_0x1a1b55:
text "MR.#MON'S HOUSE"
done
-; 0x1a1b66
-UnknownText_0x1a1b66: ; 0x1a1b66
+UnknownText_0x1a1b66:
text "TRAINER TIPS"
para "No stealing other"
@@ -482,9 +427,8 @@
line "be thrown only at"
cont "wild #MON!"
done
-; 0x1a1bc0
-UnknownText_0x1a1bc0: ; 0x1a1bc0
+UnknownText_0x1a1bc0:
text "I lost again…"
line "Gee, you're tough!"
@@ -498,9 +442,8 @@
para "I'm going to get"
line "tougher too."
done
-; 0x1a1c54
-Route30_MapEventHeader: ; 0x1a1c54
+Route30_MapEventHeader:
; filler
db 0, 0
@@ -523,7 +466,7 @@
; people-events
db 11
person_event SPRITE_YOUNGSTER, 30, 9, $7, $0, 255, 255, $90, 0, YoungsterScript_0x1a1673, $0714
- person_event SPRITE_YOUNGSTER, 32, 6, $9, $0, 255, 255, $92, 3, TrainerYoungsterJoey1, $0715
+ person_event SPRITE_YOUNGSTER, 32, 6, $9, $0, 255, 255, $92, 3, TrainerYoungsterJoey, $0715
person_event SPRITE_YOUNGSTER, 27, 9, $6, $0, 255, 255, $92, 1, TrainerYoungsterMikey, $ffff
person_event SPRITE_BUG_CATCHER, 11, 5, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherDon, $ffff
person_event SPRITE_YOUNGSTER, 34, 11, $5, $1, 255, 255, $80, 0, YoungsterScript_0x1a17d2, $ffff
@@ -533,4 +476,3 @@
person_event SPRITE_FRUIT_TREE, 9, 15, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a17f9, $ffff
person_event SPRITE_COOLTRAINER_F, 17, 6, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x1a17e6, $ffff
person_event SPRITE_POKE_BALL, 39, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a17f5, $07b8
-; 0x1a1d0c
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -1,4 +1,4 @@
-Route31_MapScriptHeader: ; 0x1a5437
+Route31_MapScriptHeader:
; trigger count
db 0
@@ -8,22 +8,19 @@
; callbacks
dbw 5, UnknownScript_0x1a543c
-; 0x1a543c
-UnknownScript_0x1a543c: ; 0x1a543c
+UnknownScript_0x1a543c:
checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
iffalse UnknownScript_0x1a5443
return
-; 0x1a5443
-UnknownScript_0x1a5443: ; 0x1a5443
+UnknownScript_0x1a5443:
specialphonecall $7
return
-; 0x1a5447
-TrainerBug_catcherWade1: ; 0x1a5447
+TrainerBug_catcherWade1:
; bit/flag number
- dw $53b
+ dw EVENT_BEAT_BUG_CATCHER_WADE
; trainer group && trainer id
db BUG_CATCHER, WADE1
@@ -39,9 +36,8 @@
; script when talk again
dw Bug_catcherWade1Script
-; 0x1a5453
-Bug_catcherWade1Script: ; 0x1a5453
+Bug_catcherWade1Script:
writecode VAR_CALLERID, $10
talkaftercancel
loadfont
@@ -58,11 +54,10 @@
setevent $0275
scall UnknownScript_0x1a554c
jump UnknownScript_0x1a547f
-; 0x1a547c
-UnknownScript_0x1a547c: ; 0x1a547c
+UnknownScript_0x1a547c:
scall UnknownScript_0x1a5550
-UnknownScript_0x1a547f: ; 0x1a547f
+UnknownScript_0x1a547f:
askforphonenumber $10
if_equal $1, UnknownScript_0x1a5560
if_equal $2, UnknownScript_0x1a555c
@@ -69,9 +64,8 @@
trainertotext BUG_CATCHER, WADE1, $0
scall UnknownScript_0x1a5554
jump UnknownScript_0x1a5558
-; 0x1a5493
-UnknownScript_0x1a5493: ; 0x1a5493
+UnknownScript_0x1a5493:
scall UnknownScript_0x1a5564
winlosstext Bug_catcherWade1BeatenText, $0000
copybytetovar wd9fa
@@ -80,19 +74,19 @@
if_equal $2, UnknownScript_0x1a54be
if_equal $1, UnknownScript_0x1a54c4
if_equal $0, UnknownScript_0x1a54ca
-UnknownScript_0x1a54b2: ; 0x1a54b2
+UnknownScript_0x1a54b2:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x1a54fe
-UnknownScript_0x1a54b8: ; 0x1a54b8
+UnknownScript_0x1a54b8:
checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x1a54f1
-UnknownScript_0x1a54be: ; 0x1a54be
+UnknownScript_0x1a54be:
checkflag $0049
iftrue UnknownScript_0x1a54e4
-UnknownScript_0x1a54c4: ; 0x1a54c4
+UnknownScript_0x1a54c4:
checkflag $0046
iftrue UnknownScript_0x1a54d7
-UnknownScript_0x1a54ca: ; 0x1a54ca
+UnknownScript_0x1a54ca:
loadtrainer BUG_CATCHER, WADE1
startbattle
returnafterbattle
@@ -99,9 +93,8 @@
loadvar wd9fa, $1
clearflag $006c
end
-; 0x1a54d7
-UnknownScript_0x1a54d7: ; 0x1a54d7
+UnknownScript_0x1a54d7:
loadtrainer BUG_CATCHER, WADE2
startbattle
returnafterbattle
@@ -108,9 +101,8 @@
loadvar wd9fa, $2
clearflag $006c
end
-; 0x1a54e4
-UnknownScript_0x1a54e4: ; 0x1a54e4
+UnknownScript_0x1a54e4:
loadtrainer BUG_CATCHER, WADE3
startbattle
returnafterbattle
@@ -117,9 +109,8 @@
loadvar wd9fa, $3
clearflag $006c
end
-; 0x1a54f1
-UnknownScript_0x1a54f1: ; 0x1a54f1
+UnknownScript_0x1a54f1:
loadtrainer BUG_CATCHER, WADE4
startbattle
returnafterbattle
@@ -126,17 +117,15 @@
loadvar wd9fa, $4
clearflag $006c
end
-; 0x1a54fe
-UnknownScript_0x1a54fe: ; 0x1a54fe
+UnknownScript_0x1a54fe:
loadtrainer BUG_CATCHER, WADE5
startbattle
returnafterbattle
clearflag $006c
end
-; 0x1a5507
-UnknownScript_0x1a5507: ; 0x1a5507
+UnknownScript_0x1a5507:
scall UnknownScript_0x1a5568
checkevent EVENT_WADE_HAS_BERRY
iftrue UnknownScript_0x1a5522
@@ -146,82 +135,68 @@
iftrue UnknownScript_0x1a5534
checkevent EVENT_WADE_HAS_BITTER_BERRY
iftrue UnknownScript_0x1a553d
-UnknownScript_0x1a5522: ; 0x1a5522
+UnknownScript_0x1a5522:
verbosegiveitem BERRY, 1
iffalse UnknownScript_0x1a5549
jump UnknownScript_0x1a5543
-; 0x1a552b
-UnknownScript_0x1a552b: ; 0x1a552b
+UnknownScript_0x1a552b:
verbosegiveitem PSNCUREBERRY, 1
iffalse UnknownScript_0x1a5549
jump UnknownScript_0x1a5543
-; 0x1a5534
-UnknownScript_0x1a5534: ; 0x1a5534
+UnknownScript_0x1a5534:
verbosegiveitem PRZCUREBERRY, 1
iffalse UnknownScript_0x1a5549
jump UnknownScript_0x1a5543
-; 0x1a553d
-UnknownScript_0x1a553d: ; 0x1a553d
+UnknownScript_0x1a553d:
verbosegiveitem BITTER_BERRY, 1
iffalse UnknownScript_0x1a5549
-UnknownScript_0x1a5543: ; 0x1a5543
+UnknownScript_0x1a5543:
clearflag $007f
jump UnknownScript_0x1a5558
-; 0x1a5549
-UnknownScript_0x1a5549: ; 0x1a5549
+UnknownScript_0x1a5549:
jump UnknownScript_0x1a556c
-; 0x1a554c
-UnknownScript_0x1a554c: ; 0x1a554c
+UnknownScript_0x1a554c:
jumpstd asknumber1m
end
-; 0x1a5550
-UnknownScript_0x1a5550: ; 0x1a5550
+UnknownScript_0x1a5550:
jumpstd asknumber2m
end
-; 0x1a5554
-UnknownScript_0x1a5554: ; 0x1a5554
+UnknownScript_0x1a5554:
jumpstd registerednumberm
end
-; 0x1a5558
-UnknownScript_0x1a5558: ; 0x1a5558
+UnknownScript_0x1a5558:
jumpstd numberacceptedm
end
-; 0x1a555c
-UnknownScript_0x1a555c: ; 0x1a555c
+UnknownScript_0x1a555c:
jumpstd numberdeclinedm
end
-; 0x1a5560
-UnknownScript_0x1a5560: ; 0x1a5560
+UnknownScript_0x1a5560:
jumpstd phonefullm
end
-; 0x1a5564
-UnknownScript_0x1a5564: ; 0x1a5564
+UnknownScript_0x1a5564:
jumpstd rematchm
end
-; 0x1a5568
-UnknownScript_0x1a5568: ; 0x1a5568
+UnknownScript_0x1a5568:
jumpstd giftm
end
-; 0x1a556c
-UnknownScript_0x1a556c: ; 0x1a556c
+UnknownScript_0x1a556c:
jumpstd packfullm
end
-; 0x1a5570
-FisherScript_0x1a5570: ; 0x1a5570
+FisherScript_0x1a5570:
faceplayer
loadfont
checkevent EVENT_GOT_TM50_NIGHTMARE
@@ -232,9 +207,8 @@
closetext
loadmovesprites
end
-; 0x1a5584
-UnknownScript_0x1a5584: ; 0x1a5584
+UnknownScript_0x1a5584:
writetext UnknownText_0x1a5761
keeptextopen
checkpokeitem ReceivedSpearowMailText
@@ -250,74 +224,63 @@
verbosegiveitem TM_NIGHTMARE, 1
iffalse UnknownScript_0x1a55b3
setevent EVENT_GOT_TM50_NIGHTMARE
-UnknownScript_0x1a55af: ; 0x1a55af
+UnknownScript_0x1a55af:
writetext UnknownText_0x1a5896
closetext
-UnknownScript_0x1a55b3: ; 0x1a55b3
+UnknownScript_0x1a55b3:
loadmovesprites
end
-; 0x1a55b5
-UnknownScript_0x1a55b5: ; 0x1a55b5
+UnknownScript_0x1a55b5:
writetext UnknownText_0x1a5921
closetext
loadmovesprites
end
-; 0x1a55bb
-UnknownScript_0x1a55bb: ; 0x1a55bb
+UnknownScript_0x1a55bb:
writetext UnknownText_0x1a5939
closetext
loadmovesprites
end
-; 0x1a55c1
-UnknownScript_0x1a55c1: ; 0x1a55c1
+UnknownScript_0x1a55c1:
writetext UnknownText_0x1a5972
closetext
loadmovesprites
end
-; 0x1a55c7
-UnknownScript_0x1a55c7: ; 0x1a55c7
+UnknownScript_0x1a55c7:
writetext UnknownText_0x1a5991
closetext
loadmovesprites
end
-ReceivedSpearowMailText: ; 0x1a55cd
+ReceivedSpearowMailText:
db "DARK CAVE leads",$4E
db "to another road@"
-YoungsterScript_0x1a55ed: ; 0x1a55ed
+YoungsterScript_0x1a55ed:
jumptextfaceplayer UnknownText_0x1a59d5
-; 0x1a55f0
-MapRoute31Signpost0Script: ; 0x1a55f0
+MapRoute31Signpost0Script:
jumptext UnknownText_0x1a5a45
-; 0x1a55f3
-MapRoute31Signpost1Script: ; 0x1a55f3
+MapRoute31Signpost1Script:
jumptext UnknownText_0x1a5a6e
-; 0x1a55f6
-CooltrainerMScript_0x1a55f6: ; 0x1a55f6
+CooltrainerMScript_0x1a55f6:
jumptextfaceplayer UnknownText_0x1a55ff
-; 0x1a55f9
-FruitTreeScript_0x1a55f9: ; 0x1a55f9
+FruitTreeScript_0x1a55f9:
fruittree $7
-; 0x1a55fb
-ItemFragment_0x1a55fb: ; 0x1a55fb
+ItemFragment_0x1a55fb:
db POTION, 1
-; 0x1a55fd
-ItemFragment_0x1a55fd: ; 0x1a55fd
+ItemFragment_0x1a55fd:
db POKE_BALL, 1
-; 0x1a55ff
-UnknownText_0x1a55ff: ; 0x1a55ff
+UnknownText_0x1a55ff:
text "DARK CAVE…"
para "If #MON could"
@@ -324,21 +287,18 @@
line "light it up, I'd"
cont "explore it."
done
-; 0x1a5635
-Bug_catcherWade1SeenText: ; 0x1a5635
+Bug_catcherWade1SeenText:
text "I caught a bunch"
line "of #MON. Let me"
cont "battle with you!"
done
-; 0x1a5668
-Bug_catcherWade1BeatenText: ; 0x1a5668
+Bug_catcherWade1BeatenText:
text "Awwwww…"
done
-; 0x1a5671
-UnknownText_0x1a5671: ; 0x1a5671
+UnknownText_0x1a5671:
text "You can catch"
line "#MON even if"
@@ -349,9 +309,8 @@
line "it'll go to your"
cont "BOX automatically."
done
-; 0x1a56d9
-UnknownText_0x1a56d9: ; 0x1a56d9
+UnknownText_0x1a56d9:
text "… Hnuurg… Huh?"
para "I walked too far"
@@ -367,24 +326,21 @@
para "…Zzzz…"
done
-; 0x1a5761
-UnknownText_0x1a5761: ; 0x1a5761
+UnknownText_0x1a5761:
text "…Zzzz… Huh?"
para "What's that? You"
line "have MAIL for me?"
done
-; 0x1a5790
-UnknownText_0x1a5790: ; 0x1a5790
+UnknownText_0x1a5790:
text "<PLAYER> handed"
line "over the #MON"
cont "holding the MAIL."
done
-; 0x1a57ba
-UnknownText_0x1a57ba: ; 0x1a57ba
+UnknownText_0x1a57ba:
text "Let's see…"
para "…DARK CAVE leads"
@@ -407,9 +363,8 @@
para "I know! I want you"
line "to have this!"
done
-; 0x1a5896
-UnknownText_0x1a5896: ; 0x1a5896
+UnknownText_0x1a5896:
text "TM50 is NIGHTMARE."
para "It's a wicked move"
@@ -424,15 +379,13 @@
para "I don't want to"
line "have bad dreams."
done
-; 0x1a5921
-UnknownText_0x1a5921: ; 0x1a5921
+UnknownText_0x1a5921:
text "This MAIL isn't"
line "for me."
done
-; 0x1a5939
-UnknownText_0x1a5939: ; 0x1a5939
+UnknownText_0x1a5939:
text "Why is this #-"
line "MON so special?"
@@ -439,15 +392,13 @@
para "It doesn't have"
line "any MAIL."
done
-; 0x1a5972
-UnknownText_0x1a5972: ; 0x1a5972
+UnknownText_0x1a5972:
text "What? You don't"
line "want anything?"
done
-; 0x1a5991
-UnknownText_0x1a5991: ; 0x1a5991
+UnknownText_0x1a5991:
text "If I take that"
line "#MON from you,"
@@ -454,9 +405,8 @@
para "what are you going"
line "to use in battle?"
done
-; 0x1a59d5
-UnknownText_0x1a59d5: ; 0x1a59d5
+UnknownText_0x1a59d5:
text "I found a good"
line "#MON in DARK"
cont "CAVE."
@@ -468,22 +418,19 @@
para "He's the leader of"
line "VIOLET CITY's GYM."
done
-; 0x1a5a45
-UnknownText_0x1a5a45: ; 0x1a5a45
+UnknownText_0x1a5a45:
text "ROUTE 31"
para "VIOLET CITY -"
line "CHERRYGROVE CITY"
done
-; 0x1a5a6e
-UnknownText_0x1a5a6e: ; 0x1a5a6e
+UnknownText_0x1a5a6e:
text "DARK CAVE"
done
-; 0x1a5a79
-Route31_MapEventHeader: ; 0x1a5a79
+Route31_MapEventHeader:
; filler
db 0, 0
@@ -510,4 +457,3 @@
person_event SPRITE_FRUIT_TREE, 11, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a55f9, $ffff
person_event SPRITE_POKE_BALL, 9, 33, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a55fb, $06ae
person_event SPRITE_POKE_BALL, 19, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a55fd, $06af
-; 0x1a5af3
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -134,7 +134,7 @@
TrainerCamperRoland:
; bit/flag number
- dw $41a
+ dw EVENT_BEAT_CAMPER_ROLAND
; trainer group && trainer id
db CAMPER, ROLAND
@@ -161,7 +161,7 @@
TrainerFisherJustin:
; bit/flag number
- dw $44e
+ dw EVENT_BEAT_FISHER_JUSTIN
; trainer group && trainer id
db FISHER, JUSTIN
@@ -188,7 +188,7 @@
TrainerFisherRalph1:
; bit/flag number
- dw $44f
+ dw EVENT_BEAT_FISHER_RALPH
; trainer group && trainer id
db FISHER, RALPH1
@@ -329,7 +329,7 @@
TrainerFisherHenry:
; bit/flag number
- dw $452
+ dw EVENT_BEAT_FISHER_HENRY
; trainer group && trainer id
db FISHER, HENRY
@@ -356,7 +356,7 @@
TrainerPicnickerLiz1:
; bit/flag number
- dw $47e
+ dw EVENT_BEAT_PICNICKER_LIZ
; trainer group && trainer id
db PICNICKER, LIZ1
@@ -489,7 +489,7 @@
TrainerYoungsterAlbert:
; bit/flag number
- dw $5ab
+ dw EVENT_BEAT_YOUNGSTER_ALBERT
; trainer group && trainer id
db YOUNGSTER, ALBERT
@@ -516,7 +516,7 @@
TrainerYoungsterGordon:
; bit/flag number
- dw $5ac
+ dw EVENT_BEAT_YOUNGSTER_GORDON
; trainer group && trainer id
db YOUNGSTER, GORDON
@@ -543,7 +543,7 @@
TrainerBird_keeperPeter:
; bit/flag number
- dw $407
+ dw EVENT_BEAT_BIRD_KEEPER_PETER
; trainer group && trainer id
db BIRD_KEEPER, PETER
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -1,18 +1,16 @@
-Route33_MapScriptHeader: ; 0x1ac000
+Route33_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1ac002
-LassScript_0x1ac002: ; 0x1ac002
+LassScript_0x1ac002:
jumptextfaceplayer UnknownText_0x1ac1e7
-; 0x1ac005
-TrainerHikerAnthony2: ; 0x1ac005
+TrainerHikerAnthony:
; bit/flag number
- dw $528
+ dw EVENT_BEAT_HIKER_ANTHONY
; trainer group && trainer id
db HIKER, ANTHONY2
@@ -28,9 +26,8 @@
; script when talk again
dw HikerAnthony2Script
-; 0x1ac011
-HikerAnthony2Script: ; 0x1ac011
+HikerAnthony2Script:
writecode VAR_CALLERID, $13
talkaftercancel
loadfont
@@ -47,11 +44,10 @@
setevent $027b
scall UnknownScript_0x1ac0cb
jump UnknownScript_0x1ac03d
-; 0x1ac03a
-UnknownScript_0x1ac03a: ; 0x1ac03a
+UnknownScript_0x1ac03a:
scall UnknownScript_0x1ac0cf
-UnknownScript_0x1ac03d: ; 0x1ac03d
+UnknownScript_0x1ac03d:
askforphonenumber $13
if_equal $1, UnknownScript_0x1ac0df
if_equal $2, UnknownScript_0x1ac0db
@@ -58,9 +54,8 @@
trainertotext HIKER, ANTHONY2, $0
scall UnknownScript_0x1ac0d3
jump UnknownScript_0x1ac0d7
-; 0x1ac051
-UnknownScript_0x1ac051: ; 0x1ac051
+UnknownScript_0x1ac051:
scall UnknownScript_0x1ac0e3
winlosstext HikerAnthony2BeatenText, $0000
copybytetovar wd9fd
@@ -69,19 +64,19 @@
if_equal $2, UnknownScript_0x1ac07c
if_equal $1, UnknownScript_0x1ac082
if_equal $0, UnknownScript_0x1ac088
-UnknownScript_0x1ac070: ; 0x1ac070
+UnknownScript_0x1ac070:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1ac0bc
-UnknownScript_0x1ac076: ; 0x1ac076
+UnknownScript_0x1ac076:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x1ac0af
-UnknownScript_0x1ac07c: ; 0x1ac07c
+UnknownScript_0x1ac07c:
checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x1ac0a2
-UnknownScript_0x1ac082: ; 0x1ac082
+UnknownScript_0x1ac082:
checkflag $0047
iftrue UnknownScript_0x1ac095
-UnknownScript_0x1ac088: ; 0x1ac088
+UnknownScript_0x1ac088:
loadtrainer HIKER, ANTHONY2
startbattle
returnafterbattle
@@ -88,9 +83,8 @@
loadvar wd9fd, $1
clearflag $006f
end
-; 0x1ac095
-UnknownScript_0x1ac095: ; 0x1ac095
+UnknownScript_0x1ac095:
loadtrainer HIKER, ANTHONY1
startbattle
returnafterbattle
@@ -97,9 +91,8 @@
loadvar wd9fd, $2
clearflag $006f
end
-; 0x1ac0a2
-UnknownScript_0x1ac0a2: ; 0x1ac0a2
+UnknownScript_0x1ac0a2:
loadtrainer HIKER, ANTHONY3
startbattle
returnafterbattle
@@ -106,9 +99,8 @@
loadvar wd9fd, $3
clearflag $006f
end
-; 0x1ac0af
-UnknownScript_0x1ac0af: ; 0x1ac0af
+UnknownScript_0x1ac0af:
loadtrainer HIKER, ANTHONY4
startbattle
returnafterbattle
@@ -115,67 +107,55 @@
loadvar wd9fd, $4
clearflag $006f
end
-; 0x1ac0bc
-UnknownScript_0x1ac0bc: ; 0x1ac0bc
+UnknownScript_0x1ac0bc:
loadtrainer HIKER, ANTHONY5
startbattle
returnafterbattle
clearflag $006f
end
-; 0x1ac0c5
-UnknownScript_0x1ac0c5: ; 0x1ac0c5
+UnknownScript_0x1ac0c5:
writetext UnknownText_0x1ac180
closetext
loadmovesprites
end
-; 0x1ac0cb
-UnknownScript_0x1ac0cb: ; 0x1ac0cb
+UnknownScript_0x1ac0cb:
jumpstd asknumber1m
end
-; 0x1ac0cf
-UnknownScript_0x1ac0cf: ; 0x1ac0cf
+UnknownScript_0x1ac0cf:
jumpstd asknumber2m
end
-; 0x1ac0d3
-UnknownScript_0x1ac0d3: ; 0x1ac0d3
+UnknownScript_0x1ac0d3:
jumpstd registerednumberm
end
-; 0x1ac0d7
-UnknownScript_0x1ac0d7: ; 0x1ac0d7
+UnknownScript_0x1ac0d7:
jumpstd numberacceptedm
end
-; 0x1ac0db
-UnknownScript_0x1ac0db: ; 0x1ac0db
+UnknownScript_0x1ac0db:
jumpstd numberdeclinedm
end
-; 0x1ac0df
-UnknownScript_0x1ac0df: ; 0x1ac0df
+UnknownScript_0x1ac0df:
jumpstd phonefullm
end
-; 0x1ac0e3
-UnknownScript_0x1ac0e3: ; 0x1ac0e3
+UnknownScript_0x1ac0e3:
jumpstd rematchm
end
-; 0x1ac0e7
-MapRoute33Signpost0Script: ; 0x1ac0e7
+MapRoute33Signpost0Script:
jumptext UnknownText_0x1ac279
-; 0x1ac0ea
-FruitTreeScript_0x1ac0ea: ; 0x1ac0ea
+FruitTreeScript_0x1ac0ea:
fruittree $6
-; 0x1ac0ec
-HikerAnthony2SeenText: ; 0x1ac0ec
+HikerAnthony2SeenText:
text "I came through the"
line "tunnel, but I"
@@ -182,22 +162,19 @@
para "still have plenty"
line "of energy left."
done
-; 0x1ac130
-HikerAnthony2BeatenText: ; 0x1ac130
+HikerAnthony2BeatenText:
text "Whoa! You've got"
line "more zip than me!"
done
-; 0x1ac153
-UnknownText_0x1ac153: ; 0x1ac153
+UnknownText_0x1ac153:
text "We HIKERS are at"
line "our best in the"
cont "mountains."
done
-; 0x1ac180
-UnknownText_0x1ac180: ; 0x1ac180
+UnknownText_0x1ac180:
text "Hey, did you get a"
line "DUNSPARCE?"
@@ -207,9 +184,8 @@
line "in the light. It's"
cont "got a funny face!"
done
-; 0x1ac1e7
-UnknownText_0x1ac1e7: ; 0x1ac1e7
+UnknownText_0x1ac1e7:
text "Pant, pant…"
para "I finally got"
@@ -224,14 +200,12 @@
para "thing, so I came"
line "outside."
done
-; 0x1ac279
-UnknownText_0x1ac279: ; 0x1ac279
+UnknownText_0x1ac279:
text "ROUTE 33"
done
-; 0x1ac283
-Route33_MapEventHeader: ; 0x1ac283
+Route33_MapEventHeader:
; filler
db 0, 0
@@ -248,7 +222,6 @@
; people-events
db 3
- person_event SPRITE_POKEFAN_M, 17, 10, $a, $0, 255, 255, $b2, 2, TrainerHikerAnthony2, $ffff
+ person_event SPRITE_POKEFAN_M, 17, 10, $a, $0, 255, 255, $b2, 2, TrainerHikerAnthony, $ffff
person_event SPRITE_LASS, 20, 17, $2, $11, 255, 255, $90, 0, LassScript_0x1ac002, $ffff
person_event SPRITE_FRUIT_TREE, 20, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac0ea, $ffff
-; 0x1ac2ba
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -1,4 +1,4 @@
-Route34_MapScriptHeader: ; 0x78000
+Route34_MapScriptHeader:
; trigger count
db 0
@@ -8,47 +8,40 @@
; callbacks
dbw 2, UnknownScript_0x78005
-; 0x78005
-UnknownScript_0x78005: ; 0x78005
+UnknownScript_0x78005:
checkflag $0005
iftrue UnknownScript_0x78014
clearevent $06e5
setevent $06e6
jump UnknownScript_0x7801d
-; 0x78014
-UnknownScript_0x78014: ; 0x78014
+UnknownScript_0x78014:
setevent $06e5
clearevent $06e6
jump UnknownScript_0x7801d
-; 0x7801d
-UnknownScript_0x7801d: ; 0x7801d
+UnknownScript_0x7801d:
checkflag $0006
iffalse UnknownScript_0x78029
clearevent $06e7
jump UnknownScript_0x7802f
-; 0x78029
-UnknownScript_0x78029: ; 0x78029
+UnknownScript_0x78029:
setevent $06e7
jump UnknownScript_0x7802f
-; 0x7802f
-UnknownScript_0x7802f: ; 0x7802f
+UnknownScript_0x7802f:
checkflag $0007
iffalse UnknownScript_0x78039
clearevent $06e8
return
-; 0x78039
-UnknownScript_0x78039: ; 0x78039
+UnknownScript_0x78039:
setevent $06e8
return
-; 0x7803d
-GrampsScript_0x7803d: ; 0x7803d
+GrampsScript_0x7803d:
faceplayer
loadfont
special Function16936
@@ -61,34 +54,30 @@
applymovement $8, MovementData_0x78333
playsound SFX_ENTER_DOOR
disappear $8
-UnknownScript_0x7805a: ; 0x7805a
+UnknownScript_0x7805a:
end
-; 0x7805b
-UnknownScript_0x7805b: ; 0x7805b
+UnknownScript_0x7805b:
applymovement $8, MovementData_0x78337
playsound SFX_ENTER_DOOR
disappear $8
end
-; 0x78065
-DaycareMon1Script_0x78065: ; 0x78065
+DaycareMon1Script_0x78065:
loadfont
special Function17421
loadmovesprites
end
-; 0x7806b
-DaycareMon2Script_0x7806b: ; 0x7806b
+DaycareMon2Script_0x7806b:
loadfont
special Function17440
loadmovesprites
end
-; 0x78071
-TrainerCamperTodd1: ; 0x78071
+TrainerCamperTodd1:
; bit/flag number
- dw $41b
+ dw EVENT_BEAT_CAMPER_TODD
; trainer group && trainer id
db CAMPER, TODD1
@@ -104,9 +93,8 @@
; script when talk again
dw CamperTodd1Script
-; 0x7807d
-CamperTodd1Script: ; 0x7807d
+CamperTodd1Script:
writecode VAR_CALLERID, $14
talkaftercancel
loadfont
@@ -123,11 +111,10 @@
setevent $027d
scall UnknownScript_0x78137
jump UnknownScript_0x780a9
-; 0x780a6
-UnknownScript_0x780a6: ; 0x780a6
+UnknownScript_0x780a6:
scall UnknownScript_0x7813b
-UnknownScript_0x780a9: ; 0x780a9
+UnknownScript_0x780a9:
askforphonenumber $14
if_equal $1, UnknownScript_0x7814b
if_equal $2, UnknownScript_0x78147
@@ -134,9 +121,8 @@
trainertotext CAMPER, TODD1, $0
scall UnknownScript_0x7813f
jump UnknownScript_0x78143
-; 0x780bd
-UnknownScript_0x780bd: ; 0x780bd
+UnknownScript_0x780bd:
scall UnknownScript_0x7814f
winlosstext CamperTodd1BeatenText, $0000
copybytetovar wd9fe
@@ -145,19 +131,19 @@
if_equal $2, UnknownScript_0x780e8
if_equal $1, UnknownScript_0x780ee
if_equal $0, UnknownScript_0x780f4
-UnknownScript_0x780dc: ; 0x780dc
+UnknownScript_0x780dc:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x78128
-UnknownScript_0x780e2: ; 0x780e2
+UnknownScript_0x780e2:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x7811b
-UnknownScript_0x780e8: ; 0x780e8
+UnknownScript_0x780e8:
checkflag $004b
iftrue UnknownScript_0x7810e
-UnknownScript_0x780ee: ; 0x780ee
+UnknownScript_0x780ee:
checkflag $0045
iftrue UnknownScript_0x78101
-UnknownScript_0x780f4: ; 0x780f4
+UnknownScript_0x780f4:
loadtrainer CAMPER, TODD1
startbattle
returnafterbattle
@@ -164,9 +150,8 @@
loadvar wd9fe, $1
clearflag $0070
end
-; 0x78101
-UnknownScript_0x78101: ; 0x78101
+UnknownScript_0x78101:
loadtrainer CAMPER, TODD2
startbattle
returnafterbattle
@@ -173,9 +158,8 @@
loadvar wd9fe, $2
clearflag $0070
end
-; 0x7810e
-UnknownScript_0x7810e: ; 0x7810e
+UnknownScript_0x7810e:
loadtrainer CAMPER, TODD3
startbattle
returnafterbattle
@@ -182,9 +166,8 @@
loadvar wd9fe, $3
clearflag $0070
end
-; 0x7811b
-UnknownScript_0x7811b: ; 0x7811b
+UnknownScript_0x7811b:
loadtrainer CAMPER, TODD4
startbattle
returnafterbattle
@@ -191,61 +174,51 @@
loadvar wd9fe, $4
clearflag $0070
end
-; 0x78128
-UnknownScript_0x78128: ; 0x78128
+UnknownScript_0x78128:
loadtrainer CAMPER, TODD5
startbattle
returnafterbattle
clearflag $0070
end
-; 0x78131
-UnknownScript_0x78131: ; 0x78131
+UnknownScript_0x78131:
writetext UnknownText_0x78532
closetext
loadmovesprites
end
-; 0x78137
-UnknownScript_0x78137: ; 0x78137
+UnknownScript_0x78137:
jumpstd asknumber1m
end
-; 0x7813b
-UnknownScript_0x7813b: ; 0x7813b
+UnknownScript_0x7813b:
jumpstd asknumber2m
end
-; 0x7813f
-UnknownScript_0x7813f: ; 0x7813f
+UnknownScript_0x7813f:
jumpstd registerednumberm
end
-; 0x78143
-UnknownScript_0x78143: ; 0x78143
+UnknownScript_0x78143:
jumpstd numberacceptedm
end
-; 0x78147
-UnknownScript_0x78147: ; 0x78147
+UnknownScript_0x78147:
jumpstd numberdeclinedm
end
-; 0x7814b
-UnknownScript_0x7814b: ; 0x7814b
+UnknownScript_0x7814b:
jumpstd phonefullm
end
-; 0x7814f
-UnknownScript_0x7814f: ; 0x7814f
+UnknownScript_0x7814f:
jumpstd rematchm
end
-; 0x78153
-TrainerPicnickerGina1: ; 0x78153
+TrainerPicnickerGina1:
; bit/flag number
- dw $47f
+ dw EVENT_BEAT_PICNICKER_GINA
; trainer group && trainer id
db PICNICKER, GINA1
@@ -261,9 +234,8 @@
; script when talk again
dw PicnickerGina1Script
-; 0x7815f
-PicnickerGina1Script: ; 0x7815f
+PicnickerGina1Script:
writecode VAR_CALLERID, $15
talkaftercancel
loadfont
@@ -280,11 +252,10 @@
setevent $027f
scall UnknownScript_0x78228
jump UnknownScript_0x7818b
-; 0x78188
-UnknownScript_0x78188: ; 0x78188
+UnknownScript_0x78188:
scall UnknownScript_0x7822c
-UnknownScript_0x7818b: ; 0x7818b
+UnknownScript_0x7818b:
askforphonenumber $15
if_equal $1, UnknownScript_0x7823c
if_equal $2, UnknownScript_0x78238
@@ -291,9 +262,8 @@
trainertotext PICNICKER, GINA1, $0
scall UnknownScript_0x78230
jump UnknownScript_0x78234
-; 0x7819f
-UnknownScript_0x7819f: ; 0x7819f
+UnknownScript_0x7819f:
scall UnknownScript_0x78240
winlosstext PicnickerGina1BeatenText, $0000
copybytetovar wd9ff
@@ -302,19 +272,19 @@
if_equal $2, UnknownScript_0x781ca
if_equal $1, UnknownScript_0x781d0
if_equal $0, UnknownScript_0x781d6
-UnknownScript_0x781be: ; 0x781be
+UnknownScript_0x781be:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x7820a
-UnknownScript_0x781c4: ; 0x781c4
+UnknownScript_0x781c4:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x781fd
-UnknownScript_0x781ca: ; 0x781ca
+UnknownScript_0x781ca:
checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x781f0
-UnknownScript_0x781d0: ; 0x781d0
+UnknownScript_0x781d0:
checkflag $0049
iftrue UnknownScript_0x781e3
-UnknownScript_0x781d6: ; 0x781d6
+UnknownScript_0x781d6:
loadtrainer PICNICKER, GINA1
startbattle
returnafterbattle
@@ -321,9 +291,8 @@
loadvar wd9ff, $1
clearflag $0071
end
-; 0x781e3
-UnknownScript_0x781e3: ; 0x781e3
+UnknownScript_0x781e3:
loadtrainer PICNICKER, GINA2
startbattle
returnafterbattle
@@ -330,9 +299,8 @@
loadvar wd9ff, $2
clearflag $0071
end
-; 0x781f0
-UnknownScript_0x781f0: ; 0x781f0
+UnknownScript_0x781f0:
loadtrainer PICNICKER, GINA3
startbattle
returnafterbattle
@@ -339,9 +307,8 @@
loadvar wd9ff, $3
clearflag $0071
end
-; 0x781fd
-UnknownScript_0x781fd: ; 0x781fd
+UnknownScript_0x781fd:
loadtrainer PICNICKER, GINA4
startbattle
returnafterbattle
@@ -348,17 +315,15 @@
loadvar wd9ff, $4
clearflag $0071
end
-; 0x7820a
-UnknownScript_0x7820a: ; 0x7820a
+UnknownScript_0x7820a:
loadtrainer PICNICKER, GINA5
startbattle
returnafterbattle
clearflag $0071
end
-; 0x78213
-UnknownScript_0x78213: ; 0x78213
+UnknownScript_0x78213:
scall UnknownScript_0x78244
verbosegiveitem LEAF_STONE, 1
iffalse UnknownScript_0x78225
@@ -365,63 +330,52 @@
clearflag $0080
setevent $0100
jump UnknownScript_0x78234
-; 0x78225
-UnknownScript_0x78225: ; 0x78225
+UnknownScript_0x78225:
jump UnknownScript_0x78248
-; 0x78228
-UnknownScript_0x78228: ; 0x78228
+UnknownScript_0x78228:
jumpstd asknumber1f
end
-; 0x7822c
-UnknownScript_0x7822c: ; 0x7822c
+UnknownScript_0x7822c:
jumpstd asknumber2f
end
-; 0x78230
-UnknownScript_0x78230: ; 0x78230
+UnknownScript_0x78230:
jumpstd registerednumberf
end
-; 0x78234
-UnknownScript_0x78234: ; 0x78234
+UnknownScript_0x78234:
jumpstd numberacceptedf
end
-; 0x78238
-UnknownScript_0x78238: ; 0x78238
+UnknownScript_0x78238:
jumpstd numberdeclinedf
end
-; 0x7823c
-UnknownScript_0x7823c: ; 0x7823c
+UnknownScript_0x7823c:
jumpstd phonefullf
end
-; 0x78240
-UnknownScript_0x78240: ; 0x78240
+UnknownScript_0x78240:
jumpstd rematchf
end
-; 0x78244
-UnknownScript_0x78244: ; 0x78244
+UnknownScript_0x78244:
jumpstd giftf
end
-; 0x78248
-UnknownScript_0x78248: ; 0x78248
+UnknownScript_0x78248:
jumpstd packfullf
end
-; 0x7824c
-OfficerScript_0x7824c: ; 0x7824c
+OfficerScript_0x7824c:
faceplayer
loadfont
checknite
iffalse UnknownScript_0x78276
- checkevent $0546
+ checkevent EVENT_BEAT_OFFICER_KEITH
iftrue UnknownScript_0x78270
playmusic MUSIC_OFFICER_ENCOUNTER
writetext UnknownText_0x785e4
@@ -431,28 +385,25 @@
loadtrainer OFFICER, KEITH
startbattle
returnafterbattle
- setevent $0546
+ setevent EVENT_BEAT_OFFICER_KEITH
loadmovesprites
end
-; 0x78270
-UnknownScript_0x78270: ; 0x78270
+UnknownScript_0x78270:
writetext UnknownText_0x78624
closetext
loadmovesprites
end
-; 0x78276
-UnknownScript_0x78276: ; 0x78276
+UnknownScript_0x78276:
writetext UnknownText_0x7866a
closetext
loadmovesprites
end
-; 0x7827c
-TrainerYoungsterSamuel: ; 0x7827c
+TrainerYoungsterSamuel:
; bit/flag number
- dw $5ad
+ dw EVENT_BEAT_YOUNGSTER_SAMUEL
; trainer group && trainer id
db YOUNGSTER, SAMUEL
@@ -468,9 +419,8 @@
; script when talk again
dw YoungsterSamuelScript
-; 0x78288
-YoungsterSamuelScript: ; 0x78288
+YoungsterSamuelScript:
talkaftercancel
loadfont
writetext UnknownText_0x783d8
@@ -477,11 +427,10 @@
closetext
loadmovesprites
end
-; 0x78290
-TrainerYoungsterIan: ; 0x78290
+TrainerYoungsterIan:
; bit/flag number
- dw $5ae
+ dw EVENT_BEAT_YOUNGSTER_IAN
; trainer group && trainer id
db YOUNGSTER, IAN
@@ -497,9 +446,8 @@
; script when talk again
dw YoungsterIanScript
-; 0x7829c
-YoungsterIanScript: ; 0x7829c
+YoungsterIanScript:
talkaftercancel
loadfont
writetext UnknownText_0x78469
@@ -506,11 +454,10 @@
closetext
loadmovesprites
end
-; 0x782a4
-TrainerPokefanmBrandon: ; 0x782a4
+TrainerPokefanmBrandon:
; bit/flag number
- dw $4d3
+ dw EVENT_BEAT_POKEFANM_BRANDON
; trainer group && trainer id
db POKEFANM, BRANDON
@@ -526,9 +473,8 @@
; script when talk again
dw PokefanmBrandonScript
-; 0x782b0
-PokefanmBrandonScript: ; 0x782b0
+PokefanmBrandonScript:
talkaftercancel
loadfont
writetext UnknownText_0x786fc
@@ -535,11 +481,10 @@
closetext
loadmovesprites
end
-; 0x782b8
-TrainerCooltrainerfIrene: ; 0x782b8
+TrainerCooltrainerfIrene:
; bit/flag number
- dw $560
+ dw EVENT_BEAT_COOLTRAINERF_IRENE
; trainer group && trainer id
db COOLTRAINERF, IRENE
@@ -555,9 +500,8 @@
; script when talk again
dw CooltrainerfIreneScript
-; 0x782c4
-CooltrainerfIreneScript: ; 0x782c4
+CooltrainerfIreneScript:
talkaftercancel
loadfont
checkevent EVENT_GOT_SOFT_SAND_FROM_KATE
@@ -566,18 +510,16 @@
closetext
loadmovesprites
end
-; 0x782d2
-UnknownScript_0x782d2: ; 0x782d2
+UnknownScript_0x782d2:
writetext UnknownText_0x787ad
closetext
loadmovesprites
end
-; 0x782d8
-TrainerCooltrainerfJenn: ; 0x782d8
+TrainerCooltrainerfJenn:
; bit/flag number
- dw $56b
+ dw EVENT_BEAT_COOLTRAINERF_JENN
; trainer group && trainer id
db COOLTRAINERF, JENN
@@ -593,9 +535,8 @@
; script when talk again
dw CooltrainerfJennScript
-; 0x782e4
-CooltrainerfJennScript: ; 0x782e4
+CooltrainerfJennScript:
talkaftercancel
loadfont
checkevent EVENT_GOT_SOFT_SAND_FROM_KATE
@@ -604,18 +545,16 @@
closetext
loadmovesprites
end
-; 0x782f2
-UnknownScript_0x782f2: ; 0x782f2
+UnknownScript_0x782f2:
writetext UnknownText_0x78866
closetext
loadmovesprites
end
-; 0x782f8
-TrainerCooltrainerfKate: ; 0x782f8
+TrainerCooltrainerfKate:
; bit/flag number
- dw $55f
+ dw EVENT_BEAT_COOLTRAINERF_KATE
; trainer group && trainer id
db COOLTRAINERF, KATE
@@ -631,9 +570,8 @@
; script when talk again
dw CooltrainerfKateScript
-; 0x78304
-CooltrainerfKateScript: ; 0x78304
+CooltrainerfKateScript:
talkaftercancel
loadfont
checkevent EVENT_GOT_SOFT_SAND_FROM_KATE
@@ -643,54 +581,45 @@
verbosegiveitem SOFT_SAND, 1
iffalse UnknownScript_0x7831d
setevent EVENT_GOT_SOFT_SAND_FROM_KATE
-UnknownScript_0x78319: ; 0x78319
+UnknownScript_0x78319:
writetext UnknownText_0x7892b
closetext
-UnknownScript_0x7831d: ; 0x7831d
+UnknownScript_0x7831d:
loadmovesprites
end
-; 0x7831f
-UnknownScript_0x7831f: ; 0x7831f
+UnknownScript_0x7831f:
jumptext UnknownText_0x7898a
-; 0x78322
-MapRoute34Signpost0Script: ; 0x78322
+MapRoute34Signpost0Script:
jumptext UnknownText_0x789a8
-; 0x78325
-MapRoute34Signpost1Script: ; 0x78325
+MapRoute34Signpost1Script:
jumptext UnknownText_0x789ed
-; 0x78328
-MapRoute34Signpost2Script: ; 0x78328
+MapRoute34Signpost2Script:
jumptext UnknownText_0x78a52
-; 0x7832b
-ItemFragment_0x7832b: ; 0x7832b
+ItemFragment_0x7832b:
db NUGGET, 1
-; 0x7832d
-MapRoute34SignpostItem3: ; 0x7832d
+MapRoute34SignpostItem3:
dw $00a7
db RARE_CANDY
-; 0x78330
-MapRoute34SignpostItem4: ; 0x78330
+MapRoute34SignpostItem4:
dw $00a8
db SUPER_POTION
-; 0x78333
-MovementData_0x78333: ; 0x78333
+MovementData_0x78333:
slow_step_left
slow_step_left
slow_step_up
step_end
-; 0x78337
-MovementData_0x78337: ; 0x78337
+MovementData_0x78337:
slow_step_down
slow_step_left
slow_step_left
@@ -697,21 +626,18 @@
slow_step_up
slow_step_up
step_end
-; 0x7833d
-YoungsterSamuelSeenText: ; 0x7833d
+YoungsterSamuelSeenText:
text "This is where I do"
line "my training!"
done
-; 0x7835e
-YoungsterSamuelBeatenText: ; 0x7835e
+YoungsterSamuelBeatenText:
text "Beaten by a"
line "passing stranger!"
done
-; 0x7837d
-UnknownText_0x7837d: ; 0x7837d
+UnknownText_0x7837d:
text "Have you been to"
line "GOLDENROD CITY?"
@@ -721,9 +647,8 @@
para "changed the"
line "#MON CENTER?"
done
-; 0x783d8
-UnknownText_0x783d8: ; 0x783d8
+UnknownText_0x783d8:
text "I'm going to train"
line "even harder."
@@ -731,28 +656,24 @@
line "trying to become"
cont "a GYM LEADER."
done
-; 0x78425
-YoungsterIanSeenText: ; 0x78425
+YoungsterIanSeenText:
text "I'm the best in my"
line "class at #MON."
done
-; 0x78447
-YoungsterIanBeatenText: ; 0x78447
+YoungsterIanBeatenText:
text "No! There are bet-"
line "ter trainers…"
done
-; 0x78469
-UnknownText_0x78469: ; 0x78469
+UnknownText_0x78469:
text "I'm trying hard so"
line "I can be the star"
cont "in my class."
done
-; 0x7849b
-CamperTodd1SeenText: ; 0x7849b
+CamperTodd1SeenText:
text "I'm confident in"
line "my ability to"
cont "raise #MON."
@@ -759,15 +680,13 @@
para "Want to see?"
done
-; 0x784d3
-CamperTodd1BeatenText: ; 0x784d3
+CamperTodd1BeatenText:
text "Did I screw up my"
line "training?"
done
-; 0x784f0
-UnknownText_0x784f0: ; 0x784f0
+UnknownText_0x784f0:
text "Maybe I should"
line "take one to a DAY-"
@@ -774,9 +693,8 @@
para "CARE. Or maybe use"
line "some items…"
done
-; 0x78532
-UnknownText_0x78532: ; 0x78532
+UnknownText_0x78532:
text "Shopping under the"
line "sky!"
@@ -783,43 +701,37 @@
para "It feels so nice"
line "up on a rooftop."
done
-; 0x7856d
-PicnickerGina1SeenText: ; 0x7856d
+PicnickerGina1SeenText:
text "Are you a trainer?"
para "Let's have a"
line "practice battle."
done
-; 0x7859e
-PicnickerGina1BeatenText: ; 0x7859e
+PicnickerGina1BeatenText:
text "Oh, no! I just"
line "can't win…"
done
-; 0x785b8
-UnknownText_0x785b8: ; 0x785b8
+UnknownText_0x785b8:
text "You're too strong"
line "to be a practice"
cont "partner."
done
-; 0x785e4
-UnknownText_0x785e4: ; 0x785e4
+UnknownText_0x785e4:
text "Who goes there?"
line "What are you up"
cont "to?"
done
-; 0x78609
-UnknownText_0x78609: ; 0x78609
+UnknownText_0x78609:
text "You're a tough"
line "little kid."
done
-; 0x78624
-UnknownText_0x78624: ; 0x78624
+UnknownText_0x78624:
text "Yep, I see nothing"
line "wrong today. You"
@@ -826,16 +738,14 @@
para "be good and stay"
line "out of trouble."
done
-; 0x7866a
-UnknownText_0x7866a: ; 0x7866a
+UnknownText_0x7866a:
text "I'm on patrol for"
line "suspicious indi-"
cont "viduals."
done
-; 0x78696
-PokefanmBrandonSeenText: ; 0x78696
+PokefanmBrandonSeenText:
text "I just got my"
line "#MON back from"
cont "DAY-CARE."
@@ -843,15 +753,13 @@
para "Let's see how much"
line "stronger it got!"
done
-; 0x786e1
-PokefanmBrandonBeatenText: ; 0x786e1
+PokefanmBrandonBeatenText:
text "Why does it end"
line "this way?"
done
-; 0x786fc
-UnknownText_0x786fc: ; 0x786fc
+UnknownText_0x786fc:
text "My #MON knew"
line "moves I didn't"
cont "know it had."
@@ -859,28 +767,24 @@
para "That confounded me"
line "to no end!"
done
-; 0x78743
-CooltrainerfIreneSeenText: ; 0x78743
+CooltrainerfIreneSeenText:
text "IRENE: Kyaaah!"
line "Someone found us!"
done
-; 0x78765
-CooltrainerfIreneBeatenText: ; 0x78765
+CooltrainerfIreneBeatenText:
text "IRENE: Ohhh!"
line "Too strong!"
done
-; 0x7877f
-UnknownText_0x7877f: ; 0x7877f
+UnknownText_0x7877f:
text "IRENE: My sister"
line "KATE will get you"
cont "for this!"
done
-; 0x787ad
-UnknownText_0x787ad: ; 0x787ad
+UnknownText_0x787ad:
text "IRENE: Isn't this"
line "beach great?"
@@ -887,49 +791,42 @@
para "It's our secret"
line "little getaway!"
done
-; 0x787eb
-CooltrainerfJennSeenText: ; 0x787eb
+CooltrainerfJennSeenText:
text "JENN: You can't"
line "beat IRENE and go"
cont "unpunished!"
done
-; 0x78819
-CooltrainerfJennBeatenText: ; 0x78819
+CooltrainerfJennBeatenText:
text "JENN: So sorry,"
line "IRENE! Sis!"
done
-; 0x78836
-UnknownText_0x78836: ; 0x78836
+UnknownText_0x78836:
text "JENN: Don't get"
line "cocky! My sister"
cont "KATE is tough!"
done
-; 0x78866
-UnknownText_0x78866: ; 0x78866
+UnknownText_0x78866:
text "JENN: Sunlight"
line "makes your body"
cont "stronger."
done
-; 0x78890
-CooltrainerfKateSeenText: ; 0x78890
+CooltrainerfKateSeenText:
text "KATE: You sure"
line "were mean to my"
cont "little sisters!"
done
-; 0x788c0
-CooltrainerfKateBeatenText: ; 0x788c0
+CooltrainerfKateBeatenText:
text "KATE: No! I can't"
line "believe I lost."
done
-; 0x788e2
-UnknownText_0x788e2: ; 0x788e2
+UnknownText_0x788e2:
text "KATE: You're too"
line "strong. I didn't"
cont "stand a chance."
@@ -937,9 +834,8 @@
para "Here. You deserve"
line "this."
done
-; 0x7892b
-UnknownText_0x7892b: ; 0x7892b
+UnknownText_0x7892b:
text "KATE: I'm sorry we"
line "jumped you."
@@ -949,15 +845,13 @@
para "here. You sure"
line "startled us."
done
-; 0x7898a
-UnknownText_0x7898a: ; 0x7898a
+UnknownText_0x7898a:
text "ILEX FOREST"
line "THROUGH THE GATE"
done
-; 0x789a8
-UnknownText_0x789a8: ; 0x789a8
+UnknownText_0x789a8:
text "ROUTE 34"
para "GOLDENROD CITY -"
@@ -966,9 +860,8 @@
para "ILEX FOREST"
line "SOMEWHERE BETWEEN"
done
-; 0x789ed
-UnknownText_0x789ed: ; 0x789ed
+UnknownText_0x789ed:
text "TRAINER TIPS"
para "BERRY trees grow"
@@ -979,17 +872,15 @@
line "which trees bear"
cont "which BERRIES."
done
-; 0x78a52
-UnknownText_0x78a52: ; 0x78a52
+UnknownText_0x78a52:
text "DAY-CARE"
para "LET US RAISE YOUR"
line "#MON FOR YOU!"
done
-; 0x78a7c
-Route34_MapEventHeader: ; 0x78a7c
+Route34_MapEventHeader:
; filler
db 0, 0
@@ -1027,4 +918,3 @@
person_event SPRITE_COOLTRAINER_F, 52, 7, $9, $0, 255, 255, $82, 3, TrainerCooltrainerfJenn, $ffff
person_event SPRITE_COOLTRAINER_F, 55, 10, $7, $0, 255, 255, $82, 2, TrainerCooltrainerfKate, $ffff
person_event SPRITE_POKE_BALL, 34, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x7832b, $07bc
-; 0x78b5d
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -1,14 +1,13 @@
-Route35_MapScriptHeader: ; 0x19c8ad
+Route35_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x19c8af
-TrainerBird_keeperBryan: ; 0x19c8af
+TrainerBird_keeperBryan:
; bit/flag number
- dw $3fd
+ dw EVENT_BEAT_BIRD_KEEPER_BRYAN
; trainer group && trainer id
db BIRD_KEEPER, BRYAN
@@ -24,9 +23,8 @@
; script when talk again
dw Bird_keeperBryanScript
-; 0x19c8bb
-Bird_keeperBryanScript: ; 0x19c8bb
+Bird_keeperBryanScript:
talkaftercancel
loadfont
writetext UnknownText_0x19cc87
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x19c8c3
-TrainerJugglerIrwin1: ; 0x19c8c3
+TrainerJugglerIrwin:
; bit/flag number
- dw $495
+ dw EVENT_BEAT_JUGGLER_IRWIN
; trainer group && trainer id
db JUGGLER, IRWIN1
@@ -53,9 +50,8 @@
; script when talk again
dw JugglerIrwin1Script
-; 0x19c8cf
-JugglerIrwin1Script: ; 0x19c8cf
+JugglerIrwin1Script:
writecode VAR_CALLERID, $16
talkaftercancel
loadfont
@@ -68,11 +64,10 @@
setevent $0281
scall UnknownScript_0x19c903
jump UnknownScript_0x19c8ef
-; 0x19c8ec
-UnknownScript_0x19c8ec: ; 0x19c8ec
+UnknownScript_0x19c8ec:
scall UnknownScript_0x19c907
-UnknownScript_0x19c8ef: ; 0x19c8ef
+UnknownScript_0x19c8ef:
askforphonenumber $16
if_equal $1, UnknownScript_0x19c917
if_equal $2, UnknownScript_0x19c913
@@ -79,46 +74,38 @@
trainertotext JUGGLER, IRWIN1, $0
scall UnknownScript_0x19c90b
jump UnknownScript_0x19c90f
-; 0x19c903
-UnknownScript_0x19c903: ; 0x19c903
+UnknownScript_0x19c903:
jumpstd asknumber1m
end
-; 0x19c907
-UnknownScript_0x19c907: ; 0x19c907
+UnknownScript_0x19c907:
jumpstd asknumber2m
end
-; 0x19c90b
-UnknownScript_0x19c90b: ; 0x19c90b
+UnknownScript_0x19c90b:
jumpstd registerednumberm
end
-; 0x19c90f
-UnknownScript_0x19c90f: ; 0x19c90f
+UnknownScript_0x19c90f:
jumpstd numberacceptedm
end
-; 0x19c913
-UnknownScript_0x19c913: ; 0x19c913
+UnknownScript_0x19c913:
jumpstd numberdeclinedm
end
-; 0x19c917
-UnknownScript_0x19c917: ; 0x19c917
+UnknownScript_0x19c917:
jumpstd phonefullm
end
-; 0x19c91b
-UnknownScript_0x19c91b: ; 0x19c91b
+UnknownScript_0x19c91b:
jumpstd rematchm
end
-; 0x19c91f
-TrainerCamperIvan: ; 0x19c91f
+TrainerCamperIvan:
; bit/flag number
- dw $41c
+ dw EVENT_BEAT_CAMPER_IVAN
; trainer group && trainer id
db CAMPER, IVAN
@@ -134,9 +121,8 @@
; script when talk again
dw CamperIvanScript
-; 0x19c92b
-CamperIvanScript: ; 0x19c92b
+CamperIvanScript:
talkaftercancel
loadfont
writetext UnknownText_0x19cac4
@@ -143,11 +129,10 @@
closetext
loadmovesprites
end
-; 0x19c933
-TrainerCamperElliot: ; 0x19c933
+TrainerCamperElliot:
; bit/flag number
- dw $41d
+ dw EVENT_BEAT_CAMPER_ELLIOT
; trainer group && trainer id
db CAMPER, ELLIOT
@@ -163,9 +148,8 @@
; script when talk again
dw CamperElliotScript
-; 0x19c93f
-CamperElliotScript: ; 0x19c93f
+CamperElliotScript:
talkaftercancel
loadfont
writetext UnknownText_0x19cb47
@@ -172,11 +156,10 @@
closetext
loadmovesprites
end
-; 0x19c947
-TrainerPicnickerBrooke: ; 0x19c947
+TrainerPicnickerBrooke:
; bit/flag number
- dw $480
+ dw EVENT_BEAT_PICNICKER_BROOKE
; trainer group && trainer id
db PICNICKER, BROOKE
@@ -192,9 +175,8 @@
; script when talk again
dw PicnickerBrookeScript
-; 0x19c953
-PicnickerBrookeScript: ; 0x19c953
+PicnickerBrookeScript:
talkaftercancel
loadfont
writetext UnknownText_0x19cbba
@@ -201,11 +183,10 @@
closetext
loadmovesprites
end
-; 0x19c95b
-TrainerPicnickerKim: ; 0x19c95b
+TrainerPicnickerKim:
; bit/flag number
- dw $481
+ dw EVENT_BEAT_PICNICKER_KIM
; trainer group && trainer id
db PICNICKER, KIM
@@ -221,9 +202,8 @@
; script when talk again
dw PicnickerKimScript
-; 0x19c967
-PicnickerKimScript: ; 0x19c967
+PicnickerKimScript:
talkaftercancel
loadfont
writetext UnknownText_0x19cc21
@@ -230,11 +210,10 @@
closetext
loadmovesprites
end
-; 0x19c96f
-TrainerBug_catcherArnie1: ; 0x19c96f
+TrainerBug_catcherArnie1:
; bit/flag number
- dw $53f
+ dw EVENT_BEAT_BUG_CATCHER_ARNIE
; trainer group && trainer id
db BUG_CATCHER, ARNIE1
@@ -250,9 +229,8 @@
; script when talk again
dw Bug_catcherArnie1Script
-; 0x19c97b
-Bug_catcherArnie1Script: ; 0x19c97b
+Bug_catcherArnie1Script:
writecode VAR_CALLERID, $17
talkaftercancel
loadfont
@@ -269,11 +247,10 @@
setevent $0283
scall UnknownScript_0x19c903
jump UnknownScript_0x19c9a7
-; 0x19c9a4
-UnknownScript_0x19c9a4: ; 0x19c9a4
+UnknownScript_0x19c9a4:
scall UnknownScript_0x19c907
-UnknownScript_0x19c9a7: ; 0x19c9a7
+UnknownScript_0x19c9a7:
askforphonenumber $17
if_equal $1, UnknownScript_0x19c917
if_equal $2, UnknownScript_0x19c913
@@ -280,9 +257,8 @@
trainertotext BUG_CATCHER, ARNIE1, $0
scall UnknownScript_0x19c90b
jump UnknownScript_0x19c90f
-; 0x19c9bb
-UnknownScript_0x19c9bb: ; 0x19c9bb
+UnknownScript_0x19c9bb:
scall UnknownScript_0x19c91b
winlosstext Bug_catcherArnie1BeatenText, $0000
copybytetovar wda01
@@ -291,19 +267,19 @@
if_equal $2, UnknownScript_0x19c9e6
if_equal $1, UnknownScript_0x19c9ec
if_equal $0, UnknownScript_0x19c9f2
-UnknownScript_0x19c9da: ; 0x19c9da
+UnknownScript_0x19c9da:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x19ca26
-UnknownScript_0x19c9e0: ; 0x19c9e0
+UnknownScript_0x19c9e0:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x19ca19
-UnknownScript_0x19c9e6: ; 0x19c9e6
+UnknownScript_0x19c9e6:
checkflag $004b
iftrue UnknownScript_0x19ca0c
-UnknownScript_0x19c9ec: ; 0x19c9ec
+UnknownScript_0x19c9ec:
checkflag $004a
iftrue UnknownScript_0x19c9ff
-UnknownScript_0x19c9f2: ; 0x19c9f2
+UnknownScript_0x19c9f2:
loadtrainer BUG_CATCHER, ARNIE1
startbattle
returnafterbattle
@@ -310,9 +286,8 @@
loadvar wda01, $1
clearflag $0072
end
-; 0x19c9ff
-UnknownScript_0x19c9ff: ; 0x19c9ff
+UnknownScript_0x19c9ff:
loadtrainer BUG_CATCHER, ARNIE2
startbattle
returnafterbattle
@@ -319,9 +294,8 @@
loadvar wda01, $2
clearflag $0072
end
-; 0x19ca0c
-UnknownScript_0x19ca0c: ; 0x19ca0c
+UnknownScript_0x19ca0c:
loadtrainer BUG_CATCHER, ARNIE3
startbattle
returnafterbattle
@@ -328,9 +302,8 @@
loadvar wda01, $3
clearflag $0072
end
-; 0x19ca19
-UnknownScript_0x19ca19: ; 0x19ca19
+UnknownScript_0x19ca19:
loadtrainer BUG_CATCHER, ARNIE4
startbattle
returnafterbattle
@@ -337,26 +310,23 @@
loadvar wda01, $4
clearflag $0072
end
-; 0x19ca26
-UnknownScript_0x19ca26: ; 0x19ca26
+UnknownScript_0x19ca26:
loadtrainer BUG_CATCHER, ARNIE5
startbattle
returnafterbattle
clearflag $0072
end
-; 0x19ca2f
-UnknownScript_0x19ca2f: ; 0x19ca2f
+UnknownScript_0x19ca2f:
writetext UnknownText_0x19ce38
closetext
loadmovesprites
end
-; 0x19ca35
-TrainerFirebreatherWalt: ; 0x19ca35
+TrainerFirebreatherWalt:
; bit/flag number
- dw $44b
+ dw EVENT_BEAT_FIREBREATHER_WALT
; trainer group && trainer id
db FIREBREATHER, WALT
@@ -372,9 +342,8 @@
; script when talk again
dw FirebreatherWaltScript
-; 0x19ca41
-FirebreatherWaltScript: ; 0x19ca41
+FirebreatherWaltScript:
talkaftercancel
loadfont
writetext UnknownText_0x19cebc
@@ -381,14 +350,13 @@
closetext
loadmovesprites
end
-; 0x19ca49
-OfficerScript_0x19ca49: ; 0x19ca49
+OfficerScript_0x19ca49:
faceplayer
loadfont
checknite
iffalse UnknownScript_0x19ca73
- checkevent $0547
+ checkevent EVENT_BEAT_OFFICER_DIRK
iftrue UnknownScript_0x19ca6d
playmusic MUSIC_OFFICER_ENCOUNTER
writetext UnknownText_0x19ceea
@@ -398,38 +366,32 @@
loadtrainer OFFICER, DIRK
startbattle
returnafterbattle
- setevent $0547
+ setevent EVENT_BEAT_OFFICER_DIRK
loadmovesprites
end
-; 0x19ca6d
-UnknownScript_0x19ca6d: ; 0x19ca6d
+UnknownScript_0x19ca6d:
writetext UnknownText_0x19cf0f
closetext
loadmovesprites
end
-; 0x19ca73
-UnknownScript_0x19ca73: ; 0x19ca73
+UnknownScript_0x19ca73:
writetext UnknownText_0x19cf56
closetext
loadmovesprites
end
-; 0x19ca79
-MapRoute35Signpost1Script: ; 0x19ca79
+MapRoute35Signpost1Script:
jumptext UnknownText_0x19cf94
-; 0x19ca7c
-ItemFragment_0x19ca7c: ; 0x19ca7c
+ItemFragment_0x19ca7c:
db TM_ROLLOUT, 1
-; 0x19ca7e
-FruitTreeScript_0x19ca7e: ; 0x19ca7e
+FruitTreeScript_0x19ca7e:
fruittree $b
-; 0x19ca80
-CamperIvanSeenText: ; 0x19ca80
+CamperIvanSeenText:
text "I've been getting"
line "#MON data off"
@@ -436,92 +398,78 @@
para "my radio. I think"
line "I'm good."
done
-; 0x19cabb
-CamperIvanBeatenText: ; 0x19cabb
+CamperIvanBeatenText:
text "I give!"
done
-; 0x19cac4
-UnknownText_0x19cac4: ; 0x19cac4
+UnknownText_0x19cac4:
text "Music on the radio"
line "changes the moods"
cont "of wild #MON."
done
-; 0x19caf8
-CamperElliotSeenText: ; 0x19caf8
+CamperElliotSeenText:
text "I'm gonna show my"
line "girlfriend I'm hot"
cont "stuff!"
done
-; 0x19cb23
-CamperElliotBeatenText: ; 0x19cb23
+CamperElliotBeatenText:
text "I wish you would"
line "have lost for me…"
done
-; 0x19cb47
-UnknownText_0x19cb47: ; 0x19cb47
+UnknownText_0x19cb47:
text "I was humiliated"
line "in front of my"
cont "girlfriend…"
done
-; 0x19cb74
-PicnickerBrookeSeenText: ; 0x19cb74
+PicnickerBrookeSeenText:
text "My boyfriend's"
line "weak, so I can't"
cont "rely on him."
done
-; 0x19cba0
-PicnickerBrookeBeatenText: ; 0x19cba0
+PicnickerBrookeBeatenText:
text "Oh, my! You're so"
line "strong!"
done
-; 0x19cbba
-UnknownText_0x19cbba: ; 0x19cbba
+UnknownText_0x19cbba:
text "I can count on my"
line "#MON more than"
cont "my boyfriend."
done
-; 0x19cbea
-PicnickerKimSeenText: ; 0x19cbea
+PicnickerKimSeenText:
text "Are you going to"
line "the GYM? Me too!"
done
-; 0x19cc0d
-PicnickerKimBeatenText: ; 0x19cc0d
+PicnickerKimBeatenText:
text "Oh. I couldn't"
line "win…"
done
-; 0x19cc21
-UnknownText_0x19cc21: ; 0x19cc21
+UnknownText_0x19cc21:
text "The GYM BADGES are"
line "pretty. I collect"
cont "them."
done
-; 0x19cc4d
-Bird_keeperBryanSeenText: ; 0x19cc4d
+Bird_keeperBryanSeenText:
text "What kinds of"
line "BALLS do you use?"
done
-; 0x19cc6e
-Bird_keeperBryanBeatenText: ; 0x19cc6e
+Bird_keeperBryanBeatenText:
text "Yikes! Not fast"
line "enough!"
done
-; 0x19cc87
-UnknownText_0x19cc87: ; 0x19cc87
+UnknownText_0x19cc87:
text "Some #MON flee"
line "right away."
@@ -536,21 +484,18 @@
para "He turns it into a"
line "custom BALL."
done
-; 0x19cd1e
-JugglerIrwin1SeenText: ; 0x19cd1e
+JugglerIrwin1SeenText:
text "Behold my graceful"
line "BALL dexterity!"
done
-; 0x19cd42
-JugglerIrwin1BeatenText: ; 0x19cd42
+JugglerIrwin1BeatenText:
text "Whew! That was a"
line "jolt!"
done
-; 0x19cd5a
-UnknownText_0x19cd5a: ; 0x19cd5a
+UnknownText_0x19cd5a:
text "I was going to"
line "dazzle you with my"
cont "prize #MON."
@@ -558,22 +503,19 @@
para "But your prowess"
line "electrified me!"
done
-; 0x19cdaa
-Bug_catcherArnie1SeenText: ; 0x19cdaa
+Bug_catcherArnie1SeenText:
text "I'll go anywhere"
line "if bug #MON"
cont "appear there."
done
-; 0x19cdd5
-Bug_catcherArnie1BeatenText: ; 0x19cdd5
+Bug_catcherArnie1BeatenText:
text "Huh? I shouldn't"
line "have lost that…"
done
-; 0x19cdf6
-UnknownText_0x19cdf6: ; 0x19cdf6
+UnknownText_0x19cdf6:
text "My VENONAT won me"
line "the Bug-Catching"
@@ -580,9 +522,8 @@
para "Contest at the"
line "NATIONAL PARK."
done
-; 0x19ce38
-UnknownText_0x19ce38: ; 0x19ce38
+UnknownText_0x19ce38:
text "Wow… Look at all"
line "those YANMA!"
@@ -589,39 +530,33 @@
para "I'm so blown away,"
line "I can't move."
done
-; 0x19ce76
-FirebreatherWaltSeenText: ; 0x19ce76
+FirebreatherWaltSeenText:
text "I'm practicing my"
line "fire breathing."
done
-; 0x19ce98
-FirebreatherWaltBeatenText: ; 0x19ce98
+FirebreatherWaltBeatenText:
text "Ow! I scorched the"
line "tip of my nose!"
done
-; 0x19cebc
-UnknownText_0x19cebc: ; 0x19cebc
+UnknownText_0x19cebc:
text "The #MON March"
line "on the radio lures"
cont "wild #MON."
done
-; 0x19ceea
-UnknownText_0x19ceea: ; 0x19ceea
+UnknownText_0x19ceea:
text "Danger lurks in"
line "the night!"
done
-; 0x19cf06
-UnknownText_0x19cf06: ; 0x19cf06
+UnknownText_0x19cf06:
text "Whoops!"
done
-; 0x19cf0f
-UnknownText_0x19cf0f: ; 0x19cf0f
+UnknownText_0x19cf0f:
text "You know, night-"
line "time is fun in its"
cont "own ways."
@@ -629,9 +564,8 @@
para "But don't overdo"
line "it, OK?"
done
-; 0x19cf56
-UnknownText_0x19cf56: ; 0x19cf56
+UnknownText_0x19cf56:
text "Your #MON look"
line "pretty tough."
@@ -638,14 +572,12 @@
para "You could go any-"
line "where safely."
done
-; 0x19cf94
-UnknownText_0x19cf94: ; 0x19cf94
+UnknownText_0x19cf94:
text "ROUTE 35"
done
-; 0x19cf9e
-Route35_MapEventHeader: ; 0x19cf9e
+Route35_MapEventHeader:
; filler
db 0, 0
@@ -672,8 +604,7 @@
person_event SPRITE_YOUNGSTER, 32, 18, $6, $0, 255, 255, $92, 0, TrainerBird_keeperBryan, $ffff
person_event SPRITE_FISHER, 14, 6, $1e, $0, 255, 255, $82, 2, TrainerFirebreatherWalt, $ffff
person_event SPRITE_BUG_CATCHER, 11, 20, $6, $2, 255, 255, $b2, 3, TrainerBug_catcherArnie1, $ffff
- person_event SPRITE_SUPER_NERD, 14, 9, $a, $0, 255, 255, $92, 2, TrainerJugglerIrwin1, $ffff
+ person_event SPRITE_SUPER_NERD, 14, 9, $a, $0, 255, 255, $92, 2, TrainerJugglerIrwin, $ffff
person_event SPRITE_OFFICER, 10, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x19ca49, $ffff
person_event SPRITE_FRUIT_TREE, 29, 6, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19ca7e, $ffff
person_event SPRITE_POKE_BALL, 20, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x19ca7c, $06b2
-; 0x19d04c
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -1,4 +1,4 @@
-Route36_MapScriptHeader: ; 0x194000
+Route36_MapScriptHeader:
; trigger count
db 2
@@ -13,13 +13,11 @@
dbw 2, ArthurCallback
-UnknownScript_0x19400d: ; 0x19400d
+UnknownScript_0x19400d:
end
-; 0x19400e
-UnknownScript_0x19400e: ; 0x19400e
+UnknownScript_0x19400e:
end
-; 0x19400f
ArthurCallback:
checkcode VAR_WEEKDAY
@@ -31,7 +29,7 @@
appear $8
return
-UnknownScript_0x19401b: ; 0x19401b
+UnknownScript_0x19401b:
showemote $0, $0, 15
pause 15
playsound SFX_WARP_FROM
@@ -44,9 +42,8 @@
clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
domaptrigger GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY, $1
end
-; 0x19403c
-WeirdTreeScript_0x19403c: ; 0x19403c
+WeirdTreeScript_0x19403c:
checkitem SQUIRTBOTTLE
iftrue UnknownScript_0x19404a
waitbutton
@@ -53,9 +50,8 @@
playsound SFX_SANDSTORM
applymovement $4, MovementData_0x194249
end
-; 0x19404a
-UnknownScript_0x19404a: ; 0x19404a
+UnknownScript_0x19404a:
loadfont
writetext UnknownText_0x19426b
yesorno
@@ -62,9 +58,8 @@
iffalse UnknownScript_0x194079
loadmovesprites
; fallthrough
-; 0x194053
-WateredWeirdTreeScript:: ; 0x194053
+WateredWeirdTreeScript::
loadfont
writetext UnknownText_0x194290
closetext
@@ -84,14 +79,12 @@
variablesprite $4, $26
returnafterbattle
end
-; 0x194079
-UnknownScript_0x194079: ; 0x194079
+UnknownScript_0x194079:
loadmovesprites
end
-; 0x19407b
-UnknownScript_0x19407b: ; 0x19407b
+UnknownScript_0x19407b:
returnafterbattle
applymovement $4, MovementData_0x19424b
disappear $4
@@ -99,9 +92,8 @@
special Function14209
special Function14168
end
-; 0x19408c
-LassScript_0x19408c: ; 0x19408c
+LassScript_0x19408c:
faceplayer
loadfont
checkevent $00ba
@@ -116,22 +108,19 @@
applymovement $9, MovementData_0x19424e
disappear $9
end
-; 0x1940ac
-UnknownScript_0x1940ac: ; 0x1940ac
+UnknownScript_0x1940ac:
applymovement $9, MovementData_0x194258
disappear $9
end
-; 0x1940b3
-UnknownScript_0x1940b3: ; 0x1940b3
+UnknownScript_0x1940b3:
writetext UnknownText_0x1943ed
closetext
loadmovesprites
end
-; 0x1940b9
-FisherScript_0x1940b9: ; 0x1940b9
+FisherScript_0x1940b9:
faceplayer
loadfont
checkevent EVENT_GOT_TM08_ROCK_SMASH
@@ -142,23 +131,21 @@
closetext
loadmovesprites
end
-; 0x1940cd
-UnknownScript_0x1940cd: ; 0x1940cd
+UnknownScript_0x1940cd:
writetext UnknownText_0x1944d0
keeptextopen
verbosegiveitem TM_ROCK_SMASH, 1
iffalse UnknownScript_0x1940de
setevent EVENT_GOT_TM08_ROCK_SMASH
-UnknownScript_0x1940da: ; 0x1940da
+UnknownScript_0x1940da:
writetext UnknownText_0x19452c
closetext
-UnknownScript_0x1940de: ; 0x1940de
+UnknownScript_0x1940de:
loadmovesprites
end
-; 0x1940e0
-LassScript_0x1940e0: ; 0x1940e0
+LassScript_0x1940e0:
faceplayer
loadfont
checkevent EVENT_FOUGHT_SUDOWOODO
@@ -167,18 +154,16 @@
closetext
loadmovesprites
end
-; 0x1940ee
-UnknownScript_0x1940ee: ; 0x1940ee
+UnknownScript_0x1940ee:
writetext UnknownText_0x19469e
closetext
loadmovesprites
end
-; 0x1940f4
-TrainerSchoolboyAlan1: ; 0x1940f4
+TrainerSchoolboyAlan1:
; bit/flag number
- dw $46e
+ dw EVENT_BEAT_SCHOOLBOY_ALAN
; trainer group && trainer id
db SCHOOLBOY, ALAN1
@@ -194,9 +179,8 @@
; script when talk again
dw SchoolboyAlan1Script
-; 0x194100
-SchoolboyAlan1Script: ; 0x194100
+SchoolboyAlan1Script:
writecode VAR_CALLERID, $18
talkaftercancel
loadfont
@@ -213,11 +197,10 @@
setevent $0285
scall UnknownScript_0x1941c9
jump UnknownScript_0x19412c
-; 0x194129
-UnknownScript_0x194129: ; 0x194129
+UnknownScript_0x194129:
scall UnknownScript_0x1941cd
-UnknownScript_0x19412c: ; 0x19412c
+UnknownScript_0x19412c:
askforphonenumber $18
if_equal $1, UnknownScript_0x1941dd
if_equal $2, UnknownScript_0x1941d9
@@ -224,9 +207,8 @@
trainertotext SCHOOLBOY, ALAN1, $0
scall UnknownScript_0x1941d1
jump UnknownScript_0x1941d5
-; 0x194140
-UnknownScript_0x194140: ; 0x194140
+UnknownScript_0x194140:
scall UnknownScript_0x1941e1
winlosstext SchoolboyAlan1BeatenText, $0000
copybytetovar wda02
@@ -235,19 +217,19 @@
if_equal $2, UnknownScript_0x19416b
if_equal $1, UnknownScript_0x194171
if_equal $0, UnknownScript_0x194177
-UnknownScript_0x19415f: ; 0x19415f
+UnknownScript_0x19415f:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1941ab
-UnknownScript_0x194165: ; 0x194165
+UnknownScript_0x194165:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x19419e
-UnknownScript_0x19416b: ; 0x19416b
+UnknownScript_0x19416b:
checkflag $004b
iftrue UnknownScript_0x194191
-UnknownScript_0x194171: ; 0x194171
+UnknownScript_0x194171:
checkflag $0047
iftrue UnknownScript_0x194184
-UnknownScript_0x194177: ; 0x194177
+UnknownScript_0x194177:
loadtrainer SCHOOLBOY, ALAN1
startbattle
returnafterbattle
@@ -254,9 +236,8 @@
loadvar wda02, $1
clearflag $0073
end
-; 0x194184
-UnknownScript_0x194184: ; 0x194184
+UnknownScript_0x194184:
loadtrainer SCHOOLBOY, ALAN2
startbattle
returnafterbattle
@@ -263,9 +244,8 @@
loadvar wda02, $2
clearflag $0073
end
-; 0x194191
-UnknownScript_0x194191: ; 0x194191
+UnknownScript_0x194191:
loadtrainer SCHOOLBOY, ALAN3
startbattle
returnafterbattle
@@ -272,9 +252,8 @@
loadvar wda02, $3
clearflag $0073
end
-; 0x19419e
-UnknownScript_0x19419e: ; 0x19419e
+UnknownScript_0x19419e:
loadtrainer SCHOOLBOY, ALAN4
startbattle
returnafterbattle
@@ -281,17 +260,15 @@
loadvar wda02, $4
clearflag $0073
end
-; 0x1941ab
-UnknownScript_0x1941ab: ; 0x1941ab
+UnknownScript_0x1941ab:
loadtrainer SCHOOLBOY, ALAN5
startbattle
returnafterbattle
clearflag $0073
end
-; 0x1941b4
-UnknownScript_0x1941b4: ; 0x1941b4
+UnknownScript_0x1941b4:
scall UnknownScript_0x1941e5
verbosegiveitem FIRE_STONE, 1
iffalse UnknownScript_0x1941c6
@@ -298,60 +275,49 @@
clearflag $0081
setevent $0101
jump UnknownScript_0x1941d5
-; 0x1941c6
-UnknownScript_0x1941c6: ; 0x1941c6
+UnknownScript_0x1941c6:
jump UnknownScript_0x1941e9
-; 0x1941c9
-UnknownScript_0x1941c9: ; 0x1941c9
+UnknownScript_0x1941c9:
jumpstd asknumber1m
end
-; 0x1941cd
-UnknownScript_0x1941cd: ; 0x1941cd
+UnknownScript_0x1941cd:
jumpstd asknumber2m
end
-; 0x1941d1
-UnknownScript_0x1941d1: ; 0x1941d1
+UnknownScript_0x1941d1:
jumpstd registerednumberm
end
-; 0x1941d5
-UnknownScript_0x1941d5: ; 0x1941d5
+UnknownScript_0x1941d5:
jumpstd numberacceptedm
end
-; 0x1941d9
-UnknownScript_0x1941d9: ; 0x1941d9
+UnknownScript_0x1941d9:
jumpstd numberdeclinedm
end
-; 0x1941dd
-UnknownScript_0x1941dd: ; 0x1941dd
+UnknownScript_0x1941dd:
jumpstd phonefullm
end
-; 0x1941e1
-UnknownScript_0x1941e1: ; 0x1941e1
+UnknownScript_0x1941e1:
jumpstd rematchm
end
-; 0x1941e5
-UnknownScript_0x1941e5: ; 0x1941e5
+UnknownScript_0x1941e5:
jumpstd giftm
end
-; 0x1941e9
-UnknownScript_0x1941e9: ; 0x1941e9
+UnknownScript_0x1941e9:
jumpstd packfullm
end
-; 0x1941ed
-TrainerPsychicMark: ; 0x1941ed
+TrainerPsychicMark:
; bit/flag number
- dw $440
+ dw EVENT_BEAT_PSYCHIC_MARK
; trainer group && trainer id
db PSYCHIC_T, MARK
@@ -367,9 +333,8 @@
; script when talk again
dw PsychicMarkScript
-; 0x1941f9
-PsychicMarkScript: ; 0x1941f9
+PsychicMarkScript:
talkaftercancel
loadfont
writetext UnknownText_0x19471e
@@ -376,7 +341,6 @@
closetext
loadmovesprites
end
-; 0x194201
ArthurScript:
faceplayer
@@ -414,38 +378,31 @@
loadmovesprites
end
-MapRoute36Signpost2Script: ; 0x19423b
+MapRoute36Signpost2Script:
jumptext UnknownText_0x194924
-; 0x19423e
-MapRoute36Signpost1Script: ; 0x19423e
+MapRoute36Signpost1Script:
jumptext UnknownText_0x19492e
-; 0x194241
-MapRoute36Signpost3Script: ; 0x194241
+MapRoute36Signpost3Script:
jumptext UnknownText_0x19494c
-; 0x194244
-MapRoute36Signpost0Script: ; 0x194244
+MapRoute36Signpost0Script:
jumptext UnknownText_0x1949ee
-; 0x194247
-FruitTreeScript_0x194247: ; 0x194247
+FruitTreeScript_0x194247:
fruittree $d
-; 0x194249
-MovementData_0x194249: ; 0x194249
+MovementData_0x194249:
db $56 ; movement
step_end
-; 0x19424b
-MovementData_0x19424b: ; 0x19424b
+MovementData_0x19424b:
fast_jump_step_up
fast_jump_step_up
step_end
-; 0x19424e
-MovementData_0x19424e: ; 0x19424e
+MovementData_0x19424e:
step_down
step_down
step_down
@@ -456,9 +413,8 @@
step_left
step_left
step_end
-; 0x194258
-MovementData_0x194258: ; 0x194258
+MovementData_0x194258:
step_left
step_down
step_down
@@ -469,9 +425,8 @@
step_left
step_left
step_end
-; 0x194262
-MovementData_0x194262: ; 0x194262
+MovementData_0x194262:
db $39 ; movement
fast_jump_step_down
fast_jump_step_down
@@ -481,21 +436,18 @@
fast_jump_step_right
db $38 ; movement
step_end
-; 0x19426b
-UnknownText_0x19426b: ; 0x19426b
+UnknownText_0x19426b:
text "It's a weird tree."
line "Use SQUIRTBOTTLE?"
done
-; 0x194290
-UnknownText_0x194290: ; 0x194290
+UnknownText_0x194290:
text "<PLAYER> used the"
line "SQUIRTBOTTLE."
done
-; 0x1942aa
-UnknownText_0x1942aa: ; 0x1942aa
+UnknownText_0x1942aa:
text "The weird tree"
line "doesn't like the"
cont "SQUIRTBOTTLE!"
@@ -503,9 +455,8 @@
para "The weird tree"
line "attacked!"
done
-; 0x1942f1
-UnknownText_0x1942f1: ; 0x1942f1
+UnknownText_0x1942f1:
text "I'm the FLOWER"
line "SHOP's FLORIA!"
@@ -530,9 +481,8 @@
line "my sis and borrow"
cont "her water bottle!"
done
-; 0x1943ed
-UnknownText_0x1943ed: ; 0x1943ed
+UnknownText_0x1943ed:
text "When I told my sis"
line "about the jiggly"
@@ -545,9 +495,8 @@
para "lend me her water"
line "bottle…"
done
-; 0x19446f
-UnknownText_0x19446f: ; 0x19446f
+UnknownText_0x19446f:
text "Wa-hey!"
para "I was going to"
@@ -559,9 +508,8 @@
para "But I couldn't!"
line "I'm a failure!"
done
-; 0x1944d0
-UnknownText_0x1944d0: ; 0x1944d0
+UnknownText_0x1944d0:
text "Did you clear that"
line "wretched tree?"
@@ -569,15 +517,13 @@
line "I want you to"
cont "have this."
done
-; 0x19451a
-UnknownText_0x19451a: ; 0x19451a
+UnknownText_0x19451a:
text "<PLAYER> received"
line "TM08."
done
-; 0x19452c
-UnknownText_0x19452c: ; 0x19452c
+UnknownText_0x19452c:
text "That happens to be"
line "ROCK SMASH."
@@ -591,9 +537,8 @@
line "in your way, just"
cont "smash 'em up!"
done
-; 0x1945b8
-UnknownText_0x1945b8: ; 0x1945b8
+UnknownText_0x1945b8:
text "An odd tree is"
line "blocking the way"
cont "to GOLDENROD CITY."
@@ -604,9 +549,8 @@
para "CENTER they just"
line "opened…"
done
-; 0x194626
-UnknownText_0x194626: ; 0x194626
+UnknownText_0x194626:
text "An odd tree is"
line "blocking the way"
cont "to GOLDENROD CITY."
@@ -617,9 +561,8 @@
para "Something should"
line "be done about it."
done
-; 0x19469e
-UnknownText_0x19469e: ; 0x19469e
+UnknownText_0x19469e:
text "That odd tree dis-"
line "appeared without a"
cont "trace."
@@ -627,20 +570,17 @@
para "Oh! That tree was"
line "really a #MON?"
done
-; 0x1946ed
-PsychicMarkSeenText: ; 0x1946ed
+PsychicMarkSeenText:
text "I'm going to read"
line "your thoughts!"
done
-; 0x19470e
-PsychicMarkBeatenText: ; 0x19470e
+PsychicMarkBeatenText:
text "I misread you!"
done
-; 0x19471e
-UnknownText_0x19471e: ; 0x19471e
+UnknownText_0x19471e:
text "I'd be strong if"
line "only I could tell"
@@ -647,22 +587,19 @@
para "what my opponent"
line "was thinking."
done
-; 0x194760
-SchoolboyAlan1SeenText: ; 0x194760
+SchoolboyAlan1SeenText:
text "Thanks to my stud-"
line "ies, I'm ready for"
cont "any #MON!"
done
-; 0x194790
-SchoolboyAlan1BeatenText: ; 0x194790
+SchoolboyAlan1BeatenText:
text "Oops! Computation"
line "error?"
done
-; 0x1947aa
-UnknownText_0x1947aa: ; 0x1947aa
+UnknownText_0x1947aa:
text "Darn. I study five"
line "hours a day too."
@@ -670,7 +607,6 @@
line "learning than just"
cont "reading books."
done
-; 0x194800
MeetArthurText:
text "ARTHUR: Who are"
@@ -710,18 +646,16 @@
cont "disappointing."
done
-UnknownText_0x194924: ; 0x194924
+UnknownText_0x194924:
text "ROUTE 36"
done
-; 0x19492e
-UnknownText_0x19492e: ; 0x19492e
+UnknownText_0x19492e:
text "RUINS OF ALPH"
line "NORTH ENTRANCE"
done
-; 0x19494c
-UnknownText_0x19494c: ; 0x19494c
+UnknownText_0x19494c:
text "TRAINER TIPS"
para "#MON stats"
@@ -737,9 +671,8 @@
para "pronounced as the"
line "#MON grow."
done
-; 0x1949ee
-UnknownText_0x1949ee: ; 0x1949ee
+UnknownText_0x1949ee:
text "TRAINER TIPS"
para "Use DIG to return"
@@ -752,9 +685,8 @@
para "caves and other"
line "landmarks."
done
-; 0x194a66
-Route36_MapEventHeader: ; 0x194a66
+Route36_MapEventHeader:
; filler
db 0, 0
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -1,4 +1,4 @@
-Route37_MapScriptHeader: ; 0x1a8d72
+Route37_MapScriptHeader:
; trigger count
db 0
@@ -19,9 +19,9 @@
appear $6
return
-TrainerTwinsAnnandanne1: ; 0x1a8d83
+TrainerTwinsAnnandanne1:
; bit/flag number
- dw $465
+ dw EVENT_BEAT_TWINS_ANN_AND_ANNE
; trainer group && trainer id
db TWINS, ANNANDANNE1
@@ -37,9 +37,8 @@
; script when talk again
dw TwinsAnnandanne1Script
-; 0x1a8d8f
-TwinsAnnandanne1Script: ; 0x1a8d8f
+TwinsAnnandanne1Script:
talkaftercancel
loadfont
writetext UnknownText_0x1a8e62
@@ -46,11 +45,10 @@
closetext
loadmovesprites
end
-; 0x1a8d97
-TrainerTwinsAnnandanne2: ; 0x1a8d97
+TrainerTwinsAnnandanne2:
; bit/flag number
- dw $465
+ dw EVENT_BEAT_TWINS_ANN_AND_ANNE
; trainer group && trainer id
db TWINS, ANNANDANNE2
@@ -66,9 +64,8 @@
; script when talk again
dw TwinsAnnandanne2Script
-; 0x1a8da3
-TwinsAnnandanne2Script: ; 0x1a8da3
+TwinsAnnandanne2Script:
talkaftercancel
loadfont
writetext UnknownText_0x1a8eec
@@ -75,11 +72,10 @@
closetext
loadmovesprites
end
-; 0x1a8dab
-TrainerPsychicGreg: ; 0x1a8dab
+TrainerPsychicGreg:
; bit/flag number
- dw $43e
+ dw EVENT_BEAT_PSYCHIC_GREG
; trainer group && trainer id
db PSYCHIC_T, GREG
@@ -95,9 +91,8 @@
; script when talk again
dw PsychicGregScript
-; 0x1a8db7
-PsychicGregScript: ; 0x1a8db7
+PsychicGregScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a8f80
@@ -104,7 +99,6 @@
closetext
loadmovesprites
end
-; 0x1a8dbf
SunnyScript:
faceplayer
@@ -149,42 +143,35 @@
loadmovesprites
end
-MapRoute37Signpost0Script: ; 0x1a8e06
+MapRoute37Signpost0Script:
jumptext UnknownText_0x1a9197
-; 0x1a8e09
-FruitTreeScript_0x1a8e09: ; 0x1a8e09
+FruitTreeScript_0x1a8e09:
fruittree $11
-; 0x1a8e0b
-FruitTreeScript_0x1a8e0b: ; 0x1a8e0b
+FruitTreeScript_0x1a8e0b:
fruittree $12
-; 0x1a8e0d
-FruitTreeScript_0x1a8e0d: ; 0x1a8e0d
+FruitTreeScript_0x1a8e0d:
fruittree $13
-; 0x1a8e0f
-MapRoute37SignpostItem1: ; 0x1a8e0f
+MapRoute37SignpostItem1:
dw $00a9
db ETHER
-; 0x1a8e12
-TwinsAnnandanne1SeenText: ; 0x1a8e12
+TwinsAnnandanne1SeenText:
text "ANN: ANNE and I"
line "are in this to-"
cont "gether!"
done
-; 0x1a8e3b
-TwinsAnnandanne1BeatenText: ; 0x1a8e3b
+TwinsAnnandanne1BeatenText:
text "ANN & ANNE: Nnn… A"
line "little too strong."
done
-; 0x1a8e62
-UnknownText_0x1a8e62: ; 0x1a8e62
+UnknownText_0x1a8e62:
text "ANN: I can tell"
line "what my sister and"
@@ -191,29 +178,25 @@
para "my #MON are"
line "thinking."
done
-; 0x1a8e9c
-TwinsAnnandanne2SeenText: ; 0x1a8e9c
+TwinsAnnandanne2SeenText:
text "ANNE: ANN and I"
line "are in this to-"
cont "gether!"
done
-; 0x1a8ec5
-TwinsAnnandanne2BeatenText: ; 0x1a8ec5
+TwinsAnnandanne2BeatenText:
text "ANN & ANNE: Nnn… A"
line "little too strong."
done
-; 0x1a8eec
-UnknownText_0x1a8eec: ; 0x1a8eec
+UnknownText_0x1a8eec:
text "ANNE: We share the"
line "same feelings as"
cont "our #MON."
done
-; 0x1a8f1b
-PsychicGregSeenText: ; 0x1a8f1b
+PsychicGregSeenText:
text "#MON can't do a"
line "thing if they are"
cont "asleep."
@@ -221,21 +204,18 @@
para "I'll show you how"
line "scary that is!"
done
-; 0x1a8f65
-PsychicGregBeatenText: ; 0x1a8f65
+PsychicGregBeatenText:
text "I lost. That's"
line "pretty sad…"
done
-; 0x1a8f80
-UnknownText_0x1a8f80: ; 0x1a8f80
+UnknownText_0x1a8f80:
text "Putting #MON to"
line "sleep or paralyz-"
cont "ing them are good"
cont "battle techniques."
done
-; 0x1a8fc8
MeetSunnyText:
text "SUNNY: Hi!"
@@ -297,12 +277,11 @@
cont "Um… I forgot!"
done
-UnknownText_0x1a9197: ; 0x1a9197
+UnknownText_0x1a9197:
text "ROUTE 37"
done
-; 0x1a91a1
-Route37_MapEventHeader: ; 0x1a91a1
+Route37_MapEventHeader:
; filler
db 0, 0
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -1,14 +1,13 @@
-Route38_MapScriptHeader: ; 0x1a1d0c
+Route38_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1a1d0e
-TrainerBird_keeperToby: ; 0x1a1d0e
+TrainerBird_keeperToby:
; bit/flag number
- dw $3ff
+ dw EVENT_BEAT_BIRD_KEEPER_TOBY
; trainer group && trainer id
db BIRD_KEEPER, TOBY
@@ -24,9 +23,8 @@
; script when talk again
dw Bird_keeperTobyScript
-; 0x1a1d1a
-Bird_keeperTobyScript: ; 0x1a1d1a
+Bird_keeperTobyScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a1f86
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x1a1d22
-TrainerSailorHarry: ; 0x1a1d22
+TrainerSailorHarry:
; bit/flag number
- dw $57e
+ dw EVENT_BEAT_SAILOR_HARRY
; trainer group && trainer id
db SAILOR, HARRY
@@ -53,9 +50,8 @@
; script when talk again
dw SailorHarryScript
-; 0x1a1d2e
-SailorHarryScript: ; 0x1a1d2e
+SailorHarryScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a220c
@@ -62,11 +58,10 @@
closetext
loadmovesprites
end
-; 0x1a1d36
-TrainerLassDana1: ; 0x1a1d36
+TrainerLassDana1:
; bit/flag number
- dw $51e
+ dw EVENT_BEAT_LASS_DANA
; trainer group && trainer id
db LASS, DANA1
@@ -82,9 +77,8 @@
; script when talk again
dw LassDana1Script
-; 0x1a1d42
-LassDana1Script: ; 0x1a1d42
+LassDana1Script:
writecode VAR_CALLERID, $1a
talkaftercancel
loadfont
@@ -101,11 +95,10 @@
setevent $0289
scall UnknownScript_0x1a1e0b
jump UnknownScript_0x1a1d6e
-; 0x1a1d6b
-UnknownScript_0x1a1d6b: ; 0x1a1d6b
+UnknownScript_0x1a1d6b:
scall UnknownScript_0x1a1e0f
-UnknownScript_0x1a1d6e: ; 0x1a1d6e
+UnknownScript_0x1a1d6e:
askforphonenumber $1a
if_equal $1, UnknownScript_0x1a1e1f
if_equal $2, UnknownScript_0x1a1e1b
@@ -112,9 +105,8 @@
trainertotext LASS, DANA1, $0
scall UnknownScript_0x1a1e13
jump UnknownScript_0x1a1e17
-; 0x1a1d82
-UnknownScript_0x1a1d82: ; 0x1a1d82
+UnknownScript_0x1a1d82:
scall UnknownScript_0x1a1e23
winlosstext LassDana1BeatenText, $0000
copybytetovar wda03
@@ -123,19 +115,19 @@
if_equal $2, UnknownScript_0x1a1dad
if_equal $1, UnknownScript_0x1a1db3
if_equal $0, UnknownScript_0x1a1db9
-UnknownScript_0x1a1da1: ; 0x1a1da1
+UnknownScript_0x1a1da1:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1a1ded
-UnknownScript_0x1a1da7: ; 0x1a1da7
+UnknownScript_0x1a1da7:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x1a1de0
-UnknownScript_0x1a1dad: ; 0x1a1dad
+UnknownScript_0x1a1dad:
checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x1a1dd3
-UnknownScript_0x1a1db3: ; 0x1a1db3
+UnknownScript_0x1a1db3:
checkflag $0045
iftrue UnknownScript_0x1a1dc6
-UnknownScript_0x1a1db9: ; 0x1a1db9
+UnknownScript_0x1a1db9:
loadtrainer LASS, DANA1
startbattle
returnafterbattle
@@ -142,9 +134,8 @@
loadvar wda03, $1
clearflag $0074
end
-; 0x1a1dc6
-UnknownScript_0x1a1dc6: ; 0x1a1dc6
+UnknownScript_0x1a1dc6:
loadtrainer LASS, DANA2
startbattle
returnafterbattle
@@ -151,9 +142,8 @@
loadvar wda03, $2
clearflag $0074
end
-; 0x1a1dd3
-UnknownScript_0x1a1dd3: ; 0x1a1dd3
+UnknownScript_0x1a1dd3:
loadtrainer LASS, DANA3
startbattle
returnafterbattle
@@ -160,9 +150,8 @@
loadvar wda03, $3
clearflag $0074
end
-; 0x1a1de0
-UnknownScript_0x1a1de0: ; 0x1a1de0
+UnknownScript_0x1a1de0:
loadtrainer LASS, DANA4
startbattle
returnafterbattle
@@ -169,17 +158,15 @@
loadvar wda03, $4
clearflag $0074
end
-; 0x1a1ded
-UnknownScript_0x1a1ded: ; 0x1a1ded
+UnknownScript_0x1a1ded:
loadtrainer LASS, DANA5
startbattle
returnafterbattle
clearflag $0074
end
-; 0x1a1df6
-UnknownScript_0x1a1df6: ; 0x1a1df6
+UnknownScript_0x1a1df6:
scall UnknownScript_0x1a1e27
verbosegiveitem THUNDERSTONE, 1
iffalse UnknownScript_0x1a1e08
@@ -186,60 +173,49 @@
clearflag $0082
setevent $0102
jump UnknownScript_0x1a1e17
-; 0x1a1e08
-UnknownScript_0x1a1e08: ; 0x1a1e08
+UnknownScript_0x1a1e08:
jump UnknownScript_0x1a1e2b
-; 0x1a1e0b
-UnknownScript_0x1a1e0b: ; 0x1a1e0b
+UnknownScript_0x1a1e0b:
jumpstd asknumber1f
end
-; 0x1a1e0f
-UnknownScript_0x1a1e0f: ; 0x1a1e0f
+UnknownScript_0x1a1e0f:
jumpstd asknumber2f
end
-; 0x1a1e13
-UnknownScript_0x1a1e13: ; 0x1a1e13
+UnknownScript_0x1a1e13:
jumpstd registerednumberf
end
-; 0x1a1e17
-UnknownScript_0x1a1e17: ; 0x1a1e17
+UnknownScript_0x1a1e17:
jumpstd numberacceptedf
end
-; 0x1a1e1b
-UnknownScript_0x1a1e1b: ; 0x1a1e1b
+UnknownScript_0x1a1e1b:
jumpstd numberdeclinedf
end
-; 0x1a1e1f
-UnknownScript_0x1a1e1f: ; 0x1a1e1f
+UnknownScript_0x1a1e1f:
jumpstd phonefullf
end
-; 0x1a1e23
-UnknownScript_0x1a1e23: ; 0x1a1e23
+UnknownScript_0x1a1e23:
jumpstd rematchf
end
-; 0x1a1e27
-UnknownScript_0x1a1e27: ; 0x1a1e27
+UnknownScript_0x1a1e27:
jumpstd giftf
end
-; 0x1a1e2b
-UnknownScript_0x1a1e2b: ; 0x1a1e2b
+UnknownScript_0x1a1e2b:
jumpstd packfullf
end
-; 0x1a1e2f
-TrainerSchoolboyChad1: ; 0x1a1e2f
+TrainerSchoolboyChad1:
; bit/flag number
- dw $475
+ dw EVENT_BEAT_SCHOOLBOY_CHAD
; trainer group && trainer id
db SCHOOLBOY, CHAD1
@@ -255,9 +231,8 @@
; script when talk again
dw SchoolboyChad1Script
-; 0x1a1e3b
-SchoolboyChad1Script: ; 0x1a1e3b
+SchoolboyChad1Script:
writecode VAR_CALLERID, $1b
talkaftercancel
loadfont
@@ -272,11 +247,10 @@
setevent $028b
scall UnknownScript_0x1a1ee9
jump UnknownScript_0x1a1e61
-; 0x1a1e5e
-UnknownScript_0x1a1e5e: ; 0x1a1e5e
+UnknownScript_0x1a1e5e:
scall UnknownScript_0x1a1eed
-UnknownScript_0x1a1e61: ; 0x1a1e61
+UnknownScript_0x1a1e61:
askforphonenumber $1b
if_equal $1, UnknownScript_0x1a1efd
if_equal $2, UnknownScript_0x1a1ef9
@@ -283,9 +257,8 @@
trainertotext SCHOOLBOY, CHAD1, $0
scall UnknownScript_0x1a1ef1
jump UnknownScript_0x1a1ef5
-; 0x1a1e75
-UnknownScript_0x1a1e75: ; 0x1a1e75
+UnknownScript_0x1a1e75:
scall UnknownScript_0x1a1f01
winlosstext SchoolboyChad1BeatenText, $0000
copybytetovar wda04
@@ -294,19 +267,19 @@
if_equal $2, UnknownScript_0x1a1ea0
if_equal $1, UnknownScript_0x1a1ea6
if_equal $0, UnknownScript_0x1a1eac
-UnknownScript_0x1a1e94: ; 0x1a1e94
+UnknownScript_0x1a1e94:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1a1ee0
-UnknownScript_0x1a1e9a: ; 0x1a1e9a
+UnknownScript_0x1a1e9a:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x1a1ed3
-UnknownScript_0x1a1ea0: ; 0x1a1ea0
+UnknownScript_0x1a1ea0:
checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x1a1ec6
-UnknownScript_0x1a1ea6: ; 0x1a1ea6
+UnknownScript_0x1a1ea6:
checkflag $0049
iftrue UnknownScript_0x1a1eb9
-UnknownScript_0x1a1eac: ; 0x1a1eac
+UnknownScript_0x1a1eac:
loadtrainer SCHOOLBOY, CHAD1
startbattle
returnafterbattle
@@ -313,9 +286,8 @@
loadvar wda04, $1
clearflag $0075
end
-; 0x1a1eb9
-UnknownScript_0x1a1eb9: ; 0x1a1eb9
+UnknownScript_0x1a1eb9:
loadtrainer SCHOOLBOY, CHAD2
startbattle
returnafterbattle
@@ -322,9 +294,8 @@
loadvar wda04, $2
clearflag $0075
end
-; 0x1a1ec6
-UnknownScript_0x1a1ec6: ; 0x1a1ec6
+UnknownScript_0x1a1ec6:
loadtrainer SCHOOLBOY, CHAD3
startbattle
returnafterbattle
@@ -331,9 +302,8 @@
loadvar wda04, $3
clearflag $0075
end
-; 0x1a1ed3
-UnknownScript_0x1a1ed3: ; 0x1a1ed3
+UnknownScript_0x1a1ed3:
loadtrainer SCHOOLBOY, CHAD4
startbattle
returnafterbattle
@@ -340,54 +310,45 @@
loadvar wda04, $4
clearflag $0075
end
-; 0x1a1ee0
-UnknownScript_0x1a1ee0: ; 0x1a1ee0
+UnknownScript_0x1a1ee0:
loadtrainer SCHOOLBOY, CHAD5
startbattle
returnafterbattle
clearflag $0075
end
-; 0x1a1ee9
-UnknownScript_0x1a1ee9: ; 0x1a1ee9
+UnknownScript_0x1a1ee9:
jumpstd asknumber1m
end
-; 0x1a1eed
-UnknownScript_0x1a1eed: ; 0x1a1eed
+UnknownScript_0x1a1eed:
jumpstd asknumber2m
end
-; 0x1a1ef1
-UnknownScript_0x1a1ef1: ; 0x1a1ef1
+UnknownScript_0x1a1ef1:
jumpstd registerednumberm
end
-; 0x1a1ef5
-UnknownScript_0x1a1ef5: ; 0x1a1ef5
+UnknownScript_0x1a1ef5:
jumpstd numberacceptedm
end
-; 0x1a1ef9
-UnknownScript_0x1a1ef9: ; 0x1a1ef9
+UnknownScript_0x1a1ef9:
jumpstd numberdeclinedm
end
-; 0x1a1efd
-UnknownScript_0x1a1efd: ; 0x1a1efd
+UnknownScript_0x1a1efd:
jumpstd phonefullm
end
-; 0x1a1f01
-UnknownScript_0x1a1f01: ; 0x1a1f01
+UnknownScript_0x1a1f01:
jumpstd rematchm
end
-; 0x1a1f05
-TrainerBeautyValerie: ; 0x1a1f05
+TrainerBeautyValerie:
; bit/flag number
- dw $4bc
+ dw EVENT_BEAT_BEAUTY_VALERIE
; trainer group && trainer id
db BEAUTY, VALERIE
@@ -403,9 +364,8 @@
; script when talk again
dw BeautyValerieScript
-; 0x1a1f11
-BeautyValerieScript: ; 0x1a1f11
+BeautyValerieScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a2185
@@ -412,11 +372,10 @@
closetext
loadmovesprites
end
-; 0x1a1f19
-TrainerBeautyOlivia: ; 0x1a1f19
+TrainerBeautyOlivia:
; bit/flag number
- dw $5c1
+ dw EVENT_BEAT_BEAUTY_OLIVIA
; trainer group && trainer id
db BEAUTY, OLIVIA
@@ -432,9 +391,8 @@
; script when talk again
dw BeautyOliviaScript
-; 0x1a1f25
-BeautyOliviaScript: ; 0x1a1f25
+BeautyOliviaScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a229a
@@ -441,34 +399,28 @@
closetext
loadmovesprites
end
-; 0x1a1f2d
-MapRoute38Signpost0Script: ; 0x1a1f2d
+MapRoute38Signpost0Script:
jumptext UnknownText_0x1a22fd
-; 0x1a1f30
-MapRoute38Signpost1Script: ; 0x1a1f30
+MapRoute38Signpost1Script:
jumptext UnknownText_0x1a2324
-; 0x1a1f33
-FruitTreeScript_0x1a1f33: ; 0x1a1f33
+FruitTreeScript_0x1a1f33:
fruittree $3
-; 0x1a1f35
-Bird_keeperTobySeenText: ; 0x1a1f35
+Bird_keeperTobySeenText:
text "Fly high into the"
line "sky, my beloved"
cont "bird #MON!"
done
-; 0x1a1f63
-Bird_keeperTobyBeatenText: ; 0x1a1f63
+Bird_keeperTobyBeatenText:
text "I feel like just"
line "flying away now."
done
-; 0x1a1f86
-UnknownText_0x1a1f86: ; 0x1a1f86
+UnknownText_0x1a1f86:
text "I plan to train in"
line "CIANWOOD CITY to"
@@ -475,22 +427,19 @@
para "teach my #MON"
line "how to FLY."
done
-; 0x1a1fc5
-SchoolboyChad1SeenText: ; 0x1a1fc5
+SchoolboyChad1SeenText:
text "Let me try some-"
line "thing I learned"
cont "today."
done
-; 0x1a1fee
-SchoolboyChad1BeatenText: ; 0x1a1fee
+SchoolboyChad1BeatenText:
text "I didn't study"
line "enough, I guess."
done
-; 0x1a200e
-UnknownText_0x1a200e: ; 0x1a200e
+UnknownText_0x1a200e:
text "I have to take so"
line "many tests, I"
@@ -501,9 +450,8 @@
line "to play, I really"
cont "concentrate."
done
-; 0x1a207d
-LassDana1SeenText: ; 0x1a207d
+LassDana1SeenText:
text "You seem to be"
line "good at #MON."
@@ -511,15 +459,13 @@
line "about giving me"
cont "some advice?"
done
-; 0x1a20c8
-LassDana1BeatenText: ; 0x1a20c8
+LassDana1BeatenText:
text "I see. So you can"
line "battle that way."
done
-; 0x1a20ec
-UnknownText_0x1a20ec: ; 0x1a20ec
+UnknownText_0x1a20ec:
text "I know something"
line "good!"
@@ -527,9 +473,8 @@
line "is famous for its"
cont "flavor."
done
-; 0x1a2130
-BeautyValerieSeenText: ; 0x1a2130
+BeautyValerieSeenText:
text "Hi! Aren't you a"
line "cute trainer!"
@@ -536,22 +481,19 @@
para "May I see your"
line "#MON?"
done
-; 0x1a2164
-BeautyValerieBeatenText: ; 0x1a2164
+BeautyValerieBeatenText:
text "I'm glad I got to"
line "see your #MON!"
done
-; 0x1a2185
-UnknownText_0x1a2185: ; 0x1a2185
+UnknownText_0x1a2185:
text "When I see #-"
line "MON, it seems to"
cont "soothe my nerves."
done
-; 0x1a21b7
-SailorHarrySeenText: ; 0x1a21b7
+SailorHarrySeenText:
text "I've been over-"
line "seas, so I know"
@@ -558,15 +500,13 @@
para "about all sorts of"
line "#MON!"
done
-; 0x1a21f0
-SailorHarryBeatenText: ; 0x1a21f0
+SailorHarryBeatenText:
text "Your skill is"
line "world class!"
done
-; 0x1a220c
-UnknownText_0x1a220c: ; 0x1a220c
+UnknownText_0x1a220c:
text "All kinds of peo-"
line "ple around the"
@@ -573,22 +513,19 @@
para "world live happily"
line "with #MON."
done
-; 0x1a224c
-BeautyOliviaSeenText: ; 0x1a224c
+BeautyOliviaSeenText:
text "Don't you think my"
line "#MON and I are"
cont "beautiful?"
done
-; 0x1a2279
-BeautyOliviaBeatenText: ; 0x1a2279
+BeautyOliviaBeatenText:
text "We drink MOOMOO"
line "MILK every day."
done
-; 0x1a229a
-UnknownText_0x1a229a: ; 0x1a229a
+UnknownText_0x1a229a:
text "MOOMOO MILK is"
line "good for beauty"
@@ -598,17 +535,15 @@
para "they only sell a"
line "bottle at a time."
done
-; 0x1a22fd
-UnknownText_0x1a22fd: ; 0x1a22fd
+UnknownText_0x1a22fd:
text "ROUTE 38"
para "OLIVINE CITY -"
line "ECRUTEAK CITY"
done
-; 0x1a2324
-UnknownText_0x1a2324: ; 0x1a2324
+UnknownText_0x1a2324:
text "TRAINER TIPS"
para "If a #MON is"
@@ -623,9 +558,8 @@
line "#MON and stops"
cont "its evolution."
done
-; 0x1a23bb
-Route38_MapEventHeader: ; 0x1a23bb
+Route38_MapEventHeader:
; filler
db 0, 0
@@ -651,4 +585,3 @@
person_event SPRITE_SAILOR, 9, 28, $1e, $0, 255, 255, $92, 2, TrainerSailorHarry, $ffff
person_event SPRITE_FRUIT_TREE, 14, 16, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a1f33, $ffff
person_event SPRITE_BUENA, 12, 9, $a, $0, 255, 255, $92, 1, TrainerBeautyOlivia, $ffff
-; 0x1a2430
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -1,12 +1,11 @@
-Route39_MapScriptHeader: ; 0x1a5af3
+Route39_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1a5af5
-TaurosScript_0x1a5af5: ; 0x1a5af5
+TaurosScript_0x1a5af5:
loadfont
writetext UnknownText_0x1a5bf9
cry MILTANK
@@ -13,11 +12,10 @@
closetext
loadmovesprites
end
-; 0x1a5aff
-TrainerPokefanmDerek1: ; 0x1a5aff
+TrainerPokefanmDerek1:
; bit/flag number
- dw $4ce
+ dw EVENT_BEAT_POKEFANM_DEREK
; trainer group && trainer id
db POKEFANM, DEREK1
@@ -33,9 +31,8 @@
; script when talk again
dw PokefanmDerek1Script
-; 0x1a5b0b
-PokefanmDerek1Script: ; 0x1a5b0b
+PokefanmDerek1Script:
writecode VAR_CALLERID, $1c
talkaftercancel
loadfont
@@ -52,11 +49,10 @@
setevent EVENT_SHOWED_DEREK_PIKACHU
scall UnknownScript_0x1a5b62
jump UnknownScript_0x1a5b36
-; 0x1a5b33
-UnknownScript_0x1a5b33: ; 0x1a5b33
+UnknownScript_0x1a5b33:
scall UnknownScript_0x1a5b66
-UnknownScript_0x1a5b36: ; 0x1a5b36
+UnknownScript_0x1a5b36:
askforphonenumber $1c
if_equal $1, UnknownScript_0x1a5b76
if_equal $2, UnknownScript_0x1a5b72
@@ -63,70 +59,58 @@
trainertotext POKEFANM, DEREK1, $0
scall UnknownScript_0x1a5b6a
jump UnknownScript_0x1a5b6e
-; 0x1a5b4a
-UnknownScript_0x1a5b4a: ; 0x1a5b4a
+UnknownScript_0x1a5b4a:
scall UnknownScript_0x1a5b7a
verbosegiveitem NUGGET, 1
iffalse UnknownScript_0x1a5b59
clearflag $0083
jump UnknownScript_0x1a5b6e
-; 0x1a5b59
-UnknownScript_0x1a5b59: ; 0x1a5b59
+UnknownScript_0x1a5b59:
jump UnknownScript_0x1a5b7e
-; 0x1a5b5c
-UnknownScript_0x1a5b5c: ; 0x1a5b5c
+UnknownScript_0x1a5b5c:
writetext UnknownText_0x1a5dec
closetext
loadmovesprites
end
-; 0x1a5b62
-UnknownScript_0x1a5b62: ; 0x1a5b62
+UnknownScript_0x1a5b62:
jumpstd asknumber1m
end
-; 0x1a5b66
-UnknownScript_0x1a5b66: ; 0x1a5b66
+UnknownScript_0x1a5b66:
jumpstd asknumber2m
end
-; 0x1a5b6a
-UnknownScript_0x1a5b6a: ; 0x1a5b6a
+UnknownScript_0x1a5b6a:
jumpstd registerednumberm
end
-; 0x1a5b6e
-UnknownScript_0x1a5b6e: ; 0x1a5b6e
+UnknownScript_0x1a5b6e:
jumpstd numberacceptedm
end
-; 0x1a5b72
-UnknownScript_0x1a5b72: ; 0x1a5b72
+UnknownScript_0x1a5b72:
jumpstd numberdeclinedm
end
-; 0x1a5b76
-UnknownScript_0x1a5b76: ; 0x1a5b76
+UnknownScript_0x1a5b76:
jumpstd phonefullm
end
-; 0x1a5b7a
-UnknownScript_0x1a5b7a: ; 0x1a5b7a
+UnknownScript_0x1a5b7a:
jumpstd giftm
end
-; 0x1a5b7e
-UnknownScript_0x1a5b7e: ; 0x1a5b7e
+UnknownScript_0x1a5b7e:
jumpstd packfullm
end
-; 0x1a5b82
-TrainerPokefanfRuth: ; 0x1a5b82
+TrainerPokefanfRuth:
; bit/flag number
- dw $4da
+ dw EVENT_BEAT_POKEFANF_RUTH
; trainer group && trainer id
db POKEFANF, RUTH
@@ -142,9 +126,8 @@
; script when talk again
dw PokefanfRuthScript
-; 0x1a5b8e
-PokefanfRuthScript: ; 0x1a5b8e
+PokefanfRuthScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a5db2
@@ -151,11 +134,10 @@
closetext
loadmovesprites
end
-; 0x1a5b96
-TrainerSailorEugene: ; 0x1a5b96
+TrainerSailorEugene:
; bit/flag number
- dw $575
+ dw EVENT_BEAT_SAILOR_EUGENE
; trainer group && trainer id
db SAILOR, EUGENE
@@ -171,9 +153,8 @@
; script when talk again
dw SailorEugeneScript
-; 0x1a5ba2
-SailorEugeneScript: ; 0x1a5ba2
+SailorEugeneScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a5c4d
@@ -180,11 +161,10 @@
closetext
loadmovesprites
end
-; 0x1a5baa
-TrainerPsychicNorman: ; 0x1a5baa
+TrainerPsychicNorman:
; bit/flag number
- dw $43f
+ dw EVENT_BEAT_PSYCHIC_NORMAN
; trainer group && trainer id
db PSYCHIC_T, NORMAN
@@ -200,9 +180,8 @@
; script when talk again
dw PsychicNormanScript
-; 0x1a5bb6
-PsychicNormanScript: ; 0x1a5bb6
+PsychicNormanScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a5e57
@@ -209,14 +188,13 @@
closetext
loadmovesprites
end
-; 0x1a5bbe
-PokefanFScript_0x1a5bbe: ; 0x1a5bbe
+PokefanFScript_0x1a5bbe:
faceplayer
loadfont
checknite
iffalse UnknownScript_0x1a5be5
- checkevent $05c2
+ checkevent EVENT_BEAT_POKEFANF_JAIME
iftrue UnknownScript_0x1a5bdf
writetext UnknownText_0x1a5ee8
closetext
@@ -225,53 +203,44 @@
loadtrainer POKEFANF, JAIME
startbattle
returnafterbattle
- setevent $05c2
+ setevent EVENT_BEAT_POKEFANF_JAIME
loadmovesprites
end
-; 0x1a5bdf
-UnknownScript_0x1a5bdf: ; 0x1a5bdf
+UnknownScript_0x1a5bdf:
writetext UnknownText_0x1a5f31
closetext
loadmovesprites
end
-; 0x1a5be5
-UnknownScript_0x1a5be5: ; 0x1a5be5
+UnknownScript_0x1a5be5:
writetext UnknownText_0x1a5ec4
closetext
loadmovesprites
end
-; 0x1a5beb
-MapRoute39Signpost2Script: ; 0x1a5beb
+MapRoute39Signpost2Script:
jumptext UnknownText_0x1a5fe3
-; 0x1a5bee
-MapRoute39Signpost1Script: ; 0x1a5bee
+MapRoute39Signpost1Script:
jumptext UnknownText_0x1a600a
-; 0x1a5bf1
-MapRoute39Signpost0Script: ; 0x1a5bf1
+MapRoute39Signpost0Script:
jumptext UnknownText_0x1a6036
-; 0x1a5bf4
-FruitTreeScript_0x1a5bf4: ; 0x1a5bf4
+FruitTreeScript_0x1a5bf4:
fruittree $f
-; 0x1a5bf6
-MapRoute39SignpostItem3: ; 0x1a5bf6
+MapRoute39SignpostItem3:
dw $00aa
db NUGGET
-; 0x1a5bf9
-UnknownText_0x1a5bf9: ; 0x1a5bf9
+UnknownText_0x1a5bf9:
text "MILTANK: Mooo!"
done
-; 0x1a5c09
-SailorEugeneSeenText: ; 0x1a5c09
+SailorEugeneSeenText:
text "I just got back to"
line "OLIVINE."
@@ -278,14 +247,12 @@
para "So how about a"
line "#MON battle?"
done
-; 0x1a5c42
-SailorEugeneBeatenText: ; 0x1a5c42
+SailorEugeneBeatenText:
text "Awaaargh!"
done
-; 0x1a5c4d
-UnknownText_0x1a5c4d: ; 0x1a5c4d
+UnknownText_0x1a5c4d:
text "My #MON were"
line "caught and raised"
cont "overseas."
@@ -294,22 +261,19 @@
line "ions on those long"
cont "voyages."
done
-; 0x1a5ca5
-PokefanmDerek1SeenText: ; 0x1a5ca5
+PokefanmDerek1SeenText:
text "This is a good"
line "time to brag about"
cont "my PIKACHU!"
done
-; 0x1a5cd4
-PokefanmDerek1BeatenText: ; 0x1a5cd4
+PokefanmDerek1BeatenText:
text "I had no time to"
line "show off PIKACHU…"
done
-; 0x1a5cf8
-UnknownText_0x1a5cf8: ; 0x1a5cf8
+UnknownText_0x1a5cf8:
text "I'm not listening"
line "to your bragging!"
@@ -319,9 +283,8 @@
para "listening to other"
line "people brag!"
done
-; 0x1a5d5b
-PokefanfRuthSeenText: ; 0x1a5d5b
+PokefanfRuthSeenText:
text "Such darling"
line "#MON."
@@ -329,15 +292,13 @@
line "#MON together"
cont "at the same time."
done
-; 0x1a5d9d
-PokefanfRuthBeatenText: ; 0x1a5d9d
+PokefanfRuthBeatenText:
text "I don't mind"
line "losing."
done
-; 0x1a5db2
-UnknownText_0x1a5db2: ; 0x1a5db2
+UnknownText_0x1a5db2:
text "Do you know about"
line "baby #MON?"
@@ -344,28 +305,24 @@
para "I bet they're just"
line "adorable!"
done
-; 0x1a5dec
-UnknownText_0x1a5dec: ; 0x1a5dec
+UnknownText_0x1a5dec:
text "PIKACHU is it!"
line "Don't you agree?"
done
-; 0x1a5e0c
-PsychicNormanSeenText: ; 0x1a5e0c
+PsychicNormanSeenText:
text "Let me see what"
line "your #MON are"
cont "capable of."
done
-; 0x1a5e37
-PsychicNormanBeatenText: ; 0x1a5e37
+PsychicNormanBeatenText:
text "Ooh, your #MON"
line "have potential."
done
-; 0x1a5e57
-UnknownText_0x1a5e57: ; 0x1a5e57
+UnknownText_0x1a5e57:
text "You know how #-"
line "MON have different"
cont "abilities?"
@@ -375,29 +332,25 @@
cont "one has different"
cont "potential."
done
-; 0x1a5ec4
-UnknownText_0x1a5ec4: ; 0x1a5ec4
+UnknownText_0x1a5ec4:
text "Ufufufu… I hope it"
line "gets dark soon."
done
-; 0x1a5ee8
-UnknownText_0x1a5ee8: ; 0x1a5ee8
+UnknownText_0x1a5ee8:
text "You came at just"
line "the right time."
para "Let's battle."
done
-; 0x1a5f17
-UnknownText_0x1a5f17: ; 0x1a5f17
+UnknownText_0x1a5f17:
text "Oh, how disap-"
line "pointing…"
done
-; 0x1a5f31
-UnknownText_0x1a5f31: ; 0x1a5f31
+UnknownText_0x1a5f31:
text "I met my MEOWTH at"
line "night, right here"
cont "on ROUTE 39."
@@ -414,25 +367,22 @@
para "training here than"
line "anywhere else."
done
-; 0x1a5fe3
-UnknownText_0x1a5fe3: ; 0x1a5fe3
+UnknownText_0x1a5fe3:
text "ROUTE 39"
para "OLIVINE CITY -"
line "ECRUTEAK CITY"
done
-; 0x1a600a
-UnknownText_0x1a600a: ; 0x1a600a
+UnknownText_0x1a600a:
text "MOOMOO FARM"
para "Enjoy Our Fresh"
line "and Tasty Milk"
done
-; 0x1a6036
-UnknownText_0x1a6036: ; 0x1a6036
+UnknownText_0x1a6036:
text "TRAINER TIPS"
para "Use HEADBUTT on"
@@ -446,9 +396,8 @@
para "Use HEADBUTT on"
line "any tree you see!"
done
-; 0x1a60ba
-Route39_MapEventHeader: ; 0x1a60ba
+Route39_MapEventHeader:
; filler
db 0, 0
@@ -479,4 +428,3 @@
person_event SPRITE_STANDING_YOUNGSTER, 11, 17, $a, $0, 255, 255, $92, 1, TrainerPsychicNorman, $ffff
person_event SPRITE_FRUIT_TREE, 7, 13, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a5bf4, $ffff
person_event SPRITE_POKEFAN_F, 26, 8, $6, $0, 255, 255, $80, 0, PokefanFScript_0x1a5bbe, $ffff
-; 0x1a6160
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -1,14 +1,13 @@
-Route4_MapScriptHeader: ; 0x1ae1ce
+Route4_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1ae1d0
-TrainerBird_keeperHank: ; 0x1ae1d0
+TrainerBird_keeperHank:
; bit/flag number
- dw $402
+ dw EVENT_BEAT_BIRD_KEEPER_HANK
; trainer group && trainer id
db BIRD_KEEPER, HANK
@@ -24,9 +23,8 @@
; script when talk again
dw Bird_keeperHankScript
-; 0x1ae1dc
-Bird_keeperHankScript: ; 0x1ae1dc
+Bird_keeperHankScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ae258
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x1ae1e4
-TrainerPicnickerHope: ; 0x1ae1e4
+TrainerPicnickerHope:
; bit/flag number
- dw $483
+ dw EVENT_BEAT_PICNICKER_HOPE
; trainer group && trainer id
db PICNICKER, HOPE
@@ -53,9 +50,8 @@
; script when talk again
dw PicnickerHopeScript
-; 0x1ae1f0
-PicnickerHopeScript: ; 0x1ae1f0
+PicnickerHopeScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ae320
@@ -62,11 +58,10 @@
closetext
loadmovesprites
end
-; 0x1ae1f8
-TrainerPicnickerSharon: ; 0x1ae1f8
+TrainerPicnickerSharon:
; bit/flag number
- dw $484
+ dw EVENT_BEAT_PICNICKER_SHARON
; trainer group && trainer id
db PICNICKER, SHARON
@@ -82,9 +77,8 @@
; script when talk again
dw PicnickerSharonScript
-; 0x1ae204
-PicnickerSharonScript: ; 0x1ae204
+PicnickerSharonScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ae369
@@ -91,36 +85,30 @@
closetext
loadmovesprites
end
-; 0x1ae20c
-MapRoute4Signpost0Script: ; 0x1ae20c
+MapRoute4Signpost0Script:
jumptext UnknownText_0x1ae384
-; 0x1ae20f
-ItemFragment_0x1ae20f: ; 0x1ae20f
+ItemFragment_0x1ae20f:
db HP_UP, 1
-; 0x1ae211
-MapRoute4SignpostItem1: ; 0x1ae211
+MapRoute4SignpostItem1:
dw $00f1
db ULTRA_BALL
-; 0x1ae214
-Bird_keeperHankSeenText: ; 0x1ae214
+Bird_keeperHankSeenText:
text "I'm raising my"
line "#MON. Want to"
cont "battle with me?"
done
-; 0x1ae241
-Bird_keeperHankBeatenText: ; 0x1ae241
+Bird_keeperHankBeatenText:
text "Ack! I lost that"
line "one…"
done
-; 0x1ae258
-UnknownText_0x1ae258: ; 0x1ae258
+UnknownText_0x1ae258:
text "If you have a"
line "specific #MON"
@@ -133,9 +121,8 @@
para "That's how to do"
line "it."
done
-; 0x1ae2ce
-PicnickerHopeSeenText: ; 0x1ae2ce
+PicnickerHopeSeenText:
text "I have a feeling"
line "that I can win."
@@ -142,15 +129,13 @@
para "Let's see if I'm"
line "right!"
done
-; 0x1ae306
-PicnickerHopeBeatenText: ; 0x1ae306
+PicnickerHopeBeatenText:
text "Aww, you are too"
line "strong."
done
-; 0x1ae320
-UnknownText_0x1ae320: ; 0x1ae320
+UnknownText_0x1ae320:
text "I heard CLEFAIRY"
line "appear at MT.MOON."
@@ -157,34 +142,29 @@
para "But where could"
line "they be?"
done
-; 0x1ae35e
-PicnickerSharonSeenText: ; 0x1ae35e
+PicnickerSharonSeenText:
text "Um…"
line "I…"
done
-; 0x1ae366
-PicnickerSharonBeatenText: ; 0x1ae366
+PicnickerSharonBeatenText:
text "…"
done
-; 0x1ae369
-UnknownText_0x1ae369: ; 0x1ae369
+UnknownText_0x1ae369:
text "……I'll go train"
line "some more…"
done
-; 0x1ae384
-UnknownText_0x1ae384: ; 0x1ae384
+UnknownText_0x1ae384:
text "MT.MOON SQUARE"
para "Just go up the"
line "stairs."
done
-; 0x1ae3ab
-Route4_MapEventHeader: ; 0x1ae3ab
+Route4_MapEventHeader:
; filler
db 0, 0
@@ -206,4 +186,3 @@
person_event SPRITE_LASS, 12, 13, $8, $0, 255, 255, $a2, 4, TrainerPicnickerHope, $ffff
person_event SPRITE_LASS, 10, 25, $9, $0, 255, 255, $a2, 4, TrainerPicnickerSharon, $ffff
person_event SPRITE_POKE_BALL, 7, 30, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ae20f, $0787
-; 0x1ae3f4
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -1,4 +1,4 @@
-Route40_MapScriptHeader: ; 0x1a6160
+Route40_MapScriptHeader:
; trigger count
db 0
@@ -20,9 +20,9 @@
appear $a
return
-TrainerSwimmerfElaine: ; 0x1a6174
+TrainerSwimmerfElaine:
; bit/flag number
- dw $3e8
+ dw EVENT_BEAT_SWIMMERF_ELAINE
; trainer group && trainer id
db SWIMMERF, ELAINE
@@ -38,9 +38,8 @@
; script when talk again
dw SwimmerfElaineScript
-; 0x1a6180
-SwimmerfElaineScript: ; 0x1a6180
+SwimmerfElaineScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a637b
@@ -47,11 +46,10 @@
closetext
loadmovesprites
end
-; 0x1a6188
-TrainerSwimmerfPaula: ; 0x1a6188
+TrainerSwimmerfPaula:
; bit/flag number
- dw $3e9
+ dw EVENT_BEAT_SWIMMERF_PAULA
; trainer group && trainer id
db SWIMMERF, PAULA
@@ -67,9 +65,8 @@
; script when talk again
dw SwimmerfPaulaScript
-; 0x1a6194
-SwimmerfPaulaScript: ; 0x1a6194
+SwimmerfPaulaScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a63f5
@@ -76,11 +73,10 @@
closetext
loadmovesprites
end
-; 0x1a619c
-TrainerSwimmermSimon: ; 0x1a619c
+TrainerSwimmermSimon:
; bit/flag number
- dw $595
+ dw EVENT_BEAT_SWIMMERM_SIMON
; trainer group && trainer id
db SWIMMERM, SIMON
@@ -96,9 +92,8 @@
; script when talk again
dw SwimmermSimonScript
-; 0x1a61a8
-SwimmermSimonScript: ; 0x1a61a8
+SwimmermSimonScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a6282
@@ -105,11 +100,10 @@
closetext
loadmovesprites
end
-; 0x1a61b0
-TrainerSwimmermRandall: ; 0x1a61b0
+TrainerSwimmermRandall:
; bit/flag number
- dw $596
+ dw EVENT_BEAT_SWIMMERM_RANDALL
; trainer group && trainer id
db SWIMMERM, RANDALL
@@ -125,9 +119,8 @@
; script when talk again
dw SwimmermRandallScript
-; 0x1a61bc
-SwimmermRandallScript: ; 0x1a61bc
+SwimmermRandallScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a62fa
@@ -134,29 +127,23 @@
closetext
loadmovesprites
end
-; 0x1a61c4
-LassScript_0x1a61c4: ; 0x1a61c4
+LassScript_0x1a61c4:
jumptextfaceplayer UnknownText_0x1a6429
-; 0x1a61c7
-PokefanMScript_0x1a61c7: ; 0x1a61c7
+PokefanMScript_0x1a61c7:
special Function10630f
iftrue UnknownScript_0x1a61d0
jumptextfaceplayer UnknownText_0x1a646a
-; 0x1a61d0
-UnknownScript_0x1a61d0: ; 0x1a61d0
+UnknownScript_0x1a61d0:
jumptextfaceplayer UnknownText_0x1a649b
-; 0x1a61d3
-LassScript_0x1a61d3: ; 0x1a61d3
+LassScript_0x1a61d3:
jumptextfaceplayer UnknownText_0x1a64e6
-; 0x1a61d6
-StandingYoungsterScript_0x1a61d6: ; 0x1a61d6
+StandingYoungsterScript_0x1a61d6:
jumptextfaceplayer UnknownText_0x1a6564
-; 0x1a61d9
MonicaScript:
faceplayer
@@ -194,20 +181,17 @@
loadmovesprites
end
-MapRoute40Signpost0Script: ; 0x1a6213
+MapRoute40Signpost0Script:
jumptext UnknownText_0x1a6767
-; 0x1a6216
-Route40Rock: ; 0x1a6216
+Route40Rock:
jumpstd smashrock
-; 0x1a6219
-MapRoute40SignpostItem1: ; 0x1a6219
+MapRoute40SignpostItem1:
dw $00ab
db HYPER_POTION
-; 0x1a621c
-MovementData_0x1a621c: ; 0x1a621c
+MovementData_0x1a621c:
step_right
step_up
step_up
@@ -216,9 +200,8 @@
step_up
step_up
step_end
-; 0x1a6224
-MovementData_0x1a6224: ; 0x1a6224
+MovementData_0x1a6224:
step_up
step_up
step_up
@@ -225,17 +208,15 @@
step_up
step_up
step_end
-; 0x1a622a
-MovementData_0x1a622a: ; 0x1a622a
+MovementData_0x1a622a:
step_up
step_up
step_up
step_up
step_end
-; 0x1a622f
-SwimmermSimonSeenText: ; 0x1a622f
+SwimmermSimonSeenText:
text "You have to warm"
line "up before going"
cont "into the water."
@@ -242,21 +223,18 @@
para "That's basic."
done
-; 0x1a626e
-SwimmermSimonBeatenText: ; 0x1a626e
+SwimmermSimonBeatenText:
text "OK! Uncle! I give!"
done
-; 0x1a6282
-UnknownText_0x1a6282: ; 0x1a6282
+UnknownText_0x1a6282:
text "CIANWOOD CITY is"
line "a good distance"
cont "away from here."
done
-; 0x1a62b4
-SwimmermRandallSeenText: ; 0x1a62b4
+SwimmermRandallSeenText:
text "Hey, you're young"
line "and fit!"
@@ -263,21 +241,18 @@
para "Don't ride your"
line "#MON! Swim!"
done
-; 0x1a62ea
-SwimmermRandallBeatenText: ; 0x1a62ea
+SwimmermRandallBeatenText:
text "Uh-oh. I lost…"
done
-; 0x1a62fa
-UnknownText_0x1a62fa: ; 0x1a62fa
+UnknownText_0x1a62fa:
text "Swimming exercises"
line "your entire body."
cont "It's healthy."
done
-; 0x1a632d
-SwimmerfElaineSeenText: ; 0x1a632d
+SwimmerfElaineSeenText:
text "Are you going to"
line "CIANWOOD?"
@@ -284,21 +259,18 @@
para "How about a quick"
line "battle first?"
done
-; 0x1a6369
-SwimmerfElaineBeatenText: ; 0x1a6369
+SwimmerfElaineBeatenText:
text "I lost that one!"
done
-; 0x1a637b
-UnknownText_0x1a637b: ; 0x1a637b
+UnknownText_0x1a637b:
text "I'd say I'm a bet-"
line "ter swimmer than"
cont "you. Yeah!"
done
-; 0x1a63a9
-SwimmerfPaulaSeenText: ; 0x1a63a9
+SwimmerfPaulaSeenText:
text "No inner tube for"
line "me."
@@ -305,22 +277,19 @@
para "I'm hanging on to"
line "a sea #MON!"
done
-; 0x1a63dd
-SwimmerfPaulaBeatenText: ; 0x1a63dd
+SwimmerfPaulaBeatenText:
text "Ooh, I'm feeling"
line "dizzy!"
done
-; 0x1a63f5
-UnknownText_0x1a63f5: ; 0x1a63f5
+UnknownText_0x1a63f5:
text "While I float like"
line "this, the waves"
cont "carry me along."
done
-; 0x1a6429
-UnknownText_0x1a6429: ; 0x1a6429
+UnknownText_0x1a6429:
text "Although you can't"
line "see it from here,"
@@ -327,17 +296,15 @@
para "CIANWOOD is across"
line "the sea."
done
-; 0x1a646a
-UnknownText_0x1a646a: ; 0x1a646a
+UnknownText_0x1a646a:
text "Hm! There's a big"
line "building up ahead!"
para "What is it?"
done
-; 0x1a649b
-UnknownText_0x1a649b: ; 0x1a649b
+UnknownText_0x1a649b:
text "Hm! Look at all"
line "those serious-"
cont "looking trainers"
@@ -345,9 +312,8 @@
para "What? What?"
done
-; 0x1a64e6
-UnknownText_0x1a64e6: ; 0x1a64e6
+UnknownText_0x1a64e6:
text "I came to OLIVINE"
line "by ship to see the"
@@ -358,9 +324,8 @@
line "feels so different"
cont "from a big city."
done
-; 0x1a6564
-UnknownText_0x1a6564: ; 0x1a6564
+UnknownText_0x1a6564:
text "Have you gone to"
line "the BATTLE TOWER?"
@@ -376,7 +341,6 @@
para "you shouldn't do"
line "badly at all."
done
-; 0x1a6606
MeetMonicaText:
text "MONICA: Glad to"
@@ -420,15 +384,14 @@
cont "Monday. How sad…"
done
-UnknownText_0x1a6767: ; 0x1a6767
+UnknownText_0x1a6767:
text "ROUTE 40"
para "CIANWOOD CITY -"
line "OLIVINE CITY"
done
-; 0x1a678e
-Route40_MapEventHeader: ; 0x1a678e
+Route40_MapEventHeader:
; filler
db 0, 0
--- a/maps/Route41.asm
+++ b/maps/Route41.asm
@@ -1,14 +1,13 @@
-Route41_MapScriptHeader: ; 0x1a683f
+Route41_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1a6841
-TrainerSwimmerfKaylee: ; 0x1a6841
+TrainerSwimmerfKaylee:
; bit/flag number
- dw $3ea
+ dw EVENT_BEAT_SWIMMERF_KAYLEE
; trainer group && trainer id
db SWIMMERF, KAYLEE
@@ -24,9 +23,8 @@
; script when talk again
dw SwimmerfKayleeScript
-; 0x1a684d
-SwimmerfKayleeScript: ; 0x1a684d
+SwimmerfKayleeScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a6c7f
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x1a6855
-TrainerSwimmerfSusie: ; 0x1a6855
+TrainerSwimmerfSusie:
; bit/flag number
- dw $3eb
+ dw EVENT_BEAT_SWIMMERF_SUSIE
; trainer group && trainer id
db SWIMMERF, SUSIE
@@ -53,9 +50,8 @@
; script when talk again
dw SwimmerfSusieScript
-; 0x1a6861
-SwimmerfSusieScript: ; 0x1a6861
+SwimmerfSusieScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a6d11
@@ -62,11 +58,10 @@
closetext
loadmovesprites
end
-; 0x1a6869
-TrainerSwimmerfDenise: ; 0x1a6869
+TrainerSwimmerfDenise:
; bit/flag number
- dw $3ec
+ dw EVENT_BEAT_SWIMMERF_DENISE
; trainer group && trainer id
db SWIMMERF, DENISE
@@ -82,9 +77,8 @@
; script when talk again
dw SwimmerfDeniseScript
-; 0x1a6875
-SwimmerfDeniseScript: ; 0x1a6875
+SwimmerfDeniseScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a6d79
@@ -91,11 +85,10 @@
closetext
loadmovesprites
end
-; 0x1a687d
-TrainerSwimmerfKara: ; 0x1a687d
+TrainerSwimmerfKara:
; bit/flag number
- dw $3ed
+ dw EVENT_BEAT_SWIMMERF_KARA
; trainer group && trainer id
db SWIMMERF, KARA
@@ -111,9 +104,8 @@
; script when talk again
dw SwimmerfKaraScript
-; 0x1a6889
-SwimmerfKaraScript: ; 0x1a6889
+SwimmerfKaraScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a6e58
@@ -120,11 +112,10 @@
closetext
loadmovesprites
end
-; 0x1a6891
-TrainerSwimmerfWendy: ; 0x1a6891
+TrainerSwimmerfWendy:
; bit/flag number
- dw $3ee
+ dw EVENT_BEAT_SWIMMERF_WENDY
; trainer group && trainer id
db SWIMMERF, WENDY
@@ -140,9 +131,8 @@
; script when talk again
dw SwimmerfWendyScript
-; 0x1a689d
-SwimmerfWendyScript: ; 0x1a689d
+SwimmerfWendyScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a6ec2
@@ -149,11 +139,10 @@
closetext
loadmovesprites
end
-; 0x1a68a5
-TrainerSwimmermCharlie: ; 0x1a68a5
+TrainerSwimmermCharlie:
; bit/flag number
- dw $597
+ dw EVENT_BEAT_SWIMMERM_CHARLIE
; trainer group && trainer id
db SWIMMERM, CHARLIE
@@ -169,9 +158,8 @@
; script when talk again
dw SwimmermCharlieScript
-; 0x1a68b1
-SwimmermCharlieScript: ; 0x1a68b1
+SwimmermCharlieScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a696e
@@ -178,11 +166,10 @@
closetext
loadmovesprites
end
-; 0x1a68b9
-TrainerSwimmermGeorge: ; 0x1a68b9
+TrainerSwimmermGeorge:
; bit/flag number
- dw $598
+ dw EVENT_BEAT_SWIMMERM_GEORGE
; trainer group && trainer id
db SWIMMERM, GEORGE
@@ -198,9 +185,8 @@
; script when talk again
dw SwimmermGeorgeScript
-; 0x1a68c5
-SwimmermGeorgeScript: ; 0x1a68c5
+SwimmermGeorgeScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a69d4
@@ -207,11 +193,10 @@
closetext
loadmovesprites
end
-; 0x1a68cd
-TrainerSwimmermBerke: ; 0x1a68cd
+TrainerSwimmermBerke:
; bit/flag number
- dw $599
+ dw EVENT_BEAT_SWIMMERM_BERKE
; trainer group && trainer id
db SWIMMERM, BERKE
@@ -227,9 +212,8 @@
; script when talk again
dw SwimmermBerkeScript
-; 0x1a68d9
-SwimmermBerkeScript: ; 0x1a68d9
+SwimmermBerkeScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a6aa4
@@ -236,11 +220,10 @@
closetext
loadmovesprites
end
-; 0x1a68e1
-TrainerSwimmermKirk: ; 0x1a68e1
+TrainerSwimmermKirk:
; bit/flag number
- dw $59a
+ dw EVENT_BEAT_SWIMMERM_KIRK
; trainer group && trainer id
db SWIMMERM, KIRK
@@ -256,9 +239,8 @@
; script when talk again
dw SwimmermKirkScript
-; 0x1a68ed
-SwimmermKirkScript: ; 0x1a68ed
+SwimmermKirkScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a6b6c
@@ -265,11 +247,10 @@
closetext
loadmovesprites
end
-; 0x1a68f5
-TrainerSwimmermMathew: ; 0x1a68f5
+TrainerSwimmermMathew:
; bit/flag number
- dw $59b
+ dw EVENT_BEAT_SWIMMERM_MATHEW
; trainer group && trainer id
db SWIMMERM, MATHEW
@@ -285,9 +266,8 @@
; script when talk again
dw SwimmermMathewScript
-; 0x1a6901
-SwimmermMathewScript: ; 0x1a6901
+SwimmermMathewScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a6bed
@@ -294,18 +274,16 @@
closetext
loadmovesprites
end
-; 0x1a6909
Route41Rock:
; unused
jumpstd smashrock
-MapRoute41SignpostItem0: ; 0x1a690c
+MapRoute41SignpostItem0:
dw $00ac
db MAX_ETHER
-; 0x1a690f
-SwimmermCharlieSeenText: ; 0x1a690f
+SwimmermCharlieSeenText:
text "The water's warm"
line "here. I'm loose"
cont "and limber."
@@ -313,34 +291,29 @@
para "Sure, I'll take"
line "you on!"
done
-; 0x1a6952
-SwimmermCharlieBeatenText: ; 0x1a6952
+SwimmermCharlieBeatenText:
text "Yikes! I've got"
line "prune skin!"
done
-; 0x1a696e
-UnknownText_0x1a696e: ; 0x1a696e
+UnknownText_0x1a696e:
text "Isn't it relaxing"
line "just floating like"
cont "this?"
done
-; 0x1a6999
-SwimmermGeorgeSeenText: ; 0x1a6999
+SwimmermGeorgeSeenText:
text "I'm a bit tired."
line "If I win, lend me"
cont "your #MON."
done
-; 0x1a69c7
-SwimmermGeorgeBeatenText: ; 0x1a69c7
+SwimmermGeorgeBeatenText:
text "Pant, pant…"
done
-; 0x1a69d4
-UnknownText_0x1a69d4: ; 0x1a69d4
+UnknownText_0x1a69d4:
text "It's so far to"
line "CIANWOOD."
@@ -350,9 +323,8 @@
para "What should I do?"
done
-; 0x1a6a2e
-SwimmermBerkeSeenText: ; 0x1a6a2e
+SwimmermBerkeSeenText:
text "See those islands"
line "that are blocked"
cont "by whirlpools?"
@@ -360,15 +332,13 @@
para "There just has to"
line "be a secret!"
done
-; 0x1a6a80
-SwimmermBerkeBeatenText: ; 0x1a6a80
+SwimmermBerkeBeatenText:
text "What's the secret"
line "to your strength?"
done
-; 0x1a6aa4
-UnknownText_0x1a6aa4: ; 0x1a6aa4
+UnknownText_0x1a6aa4:
text "It was a dark and"
line "stormy night…"
@@ -380,9 +350,8 @@
line "feathers from its"
cont "silver wings."
done
-; 0x1a6b26
-SwimmermKirkSeenText: ; 0x1a6b26
+SwimmermKirkSeenText:
text "The waves are wild"
line "here."
@@ -389,34 +358,29 @@
para "They tire you out"
line "while you swim."
done
-; 0x1a6b62
-SwimmermKirkBeatenText: ; 0x1a6b62
+SwimmermKirkBeatenText:
text "I'm beat!"
done
-; 0x1a6b6c
-UnknownText_0x1a6b6c: ; 0x1a6b6c
+UnknownText_0x1a6b6c:
text "The currents keep"
line "me from reaching"
cont "that island."
done
-; 0x1a6b9d
-SwimmermMathewSeenText: ; 0x1a6b9d
+SwimmermMathewSeenText:
text "Are you seeking"
line "the secrets of"
cont "WHIRL ISLANDS?"
done
-; 0x1a6bcc
-SwimmermMathewBeatenText: ; 0x1a6bcc
+SwimmermMathewBeatenText:
text "Ooh, you've got"
line "great endurance!"
done
-; 0x1a6bed
-UnknownText_0x1a6bed: ; 0x1a6bed
+UnknownText_0x1a6bed:
text "A secret about"
line "WHIRL ISLANDS…"
@@ -423,9 +387,8 @@
para "It's pitch-black"
line "inside!"
done
-; 0x1a6c24
-SwimmerfKayleeSeenText: ; 0x1a6c24
+SwimmerfKayleeSeenText:
text "I'm on my way to"
line "WHIRL ISLANDS."
@@ -432,15 +395,13 @@
para "I'm going explor-"
line "ing with friends."
done
-; 0x1a6c67
-SwimmerfKayleeBeatenText: ; 0x1a6c67
+SwimmerfKayleeBeatenText:
text "Is that how you do"
line "it?"
done
-; 0x1a6c7f
-UnknownText_0x1a6c7f: ; 0x1a6c7f
+UnknownText_0x1a6c7f:
text "There's supposed"
line "to be a big #-"
cont "MON deep beneath"
@@ -449,40 +410,34 @@
para "I wonder what it"
line "could be?"
done
-; 0x1a6cda
-SwimmerfSusieSeenText: ; 0x1a6cda
+SwimmerfSusieSeenText:
text "You look so ele-"
line "gant, riding your"
cont "#MON."
done
-; 0x1a6d04
-SwimmerfSusieBeatenText: ; 0x1a6d04
+SwimmerfSusieBeatenText:
text "I'm crushed…"
done
-; 0x1a6d11
-UnknownText_0x1a6d11: ; 0x1a6d11
+UnknownText_0x1a6d11:
text "Wasn't there a hit"
line "song about a boy"
cont "riding a LAPRAS?"
done
-; 0x1a6d46
-SwimmerfDeniseSeenText: ; 0x1a6d46
+SwimmerfDeniseSeenText:
text "The weather is so"
line "beautiful, I'm in"
cont "a daze!"
done
-; 0x1a6d72
-SwimmerfDeniseBeatenText: ; 0x1a6d72
+SwimmerfDeniseBeatenText:
text "Ohhh!"
done
-; 0x1a6d79
-UnknownText_0x1a6d79: ; 0x1a6d79
+UnknownText_0x1a6d79:
text "A sunburn is the"
line "worst for skin."
@@ -492,9 +447,8 @@
para "I won't pollute"
line "the water."
done
-; 0x1a6dd0
-SwimmerfKaraSeenText: ; 0x1a6dd0
+SwimmerfKaraSeenText:
text "If you need to"
line "rest, just tread"
cont "water."
@@ -505,34 +459,29 @@
para "can keep on going"
line "strong."
done
-; 0x1a6e33
-SwimmerfKaraBeatenText: ; 0x1a6e33
+SwimmerfKaraBeatenText:
text "Oh! You have more"
line "energy than I do."
done
-; 0x1a6e58
-UnknownText_0x1a6e58: ; 0x1a6e58
+UnknownText_0x1a6e58:
text "I heard roars from"
line "deep inside the"
cont "ISLANDS."
done
-; 0x1a6e85
-SwimmerfWendySeenText: ; 0x1a6e85
+SwimmerfWendySeenText:
text "At night, STARYU"
line "gather near the"
cont "water's surface."
done
-; 0x1a6eb7
-SwimmerfWendyBeatenText: ; 0x1a6eb7
+SwimmerfWendyBeatenText:
text "Oh, dear…"
done
-; 0x1a6ec2
-UnknownText_0x1a6ec2: ; 0x1a6ec2
+UnknownText_0x1a6ec2:
text "The clusters of"
line "STARYU light up"
cont "at the same time."
@@ -540,9 +489,8 @@
para "It's so beautiful,"
line "it's scary."
done
-; 0x1a6f12
-Route41_MapEventHeader: ; 0x1a6f12
+Route41_MapEventHeader:
; filler
db 0, 0
@@ -572,4 +520,3 @@
person_event SPRITE_SWIMMER_GIRL, 38, 31, $8, $0, 255, 255, $a2, 3, TrainerSwimmerfDenise, $ffff
person_event SPRITE_SWIMMER_GIRL, 32, 48, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfKara, $ffff
person_event SPRITE_SWIMMER_GIRL, 54, 13, $a, $0, 255, 255, $a2, 2, TrainerSwimmerfWendy, $ffff
-; 0x1a6fb3
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -1,4 +1,4 @@
-Route42_MapScriptHeader: ; 0x1a920c
+Route42_MapScriptHeader:
; trigger count
db 2
@@ -8,17 +8,14 @@
; callback count
db 0
-; 0x1a9216
-UnknownScript_0x1a9216: ; 0x1a9216
+UnknownScript_0x1a9216:
end
-; 0x1a9217
-UnknownScript_0x1a9217: ; 0x1a9217
+UnknownScript_0x1a9217:
end
-; 0x1a9218
-UnknownScript_0x1a9218: ; 0x1a9218
+UnknownScript_0x1a9218:
showemote $0, $0, 15
pause 15
playsound SFX_WARP_FROM
@@ -29,11 +26,10 @@
clearevent EVENT_SAW_SUICUNE_ON_ROUTE_36
domaptrigger GROUP_ROUTE_36, MAP_ROUTE_36, $1
end
-; 0x1a9233
-TrainerFisherTully1: ; 0x1a9233
+TrainerFisherTully1:
; bit/flag number
- dw $454
+ dw EVENT_BEAT_FISHER_TULLY
; trainer group && trainer id
db FISHER, TULLY1
@@ -49,9 +45,8 @@
; script when talk again
dw FisherTully1Script
-; 0x1a923f
-FisherTully1Script: ; 0x1a923f
+FisherTully1Script:
writecode VAR_CALLERID, $1d
talkaftercancel
loadfont
@@ -68,11 +63,10 @@
setevent $028f
scall UnknownScript_0x1a92f1
jump UnknownScript_0x1a926b
-; 0x1a9268
-UnknownScript_0x1a9268: ; 0x1a9268
+UnknownScript_0x1a9268:
scall UnknownScript_0x1a92f5
-UnknownScript_0x1a926b: ; 0x1a926b
+UnknownScript_0x1a926b:
askforphonenumber $1d
if_equal $1, UnknownScript_0x1a9305
if_equal $2, UnknownScript_0x1a9301
@@ -79,9 +73,8 @@
trainertotext FISHER, TULLY1, $0
scall UnknownScript_0x1a92f9
jump UnknownScript_0x1a92fd
-; 0x1a927f
-UnknownScript_0x1a927f: ; 0x1a927f
+UnknownScript_0x1a927f:
scall UnknownScript_0x1a9309
winlosstext FisherTully1BeatenText, $0000
copybytetovar wda06
@@ -89,16 +82,16 @@
if_equal $2, UnknownScript_0x1a92a0
if_equal $1, UnknownScript_0x1a92a6
if_equal $0, UnknownScript_0x1a92ac
-UnknownScript_0x1a929a: ; 0x1a929a
+UnknownScript_0x1a929a:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1a92d3
-UnknownScript_0x1a92a0: ; 0x1a92a0
+UnknownScript_0x1a92a0:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x1a92c6
-UnknownScript_0x1a92a6: ; 0x1a92a6
+UnknownScript_0x1a92a6:
checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue UnknownScript_0x1a92b9
-UnknownScript_0x1a92ac: ; 0x1a92ac
+UnknownScript_0x1a92ac:
loadtrainer FISHER, TULLY1
startbattle
returnafterbattle
@@ -105,9 +98,8 @@
loadvar wda06, $1
clearflag $0076
end
-; 0x1a92b9
-UnknownScript_0x1a92b9: ; 0x1a92b9
+UnknownScript_0x1a92b9:
loadtrainer FISHER, TULLY2
startbattle
returnafterbattle
@@ -114,9 +106,8 @@
loadvar wda06, $2
clearflag $0076
end
-; 0x1a92c6
-UnknownScript_0x1a92c6: ; 0x1a92c6
+UnknownScript_0x1a92c6:
loadtrainer FISHER, TULLY3
startbattle
returnafterbattle
@@ -123,17 +114,15 @@
loadvar wda06, $3
clearflag $0076
end
-; 0x1a92d3
-UnknownScript_0x1a92d3: ; 0x1a92d3
+UnknownScript_0x1a92d3:
loadtrainer FISHER, TULLY4
startbattle
returnafterbattle
clearflag $0076
end
-; 0x1a92dc
-UnknownScript_0x1a92dc: ; 0x1a92dc
+UnknownScript_0x1a92dc:
scall UnknownScript_0x1a930d
verbosegiveitem WATER_STONE, 1
iffalse UnknownScript_0x1a92ee
@@ -140,60 +129,49 @@
clearflag $0084
setevent $0103
jump UnknownScript_0x1a92fd
-; 0x1a92ee
-UnknownScript_0x1a92ee: ; 0x1a92ee
+UnknownScript_0x1a92ee:
jump UnknownScript_0x1a9311
-; 0x1a92f1
-UnknownScript_0x1a92f1: ; 0x1a92f1
+UnknownScript_0x1a92f1:
jumpstd asknumber1m
end
-; 0x1a92f5
-UnknownScript_0x1a92f5: ; 0x1a92f5
+UnknownScript_0x1a92f5:
jumpstd asknumber2m
end
-; 0x1a92f9
-UnknownScript_0x1a92f9: ; 0x1a92f9
+UnknownScript_0x1a92f9:
jumpstd registerednumberm
end
-; 0x1a92fd
-UnknownScript_0x1a92fd: ; 0x1a92fd
+UnknownScript_0x1a92fd:
jumpstd numberacceptedm
end
-; 0x1a9301
-UnknownScript_0x1a9301: ; 0x1a9301
+UnknownScript_0x1a9301:
jumpstd numberdeclinedm
end
-; 0x1a9305
-UnknownScript_0x1a9305: ; 0x1a9305
+UnknownScript_0x1a9305:
jumpstd phonefullm
end
-; 0x1a9309
-UnknownScript_0x1a9309: ; 0x1a9309
+UnknownScript_0x1a9309:
jumpstd rematchm
end
-; 0x1a930d
-UnknownScript_0x1a930d: ; 0x1a930d
+UnknownScript_0x1a930d:
jumpstd giftm
end
-; 0x1a9311
-UnknownScript_0x1a9311: ; 0x1a9311
+UnknownScript_0x1a9311:
jumpstd packfullm
end
-; 0x1a9315
-TrainerPokemaniacShane: ; 0x1a9315
+TrainerPokemaniacShane:
; bit/flag number
- dw $4e7
+ dw EVENT_BEAT_POKEMANIAC_SHANE
; trainer group && trainer id
db POKEMANIAC, SHANE
@@ -209,9 +187,8 @@
; script when talk again
dw PokemaniacShaneScript
-; 0x1a9321
-PokemaniacShaneScript: ; 0x1a9321
+PokemaniacShaneScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a94d6
@@ -218,11 +195,10 @@
closetext
loadmovesprites
end
-; 0x1a9329
-TrainerHikerBenjamin: ; 0x1a9329
+TrainerHikerBenjamin:
; bit/flag number
- dw $529
+ dw EVENT_BEAT_HIKER_BENJAMIN
; trainer group && trainer id
db HIKER, BENJAMIN
@@ -238,9 +214,8 @@
; script when talk again
dw HikerBenjaminScript
-; 0x1a9335
-HikerBenjaminScript: ; 0x1a9335
+HikerBenjaminScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a943f
@@ -247,51 +222,40 @@
closetext
loadmovesprites
end
-; 0x1a933d
-MapRoute42Signpost0Script: ; 0x1a933d
+MapRoute42Signpost0Script:
jumptext UnknownText_0x1a9537
-; 0x1a9340
-MapRoute42Signpost1Script: ; 0x1a9340
+MapRoute42Signpost1Script:
jumptext UnknownText_0x1a955f
-; 0x1a9343
-MapRoute42Signpost2Script: ; 0x1a9343
+MapRoute42Signpost2Script:
jumptext UnknownText_0x1a9580
-; 0x1a9346
-MapRoute42Signpost3Script: ; 0x1a9346
+MapRoute42Signpost3Script:
jumptext UnknownText_0x1a95a1
-; 0x1a9349
-ItemFragment_0x1a9349: ; 0x1a9349
+ItemFragment_0x1a9349:
db ULTRA_BALL, 1
-; 0x1a934b
-ItemFragment_0x1a934b: ; 0x1a934b
+ItemFragment_0x1a934b:
db SUPER_POTION, 1
-; 0x1a934d
-FruitTreeScript_0x1a934d: ; 0x1a934d
+FruitTreeScript_0x1a934d:
fruittree $15
-; 0x1a934f
-FruitTreeScript_0x1a934f: ; 0x1a934f
+FruitTreeScript_0x1a934f:
fruittree $16
-; 0x1a9351
-FruitTreeScript_0x1a9351: ; 0x1a9351
+FruitTreeScript_0x1a9351:
fruittree $17
-; 0x1a9353
-MapRoute42SignpostItem4: ; 0x1a9353
+MapRoute42SignpostItem4:
dw $00ad
db MAX_POTION
-; 0x1a9356
-MovementData_0x1a9356: ; 0x1a9356
+MovementData_0x1a9356:
db $39 ; movement
fast_jump_step_up
fast_jump_step_up
@@ -301,22 +265,19 @@
fast_jump_step_right
db $38 ; movement
step_end
-; 0x1a935f
-FisherTully1SeenText: ; 0x1a935f
+FisherTully1SeenText:
text "Let me demonstrate"
line "the power of the"
cont "#MON I caught!"
done
-; 0x1a9393
-FisherTully1BeatenText: ; 0x1a9393
+FisherTully1BeatenText:
text "What? That's not"
line "right."
done
-; 0x1a93ab
-UnknownText_0x1a93ab: ; 0x1a93ab
+UnknownText_0x1a93ab:
text "I want to become"
line "the trainer CHAMP"
@@ -326,21 +287,18 @@
para "That's the best"
line "part of fishing!"
done
-; 0x1a9408
-HikerBenjaminSeenText: ; 0x1a9408
+HikerBenjaminSeenText:
text "Ah, it's good to"
line "be outside!"
cont "I feel so free!"
done
-; 0x1a9435
-HikerBenjaminBeatenText: ; 0x1a9435
+HikerBenjaminBeatenText:
text "Gahahah!"
done
-; 0x1a943f
-UnknownText_0x1a943f: ; 0x1a943f
+UnknownText_0x1a943f:
text "Losing feels in-"
line "significant if you"
@@ -347,9 +305,8 @@
para "look up at the big"
line "sky!"
done
-; 0x1a947c
-PokemaniacShaneSeenText: ; 0x1a947c
+PokemaniacShaneSeenText:
text "HEY!"
para "This is my secret"
@@ -356,15 +313,13 @@
line "place! Get lost,"
cont "you outsider!"
done
-; 0x1a94b3
-PokemaniacShaneBeatenText: ; 0x1a94b3
+PokemaniacShaneBeatenText:
text "I should have used"
line "my MOON STONE…"
done
-; 0x1a94d6
-UnknownText_0x1a94d6: ; 0x1a94d6
+UnknownText_0x1a94d6:
text "You're working on"
line "a #DEX?"
@@ -375,41 +330,36 @@
para "May I please see"
line "it. Please?"
done
-; 0x1a9537
-UnknownText_0x1a9537: ; 0x1a9537
+UnknownText_0x1a9537:
text "ROUTE 42"
para "ECRUTEAK CITY -"
line "MAHOGANY TOWN"
done
-; 0x1a955f
-UnknownText_0x1a955f: ; 0x1a955f
+UnknownText_0x1a955f:
text "MT.MORTAR"
para "WATERFALL CAVE"
line "INSIDE"
done
-; 0x1a9580
-UnknownText_0x1a9580: ; 0x1a9580
+UnknownText_0x1a9580:
text "MT.MORTAR"
para "WATERFALL CAVE"
line "INSIDE"
done
-; 0x1a95a1
-UnknownText_0x1a95a1: ; 0x1a95a1
+UnknownText_0x1a95a1:
text "ROUTE 42"
para "ECRUTEAK CITY -"
line "MAHOGANY TOWN"
done
-; 0x1a95c9
-Route42_MapEventHeader: ; 0x1a95c9
+Route42_MapEventHeader:
; filler
db 0, 0
@@ -444,4 +394,3 @@
person_event SPRITE_POKE_BALL, 8, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a9349, $06b3
person_event SPRITE_POKE_BALL, 12, 37, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a934b, $06b4
person_event SPRITE_SUICUNE, 20, 30, $1, $0, 255, 255, $90, 0, ObjectEvent, $07af
-; 0x1a967e
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -1,4 +1,4 @@
-Route43_MapScriptHeader: ; 0x19d04c
+Route43_MapScriptHeader:
; trigger count
db 0
@@ -8,23 +8,20 @@
; callbacks
dbw 5, UnknownScript_0x19d051
-; 0x19d051
-UnknownScript_0x19d051: ; 0x19d051
+UnknownScript_0x19d051:
checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue UnknownScript_0x19d05c
domaptrigger GROUP_ROUTE_43_GATE, MAP_ROUTE_43_GATE, $0
return
-; 0x19d05c
-UnknownScript_0x19d05c: ; 0x19d05c
+UnknownScript_0x19d05c:
domaptrigger GROUP_ROUTE_43_GATE, MAP_ROUTE_43_GATE, $1
return
-; 0x19d061
-TrainerCamperSpencer: ; 0x19d061
+TrainerCamperSpencer:
; bit/flag number
- dw $42c
+ dw EVENT_BEAT_CAMPER_SPENCER
; trainer group && trainer id
db CAMPER, SPENCER
@@ -40,9 +37,8 @@
; script when talk again
dw CamperSpencerScript
-; 0x19d06d
-CamperSpencerScript: ; 0x19d06d
+CamperSpencerScript:
talkaftercancel
loadfont
writetext UnknownText_0x19d57e
@@ -49,11 +45,10 @@
closetext
loadmovesprites
end
-; 0x19d075
-TrainerPokemaniacBen: ; 0x19d075
+TrainerPokemaniacBen:
; bit/flag number
- dw $4e8
+ dw EVENT_BEAT_POKEMANIAC_BEN
; trainer group && trainer id
db POKEMANIAC, BEN
@@ -69,9 +64,8 @@
; script when talk again
dw PokemaniacBenScript
-; 0x19d081
-PokemaniacBenScript: ; 0x19d081
+PokemaniacBenScript:
talkaftercancel
loadfont
writetext UnknownText_0x19d2d2
@@ -78,11 +72,10 @@
closetext
loadmovesprites
end
-; 0x19d089
-TrainerPokemaniacBrent1: ; 0x19d089
+TrainerPokemaniacBrent1:
; bit/flag number
- dw $4e9
+ dw EVENT_BEAT_POKEMANIAC_BRENT
; trainer group && trainer id
db POKEMANIAC, BRENT1
@@ -98,9 +91,8 @@
; script when talk again
dw PokemaniacBrent1Script
-; 0x19d095
-PokemaniacBrent1Script: ; 0x19d095
+PokemaniacBrent1Script:
writecode VAR_CALLERID, $1e
talkaftercancel
loadfont
@@ -115,11 +107,10 @@
setevent $0291
scall UnknownScript_0x19d12c
jump UnknownScript_0x19d0bb
-; 0x19d0b8
-UnknownScript_0x19d0b8: ; 0x19d0b8
+UnknownScript_0x19d0b8:
scall UnknownScript_0x19d130
-UnknownScript_0x19d0bb: ; 0x19d0bb
+UnknownScript_0x19d0bb:
askforphonenumber $1e
if_equal $1, UnknownScript_0x19d140
if_equal $2, UnknownScript_0x19d13c
@@ -126,9 +117,8 @@
trainertotext POKEMANIAC, BRENT1, $0
scall UnknownScript_0x19d134
jump UnknownScript_0x19d138
-; 0x19d0cf
-UnknownScript_0x19d0cf: ; 0x19d0cf
+UnknownScript_0x19d0cf:
scall UnknownScript_0x19d144
winlosstext PokemaniacBrent1BeatenText, $0000
copybytetovar wda07
@@ -136,16 +126,16 @@
if_equal $2, UnknownScript_0x19d0f0
if_equal $1, UnknownScript_0x19d0f6
if_equal $0, UnknownScript_0x19d0fc
-UnknownScript_0x19d0ea: ; 0x19d0ea
+UnknownScript_0x19d0ea:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x19d123
-UnknownScript_0x19d0f0: ; 0x19d0f0
+UnknownScript_0x19d0f0:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x19d116
-UnknownScript_0x19d0f6: ; 0x19d0f6
+UnknownScript_0x19d0f6:
checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue UnknownScript_0x19d109
-UnknownScript_0x19d0fc: ; 0x19d0fc
+UnknownScript_0x19d0fc:
loadtrainer POKEMANIAC, BRENT1
startbattle
returnafterbattle
@@ -152,9 +142,8 @@
loadvar wda07, $1
clearflag $0077
end
-; 0x19d109
-UnknownScript_0x19d109: ; 0x19d109
+UnknownScript_0x19d109:
loadtrainer POKEMANIAC, BRENT2
startbattle
returnafterbattle
@@ -161,9 +150,8 @@
loadvar wda07, $2
clearflag $0077
end
-; 0x19d116
-UnknownScript_0x19d116: ; 0x19d116
+UnknownScript_0x19d116:
loadtrainer POKEMANIAC, BRENT3
startbattle
returnafterbattle
@@ -170,54 +158,45 @@
loadvar wda07, $3
clearflag $0077
end
-; 0x19d123
-UnknownScript_0x19d123: ; 0x19d123
+UnknownScript_0x19d123:
loadtrainer POKEMANIAC, BRENT4
startbattle
returnafterbattle
clearflag $0077
end
-; 0x19d12c
-UnknownScript_0x19d12c: ; 0x19d12c
+UnknownScript_0x19d12c:
jumpstd asknumber1m
end
-; 0x19d130
-UnknownScript_0x19d130: ; 0x19d130
+UnknownScript_0x19d130:
jumpstd asknumber2m
end
-; 0x19d134
-UnknownScript_0x19d134: ; 0x19d134
+UnknownScript_0x19d134:
jumpstd registerednumberm
end
-; 0x19d138
-UnknownScript_0x19d138: ; 0x19d138
+UnknownScript_0x19d138:
jumpstd numberacceptedm
end
-; 0x19d13c
-UnknownScript_0x19d13c: ; 0x19d13c
+UnknownScript_0x19d13c:
jumpstd numberdeclinedm
end
-; 0x19d140
-UnknownScript_0x19d140: ; 0x19d140
+UnknownScript_0x19d140:
jumpstd phonefullm
end
-; 0x19d144
-UnknownScript_0x19d144: ; 0x19d144
+UnknownScript_0x19d144:
jumpstd rematchm
end
-; 0x19d148
-TrainerPokemaniacRon: ; 0x19d148
+TrainerPokemaniacRon:
; bit/flag number
- dw $4ea
+ dw EVENT_BEAT_POKEMANIAC_RON
; trainer group && trainer id
db POKEMANIAC, RON
@@ -233,9 +212,8 @@
; script when talk again
dw PokemaniacRonScript
-; 0x19d154
-PokemaniacRonScript: ; 0x19d154
+PokemaniacRonScript:
talkaftercancel
loadfont
writetext UnknownText_0x19d3f8
@@ -242,11 +220,10 @@
closetext
loadmovesprites
end
-; 0x19d15c
-TrainerFisherMarvin: ; 0x19d15c
+TrainerFisherMarvin:
; bit/flag number
- dw $453
+ dw EVENT_BEAT_FISHER_MARVIN
; trainer group && trainer id
db FISHER, MARVIN
@@ -262,9 +239,8 @@
; script when talk again
dw FisherMarvinScript
-; 0x19d168
-FisherMarvinScript: ; 0x19d168
+FisherMarvinScript:
talkaftercancel
loadfont
writetext UnknownText_0x19d4d3
@@ -271,11 +247,10 @@
closetext
loadmovesprites
end
-; 0x19d170
-TrainerPicnickerTiffany3: ; 0x19d170
+TrainerPicnickerTiffany3:
; bit/flag number
- dw $491
+ dw EVENT_BEAT_PICNICKER_TIFFANY
; trainer group && trainer id
db PICNICKER, TIFFANY3
@@ -291,9 +266,8 @@
; script when talk again
dw PicnickerTiffany3Script
-; 0x19d17c
-PicnickerTiffany3Script: ; 0x19d17c
+PicnickerTiffany3Script:
writecode VAR_CALLERID, $1f
talkaftercancel
loadfont
@@ -312,11 +286,10 @@
setevent EVENT_SHOWED_TIFFANY_CLEFAIRY
scall UnknownScript_0x19d239
jump UnknownScript_0x19d1ad
-; 0x19d1aa
-UnknownScript_0x19d1aa: ; 0x19d1aa
+UnknownScript_0x19d1aa:
scall UnknownScript_0x19d23d
-UnknownScript_0x19d1ad: ; 0x19d1ad
+UnknownScript_0x19d1ad:
askforphonenumber $1f
if_equal $1, UnknownScript_0x19d24d
if_equal $2, UnknownScript_0x19d249
@@ -323,9 +296,8 @@
trainertotext PICNICKER, TIFFANY3, $0
scall UnknownScript_0x19d241
jump UnknownScript_0x19d245
-; 0x19d1c1
-UnknownScript_0x19d1c1: ; 0x19d1c1
+UnknownScript_0x19d1c1:
scall UnknownScript_0x19d251
winlosstext PicnickerTiffany3BeatenText, $0000
copybytetovar wda08
@@ -333,16 +305,16 @@
if_equal $2, UnknownScript_0x19d1e2
if_equal $1, UnknownScript_0x19d1e8
if_equal $0, UnknownScript_0x19d1ee
-UnknownScript_0x19d1dc: ; 0x19d1dc
+UnknownScript_0x19d1dc:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x19d215
-UnknownScript_0x19d1e2: ; 0x19d1e2
+UnknownScript_0x19d1e2:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x19d208
-UnknownScript_0x19d1e8: ; 0x19d1e8
+UnknownScript_0x19d1e8:
checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x19d1fb
-UnknownScript_0x19d1ee: ; 0x19d1ee
+UnknownScript_0x19d1ee:
loadtrainer PICNICKER, TIFFANY3
startbattle
returnafterbattle
@@ -349,9 +321,8 @@
loadvar wda08, $1
clearflag $0078
end
-; 0x19d1fb
-UnknownScript_0x19d1fb: ; 0x19d1fb
+UnknownScript_0x19d1fb:
loadtrainer PICNICKER, TIFFANY1
startbattle
returnafterbattle
@@ -358,9 +329,8 @@
loadvar wda08, $2
clearflag $0078
end
-; 0x19d208
-UnknownScript_0x19d208: ; 0x19d208
+UnknownScript_0x19d208:
loadtrainer PICNICKER, TIFFANY2
startbattle
returnafterbattle
@@ -367,17 +337,15 @@
loadvar wda08, $3
clearflag $0078
end
-; 0x19d215
-UnknownScript_0x19d215: ; 0x19d215
+UnknownScript_0x19d215:
loadtrainer PICNICKER, TIFFANY4
startbattle
returnafterbattle
clearflag $0078
end
-; 0x19d21e
-UnknownScript_0x19d21e: ; 0x19d21e
+UnknownScript_0x19d21e:
scall UnknownScript_0x19d255
verbosegiveitem PINK_BOW, 1
iffalse UnknownScript_0x19d230
@@ -384,85 +352,68 @@
clearflag $0085
setevent $0104
jump UnknownScript_0x19d245
-; 0x19d230
-UnknownScript_0x19d230: ; 0x19d230
+UnknownScript_0x19d230:
jump UnknownScript_0x19d259
-; 0x19d233
-UnknownScript_0x19d233: ; 0x19d233
+UnknownScript_0x19d233:
writetext UnknownText_0x19d64b
closetext
loadmovesprites
end
-; 0x19d239
-UnknownScript_0x19d239: ; 0x19d239
+UnknownScript_0x19d239:
jumpstd asknumber1f
end
-; 0x19d23d
-UnknownScript_0x19d23d: ; 0x19d23d
+UnknownScript_0x19d23d:
jumpstd asknumber2f
end
-; 0x19d241
-UnknownScript_0x19d241: ; 0x19d241
+UnknownScript_0x19d241:
jumpstd registerednumberf
end
-; 0x19d245
-UnknownScript_0x19d245: ; 0x19d245
+UnknownScript_0x19d245:
jumpstd numberacceptedf
end
-; 0x19d249
-UnknownScript_0x19d249: ; 0x19d249
+UnknownScript_0x19d249:
jumpstd numberdeclinedf
end
-; 0x19d24d
-UnknownScript_0x19d24d: ; 0x19d24d
+UnknownScript_0x19d24d:
jumpstd phonefullf
end
-; 0x19d251
-UnknownScript_0x19d251: ; 0x19d251
+UnknownScript_0x19d251:
jumpstd rematchf
end
-; 0x19d255
-UnknownScript_0x19d255: ; 0x19d255
+UnknownScript_0x19d255:
jumpstd giftf
end
-; 0x19d259
-UnknownScript_0x19d259: ; 0x19d259
+UnknownScript_0x19d259:
jumpstd packfullf
end
-; 0x19d25d
-MapRoute43Signpost0Script: ; 0x19d25d
+MapRoute43Signpost0Script:
jumptext UnknownText_0x19d67b
-; 0x19d260
-MapRoute43Signpost1Script: ; 0x19d260
+MapRoute43Signpost1Script:
jumptext UnknownText_0x19d6a2
-; 0x19d263
-MapRoute43Signpost2Script: ; 0x19d263
+MapRoute43Signpost2Script:
jumptext UnknownText_0x19d6c9
-; 0x19d266
-FruitTreeScript_0x19d266: ; 0x19d266
+FruitTreeScript_0x19d266:
fruittree $8
-; 0x19d268
-ItemFragment_0x19d268: ; 0x19d268
+ItemFragment_0x19d268:
db MAX_ETHER, 1
-; 0x19d26a
-PokemaniacBenSeenText: ; 0x19d26a
+PokemaniacBenSeenText:
text "I love #MON!"
para "That's why I"
@@ -471,15 +422,13 @@
para "I'll keep on col-"
line "lecting #MON!"
done
-; 0x19d2b4
-PokemaniacBenBeatenText: ; 0x19d2b4
+PokemaniacBenBeatenText:
text "How could you do"
line "this to me?"
done
-; 0x19d2d2
-UnknownText_0x19d2d2: ; 0x19d2d2
+UnknownText_0x19d2d2:
text "What else do I"
line "like besides"
cont "#MON?"
@@ -487,28 +436,24 @@
para "MARY on the radio."
line "I bet she's cute!"
done
-; 0x19d319
-PokemaniacBrent1SeenText: ; 0x19d319
+PokemaniacBrent1SeenText:
text "Hey! Do you have"
line "any rare #MON?"
done
-; 0x19d33a
-PokemaniacBrent1BeatenText: ; 0x19d33a
+PokemaniacBrent1BeatenText:
text "Oh, my poor #-"
line "MON! Darlings!"
done
-; 0x19d359
-UnknownText_0x19d359: ; 0x19d359
+UnknownText_0x19d359:
text "I'd be happy just"
line "to own a single"
cont "rare #MON."
done
-; 0x19d386
-PokemaniacRonSeenText: ; 0x19d386
+PokemaniacRonSeenText:
text "Would you get"
line "this?"
@@ -519,15 +464,13 @@
para "Darn it! My #-"
line "MON's great!"
done
-; 0x19d3d6
-PokemaniacRonBeatenText: ; 0x19d3d6
+PokemaniacRonBeatenText:
text "My NIDOKING did"
line "pretty right on!"
done
-; 0x19d3f8
-UnknownText_0x19d3f8: ; 0x19d3f8
+UnknownText_0x19d3f8:
text "It's okay for"
line "people to like"
@@ -538,9 +481,8 @@
line "about having the"
cont "most powerful one."
done
-; 0x19d461
-FisherMarvinSeenText: ; 0x19d461
+FisherMarvinSeenText:
text "I'm in a slump."
para "Maybe it's the"
@@ -549,15 +491,13 @@
para "Let's battle for a"
line "change of pace!"
done
-; 0x19d4b0
-FisherMarvinBeatenText: ; 0x19d4b0
+FisherMarvinBeatenText:
text "I lost, but I feel"
line "better anyway."
done
-; 0x19d4d3
-UnknownText_0x19d4d3: ; 0x19d4d3
+UnknownText_0x19d4d3:
text "KURT's LURE BALL"
line "is the best for"
@@ -568,22 +508,19 @@
line "effective than a"
cont "ULTRA BALL."
done
-; 0x19d535
-CamperSpencerSeenText: ; 0x19d535
+CamperSpencerSeenText:
text "I can do so much"
line "with my #MON--"
cont "it's super-fun!"
done
-; 0x19d565
-CamperSpencerBeatenText: ; 0x19d565
+CamperSpencerBeatenText:
text "Losing isn't fun"
line "at all…"
done
-; 0x19d57e
-UnknownText_0x19d57e: ; 0x19d57e
+UnknownText_0x19d57e:
text "What is going on"
line "at LAKE OF RAGE?"
@@ -590,9 +527,8 @@
para "We were planning"
line "to camp there."
done
-; 0x19d5c1
-PicnickerTiffany3SeenText: ; 0x19d5c1
+PicnickerTiffany3SeenText:
text "Are you going to"
line "LAKE OF RAGE too?"
@@ -599,45 +535,39 @@
para "Let's play for a "
line "little while!"
done
-; 0x19d604
-PicnickerTiffany3BeatenText: ; 0x19d604
+PicnickerTiffany3BeatenText:
text "I played too much!"
done
-; 0x19d618
-UnknownText_0x19d618: ; 0x19d618
+UnknownText_0x19d618:
text "I'm having a pic-"
line "nic with #MON."
para "Won't you join us?"
done
-; 0x19d64b
-UnknownText_0x19d64b: ; 0x19d64b
+UnknownText_0x19d64b:
text "Isn't my CLEFAIRY"
line "just the most"
cont "adorable thing?"
done
-; 0x19d67b
-UnknownText_0x19d67b: ; 0x19d67b
+UnknownText_0x19d67b:
text "ROUTE 43"
para "LAKE OF RAGE -"
line "MAHOGANY TOWN"
done
-; 0x19d6a2
-UnknownText_0x19d6a2: ; 0x19d6a2
+UnknownText_0x19d6a2:
text "ROUTE 43"
para "LAKE OF RAGE -"
line "MAHOGANY TOWN"
done
-; 0x19d6c9
-UnknownText_0x19d6c9: ; 0x19d6c9
+UnknownText_0x19d6c9:
text "TRAINER TIPS"
para "All #MON have"
@@ -658,9 +588,8 @@
para "weak against your"
line "#MON's type."
done
-; 0x19d78c
-Route43_MapEventHeader: ; 0x19d78c
+Route43_MapEventHeader:
; filler
db 0, 0
@@ -691,4 +620,3 @@
person_event SPRITE_YOUNGSTER, 44, 17, $a, $0, 255, 255, $a2, 3, TrainerCamperSpencer, $ffff
person_event SPRITE_FRUIT_TREE, 30, 5, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19d266, $ffff
person_event SPRITE_POKE_BALL, 36, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x19d268, $06b5
-; 0x19d822
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -1,14 +1,13 @@
-Route44_MapScriptHeader: ; 0x19d822
+Route44_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x19d824
-TrainerBird_keeperVance1: ; 0x19d824
+TrainerBird_keeperVance1:
; bit/flag number
- dw $401
+ dw EVENT_BEAT_BIRD_KEEPER_VANCE
; trainer group && trainer id
db BIRD_KEEPER, VANCE1
@@ -24,9 +23,8 @@
; script when talk again
dw Bird_keeperVance1Script
-; 0x19d830
-Bird_keeperVance1Script: ; 0x19d830
+Bird_keeperVance1Script:
writecode VAR_CALLERID, $20
talkaftercancel
loadfont
@@ -41,11 +39,10 @@
setevent $0295
scall UnknownScript_0x19d8df
jump UnknownScript_0x19d856
-; 0x19d853
-UnknownScript_0x19d853: ; 0x19d853
+UnknownScript_0x19d853:
scall UnknownScript_0x19d8e3
-UnknownScript_0x19d856: ; 0x19d856
+UnknownScript_0x19d856:
askforphonenumber $20
if_equal $1, UnknownScript_0x19d8f3
if_equal $2, UnknownScript_0x19d8ef
@@ -52,9 +49,8 @@
trainertotext BIRD_KEEPER, VANCE1, $0
scall UnknownScript_0x19d8e7
jump UnknownScript_0x19d8eb
-; 0x19d86a
-UnknownScript_0x19d86a: ; 0x19d86a
+UnknownScript_0x19d86a:
scall UnknownScript_0x19d8f7
winlosstext Bird_keeperVance1BeatenText, $0000
copybytetovar wda09
@@ -61,13 +57,13 @@
if_equal $2, UnknownScript_0x19d881
if_equal $1, UnknownScript_0x19d887
if_equal $0, UnknownScript_0x19d88d
-UnknownScript_0x19d881: ; 0x19d881
+UnknownScript_0x19d881:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x19d8a7
-UnknownScript_0x19d887: ; 0x19d887
+UnknownScript_0x19d887:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x19d89a
-UnknownScript_0x19d88d: ; 0x19d88d
+UnknownScript_0x19d88d:
loadtrainer BIRD_KEEPER, VANCE1
startbattle
returnafterbattle
@@ -74,9 +70,8 @@
loadvar wda09, $1
clearflag $0079
end
-; 0x19d89a
-UnknownScript_0x19d89a: ; 0x19d89a
+UnknownScript_0x19d89a:
loadtrainer BIRD_KEEPER, VANCE2
startbattle
returnafterbattle
@@ -83,9 +78,8 @@
loadvar wda09, $2
clearflag $0079
end
-; 0x19d8a7
-UnknownScript_0x19d8a7: ; 0x19d8a7
+UnknownScript_0x19d8a7:
loadtrainer BIRD_KEEPER, VANCE3
startbattle
returnafterbattle
@@ -99,13 +93,11 @@
iffalse UnknownScript_0x19d903
setevent $0267
jump UnknownScript_0x19d8eb
-; 0x19d8ca
-UnknownScript_0x19d8ca: ; 0x19d8ca
+UnknownScript_0x19d8ca:
end
-; 0x19d8cb
-UnknownScript_0x19d8cb: ; 0x19d8cb
+UnknownScript_0x19d8cb:
loadfont
writetext UnknownText_0x19dc67
closetext
@@ -114,67 +106,55 @@
clearevent EVENT_VANCE_CARBOS
setevent $0267
jump UnknownScript_0x19d8eb
-; 0x19d8df
-UnknownScript_0x19d8df: ; 0x19d8df
+UnknownScript_0x19d8df:
jumpstd asknumber1m
end
-; 0x19d8e3
-UnknownScript_0x19d8e3: ; 0x19d8e3
+UnknownScript_0x19d8e3:
jumpstd asknumber2m
end
-; 0x19d8e7
-UnknownScript_0x19d8e7: ; 0x19d8e7
+UnknownScript_0x19d8e7:
jumpstd registerednumberm
end
-; 0x19d8eb
-UnknownScript_0x19d8eb: ; 0x19d8eb
+UnknownScript_0x19d8eb:
jumpstd numberacceptedm
end
-; 0x19d8ef
-UnknownScript_0x19d8ef: ; 0x19d8ef
+UnknownScript_0x19d8ef:
jumpstd numberdeclinedm
end
-; 0x19d8f3
-UnknownScript_0x19d8f3: ; 0x19d8f3
+UnknownScript_0x19d8f3:
jumpstd phonefullm
end
-; 0x19d8f7
-UnknownScript_0x19d8f7: ; 0x19d8f7
+UnknownScript_0x19d8f7:
jumpstd rematchm
end
-; 0x19d8fb
-UnknownScript_0x19d8fb: ; 0x19d8fb
+UnknownScript_0x19d8fb:
jumpstd giftm
end
-; 0x19d8ff
-UnknownScript_0x19d8ff: ; 0x19d8ff
+UnknownScript_0x19d8ff:
jumpstd packfullm
end
-; 0x19d903
-UnknownScript_0x19d903: ; 0x19d903
+UnknownScript_0x19d903:
setevent EVENT_VANCE_CARBOS
jumpstd packfullm
end
-; 0x19d90a
-UnknownScript_0x19d90a: ; 0x19d90a
+UnknownScript_0x19d90a:
jumpstd rematchgiftm
end
-; 0x19d90e
-TrainerPsychicPhil: ; 0x19d90e
+TrainerPsychicPhil:
; bit/flag number
- dw $441
+ dw EVENT_BEAT_PSYCHIC_PHIL
; trainer group && trainer id
db PSYCHIC_T, PHIL
@@ -190,9 +170,8 @@
; script when talk again
dw PsychicPhilScript
-; 0x19d91a
-PsychicPhilScript: ; 0x19d91a
+PsychicPhilScript:
talkaftercancel
loadfont
writetext UnknownText_0x19dcfc
@@ -199,11 +178,10 @@
closetext
loadmovesprites
end
-; 0x19d922
-TrainerFisherWilton1: ; 0x19d922
+TrainerFisherWilton1:
; bit/flag number
- dw $457
+ dw EVENT_BEAT_FISHER_WILTON
; trainer group && trainer id
db FISHER, WILTON1
@@ -219,9 +197,8 @@
; script when talk again
dw FisherWilton1Script
-; 0x19d92e
-FisherWilton1Script: ; 0x19d92e
+FisherWilton1Script:
writecode VAR_CALLERID, $21
talkaftercancel
loadfont
@@ -238,11 +215,10 @@
setevent $0297
scall UnknownScript_0x19d8df
jump UnknownScript_0x19d95a
-; 0x19d957
-UnknownScript_0x19d957: ; 0x19d957
+UnknownScript_0x19d957:
scall UnknownScript_0x19d8e3
-UnknownScript_0x19d95a: ; 0x19d95a
+UnknownScript_0x19d95a:
askforphonenumber $21
if_equal $1, UnknownScript_0x19d8f3
if_equal $2, UnknownScript_0x19d8ef
@@ -249,9 +225,8 @@
trainertotext FISHER, WILTON1, $0
scall UnknownScript_0x19d8e7
jump UnknownScript_0x19d8eb
-; 0x19d96e
-UnknownScript_0x19d96e: ; 0x19d96e
+UnknownScript_0x19d96e:
scall UnknownScript_0x19d8f7
winlosstext FisherWilton1BeatenText, $0000
copybytetovar wda0a
@@ -258,13 +233,13 @@
if_equal $2, UnknownScript_0x19d985
if_equal $1, UnknownScript_0x19d98b
if_equal $0, UnknownScript_0x19d991
-UnknownScript_0x19d985: ; 0x19d985
+UnknownScript_0x19d985:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x19d9ab
-UnknownScript_0x19d98b: ; 0x19d98b
+UnknownScript_0x19d98b:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x19d99e
-UnknownScript_0x19d991: ; 0x19d991
+UnknownScript_0x19d991:
loadtrainer FISHER, WILTON1
startbattle
returnafterbattle
@@ -271,9 +246,8 @@
loadvar wda0a, $1
clearflag $007a
end
-; 0x19d99e
-UnknownScript_0x19d99e: ; 0x19d99e
+UnknownScript_0x19d99e:
loadtrainer FISHER, WILTON2
startbattle
returnafterbattle
@@ -280,17 +254,15 @@
loadvar wda0a, $2
clearflag $007a
end
-; 0x19d9ab
-UnknownScript_0x19d9ab: ; 0x19d9ab
+UnknownScript_0x19d9ab:
loadtrainer FISHER, WILTON3
startbattle
returnafterbattle
clearflag $007a
end
-; 0x19d9b4
-UnknownScript_0x19d9b4: ; 0x19d9b4
+UnknownScript_0x19d9b4:
scall UnknownScript_0x19d8fb
checkevent EVENT_WILTON_HAS_ULTRA_BALL
iftrue UnknownScript_0x19d9c9
@@ -298,33 +270,29 @@
iftrue UnknownScript_0x19d9d2
checkevent EVENT_WILTON_HAS_POKE_BALL
iftrue UnknownScript_0x19d9db
-UnknownScript_0x19d9c9: ; 0x19d9c9
+UnknownScript_0x19d9c9:
verbosegiveitem ULTRA_BALL, 1
iffalse UnknownScript_0x19d9e7
jump UnknownScript_0x19d9e1
-; 0x19d9d2
-UnknownScript_0x19d9d2: ; 0x19d9d2
+UnknownScript_0x19d9d2:
verbosegiveitem GREAT_BALL, 1
iffalse UnknownScript_0x19d9e7
jump UnknownScript_0x19d9e1
-; 0x19d9db
-UnknownScript_0x19d9db: ; 0x19d9db
+UnknownScript_0x19d9db:
verbosegiveitem POKE_BALL, 1
iffalse UnknownScript_0x19d9e7
-UnknownScript_0x19d9e1: ; 0x19d9e1
+UnknownScript_0x19d9e1:
clearflag $0086
jump UnknownScript_0x19d8eb
-; 0x19d9e7
-UnknownScript_0x19d9e7: ; 0x19d9e7
+UnknownScript_0x19d9e7:
jump UnknownScript_0x19d8ff
-; 0x19d9ea
-TrainerFisherEdgar: ; 0x19d9ea
+TrainerFisherEdgar:
; bit/flag number
- dw $458
+ dw EVENT_BEAT_FISHER_EDGAR
; trainer group && trainer id
db FISHER, EDGAR
@@ -340,9 +308,8 @@
; script when talk again
dw FisherEdgarScript
-; 0x19d9f6
-FisherEdgarScript: ; 0x19d9f6
+FisherEdgarScript:
talkaftercancel
loadfont
writetext UnknownText_0x19db6f
@@ -349,11 +316,10 @@
closetext
loadmovesprites
end
-; 0x19d9fe
-TrainerCooltrainerfCybil: ; 0x19d9fe
+TrainerCooltrainerfCybil:
; bit/flag number
- dw $56a
+ dw EVENT_BEAT_COOLTRAINERF_CYBIL
; trainer group && trainer id
db COOLTRAINERF, CYBIL
@@ -369,9 +335,8 @@
; script when talk again
dw CooltrainerfCybilScript
-; 0x19da0a
-CooltrainerfCybilScript: ; 0x19da0a
+CooltrainerfCybilScript:
talkaftercancel
loadfont
writetext UnknownText_0x19df4d
@@ -378,11 +343,10 @@
closetext
loadmovesprites
end
-; 0x19da12
-TrainerPokemaniacZach: ; 0x19da12
+TrainerPokemaniacZach:
; bit/flag number
- dw $4f0
+ dw EVENT_BEAT_POKEMANIAC_ZACH
; trainer group && trainer id
db POKEMANIAC, ZACH
@@ -398,9 +362,8 @@
; script when talk again
dw PokemaniacZachScript
-; 0x19da1e
-PokemaniacZachScript: ; 0x19da1e
+PokemaniacZachScript:
talkaftercancel
loadfont
writetext UnknownText_0x19dd7e
@@ -407,11 +370,10 @@
closetext
loadmovesprites
end
-; 0x19da26
-TrainerCooltrainermAllen: ; 0x19da26
+TrainerCooltrainermAllen:
; bit/flag number
- dw $55a
+ dw EVENT_BEAT_COOLTRAINERM_ALLEN
; trainer group && trainer id
db COOLTRAINERM, ALLEN
@@ -427,9 +389,8 @@
; script when talk again
dw CooltrainermAllenScript
-; 0x19da32
-CooltrainermAllenScript: ; 0x19da32
+CooltrainermAllenScript:
talkaftercancel
loadfont
writetext UnknownText_0x19de66
@@ -436,39 +397,31 @@
closetext
loadmovesprites
end
-; 0x19da3a
-MapRoute44Signpost0Script: ; 0x19da3a
+MapRoute44Signpost0Script:
jumptext UnknownText_0x19dfb3
-; 0x19da3d
-MapRoute44Signpost1Script: ; 0x19da3d
+MapRoute44Signpost1Script:
jumptext UnknownText_0x19dfcc
-; 0x19da40
-FruitTreeScript_0x19da40: ; 0x19da40
+FruitTreeScript_0x19da40:
fruittree $10
-; 0x19da42
-ItemFragment_0x19da42: ; 0x19da42
+ItemFragment_0x19da42:
db MAX_REVIVE, 1
-; 0x19da44
-ItemFragment_0x19da44: ; 0x19da44
+ItemFragment_0x19da44:
db ULTRA_BALL, 1
-; 0x19da46
-ItemFragment_0x19da46: ; 0x19da46
+ItemFragment_0x19da46:
db MAX_REPEL, 1
-; 0x19da48
-MapRoute44SignpostItem2: ; 0x19da48
+MapRoute44SignpostItem2:
dw $00ae
db ELIXER
-; 0x19da4b
-FisherWilton1SeenText: ; 0x19da4b
+FisherWilton1SeenText:
text "Aack! You made me"
line "lose a POLIWAG!"
@@ -475,15 +428,13 @@
para "What are you going"
line "to do about it?"
done
-; 0x19da91
-FisherWilton1BeatenText: ; 0x19da91
+FisherWilton1BeatenText:
text "Just forget about"
line "it."
done
-; 0x19daa8
-UnknownText_0x19daa8: ; 0x19daa8
+UnknownText_0x19daa8:
text "That POLIWAG that"
line "got away…"
cont "It was huge."
@@ -491,9 +442,8 @@
para "I swear it must've"
line "been 16 feet long!"
done
-; 0x19daf7
-FisherEdgarSeenText: ; 0x19daf7
+FisherEdgarSeenText:
text "I fish until I"
line "can't anymore."
@@ -504,15 +454,13 @@
line "relationship"
cont "with my #MON."
done
-; 0x19db55
-FisherEdgarBeatenText: ; 0x19db55
+FisherEdgarBeatenText:
text "Hmmmm… "
line "This isn't right."
done
-; 0x19db6f
-UnknownText_0x19db6f: ; 0x19db6f
+UnknownText_0x19db6f:
text "That's 100 wins"
line "to 101 losses."
@@ -519,22 +467,19 @@
para "I won't battle"
line "again for a while."
done
-; 0x19dbaf
-Bird_keeperVance1SeenText: ; 0x19dbaf
+Bird_keeperVance1SeenText:
text "Do you know about"
line "the legendary bird"
cont "#MON?"
done
-; 0x19dbdb
-Bird_keeperVance1BeatenText: ; 0x19dbdb
+Bird_keeperVance1BeatenText:
text "Whew! You're hot"
line "stuff."
done
-; 0x19dbf3
-UnknownText_0x19dbf3: ; 0x19dbf3
+UnknownText_0x19dbf3:
text "ARTICUNO, ZAPDOS"
line "and MOLTRES are"
@@ -545,9 +490,8 @@
line "other legendary"
cont "birds, though."
done
-; 0x19dc67
-UnknownText_0x19dc67: ; 0x19dc67
+UnknownText_0x19dc67:
text "Why can't I ever"
line "beat you?"
@@ -557,41 +501,35 @@
para "I couldn't give"
line "you last time."
done
-; 0x19dcc4
-PsychicPhilSeenText: ; 0x19dcc4
+PsychicPhilSeenText:
text "I'm gonna win,"
line "for sure!"
done
-; 0x19dcdd
-PsychicPhilBeatenText: ; 0x19dcdd
+PsychicPhilBeatenText:
text "Arrgh… That's a"
line "shocking loss…"
done
-; 0x19dcfc
-UnknownText_0x19dcfc: ; 0x19dcfc
+UnknownText_0x19dcfc:
text "It's important to"
line "have conviction"
cont "on your side."
done
-; 0x19dd2c
-PokemaniacZachSeenText: ; 0x19dd2c
+PokemaniacZachSeenText:
text "I'll do anything"
line "to get my hands on"
cont "rare #MON!"
done
-; 0x19dd5b
-PokemaniacZachBeatenText: ; 0x19dd5b
+PokemaniacZachBeatenText:
text "Oooh, your #MON"
line "are so appealing."
done
-; 0x19dd7e
-UnknownText_0x19dd7e: ; 0x19dd7e
+UnknownText_0x19dd7e:
text "If a #MON has"
line "different colors"
@@ -601,9 +539,8 @@
para "What? You mean"
line "that's not true?"
done
-; 0x19dddc
-CooltrainermAllenSeenText: ; 0x19dddc
+CooltrainermAllenSeenText:
text "I can tell you're"
line "a good trainer by"
cont "looking at you."
@@ -612,15 +549,13 @@
line "MON, and I can see"
cont "that you are too."
done
-; 0x19de43
-CooltrainermAllenBeatenText: ; 0x19de43
+CooltrainermAllenBeatenText:
text "Tch! It's a total"
line "loss on my part."
done
-; 0x19de66
-UnknownText_0x19de66: ; 0x19de66
+UnknownText_0x19de66:
text "Wow. You have a"
line "lot of BADGES."
@@ -636,9 +571,8 @@
para "He really hammered"
line "me."
done
-; 0x19deed
-CooltrainerfCybilSeenText: ; 0x19deed
+CooltrainerfCybilSeenText:
text "You look strong."
para "Good trainers seek"
@@ -645,15 +579,13 @@
line "tough opponents"
cont "instinctively."
done
-; 0x19df31
-CooltrainerfCybilBeatenText: ; 0x19df31
+CooltrainerfCybilBeatenText:
text "Nope! This won't"
line "do at all."
done
-; 0x19df4d
-UnknownText_0x19df4d: ; 0x19df4d
+UnknownText_0x19df4d:
text "We all get better"
line "by experiencing"
cont "many battles."
@@ -662,23 +594,20 @@
line "become what I am"
cont "today--an elite."
done
-; 0x19dfb3
-UnknownText_0x19dfb3: ; 0x19dfb3
+UnknownText_0x19dfb3:
text "ROUTE 44"
line "ICE PATH AHEAD"
done
-; 0x19dfcc
-UnknownText_0x19dfcc: ; 0x19dfcc
+UnknownText_0x19dfcc:
text "ROUTE 44"
para "MAHOGANY TOWN -"
line "BLACKTHORN CITY"
done
-; 0x19dff6
-Route44_MapEventHeader: ; 0x19dff6
+Route44_MapEventHeader:
; filler
db 0, 0
@@ -708,4 +637,3 @@
person_event SPRITE_POKE_BALL, 12, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da42, $06b6
person_event SPRITE_POKE_BALL, 8, 49, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da44, $06b7
person_event SPRITE_POKE_BALL, 13, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da46, $07bd
-; 0x19e09f
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -1,14 +1,13 @@
-Route45_MapScriptHeader: ; 0x19e09f
+Route45_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x19e0a1
-TrainerBlackbeltKenji3: ; 0x19e0a1
+TrainerBlackbeltKenji:
; bit/flag number
- dw $4ab
+ dw EVENT_BEAT_BLACKBELT_KENJI
; trainer group && trainer id
db BLACKBELT_T, KENJI3
@@ -24,9 +23,8 @@
; script when talk again
dw BlackbeltKenji3Script
-; 0x19e0ad
-BlackbeltKenji3Script: ; 0x19e0ad
+BlackbeltKenji3Script:
writecode VAR_CALLERID, $22
talkaftercancel
loadfont
@@ -40,11 +38,10 @@
setevent $0299
scall UnknownScript_0x19e11b
jump UnknownScript_0x19e0d0
-; 0x19e0cd
-UnknownScript_0x19e0cd: ; 0x19e0cd
+UnknownScript_0x19e0cd:
scall UnknownScript_0x19e11f
-UnknownScript_0x19e0d0: ; 0x19e0d0
+UnknownScript_0x19e0d0:
askforphonenumber $22
if_equal $1, UnknownScript_0x19e12f
if_equal $2, UnknownScript_0x19e12b
@@ -51,9 +48,8 @@
trainertotext BLACKBELT_T, KENJI3, $0
scall UnknownScript_0x19e123
jump UnknownScript_0x19e127
-; 0x19e0e4
-UnknownScript_0x19e0e4: ; 0x19e0e4
+UnknownScript_0x19e0e4:
checkcode VAR_1A
if_not_equal $1, UnknownScript_0x19e127
checkmorn
@@ -68,85 +64,70 @@
clearevent $026a
special Function11485
jump UnknownScript_0x19e127
-; 0x19e10c
-UnknownScript_0x19e10c: ; 0x19e10c
+UnknownScript_0x19e10c:
writetext UnknownText_0x19e634
closetext
loadmovesprites
end
-; 0x19e112
-UnknownScript_0x19e112: ; 0x19e112
+UnknownScript_0x19e112:
writetext UnknownText_0x19e66c
closetext
loadmovesprites
end
-; 0x19e118
-UnknownScript_0x19e118: ; 0x19e118
+UnknownScript_0x19e118:
jump UnknownScript_0x19e13b
-; 0x19e11b
-UnknownScript_0x19e11b: ; 0x19e11b
+UnknownScript_0x19e11b:
jumpstd asknumber1m
end
-; 0x19e11f
-UnknownScript_0x19e11f: ; 0x19e11f
+UnknownScript_0x19e11f:
jumpstd asknumber2m
end
-; 0x19e123
-UnknownScript_0x19e123: ; 0x19e123
+UnknownScript_0x19e123:
jumpstd registerednumberm
end
-; 0x19e127
-UnknownScript_0x19e127: ; 0x19e127
+UnknownScript_0x19e127:
jumpstd numberacceptedm
end
-; 0x19e12b
-UnknownScript_0x19e12b: ; 0x19e12b
+UnknownScript_0x19e12b:
jumpstd numberdeclinedm
end
-; 0x19e12f
-UnknownScript_0x19e12f: ; 0x19e12f
+UnknownScript_0x19e12f:
jumpstd phonefullm
end
-; 0x19e133
-UnknownScript_0x19e133: ; 0x19e133
+UnknownScript_0x19e133:
jumpstd rematchm
end
-; 0x19e137
-UnknownScript_0x19e137: ; 0x19e137
+UnknownScript_0x19e137:
jumpstd giftm
end
-; 0x19e13b
-UnknownScript_0x19e13b: ; 0x19e13b
+UnknownScript_0x19e13b:
jumpstd packfullm
end
-; 0x19e13f
-UnknownScript_0x19e13f: ; 0x19e13f
+UnknownScript_0x19e13f:
setevent EVENT_PARRY_IRON
jumpstd packfullm
end
-; 0x19e146
-UnknownScript_0x19e146: ; 0x19e146
+UnknownScript_0x19e146:
jumpstd rematchgiftm
end
-; 0x19e14a
-TrainerHikerErik: ; 0x19e14a
+TrainerHikerErik:
; bit/flag number
- dw $52a
+ dw EVENT_BEAT_HIKER_ERIK
; trainer group && trainer id
db HIKER, ERIK
@@ -162,9 +143,8 @@
; script when talk again
dw HikerErikScript
-; 0x19e156
-HikerErikScript: ; 0x19e156
+HikerErikScript:
talkaftercancel
loadfont
writetext UnknownText_0x19e301
@@ -171,11 +151,10 @@
closetext
loadmovesprites
end
-; 0x19e15e
-TrainerHikerMichael: ; 0x19e15e
+TrainerHikerMichael:
; bit/flag number
- dw $52b
+ dw EVENT_BEAT_HIKER_MICHAEL
; trainer group && trainer id
db HIKER, MICHAEL
@@ -191,9 +170,8 @@
; script when talk again
dw HikerMichaelScript
-; 0x19e16a
-HikerMichaelScript: ; 0x19e16a
+HikerMichaelScript:
talkaftercancel
loadfont
writetext UnknownText_0x19e3b1
@@ -200,11 +178,10 @@
closetext
loadmovesprites
end
-; 0x19e172
-TrainerHikerParry3: ; 0x19e172
+TrainerHikerParry:
; bit/flag number
- dw $52c
+ dw EVENT_BEAT_HIKER_PARRY
; trainer group && trainer id
db HIKER, PARRY3
@@ -220,9 +197,8 @@
; script when talk again
dw HikerParry3Script
-; 0x19e17e
-HikerParry3Script: ; 0x19e17e
+HikerParry3Script:
writecode VAR_CALLERID, $23
talkaftercancel
loadfont
@@ -237,11 +213,10 @@
setevent $029b
scall UnknownScript_0x19e11b
jump UnknownScript_0x19e1a4
-; 0x19e1a1
-UnknownScript_0x19e1a1: ; 0x19e1a1
+UnknownScript_0x19e1a1:
scall UnknownScript_0x19e11f
-UnknownScript_0x19e1a4: ; 0x19e1a4
+UnknownScript_0x19e1a4:
askforphonenumber $23
if_equal $1, UnknownScript_0x19e12f
if_equal $2, UnknownScript_0x19e12b
@@ -248,9 +223,8 @@
trainertotext HIKER, PARRY1, $0
scall UnknownScript_0x19e123
jump UnknownScript_0x19e127
-; 0x19e1b8
-UnknownScript_0x19e1b8: ; 0x19e1b8
+UnknownScript_0x19e1b8:
scall UnknownScript_0x19e133
winlosstext HikerParry3BeatenText, $0000
copybytetovar wda0c
@@ -257,13 +231,13 @@
if_equal $2, UnknownScript_0x19e1cf
if_equal $1, UnknownScript_0x19e1d5
if_equal $0, UnknownScript_0x19e1db
-UnknownScript_0x19e1cf: ; 0x19e1c
+UnknownScript_0x19e1cf:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x19e1f5
-UnknownScript_0x19e1d5: ; 0x19e1d5
+UnknownScript_0x19e1d5:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x19e1e8
-UnknownScript_0x19e1db: ; 0x19e1db
+UnknownScript_0x19e1db:
loadtrainer HIKER, PARRY3
startbattle
returnafterbattle
@@ -270,9 +244,8 @@
loadvar wda0c, $1
clearflag $007b
end
-; 0x19e1e8
-UnknownScript_0x19e1e8: ; 0x19e1e8
+UnknownScript_0x19e1e8:
loadtrainer HIKER, PARRY1
startbattle
returnafterbattle
@@ -279,9 +252,8 @@
loadvar wda0c, $2
clearflag $007b
end
-; 0x19e1f5
-UnknownScript_0x19e1f5: ; 0x19e1f5
+UnknownScript_0x19e1f5:
loadtrainer HIKER, PARRY2
startbattle
returnafterbattle
@@ -295,13 +267,11 @@
iffalse UnknownScript_0x19e13f
setevent $0268
jump UnknownScript_0x19e127
-; 0x19e218
-UnknownScript_0x19e218: ; 0x19e218
+UnknownScript_0x19e218:
end
-; 0x19e219
-UnknownScript_0x19e219: ; 0x19e219
+UnknownScript_0x19e219:
loadfont
writetext UnknownText_0x19e52c
closetext
@@ -310,11 +280,10 @@
clearevent EVENT_PARRY_IRON
setevent $0268
jump UnknownScript_0x19e127
-; 0x19e22d
-TrainerHikerTimothy: ; 0x19e22d
+TrainerHikerTimothy:
; bit/flag number
- dw $52d
+ dw EVENT_BEAT_HIKER_TIMOTHY
; trainer group && trainer id
db HIKER, TIMOTHY
@@ -330,9 +299,8 @@
; script when talk again
dw HikerTimothyScript
-; 0x19e239
-HikerTimothyScript: ; 0x19e239
+HikerTimothyScript:
talkaftercancel
loadfont
writetext UnknownText_0x19e4f1
@@ -339,11 +307,10 @@
closetext
loadmovesprites
end
-; 0x19e241
-TrainerCooltrainermRyan: ; 0x19e241
+TrainerCooltrainermRyan:
; bit/flag number
- dw $54f
+ dw EVENT_BEAT_COOLTRAINERM_RYAN
; trainer group && trainer id
db COOLTRAINERM, RYAN
@@ -359,9 +326,8 @@
; script when talk again
dw CooltrainermRyanScript
-; 0x19e24d
-CooltrainermRyanScript: ; 0x19e24d
+CooltrainermRyanScript:
talkaftercancel
loadfont
writetext UnknownText_0x19e70d
@@ -368,11 +334,10 @@
closetext
loadmovesprites
end
-; 0x19e255
-TrainerCooltrainerfKelly: ; 0x19e255
+TrainerCooltrainerfKelly:
; bit/flag number
- dw $561
+ dw EVENT_BEAT_COOLTRAINERF_KELLY
; trainer group && trainer id
db COOLTRAINERF, KELLY
@@ -388,9 +353,8 @@
; script when talk again
dw CooltrainerfKellyScript
-; 0x19e261
-CooltrainerfKellyScript: ; 0x19e261
+CooltrainerfKellyScript:
talkaftercancel
loadfont
writetext UnknownText_0x19e7d1
@@ -397,12 +361,11 @@
closetext
loadmovesprites
end
-; 0x19e269
-YoungsterScript_0x19e269: ; 0x19e269
+YoungsterScript_0x19e269:
faceplayer
loadfont
- checkevent $05c3
+ checkevent EVENT_BEAT_CAMPER_QUENTIN
iftrue UnknownScript_0x19e285
writetext UnknownText_0x19e87f
closetext
@@ -411,56 +374,46 @@
loadtrainer CAMPER, QUENTIN
startbattle
returnafterbattle
- setevent $05c3
+ setevent EVENT_BEAT_CAMPER_QUENTIN
loadmovesprites
end
-; 0x19e285
-UnknownScript_0x19e285: ; 0x19e285
+UnknownScript_0x19e285:
writetext UnknownText_0x19e8bb
closetext
loadmovesprites
end
-; 0x19e28b
-UnknownScript_0x19e28b: ; 0x19e28b
+UnknownScript_0x19e28b:
writetext UnknownText_0x19e830
closetext
loadmovesprites
end
-; 0x19e291
-MapRoute45Signpost0Script: ; 0x19e291
+MapRoute45Signpost0Script:
jumptext UnknownText_0x19e8fe
-; 0x19e294
-FruitTreeScript_0x19e294: ; 0x19e294
+FruitTreeScript_0x19e294:
fruittree $c
-; 0x19e296
-ItemFragment_0x19e296: ; 0x19e296
+ItemFragment_0x19e296:
db NUGGET, 1
-; 0x19e298
-ItemFragment_0x19e298: ; 0x19e298
+ItemFragment_0x19e298:
db REVIVE, 1
-; 0x19e29a
-ItemFragment_0x19e29a: ; 0x19e29a
+ItemFragment_0x19e29a:
db ELIXER, 1
-; 0x19e29c
-ItemFragment_0x19e29c: ; 0x19e29c
+ItemFragment_0x19e29c:
db MAX_POTION, 1
-; 0x19e29e
-MapRoute45SignpostItem1: ; 0x19e29e
+MapRoute45SignpostItem1:
dw $00af
db PP_UP
-; 0x19e2a1
-HikerErikSeenText: ; 0x19e2a1
+HikerErikSeenText:
text "Be prepared for"
line "anything!"
@@ -468,14 +421,12 @@
line "#MON have been"
cont "raised properly!"
done
-; 0x19e2ef
-HikerErikBeatenText: ; 0x19e2ef
+HikerErikBeatenText:
text "Oh, I lost that!"
done
-; 0x19e301
-UnknownText_0x19e301: ; 0x19e301
+UnknownText_0x19e301:
text "I'll head back to"
line "BLACKTHORN's ICE"
@@ -482,9 +433,8 @@
para "PATH and train"
line "some more."
done
-; 0x19e33d
-HikerMichaelSeenText: ; 0x19e33d
+HikerMichaelSeenText:
text "Yo! You're spunky!"
line "But you know what?"
@@ -492,15 +442,13 @@
line "sheer spunkiness,"
cont "I'm the man!"
done
-; 0x19e392
-HikerMichaelBeatenText: ; 0x19e392
+HikerMichaelBeatenText:
text "My #MON weren't"
line "spunky enough!"
done
-; 0x19e3b1
-UnknownText_0x19e3b1: ; 0x19e3b1
+UnknownText_0x19e3b1:
text "Boy, do I love"
line "HP UP! Mmmm, yum!"
@@ -509,21 +457,18 @@
para "I can't help it!"
done
-; 0x19e3fd
-HikerParry3SeenText: ; 0x19e3fd
+HikerParry3SeenText:
text "My #MON are"
line "power packed!"
done
-; 0x19e418
-HikerParry3BeatenText: ; 0x19e418
+HikerParry3BeatenText:
text "Wahahah! I'm the"
line "big loser!"
done
-; 0x19e434
-UnknownText_0x19e434: ; 0x19e434
+UnknownText_0x19e434:
text "I'm not much good"
line "at thinking, see?"
@@ -530,9 +475,8 @@
para "So, I just plow"
line "ahead with power!"
done
-; 0x19e47a
-HikerTimothySeenText: ; 0x19e47a
+HikerTimothySeenText:
text "Why do I climb"
line "mountains?"
@@ -545,15 +489,13 @@
para "Because they're"
line "there!"
done
-; 0x19e4d6
-HikerTimothyBeatenText: ; 0x19e4d6
+HikerTimothyBeatenText:
text "Losses…"
line "They're there too!"
done
-; 0x19e4f1
-UnknownText_0x19e4f1: ; 0x19e4f1
+UnknownText_0x19e4f1:
text "The best thing to"
line "ever happen to me"
@@ -560,9 +502,8 @@
para "was discovering"
line "#MON."
done
-; 0x19e52c
-UnknownText_0x19e52c: ; 0x19e52c
+UnknownText_0x19e52c:
text "I just can't find"
line "a way to win!"
@@ -574,9 +515,8 @@
para "you couldn't take"
line "when we last met."
done
-; 0x19e59c
-BlackbeltKenji3SeenText: ; 0x19e59c
+BlackbeltKenji3SeenText:
text "I was training"
line "here alone."
@@ -583,14 +523,12 @@
para "Behold the fruits"
line "of my labor!"
done
-; 0x19e5d7
-BlackbeltKenji3BeatenText: ; 0x19e5d7
+BlackbeltKenji3BeatenText:
text "Waaaargh!"
done
-; 0x19e5e2
-UnknownText_0x19e5e2: ; 0x19e5e2
+UnknownText_0x19e5e2:
text "This calls for"
line "extreme measures."
@@ -598,16 +536,14 @@
line "hills and train in"
cont "solitude."
done
-; 0x19e634
-UnknownText_0x19e634: ; 0x19e634
+UnknownText_0x19e634:
text "I'm going to train"
line "a bit more before"
cont "I break for lunch."
done
-; 0x19e66c
-UnknownText_0x19e66c: ; 0x19e66c
+UnknownText_0x19e66c:
text "We had plenty of"
line "rest at lunch, so"
@@ -617,22 +553,19 @@
para "We're going to"
line "train again!"
done
-; 0x19e6cb
-CooltrainermRyanSeenText: ; 0x19e6cb
+CooltrainermRyanSeenText:
text "What are your"
line "thoughts on rais-"
cont "ing #MON?"
done
-; 0x19e6f6
-CooltrainermRyanBeatenText: ; 0x19e6f6
+CooltrainermRyanBeatenText:
text "You've won my"
line "respect."
done
-; 0x19e70d
-UnknownText_0x19e70d: ; 0x19e70d
+UnknownText_0x19e70d:
text "I see you're rais-"
line "ing your #MON"
cont "with care."
@@ -641,9 +574,8 @@
line "will save you in"
cont "tough situations."
done
-; 0x19e76f
-CooltrainerfKellySeenText: ; 0x19e76f
+CooltrainerfKellySeenText:
text "What is your"
line "battle strategy?"
@@ -651,14 +583,12 @@
line "use strong moves"
cont "indiscriminately."
done
-; 0x19e7c2
-CooltrainerfKellyBeatenText: ; 0x19e7c2
+CooltrainerfKellyBeatenText:
text "Fine. I lost."
done
-; 0x19e7d1
-UnknownText_0x19e7d1: ; 0x19e7d1
+UnknownText_0x19e7d1:
text "I'm not in favor"
line "of overly power-"
cont "ful moves."
@@ -667,9 +597,8 @@
line "I also don't want"
cont "to harm #MON."
done
-; 0x19e830
-UnknownText_0x19e830: ; 0x19e830
+UnknownText_0x19e830:
text "I'm really, really"
line "tough!"
@@ -677,21 +606,18 @@
line "I can prove how"
cont "tough I really am?"
done
-; 0x19e87f
-UnknownText_0x19e87f: ; 0x19e87f
+UnknownText_0x19e87f:
text "I'm really, really"
line "tough!"
done
-; 0x19e899
-UnknownText_0x19e899: ; 0x19e899
+UnknownText_0x19e899:
text "I was tough at the"
line "BATTLE TOWER…"
done
-; 0x19e8bb
-UnknownText_0x19e8bb: ; 0x19e8bb
+UnknownText_0x19e8bb:
text "Have you been to"
line "the BATTLE TOWER?"
@@ -698,15 +624,13 @@
para "I never, ever lose"
line "there, but…"
done
-; 0x19e8fe
-UnknownText_0x19e8fe: ; 0x19e8fe
+UnknownText_0x19e8fe:
text "ROUTE 45"
line "MOUNTAIN RD. AHEAD"
done
-; 0x19e91b
-Route45_MapEventHeader: ; 0x19e91b
+Route45_MapEventHeader:
; filler
db 0, 0
@@ -726,9 +650,9 @@
db 13
person_event SPRITE_POKEFAN_M, 20, 14, $9, $0, 255, 255, $b2, 1, TrainerHikerErik, $ffff
person_event SPRITE_POKEFAN_M, 69, 19, $9, $0, 255, 255, $b2, 2, TrainerHikerMichael, $ffff
- person_event SPRITE_POKEFAN_M, 32, 9, $7, $0, 255, 255, $b2, 2, TrainerHikerParry3, $ffff
+ person_event SPRITE_POKEFAN_M, 32, 9, $7, $0, 255, 255, $b2, 2, TrainerHikerParry, $ffff
person_event SPRITE_POKEFAN_M, 69, 13, $8, $0, 255, 255, $b2, 1, TrainerHikerTimothy, $ffff
- person_event SPRITE_BLACK_BELT, 54, 15, $a, $0, 255, 255, $b2, 2, TrainerBlackbeltKenji3, $ffff
+ person_event SPRITE_BLACK_BELT, 54, 15, $a, $0, 255, 255, $b2, 2, TrainerBlackbeltKenji, $ffff
person_event SPRITE_COOLTRAINER_M, 22, 21, $8, $0, 255, 255, $82, 1, TrainerCooltrainermRyan, $ffff
person_event SPRITE_COOLTRAINER_F, 40, 9, $a, $0, 255, 255, $82, 3, TrainerCooltrainerfKelly, $ffff
person_event SPRITE_FRUIT_TREE, 86, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19e294, $ffff
@@ -737,4 +661,3 @@
person_event SPRITE_POKE_BALL, 24, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e29a, $06ba
person_event SPRITE_POKE_BALL, 37, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e29c, $06bb
person_event SPRITE_YOUNGSTER, 74, 8, $3, $0, 255, 255, $a0, 0, YoungsterScript_0x19e269, $ffff
-; 0x19e9d9
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -1,14 +1,13 @@
-Route46_MapScriptHeader: ; 0x1a967e
+Route46_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1a9680
-TrainerCamperTed: ; 0x1a9680
+TrainerCamperTed:
; bit/flag number
- dw $424
+ dw EVENT_BEAT_CAMPER_TED
; trainer group && trainer id
db CAMPER, TED
@@ -24,9 +23,8 @@
; script when talk again
dw CamperTedScript
-; 0x1a968c
-CamperTedScript: ; 0x1a968c
+CamperTedScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a9851
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x1a9694
-TrainerPicnickerErin1: ; 0x1a9694
+TrainerPicnickerErin1:
; bit/flag number
- dw $487
+ dw EVENT_BEAT_PICNICKER_ERIN
; trainer group && trainer id
db PICNICKER, ERIN1
@@ -53,9 +50,8 @@
; script when talk again
dw PicnickerErin1Script
-; 0x1a96a0
-PicnickerErin1Script: ; 0x1a96a0
+PicnickerErin1Script:
writecode VAR_CALLERID, $24
talkaftercancel
loadfont
@@ -70,11 +66,10 @@
setevent $029d
scall UnknownScript_0x1a974f
jump UnknownScript_0x1a96c6
-; 0x1a96c3
-UnknownScript_0x1a96c3: ; 0x1a96c3
+UnknownScript_0x1a96c3:
scall UnknownScript_0x1a9753
-UnknownScript_0x1a96c6: ; 0x1a96c6
+UnknownScript_0x1a96c6:
askforphonenumber $24
if_equal $1, UnknownScript_0x1a9763
if_equal $2, UnknownScript_0x1a975f
@@ -81,9 +76,8 @@
trainertotext PICNICKER, ERIN1, $0
scall UnknownScript_0x1a9757
jump UnknownScript_0x1a975b
-; 0x1a96da
-UnknownScript_0x1a96da: ; 0x1a96da
+UnknownScript_0x1a96da:
scall UnknownScript_0x1a9767
winlosstext PicnickerErin1BeatenText, $0000
copybytetovar wda0d
@@ -90,13 +84,13 @@
if_equal $2, UnknownScript_0x1a96f1
if_equal $1, UnknownScript_0x1a96f7
if_equal $0, UnknownScript_0x1a96fd
-UnknownScript_0x1a96f1: ; 0x1a96f1
+UnknownScript_0x1a96f1:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1a9717
-UnknownScript_0x1a96f7: ; 0x1a96f7
+UnknownScript_0x1a96f7:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x1a970a
-UnknownScript_0x1a96fd: ; 0x1a96fd
+UnknownScript_0x1a96fd:
loadtrainer PICNICKER, ERIN1
startbattle
returnafterbattle
@@ -103,9 +97,8 @@
loadvar wda0d, $1
clearflag $007c
end
-; 0x1a970a
-UnknownScript_0x1a970a: ; 0x1a970a
+UnknownScript_0x1a970a:
loadtrainer PICNICKER, ERIN2
startbattle
returnafterbattle
@@ -112,9 +105,8 @@
loadvar wda0d, $2
clearflag $007c
end
-; 0x1a9717
-UnknownScript_0x1a9717: ; 0x1a9717
+UnknownScript_0x1a9717:
loadtrainer PICNICKER, ERIN3
startbattle
returnafterbattle
@@ -128,13 +120,11 @@
iffalse UnknownScript_0x1a976b
setevent $0269
jump UnknownScript_0x1a975b
-; 0x1a973a
-UnknownScript_0x1a973a: ; 0x1a973a
+UnknownScript_0x1a973a:
end
-; 0x1a973b
-UnknownScript_0x1a973b: ; 0x1a973b
+UnknownScript_0x1a973b:
loadfont
writetext UnknownText_0x1a9927
closetext
@@ -143,57 +133,47 @@
clearevent EVENT_ERIN_CALCIUM
setevent $0269
jump UnknownScript_0x1a975b
-; 0x1a974f
-UnknownScript_0x1a974f: ; 0x1a974f
+UnknownScript_0x1a974f:
jumpstd asknumber1f
end
-; 0x1a9753
-UnknownScript_0x1a9753: ; 0x1a9753
+UnknownScript_0x1a9753:
jumpstd asknumber2f
end
-; 0x1a9757
-UnknownScript_0x1a9757: ; 0x1a9757
+UnknownScript_0x1a9757:
jumpstd registerednumberf
end
-; 0x1a975b
-UnknownScript_0x1a975b: ; 0x1a975b
+UnknownScript_0x1a975b:
jumpstd numberacceptedf
end
-; 0x1a975f
-UnknownScript_0x1a975f: ; 0x1a975f
+UnknownScript_0x1a975f:
jumpstd numberdeclinedf
end
-; 0x1a9763
-UnknownScript_0x1a9763: ; 0x1a9763
+UnknownScript_0x1a9763:
jumpstd phonefullf
end
-; 0x1a9767
-UnknownScript_0x1a9767: ; 0x1a9767
+UnknownScript_0x1a9767:
jumpstd rematchf
end
-; 0x1a976b
-UnknownScript_0x1a976b: ; 0x1a976b
+UnknownScript_0x1a976b:
setevent EVENT_ERIN_CALCIUM
jumpstd packfullf
end
-; 0x1a9772
-UnknownScript_0x1a9772: ; 0x1a9772
+UnknownScript_0x1a9772:
jumpstd rematchgiftf
end
-; 0x1a9776
-TrainerHikerBailey: ; 0x1a9776
+TrainerHikerBailey:
; bit/flag number
- dw $52e
+ dw EVENT_BEAT_HIKER_BAILEY
; trainer group && trainer id
db HIKER, BAILEY
@@ -209,9 +189,8 @@
; script when talk again
dw HikerBaileyScript
-; 0x1a9782
-HikerBaileyScript: ; 0x1a9782
+HikerBaileyScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a97e8
@@ -218,45 +197,37 @@
closetext
loadmovesprites
end
-; 0x1a978a
-MapRoute46Signpost0Script: ; 0x1a978a
+MapRoute46Signpost0Script:
jumptext UnknownText_0x1a99be
-; 0x1a978d
-ItemFragment_0x1a978d: ; 0x1a978d
+ItemFragment_0x1a978d:
db X_SPEED, 1
-; 0x1a978f
-FruitTreeScript_0x1a978f: ; 0x1a978f
+FruitTreeScript_0x1a978f:
fruittree $4
-; 0x1a9791
-FruitTreeScript_0x1a9791: ; 0x1a9791
+FruitTreeScript_0x1a9791:
fruittree $a
-; 0x1a9793
-HikerBaileySeenText: ; 0x1a9793
+HikerBaileySeenText:
text "Awright! I'll show"
line "you the power of"
cont "mountain #MON!"
done
-; 0x1a97c6
-HikerBaileyBeatenText: ; 0x1a97c6
+HikerBaileyBeatenText:
text "Mercy! You showed"
line "me your power!"
done
-; 0x1a97e8
-UnknownText_0x1a97e8: ; 0x1a97e8
+UnknownText_0x1a97e8:
text "It's over. I don't"
line "mind. We HIKERS"
cont "are like that."
done
-; 0x1a9819
-CamperTedSeenText: ; 0x1a9819
+CamperTedSeenText:
text "I'm raising #-"
line "MON too!"
@@ -263,14 +234,12 @@
para "Will you battle"
line "with me?"
done
-; 0x1a984a
-CamperTedBeatenText: ; 0x1a984a
+CamperTedBeatenText:
text "Wha…?"
done
-; 0x1a9851
-UnknownText_0x1a9851: ; 0x1a9851
+UnknownText_0x1a9851:
text "I did my best but"
line "came up short."
@@ -277,9 +246,8 @@
para "No excuses--I"
line "admit I lost."
done
-; 0x1a988f
-PicnickerErin1SeenText: ; 0x1a988f
+PicnickerErin1SeenText:
text "I raise #MON"
line "too!"
@@ -286,14 +254,12 @@
para "Will you battle"
line "with me?"
done
-; 0x1a98bb
-PicnickerErin1BeatenText: ; 0x1a98bb
+PicnickerErin1BeatenText:
text "Oh, rats!"
done
-; 0x1a98c6
-UnknownText_0x1a98c6: ; 0x1a98c6
+UnknownText_0x1a98c6:
text "I've been to many"
line "GYMS, but the GYM"
@@ -303,9 +269,8 @@
para "It's filled with"
line "pretty flowers!"
done
-; 0x1a9927
-UnknownText_0x1a9927: ; 0x1a9927
+UnknownText_0x1a9927:
text "Aww… I keep losing"
line "all the time!"
@@ -319,15 +284,13 @@
line "that present from"
cont "the other time."
done
-; 0x1a99be
-UnknownText_0x1a99be: ; 0x1a99be
+UnknownText_0x1a99be:
text "ROUTE 46"
line "MOUNTAIN RD. AHEAD"
done
-; 0x1a99db
-Route46_MapEventHeader: ; 0x1a99db
+Route46_MapEventHeader:
; filler
db 0, 0
@@ -352,4 +315,3 @@
person_event SPRITE_FRUIT_TREE, 9, 11, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a978f, $ffff
person_event SPRITE_FRUIT_TREE, 10, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a9791, $ffff
person_event SPRITE_POKE_BALL, 19, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a978d, $06bc
-; 0x1a9a43
--- a/maps/Route6.asm
+++ b/maps/Route6.asm
@@ -1,14 +1,13 @@
-Route6_MapScriptHeader: ; 0x1ad927
+Route6_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1ad929
-TrainerPokefanmRex: ; 0x1ad929
+TrainerPokefanmRex:
; bit/flag number
- dw $5c7
+ dw EVENT_BEAT_POKEFANM_REX
; trainer group && trainer id
db POKEFANM, REX
@@ -24,9 +23,8 @@
; script when talk again
dw PokefanmRexScript
-; 0x1ad935
-PokefanmRexScript: ; 0x1ad935
+PokefanmRexScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ad9ff
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x1ad93d
-TrainerPokefanmAllan: ; 0x1ad93d
+TrainerPokefanmAllan:
; bit/flag number
- dw $5c8
+ dw EVENT_BEAT_POKEFANM_ALLAN
; trainer group && trainer id
db POKEFANM, ALLAN
@@ -53,9 +50,8 @@
; script when talk again
dw PokefanmAllanScript
-; 0x1ad949
-PokefanmAllanScript: ; 0x1ad949
+PokefanmAllanScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ada88
@@ -62,17 +58,14 @@
closetext
loadmovesprites
end
-; 0x1ad951
-PokefanMScript_0x1ad951: ; 0x1ad951
+PokefanMScript_0x1ad951:
jumptextfaceplayer UnknownText_0x1ad957
-; 0x1ad954
-MapRoute6Signpost0Script: ; 0x1ad954
+MapRoute6Signpost0Script:
jumptext UnknownText_0x1ad99b
-; 0x1ad957
-UnknownText_0x1ad957: ; 0x1ad957
+UnknownText_0x1ad957:
text "The road is closed"
line "until the problem"
@@ -79,29 +72,25 @@
para "at the POWER PLANT"
line "is solved."
done
-; 0x1ad99b
-UnknownText_0x1ad99b: ; 0x1ad99b
+UnknownText_0x1ad99b:
text "UNDERGROUND PATH"
para "CERULEAN CITY -"
line "VERMILION CITY"
done
-; 0x1ad9cc
-PokefanmRexSeenText: ; 0x1ad9cc
+PokefanmRexSeenText:
text "My PHANPY is the"
line "cutest in the"
cont "world."
done
-; 0x1ad9f3
-PokefanmRexBeatenText: ; 0x1ad9f3
+PokefanmRexBeatenText:
text "My PHANPY!"
done
-; 0x1ad9ff
-UnknownText_0x1ad9ff: ; 0x1ad9ff
+UnknownText_0x1ad9ff:
text "Look how adorable"
line "my PHANPY acts!"
@@ -109,21 +98,18 @@
line "enough to make"
cont "your heart melt?"
done
-; 0x1ada4f
-PokefanmAllanSeenText: ; 0x1ada4f
+PokefanmAllanSeenText:
text "My TEDDIURSA is"
line "the cutest in the"
cont "world."
done
-; 0x1ada79
-PokefanmAllanBeatenText: ; 0x1ada79
+PokefanmAllanBeatenText:
text "My TEDDIURSA!"
done
-; 0x1ada88
-UnknownText_0x1ada88: ; 0x1ada88
+UnknownText_0x1ada88:
text "Look how adorable"
line "my TEDDIURSA acts!"
@@ -131,9 +117,8 @@
line "enough to make"
cont "your heart melt?"
done
-; 0x1adadb
-Route6_MapEventHeader: ; 0x1adadb
+Route6_MapEventHeader:
; filler
db 0, 0
@@ -154,4 +139,3 @@
person_event SPRITE_POKEFAN_M, 8, 21, $6, $0, 255, 255, $b0, 2, PokefanMScript_0x1ad951, $0771
person_event SPRITE_POKEFAN_M, 16, 13, $9, $0, 255, 255, $82, 0, TrainerPokefanmRex, $ffff
person_event SPRITE_POKEFAN_M, 16, 14, $8, $0, 255, 255, $82, 0, TrainerPokefanmAllan, $ffff
-; 0x1adb17
--- a/maps/Route8.asm
+++ b/maps/Route8.asm
@@ -1,14 +1,13 @@
-Route8_MapScriptHeader: ; 0x6c000
+Route8_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x6c002
-TrainerBikerDwayne: ; 0x6c002
+TrainerBikerDwayne:
; bit/flag number
- dw $433
+ dw EVENT_BEAT_BIKER_DWAYNE
; trainer group && trainer id
db BIKER, DWAYNE
@@ -24,9 +23,8 @@
; script when talk again
dw BikerDwayneScript
-; 0x6c00e
-BikerDwayneScript: ; 0x6c00e
+BikerDwayneScript:
talkaftercancel
loadfont
writetext UnknownText_0x6c0c8
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x6c016
-TrainerBikerHarris: ; 0x6c016
+TrainerBikerHarris:
; bit/flag number
- dw $434
+ dw EVENT_BEAT_BIKER_HARRIS
; trainer group && trainer id
db BIKER, HARRIS
@@ -53,9 +50,8 @@
; script when talk again
dw BikerHarrisScript
-; 0x6c022
-BikerHarrisScript: ; 0x6c022
+BikerHarrisScript:
talkaftercancel
loadfont
writetext UnknownText_0x6c143
@@ -62,11 +58,10 @@
closetext
loadmovesprites
end
-; 0x6c02a
-TrainerBikerZeke: ; 0x6c02a
+TrainerBikerZeke:
; bit/flag number
- dw $435
+ dw EVENT_BEAT_BIKER_ZEKE
; trainer group && trainer id
db BIKER, ZEKE
@@ -82,9 +77,8 @@
; script when talk again
dw BikerZekeScript
-; 0x6c036
-BikerZekeScript: ; 0x6c036
+BikerZekeScript:
talkaftercancel
loadfont
writetext UnknownText_0x6c1a3
@@ -91,11 +85,10 @@
closetext
loadmovesprites
end
-; 0x6c03e
-TrainerSupernerdSam: ; 0x6c03e
+TrainerSupernerdSam:
; bit/flag number
- dw $586
+ dw EVENT_BEAT_SUPER_NERD_SAM
; trainer group && trainer id
db SUPER_NERD, SAM
@@ -111,9 +104,8 @@
; script when talk again
dw SupernerdSamScript
-; 0x6c04a
-SupernerdSamScript: ; 0x6c04a
+SupernerdSamScript:
talkaftercancel
loadfont
writetext UnknownText_0x6c219
@@ -120,11 +112,10 @@
closetext
loadmovesprites
end
-; 0x6c052
-TrainerSupernerdTom: ; 0x6c052
+TrainerSupernerdTom:
; bit/flag number
- dw $587
+ dw EVENT_BEAT_SUPER_NERD_TOM
; trainer group && trainer id
db SUPER_NERD, TOM
@@ -140,9 +131,8 @@
; script when talk again
dw SupernerdTomScript
-; 0x6c05e
-SupernerdTomScript: ; 0x6c05e
+SupernerdTomScript:
talkaftercancel
loadfont
writetext UnknownText_0x6c27e
@@ -149,21 +139,17 @@
closetext
loadmovesprites
end
-; 0x6c066
-MapRoute8Signpost1Script: ; 0x6c066
+MapRoute8Signpost1Script:
jumptext UnknownText_0x6c2aa
-; 0x6c069
-MapRoute8Signpost0Script: ; 0x6c069
+MapRoute8Signpost0Script:
jumptext UnknownText_0x6c2b7
-; 0x6c06c
-FruitTreeScript_0x6c06c: ; 0x6c06c
+FruitTreeScript_0x6c06c:
fruittree $1b
-; 0x6c06e
-BikerDwayneSeenText: ; 0x6c06e
+BikerDwayneSeenText:
text "We're the KANTO"
line "#MON FEDERATION"
cont "trainer group."
@@ -171,21 +157,18 @@
para "We'll drive you"
line "under our wheels!"
done
-; 0x6c0be
-BikerDwayneBeatenText: ; 0x6c0be
+BikerDwayneBeatenText:
text "S-sorry!"
done
-; 0x6c0c8
-UnknownText_0x6c0c8: ; 0x6c0c8
+UnknownText_0x6c0c8:
text "The KANTO #MON"
line "FEDERATION will"
cont "never fall!"
done
-; 0x6c0f4
-BikerHarrisSeenText: ; 0x6c0f4
+BikerHarrisSeenText:
text "The cops shut down"
line "our UNDERGROUND"
@@ -192,90 +175,76 @@
para "PATH! That really"
line "fries me!"
done
-; 0x6c134
-BikerHarrisBeatenText: ; 0x6c134
+BikerHarrisBeatenText:
text "F-forgive me!"
done
-; 0x6c143
-UnknownText_0x6c143: ; 0x6c143
+UnknownText_0x6c143:
text "Wiped out by some"
line "punk from JOHTO…"
done
-; 0x6c167
-BikerZekeSeenText: ; 0x6c167
+BikerZekeSeenText:
text "We're the KANTO"
line "#MON FEDERA-"
cont "TION!"
cont "Right on!"
done
-; 0x6c194
-BikerZekeBeatenText: ; 0x6c194
+BikerZekeBeatenText:
text "Yikes! Sorry!"
done
-; 0x6c1a3
-UnknownText_0x6c1a3: ; 0x6c1a3
+UnknownText_0x6c1a3:
text "We'll try not to"
line "disturb anyone"
cont "from now on…"
done
-; 0x6c1d0
-SupernerdSamSeenText: ; 0x6c1d0
+SupernerdSamSeenText:
text "How does the MAG-"
line "NET TRAIN work?"
done
-; 0x6c1f3
-SupernerdSamBeatenText: ; 0x6c1f3
+SupernerdSamBeatenText:
text "I just want to see"
line "the MAGNET TRAIN…"
done
-; 0x6c219
-UnknownText_0x6c219: ; 0x6c219
+UnknownText_0x6c219:
text "The power of mag-"
line "nets is awesome!"
done
-; 0x6c23d
-SupernerdTomSeenText: ; 0x6c23d
+SupernerdTomSeenText:
text "Hm… You've got"
line "many GYM BADGES."
done
-; 0x6c25d
-SupernerdTomBeatenText: ; 0x6c25d
+SupernerdTomBeatenText:
text "Just as I thought…"
line "You're tough!"
done
-; 0x6c27e
-UnknownText_0x6c27e: ; 0x6c27e
+UnknownText_0x6c27e:
text "GYM BADGES give"
line "you advantages in"
cont "battles."
done
-; 0x6c2aa
-UnknownText_0x6c2aa: ; 0x6c2aa
+UnknownText_0x6c2aa:
text "It's locked…"
done
-; 0x6c2b7
-UnknownText_0x6c2b7: ; 0x6c2b7
+UnknownText_0x6c2b7:
text "The flyer's torn."
para "It's impossible to"
line "read…"
done
-; 0x6c2e1
-Route8_MapEventHeader: ; 0x6c2e1
+Route8_MapEventHeader:
; filler
db 0, 0
@@ -300,4 +269,3 @@
person_event SPRITE_SUPER_NERD, 6, 27, $6, $0, 255, 255, $b2, 3, TrainerSupernerdSam, $ffff
person_event SPRITE_SUPER_NERD, 16, 35, $a, $0, 255, 255, $b2, 4, TrainerSupernerdTom, $ffff
person_event SPRITE_FRUIT_TREE, 9, 37, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x6c06c, $ffff
-; 0x6c349
--- a/maps/Route9.asm
+++ b/maps/Route9.asm
@@ -1,14 +1,13 @@
-Route9_MapScriptHeader: ; 0x1aaf25
+Route9_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1aaf27
-TrainerCamperDean: ; 0x1aaf27
+TrainerCamperDean:
; bit/flag number
- dw $420
+ dw EVENT_BEAT_CAMPER_DEAN
; trainer group && trainer id
db CAMPER, DEAN
@@ -24,9 +23,8 @@
; script when talk again
dw CamperDeanScript
-; 0x1aaf33
-CamperDeanScript: ; 0x1aaf33
+CamperDeanScript:
talkaftercancel
loadfont
writetext UnknownText_0x1aafd9
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x1aaf3b
-TrainerPicnickerHeidi: ; 0x1aaf3b
+TrainerPicnickerHeidi:
; bit/flag number
- dw $48a
+ dw EVENT_BEAT_PICNICKER_HEIDI
; trainer group && trainer id
db PICNICKER, HEIDI
@@ -53,9 +50,8 @@
; script when talk again
dw PicnickerHeidiScript
-; 0x1aaf47
-PicnickerHeidiScript: ; 0x1aaf47
+PicnickerHeidiScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ab07c
@@ -62,11 +58,10 @@
closetext
loadmovesprites
end
-; 0x1aaf4f
-TrainerCamperSid: ; 0x1aaf4f
+TrainerCamperSid:
; bit/flag number
- dw $421
+ dw EVENT_BEAT_CAMPER_SID
; trainer group && trainer id
db CAMPER, SID
@@ -82,9 +77,8 @@
; script when talk again
dw CamperSidScript
-; 0x1aaf5b
-CamperSidScript: ; 0x1aaf5b
+CamperSidScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ab0f6
@@ -91,11 +85,10 @@
closetext
loadmovesprites
end
-; 0x1aaf63
-TrainerPicnickerEdna: ; 0x1aaf63
+TrainerPicnickerEdna:
; bit/flag number
- dw $48b
+ dw EVENT_BEAT_PICNICKER_EDNA
; trainer group && trainer id
db PICNICKER, EDNA
@@ -111,9 +104,8 @@
; script when talk again
dw PicnickerEdnaScript
-; 0x1aaf6f
-PicnickerEdnaScript: ; 0x1aaf6f
+PicnickerEdnaScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ab15f
@@ -120,11 +112,10 @@
closetext
loadmovesprites
end
-; 0x1aaf77
-TrainerHikerTim: ; 0x1aaf77
+TrainerHikerTim:
; bit/flag number
- dw $530
+ dw EVENT_BEAT_HIKER_TIM
; trainer group && trainer id
db HIKER, TIM
@@ -140,9 +131,8 @@
; script when talk again
dw HikerTimScript
-; 0x1aaf83
-HikerTimScript: ; 0x1aaf83
+HikerTimScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ab210
@@ -149,11 +139,10 @@
closetext
loadmovesprites
end
-; 0x1aaf8b
-TrainerHikerSidney: ; 0x1aaf8b
+TrainerHikerSidney:
; bit/flag number
- dw $532
+ dw EVENT_BEAT_HIKER_SIDNEY
; trainer group && trainer id
db HIKER, SIDNEY
@@ -169,9 +158,8 @@
; script when talk again
dw HikerSidneyScript
-; 0x1aaf97
-HikerSidneyScript: ; 0x1aaf97
+HikerSidneyScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ab278
@@ -178,30 +166,25 @@
closetext
loadmovesprites
end
-; 0x1aaf9f
-MapRoute9Signpost0Script: ; 0x1aaf9f
+MapRoute9Signpost0Script:
jumptext UnknownText_0x1ab2a2
-; 0x1aafa2
-MapRoute9SignpostItem1: ; 0x1aafa2
+MapRoute9SignpostItem1:
dw $00f2
db ETHER
-; 0x1aafa5
-CamperDeanSeenText: ; 0x1aafa5
+CamperDeanSeenText:
text "I came to explore"
line "ROCK TUNNEL."
done
-; 0x1aafc5
-CamperDeanBeatenText: ; 0x1aafc5
+CamperDeanBeatenText:
text "Whoa! Danger, man."
done
-; 0x1aafd9
-UnknownText_0x1aafd9: ; 0x1aafd9
+UnknownText_0x1aafd9:
text "My #MON were"
line "hurt before even"
@@ -212,9 +195,8 @@
line "them to a #MON"
cont "CENTER right away."
done
-; 0x1ab03f
-PicnickerHeidiSeenText: ; 0x1ab03f
+PicnickerHeidiSeenText:
text "Have you ever been"
line "to a picnic?"
@@ -221,14 +203,12 @@
para "They're so much"
line "fun!"
done
-; 0x1ab074
-PicnickerHeidiBeatenText: ; 0x1ab074
+PicnickerHeidiBeatenText:
text "Ohhhh!"
done
-; 0x1ab07c
-UnknownText_0x1ab07c: ; 0x1ab07c
+UnknownText_0x1ab07c:
text "We bake lots of"
line "goodies and share"
@@ -235,40 +215,34 @@
para "them all around."
line "They're delicious!"
done
-; 0x1ab0c2
-CamperSidSeenText: ; 0x1ab0c2
+CamperSidSeenText:
text "Hey, you!"
line "Don't litter!"
done
-; 0x1ab0da
-CamperSidBeatenText: ; 0x1ab0da
+CamperSidBeatenText:
text "I was just point-"
line "ing out…"
done
-; 0x1ab0f6
-UnknownText_0x1ab0f6: ; 0x1ab0f6
+UnknownText_0x1ab0f6:
text "Sorry. You weren't"
line "littering. It was"
cont "my mistake."
done
-; 0x1ab127
-PicnickerEdnaSeenText: ; 0x1ab127
+PicnickerEdnaSeenText:
text "People shouldn't"
line "leave any litter"
cont "behind."
done
-; 0x1ab151
-PicnickerEdnaBeatenText: ; 0x1ab151
+PicnickerEdnaBeatenText:
text "Ohh… I lost…"
done
-; 0x1ab15f
-UnknownText_0x1ab15f: ; 0x1ab15f
+UnknownText_0x1ab15f:
text "Conserving energy"
line "is important, but"
@@ -275,9 +249,8 @@
para "the environment is"
line "even more vital."
done
-; 0x1ab1a8
-HikerTimSeenText: ; 0x1ab1a8
+HikerTimSeenText:
text "She'll be coming"
line "'round MT.SILVER"
cont "when she comes…"
@@ -285,21 +258,18 @@
para "MT.SILVER is in"
line "JOHTO, right?"
done
-; 0x1ab1f7
-HikerTimBeatenText: ; 0x1ab1f7
+HikerTimBeatenText:
text "I was too busy"
line "singing…"
done
-; 0x1ab210
-UnknownText_0x1ab210: ; 0x1ab210
+UnknownText_0x1ab210:
text "Battles are about"
line "concentration."
done
-; 0x1ab232
-HikerSidneySeenText: ; 0x1ab232
+HikerSidneySeenText:
text "I'll tell you a"
line "secret."
@@ -306,30 +276,26 @@
para "But first, we"
line "battle!"
done
-; 0x1ab260
-HikerSidneyBeatenText: ; 0x1ab260
+HikerSidneyBeatenText:
text "Oh, dang!"
line "I lost that…"
done
-; 0x1ab278
-UnknownText_0x1ab278: ; 0x1ab278
+UnknownText_0x1ab278:
text "The POWER PLANT is"
line "across a small"
cont "river."
done
-; 0x1ab2a2
-UnknownText_0x1ab2a2: ; 0x1ab2a2
+UnknownText_0x1ab2a2:
text "ROUTE 9"
para "CERULEAN CITY -"
line "ROCK TUNNEL"
done
-; 0x1ab2c7
-Route9_MapEventHeader: ; 0x1ab2c7
+Route9_MapEventHeader:
; filler
db 0, 0
@@ -353,4 +319,3 @@
person_event SPRITE_LASS, 19, 16, $7, $0, 255, 255, $a2, 1, TrainerPicnickerEdna, $ffff
person_event SPRITE_POKEFAN_M, 7, 32, $9, $0, 255, 255, $b2, 2, TrainerHikerTim, $ffff
person_event SPRITE_POKEFAN_M, 19, 40, $9, $0, 255, 255, $b2, 4, TrainerHikerSidney, $ffff
-; 0x1ab32a
--- a/maps/RuinsofAlphOutside.asm
+++ b/maps/RuinsofAlphOutside.asm
@@ -1,4 +1,4 @@
-RuinsofAlphOutside_MapScriptHeader: ; 0x58000
+RuinsofAlphOutside_MapScriptHeader:
; trigger count
db 2
@@ -12,57 +12,48 @@
; callbacks
dbw 2, UnknownScript_0x5800f
-; 0x5800d
-UnknownScript_0x5800d: ; 0x5800d
+UnknownScript_0x5800d:
end
-; 0x5800e
-UnknownScript_0x5800e: ; 0x5800e
+UnknownScript_0x5800e:
end
-; 0x5800f
-UnknownScript_0x5800f: ; 0x5800f
+UnknownScript_0x5800f:
checkflag $000c
iftrue UnknownScript_0x5802c
checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
iftrue UnknownScript_0x5801e
jump UnknownScript_0x5802c
-; 0x5801e
-UnknownScript_0x5801e: ; 0x5801e
+UnknownScript_0x5801e:
checkcode VAR_UNOWNCOUNT
if_greater_than $2, UnknownScript_0x58027
jump UnknownScript_0x5802c
-; 0x58027
-UnknownScript_0x58027: ; 0x58027
+UnknownScript_0x58027:
appear $3
dotrigger $1
return
-; 0x5802c
-UnknownScript_0x5802c: ; 0x5802c
+UnknownScript_0x5802c:
disappear $3
dotrigger $0
return
-; 0x58031
-UnknownScript_0x58031: ; 0x58031
+UnknownScript_0x58031:
spriteface $3, UP
spriteface $0, DOWN
jump UnknownScript_0x58044
-; 0x5803a
-UnknownScript_0x5803a: ; 0x5803a
+UnknownScript_0x5803a:
spriteface $3, LEFT
spriteface $0, RIGHT
jump UnknownScript_0x58044
-; 0x58043
-ScientistScript_0x58043: ; 0x58043
+ScientistScript_0x58043:
faceplayer
-UnknownScript_0x58044: ; 0x58044
+UnknownScript_0x58044:
loadfont
writetext UnknownText_0x580c7
closetext
@@ -76,9 +67,8 @@
domaptrigger GROUP_RUINS_OF_ALPH_RESEARCH_CENTER, MAP_RUINS_OF_ALPH_RESEARCH_CENTER, $1
warpcheck
end
-; 0x58061
-FisherScript_0x58061: ; 0x58061
+FisherScript_0x58061:
faceplayer
loadfont
checkevent $00bc
@@ -91,9 +81,8 @@
closetext
loadmovesprites
end
-; 0x58076
-YoungsterScript_0x58076: ; 0x58076
+YoungsterScript_0x58076:
faceplayer
loadfont
writetext UnknownText_0x58449
@@ -100,9 +89,8 @@
closetext
loadmovesprites
end
-; 0x5807e
-YoungsterScript_0x5807e: ; 0x5807e
+YoungsterScript_0x5807e:
faceplayer
loadfont
writetext UnknownText_0x5848e
@@ -110,11 +98,10 @@
loadmovesprites
spriteface $6, UP
end
-; 0x58089
-TrainerPsychicNathan: ; 0x58089
+TrainerPsychicNathan:
; bit/flag number
- dw $43a
+ dw EVENT_BEAT_PSYCHIC_NATHAN
; trainer group && trainer id
db PSYCHIC_T, NATHAN
@@ -130,9 +117,8 @@
; script when talk again
dw PsychicNathanScript
-; 0x58095
-PsychicNathanScript: ; 0x58095
+PsychicNathanScript:
talkaftercancel
loadfont
writetext UnknownText_0x5830e
@@ -139,12 +125,11 @@
closetext
loadmovesprites
end
-; 0x5809d
-TrainerSuperNerdStan: ; 0x5809d
+TrainerSuperNerdStan:
; bit/flag number
- dw $581
+ dw EVENT_BEAT_SUPER_NERD_STAN
; trainer group && trainer id
db SUPER_NERD, STAN
@@ -160,9 +145,8 @@
; script when talk again
dw UnknownScript_0x580a9
-; 0x580a9
-UnknownScript_0x580a9: ; 0x580a9
+UnknownScript_0x580a9:
talkaftercancel
loadfont
writetext UnknownText_0x58250
@@ -169,22 +153,18 @@
closetext
loadmovesprites
end
-; 0x580b1
-MapRuinsofAlphOutsideSignpost0Script: ; 0x580b1
+MapRuinsofAlphOutsideSignpost0Script:
jumptext UnknownText_0x58325
-; 0x580b4
-MapRuinsofAlphOutsideSignpost1Script: ; 0x580b4
+MapRuinsofAlphOutsideSignpost1Script:
jumptext UnknownText_0x58342
-; 0x580b7
-MapRuinsofAlphOutsideSignpost2Script: ; 0x580b7
+MapRuinsofAlphOutsideSignpost2Script:
jumptext UnknownText_0x58362
-; 0x580ba
-MovementData_0x580ba: ; 0x580ba
+MovementData_0x580ba:
step_right
step_right
step_right
@@ -196,14 +176,12 @@
step_up
step_up
step_end
-; 0x580c5
-MovementData_0x580c5: ; 0x580c5
+MovementData_0x580c5:
step_up
step_end
-; 0x580c7
-UnknownText_0x580c7: ; 0x580c7
+UnknownText_0x580c7:
text "Hm? That's a #-"
line "DEX, isn't it?"
cont "May I see it?"
@@ -231,16 +209,14 @@
line "grade your #-"
cont "DEX. Follow me."
done
-; 0x581e5
-UnknownText_0x581e5: ; 0x581e5
+UnknownText_0x581e5:
text "What do you want?"
line "I'm studying--"
cont "don't disturb me!"
done
-; 0x58217
-UnknownText_0x58217: ; 0x58217
+UnknownText_0x58217:
text "Sorry…"
line "I'm frustrated by"
@@ -247,9 +223,8 @@
para "our lack of real"
line "understanding…"
done
-; 0x58250
-UnknownText_0x58250: ; 0x58250
+UnknownText_0x58250:
text "The RUINS are from"
line "about 1500 years"
cont "ago."
@@ -265,38 +240,32 @@
para "It's all one big"
line "mystery…"
done
-; 0x582eb
-PsychicNathanSeenText: ; 0x582eb
+PsychicNathanSeenText:
text "Hmmm… This is a"
line "strange place."
done
-; 0x5830b
-PsychicNathanBeatenText: ; 0x5830b
+PsychicNathanBeatenText:
text "…"
done
-; 0x5830e
-UnknownText_0x5830e: ; 0x5830e
+UnknownText_0x5830e:
text "I like thinking"
line "here."
done
-; 0x58325
-UnknownText_0x58325: ; 0x58325
+UnknownText_0x58325:
text "MYSTERY STONE"
line "PANEL CHAMBER"
done
-; 0x58342
-UnknownText_0x58342: ; 0x58342
+UnknownText_0x58342:
text "RUINS OF ALPH"
line "VISITORS WELCOME"
done
-; 0x58362
-UnknownText_0x58362: ; 0x58362
+UnknownText_0x58362:
text "RUINS OF ALPH"
line "RESEARCH CENTER"
@@ -303,9 +272,8 @@
para "THE AUTHORITY ON"
line "THE RUINS OF ALPH"
done
-; 0x583a4
-UnknownText_0x583a4: ; 0x583a4
+UnknownText_0x583a4:
text "While exploring"
line "the RUINS, we"
@@ -318,17 +286,15 @@
para "You should be"
line "careful too."
done
-; 0x58420
-UnknownText_0x58420: ; 0x58420
+UnknownText_0x58420:
text "The RUINS hide a"
line "huge secret!"
para "…I think…"
done
-; 0x58449
-UnknownText_0x58449: ; 0x58449
+UnknownText_0x58449:
text "There are many"
line "kinds of UNOWN, so"
@@ -335,9 +301,8 @@
para "we use them for"
line "our secret codes."
done
-; 0x5848e
-UnknownText_0x5848e: ; 0x5848e
+UnknownText_0x5848e:
text "A… H… E… A… D…"
line "Hmm…"
@@ -346,9 +311,8 @@
para "I'm decoding this"
line "message!"
done
-; 0x584c3
-RuinsofAlphOutside_MapEventHeader: ; 0x584c3
+RuinsofAlphOutside_MapEventHeader:
; filler
db 0, 0
@@ -384,4 +348,3 @@
person_event SPRITE_FISHER, 21, 17, $3, $0, 255, 255, $a0, 0, FisherScript_0x58061, $078e
person_event SPRITE_YOUNGSTER, 15, 18, $2, $11, 255, 255, $b0, 0, YoungsterScript_0x58076, $078f
person_event SPRITE_YOUNGSTER, 12, 16, $7, $0, 255, 255, $80, 0, YoungsterScript_0x5807e, $078f
-; 0x58560
--- a/maps/SaffronGym.asm
+++ b/maps/SaffronGym.asm
@@ -40,7 +40,7 @@
TrainerMediumRebecca:
; bit/flag number
- dw $590
+ dw EVENT_BEAT_MEDIUM_REBECCA
; trainer group && trainer id
db MEDIUM, REBECCA
@@ -67,7 +67,7 @@
TrainerPsychicFranklin:
; bit/flag number
- dw $43b
+ dw EVENT_BEAT_PSYCHIC_FRANKLIN
; trainer group && trainer id
db PSYCHIC_T, FRANKLIN
@@ -94,7 +94,7 @@
TrainerMediumDoris:
; bit/flag number
- dw $591
+ dw EVENT_BEAT_MEDIUM_DORIS
; trainer group && trainer id
db MEDIUM, DORIS
@@ -121,7 +121,7 @@
TrainerPsychicJared:
; bit/flag number
- dw $444
+ dw EVENT_BEAT_PSYCHIC_JARED
; trainer group && trainer id
db PSYCHIC_T, JARED
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -1,18 +1,16 @@
-SlowpokeWellB1F_MapScriptHeader: ; 0x5a5d3
+SlowpokeWellB1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x5a5d5
-KurtScript_0x5a5d5: ; 0x5a5d5
+KurtScript_0x5a5d5:
jumptextfaceplayer UnknownText_0x5a6b5
-; 0x5a5d8
-TrainerGruntM29: ; 0x5a5d8
+TrainerGruntM29:
; bit/flag number
- dw $50d
+ dw EVENT_BEAT_ROCKET_GRUNTM_22
; trainer group && trainer id
db GRUNTM, 29
@@ -28,9 +26,8 @@
; script when talk again
dw GruntM29Script
-; 0x5a5e4
-GruntM29Script: ; 0x5a5e4
+GruntM29Script:
talkaftercancel
loadfont
writetext TrainerGruntM29SlowpokeProfitText
@@ -37,11 +34,10 @@
closetext
loadmovesprites
end
-; 0x5a5ec
-TrainerGruntM1: ; 0x5a5ec
+TrainerGruntM1:
; bit/flag number
- dw $4f1
+ dw EVENT_BEAT_ROCKET_GRUNTM_1
; trainer group && trainer id
db GRUNTM, 1
@@ -57,9 +53,8 @@
; script when talk again
dw GruntM1Script
-; 0x5a5f8
-GruntM1Script: ; 0x5a5f8
+GruntM1Script:
loadfont
writetext TrainerGruntM1WhenTalkText
closetext
@@ -98,11 +93,10 @@
pause 15
warp GROUP_KURTS_HOUSE, MAP_KURTS_HOUSE, $3, $3
end
-; 0x5a659
-TrainerGruntM2: ; 0x5a659
+TrainerGruntM2:
; bit/flag number
- dw $4f2
+ dw EVENT_BEAT_ROCKET_GRUNTM_2
; trainer group && trainer id
db GRUNTM, 2
@@ -118,9 +112,8 @@
; script when talk again
dw GruntM2Script
-; 0x5a665
-GruntM2Script: ; 0x5a665
+GruntM2Script:
talkaftercancel
loadfont
writetext UnknownText_0x5aaf2
@@ -127,11 +120,10 @@
closetext
loadmovesprites
end
-; 0x5a66d
-TrainerGruntF1: ; 0x5a66d
+TrainerGruntF1:
; bit/flag number
- dw $510
+ dw EVENT_BEAT_ROCKET_GRUNTF_1
; trainer group && trainer id
db GRUNTF, 1
@@ -147,9 +139,8 @@
; script when talk again
dw GruntF1Script
-; 0x5a679
-GruntF1Script: ; 0x5a679
+GruntF1Script:
talkaftercancel
loadfont
writetext UnknownText_0x5ab8d
@@ -156,9 +147,8 @@
closetext
loadmovesprites
end
-; 0x5a681
-SlowpokeScript_0x5a681: ; 0x5a681
+SlowpokeScript_0x5a681:
faceplayer
loadfont
cry SLOWPOKE
@@ -167,16 +157,14 @@
iftrue UnknownScript_0x5a68f
loadmovesprites
end
-; 0x5a68f
-UnknownScript_0x5a68f: ; 0x5a68f
+UnknownScript_0x5a68f:
writetext UnknownText_0x5ac09
closetext
loadmovesprites
end
-; 0x5a695
-SlowpokeScript_0x5a695: ; 0x5a695
+SlowpokeScript_0x5a695:
faceplayer
loadfont
writetext UnknownText_0x5ac61
@@ -184,16 +172,14 @@
closetext
loadmovesprites
end
-; 0x5a6a0
SlowpokeWellB1FBoulder:
jumpstd strengthboulder
-ItemFragment_0x5a6a3: ; 0x5a6a3
+ItemFragment_0x5a6a3:
db SUPER_POTION, 1
-; 0x5a6a5
-KurtSlowpokeWellVictoryMovementData: ; 0x5a6a5
+KurtSlowpokeWellVictoryMovementData:
step_left
step_left
step_left
@@ -210,9 +196,8 @@
accelerate_last
turn_head_left
step_end
-; 0x5a6b5
-UnknownText_0x5a6b5: ; 0x5a6b5
+UnknownText_0x5a6b5:
text "KURT: Hey there,"
line "<PLAYER>!"
@@ -241,9 +226,8 @@
line "how gutsy you are"
cont "in my place!"
done
-; 0x5a7ca
-KurtLeaveSlowpokeWellText: ; 0x5a7ca
+KurtLeaveSlowpokeWellText:
text "KURT: Way to go,"
line "<PLAYER>!"
@@ -254,9 +238,8 @@
line "too. Let's get out"
cont "of here."
done
-; 0x5a825
-GruntM29SeenText: ; 0x5a825
+GruntM29SeenText:
text "Darn! I was stand-"
line "ing guard up top"
@@ -271,15 +254,13 @@
line "my anger by taking"
cont "it out on you!"
done
-; 0x5a8cc
-GruntM29BeatenText: ; 0x5a8cc
+GruntM29BeatenText:
text "Arrgh! This is NOT"
line "my day!"
done
-; 0x5a8e8
-TrainerGruntM29SlowpokeProfitText: ; 0x5a8e8
+TrainerGruntM29SlowpokeProfitText:
text "Sure, we've been"
line "hacking the tails"
@@ -295,9 +276,8 @@
para "and we'll do any-"
line "thing for money!"
done
-; 0x5a98b
-GruntM1SeenText: ; 0x5a98b
+GruntM1SeenText:
text "What do you want?"
para "If you interrupt"
@@ -304,16 +284,14 @@
line "our work, don't"
cont "expect any mercy!"
done
-; 0x5a9d0
-GruntM1BeatenText: ; 0x5a9d0
+GruntM1BeatenText:
text "You did OK today,"
line "but wait till next"
cont "time!"
done
-; 0x5a9fc
-TrainerGruntM1WhenTalkText: ; 0x5a9fc
+TrainerGruntM1WhenTalkText:
text "Yeah, TEAM ROCKET"
line "was broken up"
cont "three years ago."
@@ -326,9 +304,8 @@
line "fun watching us"
cont "stir up trouble!"
done
-; 0x5aa8d
-GruntM2SeenText: ; 0x5aa8d
+GruntM2SeenText:
text "Quit taking SLOW-"
line "POKETAILS?"
@@ -336,15 +313,13 @@
line "TEAM ROCKET's rep"
cont "would be ruined!"
done
-; 0x5aadf
-GruntM2BeatenText: ; 0x5aadf
+GruntM2BeatenText:
text "Just…"
line "Too strong…"
done
-; 0x5aaf2
-UnknownText_0x5aaf2: ; 0x5aaf2
+UnknownText_0x5aaf2:
text "We need the money,"
line "but selling SLOW-"
cont "POKETAILS?"
@@ -352,22 +327,19 @@
para "It's tough being a"
line "ROCKET GRUNT!"
done
-; 0x5ab43
-GruntF1SeenText: ; 0x5ab43
+GruntF1SeenText:
text "Stop taking TAILS?"
para "Yeah, just try to"
line "defeat all of us!"
done
-; 0x5ab7b
-GruntF1BeatenText: ; 0x5ab7b
+GruntF1BeatenText:
text "You rotten brat!"
done
-; 0x5ab8d
-UnknownText_0x5ab8d: ; 0x5ab8d
+UnknownText_0x5ab8d:
text "SLOWPOKETAILS"
line "grow back fast!"
@@ -374,9 +346,8 @@
para "What's wrong with"
line "selling them?"
done
-; 0x5abcb
-UnknownText_0x5abcb: ; 0x5abcb
+UnknownText_0x5abcb:
text "A SLOWPOKE with"
line "its TAIL cut off…"
@@ -383,9 +354,8 @@
para "Huh? It has MAIL."
line "Read it?"
done
-; 0x5ac09
-UnknownText_0x5ac09: ; 0x5ac09
+UnknownText_0x5ac09:
text "<PLAYER> read the"
line "MAIL."
@@ -397,15 +367,13 @@
para "Love, Dad"
done
-; 0x5ac61
-UnknownText_0x5ac61: ; 0x5ac61
+UnknownText_0x5ac61:
text "A SLOWPOKE with"
line "its TAIL cut off…"
done
-; 0x5ac84
-SlowpokeWellB1F_MapEventHeader: ; 0x5ac84
+SlowpokeWellB1F_MapEventHeader:
; filler
db 0, 0
@@ -431,4 +399,3 @@
person_event SPRITE_KURT, 18, 20, $7, $0, 255, 255, $0, 0, KurtScript_0x5a5d5, $0740
person_event SPRITE_BOULDER, 6, 7, $19, $0, 255, 255, $0, 0, SlowpokeWellB1FBoulder, $ffff
person_event SPRITE_POKE_BALL, 7, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a6a3, $0662
-; 0x5ad09
--- a/maps/SproutTower1F.asm
+++ b/maps/SproutTower1F.asm
@@ -1,30 +1,25 @@
-SproutTower1F_MapScriptHeader: ; 0x1844fc
+SproutTower1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x1844fe
-SageScript_0x1844fe: ; 0x1844fe
+SageScript_0x1844fe:
jumptextfaceplayer UnknownText_0x1845d8
-; 0x184501
-SageScript_0x184501: ; 0x184501
+SageScript_0x184501:
jumptextfaceplayer UnknownText_0x18460a
-; 0x184504
-GrannyScript_0x184504: ; 0x184504
+GrannyScript_0x184504:
jumptextfaceplayer UnknownText_0x184649
-; 0x184507
-TeacherScript_0x184507: ; 0x184507
+TeacherScript_0x184507:
jumptextfaceplayer UnknownText_0x18469d
-; 0x18450a
-TrainerSageChow: ; 0x18450a
+TrainerSageChow:
; bit/flag number
- dw $411
+ dw EVENT_BEAT_SAGE_CHOW
; trainer group && trainer id
db SAGE, CHOW
@@ -40,9 +35,8 @@
; script when talk again
dw SageChowScript
-; 0x184516
-SageChowScript: ; 0x184516
+SageChowScript:
talkaftercancel
loadfont
writetext UnknownText_0x184583
@@ -49,17 +43,14 @@
closetext
loadmovesprites
end
-; 0x18451e
-ItemFragment_0x18451e: ; 0x18451e
+ItemFragment_0x18451e:
db PARLYZ_HEAL, 1
-; 0x184520
-MapSproutTower1FSignpost1Script: ; 0x184520
+MapSproutTower1FSignpost1Script:
jumptext UnknownText_0x1846d6
-; 0x184523
-SageChowSeenText: ; 0x184523
+SageChowSeenText:
text "We stand guard in"
line "this tower."
@@ -67,14 +58,12 @@
line "our gratitude to"
cont "honor all #MON."
done
-; 0x184574
-SageChowBeatenText: ; 0x184574
+SageChowBeatenText:
text "Th-Thank you!"
done
-; 0x184583
-UnknownText_0x184583: ; 0x184583
+UnknownText_0x184583:
text "All living beings"
line "coexist through"
cont "cooperation."
@@ -82,16 +71,14 @@
para "We must always be"
line "thankful for this."
done
-; 0x1845d8
-UnknownText_0x1845d8: ; 0x1845d8
+UnknownText_0x1845d8:
text "Only if you reach"
line "the top will you"
cont "obtain an HM."
done
-; 0x18460a
-UnknownText_0x18460a: ; 0x18460a
+UnknownText_0x18460a:
text "SPROUT TOWER was"
line "built long ago"
@@ -98,9 +85,8 @@
para "as a place for"
line "#MON training."
done
-; 0x184649
-UnknownText_0x184649: ; 0x184649
+UnknownText_0x184649:
text "A BELLSPROUT over"
line "100 feet tall…"
@@ -108,9 +94,8 @@
line "became the center"
cont "pillar here."
done
-; 0x18469d
-UnknownText_0x18469d: ; 0x18469d
+UnknownText_0x18469d:
text "See the pillar"
line "shaking?"
@@ -117,17 +102,15 @@
para "People are train-"
line "ing upstairs."
done
-; 0x1846d6
-UnknownText_0x1846d6: ; 0x1846d6
+UnknownText_0x1846d6:
text "A #MON statue…"
para "It looks very"
line "distinguished."
done
-; 0x184703
-SproutTower1F_MapEventHeader: ; 0x184703
+SproutTower1F_MapEventHeader:
; filler
db 0, 0
@@ -155,4 +138,3 @@
person_event SPRITE_TEACHER, 13, 13, $7, $0, 255, 255, $0, 0, TeacherScript_0x184507, $ffff
person_event SPRITE_SAGE, 9, 7, $7, $0, 255, 255, $92, 4, TrainerSageChow, $ffff
person_event SPRITE_POKE_BALL, 11, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x18451e, $0647
-; 0x18477a
--- a/maps/SproutTower2F.asm
+++ b/maps/SproutTower2F.asm
@@ -1,14 +1,13 @@
-SproutTower2F_MapScriptHeader: ; 0x18477a
+SproutTower2F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x18477c
-TrainerSageNico: ; 0x18477c
+TrainerSageNico:
; bit/flag number
- dw $412
+ dw EVENT_BEAT_SAGE_NICO
; trainer group && trainer id
db SAGE, NICO
@@ -24,9 +23,8 @@
; script when talk again
dw SageNicoScript
-; 0x184788
-SageNicoScript: ; 0x184788
+SageNicoScript:
talkaftercancel
loadfont
writetext UnknownText_0x1847ff
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x184790
-TrainerSageEdmond: ; 0x184790
+TrainerSageEdmond:
; bit/flag number
- dw $417
+ dw EVENT_BEAT_SAGE_EDMOND
; trainer group && trainer id
db SAGE, EDMOND
@@ -53,9 +50,8 @@
; script when talk again
dw SageEdmondScript
-; 0x18479c
-SageEdmondScript: ; 0x18479c
+SageEdmondScript:
talkaftercancel
loadfont
writetext UnknownText_0x18486f
@@ -62,30 +58,25 @@
closetext
loadmovesprites
end
-; 0x1847a4
-MapSproutTower2FSignpost0Script: ; 0x1847a4
+MapSproutTower2FSignpost0Script:
jumptext UnknownText_0x1848c8
-; 0x1847a7
-ItemFragment_0x1847a7: ; 0x1847a7
+ItemFragment_0x1847a7:
db X_ACCURACY, 1
-; 0x1847a9
-SageNicoSeenText: ; 0x1847a9
+SageNicoSeenText:
text "However hard we"
line "battle, the TOWER"
cont "will stand strong."
done
-; 0x1847df
-SageNicoBeatenText: ; 0x1847df
+SageNicoBeatenText:
text "I fought hard but"
line "I'm too weak."
done
-; 0x1847ff
-UnknownText_0x1847ff: ; 0x1847ff
+UnknownText_0x1847ff:
text "The flexible pil-"
line "lar protects the"
@@ -92,20 +83,17 @@
para "TOWER, even from"
line "earthquakes."
done
-; 0x184841
-SageEdmondSeenText: ; 0x184841
+SageEdmondSeenText:
text "…Sway like leaves"
line "in the wind…"
done
-; 0x184861
-SageEdmondBeatenText: ; 0x184861
+SageEdmondBeatenText:
text "Oh, I'm weak!"
done
-; 0x18486f
-UnknownText_0x18486f: ; 0x18486f
+UnknownText_0x18486f:
text "I tried to copy"
line "BELLSPROUT's"
@@ -115,17 +103,15 @@
para "But I didn't train"
line "well enough."
done
-; 0x1848c8
-UnknownText_0x1848c8: ; 0x1848c8
+UnknownText_0x1848c8:
text "A #MON statue…"
para "It looks very"
line "distinguished."
done
-; 0x1848f5
-SproutTower2F_MapEventHeader: ; 0x1848f5
+SproutTower2F_MapEventHeader:
; filler
db 0, 0
@@ -148,4 +134,3 @@
person_event SPRITE_SAGE, 7, 16, $a, $0, 255, 255, $92, 4, TrainerSageNico, $ffff
person_event SPRITE_SAGE, 18, 13, $8, $0, 255, 255, $92, 5, TrainerSageEdmond, $ffff
person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x1847a7, $0648
-; 0x18493b
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -1,4 +1,4 @@
-SproutTower3F_MapScriptHeader: ; 0x18493b
+SproutTower3F_MapScriptHeader:
; trigger count
db 2
@@ -8,17 +8,14 @@
; callback count
db 0
-; 0x184945
-UnknownScript_0x184945: ; 0x184945
+UnknownScript_0x184945:
end
-; 0x184946
-UnknownScript_0x184946: ; 0x184946
+UnknownScript_0x184946:
end
-; 0x184947
-UnknownScript_0x184947: ; 0x184947
+UnknownScript_0x184947:
spriteface $0, UP
showemote $0, $0, 15
special Functionc48f
@@ -58,9 +55,8 @@
dotrigger $1
special RestartMapMusic
end
-; 0x1849a6
-SageLiScript: ; 0x1849a6
+SageLiScript:
faceplayer
loadfont
checkevent EVENT_GOT_HM05_FLASH
@@ -82,18 +78,16 @@
closetext
loadmovesprites
end
-; 0x1849d1
-UnknownScript_0x1849d1: ; 0x1849d1
+UnknownScript_0x1849d1:
writetext UnknownText_0x184d88
closetext
loadmovesprites
end
-; 0x1849d7
-TrainerSageJin: ; 0x1849d7
+TrainerSageJin:
; bit/flag number
- dw $413
+ dw EVENT_BEAT_SAGE_JIN
; trainer group && trainer id
db SAGE, JIN
@@ -109,9 +103,8 @@
; script when talk again
dw SageJinScript
-; 0x1849e3
-SageJinScript: ; 0x1849e3
+SageJinScript:
talkaftercancel
loadfont
writetext UnknownText_0x184dfa
@@ -118,11 +111,10 @@
closetext
loadmovesprites
end
-; 0x1849eb
-TrainerSageTroy: ; 0x1849eb
+TrainerSageTroy:
; bit/flag number
- dw $414
+ dw EVENT_BEAT_SAGE_TROY
; trainer group && trainer id
db SAGE, TROY
@@ -138,9 +130,8 @@
; script when talk again
dw SageTroyScript
-; 0x1849f7
-SageTroyScript: ; 0x1849f7
+SageTroyScript:
talkaftercancel
loadfont
writetext UnknownText_0x184ea4
@@ -147,11 +138,10 @@
closetext
loadmovesprites
end
-; 0x1849ff
-TrainerSageNeal: ; 0x1849ff
+TrainerSageNeal:
; bit/flag number
- dw $418
+ dw EVENT_BEAT_SAGE_NEAL
; trainer group && trainer id
db SAGE, NEAL
@@ -167,9 +157,8 @@
; script when talk again
dw SageNealScript
-; 0x184a0b
-SageNealScript: ; 0x184a0b
+SageNealScript:
talkaftercancel
loadfont
writetext UnknownText_0x184f12
@@ -176,44 +165,36 @@
closetext
loadmovesprites
end
-; 0x184a13
-MapSproutTower3FSignpost3Script: ; 0x184a13
+MapSproutTower3FSignpost3Script:
jumptext UnknownText_0x184f37
-; 0x184a16
-MapSproutTower3FSignpost5Script: ; 0x184a16
+MapSproutTower3FSignpost5Script:
jumptext UnknownText_0x184f61
-; 0x184a19
-ItemFragment_0x184a19: ; 0x184a19
+ItemFragment_0x184a19:
db POTION, 1
-; 0x184a1b
-ItemFragment_0x184a1b: ; 0x184a1b
+ItemFragment_0x184a1b:
db ESCAPE_ROPE, 1
-; 0x184a1d
-MovementData_0x184a1d: ; 0x184a1d
+MovementData_0x184a1d:
step_up
step_up
step_up
step_up
step_end
-; 0x184a22
-MovementData_0x184a22: ; 0x184a22
+MovementData_0x184a22:
step_up
step_end
-; 0x184a24
-MovementData_0x184a24: ; 0x184a24
+MovementData_0x184a24:
step_right
step_down
step_end
-; 0x184a27
-UnknownText_0x184a27: ; 0x184a27
+UnknownText_0x184a27:
text "ELDER: You are in-"
line "deed skilled as a"
cont "trainer."
@@ -233,9 +214,8 @@
para "#MON are not"
line "tools of war…"
done
-; 0x184aec
-UnknownText_0x184aec: ; 0x184aec
+UnknownText_0x184aec:
text "…"
line "…Humph!"
@@ -260,15 +240,13 @@
line "care less about"
cont "weak #MON."
done
-; 0x184bc8
-UnknownText_0x184bc8: ; 0x184bc8
+UnknownText_0x184bc8:
text "<RIVAL> used an"
line "ESCAPE ROPE!"
done
-; 0x184be0
-SageLiSeenText: ; 0x184be0
+SageLiSeenText:
text "So good of you to"
line "come here!"
@@ -290,14 +268,12 @@
para "your #MON and"
line "you!"
done
-; 0x184cb2
-SageLiBeatenText: ; 0x184cb2
+SageLiBeatenText:
text "Ah, excellent!"
done
-; 0x184cc2
-UnknownText_0x184cc2: ; 0x184cc2
+UnknownText_0x184cc2:
text "You and your #-"
line "MON should have"
@@ -307,9 +283,8 @@
para "Take this FLASH"
line "HM."
done
-; 0x184d13
-UnknownText_0x184d13: ; 0x184d13
+UnknownText_0x184d13:
text "FLASH illuminates"
line "even the darkest"
cont "of all places."
@@ -320,29 +295,25 @@
para "need the BADGE"
line "from VIOLET's GYM."
done
-; 0x184d88
-UnknownText_0x184d88: ; 0x184d88
+UnknownText_0x184d88:
text "I hope you learn"
line "and grow from your"
cont "journey."
done
-; 0x184db6
-SageJinSeenText: ; 0x184db6
+SageJinSeenText:
text "I train to find"
line "enlightenment in"
cont "#MON!"
done
-; 0x184dde
-SageJinBeatenText: ; 0x184dde
+SageJinBeatenText:
text "My training is"
line "incomplete…"
done
-; 0x184dfa
-UnknownText_0x184dfa: ; 0x184dfa
+UnknownText_0x184dfa:
text "As #MON grow"
line "stronger, so does"
cont "the trainer."
@@ -353,62 +324,53 @@
para "stronger, so do"
line "the #MON."
done
-; 0x184e60
-SageTroySeenText: ; 0x184e60
+SageTroySeenText:
text "Let me see how"
line "much you trust"
cont "your #MON."
done
-; 0x184e8a
-SageTroyBeatenText: ; 0x184e8a
+SageTroyBeatenText:
text "Yes, your trust is"
line "real!"
done
-; 0x184ea4
-UnknownText_0x184ea4: ; 0x184ea4
+UnknownText_0x184ea4:
text "It is not far to"
line "the ELDER."
done
-; 0x184ec1
-SageNealSeenText: ; 0x184ec1
+SageNealSeenText:
text "The ELDER's HM"
line "lights even pitch-"
cont "black darkness."
done
-; 0x184ef3
-SageNealBeatenText: ; 0x184ef3
+SageNealBeatenText:
text "It is my head that"
line "is bright!"
done
-; 0x184f12
-UnknownText_0x184f12: ; 0x184f12
+UnknownText_0x184f12:
text "Let there be light"
line "on your journey."
done
-; 0x184f37
-UnknownText_0x184f37: ; 0x184f37
+UnknownText_0x184f37:
text "It's a powerful"
line "painting of a"
cont "BELLSPROUT."
done
-; 0x184f61
-UnknownText_0x184f61: ; 0x184f61
+UnknownText_0x184f61:
text "A #MON statue…"
para "It looks very"
line "distinguished."
done
-; 0x184f8e
-SproutTower3F_MapEventHeader: ; 0x184f8e
+SproutTower3F_MapEventHeader:
; filler
db 0, 0
@@ -438,4 +400,3 @@
person_event SPRITE_POKE_BALL, 18, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x184a19, $0649
person_event SPRITE_POKE_BALL, 5, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x184a1b, $064a
person_event SPRITE_SILVER, 8, 14, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER
-; 0x18501a
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -1,4 +1,4 @@
-TeamRocketBaseB1F_MapScriptHeader: ; 0x6c651
+TeamRocketBaseB1F_MapScriptHeader:
; trigger count
db 1
@@ -11,18 +11,15 @@
; callbacks
dbw 2, UnknownScript_0x6c65b
-; 0x6c65a
-UnknownScript_0x6c65a: ; 0x6c65a
+UnknownScript_0x6c65a:
end
-; 0x6c65b
-UnknownScript_0x6c65b: ; 0x6c65b
+UnknownScript_0x6c65b:
disappear $2
return
-; 0x6c65e
-SecurityCamera1a: ; 0x6c65e
+SecurityCamera1a:
checkevent EVENT_SECURITY_CAMERA_1
iftrue NoSecurityCamera
scall PlaySecurityCameraSounds
@@ -46,9 +43,8 @@
if_equal $1, NoSecurityCamera
setevent EVENT_SECURITY_CAMERA_1
end
-; 0x6c6a7
-SecurityCamera1b: ; 0x6c6a7
+SecurityCamera1b:
checkevent EVENT_SECURITY_CAMERA_1
iftrue NoSecurityCamera
scall PlaySecurityCameraSounds
@@ -72,9 +68,8 @@
if_equal $1, NoSecurityCamera
setevent EVENT_SECURITY_CAMERA_1
end
-; 0x6c6f0
-SecurityCamera2a: ; 0x6c6f0
+SecurityCamera2a:
checkevent EVENT_SECURITY_CAMERA_2
iftrue NoSecurityCamera
scall PlaySecurityCameraSounds
@@ -99,9 +94,8 @@
if_equal $1, NoSecurityCamera
setevent EVENT_SECURITY_CAMERA_2
end
-; 0x6c73c
-SecurityCamera2b: ; 0x6c73c
+SecurityCamera2b:
checkevent EVENT_SECURITY_CAMERA_2
iftrue NoSecurityCamera
scall PlaySecurityCameraSounds
@@ -126,9 +120,8 @@
if_equal $1, NoSecurityCamera
setevent EVENT_SECURITY_CAMERA_2
end
-; 0x6c788
-SecurityCamera3a: ; 0x6c788
+SecurityCamera3a:
checkevent EVENT_SECURITY_CAMERA_3
iftrue NoSecurityCamera
scall PlaySecurityCameraSounds
@@ -153,9 +146,8 @@
if_equal $1, NoSecurityCamera
setevent EVENT_SECURITY_CAMERA_3
end
-; 0x6c7d4
-SecurityCamera3b: ; 0x6c7d4
+SecurityCamera3b:
checkevent EVENT_SECURITY_CAMERA_3
iftrue NoSecurityCamera
scall PlaySecurityCameraSounds
@@ -180,9 +172,8 @@
if_equal $1, NoSecurityCamera
setevent EVENT_SECURITY_CAMERA_3
end
-; 0x6c820
-SecurityCamera4: ; 0x6c820
+SecurityCamera4:
checkevent EVENT_SECURITY_CAMERA_4
iftrue NoSecurityCamera
scall PlaySecurityCameraSounds
@@ -207,9 +198,8 @@
if_equal $1, NoSecurityCamera
setevent EVENT_SECURITY_CAMERA_4
end
-; 0x6c86c
-SecurityCamera5: ; 0x6c86c
+SecurityCamera5:
checkevent EVENT_SECURITY_CAMERA_5
iftrue NoSecurityCamera
scall PlaySecurityCameraSounds
@@ -234,13 +224,11 @@
if_equal $1, NoSecurityCamera
setevent EVENT_SECURITY_CAMERA_5
end
-; 0x6c8b8
-NoSecurityCamera: ; 0x6c8b8
+NoSecurityCamera:
end
-; 0x6c8b9
-TrainerCameraGrunt1: ; 0x6c8b9
+TrainerCameraGrunt1:
loadfont
writetext CameraGrunt1SeenText
closetext
@@ -252,9 +240,8 @@
disappear $2
returnafterbattle
end
-; 0x6c8ce
-TrainerCameraGrunt2: ; 0x6c8ce
+TrainerCameraGrunt2:
loadfont
writetext CameraGrunt2SeenText
closetext
@@ -266,9 +253,8 @@
disappear $2
returnafterbattle
end
-; 0x6c8e3
-PlaySecurityCameraSounds: ; 0x6c8e3
+PlaySecurityCameraSounds:
playsound SFX_LICK
pause 10
playsound SFX_LICK
@@ -281,9 +267,8 @@
pause 10
playsound SFX_LICK
end
-; 0x6c900
-ExplodingTrap1: ; 0x6c900
+ExplodingTrap1:
checkevent EVENT_EXPLODING_TRAP_1
iftrue NoExplodingTrap
scall KoffingExplodingTrap
@@ -291,7 +276,7 @@
setevent EVENT_EXPLODING_TRAP_1
end
-ExplodingTrap2: ; 0x6c90e
+ExplodingTrap2:
checkevent EVENT_EXPLODING_TRAP_2
iftrue NoExplodingTrap
scall VoltorbExplodingTrap
@@ -299,7 +284,7 @@
setevent EVENT_EXPLODING_TRAP_2
end
-ExplodingTrap3: ; 0x6c91c
+ExplodingTrap3:
checkevent EVENT_EXPLODING_TRAP_3
iftrue NoExplodingTrap
scall GeodudeExplodingTrap
@@ -307,7 +292,7 @@
setevent EVENT_EXPLODING_TRAP_3
end
-ExplodingTrap4: ; 0x6c92a
+ExplodingTrap4:
checkevent EVENT_EXPLODING_TRAP_4
iftrue NoExplodingTrap
scall VoltorbExplodingTrap
@@ -315,7 +300,7 @@
setevent EVENT_EXPLODING_TRAP_4
end
-ExplodingTrap5: ; 0x6c938
+ExplodingTrap5:
checkevent EVENT_EXPLODING_TRAP_5
iftrue NoExplodingTrap
scall GeodudeExplodingTrap
@@ -323,7 +308,7 @@
setevent EVENT_EXPLODING_TRAP_5
end
-ExplodingTrap6: ; 0x6c946
+ExplodingTrap6:
checkevent EVENT_EXPLODING_TRAP_6
iftrue NoExplodingTrap
scall KoffingExplodingTrap
@@ -331,7 +316,7 @@
setevent EVENT_EXPLODING_TRAP_6
end
-ExplodingTrap7: ; 0x6c954
+ExplodingTrap7:
checkevent EVENT_EXPLODING_TRAP_7
iftrue NoExplodingTrap
scall VoltorbExplodingTrap
@@ -339,7 +324,7 @@
setevent EVENT_EXPLODING_TRAP_7
end
-ExplodingTrap8: ; 0x6c962
+ExplodingTrap8:
checkevent EVENT_EXPLODING_TRAP_8
iftrue NoExplodingTrap
scall KoffingExplodingTrap
@@ -347,7 +332,7 @@
setevent EVENT_EXPLODING_TRAP_8
end
-ExplodingTrap9: ; 0x6c970
+ExplodingTrap9:
checkevent EVENT_EXPLODING_TRAP_9
iftrue NoExplodingTrap
scall KoffingExplodingTrap
@@ -355,7 +340,7 @@
setevent EVENT_EXPLODING_TRAP_9
end
-ExplodingTrap10: ; 0x6c97e
+ExplodingTrap10:
checkevent EVENT_EXPLODING_TRAP_10
iftrue NoExplodingTrap
scall VoltorbExplodingTrap
@@ -363,7 +348,7 @@
setevent EVENT_EXPLODING_TRAP_10
end
-ExplodingTrap11: ; 0x6c98c
+ExplodingTrap11:
checkevent EVENT_EXPLODING_TRAP_11
iftrue NoExplodingTrap
scall GeodudeExplodingTrap
@@ -371,7 +356,7 @@
setevent EVENT_EXPLODING_TRAP_11
end
-ExplodingTrap12: ; 0x6c99a
+ExplodingTrap12:
checkevent EVENT_EXPLODING_TRAP_12
iftrue NoExplodingTrap
scall GeodudeExplodingTrap
@@ -379,7 +364,7 @@
setevent EVENT_EXPLODING_TRAP_12
end
-ExplodingTrap13: ; 0x6c9a8
+ExplodingTrap13:
checkevent EVENT_EXPLODING_TRAP_13
iftrue NoExplodingTrap
scall GeodudeExplodingTrap
@@ -387,7 +372,7 @@
setevent EVENT_EXPLODING_TRAP_13
end
-ExplodingTrap14: ; 0x6c9b6
+ExplodingTrap14:
checkevent EVENT_EXPLODING_TRAP_14
iftrue NoExplodingTrap
scall KoffingExplodingTrap
@@ -395,7 +380,7 @@
setevent EVENT_EXPLODING_TRAP_14
end
-ExplodingTrap15: ; 0x6c9c4
+ExplodingTrap15:
checkevent EVENT_EXPLODING_TRAP_15
iftrue NoExplodingTrap
scall VoltorbExplodingTrap
@@ -403,7 +388,7 @@
setevent EVENT_EXPLODING_TRAP_15
end
-ExplodingTrap16: ; 0x6c9d2
+ExplodingTrap16:
checkevent EVENT_EXPLODING_TRAP_16
iftrue NoExplodingTrap
scall KoffingExplodingTrap
@@ -411,7 +396,7 @@
setevent EVENT_EXPLODING_TRAP_16
end
-ExplodingTrap17: ; 0x6c9e0
+ExplodingTrap17:
checkevent EVENT_EXPLODING_TRAP_17
iftrue NoExplodingTrap
scall VoltorbExplodingTrap
@@ -419,7 +404,7 @@
setevent EVENT_EXPLODING_TRAP_17
end
-ExplodingTrap18: ; 0x6c9ee
+ExplodingTrap18:
checkevent EVENT_EXPLODING_TRAP_18
iftrue NoExplodingTrap
scall GeodudeExplodingTrap
@@ -427,7 +412,7 @@
setevent EVENT_EXPLODING_TRAP_18
end
-ExplodingTrap19: ; 0x6c9fc
+ExplodingTrap19:
checkevent EVENT_EXPLODING_TRAP_19
iftrue NoExplodingTrap
scall GeodudeExplodingTrap
@@ -435,7 +420,7 @@
setevent EVENT_EXPLODING_TRAP_19
end
-ExplodingTrap20: ; 0x6ca0a
+ExplodingTrap20:
checkevent EVENT_EXPLODING_TRAP_20
iftrue NoExplodingTrap
scall VoltorbExplodingTrap
@@ -443,7 +428,7 @@
setevent EVENT_EXPLODING_TRAP_20
end
-ExplodingTrap21: ; 0x6ca18
+ExplodingTrap21:
checkevent EVENT_EXPLODING_TRAP_21
iftrue NoExplodingTrap
scall KoffingExplodingTrap
@@ -451,7 +436,7 @@
setevent EVENT_EXPLODING_TRAP_21
end
-ExplodingTrap22: ; 0x6ca26
+ExplodingTrap22:
checkevent EVENT_EXPLODING_TRAP_22
iftrue NoExplodingTrap
scall VoltorbExplodingTrap
@@ -459,7 +444,7 @@
setevent EVENT_EXPLODING_TRAP_22
end
-VoltorbExplodingTrap: ; 0x6ca34
+VoltorbExplodingTrap:
special Function8c084
cry VOLTORB
special Function8c079
@@ -469,7 +454,7 @@
startbattle
end
-GeodudeExplodingTrap: ; 0x6ca47
+GeodudeExplodingTrap:
special Function8c084
cry GEODUDE
special Function8c079
@@ -479,7 +464,7 @@
startbattle
end
-KoffingExplodingTrap: ; 0x6ca5a
+KoffingExplodingTrap:
special Function8c084
cry KOFFING
special Function8c079
@@ -489,13 +474,12 @@
startbattle
end
-NoExplodingTrap: ; 0x6ca6d
+NoExplodingTrap:
end
-; 0x6ca6e
-TrainerScientistJed: ; 0x6ca6e
+TrainerScientistJed:
; bit/flag number
- dw $4a1
+ dw EVENT_BEAT_SCIENTIST_JED
; trainer group && trainer id
db SCIENTIST, JED
@@ -511,9 +495,8 @@
; script when talk again
dw ScientistJedScript
-; 0x6ca7a
-ScientistJedScript: ; 0x6ca7a
+ScientistJedScript:
talkaftercancel
loadfont
writetext UnknownText_0x6cc16
@@ -520,11 +503,10 @@
closetext
loadmovesprites
end
-; 0x6ca82
-TrainerGruntM16: ; 0x6ca82
+TrainerGruntM16:
; bit/flag number
- dw $500
+ dw EVENT_BEAT_ROCKET_GRUNTM_15
; trainer group && trainer id
db GRUNTM, 16
@@ -540,9 +522,8 @@
; script when talk again
dw GruntM16Script
-; 0x6ca8e
-GruntM16Script: ; 0x6ca8e
+GruntM16Script:
talkaftercancel
loadfont
writetext UnknownText_0x6cd1b
@@ -549,17 +530,14 @@
closetext
loadmovesprites
end
-; 0x6ca96
-MapTeamRocketBaseB1FSignpost5Script: ; 0x6ca96
+MapTeamRocketBaseB1FSignpost5Script:
jumptext SecurityCameraText
-; 0x6ca99
-MapTeamRocketBaseB1FSignpost7Script: ; 0x6ca99
+MapTeamRocketBaseB1FSignpost7Script:
jumpstd teamrocketoath
-; 0x6ca9c
-MapTeamRocketBaseB1FSignpost0Script: ; 0x6ca9c
+MapTeamRocketBaseB1FSignpost0Script:
loadfont
checkevent EVENT_TURNED_OFF_SECURITY_CAMERAS
iftrue UnknownScript_0x6cabe
@@ -574,42 +552,35 @@
setevent EVENT_SECURITY_CAMERA_4
setevent EVENT_SECURITY_CAMERA_5
end
-; 0x6cabe
-UnknownScript_0x6cabe: ; 0x6cabe
+UnknownScript_0x6cabe:
writetext UnknownText_0x6cdd0
closetext
loadmovesprites
end
-; 0x6cac4
-ItemFragment_0x6cac4: ; 0x6cac4
+ItemFragment_0x6cac4:
db HYPER_POTION, 1
-; 0x6cac6
-ItemFragment_0x6cac6: ; 0x6cac6
+ItemFragment_0x6cac6:
db NUGGET, 1
-; 0x6cac8
-ItemFragment_0x6cac8: ; 0x6cac8
+ItemFragment_0x6cac8:
db GUARD_SPEC, 1
-; 0x6caca
-MapTeamRocketBaseB1FSignpostItem8: ; 0x6caca
+MapTeamRocketBaseB1FSignpostItem8:
dw $0086
db REVIVE
-; 0x6cacd
-SecurityCameraMovement1: ; 0x6cacd
+SecurityCameraMovement1:
big_step_right
big_step_right
big_step_right
big_step_right
step_end
-; 0x6cad2
-SecurityCameraMovement2: ; 0x6cad2
+SecurityCameraMovement2:
big_step_up
big_step_right
big_step_up
@@ -618,9 +589,8 @@
big_step_up
turn_head_right
step_end
-; 0x6cada
-SecurityCameraMovement3: ; 0x6cada
+SecurityCameraMovement3:
big_step_left
big_step_left
big_step_left
@@ -630,9 +600,8 @@
big_step_left
big_step_left
step_end
-; 0x6cae3
-SecurityCameraMovement4: ; 0x6cae3
+SecurityCameraMovement4:
; he jumps over a trap
jump_step_up
big_step_right
@@ -641,9 +610,8 @@
big_step_up
turn_head_right
step_end
-; 0x6caea
-SecurityCameraMovement5: ; 0x6caea
+SecurityCameraMovement5:
big_step_left
big_step_left
big_step_left
@@ -652,9 +620,8 @@
big_step_left
big_step_left
step_end
-; 0x6caf2
-SecurityCameraMovement6: ; 0x6caf2
+SecurityCameraMovement6:
big_step_up
big_step_up
big_step_right
@@ -663,9 +630,8 @@
big_step_up
big_step_left
step_end
-; 0x6cafa
-SecurityCameraMovement7: ; 0x6cafa
+SecurityCameraMovement7:
big_step_up
big_step_up
big_step_up
@@ -674,9 +640,8 @@
big_step_up
big_step_left
step_end
-; 0x6cb02
-SecurityCameraMovement8: ; 0x6cb02
+SecurityCameraMovement8:
big_step_down
big_step_down
big_step_right
@@ -687,9 +652,8 @@
big_step_left
big_step_left
step_end
-; 0x6cb0c
-SecurityCameraMovement9: ; 0x6cb0c
+SecurityCameraMovement9:
big_step_left
big_step_left
big_step_left
@@ -696,26 +660,22 @@
big_step_left
big_step_left
step_end
-; 0x6cb12
-CameraGrunt1SeenText: ; 0x6cb12
+CameraGrunt1SeenText:
text "Hey!"
line "Intruder alert!"
done
-; 0x6cb28
-CameraGrunt1BeatenText: ; 0x6cb28
+CameraGrunt1BeatenText:
text "Dang… I failed…"
done
-; 0x6cb39
-CameraGrunt2SeenText: ; 0x6cb39
+CameraGrunt2SeenText:
text "It's my turn!"
line "There's no escape!"
done
-; 0x6cb59
-CameraGrunt2BeatenText: ; 0x6cb59
+CameraGrunt2BeatenText:
text "Surveillance cams"
line "are in the #MON"
cont "statues."
@@ -724,9 +684,8 @@
line "ing until you trip"
cont "a secret switch."
done
-; 0x6cbbb
-ScientistJedSeenText: ; 0x6cbbb
+ScientistJedSeenText:
text "This was once a"
line "ninja hideout."
@@ -734,14 +693,12 @@
line "confound intruders"
cont "like you."
done
-; 0x6cc0b
-ScientistJedBeatenText: ; 0x6cc0b
+ScientistJedBeatenText:
text "I get it…"
done
-; 0x6cc16
-UnknownText_0x6cc16: ; 0x6cc16
+UnknownText_0x6cc16:
text "All right. I'll"
line "divulge a secret"
cont "about our hideout."
@@ -756,9 +713,8 @@
para "back to the en-"
line "trance."
done
-; 0x6ccb7
-GruntM16SeenText: ; 0x6ccb7
+GruntM16SeenText:
text "Heheh. Feeling"
line "lucky, punk?"
@@ -768,14 +724,12 @@
para "We've got traps"
line "set in the floor!"
done
-; 0x6cd12
-GruntM16BeatenText: ; 0x6cd12
+GruntM16BeatenText:
text "Kaboom!"
done
-; 0x6cd1b
-UnknownText_0x6cd1b: ; 0x6cd1b
+UnknownText_0x6cd1b:
text "I don't even know"
line "where the traps"
cont "are planted."
@@ -784,9 +738,8 @@
line "to collect your"
cont "courage and walk."
done
-; 0x6cd7c
-SecurityCameraText: ; 0x6cd7c
+SecurityCameraText:
text "It's a PERSIAN"
line "statue…"
@@ -793,21 +746,18 @@
para "Its eyes are oddly"
line "shiny."
done
-; 0x6cdad
-UnknownText_0x6cdad: ; 0x6cdad
+UnknownText_0x6cdad:
text "A secret switch!"
line "Better press it."
done
-; 0x6cdd0
-UnknownText_0x6cdd0: ; 0x6cdd0
+UnknownText_0x6cdd0:
text "The switch is"
line "turned off."
done
-; 0x6cdeb
-TeamRocketBaseB1F_MapEventHeader: ; 0x6cdeb
+TeamRocketBaseB1F_MapEventHeader:
; filler
db 0, 0
@@ -875,4 +825,3 @@
person_event SPRITE_POKE_BALL, 10, 31, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac4, $0669
person_event SPRITE_POKE_BALL, 19, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac6, $066a
person_event SPRITE_POKE_BALL, 16, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac8, $066b
-; 0x6cf70
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -1,4 +1,4 @@
-TeamRocketBaseB2F_MapScriptHeader: ; 0x6cf70
+TeamRocketBaseB2F_MapScriptHeader:
; trigger count
db 4
@@ -14,46 +14,38 @@
; callbacks
dbw 1, UnknownScript_0x6cf89
-; 0x6cf85
-UnknownScript_0x6cf85: ; 0x6cf85
+UnknownScript_0x6cf85:
end
-; 0x6cf86
-UnknownScript_0x6cf86: ; 0x6cf86
+UnknownScript_0x6cf86:
end
-; 0x6cf87
-UnknownScript_0x6cf87: ; 0x6cf87
+UnknownScript_0x6cf87:
end
-; 0x6cf88
-UnknownScript_0x6cf88: ; 0x6cf88
+UnknownScript_0x6cf88:
end
-; 0x6cf89
-UnknownScript_0x6cf89: ; 0x6cf89
+UnknownScript_0x6cf89:
checkevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER
iftrue UnknownScript_0x6cf90
return
-; 0x6cf90
-UnknownScript_0x6cf90: ; 0x6cf90
+UnknownScript_0x6cf90:
changeblock $e, $c, $7
return
-; 0x6cf95
-UnknownScript_0x6cf95: ; 0x6cf95
+UnknownScript_0x6cf95:
moveperson $4, $9, $d
jump UnknownScript_0x6cfac
-; 0x6cf9c
-UnknownScript_0x6cf9c: ; 0x6cf9c
+UnknownScript_0x6cf9c:
moveperson $3, $15, $10
moveperson $2, $15, $10
moveperson $5, $a, $d
moveperson $4, $a, $d
-UnknownScript_0x6cfac: ; 0x6cfac
+UnknownScript_0x6cfac:
appear $3
appear $2
loadfont
@@ -101,7 +93,7 @@
setevent $06de
setevent $06d6
returnafterbattle
- setevent $0570
+ setevent EVENT_BEAT_ROCKET_EXECUTIVEF_2
loadfont
writetext UnknownText_0x6d4c6
closetext
@@ -138,14 +130,12 @@
loadmovesprites
applymovement $4, MovementData_0x6d267
disappear $4
-; 0x6d075
-UnknownScript_0x6d075: ; 0x6d075
+UnknownScript_0x6d075:
applymovement $0, MovementData_0x6d271
end
-; 0x6d07a
-UnknownScript_0x6d07a: ; 0x6d07a
+UnknownScript_0x6d07a:
loadfont
writetext UnknownText_0x6d7ea
closetext
@@ -152,17 +142,15 @@
loadmovesprites
applymovement $0, MovementData_0x6d278
end
-; 0x6d085
-UnknownScript_0x6d085: ; 0x6d085
+UnknownScript_0x6d085:
spriteface $0, UP
jump UnknownScript_0x6d091
-; 0x6d08b
-UnknownScript_0x6d08b: ; 0x6d08b
+UnknownScript_0x6d08b:
spriteface $0, RIGHT
spriteface $4, LEFT
-UnknownScript_0x6d091: ; 0x6d091
+UnknownScript_0x6d091:
loadfont
writetext UnknownText_0x6da97
closetext
@@ -183,17 +171,15 @@
applymovement $4, MovementData_0x6d212
disappear $4
end
-; 0x6d0be
-UnknownScript_0x6d0be: ; 0x6d0be
+UnknownScript_0x6d0be:
applymovement $4, MovementData_0x6d219
disappear $4
end
-; 0x6d0c5
-TrainerGruntM17: ; 0x6d0c5
+TrainerGruntM17:
; bit/flag number
- dw $501
+ dw EVENT_BEAT_ROCKET_GRUNTM_16
; trainer group && trainer id
db GRUNTM, 17
@@ -209,9 +195,8 @@
; script when talk again
dw GruntM17Script
-; 0x6d0d1
-GruntM17Script: ; 0x6d0d1
+GruntM17Script:
talkaftercancel
loadfont
writetext UnknownText_0x6db88
@@ -218,11 +203,10 @@
closetext
loadmovesprites
end
-; 0x6d0d9
-TrainerGruntM18: ; 0x6d0d9
+TrainerGruntM18:
; bit/flag number
- dw $502
+ dw EVENT_BEAT_ROCKET_GRUNTM_17
; trainer group && trainer id
db GRUNTM, 18
@@ -238,9 +222,8 @@
; script when talk again
dw GruntM18Script
-; 0x6d0e5
-GruntM18Script: ; 0x6d0e5
+GruntM18Script:
talkaftercancel
loadfont
writetext UnknownText_0x6dc1a
@@ -247,11 +230,10 @@
closetext
loadmovesprites
end
-; 0x6d0ed
-TrainerGruntM19: ; 0x6d0ed
+TrainerGruntM19:
; bit/flag number
- dw $503
+ dw EVENT_BEAT_ROCKET_GRUNTM_18
; trainer group && trainer id
db GRUNTM, 19
@@ -267,9 +249,8 @@
; script when talk again
dw GruntM19Script
-; 0x6d0f9
-GruntM19Script: ; 0x6d0f9
+GruntM19Script:
talkaftercancel
loadfont
writetext UnknownText_0x6dcd1
@@ -276,9 +257,8 @@
closetext
loadmovesprites
end
-; 0x6d101
-VoltorbScript_0x6d101: ; 0x6d101
+VoltorbScript_0x6d101:
cry ELECTRODE
loadpokedata ELECTRODE, 23
startbattle
@@ -295,9 +275,8 @@
special PlayMapMusic
applymovement $0, MovementData_0x6d28c
jump UnknownScript_0x6d184
-; 0x6d12c
-VoltorbScript_0x6d12c: ; 0x6d12c
+VoltorbScript_0x6d12c:
cry ELECTRODE
loadpokedata ELECTRODE, 23
startbattle
@@ -314,9 +293,8 @@
special PlayMapMusic
applymovement $0, MovementData_0x6d299
jump UnknownScript_0x6d184
-; 0x6d157
-VoltorbScript_0x6d157: ; 0x6d157
+VoltorbScript_0x6d157:
cry ELECTRODE
loadpokedata ELECTRODE, 23
startbattle
@@ -333,14 +311,12 @@
special PlayMapMusic
applymovement $0, MovementData_0x6d2a4
jump UnknownScript_0x6d184
-; 0x6d182
-UnknownScript_0x6d182: ; 0x6d182
+UnknownScript_0x6d182:
returnafterbattle
end
-; 0x6d184
-UnknownScript_0x6d184: ; 0x6d184
+UnknownScript_0x6d184:
moveperson $4, $12, $6
appear $4
applymovement $4, MovementData_0x6d27a
@@ -374,15 +350,13 @@
setevent EVENT_SECURITY_CAMERA_4
setevent EVENT_SECURITY_CAMERA_5
end
-; 0x6d1d7
-MapTeamRocketBaseB2FSignpostPtr1: ; 0x6d1d7
+MapTeamRocketBaseB2FSignpostPtr1:
dw $0300
dw MapTeamRocketBaseB2FSignpost1Script
-; 0x6d1db
-MapTeamRocketBaseB2FSignpost1Script: ; 0x6d1db
+MapTeamRocketBaseB2FSignpost1Script:
loadfont
checkevent EVENT_LEARNED_HAIL_GIOVANNI
iftrue UnknownScript_0x6d1e8
@@ -390,9 +364,8 @@
closetext
loadmovesprites
end
-; 0x6d1e8
-UnknownScript_0x6d1e8: ; 0x6d1e8
+UnknownScript_0x6d1e8:
writetext UnknownText_0x6dd6b
closetext
playsound SFX_ENTER_DOOR
@@ -402,9 +375,8 @@
setevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER
waitbutton
end
-; 0x6d1fa
-MapTeamRocketBaseB2FSignpost21Script: ; 0x6d1fa
+MapTeamRocketBaseB2FSignpost21Script:
loadfont
checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue UnknownScript_0x6d207
@@ -412,26 +384,22 @@
closetext
loadmovesprites
end
-; 0x6d207
-UnknownScript_0x6d207: ; 0x6d207
+UnknownScript_0x6d207:
writetext UnknownText_0x6de03
closetext
loadmovesprites
end
-; 0x6d20d
-ItemFragment_0x6d20d: ; 0x6d20d
+ItemFragment_0x6d20d:
db TM_THIEF, 1
-; 0x6d20f
-MapTeamRocketBaseB2FSignpostItem22: ; 0x6d20f
+MapTeamRocketBaseB2FSignpostItem22:
dw $0087
db FULL_HEAL
-; 0x6d212
-MovementData_0x6d212: ; 0x6d212
+MovementData_0x6d212:
step_right
step_right
step_right
@@ -439,9 +407,8 @@
step_right
step_right
step_end
-; 0x6d219
-MovementData_0x6d219: ; 0x6d219
+MovementData_0x6d219:
step_right
step_right
step_right
@@ -448,17 +415,15 @@
step_right
step_right
step_end
-; 0x6d21f
-MovementData_0x6d21f: ; 0x6d21f
+MovementData_0x6d21f:
step_down
step_down
step_down
turn_head_right
step_end
-; 0x6d224
-MovementData_0x6d224: ; 0x6d224
+MovementData_0x6d224:
big_step_left
big_step_left
big_step_up
@@ -470,9 +435,8 @@
big_step_left
turn_head_down
step_end
-; 0x6d22f
-MovementData_0x6d22f: ; 0x6d22f
+MovementData_0x6d22f:
big_step_left
big_step_left
big_step_up
@@ -480,17 +444,15 @@
big_step_left
big_step_left
step_end
-; 0x6d236
-MovementData_0x6d236: ; 0x6d236
+MovementData_0x6d236:
big_step_right
big_step_right
big_step_right
big_step_right
step_end
-; 0x6d23b
-MovementData_0x6d23b: ; 0x6d23b
+MovementData_0x6d23b:
fix_facing
db $39 ; movement
jump_step_right
@@ -497,53 +459,45 @@
db $38 ; movement
remove_fixed_facing
step_end
-; 0x6d241
-MovementData_0x6d241: ; 0x6d241
+MovementData_0x6d241:
slow_step_down
turn_head_left
step_end
-; 0x6d244
-MovementData_0x6d244: ; 0x6d244
+MovementData_0x6d244:
step_right
step_right
step_right
step_end
-; 0x6d248
-MovementData_0x6d248: ; 0x6d248
+MovementData_0x6d248:
big_step_left
step_end
-; 0x6d24a
-MovementData_0x6d24a: ; 0x6d24a
+MovementData_0x6d24a:
big_step_left
step_end
-; 0x6d24c
-MovementData_0x6d24c: ; 0x6d24c
+MovementData_0x6d24c:
big_step_left
big_step_up
turn_head_left
step_end
-; 0x6d250
-MovementData_0x6d250: ; 0x6d250
+MovementData_0x6d250:
step_right
step_right
turn_head_down
step_end
-; 0x6d254
-MovementData_0x6d254: ; 0x6d254
+MovementData_0x6d254:
step_up
step_up
step_up
step_end
-; 0x6d258
-MovementData_0x6d258: ; 0x6d258
+MovementData_0x6d258:
accelerate_last
step_left
step_left
@@ -559,9 +513,8 @@
step_left
turn_head_down
step_end
-; 0x6d267
-MovementData_0x6d267: ; 0x6d267
+MovementData_0x6d267:
step_right
step_right
step_right
@@ -572,9 +525,8 @@
step_up
step_up
step_end
-; 0x6d271
-MovementData_0x6d271: ; 0x6d271
+MovementData_0x6d271:
step_up
step_left
step_left
@@ -582,14 +534,12 @@
step_left
turn_head_up
step_end
-; 0x6d278
-MovementData_0x6d278: ; 0x6d278
+MovementData_0x6d278:
step_left
step_end
-; 0x6d27a
-MovementData_0x6d27a: ; 0x6d27a
+MovementData_0x6d27a:
step_down
step_down
step_down
@@ -599,9 +549,8 @@
step_left
step_left
step_end
-; 0x6d283
-MovementData_0x6d283: ; 0x6d283
+MovementData_0x6d283:
step_down
step_down
step_left
@@ -611,9 +560,8 @@
step_left
step_left
step_end
-; 0x6d28c
-MovementData_0x6d28c: ; 0x6d28c
+MovementData_0x6d28c:
step_right
step_right
step_down
@@ -627,9 +575,8 @@
step_right
step_right
step_end
-; 0x6d299
-MovementData_0x6d299: ; 0x6d299
+MovementData_0x6d299:
step_right
step_right
step_down
@@ -641,9 +588,8 @@
step_right
step_right
step_end
-; 0x6d2a4
-MovementData_0x6d2a4: ; 0x6d2a4
+MovementData_0x6d2a4:
step_right
step_right
step_down
@@ -653,15 +599,13 @@
step_right
step_right
step_end
-; 0x6d2ad
-UnknownText_0x6d2ad: ; 0x6d2ad
+UnknownText_0x6d2ad:
text "Hold it right"
line "there!"
done
-; 0x6d2c3
-UnknownText_0x6d2c3: ; 0x6d2c3
+UnknownText_0x6d2c3:
text "We can't have a"
line "brat like you on"
cont "the loose."
@@ -680,16 +624,14 @@
line "get ready to be"
cont "thrashed."
done
-; 0x6d38c
-UnknownText_0x6d38c: ; 0x6d38c
+UnknownText_0x6d38c:
text "Hey! Don't be so"
line "selfish. Spread"
cont "the fun around."
done
-; 0x6d3bd
-UnknownText_0x6d3bd: ; 0x6d3bd
+UnknownText_0x6d3bd:
text "What? You had an"
line "accomplice?"
@@ -705,9 +647,8 @@
para "it is to meddle"
line "with TEAM ROCKET!"
done
-; 0x6d45c
-UnknownText_0x6d45c: ; 0x6d45c
+UnknownText_0x6d45c:
text "Tch, you really"
line "are strong."
@@ -719,9 +660,8 @@
para "you could become"
line "an EXECUTIVE."
done
-; 0x6d4c6
-UnknownText_0x6d4c6: ; 0x6d4c6
+UnknownText_0x6d4c6:
text "…This hideout is"
line "done for…"
@@ -748,9 +688,8 @@
para "Fufufufu…"
done
-; 0x6d5d8
-UnknownText_0x6d5d8: ; 0x6d5d8
+UnknownText_0x6d5d8:
text "LANCE: That did"
line "it. We defeated"
@@ -763,9 +702,8 @@
para "guy I battled in"
line "the process…"
done
-; 0x6d64e
-UnknownText_0x6d64e: ; 0x6d64e
+UnknownText_0x6d64e:
text "Sorry, <PLAY_G>."
line "I saw how well you"
@@ -778,9 +716,8 @@
para "turn off that odd"
line "radio signal."
done
-; 0x6d6cf
-UnknownText_0x6d6cf: ; 0x6d6cf
+UnknownText_0x6d6cf:
text "It's this machine"
line "that's causing all"
cont "the problems."
@@ -809,15 +746,13 @@
para "<PLAY_G>, let's"
line "split the job."
done
-; 0x6d7ea
-UnknownText_0x6d7ea: ; 0x6d7ea
+UnknownText_0x6d7ea:
text "LANCE: Leave this"
line "side to me."
done
-; 0x6d809
-UnknownText_0x6d809: ; 0x6d809
+UnknownText_0x6d809:
text "LANCE: That odd"
line "signal has finally"
cont "stopped."
@@ -838,15 +773,13 @@
line "but I don't have"
cont "any need for it."
done
-; 0x6d8e6
-UnknownText_0x6d8e6: ; 0x6d8e6
+UnknownText_0x6d8e6:
text "<PLAYER> received"
line "HM06."
done
-; 0x6d8f8
-UnknownText_0x6d8f8: ; 0x6d8f8
+UnknownText_0x6d8f8:
text "That's WHIRLPOOL."
line "Teach it to a"
@@ -862,9 +795,8 @@
para "with the BADGE"
line "from MAHOGANY GYM."
done
-; 0x6d994
-UnknownText_0x6d994: ; 0x6d994
+UnknownText_0x6d994:
text "<PLAY_G>…"
para "The journey to be-"
@@ -893,9 +825,8 @@
para "I look forward to"
line "seeing you again!"
done
-; 0x6da97
-UnknownText_0x6da97: ; 0x6da97
+UnknownText_0x6da97:
text "LANCE: Are you all"
line "right?"
@@ -906,16 +837,14 @@
line "some of my medi-"
cont "cine."
done
-; 0x6daf7
-UnknownText_0x6daf7: ; 0x6daf7
+UnknownText_0x6daf7:
text "LANCE: <PLAY_G>,"
line "let's give it our"
cont "best for #MON."
done
-; 0x6db22
-GruntM17SeenText: ; 0x6db22
+GruntM17SeenText:
text "The door won't"
line "open?"
@@ -925,14 +854,12 @@
para "password that only"
line "TEAM ROCKET knows."
done
-; 0x6db79
-GruntM17BeatenText: ; 0x6db79
+GruntM17BeatenText:
text "What? I lost?"
done
-; 0x6db88
-UnknownText_0x6db88: ; 0x6db88
+UnknownText_0x6db88:
text "Heh, I'm just a"
line "GRUNT."
@@ -940,9 +867,8 @@
line "password. Too bad"
cont "for you."
done
-; 0x6dbca
-GruntM18SeenText: ; 0x6dbca
+GruntM18SeenText:
text "Oh, a kid? I don't"
line "really like this,"
@@ -949,14 +875,12 @@
para "but eliminate you"
line "I must."
done
-; 0x6dc09
-GruntM18BeatenText: ; 0x6dc09
+GruntM18BeatenText:
text "I knew I'd lose…"
done
-; 0x6dc1a
-UnknownText_0x6dc1a: ; 0x6dc1a
+UnknownText_0x6dc1a:
text "I got wiped out on"
line "the last mission"
cont "by a kid too."
@@ -970,20 +894,17 @@
para "looking eyes just"
line "creamed me…"
done
-; 0x6dcb0
-GruntM19SeenText: ; 0x6dcb0
+GruntM19SeenText:
text "You rotten little"
line "pest!"
done
-; 0x6dcc9
-GruntM19BeatenText: ; 0x6dcc9
+GruntM19BeatenText:
text "Grrrr…"
done
-; 0x6dcd1
-UnknownText_0x6dcd1: ; 0x6dcd1
+UnknownText_0x6dcd1:
text "Heh, only the boss"
line "knows the password"
cont "for that door."
@@ -992,17 +913,15 @@
line "Who knows? Go look"
cont "for yourself."
done
-; 0x6dd39
-UnknownText_0x6dd39: ; 0x6dd39
+UnknownText_0x6dd39:
text "The door's closed…"
para "It needs a pass-"
line "word to open."
done
-; 0x6dd6b
-UnknownText_0x6dd6b: ; 0x6dd6b
+UnknownText_0x6dd6b:
text "The door's closed…"
para "<PLAYER> entered"
@@ -1010,9 +929,8 @@
para "The door opened!"
done
-; 0x6dda7
-UnknownText_0x6dda7: ; 0x6dda7
+UnknownText_0x6dda7:
text "It's the radio"
line "transmitter that's"
@@ -1022,9 +940,8 @@
para "It's working at"
line "full capacity."
done
-; 0x6de03
-UnknownText_0x6de03: ; 0x6de03
+UnknownText_0x6de03:
text "The radio trans-"
line "mitter has finally"
@@ -1031,9 +948,8 @@
para "stopped its evil"
line "broadcast."
done
-; 0x6de44
-TeamRocketBaseB2F_MapEventHeader: ; 0x6de44
+TeamRocketBaseB2F_MapEventHeader:
; filler
db 0, 0
@@ -1099,4 +1015,3 @@
person_event SPRITE_ROCKET, 5, 8, $a, $0, 255, 255, $2, 1, TrainerGruntM18, $06da
person_event SPRITE_ROCKET, 18, 25, $8, $0, 255, 255, $2, 4, TrainerGruntM19, $06da
person_event SPRITE_POKE_BALL, 14, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x6d20d, $066c
-; 0x6dfd4
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -1,4 +1,4 @@
-TeamRocketBaseB3F_MapScriptHeader: ; 0x6dfd4
+TeamRocketBaseB3F_MapScriptHeader:
; trigger count
db 4
@@ -14,37 +14,30 @@
; callbacks
dbw 1, UnknownScript_0x6dff0
-; 0x6dfe9
-UnknownScript_0x6dfe9: ; 0x6dfe9
+UnknownScript_0x6dfe9:
priorityjump LanceScript_0x6dffc
end
-; 0x6dfed
-UnknownScript_0x6dfed: ; 0x6dfed
+UnknownScript_0x6dfed:
end
-; 0x6dfee
-UnknownScript_0x6dfee: ; 0x6dfee
+UnknownScript_0x6dfee:
end
-; 0x6dfef
-UnknownScript_0x6dfef: ; 0x6dfef
+UnknownScript_0x6dfef:
end
-; 0x6dff0
-UnknownScript_0x6dff0: ; 0x6dff0
+UnknownScript_0x6dff0:
checkevent $0303
iftrue UnknownScript_0x6dff7
return
-; 0x6dff7
-UnknownScript_0x6dff7: ; 0x6dff7
+UnknownScript_0x6dff7:
changeblock $a, $8, $7
return
-; 0x6dffc
-LanceScript_0x6dffc: ; 0x6dffc
+LanceScript_0x6dffc:
spriteface $0, LEFT
pause 5
spriteface $4, RIGHT
@@ -58,9 +51,8 @@
disappear $2
dotrigger $1
end
-; 0x6e019
-UnknownScript_0x6e019: ; 0x6e019
+UnknownScript_0x6e019:
spriteface $0, LEFT
showemote $0, $0, 15
special Functionc48f
@@ -79,20 +71,17 @@
dotrigger $2
special RestartMapMusic
end
-; 0x6e048
-RocketScript_0x6e048: ; 0x6e048
+RocketScript_0x6e048:
jumptextfaceplayer UnknownText_0x6e235
-; 0x6e04b
-UnknownScript_0x6e04b: ; 0x6e04b
+UnknownScript_0x6e04b:
applymovement $0, MovementData_0x6e133
jump UnknownScript_0x6e056
-; 0x6e052
-UnknownScript_0x6e052: ; 0x6e052
+UnknownScript_0x6e052:
applymovement $0, MovementData_0x6e13a
-UnknownScript_0x6e056: ; 0x6e056
+UnknownScript_0x6e056:
pause 30
showemote $0, $3, 15
playmusic MUSIC_ROCKET_ENCOUNTER
@@ -107,7 +96,7 @@
loadtrainer EXECUTIVEM, 4
startbattle
returnafterbattle
- setevent $0574
+ setevent EVENT_BEAT_ROCKET_EXECUTIVEM_4
loadfont
writetext UnknownText_0x6e548
closetext
@@ -118,9 +107,8 @@
disappear $3
dotrigger $3
end
-; 0x6e091
-MoltresScript_0x6e091: ; 0x6e091
+MoltresScript_0x6e091:
loadfont
writetext UnknownText_0x6e585
closetext
@@ -127,11 +115,10 @@
loadmovesprites
setevent EVENT_LEARNED_HAIL_GIOVANNI
end
-; 0x6e09b
-TrainerGruntF5: ; 0x6e09b
+TrainerGruntF5:
; bit/flag number
- dw $514
+ dw EVENT_BEAT_ROCKET_GRUNTF_5
; trainer group && trainer id
db GRUNTF, 5
@@ -147,9 +134,8 @@
; script when talk again
dw GruntF5Script
-; 0x6e0a7
-GruntF5Script: ; 0x6e0a7
+GruntF5Script:
talkaftercancel
loadfont
writetext UnknownText_0x6e611
@@ -157,11 +143,10 @@
loadmovesprites
setevent $0301
end
-; 0x6e0b2
-TrainerGruntM28: ; 0x6e0b2
+TrainerGruntM28:
; bit/flag number
- dw $50c
+ dw EVENT_BEAT_ROCKET_GRUNTM_21
; trainer group && trainer id
db GRUNTM, 28
@@ -177,9 +162,8 @@
; script when talk again
dw GruntM28Script
-; 0x6e0be
-GruntM28Script: ; 0x6e0be
+GruntM28Script:
talkaftercancel
loadfont
writetext UnknownText_0x6e737
@@ -187,11 +171,10 @@
loadmovesprites
setevent $0302
end
-; 0x6e0c9
-TrainerScientistRoss: ; 0x6e0c9
+TrainerScientistRoss:
; bit/flag number
- dw $49f
+ dw EVENT_BEAT_SCIENTIST_ROSS
; trainer group && trainer id
db SCIENTIST, ROSS
@@ -207,9 +190,8 @@
; script when talk again
dw ScientistRossScript
-; 0x6e0d5
-ScientistRossScript: ; 0x6e0d5
+ScientistRossScript:
talkaftercancel
loadfont
writetext UnknownText_0x6e822
@@ -216,11 +198,10 @@
closetext
loadmovesprites
end
-; 0x6e0dd
-TrainerScientistMitch: ; 0x6e0dd
+TrainerScientistMitch:
; bit/flag number
- dw $4a0
+ dw EVENT_BEAT_SCIENTIST_MITCH
; trainer group && trainer id
db SCIENTIST, MITCH
@@ -236,9 +217,8 @@
; script when talk again
dw ScientistMitchScript
-; 0x6e0e9
-ScientistMitchScript: ; 0x6e0e9
+ScientistMitchScript:
talkaftercancel
loadfont
writetext UnknownText_0x6e90a
@@ -245,15 +225,13 @@
closetext
loadmovesprites
end
-; 0x6e0f1
-MapTeamRocketBaseB3FSignpostPtr1: ; 0x6e0f1
+MapTeamRocketBaseB3FSignpostPtr1:
dw $0303
dw MapTeamRocketBaseB3FSignpost1Script
-; 0x6e0f5
-MapTeamRocketBaseB3FSignpost1Script: ; 0x6e0f5
+MapTeamRocketBaseB3FSignpost1Script:
loadfont
checkevent $0301
iffalse UnknownScript_0x6e105
@@ -260,16 +238,14 @@
checkevent $0302
iffalse UnknownScript_0x6e105
jump UnknownScript_0x6e10b
-; 0x6e105
-UnknownScript_0x6e105: ; 0x6e105
+UnknownScript_0x6e105:
writetext UnknownText_0x6e970
closetext
loadmovesprites
end
-; 0x6e10b
-UnknownScript_0x6e10b: ; 0x6e10b
+UnknownScript_0x6e10b:
writetext UnknownText_0x6e9a3
closetext
playsound SFX_ENTER_DOOR
@@ -279,38 +255,30 @@
setevent $0303
waitbutton
end
-; 0x6e11d
-MapTeamRocketBaseB3FSignpost9Script: ; 0x6e11d
+MapTeamRocketBaseB3FSignpost9Script:
jumpstd teamrocketoath
-; 0x6e120
-ItemFragment_0x6e120: ; 0x6e120
+ItemFragment_0x6e120:
db PROTEIN, 1
-; 0x6e122
-ItemFragment_0x6e122: ; 0x6e122
+ItemFragment_0x6e122:
db X_SPECIAL, 1
-; 0x6e124
-ItemFragment_0x6e124: ; 0x6e124
+ItemFragment_0x6e124:
db FULL_HEAL, 1
-; 0x6e126
-ItemFragment_0x6e126: ; 0x6e126
+ItemFragment_0x6e126:
db ICE_HEAL, 1
-; 0x6e128
-ItemFragment_0x6e128: ; 0x6e128
+ItemFragment_0x6e128:
db ULTRA_BALL, 1
-; 0x6e12a
-MovementData_0x6e12a: ; 0x6e12a
+MovementData_0x6e12a:
step_right
step_end
-; 0x6e12c
-MovementData_0x6e12c: ; 0x6e12c
+MovementData_0x6e12c:
step_down
step_left
step_left
@@ -318,9 +286,8 @@
step_left
step_left
step_end
-; 0x6e133
-MovementData_0x6e133: ; 0x6e133
+MovementData_0x6e133:
step_up
step_up
step_up
@@ -328,9 +295,8 @@
step_left
turn_head_up
step_end
-; 0x6e13a
-MovementData_0x6e13a: ; 0x6e13a
+MovementData_0x6e13a:
step_up
step_up
step_left
@@ -339,20 +305,17 @@
step_left
turn_head_up
step_end
-; 0x6e142
-MovementData_0x6e142: ; 0x6e142
+MovementData_0x6e142:
step_down
step_end
-; 0x6e144
-MovementData_0x6e144: ; 0x6e144
+MovementData_0x6e144:
big_step_right
big_step_right
step_end
-; 0x6e147
-MovementData_0x6e147: ; 0x6e147
+MovementData_0x6e147:
fix_facing
fast_jump_step_left
remove_fixed_facing
@@ -382,9 +345,8 @@
big_step_left
big_step_left
step_end
-; 0x6e164
-MovementData_0x6e164: ; 0x6e164
+MovementData_0x6e164:
step_down
step_down
step_down
@@ -394,9 +356,8 @@
step_right
step_right
step_end
-; 0x6e16d
-MovementData_0x6e16d: ; 0x6e16d
+MovementData_0x6e16d:
step_left
step_left
step_up
@@ -405,16 +366,14 @@
step_up
step_up
step_end
-; 0x6e175
-MovementData_0x6e175: ; 0x6e175
+MovementData_0x6e175:
fix_facing
big_step_right
remove_fixed_facing
step_end
-; 0x6e179
-UnknownText_0x6e179: ; 0x6e179
+UnknownText_0x6e179:
text "LANCE: It takes"
line "two passwords to"
@@ -432,16 +391,14 @@
para "<PLAY_G>, let's go"
line "get the passwords."
done
-; 0x6e235
-UnknownText_0x6e235: ; 0x6e235
+UnknownText_0x6e235:
text "Urrggh… The guy"
line "in the cape is"
cont "incredibly tough…"
done
-; 0x6e267
-UnknownText_0x6e267: ; 0x6e267
+UnknownText_0x6e267:
text "…"
para "Didn't I tell you"
@@ -482,9 +439,8 @@
line "have the time for"
cont "the likes of you!"
done
-; 0x6e400
-UnknownText_0x6e400: ; 0x6e400
+UnknownText_0x6e400:
text "What? Who are you?"
line "This is the office"
@@ -510,9 +466,8 @@
line "one disturb this"
cont "place!"
done
-; 0x6e511
-UnknownText_0x6e511: ; 0x6e511
+UnknownText_0x6e511:
text "I… I couldn't do a"
line "thing…"
@@ -519,9 +474,8 @@
para "GIOVANNI, please"
line "forgive me…"
done
-; 0x6e548
-UnknownText_0x6e548: ; 0x6e548
+UnknownText_0x6e548:
text "No, I can't let"
line "this affect me."
@@ -528,17 +482,15 @@
para "I have to inform"
line "the others…"
done
-; 0x6e585
-UnknownText_0x6e585: ; 0x6e585
+UnknownText_0x6e585:
text "MURKROW: The"
line "password is…"
para "HAIL GIOVANNI."
done
-; 0x6e5af
-GruntF5SeenText: ; 0x6e5af
+GruntF5SeenText:
text "Do I know the"
line "password?"
@@ -547,15 +499,13 @@
para "But no weakling's"
line "going to get it!"
done
-; 0x6e5f1
-GruntF5BeatenText: ; 0x6e5f1
+GruntF5BeatenText:
text "All right. Stop."
line "I'll tell you."
done
-; 0x6e611
-UnknownText_0x6e611: ; 0x6e611
+UnknownText_0x6e611:
text "The password to"
line "the boss's room is"
@@ -565,9 +515,8 @@
line "unless you have"
cont "two passwords."
done
-; 0x6e671
-GruntM28SeenText: ; 0x6e671
+GruntM28SeenText:
text "Hyuck-hyuck-hyuck!"
para "You're challenging"
@@ -584,15 +533,13 @@
para "a password to the"
line "boss's room!"
done
-; 0x6e717
-GruntM28BeatenText: ; 0x6e717
+GruntM28BeatenText:
text "Hyuck-hyuck-hyuck!"
line "You're good!"
done
-; 0x6e737
-UnknownText_0x6e737: ; 0x6e737
+UnknownText_0x6e737:
text "Hyuck-hyuck-hyuck!"
para "The password to"
@@ -601,9 +548,8 @@
para "Uh…, I think it is"
line "RATICATE TAIL."
done
-; 0x6e78d
-ScientistRossSeenText: ; 0x6e78d
+ScientistRossSeenText:
text "I used to work for"
line "SILPH, but now I"
@@ -614,15 +560,13 @@
line "like you needs to"
cont "be punished."
done
-; 0x6e802
-ScientistRossBeatenText: ; 0x6e802
+ScientistRossBeatenText:
text "A mere tactical"
line "error cost me…"
done
-; 0x6e822
-UnknownText_0x6e822: ; 0x6e822
+UnknownText_0x6e822:
text "A radio signal"
line "that drives #-"
cont "MON mad…"
@@ -636,23 +580,20 @@
para "means absolutely"
line "nothing."
done
-; 0x6e8ac
-ScientistMitchSeenText: ; 0x6e8ac
+ScientistMitchSeenText:
text "I don't care that"
line "#MON are hurt"
cont "by our experiment."
done
-; 0x6e8df
-ScientistMitchBeatenText: ; 0x6e8df
+ScientistMitchBeatenText:
text "Thinking is my"
line "strong suit, not"
cont "battling."
done
-; 0x6e90a
-UnknownText_0x6e90a: ; 0x6e90a
+UnknownText_0x6e90a:
text "If we turn up the"
line "power of our radio"
@@ -662,17 +603,15 @@
para "The very thought"
line "excites me!"
done
-; 0x6e970
-UnknownText_0x6e970: ; 0x6e970
+UnknownText_0x6e970:
text "The door's closed…"
para "It needs two"
line "passwords to open."
done
-; 0x6e9a3
-UnknownText_0x6e9a3: ; 0x6e9a3
+UnknownText_0x6e9a3:
text "The door's closed…"
para "<PLAYER> entered"
@@ -680,9 +619,8 @@
para "The door opened!"
done
-; 0x6e9e4
-TeamRocketBaseB3F_MapEventHeader: ; 0x6e9e4
+TeamRocketBaseB3F_MapEventHeader:
; filler
db 0, 0
@@ -728,4 +666,3 @@
person_event SPRITE_POKE_BALL, 13, 32, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e124, $066f
person_event SPRITE_POKE_BALL, 6, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e126, $0670
person_event SPRITE_POKE_BALL, 14, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e128, $0654
-; 0x6eafe
--- a/maps/UndergroundPathSwitchRoomEntrances.asm
+++ b/maps/UndergroundPathSwitchRoomEntrances.asm
@@ -1,4 +1,4 @@
-UndergroundPathSwitchRoomEntrances_MapScriptHeader: ; 0x7c9e8
+UndergroundPathSwitchRoomEntrances_MapScriptHeader:
; trigger count
db 2
@@ -12,78 +12,72 @@
; callbacks
dbw 1, UnknownScript_0x7c9f7
-; 0x7c9f5
-UnknownScript_0x7c9f5: ; 0x7c9f5
+UnknownScript_0x7c9f5:
end
-; 0x7c9f6
-UnknownScript_0x7c9f6: ; 0x7c9f6
+UnknownScript_0x7c9f6:
end
-; 0x7c9f7
-UnknownScript_0x7c9f7: ; 0x7c9f7
+UnknownScript_0x7c9f7:
checkevent EVENT_SWITCH_4
iffalse UnknownScript_0x7ca01
changeblock $10, $6, $2d
-UnknownScript_0x7ca01: ; 0x7ca01
+UnknownScript_0x7ca01:
checkevent EVENT_SWITCH_5
iffalse UnknownScript_0x7ca0b
changeblock $a, $6, $2d
-UnknownScript_0x7ca0b: ; 0x7ca0b
+UnknownScript_0x7ca0b:
checkevent EVENT_SWITCH_6
iffalse UnknownScript_0x7ca15
changeblock $2, $6, $2d
-UnknownScript_0x7ca15: ; 0x7ca15
+UnknownScript_0x7ca15:
checkevent EVENT_SWITCH_7
iffalse UnknownScript_0x7ca1f
changeblock $2, $a, $2d
-UnknownScript_0x7ca1f: ; 0x7ca15
+UnknownScript_0x7ca1f:
checkevent EVENT_SWITCH_8
iffalse UnknownScript_0x7ca29
changeblock $a, $a, $2d
-UnknownScript_0x7ca29: ; 0x7ca29
+UnknownScript_0x7ca29:
checkevent EVENT_SWITCH_9
iffalse UnknownScript_0x7ca33
changeblock $10, $a, $2d
-UnknownScript_0x7ca33: ; 0x7ca33
+UnknownScript_0x7ca33:
checkevent EVENT_SWITCH_10
iffalse UnknownScript_0x7ca41
changeblock $c, $6, $2a
changeblock $c, $8, $2d
-UnknownScript_0x7ca41: ; 0x7ca41
+UnknownScript_0x7ca41:
checkevent EVENT_SWITCH_11
iffalse UnknownScript_0x7ca4f
changeblock $6, $6, $2a
changeblock $6, $8, $2d
-UnknownScript_0x7ca4f: ; 0x7ca4f
+UnknownScript_0x7ca4f:
checkevent EVENT_SWITCH_12
iffalse UnknownScript_0x7ca5d
changeblock $c, $a, $2a
changeblock $c, $c, $2d
-UnknownScript_0x7ca5d: ; 0x7ca5d
+UnknownScript_0x7ca5d:
checkevent EVENT_SWITCH_13
iffalse UnknownScript_0x7ca6b
changeblock $6, $a, $2a
changeblock $6, $c, $2d
-UnknownScript_0x7ca6b: ; 0x7ca6b
+UnknownScript_0x7ca6b:
checkevent EVENT_SWITCH_14
iffalse UnknownScript_0x7ca79
changeblock $12, $a, $2a
changeblock $12, $c, $2d
-UnknownScript_0x7ca79: ; 0x7ca79
+UnknownScript_0x7ca79:
return
-; 0x7ca7a
-SuperNerdScript_0x7ca7a: ; 0x7ca7a
+SuperNerdScript_0x7ca7a:
jumptextfaceplayer UnknownText_0x7d176
-; 0x7ca7d
-TeacherScript_0x7ca7d: ; 0x7ca7d
+TeacherScript_0x7ca7d:
jumptextfaceplayer UnknownText_0x7d1d0
-; 0x7ca80
-UnknownScript_0x7ca80: ; 0x7ca80
+UnknownScript_0x7ca80:
spriteface $0, RIGHT
showemote $0, $0, 15
special Functionc48f
@@ -101,9 +95,8 @@
waitbutton
playmapmusic
end
-; 0x7caaa
-UnknownScript_0x7caaa: ; 0x7caaa
+UnknownScript_0x7caaa:
spriteface $0, RIGHT
showemote $0, $0, 15
special Functionc48f
@@ -121,14 +114,13 @@
waitbutton
playmapmusic
end
-; 0x7cad4
-UnknownScript_0x7cad4: ; 0x7cad4
+UnknownScript_0x7cad4:
checkevent $06c5
iftrue UnknownScript_0x7cae1
setevent $06c5
domaptrigger GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F, $1
-UnknownScript_0x7cae1: ; 0x7cae1
+UnknownScript_0x7cae1:
playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
writetext UnknownText_0x7ce9d
@@ -146,9 +138,8 @@
reloadmapmusic
returnafterbattle
jump UnknownScript_0x7cb29
-; 0x7cb09
-UnknownScript_0x7cb09: ; 0x7cb09
+UnknownScript_0x7cb09:
winlosstext UnknownText_0x7cf5d, UnknownText_0x7d102
setlasttalked $c
loadtrainer RIVAL1, RIVAL1_10
@@ -156,9 +147,8 @@
reloadmapmusic
returnafterbattle
jump UnknownScript_0x7cb29
-; 0x7cb19
-UnknownScript_0x7cb19: ; 0x7cb19
+UnknownScript_0x7cb19:
winlosstext UnknownText_0x7cf5d, UnknownText_0x7d102
setlasttalked $c
loadtrainer RIVAL1, RIVAL1_11
@@ -166,9 +156,8 @@
reloadmapmusic
returnafterbattle
jump UnknownScript_0x7cb29
-; 0x7cb29
-UnknownScript_0x7cb29: ; 0x7cb29
+UnknownScript_0x7cb29:
playmusic MUSIC_RIVAL_AFTER
loadfont
writetext UnknownText_0x7cfc2
@@ -175,11 +164,10 @@
closetext
loadmovesprites
end
-; 0x7cb33
-TrainerGruntM11: ; 0x7cb33
+TrainerGruntM11:
; bit/flag number
- dw $4fb
+ dw EVENT_BEAT_ROCKET_GRUNTM_11
; trainer group && trainer id
db GRUNTM, 11
@@ -195,9 +183,8 @@
; script when talk again
dw GruntM11Script
-; 0x7cb3f
-GruntM11Script: ; 0x7cb3f
+GruntM11Script:
talkaftercancel
loadfont
writetext UnknownText_0x7d290
@@ -204,11 +191,10 @@
closetext
loadmovesprites
end
-; 0x7cb47
-TrainerGruntM25: ; 0x7cb47
+TrainerGruntM25:
; bit/flag number
- dw $509
+ dw EVENT_BEAT_ROCKET_GRUNTM_20
; trainer group && trainer id
db GRUNTM, 25
@@ -224,9 +210,8 @@
; script when talk again
dw GruntM25Script
-; 0x7cb53
-GruntM25Script: ; 0x7cb53
+GruntM25Script:
talkaftercancel
loadfont
writetext UnknownText_0x7d347
@@ -233,11 +218,10 @@
closetext
loadmovesprites
end
-; 0x7cb5b
-TrainerBurglarDuncan: ; 0x7cb5b
+TrainerBurglarDuncan:
; bit/flag number
- dw $42d
+ dw EVENT_BEAT_BURGLAR_DUNCAN
; trainer group && trainer id
db BURGLAR, DUNCAN
@@ -253,9 +237,8 @@
; script when talk again
dw BurglarDuncanScript
-; 0x7cb67
-BurglarDuncanScript: ; 0x7cb67
+BurglarDuncanScript:
talkaftercancel
loadfont
writetext UnknownText_0x7d3cf
@@ -262,11 +245,10 @@
closetext
loadmovesprites
end
-; 0x7cb6f
-TrainerBurglarEddie: ; 0x7cb6f
+TrainerBurglarEddie:
; bit/flag number
- dw $42e
+ dw EVENT_BEAT_BURGLAR_EDDIE
; trainer group && trainer id
db BURGLAR, EDDIE
@@ -282,9 +264,8 @@
; script when talk again
dw BurglarEddieScript
-; 0x7cb7b
-BurglarEddieScript: ; 0x7cb7b
+BurglarEddieScript:
talkaftercancel
loadfont
writetext UnknownText_0x7d45b
@@ -291,11 +272,10 @@
closetext
loadmovesprites
end
-; 0x7cb83
-TrainerGruntM13: ; 0x7cb83
+TrainerGruntM13:
; bit/flag number
- dw $4fd
+ dw EVENT_BEAT_ROCKET_GRUNTM_12
; trainer group && trainer id
db GRUNTM, 13
@@ -311,9 +291,8 @@
; script when talk again
dw GruntM13Script
-; 0x7cb8f
-GruntM13Script: ; 0x7cb8f
+GruntM13Script:
talkaftercancel
loadfont
writetext UnknownText_0x7d51f
@@ -320,11 +299,10 @@
closetext
loadmovesprites
end
-; 0x7cb97
-TrainerGruntF3: ; 0x7cb97
+TrainerGruntF3:
; bit/flag number
- dw $512
+ dw EVENT_BEAT_ROCKET_GRUNTF_3
; trainer group && trainer id
db GRUNTF, 3
@@ -340,9 +318,8 @@
; script when talk again
dw GruntF3Script
-; 0x7cba3
-GruntF3Script: ; 0x7cba3
+GruntF3Script:
talkaftercancel
loadfont
writetext UnknownText_0x7d5e6
@@ -349,9 +326,8 @@
closetext
loadmovesprites
end
-; 0x7cbab
-MapUndergroundPathSwitchRoomEntrancesSignpost0Script: ; 0x7cbab
+MapUndergroundPathSwitchRoomEntrancesSignpost0Script:
loadfont
writetext UnknownText_0x7d554
keeptextopen
@@ -365,9 +341,8 @@
copyvartobyte UndergroundSwitchPositions
setevent EVENT_SWITCH_1
jump UnknownScript_0x7cc8d
-; 0x7cbcb
-UnknownScript_0x7cbcb: ; 0x7cbcb
+UnknownScript_0x7cbcb:
writetext UnknownText_0x7d62d
yesorno
iffalse UnknownScript_0x7cc8b
@@ -376,9 +351,8 @@
copyvartobyte UndergroundSwitchPositions
clearevent EVENT_SWITCH_1
jump UnknownScript_0x7cc8d
-; 0x7cbe0
-MapUndergroundPathSwitchRoomEntrancesSignpost1Script: ; 0x7cbe0
+MapUndergroundPathSwitchRoomEntrancesSignpost1Script:
loadfont
writetext UnknownText_0x7d643
keeptextopen
@@ -392,9 +366,8 @@
copyvartobyte UndergroundSwitchPositions
setevent EVENT_SWITCH_2
jump UnknownScript_0x7cc8d
-; 0x7cc00
-UnknownScript_0x7cc00: ; 0x7cc00
+UnknownScript_0x7cc00:
writetext UnknownText_0x7d62d
yesorno
iffalse UnknownScript_0x7cc8b
@@ -403,9 +376,8 @@
copyvartobyte UndergroundSwitchPositions
clearevent EVENT_SWITCH_2
jump UnknownScript_0x7cc8d
-; 0x7cc15
-MapUndergroundPathSwitchRoomEntrancesSignpost2Script: ; 0x7cc15
+MapUndergroundPathSwitchRoomEntrancesSignpost2Script:
loadfont
writetext UnknownText_0x7d65a
keeptextopen
@@ -419,9 +391,8 @@
copyvartobyte UndergroundSwitchPositions
setevent EVENT_SWITCH_3
jump UnknownScript_0x7cc8d
-; 0x7cc35
-UnknownScript_0x7cc35: ; 0x7cc35
+UnknownScript_0x7cc35:
writetext UnknownText_0x7d62d
yesorno
iffalse UnknownScript_0x7cc8b
@@ -430,9 +401,8 @@
copyvartobyte UndergroundSwitchPositions
clearevent EVENT_SWITCH_3
jump UnknownScript_0x7cc8d
-; 0x7cc4a
-MapUndergroundPathSwitchRoomEntrancesSignpost3Script: ; 0x7cc4a
+MapUndergroundPathSwitchRoomEntrancesSignpost3Script:
loadfont
writetext UnknownText_0x7d671
keeptextopen
@@ -448,9 +418,8 @@
setevent EVENT_SWITCH_2
setevent EVENT_SWITCH_3
jump UnknownScript_0x7cc8d
-; 0x7cc70
-UnknownScript_0x7cc70: ; 0x7cc70
+UnknownScript_0x7cc70:
writetext UnknownText_0x7d62d
yesorno
iffalse UnknownScript_0x7cc8b
@@ -461,14 +430,12 @@
clearevent EVENT_SWITCH_2
clearevent EVENT_SWITCH_3
jump UnknownScript_0x7cc8d
-; 0x7cc8b
-UnknownScript_0x7cc8b: ; 0x7cc8b
+UnknownScript_0x7cc8b:
loadmovesprites
end
-; 0x7cc8d
-UnknownScript_0x7cc8d: ; 0x7cc8d
+UnknownScript_0x7cc8d:
copybytetovar UndergroundSwitchPositions
if_equal $0, UnknownScript_0x7ccb0
if_equal $1, UnknownScript_0x7ccd7
@@ -478,7 +445,7 @@
if_equal $5, UnknownScript_0x7cd43
if_equal $6, UnknownScript_0x7cd5e
if_equal $7, UnknownScript_0x7cd79
-UnknownScript_0x7ccb0: ; 0x7ccb0
+UnknownScript_0x7ccb0:
playsound SFX_ENTER_DOOR
scall UnknownScript_0x7ce11
scall UnknownScript_0x7ce19
@@ -494,9 +461,8 @@
reloadmappart
loadmovesprites
end
-; 0x7ccd7
-UnknownScript_0x7ccd7: ; 0x7ccd7
+UnknownScript_0x7ccd7:
playsound SFX_ENTER_DOOR
scall UnknownScript_0x7cda5
scall UnknownScript_0x7cdd5
@@ -508,9 +474,8 @@
reloadmappart
loadmovesprites
end
-; 0x7ccf2
-UnknownScript_0x7ccf2: ; 0x7ccf2
+UnknownScript_0x7ccf2:
playsound SFX_ENTER_DOOR
scall UnknownScript_0x7cdad
scall UnknownScript_0x7cde1
@@ -522,9 +487,8 @@
reloadmappart
loadmovesprites
end
-; 0x7cd0d
-UnknownScript_0x7cd0d: ; 0x7cd0d
+UnknownScript_0x7cd0d:
playsound SFX_ENTER_DOOR
scall UnknownScript_0x7cdb5
scall UnknownScript_0x7cdd5
@@ -536,9 +500,8 @@
reloadmappart
loadmovesprites
end
-; 0x7cd28
-UnknownScript_0x7cd28: ; 0x7cd28
+UnknownScript_0x7cd28:
playsound SFX_ENTER_DOOR
scall UnknownScript_0x7cdbd
scall UnknownScript_0x7cde1
@@ -550,9 +513,8 @@
reloadmappart
loadmovesprites
end
-; 0x7cd43
-UnknownScript_0x7cd43: ; 0x7cd43
+UnknownScript_0x7cd43:
playsound SFX_ENTER_DOOR
scall UnknownScript_0x7cdc5
scall UnknownScript_0x7cdd5
@@ -564,9 +526,8 @@
reloadmappart
loadmovesprites
end
-; 0x7cd5e
-UnknownScript_0x7cd5e: ; 0x7cd5e
+UnknownScript_0x7cd5e:
playsound SFX_ENTER_DOOR
scall UnknownScript_0x7cdcd
scall UnknownScript_0x7cde1
@@ -578,9 +539,8 @@
reloadmappart
loadmovesprites
end
-; 0x7cd79
-UnknownScript_0x7cd79: ; 0x7cd79
+UnknownScript_0x7cd79:
playsound SFX_ENTER_DOOR
scall UnknownScript_0x7ce11
scall UnknownScript_0x7ce19
@@ -598,179 +558,151 @@
writebyte $6
copyvartobyte UndergroundSwitchPositions
end
-; 0x7cda5
-UnknownScript_0x7cda5: ; 0x7cda5
+UnknownScript_0x7cda5:
changeblock $10, $6, $2d
setevent EVENT_SWITCH_4
end
-; 0x7cdad
-UnknownScript_0x7cdad: ; 0x7cdad
+UnknownScript_0x7cdad:
changeblock $a, $6, $2d
setevent EVENT_SWITCH_5
end
-; 0x7cdb5
-UnknownScript_0x7cdb5: ; 0x7cdb5
+UnknownScript_0x7cdb5:
changeblock $2, $6, $2d
setevent EVENT_SWITCH_6
end
-; 0x7cdbd
-UnknownScript_0x7cdbd: ; 0x7cdbd
+UnknownScript_0x7cdbd:
changeblock $2, $a, $2d
setevent EVENT_SWITCH_7
end
-; 0x7cdc5
-UnknownScript_0x7cdc5: ; 0x7cdc5
+UnknownScript_0x7cdc5:
changeblock $a, $a, $2d
setevent EVENT_SWITCH_8
end
-; 0x7cdcd
-UnknownScript_0x7cdcd: ; 0x7cdcd
+UnknownScript_0x7cdcd:
changeblock $10, $a, $2d
setevent EVENT_SWITCH_9
end
-; 0x7cdd5
-UnknownScript_0x7cdd5: ; 0x7cdd5
+UnknownScript_0x7cdd5:
changeblock $c, $6, $2a
changeblock $c, $8, $2d
setevent EVENT_SWITCH_10
end
-; 0x7cde1
-UnknownScript_0x7cde1: ; 0x7cde1
+UnknownScript_0x7cde1:
changeblock $6, $6, $2a
changeblock $6, $8, $2d
setevent EVENT_SWITCH_11
end
-; 0x7cded
-UnknownScript_0x7cded: ; 0x7cded
+UnknownScript_0x7cded:
changeblock $c, $a, $2a
changeblock $c, $c, $2d
setevent EVENT_SWITCH_12
end
-; 0x7cdf9
-UnknownScript_0x7cdf9: ; 0x7cdf9
+UnknownScript_0x7cdf9:
changeblock $6, $a, $2a
changeblock $6, $c, $2d
setevent EVENT_SWITCH_13
end
-; 0x7ce05
-UnknownScript_0x7ce05: ; 0x7ce05
+UnknownScript_0x7ce05:
changeblock $12, $a, $2a
changeblock $12, $c, $2d
setevent EVENT_SWITCH_14
end
-; 0x7ce11
-UnknownScript_0x7ce11: ; 0x7ce11
+UnknownScript_0x7ce11:
changeblock $10, $6, $3e
clearevent EVENT_SWITCH_4
end
-; 0x7ce19
-UnknownScript_0x7ce19: ; 0x7ce19
+UnknownScript_0x7ce19:
changeblock $a, $6, $3e
clearevent EVENT_SWITCH_5
end
-; 0x7ce21
-UnknownScript_0x7ce21: ; 0x7ce21
+UnknownScript_0x7ce21:
changeblock $2, $6, $3e
clearevent EVENT_SWITCH_6
end
-; 0x7ce29
-UnknownScript_0x7ce29: ; 0x7ce29
+UnknownScript_0x7ce29:
changeblock $2, $a, $3e
clearevent EVENT_SWITCH_7
end
-; 0x7ce31
-UnknownScript_0x7ce31: ; 0x7ce31
+UnknownScript_0x7ce31:
changeblock $a, $a, $3e
clearevent EVENT_SWITCH_8
end
-; 0x7ce39
-UnknownScript_0x7ce39: ; 0x7ce39
+UnknownScript_0x7ce39:
changeblock $10, $a, $3e
clearevent EVENT_SWITCH_9
end
-; 0x7ce41
-UnknownScript_0x7ce41: ; 0x7ce41
+UnknownScript_0x7ce41:
changeblock $c, $6, $3f
changeblock $c, $8, $3d
clearevent EVENT_SWITCH_10
end
-; 0x7ce4d
-UnknownScript_0x7ce4d: ; 0x7ce4d
+UnknownScript_0x7ce4d:
changeblock $6, $6, $3f
changeblock $6, $8, $3d
clearevent EVENT_SWITCH_11
end
-; 0x7ce59
-UnknownScript_0x7ce59: ; 0x7ce59
+UnknownScript_0x7ce59:
changeblock $c, $a, $3f
changeblock $c, $c, $3d
clearevent EVENT_SWITCH_12
end
-; 0x7ce65
-UnknownScript_0x7ce65: ; 0x7ce65
+UnknownScript_0x7ce65:
changeblock $6, $a, $3f
changeblock $6, $c, $3d
clearevent EVENT_SWITCH_13
end
-; 0x7ce71
-UnknownScript_0x7ce71: ; 0x7ce71
+UnknownScript_0x7ce71:
changeblock $12, $a, $3f
changeblock $12, $c, $3d
clearevent EVENT_SWITCH_14
end
-; 0x7ce7d
-ItemFragment_0x7ce7d: ; 0x7ce7d
+ItemFragment_0x7ce7d:
db SMOKE_BALL, 1
-; 0x7ce7f
-ItemFragment_0x7ce7f: ; 0x7ce7f
+ItemFragment_0x7ce7f:
db FULL_HEAL, 1
-; 0x7ce81
-MapUndergroundPathSwitchRoomEntrancesSignpostItem4: ; 0x7ce81
+MapUndergroundPathSwitchRoomEntrancesSignpostItem4:
dw $008e
db MAX_POTION
-; 0x7ce84
-MapUndergroundPathSwitchRoomEntrancesSignpostItem5: ; 0x7ce84
+MapUndergroundPathSwitchRoomEntrancesSignpostItem5:
dw $008f
db REVIVE
-; 0x7ce87
-MovementData_0x7ce87: ; 0x7ce87
+MovementData_0x7ce87:
step_down
step_left
step_left
step_left
step_end
-; 0x7ce8c
-MovementData_0x7ce8c: ; 0x7ce8c
+MovementData_0x7ce8c:
step_down
step_down
step_left
@@ -777,17 +709,15 @@
step_left
step_left
step_end
-; 0x7ce92
-MovementData_0x7ce92: ; 0x7ce92
+MovementData_0x7ce92:
step_right
step_right
step_right
step_up
step_end
-; 0x7ce97
-MovementData_0x7ce97: ; 0x7ce97
+MovementData_0x7ce97:
step_right
step_right
step_right
@@ -794,9 +724,8 @@
step_up
step_up
step_end
-; 0x7ce9d
-UnknownText_0x7ce9d: ; 0x7ce9d
+UnknownText_0x7ce9d:
text "Hold it!"
para "I saw you, so I"
@@ -818,9 +747,8 @@
para "But I repay my"
line "debts!"
done
-; 0x7cf5d
-UnknownText_0x7cf5d: ; 0x7cf5d
+UnknownText_0x7cf5d:
text "…Why…"
line "Why do I lose?"
@@ -832,9 +760,8 @@
para "So why do I lose?"
done
-; 0x7cfc2
-UnknownText_0x7cfc2: ; 0x7cfc2
+UnknownText_0x7cfc2:
text "…I don't under-"
line "stand…"
@@ -869,9 +796,8 @@
para "the world's best"
line "#MON trainer!"
done
-; 0x7d102
-UnknownText_0x7d102: ; 0x7d102
+UnknownText_0x7d102:
text "Humph. This is my"
line "real power, wimp."
@@ -882,9 +808,8 @@
line "grind that LANCE"
cont "under my heels."
done
-; 0x7d176
-UnknownText_0x7d176: ; 0x7d176
+UnknownText_0x7d176:
text "I was challenged"
line "to a battle down-"
cont "stairs."
@@ -893,9 +818,8 @@
line "there. You'd"
cont "better be careful."
done
-; 0x7d1d0
-UnknownText_0x7d1d0: ; 0x7d1d0
+UnknownText_0x7d1d0:
text "There are some"
line "shops downstairs…"
@@ -905,9 +829,8 @@
para "I'm scared to go"
line "down there."
done
-; 0x7d22b
-GruntM11SeenText: ; 0x7d22b
+GruntM11SeenText:
text "Open one shutter,"
line "another closes."
@@ -914,15 +837,13 @@
para "Bet you can't get"
line "where you want!"
done
-; 0x7d26f
-GruntM11BeatenText: ; 0x7d26f
+GruntM11BeatenText:
text "Drat! I was sunk"
line "by indecision!"
done
-; 0x7d290
-UnknownText_0x7d290: ; 0x7d290
+UnknownText_0x7d290:
text "I'm confused too…"
line "The switch on the"
@@ -929,9 +850,8 @@
para "end is the one to"
line "press first, but…"
done
-; 0x7d2d8
-GruntM25SeenText: ; 0x7d2d8
+GruntM25SeenText:
text "Kwahaha!"
para "Confounded by the"
@@ -941,15 +861,13 @@
line "a secret if you"
cont "can beat me!"
done
-; 0x7d335
-GruntM25BeatenText: ; 0x7d335
+GruntM25BeatenText:
text "Uwww…"
line "I blew it."
done
-; 0x7d347
-UnknownText_0x7d347: ; 0x7d347
+UnknownText_0x7d347:
text "All right. A hint!"
para "Change the order"
@@ -959,27 +877,23 @@
line "ways the shutters"
cont "open and close."
done
-; 0x7d3ae
-BurglarDuncanSeenText: ; 0x7d3ae
+BurglarDuncanSeenText:
text "Fork over your"
line "goodies!"
done
-; 0x7d3c7
-BurglarDuncanBeatenText: ; 0x7d3c7
+BurglarDuncanBeatenText:
text "Mercy!"
done
-; 0x7d3cf
-UnknownText_0x7d3cf: ; 0x7d3cf
+UnknownText_0x7d3cf:
text "Steal and sell!"
line "That's basic in"
cont "crime, kid!"
done
-; 0x7d3fb
-BurglarEddieSeenText: ; 0x7d3fb
+BurglarEddieSeenText:
text "They ditched this"
line "project before"
cont "they finished."
@@ -987,14 +901,12 @@
para "I'm searching for"
line "leftover loot."
done
-; 0x7d44c
-BurglarEddieBeatenText: ; 0x7d44c
+BurglarEddieBeatenText:
text "Over the top!"
done
-; 0x7d45b
-UnknownText_0x7d45b: ; 0x7d45b
+UnknownText_0x7d45b:
text "UNDERGROUND WARE-"
line "HOUSE?"
@@ -1004,9 +916,8 @@
para "There's nothing"
line "down there."
done
-; 0x7d4b2
-GruntM13SeenText: ; 0x7d4b2
+GruntM13SeenText:
text "I don't care if"
line "you're lost."
@@ -1014,28 +925,24 @@
line "you're nothing but"
cont "a victim!"
done
-; 0x7d4fc
-GruntM13BeatenText: ; 0x7d4fc
+GruntM13BeatenText:
text "Urk! Yeah, think"
line "you're cool, huh?"
done
-; 0x7d51f
-UnknownText_0x7d51f: ; 0x7d51f
+UnknownText_0x7d51f:
text "You must have ice"
line "in your veins to"
cont "dis TEAM ROCKET."
done
-; 0x7d554
-UnknownText_0x7d554: ; 0x7d554
+UnknownText_0x7d554:
text "It's labeled"
line "SWITCH 1."
done
-; 0x7d56b
-GruntF3SeenText: ; 0x7d56b
+GruntF3SeenText:
text "Are you lost? No,"
line "you can't be."
@@ -1046,51 +953,43 @@
line "something to be"
cont "scared about!"
done
-; 0x7d5d6
-GruntF3BeatenText: ; 0x7d5d6
+GruntF3BeatenText:
text "How could you?"
done
-; 0x7d5e6
-UnknownText_0x7d5e6: ; 0x7d5e6
+UnknownText_0x7d5e6:
text "Go wherever you'd"
line "like! Get lost!"
cont "See if I care!"
done
-; 0x7d617
-UnknownText_0x7d617: ; 0x7d617
+UnknownText_0x7d617:
text "It's OFF."
line "Turn it ON?"
done
-; 0x7d62d
-UnknownText_0x7d62d: ; 0x7d62d
+UnknownText_0x7d62d:
text "It's ON."
line "Turn it OFF?"
done
-; 0x7d643
-UnknownText_0x7d643: ; 0x7d643
+UnknownText_0x7d643:
text "It's labeled"
line "SWITCH 2."
done
-; 0x7d65a
-UnknownText_0x7d65a: ; 0x7d65a
+UnknownText_0x7d65a:
text "It's labeled"
line "SWITCH 3."
done
-; 0x7d671
-UnknownText_0x7d671: ; 0x7d671
+UnknownText_0x7d671:
text "It's labeled"
line "EMERGENCY."
done
-; 0x7d689
-UndergroundPathSwitchRoomEntrances_MapEventHeader: ; 0x7d689
+UndergroundPathSwitchRoomEntrances_MapEventHeader:
; filler
db 0, 0
@@ -1133,4 +1032,3 @@
person_event SPRITE_POKE_BALL, 16, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ce7d, $0673
person_event SPRITE_POKE_BALL, 13, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ce7f, $0674
person_event SPRITE_SILVER, 7, 27, $6, $0, 255, 255, $0, 0, ObjectEvent, $06c1
-; 0x7d779
--- a/maps/UndergroundWarehouse.asm
+++ b/maps/UndergroundWarehouse.asm
@@ -1,4 +1,4 @@
-UndergroundWarehouse_MapScriptHeader: ; 0x7d94b
+UndergroundWarehouse_MapScriptHeader:
; trigger count
db 0
@@ -8,9 +8,8 @@
; callbacks
dbw 5, UnknownScript_0x7d950
-; 0x7d950
-UnknownScript_0x7d950: ; 0x7d950
+UnknownScript_0x7d950:
clearevent EVENT_SWITCH_1
clearevent EVENT_SWITCH_2
clearevent EVENT_SWITCH_3
@@ -29,11 +28,10 @@
writebyte $0
copyvartobyte UndergroundSwitchPositions
return
-; 0x7d983
-TrainerGruntM24: ; 0x7d983
+TrainerGruntM24:
; bit/flag number
- dw $508
+ dw EVENT_BEAT_ROCKET_GRUNTM_19
; trainer group && trainer id
db GRUNTM, 24
@@ -49,9 +47,8 @@
; script when talk again
dw GruntM24Script
-; 0x7d98f
-GruntM24Script: ; 0x7d98f
+GruntM24Script:
talkaftercancel
loadfont
writetext UnknownText_0x7da48
@@ -58,11 +55,10 @@
closetext
loadmovesprites
end
-; 0x7d997
-TrainerGruntM14: ; 0x7d997
+TrainerGruntM14:
; bit/flag number
- dw $4fe
+ dw EVENT_BEAT_ROCKET_GRUNTM_13
; trainer group && trainer id
db GRUNTM, 14
@@ -78,9 +74,8 @@
; script when talk again
dw GruntM14Script
-; 0x7d9a3
-GruntM14Script: ; 0x7d9a3
+GruntM14Script:
talkaftercancel
loadfont
writetext UnknownText_0x7db01
@@ -87,11 +82,10 @@
closetext
loadmovesprites
end
-; 0x7d9ab
-TrainerGruntM15: ; 0x7d9ab
+TrainerGruntM15:
; bit/flag number
- dw $4ff
+ dw EVENT_BEAT_ROCKET_GRUNTM_14
; trainer group && trainer id
db GRUNTM, 15
@@ -107,9 +101,8 @@
; script when talk again
dw GruntM15Script
-; 0x7d9b7
-GruntM15Script: ; 0x7d9b7
+GruntM15Script:
talkaftercancel
loadfont
writetext UnknownText_0x7db8e
@@ -116,9 +109,8 @@
closetext
loadmovesprites
end
-; 0x7d9bf
-GentlemanScript_0x7d9bf: ; 0x7d9bf
+GentlemanScript_0x7d9bf:
faceplayer
loadfont
checkevent $004a
@@ -132,26 +124,22 @@
clearevent $0306
writetext UnknownText_0x7dc5b
keeptextopen
-UnknownScript_0x7d9de: ; 0x7d9de
+UnknownScript_0x7d9de:
writetext UnknownText_0x7dc8d
closetext
loadmovesprites
end
-; 0x7d9e4
-ItemFragment_0x7d9e4: ; 0x7d9e4
+ItemFragment_0x7d9e4:
db MAX_ETHER, 1
-; 0x7d9e6
-ItemFragment_0x7d9e6: ; 0x7d9e6
+ItemFragment_0x7d9e6:
db TM_SLEEP_TALK, 1
-; 0x7d9e8
-ItemFragment_0x7d9e8: ; 0x7d9e8
+ItemFragment_0x7d9e8:
db ULTRA_BALL, 1
-; 0x7d9ea
-GruntM24SeenText: ; 0x7d9ea
+GruntM24SeenText:
text "How did you get"
line "this far?"
@@ -159,14 +147,12 @@
line "be helped. I'll"
cont "dispose of you."
done
-; 0x7da34
-GruntM24BeatenText: ; 0x7da34
+GruntM24BeatenText:
text "I got disposed of…"
done
-; 0x7da48
-UnknownText_0x7da48: ; 0x7da48
+UnknownText_0x7da48:
text "TEAM ROCKET will"
line "keep going, wait-"
cont "ing for the return"
@@ -175,9 +161,8 @@
para "We'll do whatever"
line "it takes."
done
-; 0x7daa7
-GruntM14SeenText: ; 0x7daa7
+GruntM14SeenText:
text "You're not going"
line "any farther!"
@@ -185,22 +170,19 @@
line "to my enemies, not"
cont "even brats!"
done
-; 0x7daf6
-GruntM14BeatenText: ; 0x7daf6
+GruntM14BeatenText:
text "Blast it!"
done
-; 0x7db01
-UnknownText_0x7db01: ; 0x7db01
+UnknownText_0x7db01:
text "I lost…"
para "Please forgive me,"
line "GIOVANNI!"
done
-; 0x7db27
-GruntM15SeenText: ; 0x7db27
+GruntM15SeenText:
text "Hyuck-hyuck-hyuck!"
line "I remember you!"
@@ -207,22 +189,19 @@
para "You got me good"
line "at our hideout!"
done
-; 0x7db6b
-GruntM15BeatenText: ; 0x7db6b
+GruntM15BeatenText:
text "Hyuck-hyuck-hyuck!"
line "So, that's how?"
done
-; 0x7db8e
-UnknownText_0x7db8e: ; 0x7db8e
+UnknownText_0x7db8e:
text "Hyuck-hyuck-hyuck!"
line "That was a blast!"
cont "I'll remember you!"
done
-; 0x7dbc6
-UnknownText_0x7dbc6: ; 0x7dbc6
+UnknownText_0x7dbc6:
text "DIRECTOR: Who?"
line "What? You came to"
cont "rescue me?"
@@ -240,16 +219,14 @@
para "Here. Take this"
line "CARD KEY."
done
-; 0x7dc5b
-UnknownText_0x7dc5b: ; 0x7dc5b
+UnknownText_0x7dc5b:
text "DIRECTOR: Use that"
line "to open the shut-"
cont "ters on 3F."
done
-; 0x7dc8d
-UnknownText_0x7dc8d: ; 0x7dc8d
+UnknownText_0x7dc8d:
text "I'm begging you to"
line "help."
@@ -274,9 +251,8 @@
para "And all the #-"
line "MON nationwide!"
done
-; 0x7dd84
-UndergroundWarehouse_MapEventHeader: ; 0x7dd84
+UndergroundWarehouse_MapEventHeader:
; filler
db 0, 0
@@ -301,4 +277,3 @@
person_event SPRITE_POKE_BALL, 19, 22, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e4, $0679
person_event SPRITE_POKE_BALL, 13, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e6, $067a
person_event SPRITE_POKE_BALL, 5, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e8, $0655
-; 0x7ddf4
--- a/maps/UnionCave1F.asm
+++ b/maps/UnionCave1F.asm
@@ -1,14 +1,13 @@
-UnionCave1F_MapScriptHeader: ; 0x59b9a
+UnionCave1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x59b9c
-TrainerPokemaniacLarry: ; 0x59b9c
+TrainerPokemaniacLarry:
; bit/flag number
- dw $4e4
+ dw EVENT_BEAT_POKEMANIAC_LARRY
; trainer group && trainer id
db POKEMANIAC, LARRY
@@ -24,9 +23,8 @@
; script when talk again
dw PokemaniacLarryScript
-; 0x59ba8
-PokemaniacLarryScript: ; 0x59ba8
+PokemaniacLarryScript:
talkaftercancel
loadfont
writetext UnknownText_0x59d31
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x59bb0
-TrainerHikerRussell: ; 0x59bb0
+TrainerHikerRussell:
; bit/flag number
- dw $525
+ dw EVENT_BEAT_HIKER_RUSSELL
; trainer group && trainer id
db HIKER, RUSSELL
@@ -53,9 +50,8 @@
; script when talk again
dw HikerRussellScript
-; 0x59bbc
-HikerRussellScript: ; 0x59bbc
+HikerRussellScript:
talkaftercancel
loadfont
writetext UnknownText_0x59c6c
@@ -62,11 +58,10 @@
closetext
loadmovesprites
end
-; 0x59bc4
-TrainerHikerDaniel: ; 0x59bc4
+TrainerHikerDaniel:
; bit/flag number
- dw $535
+ dw EVENT_BEAT_HIKER_DANIEL
; trainer group && trainer id
db HIKER, DANIEL
@@ -82,9 +77,8 @@
; script when talk again
dw HikerDanielScript
-; 0x59bd0
-HikerDanielScript: ; 0x59bd0
+HikerDanielScript:
talkaftercancel
loadfont
writetext UnknownText_0x59dc9
@@ -91,11 +85,10 @@
closetext
loadmovesprites
end
-; 0x59bd8
-TrainerFirebreatherBill: ; 0x59bd8
+TrainerFirebreatherBill:
; bit/flag number
- dw $44a
+ dw EVENT_BEAT_FIREBREATHER_BILL
; trainer group && trainer id
db FIREBREATHER, BILL
@@ -111,9 +104,8 @@
; script when talk again
dw FirebreatherBillScript
-; 0x59be4
-FirebreatherBillScript: ; 0x59be4
+FirebreatherBillScript:
talkaftercancel
loadfont
writetext UnknownText_0x59e6f
@@ -120,11 +112,10 @@
closetext
loadmovesprites
end
-; 0x59bec
-TrainerFirebreatherRay: ; 0x59bec
+TrainerFirebreatherRay:
; bit/flag number
- dw $44c
+ dw EVENT_BEAT_FIREBREATHER_RAY
; trainer group && trainer id
db FIREBREATHER, RAY
@@ -140,9 +131,8 @@
; script when talk again
dw FirebreatherRayScript
-; 0x59bf8
-FirebreatherRayScript: ; 0x59bf8
+FirebreatherRayScript:
talkaftercancel
loadfont
writetext UnknownText_0x59efc
@@ -149,29 +139,23 @@
closetext
loadmovesprites
end
-; 0x59c00
-ItemFragment_0x59c00: ; 0x59c00
+ItemFragment_0x59c00:
db GREAT_BALL, 1
-; 0x59c02
-ItemFragment_0x59c02: ; 0x59c02
+ItemFragment_0x59c02:
db X_ATTACK, 1
-; 0x59c04
-ItemFragment_0x59c04: ; 0x59c04
+ItemFragment_0x59c04:
db POTION, 1
-; 0x59c06
-ItemFragment_0x59c06: ; 0x59c06
+ItemFragment_0x59c06:
db AWAKENING, 1
-; 0x59c08
-UnknownScript_0x59c08: ; 0x59c08
+UnknownScript_0x59c08:
jumptext UnknownText_0x59f29
-; 0x59c0b
-HikerRussellSeenText: ; 0x59c0b
+HikerRussellSeenText:
text "You're headed to"
line "AZALEA, are you?"
@@ -179,14 +163,12 @@
line "if you are good"
cont "enough to battle."
done
-; 0x59c5f
-HikerRussellBeatenText: ; 0x59c5f
+HikerRussellBeatenText:
text "Oh, oh, oh!"
done
-; 0x59c6c
-UnknownText_0x59c6c: ; 0x59c6c
+UnknownText_0x59c6c:
text "All right, then!"
line "I've decided."
@@ -194,9 +176,8 @@
line "until my #MON"
cont "get tougher!"
done
-; 0x59cb5
-PokemaniacLarrySeenText: ; 0x59cb5
+PokemaniacLarrySeenText:
text "I roam far and"
line "wide in search of"
cont "#MON."
@@ -207,15 +188,13 @@
para "Then you're my"
line "collecting rival!"
done
-; 0x59d1b
-PokemaniacLarryBeatenText: ; 0x59d1b
+PokemaniacLarryBeatenText:
text "Ugh. My poor #-"
line "MON…"
done
-; 0x59d31
-UnknownText_0x59d31: ; 0x59d31
+UnknownText_0x59d31:
text "Every Friday, you"
line "can hear #MON"
@@ -222,9 +201,8 @@
para "roars from deep"
line "inside the cave."
done
-; 0x59d73
-HikerDanielSeenText: ; 0x59d73
+HikerDanielSeenText:
text "Whoa! What a"
line "surprise!"
@@ -231,15 +209,13 @@
para "I didn't expect to"
line "see anyone here!"
done
-; 0x59dae
-HikerDanielBeatenText: ; 0x59dae
+HikerDanielBeatenText:
text "Whoa! I'm beaten"
line "big time!"
done
-; 0x59dc9
-UnknownText_0x59dc9: ; 0x59dc9
+UnknownText_0x59dc9:
text "I was conned into"
line "buying a SLOWPOKE-"
cont "TAIL."
@@ -247,9 +223,8 @@
para "I feel sorry for"
line "the poor #MON."
done
-; 0x59e15
-FirebreatherBillSeenText: ; 0x59e15
+FirebreatherBillSeenText:
text "ZUBAT's SUPERSONIC"
line "keeps confusing"
cont "my #MON."
@@ -257,14 +232,12 @@
para "I'm seriously"
line "upset about that!"
done
-; 0x59e60
-FirebreatherBillBeatenText: ; 0x59e60
+FirebreatherBillBeatenText:
text "I flamed out!"
done
-; 0x59e6f
-UnknownText_0x59e6f: ; 0x59e6f
+UnknownText_0x59e6f:
text "On weekends, you"
line "can hear strange"
@@ -271,9 +244,8 @@
para "roars from deep in"
line "the cave."
done
-; 0x59eaf
-FirebreatherRaySeenText: ; 0x59eaf
+FirebreatherRaySeenText:
text "If it's light, a"
line "cave isn't scary."
@@ -281,26 +253,22 @@
line "#MON aren't"
cont "scary."
done
-; 0x59ef4
-FirebreatherRayBeatenText: ; 0x59ef4
+FirebreatherRayBeatenText:
text "FLASH!"
done
-; 0x59efc
-UnknownText_0x59efc: ; 0x59efc
+UnknownText_0x59efc:
text "It's my #MON's"
line "fire that lights"
cont "up this cave."
done
-; 0x59f29
-UnknownText_0x59f29: ; 0x59f29
+UnknownText_0x59f29:
text "UNION CAVE"
done
-; 0x59f35
-UnionCave1F_MapEventHeader: ; 0x59f35
+UnionCave1F_MapEventHeader:
; filler
db 0, 0
@@ -328,4 +296,3 @@
person_event SPRITE_POKE_BALL, 6, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c02, $065b
person_event SPRITE_POKE_BALL, 21, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c04, $065c
person_event SPRITE_POKE_BALL, 37, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c06, $065d
-; 0x59fc4
--- a/maps/UnionCaveB1F.asm
+++ b/maps/UnionCaveB1F.asm
@@ -1,14 +1,13 @@
-UnionCaveB1F_MapScriptHeader: ; 0x59fc4
+UnionCaveB1F_MapScriptHeader:
; trigger count
db 0
; callback count
db 0
-; 0x59fc6
-TrainerPokemaniacAndrew: ; 0x59fc6
+TrainerPokemaniacAndrew:
; bit/flag number
- dw $4e5
+ dw EVENT_BEAT_POKEMANIAC_ANDREW
; trainer group && trainer id
db POKEMANIAC, ANDREW
@@ -24,9 +23,8 @@
; script when talk again
dw PokemaniacAndrewScript
-; 0x59fd2
-PokemaniacAndrewScript: ; 0x59fd2
+PokemaniacAndrewScript:
talkaftercancel
loadfont
writetext UnknownText_0x5a181
@@ -33,11 +31,10 @@
closetext
loadmovesprites
end
-; 0x59fda
-TrainerPokemaniacCalvin: ; 0x59fda
+TrainerPokemaniacCalvin:
; bit/flag number
- dw $4e6
+ dw EVENT_BEAT_POKEMANIAC_CALVIN
; trainer group && trainer id
db POKEMANIAC, CALVIN
@@ -53,9 +50,8 @@
; script when talk again
dw PokemaniacCalvinScript
-; 0x59fe6
-PokemaniacCalvinScript: ; 0x59fe6
+PokemaniacCalvinScript:
talkaftercancel
loadfont
writetext UnknownText_0x5a230
@@ -62,11 +58,10 @@
closetext
loadmovesprites
end
-; 0x59fee
-TrainerHikerPhillip: ; 0x59fee
+TrainerHikerPhillip:
; bit/flag number
- dw $526
+ dw EVENT_BEAT_HIKER_PHILLIP
; trainer group && trainer id
db HIKER, PHILLIP
@@ -82,9 +77,8 @@
; script when talk again
dw HikerPhillipScript
-; 0x59ffa
-HikerPhillipScript: ; 0x59ffa
+HikerPhillipScript:
talkaftercancel
loadfont
writetext UnknownText_0x5a073
@@ -91,11 +85,10 @@
closetext
loadmovesprites
end
-; 0x5a002
-TrainerHikerLeonard: ; 0x5a002
+TrainerHikerLeonard:
; bit/flag number
- dw $527
+ dw EVENT_BEAT_HIKER_LEONARD
; trainer group && trainer id
db HIKER, LEONARD
@@ -111,9 +104,8 @@
; script when talk again
dw HikerLeonardScript
-; 0x5a00e
-HikerLeonardScript: ; 0x5a00e
+HikerLeonardScript:
talkaftercancel
loadfont
writetext UnknownText_0x5a0fb
@@ -120,20 +112,17 @@
closetext
loadmovesprites
end
-; 0x5a016
-ItemFragment_0x5a016: ; 0x5a016
+ItemFragment_0x5a016:
db TM_SWIFT, 1
-; 0x5a018
-ItemFragment_0x5a018: ; 0x5a018
+ItemFragment_0x5a018:
db X_DEFEND, 1
-; 0x5a01a
UnionCaveB1FBoulder:
jumpstd strengthboulder
-HikerPhillipSeenText: ; 0x5a01d
+HikerPhillipSeenText:
text "It's been a while"
line "since I last saw"
cont "another person."
@@ -141,14 +130,12 @@
para "Don't be shy."
line "Let's battle!"
done
-; 0x5a06a
-HikerPhillipBeatenText: ; 0x5a06a
+HikerPhillipBeatenText:
text "Uurggh…"
done
-; 0x5a073
-UnknownText_0x5a073: ; 0x5a073
+UnknownText_0x5a073:
text "I've been lost for"
line "a long time…"
@@ -156,21 +143,18 @@
line "here, but I am"
cont "soooo hungry!"
done
-; 0x5a0bf
-HikerLeonardSeenText: ; 0x5a0bf
+HikerLeonardSeenText:
text "What do you know!"
line "A visitor!"
done
-; 0x5a0dd
-HikerLeonardBeatenText: ; 0x5a0dd
+HikerLeonardBeatenText:
text "Wahahah! You're a"
line "feisty one!"
done
-; 0x5a0fb
-UnknownText_0x5a0fb: ; 0x5a0fb
+UnknownText_0x5a0fb:
text "I live down here."
para "You can, too, if"
@@ -179,30 +163,26 @@
para "There's plenty of"
line "room, you see."
done
-; 0x5a14a
-PokemaniacAndrewSeenText: ; 0x5a14a
+PokemaniacAndrewSeenText:
text "Who's there?"
para "Leave me and my"
line "#MON alone!"
done
-; 0x5a173
-PokemaniacAndrewBeatenText: ; 0x5a173
+PokemaniacAndrewBeatenText:
text "Go…"
line "Go away!"
done
-; 0x5a181
-UnknownText_0x5a181: ; 0x5a181
+UnknownText_0x5a181:
text "Just me and my"
line "#MON. I'm de-"
cont "lirious with joy."
done
-; 0x5a1b0
-PokemaniacCalvinSeenText: ; 0x5a1b0
+PokemaniacCalvinSeenText:
text "I came all the way"
line "here to conduct my"
cont "#MON research."
@@ -211,15 +191,13 @@
line "my findings in a"
cont "real battle!"
done
-; 0x5a217
-PokemaniacCalvinBeatenText: ; 0x5a217
+PokemaniacCalvinBeatenText:
text "You demonstrated"
line "on me!"
done
-; 0x5a230
-UnknownText_0x5a230: ; 0x5a230
+UnknownText_0x5a230:
text "I should compile"
line "and announce my"
cont "study findings."
@@ -228,9 +206,8 @@
line "come famous like"
cont "PROF.ELM."
done
-; 0x5a28e
-UnionCaveB1F_MapEventHeader: ; 0x5a28e
+UnionCaveB1F_MapEventHeader:
; filler
db 0, 0
@@ -257,4 +234,3 @@
person_event SPRITE_POKE_BALL, 20, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a016, $065e
person_event SPRITE_BOULDER, 14, 11, $19, $0, 255, 255, $0, 0, UnionCaveB1FBoulder, $ffff
person_event SPRITE_POKE_BALL, 27, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a018, $065f
-; 0x5a308
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -1,4 +1,4 @@
-UnionCaveB2F_MapScriptHeader: ; 0x5a308
+UnionCaveB2F_MapScriptHeader:
; trigger count
db 0
@@ -8,24 +8,21 @@
; callbacks
dbw 2, UnknownScript_0x5a30d
-; 0x5a30d
-UnknownScript_0x5a30d: ; 0x5a30d
+UnknownScript_0x5a30d:
checkflag $0059
iftrue UnknownScript_0x5a319
checkcode VAR_WEEKDAY
if_equal FRIDAY, UnknownScript_0x5a31c
-UnknownScript_0x5a319: ; 0x5a319
+UnknownScript_0x5a319:
disappear $7
return
-; 0x5a31c
-UnknownScript_0x5a31c: ; 0x5a31c
+UnknownScript_0x5a31c:
appear $7
return
-; 0x5a31f
-SurfScript_0x5a31f: ; 0x5a31f
+SurfScript_0x5a31f:
faceplayer
cry LAPRAS
loadpokedata LAPRAS, 20
@@ -34,11 +31,10 @@
setflag $0059
returnafterbattle
end
-; 0x5a32e
-TrainerCooltrainermNick: ; 0x5a32e
+TrainerCooltrainermNick:
; bit/flag number
- dw $548
+ dw EVENT_BEAT_COOLTRAINERM_NICK
; trainer group && trainer id
db COOLTRAINERM, NICK
@@ -54,9 +50,8 @@
; script when talk again
dw CooltrainermNickScript
-; 0x5a33a
-CooltrainermNickScript: ; 0x5a33a
+CooltrainermNickScript:
talkaftercancel
loadfont
writetext UnknownText_0x5a3f0
@@ -63,11 +58,10 @@
closetext
loadmovesprites
end
-; 0x5a342
-TrainerCooltrainerfGwen: ; 0x5a342
+TrainerCooltrainerfGwen:
; bit/flag number
- dw $55b
+ dw EVENT_BEAT_COOLTRAINERF_GWEN
; trainer group && trainer id
db COOLTRAINERF, GWEN
@@ -83,9 +77,8 @@
; script when talk again
dw CooltrainerfGwenScript
-; 0x5a34e
-CooltrainerfGwenScript: ; 0x5a34e
+CooltrainerfGwenScript:
talkaftercancel
loadfont
writetext UnknownText_0x5a488
@@ -92,11 +85,10 @@
closetext
loadmovesprites
end
-; 0x5a356
-TrainerCooltrainerfEmma: ; 0x5a356
+TrainerCooltrainerfEmma:
; bit/flag number
- dw $569
+ dw EVENT_BEAT_COOLTRAINERF_EMMA
; trainer group && trainer id
db COOLTRAINERF, EMMA
@@ -112,9 +104,8 @@
; script when talk again
dw CooltrainerfEmmaScript
-; 0x5a362
-CooltrainerfEmmaScript: ; 0x5a362
+CooltrainerfEmmaScript:
talkaftercancel
loadfont
writetext UnknownText_0x5a52b
@@ -121,17 +112,14 @@
closetext
loadmovesprites
end
-; 0x5a36a
-ItemFragment_0x5a36a: ; 0x5a36a
+ItemFragment_0x5a36a:
db ELIXER, 1
-; 0x5a36c
-ItemFragment_0x5a36c: ; 0x5a36c
+ItemFragment_0x5a36c:
db HYPER_POTION, 1
-; 0x5a36e
-CooltrainermNickSeenText: ; 0x5a36e
+CooltrainermNickSeenText:
text "There are two"
line "kinds of people."
@@ -142,15 +130,13 @@
para "What kind of"
line "person are you?"
done
-; 0x5a3d5
-CooltrainermNickBeatenText: ; 0x5a3d5
+CooltrainermNickBeatenText:
text "You've got"
line "dazzling style!"
done
-; 0x5a3f0
-UnknownText_0x5a3f0: ; 0x5a3f0
+UnknownText_0x5a3f0:
text "Your #MON style"
line "is stunning and"
cont "colorful, I admit."
@@ -158,28 +144,24 @@
para "You'll just keep"
line "getting better!"
done
-; 0x5a444
-CooltrainerfGwenSeenText: ; 0x5a444
+CooltrainerfGwenSeenText:
text "I'm in training."
line "Care for a round?"
done
-; 0x5a467
-CooltrainerfGwenBeatenText: ; 0x5a467
+CooltrainerfGwenBeatenText:
text "Aww, no! You're"
line "too good for me."
done
-; 0x5a488
-UnknownText_0x5a488: ; 0x5a488
+UnknownText_0x5a488:
text "I'm going to train"
line "by myself until I"
cont "improve."
done
-; 0x5a4b6
-CooltrainerfEmmaSeenText: ; 0x5a4b6
+CooltrainerfEmmaSeenText:
text "If the #MON I"
line "liked were there,"
cont "I'd go anywhere."
@@ -187,15 +169,13 @@
para "That's what a real"
line "trainer does."
done
-; 0x5a507
-CooltrainerfEmmaBeatenText: ; 0x5a507
+CooltrainerfEmmaBeatenText:
text "I'd rather pet my"
line "babies than this!"
done
-; 0x5a52b
-UnknownText_0x5a52b: ; 0x5a52b
+UnknownText_0x5a52b:
text "Just once a week,"
line "a #MON comes to"
cont "the water's edge."
@@ -203,9 +183,8 @@
para "I wanted to see"
line "that #MON…"
done
-; 0x5a57a
-UnionCaveB2F_MapEventHeader: ; 0x5a57a
+UnionCaveB2F_MapEventHeader:
; filler
db 0, 0
@@ -227,4 +206,3 @@
person_event SPRITE_POKE_BALL, 6, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a36a, $0660
person_event SPRITE_POKE_BALL, 23, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a36c, $0661
person_event SPRITE_SURF, 35, 15, $24, $11, 255, 255, $90, 0, SurfScript_0x5a31f, $0760
-; 0x5a5d3
--- a/maps/VermilionGym.asm
+++ b/maps/VermilionGym.asm
@@ -39,7 +39,7 @@
TrainerGentlemanGregory:
; bit/flag number
- dw $49c
+ dw EVENT_BEAT_GENTLEMAN_GREGORY
; trainer group && trainer id
db GENTLEMAN, GREGORY
@@ -66,7 +66,7 @@
TrainerGuitaristVincent:
; bit/flag number
- dw $494
+ dw EVENT_BEAT_GUITARIST_VINCENT
; trainer group && trainer id
db GUITARIST, VINCENT
@@ -93,7 +93,7 @@
TrainerJugglerHorton:
; bit/flag number
- dw $497
+ dw EVENT_BEAT_JUGGLER_HORTON
; trainer group && trainer id
db JUGGLER, HORTON
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -62,7 +62,7 @@
TrainerBird_keeperRod:
; bit/flag number
- dw $3fb
+ dw EVENT_BEAT_BIRD_KEEPER_ROD
; trainer group && trainer id
db BIRD_KEEPER, ROD
@@ -89,7 +89,7 @@
TrainerBird_keeperAbe:
; bit/flag number
- dw $3fc
+ dw EVENT_BEAT_BIRD_KEEPER_ABE
; trainer group && trainer id
db BIRD_KEEPER, ABE
--- a/maps/WarehouseEntrance.asm
+++ b/maps/WarehouseEntrance.asm
@@ -1,4 +1,4 @@
-WarehouseEntrance_MapScriptHeader: ; 0x7c038
+WarehouseEntrance_MapScriptHeader:
; trigger count
db 0
@@ -12,9 +12,8 @@
dbw 1, UnknownScript_0x7c076
dbw 2, UnknownScript_0x7c082
-; 0x7c043
-UnknownScript_0x7c043: ; 0x7c043
+UnknownScript_0x7c043:
clearevent EVENT_SWITCH_1
clearevent EVENT_SWITCH_2
clearevent EVENT_SWITCH_3
@@ -33,20 +32,17 @@
writebyte $0
copyvartobyte UndergroundSwitchPositions
return
-; 0x7c076
-UnknownScript_0x7c076: ; 0x7c076
+UnknownScript_0x7c076:
checkevent EVENT_USED_BASEMENT_KEY
iffalse UnknownScript_0x7c07d
return
-; 0x7c07d
-UnknownScript_0x7c07d: ; 0x7c07d
+UnknownScript_0x7c07d:
changeblock $12, $6, $3d
return
-; 0x7c082
-UnknownScript_0x7c082: ; 0x7c082
+UnknownScript_0x7c082:
checkcode VAR_WEEKDAY
if_equal MONDAY, UnknownScript_0x7c0a5
if_equal TUESDAY, UnknownScript_0x7c0b5
@@ -59,63 +55,56 @@
appear $9
appear $a
return
-; 0x7c0a5
-UnknownScript_0x7c0a5: ; 0x7c0a5
+UnknownScript_0x7c0a5:
disappear $7
checkmorn
iffalse UnknownScript_0x7c0ae
appear $7
-UnknownScript_0x7c0ae: ; 0x7c0ae
+UnknownScript_0x7c0ae:
disappear $8
disappear $9
disappear $a
return
-; 0x7c0b5
-UnknownScript_0x7c0b5: ; 0x7c0b5
+UnknownScript_0x7c0b5:
disappear $7
appear $8
disappear $9
disappear $a
return
-; 0x7c0be
-UnknownScript_0x7c0be: ; 0x7c0be
+UnknownScript_0x7c0be:
disappear $7
disappear $8
appear $9
disappear $a
return
-; 0x7c0c7
-UnknownScript_0x7c0c7: ; 0x7c0c7
+UnknownScript_0x7c0c7:
disappear $7
appear $8
disappear $9
disappear $a
return
-; 0x7c0d0
-UnknownScript_0x7c0d0: ; 0x7c0d0
+UnknownScript_0x7c0d0:
disappear $7
disappear $8
appear $9
disappear $a
return
-; 0x7c0d9
-UnknownScript_0x7c0d9: ; 0x7c0d9
+UnknownScript_0x7c0d9:
disappear $7
appear $8
disappear $9
appear $a
return
-; 0x7c0e2
-TrainerSupernerdEric: ; 0x7c0e2
+TrainerSupernerdEric:
; bit/flag number
- dw $582
+ dw EVENT_BEAT_SUPER_NERD_ERIC
; trainer group && trainer id
db SUPER_NERD, ERIC
@@ -131,9 +120,8 @@
; script when talk again
dw SupernerdEricScript
-; 0x7c0ee
-SupernerdEricScript: ; 0x7c0ee
+SupernerdEricScript:
talkaftercancel
loadfont
writetext UnknownText_0x7c36c
@@ -140,11 +128,10 @@
closetext
loadmovesprites
end
-; 0x7c0f6
-TrainerSupernerdTeru: ; 0x7c0f6
+TrainerSupernerdTeru:
; bit/flag number
- dw $58a
+ dw EVENT_BEAT_SUPER_NERD_TERU
; trainer group && trainer id
db SUPER_NERD, TERU
@@ -160,9 +147,8 @@
; script when talk again
dw SupernerdTeruScript
-; 0x7c102
-SupernerdTeruScript: ; 0x7c102
+SupernerdTeruScript:
talkaftercancel
loadfont
writetext UnknownText_0x7c410
@@ -169,11 +155,10 @@
closetext
loadmovesprites
end
-; 0x7c10a
-TrainerPokemaniacIssac: ; 0x7c10a
+TrainerPokemaniacIssac:
; bit/flag number
- dw $4ee
+ dw EVENT_BEAT_POKEMANIAC_ISSAC
; trainer group && trainer id
db POKEMANIAC, ISSAC
@@ -189,9 +174,8 @@
; script when talk again
dw PokemaniacIssacScript
-; 0x7c116
-PokemaniacIssacScript: ; 0x7c116
+PokemaniacIssacScript:
talkaftercancel
loadfont
writetext UnknownText_0x7c498
@@ -198,11 +182,10 @@
closetext
loadmovesprites
end
-; 0x7c11e
-TrainerPokemaniacDonald: ; 0x7c11e
+TrainerPokemaniacDonald:
; bit/flag number
- dw $4ef
+ dw EVENT_BEAT_POKEMANIAC_DONALD
; trainer group && trainer id
db POKEMANIAC, DONALD
@@ -218,9 +201,8 @@
; script when talk again
dw PokemaniacDonaldScript
-; 0x7c12a
-PokemaniacDonaldScript: ; 0x7c12a
+PokemaniacDonaldScript:
talkaftercancel
loadfont
writetext UnknownText_0x7c52f
@@ -227,23 +209,20 @@
closetext
loadmovesprites
end
-; 0x7c132
-GrannyScript_0x7c132: ; 0x7c132
+GrannyScript_0x7c132:
loadfont
checkcode VAR_WEEKDAY
if_equal SUNDAY, UnknownScript_0x7c140
if_equal SATURDAY, UnknownScript_0x7c140
jump UnknownScript_0x7c300
-; 0x7c140
-UnknownScript_0x7c140: ; 0x7c140
+UnknownScript_0x7c140:
pokemart $1, $0021
loadmovesprites
end
-; 0x7c146
-GrampsScript_0x7c146: ; 0x7c146
+GrampsScript_0x7c146:
loadfont
checkflag $0056
iftrue UnknownScript_0x7c300
@@ -250,17 +229,15 @@
checkcode VAR_WEEKDAY
if_equal MONDAY, UnknownScript_0x7c156
jump UnknownScript_0x7c300
-; 0x7c156
-UnknownScript_0x7c156: ; 0x7c156
+UnknownScript_0x7c156:
checkmorn
iffalse UnknownScript_0x7c300
pokemart $2, $0000
loadmovesprites
end
-; 0x7c161
-SuperNerdScript_0x7c161: ; 0x7c161
+SuperNerdScript_0x7c161:
loadfont
checkcode VAR_WEEKDAY
if_equal TUESDAY, UnknownScript_0x7c173
@@ -267,9 +244,8 @@
if_equal THURSDAY, UnknownScript_0x7c173
if_equal SATURDAY, UnknownScript_0x7c173
jump UnknownScript_0x7c300
-; 0x7c173
-UnknownScript_0x7c173: ; 0x7c173
+UnknownScript_0x7c173:
checkflag $005a
iftrue UnknownScript_0x7c208
special Function24ae8
@@ -287,30 +263,26 @@
if_equal $2, UnknownScript_0x7c1a9
if_equal $3, UnknownScript_0x7c1b5
jump UnknownScript_0x7c1c1
-; 0x7c1a9
-UnknownScript_0x7c1a9: ; 0x7c1a9
+UnknownScript_0x7c1a9:
setevent $0000
clearevent $0001
clearevent $0002
jump UnknownScript_0x7c1cd
-; 0x7c1b5
-UnknownScript_0x7c1b5: ; 0x7c1b5
+UnknownScript_0x7c1b5:
clearevent $0000
setevent $0001
clearevent $0002
jump UnknownScript_0x7c1cd
-; 0x7c1c1
-UnknownScript_0x7c1c1: ; 0x7c1c1
+UnknownScript_0x7c1c1:
clearevent $0000
clearevent $0001
setevent $0002
jump UnknownScript_0x7c1cd
-; 0x7c1cd
-UnknownScript_0x7c1cd: ; 0x7c1cd
+UnknownScript_0x7c1cd:
takemoney $0, 500
special Function24ae8
writetext UnknownText_0x7c6b8
@@ -329,30 +301,26 @@
checkevent $0001
iftrue UnknownScript_0x7c2c4
jump UnknownScript_0x7c2cd
-; 0x7c1fc
-UnknownScript_0x7c1fc: ; 0x7c1fc
+UnknownScript_0x7c1fc:
writetext UnknownText_0x7c6ea
closetext
loadmovesprites
end
-; 0x7c202
-UnknownScript_0x7c202: ; 0x7c202
+UnknownScript_0x7c202:
writetext UnknownText_0x7c709
closetext
loadmovesprites
end
-; 0x7c208
-UnknownScript_0x7c208: ; 0x7c208
+UnknownScript_0x7c208:
writetext UnknownText_0x7c72b
closetext
loadmovesprites
end
-; 0x7c20e
-SuperNerdScript_0x7c20e: ; 0x7c20e
+SuperNerdScript_0x7c20e:
loadfont
checkcode VAR_WEEKDAY
if_equal SUNDAY, UnknownScript_0x7c220
@@ -359,9 +327,8 @@
if_equal WEDNESDAY, UnknownScript_0x7c220
if_equal FRIDAY, UnknownScript_0x7c220
jump UnknownScript_0x7c300
-; 0x7c220
-UnknownScript_0x7c220: ; 0x7c220
+UnknownScript_0x7c220:
checkflag $005a
iftrue UnknownScript_0x7c2b5
special Function24ae8
@@ -379,30 +346,26 @@
if_equal $2, UnknownScript_0x7c256
if_equal $3, UnknownScript_0x7c262
jump UnknownScript_0x7c26e
-; 0x7c256
-UnknownScript_0x7c256: ; 0x7c256
+UnknownScript_0x7c256:
setevent $0000
clearevent $0001
clearevent $0002
jump UnknownScript_0x7c27a
-; 0x7c262
-UnknownScript_0x7c262: ; 0x7c262
+UnknownScript_0x7c262:
clearevent $0000
setevent $0001
clearevent $0002
jump UnknownScript_0x7c27a
-; 0x7c26e
-UnknownScript_0x7c26e: ; 0x7c26e
+UnknownScript_0x7c26e:
clearevent $0000
clearevent $0001
setevent $0002
jump UnknownScript_0x7c27a
-; 0x7c27a
-UnknownScript_0x7c27a: ; 0x7c27a
+UnknownScript_0x7c27a:
takemoney $0, 300
special Function24ae8
writetext UnknownText_0x7c80e
@@ -421,54 +384,47 @@
checkevent $0001
iftrue UnknownScript_0x7c2c4
jump UnknownScript_0x7c2cd
-; 0x7c2a9
-UnknownScript_0x7c2a9: ; 0x7c2a9
+UnknownScript_0x7c2a9:
writetext UnknownText_0x7c842
closetext
loadmovesprites
end
-; 0x7c2af
-UnknownScript_0x7c2af: ; 0x7c2af
+UnknownScript_0x7c2af:
writetext UnknownText_0x7c85b
closetext
loadmovesprites
end
-; 0x7c2b5
-UnknownScript_0x7c2b5: ; 0x7c2b5
+UnknownScript_0x7c2b5:
writetext UnknownText_0x7c87b
closetext
loadmovesprites
end
-; 0x7c2bb
-UnknownScript_0x7c2bb: ; 0x7c2bb
+UnknownScript_0x7c2bb:
writetext UnknownText_0x7c8bf
special Functionc472
closetext
loadmovesprites
end
-; 0x7c2c4
-UnknownScript_0x7c2c4: ; 0x7c2c4
+UnknownScript_0x7c2c4:
writetext UnknownText_0x7c8dc
special Functionc472
closetext
loadmovesprites
end
-; 0x7c2cd
-UnknownScript_0x7c2cd: ; 0x7c2cd
+UnknownScript_0x7c2cd:
writetext UnknownText_0x7c8ee
special Functionc472
closetext
loadmovesprites
end
-; 0x7c2d6
-MapWarehouseEntranceSignpost0Script:: ; 0x7c2d6
+MapWarehouseEntranceSignpost0Script::
loadfont
checkevent EVENT_USED_BASEMENT_KEY
iftrue UnknownScript_0x7c2fa
@@ -478,9 +434,8 @@
closetext
loadmovesprites
end
-; 0x7c2e8
-UnknownScript_0x7c2e8: ; 0x7c2e8
+UnknownScript_0x7c2e8:
playsound SFX_TRANSACTION
writetext UnknownText_0x7c5d6
closetext
@@ -490,49 +445,41 @@
loadmovesprites
setevent EVENT_USED_BASEMENT_KEY
end
-; 0x7c2fa
-UnknownScript_0x7c2fa: ; 0x7c2fa
+UnknownScript_0x7c2fa:
writetext UnknownText_0x7c5c3
closetext
loadmovesprites
end
-; 0x7c300
-UnknownScript_0x7c300: ; 0x7c300
+UnknownScript_0x7c300:
writetext UnknownText_0x7c904
closetext
loadmovesprites
end
-; 0x7c306
-ItemFragment_0x7c306: ; 0x7c306
+ItemFragment_0x7c306:
db COIN_CASE, 1
-; 0x7c308
-MapWarehouseEntranceSignpost1Script: ; 0x7c308
+MapWarehouseEntranceSignpost1Script:
jumptext UnknownText_0x7c91a
-; 0x7c30b
-MapWarehouseEntranceSignpostItem2: ; 0x7c30b
+MapWarehouseEntranceSignpostItem2:
dw $008b
db PARLYZ_HEAL
-; 0x7c30e
-MapWarehouseEntranceSignpostItem3: ; 0x7c30e
+MapWarehouseEntranceSignpostItem3:
dw $008c
db SUPER_POTION
-; 0x7c311
-MapWarehouseEntranceSignpostItem4: ; 0x7c311
+MapWarehouseEntranceSignpostItem4:
dw $008d
db ANTIDOTE
-; 0x7c314
-SupernerdEricSeenText: ; 0x7c314
+SupernerdEricSeenText:
text "I got booted out"
line "of the GAME COR-"
cont "NER."
@@ -541,21 +488,18 @@
line "cheat using my"
cont "#MON…"
done
-; 0x7c361
-SupernerdEricBeatenText: ; 0x7c361
+SupernerdEricBeatenText:
text "…Grumble…"
done
-; 0x7c36c
-UnknownText_0x7c36c: ; 0x7c36c
+UnknownText_0x7c36c:
text "I guess I have to"
line "do things fair and"
cont "square…"
done
-; 0x7c39a
-SupernerdTeruSeenText: ; 0x7c39a
+SupernerdTeruSeenText:
text "Do you consider"
line "type alignments in"
cont "battle?"
@@ -566,14 +510,12 @@
para "you'll do better"
line "in battle."
done
-; 0x7c403
-SupernerdTeruBeatenText: ; 0x7c403
+SupernerdTeruBeatenText:
text "Ow, ow, ow!"
done
-; 0x7c410
-UnknownText_0x7c410: ; 0x7c410
+UnknownText_0x7c410:
text "I know my #MON"
line "type alignments."
@@ -580,9 +522,8 @@
para "But I only use one"
line "type of #MON."
done
-; 0x7c452
-PokemaniacIssacSeenText: ; 0x7c452
+PokemaniacIssacSeenText:
text "My #MON just"
line "got a haircut!"
@@ -589,14 +530,12 @@
para "I'll show you how"
line "strong it is!"
done
-; 0x7c48e
-PokemaniacIssacBeatenText: ; 0x7c48e
+PokemaniacIssacBeatenText:
text "Aiyeeee!"
done
-; 0x7c498
-UnknownText_0x7c498: ; 0x7c498
+UnknownText_0x7c498:
text "Your #MON will"
line "like you more if"
@@ -603,9 +542,8 @@
para "you give them"
line "haircuts."
done
-; 0x7c4d1
-PokemaniacDonaldSeenText: ; 0x7c4d1
+PokemaniacDonaldSeenText:
text "I think you have"
line "some rare #MON"
cont "with you."
@@ -612,15 +550,13 @@
para "Let me see them!"
done
-; 0x7c50d
-PokemaniacDonaldBeatenText: ; 0x7c50d
+PokemaniacDonaldBeatenText:
text "Gaah! I lost!"
line "That makes me mad!"
done
-; 0x7c52f
-UnknownText_0x7c52f: ; 0x7c52f
+UnknownText_0x7c52f:
text "Are you making a"
line "#DEX? Here's a"
cont "hot tip."
@@ -633,25 +569,21 @@
line "he sees any rare"
cont "#MON."
done
-; 0x7c5b0
-UnknownText_0x7c5b0: ; 0x7c5b0
+UnknownText_0x7c5b0:
text "The door's locked…"
done
-; 0x7c5c3
-UnknownText_0x7c5c3: ; 0x7c5c3
+UnknownText_0x7c5c3:
text "The door is open."
done
-; 0x7c5d6
-UnknownText_0x7c5d6: ; 0x7c5d6
+UnknownText_0x7c5d6:
text "The BASEMENT KEY"
line "opened the door."
done
-; 0x7c5f9
-UnknownText_0x7c5f9: ; 0x7c5f9
+UnknownText_0x7c5f9:
text "Welcome!"
para "I run the #MON"
@@ -668,45 +600,38 @@
para "Would you like me"
line "to do that?"
done
-; 0x7c69a
-UnknownText_0x7c69a: ; 0x7c69a
+UnknownText_0x7c69a:
text "Which #MON"
line "should I work on?"
done
-; 0x7c6b8
-UnknownText_0x7c6b8: ; 0x7c6b8
+UnknownText_0x7c6b8:
text "OK! Watch it"
line "become beautiful!"
done
-; 0x7c6d8
-UnknownText_0x7c6d8: ; 0x7c6d8
+UnknownText_0x7c6d8:
text "There! All done!"
done
-; 0x7c6ea
-UnknownText_0x7c6ea: ; 0x7c6ea
+UnknownText_0x7c6ea:
text "Is that right?"
line "That's a shame!"
done
-; 0x7c709
-UnknownText_0x7c709: ; 0x7c709
+UnknownText_0x7c709:
text "You'll need more"
line "money than that."
done
-; 0x7c72b
-UnknownText_0x7c72b: ; 0x7c72b
+UnknownText_0x7c72b:
text "I do only one"
line "haircut a day. I'm"
cont "done for today."
done
-; 0x7c75c
-UnknownText_0x7c75c: ; 0x7c75c
+UnknownText_0x7c75c:
text "Welcome to the"
line "#MON SALON!"
@@ -721,39 +646,33 @@
para "So? How about it?"
done
-; 0x7c7f1
-UnknownText_0x7c7f1: ; 0x7c7f1
+UnknownText_0x7c7f1:
text "OK, which #MON"
line "should I do?"
done
-; 0x7c80e
-UnknownText_0x7c80e: ; 0x7c80e
+UnknownText_0x7c80e:
text "OK! I'll make it"
line "look cool!"
done
-; 0x7c82a
-UnknownText_0x7c82a: ; 0x7c82a
+UnknownText_0x7c82a:
text "There we go!"
line "All done!"
done
-; 0x7c842
-UnknownText_0x7c842: ; 0x7c842
+UnknownText_0x7c842:
text "No? "
line "How disappointing!"
done
-; 0x7c85b
-UnknownText_0x7c85b: ; 0x7c85b
+UnknownText_0x7c85b:
text "You're a little"
line "short on funds."
done
-; 0x7c87b
-UnknownText_0x7c87b: ; 0x7c87b
+UnknownText_0x7c87b:
text "I can do only one"
line "haircut a day."
@@ -760,42 +679,36 @@
para "Sorry, but I'm all"
line "done for today."
done
-; 0x7c8bf
-UnknownText_0x7c8bf: ; 0x7c8bf
+UnknownText_0x7c8bf:
text_from_ram StringBuffer3
text " looks a"
line "little happier."
done
-; 0x7c8dc
-UnknownText_0x7c8dc: ; 0x7c8dc
+UnknownText_0x7c8dc:
text_from_ram StringBuffer3
text " looks"
line "happy."
done
-; 0x7c8ee
-UnknownText_0x7c8ee: ; 0x7c8ee
+UnknownText_0x7c8ee:
text_from_ram StringBuffer3
text " looks"
line "delighted!"
done
-; 0x7c904
-UnknownText_0x7c904: ; 0x7c904
+UnknownText_0x7c904:
text "We're not open"
line "today."
done
-; 0x7c91a
-UnknownText_0x7c91a: ; 0x7c91a
+UnknownText_0x7c91a:
text "NO ENTRY BEYOND"
line "THIS POINT"
done
-; 0x7c936
-WarehouseEntrance_MapEventHeader: ; 0x7c936
+WarehouseEntrance_MapEventHeader:
; filler
db 0, 0
@@ -830,4 +743,3 @@
person_event SPRITE_SUPER_NERD, 18, 11, $8, $0, 255, 255, $90, 0, SuperNerdScript_0x7c161, $0754
person_event SPRITE_SUPER_NERD, 19, 11, $8, $0, 255, 255, $a0, 0, SuperNerdScript_0x7c20e, $0755
person_event SPRITE_GRANNY, 25, 11, $8, $0, 255, 255, $b0, 0, GrannyScript_0x7c132, $0752
-; 0x7c9e8
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -1,4 +1,4 @@
-WillsRoom_MapScriptHeader: ; 0x1804b9
+WillsRoom_MapScriptHeader:
; trigger count
db 2
@@ -12,30 +12,26 @@
; callbacks
dbw 1, UnknownScript_0x1804cb
-; 0x1804c6
-UnknownScript_0x1804c6: ; 0x1804c6
+UnknownScript_0x1804c6:
priorityjump UnknownScript_0x1804e0
end
-; 0x1804ca
-UnknownScript_0x1804ca: ; 0x1804ca
+UnknownScript_0x1804ca:
end
-; 0x1804cb
-UnknownScript_0x1804cb: ; 0x1804cb
+UnknownScript_0x1804cb:
checkevent $0309
iffalse UnknownScript_0x1804d5
changeblock $4, $e, $2a
-UnknownScript_0x1804d5: ; 0x1804d5
+UnknownScript_0x1804d5:
checkevent EVENT_WILLS_ROOM_EXIT_OPEN
iffalse UnknownScript_0x1804df
changeblock $4, $2, $16
-UnknownScript_0x1804df: ; 0x1804df
+UnknownScript_0x1804df:
return
-; 0x1804e0
-UnknownScript_0x1804e0: ; 0x1804e0
+UnknownScript_0x1804e0:
applymovement $0, MovementData_0x18052c
refreshscreen $86
playsound SFX_STRENGTH
@@ -47,12 +43,11 @@
setevent $0309
waitbutton
end
-; 0x1804f8
-WillScript_0x1804f8: ; 0x1804f8
+WillScript_0x1804f8:
faceplayer
loadfont
- checkevent $05b8
+ checkevent EVENT_BEAT_ELITE_4_WILL
iftrue UnknownScript_0x180526
writetext UnknownText_0x180531
closetext
@@ -61,7 +56,7 @@
loadtrainer WILL, 1
startbattle
returnafterbattle
- setevent $05b8
+ setevent EVENT_BEAT_ELITE_4_WILL
loadfont
writetext UnknownText_0x180644
closetext
@@ -73,24 +68,21 @@
setevent EVENT_WILLS_ROOM_EXIT_OPEN
waitbutton
end
-; 0x180526
-UnknownScript_0x180526: ; 0x180526
+UnknownScript_0x180526:
writetext UnknownText_0x180644
closetext
loadmovesprites
end
-; 0x18052c
-MovementData_0x18052c: ; 0x18052c
+MovementData_0x18052c:
step_up
step_up
step_up
step_up
step_end
-; 0x180531
-UnknownText_0x180531: ; 0x180531
+UnknownText_0x180531:
text "Welcome to #MON"
line "LEAGUE, <PLAYER>."
@@ -114,15 +106,13 @@
para "Losing is not an"
line "option!"
done
-; 0x18062c
-UnknownText_0x18062c: ; 0x18062c
+UnknownText_0x18062c:
text "I… I can't…"
line "believe it…"
done
-; 0x180644
-UnknownText_0x180644: ; 0x180644
+UnknownText_0x180644:
text "Even though I was"
line "defeated, I won't"
cont "change my course."
@@ -139,9 +129,8 @@
para "the true ferocity"
line "of the ELITE FOUR."
done
-; 0x1806f9
-WillsRoom_MapEventHeader: ; 0x1806f9
+WillsRoom_MapEventHeader:
; filler
db 0, 0
@@ -160,4 +149,3 @@
; people-events
db 1
person_event SPRITE_WILL, 11, 9, $6, $0, 255, 255, $80, 0, WillScript_0x1804f8, $ffff
-; 0x18071b
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -1,4 +1,4 @@
-WiseTriosRoom_MapScriptHeader: ; 0x98565
+WiseTriosRoom_MapScriptHeader:
; trigger count
db 2
@@ -12,17 +12,14 @@
; callbacks
dbw 2, UnknownScript_0x98574
-; 0x98572
-UnknownScript_0x98572: ; 0x98572
+UnknownScript_0x98572:
end
-; 0x98573
-UnknownScript_0x98573: ; 0x98573
+UnknownScript_0x98573:
end
-; 0x98574
-UnknownScript_0x98574: ; 0x98574
+UnknownScript_0x98574:
checkevent EVENT_FOUGHT_SUICUNE
iftrue UnknownScript_0x98593
checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
@@ -32,33 +29,27 @@
clearevent $07ab
setevent $07ac
return
-; 0x9858c
-UnknownScript_0x9858c: ; 0x9858c
+UnknownScript_0x9858c:
setevent $07ab
clearevent $07ac
return
-; 0x98593
-UnknownScript_0x98593: ; 0x98593
+UnknownScript_0x98593:
setevent $07ab
setevent $07ac
return
-; 0x9859a
-SageScript_0x9859a: ; 0x9859a
+SageScript_0x9859a:
jumptextfaceplayer UnknownText_0x9862b
-; 0x9859d
-SageScript_0x9859d: ; 0x9859d
+SageScript_0x9859d:
jumptextfaceplayer UnknownText_0x9868b
-; 0x985a0
-SageScript_0x985a0: ; 0x985a0
+SageScript_0x985a0:
jumptextfaceplayer UnknownText_0x987af
-; 0x985a3
-UnknownScript_0x985a3: ; 0x985a3
+UnknownScript_0x985a3:
spriteface $4, UP
spriteface $0, DOWN
showemote $0, $4, 20
@@ -73,11 +64,10 @@
applymovement $4, MovementData_0x98625
spriteface $4, LEFT
end
-; 0x985c6
-TrainerSageGaku: ; 0x985c6
+TrainerSageGaku:
; bit/flag number
- dw $5c9
+ dw EVENT_BEAT_SAGE_GAKU
; trainer group && trainer id
db SAGE, GAKU
@@ -93,19 +83,17 @@
; script when talk again
dw SageGakuScript
-; 0x985d2
-SageGakuScript: ; 0x985d2
+SageGakuScript:
loadfont
writetext UnknownText_0x98938
closetext
loadmovesprites
end
-; 0x985d9
-TrainerSageMasa: ; 0x985d9
+TrainerSageMasa:
; bit/flag number
- dw $5ca
+ dw EVENT_BEAT_SAGE_MASA
; trainer group && trainer id
db SAGE, MASA
@@ -121,19 +109,17 @@
; script when talk again
dw SageMasaScript
-; 0x985e5
-SageMasaScript: ; 0x985e5
+SageMasaScript:
loadfont
writetext UnknownText_0x98a35
closetext
loadmovesprites
end
-; 0x985ec
-TrainerSageKoji: ; 0x985ec
+TrainerSageKoji:
; bit/flag number
- dw $5cb
+ dw EVENT_BEAT_SAGE_KOJI
; trainer group && trainer id
db SAGE, KOJI
@@ -149,9 +135,8 @@
; script when talk again
dw SageKojiScript
-; 0x985f8
-SageKojiScript: ; 0x985f8
+SageKojiScript:
checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
iftrue UnknownScript_0x9861b
pause 10
@@ -167,35 +152,30 @@
setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
dotrigger $1
end
-; 0x9861b
-UnknownScript_0x9861b: ; 0x9861b
+UnknownScript_0x9861b:
loadfont
writetext UnknownText_0x98db5
closetext
loadmovesprites
end
-; 0x98622
-MovementData_0x98622: ; 0x98622
+MovementData_0x98622:
step_left
step_left
step_end
-; 0x98625
-MovementData_0x98625: ; 0x98625
+MovementData_0x98625:
step_right
step_down
step_end
-; 0x98628
-MovementData_0x98628: ; 0x98628
+MovementData_0x98628:
step_right
step_down
step_end
-; 0x9862b
-UnknownText_0x9862b: ; 0x9862b
+UnknownText_0x9862b:
text "Astounding…"
para "SUICUNE, ENTEI and"
@@ -205,9 +185,8 @@
para "Is the legend"
line "coming true?"
done
-; 0x9868b
-UnknownText_0x9868b: ; 0x9868b
+UnknownText_0x9868b:
text "We train at the"
line "BURNED TOWER, but"
@@ -220,9 +199,8 @@
para "deliberately made"
line "by someone."
done
-; 0x98712
-UnknownText_0x98712: ; 0x98712
+UnknownText_0x98712:
text "TIN TOWER may be"
line "entered by those"
@@ -238,9 +216,8 @@
para "to refrain from"
line "entering!"
done
-; 0x987af
-UnknownText_0x987af: ; 0x987af
+UnknownText_0x987af:
text "We, the WISE TRIO,"
line "are the protectors"
@@ -247,9 +224,8 @@
para "of the legendary"
line "#MON."
done
-; 0x987ed
-SageGakuSeenText: ; 0x987ed
+SageGakuSeenText:
text "Legend has it that"
line "upon the emergence"
@@ -278,15 +254,13 @@
para "worthiness to go"
line "inside!"
done
-; 0x98914
-SageGakuBeatenText: ; 0x98914
+SageGakuBeatenText:
text "Stronger than we"
line "thought? Perhaps…"
done
-; 0x98938
-UnknownText_0x98938: ; 0x98938
+UnknownText_0x98938:
text "Ah, so it is you"
line "who claim to have"
@@ -300,9 +274,8 @@
line "they can't be seen"
cont "while they sleep…"
done
-; 0x989d2
-SageMasaSeenText: ; 0x989d2
+SageMasaSeenText:
text "Can you be trusted"
line "with the truth?"
@@ -309,15 +282,13 @@
para "I must ascertain"
line "your worthiness."
done
-; 0x98a18
-SageMasaBeatenText: ; 0x98a18
+SageMasaBeatenText:
text "…I will tell you"
line "the truth…"
done
-; 0x98a35
-UnknownText_0x98a35: ; 0x98a35
+UnknownText_0x98a35:
text "In the past, there"
line "were two nine-tier"
cont "towers here."
@@ -366,21 +337,18 @@
line "the BURNED TOWER"
cont "came to be."
done
-; 0x98c42
-SageKojiSeenText: ; 0x98c42
+SageKojiSeenText:
text "Let me see your"
line "power!"
done
-; 0x98c5a
-SageKojiBeatenText: ; 0x98c5a
+SageKojiBeatenText:
text "Too strong!"
line "Why?"
done
-; 0x98c6c
-UnknownText_0x98c6c: ; 0x98c6c
+UnknownText_0x98c6c:
text "You… Are you the"
line "trainer who is"
@@ -387,9 +355,8 @@
para "awaited by the"
line "legendary #MON?"
done
-; 0x98cac
-UnknownText_0x98cac: ; 0x98cac
+UnknownText_0x98cac:
text "I see…"
para "We, the WISE TRIO,"
@@ -414,17 +381,15 @@
para "SUICUNE will put"
line "you to the test."
done
-; 0x98db5
-UnknownText_0x98db5: ; 0x98db5
+UnknownText_0x98db5:
text "Please, do go on."
para "SUICUNE will put"
line "you to the test."
done
-; 0x98dea
-WiseTriosRoom_MapEventHeader: ; 0x98dea
+WiseTriosRoom_MapEventHeader:
; filler
db 0, 0
@@ -449,4 +414,3 @@
person_event SPRITE_SAGE, 6, 8, $6, $0, 255, 255, $2, 2, TrainerSageGaku, $07ac
person_event SPRITE_SAGE, 10, 8, $7, $0, 255, 255, $2, 2, TrainerSageMasa, $07ac
person_event SPRITE_SAGE, 8, 10, $8, $0, 255, 255, $2, 2, TrainerSageKoji, $07ac
-; 0x98e55