diff options
Diffstat (limited to 'maps/Route30.asm')
| -rw-r--r-- | maps/Route30.asm | 194 |
1 files changed, 68 insertions, 126 deletions
diff --git a/maps/Route30.asm b/maps/Route30.asm index 758701c91..2f757bd15 100644 --- 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 @@ YoungsterScript_0x1a1673: ; 0x1a1673 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 @@ TrainerYoungsterJoey1: ; 0x1a169a ; script when talk again dw YoungsterJoey1Script -; 0x1a16a6 -YoungsterJoey1Script: ; 0x1a16a6 +YoungsterJoey1Script: writecode VAR_CALLERID, $f talkaftercancel loadfont @@ -62,20 +59,18 @@ YoungsterJoey1Script: ; 0x1a16a6 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 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,55 +79,51 @@ UnknownScript_0x1a16e0: ; 0x1a16e0 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 loadvar wd9f9, $1 clearflag $006b end -; 0x1a1724 -UnknownScript_0x1a1724: ; 0x1a1724 +UnknownScript_0x1a1724: loadtrainer YOUNGSTER, JOEY2 startbattle returnafterbattle loadvar wd9f9, $2 clearflag $006b end -; 0x1a1731 -UnknownScript_0x1a1731: ; 0x1a1731 +UnknownScript_0x1a1731: loadtrainer YOUNGSTER, JOEY3 startbattle returnafterbattle loadvar wd9f9, $3 clearflag $006b end -; 0x1a173e -UnknownScript_0x1a173e: ; 0x1a173e +UnknownScript_0x1a173e: loadtrainer YOUNGSTER, JOEY4 startbattle returnafterbattle loadvar wd9f9, $4 clearflag $006b end -; 0x1a174b -UnknownScript_0x1a174b: ; 0x1a174b +UnknownScript_0x1a174b: loadtrainer YOUNGSTER, JOEY5 startbattle returnafterbattle @@ -146,13 +137,11 @@ UnknownScript_0x1a174b: ; 0x1a174b 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 @@ UnknownScript_0x1a176f: ; 0x1a176f 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,20 +206,18 @@ TrainerYoungsterMikey: ; 0x1a17aa ; script when talk again dw YoungsterMikeyScript -; 0x1a17b6 -YoungsterMikeyScript: ; 0x1a17b6 +YoungsterMikeyScript: talkaftercancel loadfont writetext UnknownText_0x1a197d 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,18 +233,16 @@ TrainerBug_catcherDon: ; 0x1a17be ; script when talk again dw Bug_catcherDonScript -; 0x1a17ca -Bug_catcherDonScript: ; 0x1a17ca +Bug_catcherDonScript: talkaftercancel loadfont writetext UnknownText_0x1a1a1c closetext loadmovesprites end -; 0x1a17d2 -YoungsterScript_0x1a17d2: ; 0x1a17d2 +YoungsterScript_0x1a17d2: faceplayer loadfont checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM @@ -276,82 +251,67 @@ YoungsterScript_0x1a17d2: ; 0x1a17d2 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 @@ YoungsterJoey1SeenText: ; 0x1a1849 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,24 +337,21 @@ UnknownText_0x1a18c2: ; 0x1a18c2 line "with this one no" cont "matter what!" done -; 0x1a1928 -YoungsterMikeySeenText: ; 0x1a1928 +YoungsterMikeySeenText: text "You're a #MON" line "trainer, right?" 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 @@ UnknownText_0x1a197d: ; 0x1a197d 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,51 +380,44 @@ UnknownText_0x1a1a1c: ; 0x1a1a1c 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" 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 @@ UnknownText_0x1a1b66: ; 0x1a1b66 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 @@ UnknownText_0x1a1bc0: ; 0x1a1bc0 para "I'm going to get" line "tougher too." done -; 0x1a1c54 -Route30_MapEventHeader: ; 0x1a1c54 +Route30_MapEventHeader: ; filler db 0, 0 @@ -523,7 +466,7 @@ Route30_MapEventHeader: ; 0x1a1c54 ; 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 @@ Route30_MapEventHeader: ; 0x1a1c54 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 |